ibizdev提交

app_web/CHANGELOG.md

+## v7.0.0-alpha.4 [2020-5-14]
+
+### Bug修复
+
+修复代码表代码项图标和数据
+
+修复数据多项选择视图UI逻辑不匹配
+
+修复列表高度异常
+
+修复树节点上下文
+
+修复表格（视图）高度，滚动条问题
+
+修复表单loaddraft服务仿真主键丢失修复
+
+修复user显示名称逻辑
+
+修复issue地址为正式环境地址
+
+
+### 功能新增及优化
+
+#### 模板
+
+模态时视图样式调整
+
+增加菜单权限
+
+增加快速分组搜索或快速搜索表单功能
+
+增加表格内置工具栏
+
+代码表多选控件分割符从分号转化为逗号
+
+
+#### 基础文件
+
+增加数据选择类插件表格呈现插件
+
+
 ## v7.0.0-alpha.3 [2020-5-10]
 
 ### Bug修复
@@ -65,3 +106,5 @@
 ## v7.0.0-alpha.1 [2020-4-29]
 
 初始化文件
+
+

app_web/src/components/app-form-druipart/app-form-druipart.vue

@@ -263,7 +263,9 @@ export default class AppFormDRUIPart extends Vue {
             }
         }
         if(!this.isForbidLoad){
-            this.formDruipart.next({action:'load',data:{srfparentdename:this.parentName,srfparentkey:_paramitem}});
+            this.$nextTick(() => {
+                this.formDruipart.next({action:'load',data:{srfparentdename:this.parentName,srfparentkey:_paramitem}});
+            });
         }
     }
 

app_web/src/pages/uaa/sys-permissionedit-view/sys-permissionedit-view-base.vue

@@ -899,14 +899,14 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
             const data: any = {};
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
             _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
