cnhis-design-vue 0.1.79-beta → 0.1.83-beta

package/packages/table-filter/src/quick-search/QuickSearch.vue

@@ -715,6 +715,7 @@ import multiSelect from '../components/multi-select/multi-select';
 import resize from 'vue-resize-directive';
 import { durationMixin, $utils, filterApiFn } from '../mixins/mixins';
 import vexutils from '@/utils/vexutils';
+import wordBookutils from '../mixins/wordBookutils';
 import create from '@/core/create';
 export default create({
   name: "quick-search",
@@ -1114,47 +1115,11 @@ export default create({
       });
     },
     handleWordbookData(item, data, params) {
-      let { setting = {} } = item;
-      let { showKeys = [], defaultValue, defaultValueTitle } = setting.wordbook || {};
-      let defaultItem = null;
-      if (defaultValue && defaultValueTitle) {
-        defaultItem = {
-          myName: defaultValue,
-          showKeys: defaultValueTitle
-        };
-      }
-      if (data && data.result) {
-         let {  page, hasNextPage } = data.map;
-          item.searchPageConfig = Object.assign(item.searchPageConfig, {
-            page,
-            hasNextPage,
-            isRequest: true,
-            keyword: params?.keyword || undefined
-          });
-        // 数组赋值并添加唯一name
-        let rows = data.map.rows.map(row => {
-          let showKeysStr = [];
-          showKeys.forEach(ren => {
-            let str = vexutils.stringToValue(row[ren],'change_text')
-            showKeysStr.push(str);
-          });
-          let name = vexutils.stringToValue(row[item.setting.wordbook.field_key],'value')
-          return Object.assign(row, {
-            myName: name,
-            showKeys: showKeysStr.join("")
-          });
-        });
-        // 数组对象去重
-        let obj = {};
-        let arr = rows.reduce((cur, next) => {
-          obj[next.myName] ? "" : (obj[next.myName] = true && cur.push(next));
-          return cur;
-        }, []);
-        if (defaultItem) {
-          arr.unshift(defaultItem);
-        }
-        this.$set(item, "dataSource", arr);
-      }
+      this.$set(item, "hasFieldList", false);
+      const {rows,hasFieldList,searchPageConfig} = wordBookutils.handleWordbookData(item,data,params);
+      this.$set(item, "hasFieldList", hasFieldList);
+      this.$set(item, "dataSource", rows);
+      item.searchPageConfig = Object.assign(item.searchPageConfig, searchPageConfig);
     },
     filterChange() {},
     maxTagPlaceholder(item) {

package/src/utils/vexutils.js

@@ -698,6 +698,76 @@ XEUtils.mixin({
       }
     return item;
   },
+
+  notEmpty(text) {
+    return XEUtils.isBoolean(text) || String(text) === "0" || !!text;
+  },
+
+    /**
+   * 变量转换
+   * @param {string} str
+   * @param {object} obj
+   * @param {string | number} noval // 没有值，默认赋值
+   */
+     handleSysParams(str, obj = {}, noval = "") {
+      let p = {
+        ...obj
+      };
+      const that = this;
+      // 解析变量
+      const getValList = (plsList = [], obj = {}) => {
+        var l = [];
+        var o = obj;
+        plsList.forEach(v => {
+          let c = v;
+          // xx.xx
+          if (v.includes(".")) {
+            try {
+              // 使用 eval 解析 'result.map.map.filed'
+              eval(`c=o.${v}`);
+            } catch (error) {
+              c = "";
+            }
+          }
+          if (XEUtils.notEmpty(c)) {
+            l.push(c);
+          }
+        });
+        return l;
+      };
+      const getVal = (t, r, k) => {
+        return t.replace(r, function() {
+          var pKey = arguments[1];
+          // 切割
+          var pls = pKey.split("!");
+          // 取值
+          var l = getValList(pls, p);
+          var f = l.find(v => XEUtils.notEmpty(v));
+          var res = f;
+          res = XEUtils.notEmpty(res) ? res : noval;
+          return res;
+        });
+      };
+      if (typeof str === "string") {
+        if (str.includes("form")) {
+          str = getVal(str, /\${(.*?)\}/g, "form");
+        }
+        if (str.includes("sys")) {
+          str = getVal(str, /\${(.*?)\}/g, "sys");
+        }
+        if (str.includes("db")) {
+          str = getVal(str, /\${(.*?)\}/g, "db");
+        }
+        if (str.includes("table")) {
+          str = getVal(str, /\${(.*?)\}/g, "table");
+        }
+        if (str.includes("result")) {
+          str = getVal(str, /\${(.*?)\}/g, "result");
+        }
+      }
+      return str;
+    },
+
 });
 
 export default XEUtils;