ibiz4j 发布系统代码

app_web/src/components/app-picker/app-picker.vue

@@ -350,7 +350,7 @@ export default class AppPicker extends Vue {
         if(this.sort && !Object.is(this.sort, "")) {
             Object.assign(_param, { sort: this.sort });
         }
-        Object.assign(_param, { query: query });
+        Object.assign(_param, { query: query, size: 1000 });
         // 错误信息国际化
         let error: string = (this.$t('components.appPicker.error') as any);
         let miss: string = (this.$t('components.appPicker.miss') as any);

app_web/src/components/dropdown-list-mpicker/dropdown-list-mpicker.vue

@@ -10,8 +10,8 @@
         :filterable="filterable === true ? true : false"
         @on-open-change="onClick"
         :placeholder="$t('components.dropDownListMpicker.placeholder')">
-        <i-option v-for="(item, index) in items" :key="index" :value="item.value.toString()" :label="item.text">
-          <Checkbox :value = "(currentVal.indexOf(item.value.toString()))==-1?false:true">
+        <i-option v-for="(item, index) in items" :key="index" :value="item.value" :label="item.text">
+          <Checkbox :value = "(currentVal.indexOf(item.value))==-1?false:true">
              {{Object.is(codelistType,'STATIC') ? $t('codelist.'+tag+'.'+item.value) : item.text}}
           </Checkbox>
         </i-option>
@@ -154,6 +154,13 @@ export default class DropDownListMpicker extends Vue {
      */
     public items: any[] = [];
 
+    /**
+     * 属性类型
+     * @type {string}
+     * @memberof DropDownList
+     */
+    @Prop() public valueType?: string;
+
     /**
      * 公共参数处理
      *
@@ -185,7 +192,8 @@ export default class DropDownListMpicker extends Vue {
       if(this.tag && Object.is(this.codelistType,"STATIC")){
           const codelist = this.$store.getters.getCodeList(this.tag);
           if (codelist) {
-              this.items = [...JSON.parse(JSON.stringify(codelist.items))];
+              let items: Array<any> = [...JSON.parse(JSON.stringify(codelist.items))];
+              this.formatCodeList(items);
           } else {
               console.log(`----${this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
           }
@@ -197,7 +205,8 @@ export default class DropDownListMpicker extends Vue {
           let _context = data.context;
           let _param = data.param;
           this.codeListService.getItems(this.tag,_context,_param).then((res:any) => {
-              this.items = res;
+            let items: Array<any> = [...res];
+            this.formatCodeList(items);
           }).catch((error:any) => {
               console.log(`----${this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
           });
@@ -219,13 +228,51 @@ export default class DropDownListMpicker extends Vue {
             let _context = data.context;
             let _param = data.param;
             this.codeListService.getItems(this.tag,_context,_param).then((res:any) => {
-                this.items = res;
+                let items: Array<any> = [...res];
+                this.formatCodeList(items);
             }).catch((error:any) => {
                 console.log(`----${this.tag}----${(this.$t('app.commonWords.codeNotExist') as string)}`);
             });
         }
     }
 
+    /**
+     * 代码表类型和属性匹配
+     * 
+     * @param {*} items
+     * @memberof DropDownList
+     */
+    public formatCodeList(items: Array<any>){
+        let matching: boolean = true;
+        this.items = [];
+        try{
+            if(this.valueType){
+                items.forEach((item: any)=>{
+                    const type = this.$util.typeOf(item.value);
+                    if(type != this.valueType){
+                        matching = false;
+                        if(type == 'number'){
+                            item.value = item.value.toString();
+                        }else{
+                            if(item.value.indexOf('.') == -1){
+                                item.value = parseInt(item.value);
+                            }else{
+                                item.value = parseFloat(item.value);
+                            }
+                        }
+                    }
+                    this.items.push(item);
+                });
+                if(!matching){
+                    console.warn(`代码表 ${ this.tag } 值类型和属性类型不匹配，已自动强制转换，请修正代码表值类型和属性类型匹配`);
+                }
+            }else{
+                this.items = items;
+            }
+        }catch(error){
+            console.warn('代码表值类型和属性类型不匹配，自动强制转换异常，请修正代码表值类型和属性类型匹配');
+        }
+    }
 }
 </script>
 

app_web/src/pages/uaa/index/index-base.vue

@@ -378,7 +378,7 @@ export default class IndexBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -386,7 +386,7 @@ export default class IndexBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

app_web/src/pages/uaa/sys-app-edit-view/sys-app-edit-view-base.vue

@@ -456,7 +456,7 @@ export default class SysAppEditViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -464,7 +464,7 @@ export default class SysAppEditViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

app_web/src/pages/uaa/sys-app-grid-view/sys-app-grid-view-base.vue

@@ -534,7 +534,7 @@ export default class SysAppGridViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -542,7 +542,7 @@ export default class SysAppGridViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

app_web/src/pages/uaa/sys-auth-log-grid-view/sys-auth-log-grid-view-base.vue

@@ -440,7 +440,7 @@ export default class SysAuthLogGridViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -448,7 +448,7 @@ export default class SysAuthLogGridViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -456,7 +456,7 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -464,7 +464,7 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -468,7 +468,7 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -476,7 +476,7 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -506,7 +506,7 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -514,7 +514,7 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -438,7 +438,7 @@ export default class SYS_PERMISSIONMPickupViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -446,7 +446,7 @@ export default class SYS_PERMISSIONMPickupViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

app_web/src/pages/uaa/sys-permissionpickup-grid-view/sys-permissionpickup-grid-view-base.vue

@@ -412,7 +412,7 @@ export default class SYS_PERMISSIONPickupGridViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -420,7 +420,7 @@ export default class SYS_PERMISSIONPickupGridViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -405,7 +405,7 @@ export default class SYS_PERMISSIONPickupViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -413,7 +413,7 @@ export default class SYS_PERMISSIONPickupViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -355,7 +355,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -363,7 +363,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -456,7 +456,7 @@ export default class SysRoleEditViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -464,7 +464,7 @@ export default class SysRoleEditViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -468,7 +468,7 @@ export default class SysRoleEditView2Base extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -476,7 +476,7 @@ export default class SysRoleEditView2Base extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -506,7 +506,7 @@ export default class SysRoleGridViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -514,7 +514,7 @@ export default class SysRoleGridViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -361,7 +361,7 @@ export default class SysRolePermissionCustomViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -369,7 +369,7 @@ export default class SysRolePermissionCustomViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -503,7 +503,7 @@ export default class SysRolePermissionGridViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -511,7 +511,7 @@ export default class SysRolePermissionGridViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -438,7 +438,7 @@ export default class SysRolePermissionMPickupViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -446,7 +446,7 @@ export default class SysRolePermissionMPickupViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -405,7 +405,7 @@ export default class SysRolePermissionPickupViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -413,7 +413,7 @@ export default class SysRolePermissionPickupViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -355,7 +355,7 @@ export default class SysRolePermissionRedirectViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -363,7 +363,7 @@ export default class SysRolePermissionRedirectViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -456,7 +456,7 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -464,7 +464,7 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -468,7 +468,7 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -476,7 +476,7 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -412,7 +412,7 @@ export default class SYS_ROLE_PERMISSIONPickupGridViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -420,7 +420,7 @@ export default class SYS_ROLE_PERMISSIONPickupGridViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -412,7 +412,7 @@ export default class SysRolePickupGridViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -420,7 +420,7 @@ export default class SysRolePickupGridViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -438,7 +438,7 @@ export default class SYS_ROLEMPickupViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -446,7 +446,7 @@ export default class SYS_ROLEMPickupViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -405,7 +405,7 @@ export default class SYS_ROLEPickupViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -413,7 +413,7 @@ export default class SYS_ROLEPickupViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -355,7 +355,7 @@ export default class SYS_ROLERedirectViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -363,7 +363,7 @@ export default class SYS_ROLERedirectViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -456,7 +456,7 @@ export default class SysUserEditViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -464,7 +464,7 @@ export default class SysUserEditViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -506,7 +506,7 @@ export default class SysUserGridViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -514,7 +514,7 @@ export default class SysUserGridViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -456,7 +456,7 @@ export default class SysUserRoleEditViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -464,7 +464,7 @@ export default class SysUserRoleEditViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -468,7 +468,7 @@ export default class SysUserRoleEditView2Base extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -476,7 +476,7 @@ export default class SysUserRoleEditView2Base extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -503,7 +503,7 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -511,7 +511,7 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -438,7 +438,7 @@ export default class SYS_USER_ROLEMPickupViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -446,7 +446,7 @@ export default class SYS_USER_ROLEMPickupViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -412,7 +412,7 @@ export default class SYS_USER_ROLEPickupGridViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -420,7 +420,7 @@ export default class SYS_USER_ROLEPickupGridViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -405,7 +405,7 @@ export default class SYS_USER_ROLEPickupViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -413,7 +413,7 @@ export default class SYS_USER_ROLEPickupViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -355,7 +355,7 @@ export default class SYS_USER_ROLERedirectViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -363,7 +363,7 @@ export default class SYS_USER_ROLERedirectViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -468,7 +468,7 @@ export default class SYS_USEREditView2Base extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -476,7 +476,7 @@ export default class SYS_USEREditView2Base extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -438,7 +438,7 @@ export default class SYS_USERMPickupViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -446,7 +446,7 @@ export default class SYS_USERMPickupViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

app_web/src/pages/uaa/sys-userpickup-grid-view/sys-userpickup-grid-view-base.vue

@@ -412,7 +412,7 @@ export default class SYS_USERPickupGridViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -420,7 +420,7 @@ export default class SYS_USERPickupGridViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -405,7 +405,7 @@ export default class SYS_USERPickupViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -413,7 +413,7 @@ export default class SYS_USERPickupViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -355,7 +355,7 @@ export default class SYS_USERRedirectViewBase extends Vue {
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -363,7 +363,7 @@ export default class SYS_USERRedirectViewBase extends Vue {
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

app_web/src/store/getters.ts

@@ -77,19 +77,6 @@ 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;
-}
-
 /**
  * 获取单位数据
  * 

app_web/src/store/mutations.ts

@@ -255,18 +255,6 @@ 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));
-  }
-}
-
 /**
  * 添加单位数据
  * 

app_web/src/store/state.ts

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

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

@@ -1256,11 +1256,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     this.load(data);
                 }
                 if (Object.is('loaddraft', action)) {
-                    if(this.context.srfsourcekey){
-                        this.copy(this.context.srfsourcekey);
-                    }else{
-                        this.loadDraft(data);
-                    }
+                    this.loadDraft(data);
                 }
                 if (Object.is('save', action)) {
                     this.save(data,data.showResultInfo);
@@ -1318,26 +1314,6 @@ export default class MainBase extends Vue implements ControlInterface {
         }
     }
 
-    /**
-     * 拷贝内容
-     *
-     * @param {*} [arg={}]
-     * @memberof @memberof MainBase
-     */
-    public copy(srfkey: string): void {
-        let copyData = this.$store.getters.getCopyData(srfkey);
-        copyData.srfkey = Util.createUUID();
-        copyData.sysapp = copyData.srfkey;
-        copyData.id = copyData.srfkey;
-        Object.assign(this.context,{sysapp:copyData.sysapp})
-        this.data = copyData;
-        this.$nextTick(() => {
-          this.formState.next({ type: 'load', data: copyData });
-          this.data.srfuf = '0';
-          this.setFormEnableCond(this.data);
-        });
-    }
-
     /**
      *打印
      *@memberof @memberof MainBase
@@ -1566,6 +1542,9 @@ export default class MainBase extends Vue implements ControlInterface {
                     return;
                 }
             }
+            if(this.viewparams && this.viewparams.copymode){
+                data.srfuf = '0';
+            }
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
@@ -1573,9 +1552,6 @@ export default class MainBase extends Vue implements ControlInterface {
                 return;
             }
             Object.assign(arg,{viewparams:this.viewparams});
-            if(this.viewparams && this.viewparams.copymode){
-                data.srfuf = '0';
-            }
             const post: Promise<any> = Object.is(data.srfuf, '1')?this.service.update(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(action,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
             post.then((response: any) => {
                 if (!response.status || response.status !== 200) {

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

@@ -1016,11 +1016,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     this.load(data);
                 }
                 if (Object.is('loaddraft', action)) {
-                    if(this.context.srfsourcekey){
-                        this.copy(this.context.srfsourcekey);
-                    }else{
-                        this.loadDraft(data);
-                    }
+                    this.loadDraft(data);
                 }
                 if (Object.is('save', action)) {
                     this.save(data,data.showResultInfo);
@@ -1078,26 +1074,6 @@ export default class MainBase extends Vue implements ControlInterface {
         }
     }
 
-    /**
-     * 拷贝内容
-     *
-     * @param {*} [arg={}]
-     * @memberof @memberof MainBase
-     */
-    public copy(srfkey: string): void {
-        let copyData = this.$store.getters.getCopyData(srfkey);
-        copyData.srfkey = Util.createUUID();
-        copyData.syspermission = copyData.srfkey;
-        copyData.permissionid = copyData.srfkey;
-        Object.assign(this.context,{syspermission:copyData.syspermission})
-        this.data = copyData;
-        this.$nextTick(() => {
-          this.formState.next({ type: 'load', data: copyData });
-          this.data.srfuf = '0';
-          this.setFormEnableCond(this.data);
-        });
-    }
-
     /**
      *打印
      *@memberof @memberof MainBase
@@ -1325,6 +1301,9 @@ export default class MainBase extends Vue implements ControlInterface {
                     return;
                 }
             }
+            if(this.viewparams && this.viewparams.copymode){
+                data.srfuf = '0';
+            }
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
@@ -1332,9 +1311,6 @@ export default class MainBase extends Vue implements ControlInterface {
                 return;
             }
             Object.assign(arg,{viewparams:this.viewparams});
-            if(this.viewparams && this.viewparams.copymode){
-                data.srfuf = '0';
-            }
             const post: Promise<any> = Object.is(data.srfuf, '1')?this.service.update(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(action,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
             post.then((response: any) => {
                 if (!response.status || response.status !== 200) {

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

@@ -1133,11 +1133,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     this.load(data);
                 }
                 if (Object.is('loaddraft', action)) {
-                    if(this.context.srfsourcekey){
-                        this.copy(this.context.srfsourcekey);
-                    }else{
-                        this.loadDraft(data);
-                    }
+                    this.loadDraft(data);
                 }
                 if (Object.is('save', action)) {
                     this.save(data,data.showResultInfo);
@@ -1195,26 +1191,6 @@ export default class MainBase extends Vue implements ControlInterface {
         }
     }
 
-    /**
-     * 拷贝内容
-     *
-     * @param {*} [arg={}]
-     * @memberof @memberof MainBase
-     */
-    public copy(srfkey: string): void {
-        let copyData = this.$store.getters.getCopyData(srfkey);
-        copyData.srfkey = Util.createUUID();
-        copyData.sysrolepermission = copyData.srfkey;
-        copyData.rolepermissionid = copyData.srfkey;
-        Object.assign(this.context,{sysrolepermission:copyData.sysrolepermission})
-        this.data = copyData;
-        this.$nextTick(() => {
-          this.formState.next({ type: 'load', data: copyData });
-          this.data.srfuf = '0';
-          this.setFormEnableCond(this.data);
-        });
-    }
-
     /**
      *打印
      *@memberof @memberof MainBase
@@ -1442,6 +1418,9 @@ export default class MainBase extends Vue implements ControlInterface {
                     return;
                 }
             }
+            if(this.viewparams && this.viewparams.copymode){
+                data.srfuf = '0';
+            }
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
@@ -1449,9 +1428,6 @@ export default class MainBase extends Vue implements ControlInterface {
                 return;
             }
             Object.assign(arg,{viewparams:this.viewparams});
-            if(this.viewparams && this.viewparams.copymode){
-                data.srfuf = '0';
-            }
             const post: Promise<any> = Object.is(data.srfuf, '1')?this.service.update(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(action,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
             post.then((response: any) => {
                 if (!response.status || response.status !== 200) {

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

@@ -1232,11 +1232,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     this.load(data);
                 }
                 if (Object.is('loaddraft', action)) {
-                    if(this.context.srfsourcekey){
-                        this.copy(this.context.srfsourcekey);
-                    }else{
-                        this.loadDraft(data);
-                    }
+                    this.loadDraft(data);
                 }
                 if (Object.is('save', action)) {
                     this.save(data,data.showResultInfo);
@@ -1294,26 +1290,6 @@ export default class MainBase extends Vue implements ControlInterface {
         }
     }
 
-    /**
-     * 拷贝内容
-     *
-     * @param {*} [arg={}]
-     * @memberof @memberof MainBase
-     */
-    public copy(srfkey: string): void {
-        let copyData = this.$store.getters.getCopyData(srfkey);
-        copyData.srfkey = Util.createUUID();
-        copyData.sysrole = copyData.srfkey;
-        copyData.roleid = copyData.srfkey;
-        Object.assign(this.context,{sysrole:copyData.sysrole})
-        this.data = copyData;
-        this.$nextTick(() => {
-          this.formState.next({ type: 'load', data: copyData });
-          this.data.srfuf = '0';
-          this.setFormEnableCond(this.data);
-        });
-    }
-
     /**
      *打印
      *@memberof @memberof MainBase
@@ -1541,6 +1517,9 @@ export default class MainBase extends Vue implements ControlInterface {
                     return;
                 }
             }
+            if(this.viewparams && this.viewparams.copymode){
+                data.srfuf = '0';
+            }
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
@@ -1548,9 +1527,6 @@ export default class MainBase extends Vue implements ControlInterface {
                 return;
             }
             Object.assign(arg,{viewparams:this.viewparams});
-            if(this.viewparams && this.viewparams.copymode){
-                data.srfuf = '0';
-            }
             const post: Promise<any> = Object.is(data.srfuf, '1')?this.service.update(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(action,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
             post.then((response: any) => {
                 if (!response.status || response.status !== 200) {

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

@@ -1157,11 +1157,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     this.load(data);
                 }
                 if (Object.is('loaddraft', action)) {
-                    if(this.context.srfsourcekey){
-                        this.copy(this.context.srfsourcekey);
-                    }else{
-                        this.loadDraft(data);
-                    }
+                    this.loadDraft(data);
                 }
                 if (Object.is('save', action)) {
                     this.save(data,data.showResultInfo);
@@ -1219,26 +1215,6 @@ export default class MainBase extends Vue implements ControlInterface {
         }
     }
 
-    /**
-     * 拷贝内容
-     *
-     * @param {*} [arg={}]
-     * @memberof @memberof MainBase
-     */
-    public copy(srfkey: string): void {
-        let copyData = this.$store.getters.getCopyData(srfkey);
-        copyData.srfkey = Util.createUUID();
-        copyData.sysuserrole = copyData.srfkey;
-        copyData.userroleid = copyData.srfkey;
-        Object.assign(this.context,{sysuserrole:copyData.sysuserrole})
-        this.data = copyData;
-        this.$nextTick(() => {
-          this.formState.next({ type: 'load', data: copyData });
-          this.data.srfuf = '0';
-          this.setFormEnableCond(this.data);
-        });
-    }
-
     /**
      *打印
      *@memberof @memberof MainBase
@@ -1467,6 +1443,9 @@ export default class MainBase extends Vue implements ControlInterface {
                     return;
                 }
             }
+            if(this.viewparams && this.viewparams.copymode){
+                data.srfuf = '0';
+            }
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
@@ -1474,9 +1453,6 @@ export default class MainBase extends Vue implements ControlInterface {
                 return;
             }
             Object.assign(arg,{viewparams:this.viewparams});
-            if(this.viewparams && this.viewparams.copymode){
-                data.srfuf = '0';
-            }
             const post: Promise<any> = Object.is(data.srfuf, '1')?this.service.update(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(action,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
             post.then((response: any) => {
                 if (!response.status || response.status !== 200) {

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

@@ -1182,11 +1182,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     this.load(data);
                 }
                 if (Object.is('loaddraft', action)) {
-                    if(this.context.srfsourcekey){
-                        this.copy(this.context.srfsourcekey);
-                    }else{
-                        this.loadDraft(data);
-                    }
+                    this.loadDraft(data);
                 }
                 if (Object.is('save', action)) {
                     this.save(data,data.showResultInfo);
@@ -1244,26 +1240,6 @@ export default class MainBase extends Vue implements ControlInterface {
         }
     }
 
-    /**
-     * 拷贝内容
-     *
-     * @param {*} [arg={}]
-     * @memberof @memberof MainBase
-     */
-    public copy(srfkey: string): void {
-        let copyData = this.$store.getters.getCopyData(srfkey);
-        copyData.srfkey = Util.createUUID();
-        copyData.sysuser = copyData.srfkey;
-        copyData.userid = copyData.srfkey;
-        Object.assign(this.context,{sysuser:copyData.sysuser})
-        this.data = copyData;
-        this.$nextTick(() => {
-          this.formState.next({ type: 'load', data: copyData });
-          this.data.srfuf = '0';
-          this.setFormEnableCond(this.data);
-        });
-    }
-
     /**
      *打印
      *@memberof @memberof MainBase
@@ -1492,6 +1468,9 @@ export default class MainBase extends Vue implements ControlInterface {
                     return;
                 }
             }
+            if(this.viewparams && this.viewparams.copymode){
+                data.srfuf = '0';
+            }
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
@@ -1499,9 +1478,6 @@ export default class MainBase extends Vue implements ControlInterface {
                 return;
             }
             Object.assign(arg,{viewparams:this.viewparams});
-            if(this.viewparams && this.viewparams.copymode){
-                data.srfuf = '0';
-            }
             const post: Promise<any> = Object.is(data.srfuf, '1')?this.service.update(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(action,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
             post.then((response: any) => {
                 if (!response.status || response.status !== 200) {

ibzuaa-provider/ibzuaa-provider-api/src/main/resources/application.yml

+spring:
+  profiles:
+    include: sys ,nacos, api-prod
+  application:
+    name: ibzuaa-api
\ No newline at end of file