Revert "工具类新增计算导航数据 、 下拉视图参数解析"

This reverts commit 437ef1c0.

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

@@ -640,21 +640,34 @@ export default class AppSelectDropDown extends Vue {
      * @memberof AppSelectDropDown
      */
     public handlePublicParams(arg: any): boolean {
+        if (!this.itemParam) {
+            return true;
+        }
         if (!this.data) {
+             this.$notice.error('错误,表单数据异常');
             return false;
         }
         // 合并表单参数
-        arg.param = this.viewparams ? JSON.parse(JSON.stringify(this.viewparams)) : {};
-        arg.context = this.context ? JSON.parse(JSON.stringify(this.context)) : {};
+        let _context: any = {};
+        let _params: any = {};
+        Object.assign(_context,this.context,this.navigateContext);
+        Object.assign(_params,this.viewparams,this.navigateParam);
+        arg.param = JSON.parse(JSON.stringify(_params));
+        arg.context = JSON.parse(JSON.stringify(_context));
         // 附加参数处理
-        if (this.navigateContext && Object.keys(this.navigateContext).length >0) {
-            let _context = this.$util.computedNavData(this.data,arg.context,arg.param,this.navigateContext);
+        if (this.itemParam.context) {
+           
+          let _context = this.formatData(this.data,this.itemParam.context);
             Object.assign(arg.context,_context);
         }
-        if (this.navigateParam && Object.keys(this.navigateParam).length >0) {
-            let _param = this.$util.computedNavData(this.data,arg.param,arg.param,this.navigateParam);
+        if (this.itemParam.param) {
+          let _param = this.formatData(this.data,this.itemParam.param);
             Object.assign(arg.param,_param);
         }
+        if (this.itemParam.parentdata) {
+          let _parentdata = this.formatData(this.data,this.itemParam.parentdata);
+            Object.assign(arg.param,_parentdata);
+        }
         return true;
     }
 

src/ibiz-core/utils/util/util.ts

@@ -296,42 +296,4 @@ export class Util {
         return FirstOBJ;
     }
 
-    /**
-     * 计算导航数据
-     * 先从当前数据目标计算，然后再从当前上下文计算，最后从当前视图参数计算，没有则为null
-     * 
-     * @static
-     * @param {any} data 表单数据
-     * @param {any} parentContext 外层context
-     * @param {any} parentParam 外层param
-     * @param {any} params 附加参数
-     * @returns {any}
-     * @memberof Util
-     */ 
-    public static computedNavData(data:any,parentContext:any,parentParam:any,params:any):any{
-        let _data: any = {};
-        if(params && Object.keys(params).length >0){
-            Object.keys(params).forEach((name: string) => {
-                if (!name) {
-                    return;
-                }
-                let value: string | null = params[name];
-                if (value && value.startsWith('%') && value.endsWith('%')) {
-                    const key = value.substring(1, value.length - 1).toLowerCase();
-                    if (data && data.hasOwnProperty(key)) {
-                        value = data[key];
-                    }else if(parentContext && parentContext[key]){
-                        value = parentContext[key];
-                    }else if(parentParam && parentParam[key]){
-                        value = parentParam[key];
-                    } else {
-                        value = null;
-                    }
-                }
-                Object.assign(_data, { [name.toLowerCase()]: value });
-            });
-        }
-        return _data;
-    }
-
 }
\ No newline at end of file

src/utils/types/util.d.ts

@@ -127,20 +127,6 @@ export declare interface Util {
      * @memberof Util
      */
     deepObjectMerge(FirstOBJ:any, SecondOBJ:any) :any;
-
-    /**
-     * 计算导航数据
-     * 先从当前数据目标计算，然后再从当前上下文计算，最后从当前视图参数计算，没有则为null
-     * 
-     * @static
-     * @param {any} data 表单数据
-     * @param {any} parentContext 外层context
-     * @param {any} parentParam 外层param
-     * @param {any} params 附加参数
-     * @returns {any}
-     * @memberof Util
-     */ 
-    computedNavData(data:any,parentContext:any,parentParam:any,params:any):any;
 }
 
 declare module "vue/types/vue" {