cnhis-design-vue 2.1.79 → 2.1.81

package/packages/table-filter/src/components/render-widget/mixins/dynamic-method.js

@@ -0,0 +1,164 @@
+import vexutils from '@/utils/vexutils';
+
+export default {
+  props: {},
+  data() {
+    return {};
+  },
+  methods: {
+    wordbookDataParamsRender(dynamicOptionInfo) {
+      let { dataSourceId, dataSourceType = 'WORDBOOK', filterKeys, autograph, defaultParams } = dynamicOptionInfo;
+      if (Array.isArray(filterKeys)) {
+        filterKeys = JSON.stringify(filterKeys);
+      }
+      const params = {
+        wordbookId: dataSourceId,
+        wordbookType: dataSourceType,
+        fieldKeys: filterKeys,
+        autograph
+      };
+      return params;
+    },
+    handleRenderFirstDef(item, rows) {
+      let { explicitDefaultVal, multiple } = item.widgetCfg;
+      let needSet = !item.initSearch && explicitDefaultVal;
+      if (!needSet) return;
+      let df = explicitDefaultVal;
+      let defval = [];
+      if (df === 'firstOption') {
+        let [v, k] = rows;
+        v && (defval = [v.myName]);
+      } else {
+        let f = rows.find(v => v.myName.includes(df));
+        if (f) {
+          defval = [f.myName];
+        }
+      }
+      item.value = multiple ? [...defval] : defval[0];
+    },
+    getWordbookDataRender(params, row) {
+      this.$set(row, 'fetchingWordbook', true);
+      return this.handleGetConfigApi(params, 'requestGetWordbookData')
+        .then(res => {
+          this.$set(row, 'fetchingWordbook', false);
+          if (typeof res.data === 'object') {
+            res.data.reqParams = params;
+          }
+          return res;
+        })
+        .catch(() => {
+          this.$set(row, 'fetchingWordbook', false);
+        });
+    },
+
+    formatWordbookDataRender(item, data, params) {
+      let searchPageConfig = {
+          page: 0,
+          hasNextPage: false,
+          isRequest: true,
+          keyword: params?.keyword || undefined,
+          asyncCount: undefined
+        },
+        resArr = [];
+      if (data && data.result === 'SUCCESS') {
+        let reqParams = data?.reqParams || {};
+        let { showKeys, valueKey } = item?.widgetCfg?.dynamicOptionInfo || {};
+        showKeys = Array.isArray(showKeys) ? showKeys : [showKeys];
+        let { page, hasNextPage, fieldList, rows = [] } = data.map;
+
+        // columnName title
+        // showKeys是 columnName 需要从fieldList中匹配住中文
+        let _showKeys_ = [];
+        showKeys.forEach(v => {
+          let mItem = fieldList.find(k => k.columnName === v);
+          if (mItem) {
+            _showKeys_.push(mItem.title);
+          }
+        });
+        this.$set(item, '_showKeys_', _showKeys_);
+
+        searchPageConfig = Object.assign(item.searchPageConfig || {}, {
+          page,
+          hasNextPage,
+          isRequest: true,
+          keyword: params?.keyword || undefined,
+          asyncCount: reqParams?.asyncCount || undefined
+        });
+        let rowsArr = rows.map(row => {
+          let showKeysStr = [];
+          // 取值是value, 展示是change_text
+          let valueKeyN = `_${valueKey}_`;
+          for (let key in row) {
+            let showVal = vexutils.stringToValue(row[key], 'change_text');
+            if (key === valueKey) {
+              row[valueKeyN] = vexutils.stringToValue(row[key]);
+            }
+            row[key] = showVal;
+          }
+          showKeys.forEach(s => {
+            // let str = vexutils.stringToValue(row[s]);
+            showKeysStr.push(row[s]);
+          });
+          // let name = vexutils.stringToValue(row[valueKey]);
+          let name = row[valueKeyN];
+          // 保存的时候值会变成字符串, 如果是数字的话回显会出问题, 这里全部处理成字符串
+          if (typeof name === 'number') {
+            name = String(name);
+          }
+          return Object.assign(row, {
+            myName: name,
+            _show_title: showKeysStr.join(' ')
+          });
+        });
+        // 数组对象去重
+        let obj = {};
+        resArr = rowsArr.reduce((cur, next) => {
+          obj[next.myName] ? '' : (obj[next.myName] = true && cur.push(next));
+          return cur;
+        }, []);
+      } else {
+        this.$set(item, '_showKeys_', []);
+      }
+      return {
+        rows: resArr,
+        searchPageConfig
+      };
+    },
+    wordbookDataMethodRender(params, item) {
+      this.getWordbookDataRender(params, item).then(({ data }) => {
+        let { rows, searchPageConfig } = this.formatWordbookDataRender(item, data, params);
+        this.handleRenderFirstDef(item, rows);
+        this.$set(item, 'dataSource', rows);
+        this.$set(item, 'searchPageConfig', searchPageConfig);
+      });
+    },
+    async getWordbookFirstOptionRender(item) {
+      try {
+        let params = this.wordbookDataParamsRender(item.widgetCfg.dynamicOptionInfo);
+        let { data } = (await this.getWordbookDataRender(params, item)) || {};
+        let { rows, searchPageConfig } = this.formatWordbookDataRender(item, data, params);
+        this.handleRenderFirstDef(item, rows);
+        this.$set(item, 'dataSource', rows);
+        this.$set(item, 'searchPageConfig', searchPageConfig);
+      } catch (err) {
+        console.log(err);
+      }
+    },
+    dropdownVisibleChangeRender(open, item) {
+      if (!open) return;
+      let params = this.wordbookDataParamsRender(item.widgetCfg.dynamicOptionInfo);
+      this.wordbookDataMethodRender(params, item);
+    },
+    handleWordBookSearchDef(value, item, config = {}) {
+      let params = this.wordbookDataParamsRender(item.widgetCfg.dynamicOptionInfo);
+      let { tableDataType, filterKeys } = item?.widgetCfg?.dynamicOptionInfo || {};
+      let searchKeyName = 'keyword';
+      // API类型的列表, keyword名字为filterKeys的值
+      if (tableDataType === 'API' && Array.isArray(filterKeys) && filterKeys.length) {
+        searchKeyName = filterKeys[0] || 'keyword';
+      }
+      let rp = { [searchKeyName]: value, ...params, ...config };
+      this.wordbookDataMethodRender(rp, item);
+    }
+  }
+};

