cnhis-design-vue 2.2.1 → 2.2.3

package/packages/big-table/src/utils/headerFilter.js

@@ -1,4 +1,6 @@
 import vexutils from '@/utils/vexutils';
+import { pick } from 'xe-utils';
+import wordBookutils from '~/table-filter/src/mixins/wordBookutils';
 let beforeSearchConvert = [];
 const filterTopOffsetMap = {
   large: 28,
@@ -22,18 +24,41 @@ export default {
   props: {},
   data() {
     return {
-      apiFilterMap: {}
+      apiFilterMap: {},
+      wordbookSearchDef: {
+        fetchingWordbook: false,
+        noData: false,
+        result: '',
+        resultMsg: '',
+        hasFieldList: false,
+        page: 1,
+        hasNextPage: false,
+        isRequest: false,
+        keyword: '',
+        total: 0,
+        asyncCount: 1
+      },
+      // 字典搜索的item保存, 同步给筛选外显, 不然可能没有下拉, 显示为value
+      filterCheckedOptionMap: {}
     };
   },
   computed: {
     isApiTable() {
       return this.tableDataType === 'API';
+    },
+    isLowCode() {
+      return this.libSource == 'lowCode';
     }
   },
   created() {
     this.handleFilterSeachDebounce = vexutils.debounce(this.handleFilterSeach, 100);
   },
   methods: {
+    isSingleItem(field) {
+      const { multiple } = field?.filterSettingMap || {};
+      let isSingle = (this.isApiTable && !multiple) || (!this.isApiTable && field.advanceOptionSetting == '0');
+      return isSingle;
+    },
     getOffsetLocation(element, cls, offsetKey) {
       let actualTop = element[offsetKey];
       let current = element.offsetParent;
@@ -50,6 +75,63 @@ export default {
       let resHeight = target.offsetHeight;
       return { resTop, resLeft, resWidth, resHeight };
     },
+    wordbookDataParams(wordbook) {
+      const { params, autograph, id, filterKeys, wordbookType = 'WORDBOOK' } = wordbook || {};
+      let resFieldKeys = Array.isArray(filterKeys) ? JSON.stringify(filterKeys) : filterKeys;
+      let obj = {
+        wordbookId: id,
+        fieldKeys: resFieldKeys,
+        wordbookType,
+        asyncCount: 1 // 开启性能模式
+      };
+      if (params) {
+        params.forEach(item => {
+          obj[item.p_name] = item.p_value;
+        });
+      }
+      if (autograph) {
+        obj.autograph = autograph;
+      }
+      return obj;
+    },
+    async getWordbookData(field, config) {
+      const { wordbookSearch = {} } = field || {};
+      Object.assign(wordbookSearch, { fetchingWordbook: true, noData: false, result: '', resultMsg: '', hasFieldList: false });
+      try {
+        const wordbook = field.settingObj?.wordbook;
+        let params = this.wordbookDataParams(wordbook);
+        if (config) {
+          Object.assign(params, config);
+        }
+        let { data } = (await this.requestGetWordbookData(params)) || {};
+        let { result, resultMsg, map } = data || {};
+        Object.assign(wordbookSearch, { fetchingWordbook: false, result, resultMsg });
+        if (!data || result !== 'SUCCESS') {
+          Object.assign(wordbookSearch, { result: 'ERROR', isRequest: true });
+          return;
+        }
+        data.reqParams = params;
+        if (!map?.rows?.length) {
+          Object.assign(wordbookSearch, { result: 'ERROR', isRequest: true, noData: true, resultMsg: '暂无数据' });
+          return;
+        }
+        let configObj = {
+          isHeader: true,
+          headerSearchPageConfig: pick(wordbookSearch, ['page', 'hasNextPage', 'isRequest', 'keyword', 'asyncCount'])
+        };
+        const { rows, rowsMap, hasFieldList, searchPageConfig } = wordBookutils.handleWordbookData(field, data, params, configObj);
+        field.filterSettingMap.filterOptions = rows;
+        field.filterSettingMap.filterOptionsMap = rowsMap;
+        Object.assign(wordbookSearch, { hasFieldList, ...searchPageConfig });
+      } catch (e) {
+        console.log(e, '----e');
+        Object.assign(wordbookSearch, { fetchingWordbook: false, isRequest: true, result: 'ERROR' });
+      }
+    },
+    handleStaticOptions(field, columnName) {
+      this.handleShowFilterOptions(field);
+      this.handleShowFilterCheck(field, columnName);
+    },
     handleShowFilterOptions(field) {
       const { filterSettingMap = {}, setting } = field || {};
       let originOptions = setting?.showSetting || [];
@@ -60,7 +142,7 @@ export default {
       filterSettingMap.filterOptions = originOptions;
     },
     handleShowFilterCheck(field, columnName) {
-      let { filterOptions } = field?.filterSettingMap || {};
+      let { filterOptions, filterType } = field?.filterSettingMap || {};
       let len = this.filterFields[columnName]?.CONVERT?.length;
       let allLen = filterOptions?.length || field.setting?.showSetting?.length;
       field.checkAll = len === allLen;
@@ -121,9 +203,13 @@ export default {
       field.visible = !field.visible;
       field.searchFilterText = '';
 
-      // field.filterSettingMap.filterOptions =field.setting?.showSetting || [];
-      this.handleShowFilterOptions(field);
-      this.handleShowFilterCheck(field, columnName);
+      let isWordbook = field.filterSettingMap?.isVaildWordbook;
+      this.filterCheckedOptionMap[columnName] = {};
+      if (isWordbook) {
+        this.getWordbookData(field);
+      } else {
+        this.handleStaticOptions(field, columnName);
+      }
     },
     handlefilterBoxClickSort(sort, field) {
       if (field.filterSort === sort) {
@@ -136,9 +222,7 @@ export default {
       field.visible = false;
       this.$emit('sortChange', { prop: field.columnName, order: sort });
     },
-    handleFilterSeach(val, item) {
-      let field = this.filterFields[item.columnName];
-      if (!field) return;
+    handleFilterSeachStatic(val, field) {
       field.searchFilterText = val;
       let { filterOptions } = field?.filterSettingMap || {};
       let options = filterOptions || field.setting?.showSetting;
@@ -150,10 +234,7 @@ export default {
         field.checkAll = cLen === allLen;
         field.indeterminate = !!cLen && cLen !== allLen;
 
-        field.filterSettingMap &&
-          Object.assign(field.filterSettingMap, {
-            filterOptions: originOptions
-          });
+        field.filterSettingMap && Object.assign(field.filterSettingMap, { filterOptions: originOptions });
         return;
       }
 
@@ -167,13 +248,24 @@ export default {
 
       field.searchFilterCONVERT = curFilterOptions.filter(item => field.CONVERT.includes(item.value)).map(item => item.value);
 
-      field.filterSettingMap &&
-        Object.assign(field.filterSettingMap, {
-          filterOptions: curFilterOptions
-        });
+      field.filterSettingMap && Object.assign(field.filterSettingMap, { filterOptions: curFilterOptions });
 
       beforeSearchConvert = field.searchFilterCONVERT;
     },
+    handleFilterSeachWordbook(val, field, config = {}) {
+      let otherParmas = { keyword: val, ...config };
+      this.getWordbookData(field, otherParmas);
+    },
+    handleFilterSeach(val, item, config) {
+      let field = this.filterFields[item.columnName];
+      if (!field) return;
+      let isWordbook = field.filterSettingMap?.isVaildWordbook;
+      if (isWordbook) {
+        this.handleFilterSeachWordbook(val, field, config);
+      } else {
+        this.handleFilterSeachStatic(val, field);
+      }
+    },
     handleFilterChangeAll(e, field) {
       this.reScrollFilterWrap();
       let checked = e.target.checked;
@@ -192,7 +284,7 @@ export default {
 
     handleFilterChange(newValue, name, field) {
       this.reScrollFilterWrap();
-      let value = newValue;
+      let value = newValue || [];
       value = this.getSingleConvert(value, this.filterFields[name].CONVERT, field);
       let { filterOptions } = field?.filterSettingMap || {};
       let allLen = filterOptions?.length || field.setting?.showSetting?.length;
@@ -201,8 +293,7 @@ export default {
       field.checkAll = value.length === allLen;
       field.indeterminate = !!value.length && value.length !== allLen;
     },
-    handleFilterSearchChange(value, columnName, field) {
-      this.reScrollFilterWrap();
+    handleFilterSearchChangeStatic(value, columnName, field) {
       /* filter-check-group value更新 触发 主check-group value同步更新 */
       let curField = this.filterFields[columnName];
       let isAdd = beforeSearchConvert.length < value.length;
@@ -231,21 +322,29 @@ export default {
       field.searchFilterCONVERT = newValue;
       beforeSearchConvert = vexutils.clone(newValue, true);
     },
+    handleFilterSearchChange(value, columnName, field) {
+      this.reScrollFilterWrap();
+      this.handleFilterSearchChangeStatic(value, columnName, field);
+    },
     handleFilterClearAll(field) {
       field.indeterminate = false;
       field.checkAll = false;
       this.filterFields[field.columnName].CONVERT = [];
       if (field.searchFilterCONVERT) {
         this.filterFields[field.columnName].searchFilterCONVERT = [];
+        this.filterFields[field.columnName].wordbookSearch = { ...this.wordbookSearchDef };
       }
       this.handleFilter(field);
     },
-    handleCancelFilter() {
+    handleCancelFilter(field) {
       this.hideFilterWrap();
     },
     handleFilter(field) {
       let conObj = this.mergeConObjFn();
-      this.$emit('onSave', conObj, false, [], [], { isBigTable: true });
+      let checkedOptionObj = this.filterCheckedOptionMap[field.columnName] || {};
+      let config = { isBigTable: true, checkedOptionObj };
+
+      this.$emit('onSave', conObj, false, [], [], config);
       field.visible = false;
     },
     handleFilterEmpty(field, columnName) {
@@ -261,7 +360,7 @@ export default {
       let conObj = this.getConObj(fields);
       let mergeConObj = [...conObj];
       // 兼容二次开发平台逻辑
-      if (this.libSource != 'lowCode') {
+      if (!this.isLowCode) {
         let qqConObj = this.tableParams.qqConObj ? JSON.parse(this.tableParams.qqConObj) : [];
 
         qqConObj.forEach(i => {
@@ -282,9 +381,20 @@ export default {
       let conObj = [];
       for (let i = 0; i < arr.length; i++) {
         let item = arr[i];
+        const { isVaildWordbook } = item.filterSettingMap || {};
         let value = '';
         let limit_date = '';
-        if (item.EQ || item.CL) {
+        if (isVaildWordbook && item.CONVERT) {
+          if (this.isApiTable) {
+            value = item.CONVERT;
+          } else {
+            let cVal = item.CONVERT;
+            if (!Array.isArray(cVal)) {
+              cVal = [cVal];
+            }
+            value = cVal.join('|#|');
+          }
+        } else if (item.EQ || item.CL) {
           value = item.EQ || item.CL;
           if (item.settingObj?.attr === 'PERCENTAGE') {
             value = Number(value) / 100;
@@ -379,22 +489,66 @@ export default {
         checkboxWrapEl.scrollTop = tableScrollTop;
       });
     },
+    handleWordbookCheckedOptions(field, value, config) {
+      const { isVaildWordbook, filterOptionsMap } = field.filterSettingMap || {};
+      if (!isVaildWordbook) return;
+      let fieldChecked = this.filterCheckedOptionMap[field.columnName];
+      if (!fieldChecked) return;
+      const { isSingle, curPageOldVal } = config || {};
+      if (isSingle) {
+        if (!value?.length) {
+          this.filterCheckedOptionMap[field.columnName] = {};
+          return;
+        }
+        let fKey = value[0];
+        let fOp = filterOptionsMap[fKey];
+        fOp && (this.filterCheckedOptionMap[field.columnName][fKey] = fOp);
+        return;
+      }
+      // 无curPageOldVal 有value 代表新增了
+      if (!curPageOldVal.length && value.length) {
+        value.forEach(v => filterOptionsMap[v] && (this.filterCheckedOptionMap[field.columnName][v] = filterOptionsMap[v]));
+        return;
+      }
+      // 有curPageOldVal 无value 代表删除了
+      if (curPageOldVal.length && !value.length) {
+        curPageOldVal.forEach(v => delete this.filterCheckedOptionMap[field.columnName][v]);
+        return;
+      }
+      // 有curPageOldVal中有,  value中无, 删除curPageOldVal 设置value;
+      let delVal = curPageOldVal.filter(v => !value.includes?.(v));
+      if (delVal.length) {
+        delVal.forEach(v => delete this.filterCheckedOptionMap[field.columnName][v]);
+      }
+      if (value.length) {
+        value.forEach(v => filterOptionsMap[v] && (this.filterCheckedOptionMap[field.columnName][v] = filterOptionsMap[v]));
+      }
+    },
 
     /**
      * 映射值如果配置了单选，限制只能选一个
      */
-    getSingleConvert(value, old, field) {
+    getSingleConvert(value, old = [], field) {
       let cValue = value;
+      const { isVaildWordbook, filterOptions } = field.filterSettingMap || {};
       if (!Array.isArray(old) || !Array.isArray(value)) return cValue;
       // 单选
-      const { multiple } = field?.filterSettingMap || {};
-      let isSingle = (this.isApiTable && !multiple) || (!this.isApiTable && field.advanceOptionSetting == '0');
-      if (isSingle && (value?.length || 0) > 1) {
+      let isSingle = this.isSingleItem(field);
+      if (isSingle && value?.length > 1) {
         cValue = cValue.filter(v => !old?.includes?.(v));
         if (cValue.length > 1) {
-          return [cValue[0]];
+          cValue = [cValue[0]];
         }
       }
+      // wordbook 可能分页选择了
+      let curPageOldVal = [];
+      if (isVaildWordbook && !isSingle) {
+        curPageOldVal = old.filter(v => filterOptions.find(f => f.value === v));
+        let noCurPageOldVal = old.filter(v => !filterOptions.find(f => f.value === v));
+        // 有可能是合并另一页, 有可能是取消选中 把当前页的过滤出来, 其它都是需要合并的, 当前页的留下value, merge filter old
+        cValue = [...new Set([...noCurPageOldVal, ...value])];
+      }
+      this.handleWordbookCheckedOptions(field, cValue, { isSingle, curPageOldVal });
       return cValue;
     },
     onmousedownFunc(e) {
@@ -466,7 +620,7 @@ export default {
           this.$set(el, 'setting', setting);
         }
         const { showSetting, attr, labelType, wordbook } = setting || {};
-        const { filterField, headerFilterKey } = filterSettingMap || {};
+        const { filterField, headerFilterKey, isWordbook } = filterSettingMap || {};
         // 处理api表头筛选映射
         if (this.isApiTable && filterField && headerFilterKey) {
           this.apiFilterMap[headerFilterKey] = columnName;

package/packages/select/index.js

@@ -5,6 +5,7 @@ import Option from './src/Option';
 import OptGroup from './src/OptGroup';
 import CustomSelect from './src/CustomSelect/index';
 import TableSelect from './src/TableSelect/index';
+import PagerSelect from './src/PagerSelect/index';
 
 // 为组件提供 install 安装方法，供按需引入
 Select.install = function(Vue) {
@@ -14,13 +15,15 @@ Select.install = function(Vue) {
   Vue.component(OptGroup.name, OptGroup);
   Vue.component(CustomSelect.name, CustomSelect);
   Vue.component(TableSelect.name, TableSelect);
+  Vue.component(PagerSelect.name, PagerSelect);
 };
 
 Object.assign(Select, {
   Option,
   OptGroup,
   CustomSelect,
-  TableSelect
+  TableSelect,
+  PagerSelect
 });
 
 // 默认导出组件

package/packages/select/src/PagerSelect/index.vue

@@ -0,0 +1,92 @@
+<template>
+  <a-select v-on="$listeners" v-bind="$attrs" :filter-option="false" show-search @search="debounceSearch" @dropdownVisibleChange="dropdownVisibleChange">
+    <div slot="dropdownRender" slot-scope="menu" @change="handleChange">
+      <a-spin style="width: 100%;margin: 100px 0 100px" v-if="fetching" />
+      <template v-else>
+        <v-nodes :vnodes="menu" />
+        <select-pages v-if="pagerInfo.total > 1" :searchPageConfig="pagerInfo" :handleSearchChangePage="handlePager" />
+      </template>
+    </div>
+
+    <a-select-option v-for="item in option" :key="item.value" :value="item.value" :disabled="item.disabled">{{ item.title }}</a-select-option>
+  </a-select>
+</template>
+<script>
+/**
+ * @author ruanlin
+ * @desc 根据reuseapp项目功能定制
+ * @time 2021-06-17
+ */
+import Vue from 'vue';
+import { Select, Spin } from 'ant-design-vue';
+import create from '@/core/create';
+import selectPages from '@/component/select-pages';
+import vexutils from '@/utils/vexutils';
+
+export default create({
+  name: 'pager-select',
+  props: {
+    queryOption: {
+      type: Function,
+      require: true
+    }
+  },
+  beforeCreate() {
+    Vue.use(Select).use(Spin);
+  },
+  components: {
+    VNodes: {
+      functional: true,
+      render: (h, ctx) => {
+        return ctx.props.vnodes;
+      }
+    },
+    selectPages
+  },
+  data() {
+    this.debounceSearch = vexutils.debounce(this.debounceSearch, 800);
+    this.keyword = '';
+    return {
+      fetching: false,
+      option: [],
+      pagerInfo: { page: 1, total: 1 }
+    };
+  },
+  mounted() {},
+  methods: {
+    async debounceSearch(value) {
+      this.keyword = value;
+      this.pagerInfo.page = 1;
+      this.handleQuery();
+    },
+    handlePager(type) {
+      type == 'prev' ? this.pagerInfo.page-- : this.pagerInfo.page++;
+      this.handleQuery();
+    },
+    dropdownVisibleChange(open) {
+      if (open) {
+        this.keyword = '';
+        Object.assign(this.pagerInfo, {
+          page: 1,
+          total: 1
+        });
+        this.handleQuery();
+      }
+    },
+    async handleQuery() {
+      this.fetching = true;
+      try {
+        const _data = await this.queryOption({ page: this.pagerInfo.page, keyword: this.keyword });
+        const { data = [], total } = _data || {};
+        this.option = data;
+        this.pagerInfo.total = total;
+      } catch (error) {
+        console.log(error);
+      } finally {
+        this.fetching = false;
+      }
+    }
+  }
+});
+</script>
+<style lang="less" scoped></style>

package/packages/select-person/select-person.vue

@@ -849,16 +849,22 @@ export default create({
 
     // 暂存实际可选节点arr
     generateDataList(data, dataList) {
-      for (let i = 0; i < data.length; i++) {
-        const node = data[i];
+      vexutils.eachTree(data, node => {
         dataList.push({
           parentId: this.getParentId(node),
           ...node
         });
-        if (node.children) {
-          this.generateDataList(node.children, dataList);
-        }
-      }
+      });
+      // for (let i = 0; i < data.length; i++) {
+      //   const node = data[i];
+      //   dataList.push({
+      //     parentId: this.getParentId(node),
+      //     ...node
+      //   });
+      //   if (node.children) {
+      //     this.generateDataList(node.children, dataList);
+      //   }
+      // }
     },
 
     // 获取匹配搜索节点arr

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

@@ -6,7 +6,7 @@ const SYMBOL = '<&=&>';
  */
 const formatWordbookDataUtils = {
   hasArray: arr => Array.isArray(arr) && arr.length > 0,
-  handleWordbookData(item, data, params) {
+  handleWordbookData(item, data, params, configObj) {
     // this.$set(item, "hasFieldList", false);
     let { setting = {} } = item;
     let { showKeys = [], defaultValue, defaultValueTitle } = setting.wordbook || {};
@@ -15,6 +15,7 @@ const formatWordbookDataUtils = {
     let resArr = [];
     let hasFieldList = false;
     let searchPageConfig = {};
+    const { isHeader, headerSearchPageConfig } = configObj || {};
 
     if (defaultValue && defaultValueTitle) {
       // 保存的时候值会变成字符串, 如果是数字的话回显会出问题, 这里全部处理成字符串
@@ -25,12 +26,16 @@ const formatWordbookDataUtils = {
         myName: defaultValue,
         showKeys: defaultValueTitle
       };
+      if (isHeader) {
+        Object.assign(defaultItem, { _show_title: defaultValueTitle, value: defaultValue });
+      }
     }
     if (data && data.result) {
       let reqParams = data?.reqParams || {};
 
       let { page, hasNextPage, fieldList } = data.map;
-      searchPageConfig = Object.assign(item.searchPageConfig, {
+      let oldSearchPageConfig = isHeader ? headerSearchPageConfig : item.searchPageConfig;
+      searchPageConfig = Object.assign(oldSearchPageConfig, {
         page,
         hasNextPage,
         isRequest: true,
@@ -49,10 +54,16 @@ const formatWordbookDataUtils = {
         if (typeof name === 'number') {
           name = String(name);
         }
+        const _show_title = showKeysStr.join(' ');
+
+        if (isHeader) {
+          delete row.label;
+          Object.assign(row, { value: name });
+        }
         return Object.assign(row, {
           myName: name,
           showKeys: showKeysStr.join(SYMBOL),
-          _show_title: showKeysStr.join(' ')
+          _show_title
         });
       });
       // 数组对象去重
@@ -64,7 +75,7 @@ const formatWordbookDataUtils = {
       if (defaultItem) {
         resArr.unshift(defaultItem);
       }
-      if (formatWordbookDataUtils.hasArray(fieldList) && formatWordbookDataUtils.hasArray(showKeys) && showKeys.length > 1) {
+      if (!isHeader && formatWordbookDataUtils.hasArray(fieldList) && formatWordbookDataUtils.hasArray(showKeys) && showKeys.length > 1) {
         let t = formatWordbookDataUtils.getTitleHeader(fieldList, showKeys);
         // 保存的时候值会变成字符串, 如果是数字的话回显会出问题, 这里全部处理成字符串
         if (typeof t === 'number') {
@@ -81,8 +92,14 @@ const formatWordbookDataUtils = {
       // this.$set(item, "dataSource", resArr);
     }
 
+    let rowsMap = {};
+    resArr.map(row => {
+      rowsMap[row.myName] = row;
+    });
+
     return {
       rows: resArr,
+      rowsMap,
       hasFieldList,
       searchPageConfig
     };

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

@@ -1111,8 +1111,8 @@ export default create({
             /**
              * 映射方式的单选模式
              */
-            let isCheck = optionSetting0 && showSetting.length && showSetting.length < 10 
-            if(optionSetting0 && !isCheck){
+            let isCheck = optionSetting0 && showSetting.length
+            if(optionSetting0 && isCheck){
               this.$set(el, "com", "SelectMui");
               this.$set(el, "comType", "SelectMui");
               const labelList = el.setting.showSetting.map(i => {
@@ -1462,7 +1462,8 @@ export default create({
             return item;
           });
           value = tempConvert
-          if (optionSetting0) {
+          if (optionSetting0 && item.con === 'CONVERT') {
+            // CONVERT 类型 值都是数据类型 => 付名城 2024.8.13
             value = tempConvert[0]
           }
         } else if (item.DATE && !item.AGEAttr) {