数据选择，动态代码表，自动完成类编辑器上下文参数处理

src/components/app-autocomplete/app-autocomplete.vue

@@ -100,12 +100,20 @@ export default class AppAutocomplete extends Vue {
     @Prop() public name!: string;
 
     /**
-     * 编辑器参数
-     *
-     * @type {string}
+     * 局部上下文导航参数
+     * 
+     * @type {any}
      * @memberof AppAutocomplete
      */
-    @Prop() public itemParam?: any;
+    @Prop() public localContext!:any;
+
+    /**
+     * 局部导航参数
+     * 
+     * @type {any}
+     * @memberof AppAutocomplete
+     */
+    @Prop() public localParam!:any;
 
     /**
      * 值项名称
@@ -119,7 +127,7 @@ export default class AppAutocomplete extends Vue {
      * 值
      *
      * @type {*}
-     * @memberof AppPicker
+     * @memberof AppAutocomplete
      */
     @Model('change') public value?: any;
 
@@ -127,7 +135,7 @@ export default class AppAutocomplete extends Vue {
      * 当前值
      *
      * @type {string}
-     * @memberof AppPicker
+     * @memberof AppAutocomplete
      */
     public curvalue: string = '';
 
@@ -160,7 +168,7 @@ export default class AppAutocomplete extends Vue {
      *
      * @param {*} newVal
      * @param {*} oldVal
-     * @memberof AppPicker
+     * @memberof AppAutocomplete
      */
     @Watch('value')
     public onValueChange(newVal: any, oldVal: any) {
@@ -277,19 +285,19 @@ export default class AppAutocomplete extends Vue {
      */
     public handlePublicParams(arg: any): boolean {
         if (!this.data) {
-            this.$Notice.error({ title: (this.$t('components.appPicker.error') as any), desc: (this.$t('components.appPicker.formdataException') as any) });
+            this.$Notice.error({ title: (this.$t('components.AppAutocomplete.error') as any), desc: (this.$t('components.AppAutocomplete.formdataException') as any) });
             return false;
         }
         // 合并表单参数
         arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {};
         arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {};
         // 附加参数处理
-        if (this.itemParam && this.itemParam.context) {
-          let _context = this.$util.formatData(this.data,arg.context,this.itemParam.context);
+        if (this.localContext && Object.keys(this.localContext).length >0) {
+            let _context = this.$util.computedNavData(this.data,arg.context,arg.param,this.localContext);
             Object.assign(arg.context,_context);
         }
-        if (this.itemParam && this.itemParam.param) {
-          let _param = this.$util.formatData(this.data,arg.param,this.itemParam.param);
+        if (this.localParam && Object.keys(this.localParam).length >0) {
+            let _param = this.$util.computedNavData(this.data,arg.param,arg.param,this.localParam);
             Object.assign(arg.param,_param);
         }
         return true;

src/components/app-checkbox-list/app-checkbox-list.vue

@@ -57,23 +57,31 @@ export default class AppCheckBox extends Vue {
      * 传入表单数据
      *
      * @type {*}
-     * @memberof DropDownList
+     * @memberof AppCheckBox
      */
     @Prop() public data?: any;
 
     /**
-     * 传入额外参数
-     *
-     * @type {*}
-     * @memberof DropDownList
+     * 局部上下文导航参数
+     * 
+     * @type {any}
+     * @memberof AppCheckBox
+     */
+    @Prop() public localContext!:any;
+
+    /**
+     * 局部导航参数
+     * 
+     * @type {any}
+     * @memberof AppCheckBox
      */
-    @Prop() public itemParam?: any;
+    @Prop() public localParam!:any;
 
     /**
      * 视图上下文
      *
      * @type {*}
-     * @memberof AppAutocomplete
+     * @memberof AppCheckBox
      */
     @Prop() public context!: any;
 
@@ -81,7 +89,7 @@ export default class AppCheckBox extends Vue {
      * 视图参数
      *
      * @type {*}
-     * @memberof AppFormDRUIPart
+     * @memberof AppCheckBox
      */
     @Prop() public viewparams!: any;
 
@@ -203,19 +211,19 @@ export default class AppCheckBox extends Vue {
      *
      * @param {*} arg
      * @returns
-     * @memberof DropDownList
+     * @memberof AppCheckBox
      */
     public handlePublicParams(arg: any) {
         // 合并表单参数
         arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {};
         arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {};
         // 附加参数处理
-        if (this.itemParam && this.itemParam.context) {
-          let _context = this.$util.formatData(this.data,arg.context,this.itemParam.context);
+        if (this.localContext && Object.keys(this.localContext).length >0) {
+            let _context = this.$util.computedNavData(this.data,arg.context,arg.param,this.localContext);
             Object.assign(arg.context,_context);
         }
-        if (this.itemParam && this.itemParam.param) {
-          let _param = this.$util.formatData(this.data,arg.param,this.itemParam.param);
+        if (this.localParam && Object.keys(this.localParam).length >0) {
+            let _param = this.$util.computedNavData(this.data,arg.param,arg.param,this.localParam);
             Object.assign(arg.param,_param);
         }
     }
@@ -253,7 +261,7 @@ export default class AppCheckBox extends Vue {
     /**
      * 监听表单数据变化
      * 
-     * @memberof AppOrgSelect
+     * @memberof AppCheckBox
      */
     @Watch('data',{immediate:true,deep:true})
     onDataChange(newVal: any, oldVal: any) {

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

@@ -62,7 +62,7 @@ export default class AppEmbedPicker extends Vue {
      * 表单数据
      *
      * @type {*}
-     * @memberof AppPicker
+     * @memberof AppEmbedPicker
      */
     @Prop() public data!: any;
 
@@ -95,7 +95,7 @@ export default class AppEmbedPicker extends Vue {
      * 值项名称
      *
      * @type {string}
-     * @memberof AppPicker
+     * @memberof AppEmbedPicker
      */
     @Prop() public valueItem?: string;
 
@@ -103,7 +103,7 @@ export default class AppEmbedPicker extends Vue {
      * 关联视图名称
      *
      * @type {string}
-     * @memberof AppPicker
+     * @memberof AppEmbedPicker
      */
     @Prop() public refviewname?: string;
 
@@ -127,17 +127,25 @@ export default class AppEmbedPicker extends Vue {
      * 属性项名称
      *
      * @type {string}
-     * @memberof AppPicker
+     * @memberof AppEmbedPicker
      */
     @Prop() public name!: string;
 
     /**
-     * 关联视图参数
-     *
-     * @type {*}
+     * 局部上下文导航参数
+     * 
+     * @type {any}
      * @memberof AppEmbedPicker
      */
-    @Prop() public itemParam: any;
+    @Prop() public localContext!:any;
+
+    /**
+     * 局部导航参数
+     * 
+     * @type {any}
+     * @memberof AppEmbedPicker
+     */
+    @Prop() public localParam!:any;
 
     /**
      * 是否忽略之变化
@@ -160,8 +168,8 @@ export default class AppEmbedPicker extends Vue {
      *
      * @memberof AppEmbedPicker
      */
-    public setViewParam(activeData: any) {
-        if (!this.itemParam || !activeData) {
+    public setViewParam() {
+        if (!this.data) {
             return;
         }
         let arg: any = {};
@@ -169,17 +177,13 @@ export default class AppEmbedPicker extends Vue {
         let param: any = JSON.parse(JSON.stringify(this.viewparams));
         let context: any = JSON.parse(JSON.stringify(this.context));
         // 附加参数处理
-        if (this.itemParam.context) {
-            let _context = this.$util.formatData(activeData,context,this.itemParam.context);
-            Object.assign(context,_context);
-        }
-        if (this.itemParam.param) {
-            let _param = this.$util.formatData(activeData,param,this.itemParam.param);
-            Object.assign(param,_param);
+         if (this.localContext && Object.keys(this.localContext).length >0) {
+            let _context = this.$util.computedNavData(this.data,arg.context,arg.param,this.localContext);
+            Object.assign(arg.context,_context);
         }
-        if (this.itemParam.parentdata) {
-            let _parentdata = this.$util.formatData(activeData,param,this.itemParam.parentdata);
-            Object.assign(param,_parentdata);
+        if (this.localParam && Object.keys(this.localParam).length >0) {
+            let _param = this.$util.computedNavData(this.data,arg.param,arg.param,this.localParam);
+            Object.assign(arg.param,_param);
         }
         this.viewdata = JSON.stringify(context);
         this.viewparam = JSON.stringify(param);
@@ -196,7 +200,7 @@ export default class AppEmbedPicker extends Vue {
     onActivedataChange(newVal: any, oldVal: any) {
         const newFormData: any = JSON.parse(newVal);
         const oldDormData: any = JSON.parse(oldVal);
-        this.setViewParam(newFormData);
+        this.setViewParam();
         if (!this.refreshitems || this.ignorefieldvaluechange) {
             return;
         }
@@ -215,7 +219,7 @@ export default class AppEmbedPicker extends Vue {
         if(this.formState) {
             this.formStateEvent = this.formState.subscribe(({ tag, action, data }) => {
                 if (Object.is('load', action)) {
-                    this.setViewParam(JSON.parse(this.data));
+                    this.setViewParam();
                 }
             });
         }

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

@@ -45,12 +45,20 @@ export default class AppMpicker extends Vue {
     @Prop() curvalue?: any;
 
     /**
-     * 表单项参数
+     * 局部上下文导航参数
      * 
      * @type {any}
-     * @memberof AppPicker
+     * @memberof AppMpicker
+     */
+    @Prop() public localContext!:any;
+
+    /**
+     * 局部导航参数
+     * 
+     * @type {any}
+     * @memberof AppMpicker
      */
-    @Prop() public itemParam: any;
+    @Prop() public localParam!:any;
 
     /**
      * 表单项名称
@@ -61,7 +69,7 @@ export default class AppMpicker extends Vue {
      * 视图上下文
      *
      * @type {*}
-     * @memberof AppFormDRUIPart
+     * @memberof AppMpicker
      */
     @Prop() public context!: any;
 
@@ -69,7 +77,7 @@ export default class AppMpicker extends Vue {
      * 视图参数
      *
      * @type {*}
-     * @memberof AppFormDRUIPart
+     * @memberof AppMpicker
      */
     @Prop() public viewparams!: any;
 
@@ -77,7 +85,7 @@ export default class AppMpicker extends Vue {
      * AC参数
      *
      * @type {*}
-     * @memberof AppFormDRUIPart
+     * @memberof AppMpicker
      */
     @Prop({default: () => {}}) public acParams?: any;
 
@@ -85,7 +93,7 @@ export default class AppMpicker extends Vue {
      * 应用实体主信息属性名称
      *
      * @type {string}
-     * @memberof AppAutocomplete
+     * @memberof AppMpicker
      */
     @Prop({default: 'srfmajortext'}) public deMajorField!: string;
 
@@ -93,7 +101,7 @@ export default class AppMpicker extends Vue {
      * 应用实体主键属性名称
      *
      * @type {string}
-     * @memberof AppAutocomplete
+     * @memberof AppMpicker
      */
     @Prop({default: 'srfkey'}) public deKeyField!: string;
 
@@ -101,7 +109,7 @@ export default class AppMpicker extends Vue {
      * 表单服务
      *
      * @type {*}
-     * @memberof AppFormDRUIPart
+     * @memberof AppMpicker
      */
     @Prop() public service?: any;
 
@@ -242,19 +250,19 @@ export default class AppMpicker extends Vue {
      */
     public handlePublicParams(arg: any): boolean {
         if (!this.activeData) {
-            this.$Notice.error({ title: (this.$t('components.appPicker.error') as any), desc: (this.$t('components.appPicker.formdataException') as any) });
+            this.$Notice.error({ title: (this.$t('components.AppMpicker.error') as any), desc: (this.$t('components.AppMpicker.formdataException') as any) });
             return false;
         }
         // 合并表单参数
         arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {};
         arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {};
         // 附加参数处理
-        if (this.itemParam && this.itemParam.context) {
-          let _context = this.$util.formatData(this.activeData,arg.context,this.itemParam.context);
+        if (this.localContext && Object.keys(this.localContext).length >0) {
+            let _context = this.$util.computedNavData(this.activeData,arg.context,arg.param,this.localContext);
             Object.assign(arg.context,_context);
         }
-        if (this.itemParam  && this.itemParam.param) {
-          let _param = this.$util.formatData(this.activeData,arg.param,this.itemParam.param);
+        if (this.localParam && Object.keys(this.localParam).length >0) {
+            let _param = this.$util.computedNavData(this.activeData,arg.param,arg.param,this.localParam);
             Object.assign(arg.param,_param);
         }
         return true;

src/components/app-radio-group/app-radio-group.vue

@@ -65,14 +65,14 @@ export default class AppRadioGroup extends Vue {
      * 传入表单数据
      *
      * @type {*}
-     * @memberof DropDownList
+     * @memberof AppRadioGroup
      */
     @Prop() public data?: any;
 
     /**
      * 监听表单数据变化
      * 
-     * @memberof AppOrgSelect
+     * @memberof AppRadioGroup
      */
     @Watch('data',{immediate:true,deep:true})
     onDataChange(newVal: any, oldVal: any) {
@@ -103,18 +103,26 @@ export default class AppRadioGroup extends Vue {
     @Prop() public disabled?: boolean;
 
     /**
-     * 传入额外参数
-     *
-     * @type {*}
-     * @memberof DropDownList
+     * 局部上下文导航参数
+     * 
+     * @type {any}
+     * @memberof AppRadioGroup
+     */
+    @Prop() public localContext!:any;
+
+    /**
+     * 局部导航参数
+     * 
+     * @type {any}
+     * @memberof AppRadioGroup
      */
-    @Prop() public itemParam?: any;
+    @Prop() public localParam!:any;
 
     /**
      * 视图上下文
      *
      * @type {*}
-     * @memberof AppAutocomplete
+     * @memberof AppRadioGroup
      */
     @Prop() public context!: any;
 
@@ -122,7 +130,7 @@ export default class AppRadioGroup extends Vue {
      * 视图参数
      *
      * @type {*}
-     * @memberof AppFormDRUIPart
+     * @memberof AppRadioGroup
      */
     @Prop() public viewparams!: any;
 
@@ -161,19 +169,19 @@ export default class AppRadioGroup extends Vue {
      *
      * @param {*} arg
      * @returns
-     * @memberof DropDownList
+     * @memberof AppRadioGroup
      */
     public handlePublicParams(arg: any) {
         // 合并表单参数
         arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {};
         arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {};
         // 附加参数处理
-        if (this.itemParam && this.itemParam.context) {
-          let _context = this.$util.formatData(this.data,arg.context,this.itemParam.context);
+        if (this.localContext && Object.keys(this.localContext).length >0) {
+            let _context = this.$util.computedNavData(this.data,arg.context,arg.param,this.localContext);
             Object.assign(arg.context,_context);
         }
-        if (this.itemParam && this.itemParam.param) {
-          let _param = this.$util.formatData(this.data,arg.param,this.itemParam.param);
+        if (this.localParam && Object.keys(this.localParam).length >0) {
+            let _param = this.$util.computedNavData(this.data,arg.param,arg.param,this.localParam);
             Object.assign(arg.param,_param);
         }
     }

src/components/app-span/app-span.vue

@@ -72,12 +72,20 @@ export default class AppSpan extends Vue {
     @Prop() public data?: any;
 
     /**
-     * 传入额外参数
-     *
-     * @type {*}
+     * 局部上下文导航参数
+     * 
+     * @type {any}
+     * @memberof AppSpan
+     */
+    @Prop() public localContext!:any;
+
+    /**
+     * 局部导航参数
+     * 
+     * @type {any}
      * @memberof AppSpan
      */
-    @Prop() public itemParam?: any;
+    @Prop() public localParam!:any;
 
     /**
      * 视图上下文

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

@@ -36,7 +36,7 @@ export default class AppTreePicker extends Vue {
      * 视图上下文
      *
      * @type {*}
-     * @memberof AppFormDRUIPart
+     * @memberof AppTreePicker
      */
     @Prop() public context!: any;
 
@@ -44,7 +44,7 @@ export default class AppTreePicker extends Vue {
      * 视图参数
      *
      * @type {*}
-     * @memberof AppFormDRUIPart
+     * @memberof AppTreePicker
      */
     @Prop() public viewparams!: any;
 
@@ -52,7 +52,7 @@ export default class AppTreePicker extends Vue {
      * 表单数据
      *
      * @type {*}
-     * @memberof AppPicker
+     * @memberof AppTreePicker
      */
     @Prop() public data!: any;
 
@@ -68,7 +68,7 @@ export default class AppTreePicker extends Vue {
      * 是否启用
      *
      * @type {boolean}
-     * @memberof AppPicker
+     * @memberof AppTreePicker
      */
     @Prop({default: false}) public disabled!: boolean;
     
@@ -101,7 +101,7 @@ export default class AppTreePicker extends Vue {
      * 值项名称
      *
      * @type {string}
-     * @memberof AppPicker
+     * @memberof AppTreePicker
      */
     @Prop() public valueItem?: string;
 
@@ -109,7 +109,7 @@ export default class AppTreePicker extends Vue {
      * 关联视图名称
      *
      * @type {string}
-     * @memberof AppPicker
+     * @memberof AppTreePicker
      */
     @Prop() public refviewname?: string;
 
@@ -125,17 +125,25 @@ export default class AppTreePicker extends Vue {
      * 属性项名称
      *
      * @type {string}
-     * @memberof AppPicker
+     * @memberof AppTreePicker
      */
     @Prop() public name!: string;
 
     /**
-     * 关联视图参数
-     *
-     * @type {*}
+     * 局部上下文导航参数
+     * 
+     * @type {any}
      * @memberof AppTreePicker
      */
-    @Prop() public itemParam: any;
+    @Prop() public localContext!:any;
+
+    /**
+     * 局部导航参数
+     * 
+     * @type {any}
+     * @memberof AppTreePicker
+     */
+    @Prop() public localParam!:any;
 
     /**
      * 是否忽略之变化
@@ -210,8 +218,8 @@ export default class AppTreePicker extends Vue {
      *
      * @memberof AppTreePicker
      */
-    public setViewParam(activeData: any) {
-        if (!this.itemParam || !activeData) {
+    public setViewParam() {
+        if (!this.data) {
             return;
         }
         let arg: any = {};
@@ -219,17 +227,13 @@ export default class AppTreePicker extends Vue {
         let param: any = JSON.parse(JSON.stringify(this.viewparams));
         let context: any = JSON.parse(JSON.stringify(this.context));
         // 附加参数处理
-        if (this.itemParam.context) {
-            let _context = this.$util.formatData(activeData,context,this.itemParam.context);
-            Object.assign(context,_context);
+        if (this.localContext && Object.keys(this.localContext).length >0) {
+            let _context = this.$util.computedNavData(this.data,arg.context,arg.param,this.localContext);
+            Object.assign(arg.context,_context);
         }
-        if (this.itemParam.param) {
-            let _param = this.$util.formatData(activeData,param,this.itemParam.param);
-            Object.assign(param,_param);
-        }
-        if (this.itemParam.parentdata) {
-            let _parentdata = this.$util.formatData(activeData,param,this.itemParam.parentdata);
-            Object.assign(param,_parentdata);
+        if (this.localParam && Object.keys(this.localParam).length >0) {
+            let _param = this.$util.computedNavData(this.data,arg.param,arg.param,this.localParam);
+            Object.assign(arg.param,_param);
         }
         this.viewdata = JSON.stringify(context);
         this.viewparam = JSON.stringify(param);
@@ -240,13 +244,13 @@ export default class AppTreePicker extends Vue {
      *
      * @param {*} newVal
      * @param {*} oldVal
-     * @memberof AppFormDRUIPart
+     * @memberof AppTreePicker
      */
     @Watch('data')
     onActivedataChange(newVal: any, oldVal: any) {
         const newFormData: any = JSON.parse(newVal);
         const oldDormData: any = JSON.parse(oldVal);
-        this.setViewParam(newFormData);
+        this.setViewParam();
         if (!this.refreshitems || this.ignorefieldvaluechange) {
             return;
         }
@@ -261,7 +265,7 @@ export default class AppTreePicker extends Vue {
      *
      * @param {*} newVal
      * @param {*} oldVal
-     * @memberof AppPicker
+     * @memberof AppTreePicker
      */
     @Watch('value')
     public onValueChange(newVal: any, oldVal: any) {
@@ -277,7 +281,7 @@ export default class AppTreePicker extends Vue {
         if(this.formState) {
             this.formStateEvent = this.formState.subscribe(({ tag, action, data }) => {
                 if (Object.is('load', action)) {
-                    this.setViewParam(JSON.parse(this.data));
+                    this.setViewParam();
                 }
             });
         }
@@ -286,7 +290,7 @@ export default class AppTreePicker extends Vue {
     /**
      * vue 生命周期
      *
-     * @memberof SelectType
+     * @memberof AppTreePicker
      */
     public destroyed() {
         if (this.formStateEvent) {

src/components/codelist/codelist.vue

@@ -79,12 +79,20 @@ export default class CodeList extends Vue {
     @Prop() public data?: any;
 
     /**
-     * 传入额外参数
-     *
-     * @type {*}
+     * 局部上下文导航参数
+     * 
+     * @type {any}
+     * @memberof CodeList
+     */
+    @Prop() public localContext!:any;
+
+    /**
+     * 局部导航参数
+     * 
+     * @type {any}
      * @memberof CodeList
      */
-    @Prop() public itemParam?: any;
+    @Prop() public localParam!:any;
 
     /**
      * 视图上下文
@@ -270,12 +278,12 @@ export default class CodeList extends Vue {
         arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {};
         arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {};
         // 附加参数处理
-        if (this.itemParam && this.itemParam.context) {
-          let _context = this.$util.formatData(this.data,arg.context,this.itemParam.context);
+        if (this.localContext && Object.keys(this.localContext).length >0) {
+            let _context = this.$util.computedNavData(this.data,arg.context,arg.param,this.localContext);
             Object.assign(arg.context,_context);
         }
-        if (this.itemParam && this.itemParam.param) {
-          let _param = this.$util.formatData(this.data,arg.param,this.itemParam.param);
+        if (this.localParam && Object.keys(this.localParam).length >0) {
+            let _param = this.$util.computedNavData(this.data,arg.param,arg.param,this.localParam);
             Object.assign(arg.param,_param);
         }
     }

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

@@ -85,12 +85,20 @@ export default class DropDownListMpicker extends Vue {
     @Prop() public placeholder?: string;
 
     /**
-     * 传入额外参数
-     *
-     * @type {*}
+     * 局部上下文导航参数
+     * 
+     * @type {any}
+     * @memberof DropDownListMpicker
+     */
+    @Prop() public localContext!:any;
+
+    /**
+     * 局部导航参数
+     * 
+     * @type {any}
      * @memberof DropDownListMpicker
      */
-    @Prop() public itemParam?: any;
+    @Prop() public localParam!:any;
 
     /**
      * 视图上下文
@@ -157,12 +165,12 @@ export default class DropDownListMpicker extends Vue {
         arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {};
         arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {};
         // 附加参数处理
-        if (this.itemParam.context) {
-          let _context = this.$util.formatData(this.data,arg.context,this.itemParam.context);
+        if (this.localContext && Object.keys(this.localContext).length >0) {
+            let _context = this.$util.computedNavData(this.data,arg.context,arg.param,this.localContext);
             Object.assign(arg.context,_context);
         }
-        if (this.itemParam.param) {
-          let _param = this.$util.formatData(this.data,arg.param,this.itemParam.param);
+        if (this.localParam && Object.keys(this.localParam).length >0) {
+            let _param = this.$util.computedNavData(this.data,arg.param,arg.param,this.localParam);
             Object.assign(arg.param,_param);
         }
     }