package/packages/table-filter/src/components/render-widget/mixins/label-method.js

@@ -0,0 +1,23 @@
+export default {
+  props: {},
+  data() {
+    return {};
+  },
+  methods: {
+    getLabelDataRender(params) {
+      return this.handleGetConfigApi(params, 'requestListByClassify').then(res => {
+        if (typeof res.data === 'object') {
+          res.data.reqParams = params;
+        }
+        return res;
+      });
+    },
+    getLabelListMethodRender(item) {
+      const { classifyStr = '' } = item.widgetCfg || {};
+      this.getLabelDataRender({ classifyStr }).then(({ data }) => {
+        const { list = [] } = data;
+        this.$set(item, 'tagList', list);
+      });
+    }
+  }
+};

package/packages/table-filter/src/components/render-widget/widgetCfgMaps.js

@@ -1,92 +1,99 @@
 import { WidgetTypeEnums, DatePresetValEnums } from './enums';
 import { InputNumber, Input, DatePicker } from 'ant-design-vue';
-import { CheckboxGroup, Select } from './components';
+import { CheckboxGroup, Select, NumberRange, DateRangeQuick, SelectDynamic, Label, SelectLabel } from './components';
 import moment from 'moment';
 import { presetValToTimestamp } from './helpers/presetValToTimestamp';
 