-            const data2: any = {};
             if (args.length > 0) {
-                Object.assign(data2, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
-            xData.copy(data2);
+            xData.copy(args[0].srfkey);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }

app_web/src/pages/uaa/sys-permissionedit-view2/sys-permissionedit-view2-base.vue

@@ -931,14 +931,14 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
             const data: any = {};
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
             _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
-            const data2: any = {};
             if (args.length > 0) {
-                Object.assign(data2, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
-            xData.copy(data2);
+            xData.copy(args[0].srfkey);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }

app_web/src/pages/uaa/sys-permissiongrid-view/sys-permissiongrid-view-base.vue

@@ -956,6 +956,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
      */
     public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
         const data: any = {};
+        if(args[0].srfsourcekey){
+            data.srfsourcekey = args[0].srfsourcekey;
+        }
         let curViewParam = JSON.parse(JSON.stringify(this.context));
         if(args.length >0){
             Object.assign(curViewParam,args[0]);
@@ -1098,14 +1101,14 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
             const data: any = {};
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
             _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
-            const data2: any = {};
             if (args.length > 0) {
-                Object.assign(data2, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
-            xData.copy(data2);
+            xData.copy(args[0].srfkey);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }

app_web/src/pages/uaa/sys-role-permissionedit-view/sys-role-permissionedit-view-base.vue

@@ -899,14 +899,14 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
             const data: any = {};
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
             _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
-            const data2: any = {};
             if (args.length > 0) {
-                Object.assign(data2, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
-            xData.copy(data2);
+            xData.copy(args[0].srfkey);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }

app_web/src/pages/uaa/sys-role-permissionedit-view2/sys-role-permissionedit-view2-base.vue

@@ -931,14 +931,14 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
             const data: any = {};
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
             _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
-            const data2: any = {};
             if (args.length > 0) {
-                Object.assign(data2, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
-            xData.copy(data2);
+            xData.copy(args[0].srfkey);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }

app_web/src/pages/uaa/sys-role-permissiongrid-view/sys-role-permissiongrid-view-base.vue

@@ -1126,14 +1126,14 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
             const data: any = {};
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
             _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
-            const data2: any = {};
             if (args.length > 0) {
-                Object.assign(data2, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
-            xData.copy(data2);
+            xData.copy(args[0].srfkey);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }

app_web/src/pages/uaa/sys-roleedit-view/sys-roleedit-view-base.vue

@@ -899,14 +899,14 @@ export default class SYS_ROLEEditViewBase extends Vue {
             const data: any = {};
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
             _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
-            const data2: any = {};
             if (args.length > 0) {
-                Object.assign(data2, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
-            xData.copy(data2);
+            xData.copy(args[0].srfkey);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }

app_web/src/pages/uaa/sys-roleedit-view2/sys-roleedit-view2-base.vue

@@ -931,14 +931,14 @@ export default class SYS_ROLEEditView2Base extends Vue {
             const data: any = {};
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
             _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
-            const data2: any = {};
             if (args.length > 0) {
-                Object.assign(data2, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
-            xData.copy(data2);
+            xData.copy(args[0].srfkey);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }

app_web/src/pages/uaa/sys-rolegrid-view/sys-rolegrid-view-base.vue

@@ -956,6 +956,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
      */
     public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
         const data: any = {};
+        if(args[0].srfsourcekey){
+            data.srfsourcekey = args[0].srfsourcekey;
+        }
         let curViewParam = JSON.parse(JSON.stringify(this.context));
         if(args.length >0){
             Object.assign(curViewParam,args[0]);
@@ -1098,14 +1101,14 @@ export default class SYS_ROLEGridViewBase extends Vue {
             const data: any = {};
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
             _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
-            const data2: any = {};
             if (args.length > 0) {
-                Object.assign(data2, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
-            xData.copy(data2);
+            xData.copy(args[0].srfkey);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }

app_web/src/pages/uaa/sys-user-roleedit-view/sys-user-roleedit-view-base.vue

@@ -899,14 +899,14 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
             const data: any = {};
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
             _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
-            const data2: any = {};
             if (args.length > 0) {
-                Object.assign(data2, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
-            xData.copy(data2);
+            xData.copy(args[0].srfkey);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }

app_web/src/pages/uaa/sys-user-roleedit-view2/sys-user-roleedit-view2-base.vue

@@ -931,14 +931,14 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
             const data: any = {};
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
             _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
-            const data2: any = {};
             if (args.length > 0) {
-                Object.assign(data2, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
-            xData.copy(data2);
+            xData.copy(args[0].srfkey);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }

app_web/src/pages/uaa/sys-user-rolegrid-view/sys-user-rolegrid-view-base.vue

@@ -1126,14 +1126,14 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
             const data: any = {};
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
             _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
-            const data2: any = {};
             if (args.length > 0) {
-                Object.assign(data2, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
-            xData.copy(data2);
+            xData.copy(args[0].srfkey);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }

app_web/src/pages/uaa/sys-useredit-view/sys-useredit-view-base.vue

@@ -899,14 +899,14 @@ export default class SYS_USEREditViewBase extends Vue {
             const data: any = {};
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
             _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
-            const data2: any = {};
             if (args.length > 0) {
-                Object.assign(data2, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
-            xData.copy(data2);
+            xData.copy(args[0].srfkey);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }

app_web/src/pages/uaa/sys-useredit-view2/sys-useredit-view2-base.vue

@@ -931,14 +931,14 @@ export default class SYS_USEREditView2Base extends Vue {
             const data: any = {};
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
             _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
-            const data2: any = {};
             if (args.length > 0) {
-                Object.assign(data2, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
-            xData.copy(data2);
+            xData.copy(args[0].srfkey);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }

app_web/src/pages/uaa/sys-usergrid-view/sys-usergrid-view-base.vue

@@ -956,6 +956,9 @@ export default class SYS_USERGridViewBase extends Vue {
      */
     public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
         const data: any = {};
+        if(args[0].srfsourcekey){
+            data.srfsourcekey = args[0].srfsourcekey;
+        }
         let curViewParam = JSON.parse(JSON.stringify(this.context));
         if(args.length >0){
             Object.assign(curViewParam,args[0]);
@@ -1098,14 +1101,14 @@ export default class SYS_USERGridViewBase extends Vue {
             const data: any = {};
             if (args.length > 0) {
                 Object.assign(data, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
             _this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
         } else if (xData && xData.copy instanceof Function) {
-            const data2: any = {};
             if (args.length > 0) {
-                Object.assign(data2, { srfsourcekey: args[0].srfkey })
+                actionContext.$store.commit('addCopyData', { srfkey: args[0].srfkey, copyData: args[0] });
             }
-            xData.copy(data2);
+            xData.copy(args[0].srfkey);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }

app_web/src/store/getters.ts

@@ -75,4 +75,17 @@ export const getZIndex = (state: any) => () => {
  */
 export const getViewSplit = (state: any) => (viewUID: string) => {
   return state.viewSplit[viewUID];
+}
+
+/**
+ * 获取拷贝数据
+ * 
+ * @param state 
+ */
+export const getCopyData = (state: any) => (srfkey: string) => {
+  let copyData = state.copyDataMap[srfkey];
+  if(copyData){
+      delete state.copyDataMap[srfkey];
+  }
+  return copyData;
 }
\ No newline at end of file

app_web/src/store/mutations.ts

@@ -253,4 +253,16 @@ export const updateZIndex = (state: any, zIndex: number) => {
  */
 export const setViewSplit = (state: any, args: {viewSplit: number,viewUID:string}) => {
   state.viewSplit[args.viewUID] = args.viewSplit;
+}
+
+/**
+ * 添加拷贝数据
+ * 
+ * @param state 
+ * @param localdata 
+ */
+export const addCopyData = (state: any, args: {srfkey: string,copyData: any}) => {
+  if(args && args.srfkey && args.copyData){
+      state.copyDataMap[args.srfkey] = JSON.parse(JSON.stringify(args.copyData));
+  }
 }
\ No newline at end of file

app_web/src/store/state.ts

@@ -13,4 +13,5 @@ export const rootstate: any = {
     localdata: {},
     zIndex: 300,
     viewSplit: {},
+    copyDataMap:{},
 }
\ No newline at end of file

app_web/src/widgets/sys-permission/main-form/main-form-base.vue

@@ -873,7 +873,11 @@ export default class MainBase extends Vue implements ControlInterface {
                     this.load(data);
                 }
                 if (Object.is('loaddraft', action)) {
-                    this.loadDraft(data);
+                    if(this.context.srfsourcekey){
+                        this.copy(this.context.srfsourcekey);
+                    }else{
+                        this.loadDraft(data);
+                    }
                 }
                 if (Object.is('save', action)) {
                     this.save(data,data.showResultInfo);
@@ -937,8 +941,18 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {*} [arg={}]
      * @memberof @memberof Main
      */
-    public copy(arg: any = {}): void {
-        this.loadDraft(arg);
+    public copy(srfkey: string): void {
+        let copyData = this.$store.getters.getCopyData(srfkey);
+        copyData.srfkey = Util.createUUID();
+        copyData.sys_permission = copyData.srfkey;
+        copyData.permissionid = copyData.srfkey;
+        Object.assign(this.context,{sys_permission:copyData.sys_permission})
+        this.data = copyData;
+        this.$nextTick(() => {
+          this.formState.next({ type: 'load', data: copyData });
+          this.data.srfuf = '0';
+          this.setFormEnableCond(this.data);
+        });
     }
 
     /**

app_web/src/widgets/sys-role-permission/main-form/main-form-base.vue

@@ -965,7 +965,11 @@ export default class MainBase extends Vue implements ControlInterface {
                     this.load(data);
                 }
                 if (Object.is('loaddraft', action)) {
-                    this.loadDraft(data);
+                    if(this.context.srfsourcekey){
+                        this.copy(this.context.srfsourcekey);
+                    }else{
+                        this.loadDraft(data);
+                    }
                 }
                 if (Object.is('save', action)) {
                     this.save(data,data.showResultInfo);
@@ -1029,8 +1033,18 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {*} [arg={}]
      * @memberof @memberof Main
      */
-    public copy(arg: any = {}): void {
-        this.loadDraft(arg);
+    public copy(srfkey: string): void {
+        let copyData = this.$store.getters.getCopyData(srfkey);
+        copyData.srfkey = Util.createUUID();
+        copyData.sys_role_permission = copyData.srfkey;
+        copyData.rolepermissionid = copyData.srfkey;
+        Object.assign(this.context,{sys_role_permission:copyData.sys_role_permission})
+        this.data = copyData;
+        this.$nextTick(() => {
+          this.formState.next({ type: 'load', data: copyData });
+          this.data.srfuf = '0';
+          this.setFormEnableCond(this.data);
+        });
     }
 
     /**

app_web/src/widgets/sys-role/main-form/main-form-base.vue

@@ -982,7 +982,11 @@ export default class MainBase extends Vue implements ControlInterface {
                     this.load(data);
                 }
                 if (Object.is('loaddraft', action)) {
-                    this.loadDraft(data);
+                    if(this.context.srfsourcekey){
+                        this.copy(this.context.srfsourcekey);
+                    }else{
+                        this.loadDraft(data);
+                    }
                 }
                 if (Object.is('save', action)) {
                     this.save(data,data.showResultInfo);
@@ -1046,8 +1050,18 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {*} [arg={}]
      * @memberof @memberof Main
      */
-    public copy(arg: any = {}): void {
-        this.loadDraft(arg);
+    public copy(srfkey: string): void {
+        let copyData = this.$store.getters.getCopyData(srfkey);
+        copyData.srfkey = Util.createUUID();
+        copyData.sys_role = copyData.srfkey;
+        copyData.roleid = copyData.srfkey;
+        Object.assign(this.context,{sys_role:copyData.sys_role})
+        this.data = copyData;
+        this.$nextTick(() => {
+          this.formState.next({ type: 'load', data: copyData });
+          this.data.srfuf = '0';
+          this.setFormEnableCond(this.data);
+        });
     }
 
     /**

app_web/src/widgets/sys-user-role/main-form/main-form-base.vue

@@ -1006,7 +1006,11 @@ export default class MainBase extends Vue implements ControlInterface {
                     this.load(data);
                 }
                 if (Object.is('loaddraft', action)) {
-                    this.loadDraft(data);
+                    if(this.context.srfsourcekey){
+                        this.copy(this.context.srfsourcekey);
+                    }else{
+                        this.loadDraft(data);
+                    }
                 }
                 if (Object.is('save', action)) {
                     this.save(data,data.showResultInfo);
@@ -1070,8 +1074,18 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {*} [arg={}]
      * @memberof @memberof Main
      */
-    public copy(arg: any = {}): void {
-        this.loadDraft(arg);
+    public copy(srfkey: string): void {
+        let copyData = this.$store.getters.getCopyData(srfkey);
+        copyData.srfkey = Util.createUUID();
+        copyData.sys_user_role = copyData.srfkey;
+        copyData.userroleid = copyData.srfkey;
+        Object.assign(this.context,{sys_user_role:copyData.sys_user_role})
+        this.data = copyData;
+        this.$nextTick(() => {
+          this.formState.next({ type: 'load', data: copyData });
+          this.data.srfuf = '0';
+          this.setFormEnableCond(this.data);
+        });
     }
 
     /**

app_web/src/widgets/sys-user/main-form/main-form-base.vue

@@ -883,7 +883,11 @@ export default class MainBase extends Vue implements ControlInterface {
                     this.load(data);
                 }
                 if (Object.is('loaddraft', action)) {
-                    this.loadDraft(data);
+                    if(this.context.srfsourcekey){
+                        this.copy(this.context.srfsourcekey);
+                    }else{
+                        this.loadDraft(data);
+                    }
                 }
                 if (Object.is('save', action)) {
                     this.save(data,data.showResultInfo);
@@ -947,8 +951,18 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {*} [arg={}]
      * @memberof @memberof Main
      */
-    public copy(arg: any = {}): void {
-        this.loadDraft(arg);
+    public copy(srfkey: string): void {
+        let copyData = this.$store.getters.getCopyData(srfkey);
+        copyData.srfkey = Util.createUUID();
+        copyData.sys_user = copyData.srfkey;
+        copyData.userid = copyData.srfkey;
+        Object.assign(this.context,{sys_user:copyData.sys_user})
+        this.data = copyData;
+        this.$nextTick(() => {
+          this.formState.next({ type: 'load', data: copyData });
+          this.data.srfuf = '0';
+          this.setFormEnableCond(this.data);
+        });
     }
 
     /**

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibzuaa/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzuaa/
-      mvn clean package -Papi
-      cd ibzuaa-provider/ibzuaa-provider-api
-      mvn -Papi docker:build
-      mvn -Papi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-provider-api.yaml ibzlab-rt --with-registry-auth      
+      mvn clean package -Pweb
+      cd ibzuaa-app/ibzuaa-app-web
+      mvn -Pweb docker:build
+      mvn -Pweb docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-app-web.yaml ibzlab-rt --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzuaa-app/ibzuaa-app-web/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-app-web.jar
 
-EXPOSE 8080
+EXPOSE 30002
 
 ADD ibzuaa-app-web.jar /ibzuaa-app-web.jar

ibzuaa-app/ibzuaa-app-web/src/main/docker/ibzuaa-app-web.yaml

@@ -3,9 +3,11 @@ services:
   ibzuaa-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
     ports:
-      - "8080:8080"
+      - "30002:30002"
     networks:
       - agent_network
+    environment:
+      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-api.jar
 
-EXPOSE 40002
+EXPOSE 8081
 
 ADD ibzuaa-provider-api.jar /ibzuaa-provider-api.jar

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/ibzuaa-provider-api.yaml

@@ -3,11 +3,9 @@ services:
   ibzuaa-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
     ports:
-      - "40002:40002"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1