cnhis-design-vue 2.1.63 → 2.1.65

package/packages/table-filter/src/mixins/wordBookutils.js

@@ -1,11 +1,11 @@
 import vexutils from '@/utils/vexutils';
 
-const SYMBOL = "<&=&>"
+const SYMBOL = '<&=&>';
 /**
  * 处理  getWordbookData 接口返回的数据以及配置
  */
 const formatWordbookDataUtils = {
-  hasArray: (arr) => Array.isArray(arr) && arr.length > 0,
+  hasArray: arr => Array.isArray(arr) && arr.length > 0,
   handleWordbookData(item, data, params) {
     // this.$set(item, "hasFieldList", false);
     let { setting = {} } = item;
@@ -17,52 +17,64 @@ const formatWordbookDataUtils = {
     let searchPageConfig = {};
 
     if (defaultValue && defaultValueTitle) {
+      // 保存的时候值会变成字符串, 如果是数字的话回显会出问题, 这里全部处理成字符串
+      if (typeof defaultValue === 'number') {
+        defaultValue = String(defaultValue);
+      }
       defaultItem = {
         myName: defaultValue,
         showKeys: defaultValueTitle
       };
     }
     if (data && data.result) {
-      let reqParams = data?.reqParams || {}
+      let reqParams = data?.reqParams || {};
 
-       let {  page, hasNextPage,fieldList } = data.map;
-        searchPageConfig = Object.assign(item.searchPageConfig, {
-          page,
-          hasNextPage,
-          isRequest: true,
-          keyword: params?.keyword || undefined,
-          asyncCount: reqParams?.asyncCount  || undefined
-        });
+      let { page, hasNextPage, fieldList } = data.map;
+      searchPageConfig = Object.assign(item.searchPageConfig, {
+        page,
+        hasNextPage,
+        isRequest: true,
+        keyword: params?.keyword || undefined,
+        asyncCount: reqParams?.asyncCount || undefined
+      });
       // 数组赋值并添加唯一name
       let rows = data.map.rows.map(row => {
         let showKeysStr = [];
         showKeys.forEach(ren => {
-          let str = vexutils.stringToValue(row[ren],'change_text')
+          let str = vexutils.stringToValue(row[ren], 'change_text');
           showKeysStr.push(str);
         });
-        let name = vexutils.stringToValue(row[item.setting.wordbook.field_key],'value')
+        let name = vexutils.stringToValue(row[item.setting.wordbook.field_key], 'value');
+        // 保存的时候值会变成字符串, 如果是数字的话回显会出问题, 这里全部处理成字符串
+        if (typeof name === 'number') {
+          name = String(name);
+        }
         return Object.assign(row, {
           myName: name,
           showKeys: showKeysStr.join(SYMBOL),
-          _show_title: showKeysStr.join(" ")
+          _show_title: showKeysStr.join(' ')
         });
       });
       // 数组对象去重
       let obj = {};
       resArr = rows.reduce((cur, next) => {
-        obj[next.myName] ? "" : (obj[next.myName] = true && cur.push(next));
+        obj[next.myName] ? '' : (obj[next.myName] = true && cur.push(next));
         return cur;
       }, []);
       if (defaultItem) {
         resArr.unshift(defaultItem);
       }
-      if(formatWordbookDataUtils.hasArray(fieldList) && formatWordbookDataUtils.hasArray(showKeys) && showKeys.length > 1){
-        let t = formatWordbookDataUtils.getTitleHeader(fieldList,showKeys);
+      if (formatWordbookDataUtils.hasArray(fieldList) && formatWordbookDataUtils.hasArray(showKeys) && showKeys.length > 1) {
+        let t = formatWordbookDataUtils.getTitleHeader(fieldList, showKeys);
+        // 保存的时候值会变成字符串, 如果是数字的话回显会出问题, 这里全部处理成字符串
+        if (typeof t === 'number') {
+          t = String(t);
+        }
         resArr.unshift({
-            myName: t,
+          myName: t,
           showKeys: t,
-           sid: Math.random()
-        })
+          sid: Math.random()
+        });
         // this.$set(item, "hasFieldList", true);
         hasFieldList = true;
       }
@@ -70,10 +82,10 @@ const formatWordbookDataUtils = {
     }
 
     return {
-      rows:resArr,
+      rows: resArr,
       hasFieldList,
       searchPageConfig
-    }
+    };
   },
 
   // 下拉搜索框获取字段title
@@ -95,8 +107,7 @@ const formatWordbookDataUtils = {
     });
     let res = titleHeader.join(SYMBOL);
     return res;
-  },
-}
-
+  }
+};
 
 export default formatWordbookDataUtils;

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

@@ -1012,6 +1012,11 @@ export default create({
         if (find) {
           let value = find?.value
           let isTrance = item.CONVERT && Array.isArray(item.CONVERT) || item.comType == "SelectMui" && item.con == "CONVERT"
+          // wordbook多选
+          let isWordBookMulti = value && item.comType === "SelectMuiWordBook"&& typeof value ==='string' && value.includes('|#|')
+          if(isWordBookMulti) {
+            value = value.split('|#|')
+          }
           if(Array.isArray(value) && isTrance){
             let value = find?.value?.map?.(item => JSON.stringify(item)) || find.value;
             value = value.filter(Boolean)