-const SetDefVal = (defaultValue) => defaultValue
+const SetDefVal = defaultValue => defaultValue;
 
 export const WidgetCfgMaps = new Map([
   [
-    WidgetTypeEnums.INPUT_NUMBER, 
+    WidgetTypeEnums.INPUT_NUMBER,
     {
       component: InputNumber,
       props: {
-        allowClear: true,
+        allowClear: true
       },
-      eventsBySearch: [{
-        name: "keydown",
-        handler(e, search) {
-          if (e.key === 'Enter') {
-            search();
+      eventsBySearch: [
+        {
+          name: 'keydown',
+          handler(e, search) {
+            if (e.key === 'Enter') {
+              search();
+            }
           }
         }
-      }],
+      ],
       handlerProps(props, { title } = {}) {
-        const Props = { ...props, placeholder: `输入${title}` };
+        const Props = { ...props, placeholder: `请输入${title}` };
         return Props;
       },
-      setDefaultValue: SetDefVal,
+      setDefaultValue: SetDefVal
     }
   ],
   [
-    WidgetTypeEnums.INPUT, 
+    WidgetTypeEnums.INPUT,
     {
       component: Input,
       props: {
-        allowClear: true,
+        allowClear: true
       },
-      eventsBySearch: [{
-        name: "keydown",
-        handler(e, search) {
-          if (e.key === 'Enter') {
-            search();
+      eventsBySearch: [
+        {
+          name: 'keydown',
+          handler(e, search) {
+            if (e.key === 'Enter') {
+              search();
+            }
           }
         }
-      }],
+      ],
       handlerProps(props, { title } = {}) {
-        const Props = { ...props, placeholder: `搜索${title}` };
+        const Props = { ...props, placeholder: `请输入${title}` };
         return Props;
       },
-      setDefaultValue: SetDefVal,
+      setDefaultValue: SetDefVal
     }
   ],
   [
-    WidgetTypeEnums.SELECT, 
+    WidgetTypeEnums.SELECT,
     {
       component: Select,
       props: {
         allowClear: true,
         options: [],
         showSearch: true,
-        mode: "default",
-        showArrow: true,
-      },
-      eventsBySearch: [{
-        name: "change",
-        handler(e, search, props) {
-          const { mode } = props;
-          if (mode !== 'multiple') {
-            search();
+        mode: 'default',
+        showArrow: true
+      },
+      eventsBySearch: [
+        {
+          name: 'change',
+          handler(e, search, props) {
+            const { mode } = props;
+            if (mode !== 'multiple') {
+              search();
+            }
           }
         }
-      }],
+      ],
       handlerProps(props, { valueList, multiple, title } = {}) {
         const Props = { ...props, placeholder: `请选择${title}` };
         if (Array.isArray(valueList)) Props.options = valueList.map(({ value, label }) => ({ value, label }));
-        if (multiple) Props.mode = "multiple";
+        if (multiple) Props.mode = 'multiple';
         return Props;
       },
-      setDefaultValue: SetDefVal,
+      setDefaultValue: SetDefVal
     }
   ],
+
   [
-    WidgetTypeEnums.DATE, 
+    WidgetTypeEnums.DATE,
     {
       component: DatePicker,
       props: {
         allowClear: true,
-        valueFormat: "YYYY-MM-DD HH:mm:ss"
+        valueFormat: 'YYYY-MM-DD HH:mm:ss'
       },
       handlerProps(props, { title } = {}) {
         const Props = { ...props, placeholder: `请选择${title}` };
@@ -94,20 +101,20 @@ export const WidgetCfgMaps = new Map([
       },
       setDefaultValue(defaultValue, defValueUnit) {
         if (defValueUnit && defValueUnit !== DatePresetValEnums.CUSTOM) {
-          return presetValToTimestamp(defValueUnit, "YYYY-MM-DD HH:mm:ss");
+          return presetValToTimestamp(defValueUnit, 'YYYY-MM-DD HH:mm:ss');
         }
         return defaultValue;
       }
     }
   ],
   [
-    WidgetTypeEnums.DATE_TIME, 
+    WidgetTypeEnums.DATE_TIME,
     {
       component: DatePicker,
       props: {
         allowClear: true,
-        valueFormat: "YYYY-MM-DD HH:mm:ss",
-        "show-time": { defaultValue: moment('00:00:00', 'HH:mm:ss') }
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        'show-time': { defaultValue: moment('00:00:00', 'HH:mm:ss') }
       },
       handlerProps(props, { title } = {}) {
         const Props = { ...props, placeholder: `请选择${title}` };
@@ -115,7 +122,7 @@ export const WidgetCfgMaps = new Map([
       },
       setDefaultValue(defaultValue, defValueUnit) {
         if (defValueUnit && defValueUnit !== DatePresetValEnums.CUSTOM) {
-          return presetValToTimestamp(defValueUnit, "YYYY-MM-DD HH:mm:ss");
+          return presetValToTimestamp(defValueUnit, 'YYYY-MM-DD HH:mm:ss');
         }
         return defaultValue;
       }
@@ -127,14 +134,155 @@ export const WidgetCfgMaps = new Map([
       component: CheckboxGroup,
       props: {},
       style: {
-        "line-height": "32px"
+        'line-height': '32px'
       },
       handlerProps(props, { valueList, multiple } = {}) {
         const Props = { ...props, multiple };
         if (Array.isArray(valueList)) Props.options = valueList.map(({ value, label }) => ({ value, label }));
         return Props;
       },
-      setDefaultValue: SetDefVal,
+      setDefaultValue: SetDefVal
+    }
+  ],
+  [
+    WidgetTypeEnums.INPUT_NUMBER_RANGE,
+    {
+      component: NumberRange,
+      props: {},
+      handlerProps(props, { valueList, multiple, title, isQuick } = {}) {
+        const placeholderS = isQuick ? '最小值' : `起始${title}`;
+        const placeholderE = isQuick ? '最大值' : `截止${title}`;
+        const Props = { ...props, multiple, placeholderS, placeholderE };
+        if (Array.isArray(valueList)) Props.options = valueList.map(({ value, label }) => ({ value, label }));
+        return Props;
+      },
+      setDefaultValue: SetDefVal
+    }
+  ],
+  [
+    WidgetTypeEnums.DATE_RANGE,
+    {
+      component: DatePicker.RangePicker,
+      props: {
+        allowClear: true,
+        valueFormat: 'YYYY-MM-DD'
+      },
+      handlerProps(props, { title } = {}) {
+        const Props = { ...props, placeholder: [`起始${title}`, `截止${title}`] };
+        return Props;
+      },
+      setDefaultValue(defaultValue, defValueUnit) {
+        if (defValueUnit && defValueUnit !== DatePresetValEnums.CUSTOM) {
+          let resDate = presetValToTimestamp(defValueUnit, 'YYYY-MM-DD');
+          return [resDate, resDate];
+        }
+        if (!defaultValue || (defaultValue && !Array.isArray(defaultValue))) {
+          return [];
+        }
+        return defaultValue;
+      }
+    }
+  ],
+  [
+    WidgetTypeEnums.DATETIME_RANGE,
+    {
+      component: DatePicker.RangePicker,
+      props: {
+        allowClear: true,
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        'show-time': { defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')] }
+      },
+      handlerProps(props, { title } = {}) {
+        const Props = { ...props, placeholder: [`起始${title}`, `截止${title}`] };
+        return Props;
+      },
+      setDefaultValue(defaultValue, defValueUnit) {
+        if (defValueUnit && defValueUnit !== DatePresetValEnums.CUSTOM) {
+          let resDate = presetValToTimestamp(defValueUnit, 'YYYY-MM-DD HH:mm:ss');
+          return [resDate, resDate];
+        }
+        if (!defaultValue || (defaultValue && !Array.isArray(defaultValue))) {
+          return [];
+        }
+        return defaultValue;
+      }
+    }
+  ],
+  [
+    WidgetTypeEnums.DATE_RANGE_QUICK,
+    {
+      component: DateRangeQuick,
+      props: {},
+      handlerProps(props, { fieldType } = {}) {
+        let str = fieldType === 'DATE' ? '日期' : '时间';
+        const Props = { ...props, placeholderS: `开始${str}`, placeholderE: `结束${str}`, fieldType };
+        return Props;
+      },
+      setDefaultValue: SetDefVal
+    }
+  ],
+  [
+    WidgetTypeEnums.SELECT_DYNAMIC,
+    {
+      component: SelectDynamic,
+      props: {},
+      eventsBySearch: [
+        {
+          name: 'change',
+          handler(e, search, props) {
+            const { mode } = props;
+            if (mode !== 'multiple') {
+              search();
+            }
+          }
+        }
+      ],
+      handlerProps(props, { multiple, title } = {}) {
+        const Props = { ...props, placeholder: `请选择${title}` };
+        Props.mode = multiple ? 'multiple' : 'default';
+        return Props;
+      },
+      setDefaultValue: SetDefVal
+    }
+  ],
+  [
+    WidgetTypeEnums.LABEL,
+    {
+      component: Label,
+      props: {},
+      handlerProps(props) {
+        const Props = { ...props };
+        return Props;
+      },
+      setDefaultValue(defaultValue, defValueUnit) {
+        if (defaultValue && Array.isArray(defaultValue)) {
+          return defaultValue.join('|#|');
+        }
+        return defaultValue;
+      }
+    }
+  ],
+  [
+    WidgetTypeEnums.SELECT_LABEL,
+    {
+      component: SelectLabel,
+      props: {
+        allowClear: true,
+        showSearch: true,
+        mode: 'default',
+        showArrow: true
+      },
+      handlerProps(props, { multiple, title } = {}) {
+        const Props = { ...props, placeholder: `请选择${title}` };
+        Props.mode = multiple ? 'multiple' : 'default';
+        return Props;
+      },
+      setDefaultValue(defaultValue, defValueUnit) {
+        if (defaultValue && Array.isArray(defaultValue)) {
+          return defaultValue.join('|#|');
+        }
+        return defaultValue;
+      }
     }
-  ]
-]);
+  ],
+]);

package/packages/table-filter/src/components/search-filter/SearchFilter.vue

@@ -42,6 +42,7 @@
 <script>
 import {Modal,Icon} from 'ant-design-vue'
 import SearchCondition from "../search-condition/SearchCondition.vue";
+import svgIcon from '@/component/svg/index.vue';
 export default {
   name: "SearchFilter",
   props: {
@@ -69,7 +70,8 @@ export default {
   components: {
     SearchCondition,
     AModal:Modal,
-    [Icon.name]:Icon
+    [Icon.name]:Icon,
+    svgIcon
   },
   watch: {
     visible(value) {

package/packages/table-filter/src/components/search-modal/set-classification.vue

@@ -191,7 +191,7 @@ export default {
       });
     },
     // 保存列表搜索分类
-    async saveAdd(params) {
+    async saveAdd(params, isValidConObj, config = {}) {
       try {
         Object.assign(params, {
           tableId: this.$attrs.tableId,
@@ -202,9 +202,13 @@ export default {
         let res = await this.handleGetConfigApi(params, 'requestSaveTableCondiTion');
         if (!res) return;
         let searchFilter = this.$refs.searchFilter;
+        let {cancelSaveAdd} = config
         if (searchFilter) {
           searchFilter.cancelSaveAdd();
         }
+        if(!searchFilter && typeof cancelSaveAdd === 'function') {
+          cancelSaveAdd()
+        }
         this.$emit('saveGetTableCondiTionList');
         this.addVisible = false;
       } catch (error) {