Merge branch 'dev' of http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuemobr7res into dev

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

@@ -281,10 +281,10 @@ export default class AppFormDRUIPart extends Vue {
     Object.assign(_context, { [this.paramItem]: _paramitem });
     //设置顶层视图唯一标识
     Object.assign(_context, this.context);
-
-    const { context: navigateContext, param: navigateParam }= this.$viewTool.formatNavigateParam({ context: this.navigateContext, param: this.navigateParam }, _context, this.viewparams, this.data);
-    Object.assign(this.tempContext, navigateContext);
-    Object.assign(this.tempViewParams, navigateParam);
+    // 导航参数处理
+    const {context, param}= this.$viewTool.formatNavigateParam(this.navigateContext, this.navigateParam, _context, this.viewparams, this.data);    
+    Object.assign(this.tempContext, context);
+    Object.assign(this.tempViewParams, param);
 
     if (this.isRelationalData) {
       if (!_paramitem || _paramitem == null || Object.is(_paramitem, "")) {

src/components/app-mob-check-list/app-mob-check-list.vue

@@ -180,10 +180,10 @@
         if (!this.data) {
             return false;
         }
-        // 附加参数处理
-        const param = this.$viewTool.formatNavigateParam({context:this.navigateContext,param:this.navigateParam},this.context,this.viewparams,this.data);
-        Object.assign(arg.context,param.context);
-        Object.assign(arg.param,param.param);
+        // 导航参数处理
+        const {context, param} = this.$viewTool.formatNavigateParam( this.navigateContext, this.navigateParam, this.context, this.viewparams, this.data );
+        Object.assign(arg.context, context);
+        Object.assign(arg.param, param);
         return true;
     }
 

src/components/app-mob-mpicker/app-mob-mpicker.vue

@@ -236,10 +236,10 @@ export default class AppMobMpicker extends Vue {
         if (!this.data) {
             return false;
         }
-        // 附加参数处理
-        const param = this.$viewTool.formatNavigateParam({context:this.navigateContext,param:this.navigateParam},this.context,this.viewparams,this.data);
-        Object.assign(arg.context,param.context);
-        Object.assign(arg.param,param.param);
+        // 导航参数处理
+        const {context, param} = this.$viewTool.formatNavigateParam( this.navigateContext, this.navigateParam, this.context, this.viewparams, this.data );
+        Object.assign(arg.context, context);
+        Object.assign(arg.param, param);
         return true;
     }
 

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

@@ -683,10 +683,10 @@ export default class AppPicker extends Vue {
         if (!this.data) {
             return false;
         }
-        // 附加参数处理
-        const param = this.$viewTool.formatNavigateParam({ context: this.navigateContext, param: this.navigateParam }, this.context, this.viewparams, this.data);
-        Object.assign(arg.context, param.context);
-        Object.assign(arg.param, param.param);
+        // 导航参数处理
+        const {context, param} = this.$viewTool.formatNavigateParam( this.navigateContext, this.navigateParam, this.context, this.viewparams, this.data );
+        Object.assign(arg.context, context);
+        Object.assign(arg.param, param);
         return true;
     }
 

src/components/app-mob-select-drop-down/app-mob-select-drop-down.vue

@@ -643,10 +643,10 @@ export default class AppSelectDropDown extends Vue {
         if (!this.data) {
             return false;
         }
-        // 附加参数处理
-        const param = this.$viewTool.formatNavigateParam({ context: this.navigateContext, param: this.navigateParam }, this.context, this.viewparams, this.data);
-        Object.assign(arg.context, param.context);
-        Object.assign(arg.param, param.param);
+        // 导航参数处理
+        const {context, param} = this.$viewTool.formatNavigateParam( this.navigateContext, this.navigateParam, this.context, this.viewparams, this.data );
+        Object.assign(arg.context, context);
+        Object.assign(arg.param, param);
         return true;
     }
 

src/components/app-mob-select/app-mob-select.vue

@@ -219,9 +219,9 @@ export default class AppSelect extends Vue {
             return false;
         }
         // 附加参数处理
-        const param = this.$viewTool.formatNavigateParam({context:this.navigateContext,param:this.navigateParam},this.context,this.viewparams,this.data);
-        Object.assign(arg.context,param.context);
-        Object.assign(arg.param,param.param);
+        const {context, param} = this.$viewTool.formatNavigateParam( this.navigateContext, this.navigateParam, this.context, this.viewparams, this.data );
+        Object.assign( arg.context, context );
+        Object.assign( arg.param, param );
         return true;
     }
 }