cnhis-design-vue 2.1.78 → 2.1.80

package/packages/table-filter/src/mixins/out-quick-method.js

@@ -0,0 +1,123 @@
+import vexutils from '@/utils/vexutils';
+import wordBookutils from './wordBookutils';
+
+export default {
+  data() {
+    return {
+      fetchingWordbook: false
+    };
+  },
+  methods: {
+    handleWordBookSearch(value, item, config = {}) {
+      if (item.comType != 'SelectMuiWordBook') return;
+      let curAutograph = item.settingObj.wordbook && item.settingObj.wordbook.autograph;
+      let params = {
+        keyword: value,
+        autograph: curAutograph
+      };
+      let obj = {};
+      let p = item?.setting?.wordbook?.params || undefined;
+      if (p) {
+        item.setting.wordbook.params.forEach(item => {
+          obj[item.p_name] = item.p_value;
+        });
+      }
+      let rp = { ...params, ...obj, ...config };
+      this.getWordbookData(item.setting.wordbook, rp).then(({ data }) => {
+        this.handleWordbookData(item, data, rp);
+      });
+    },
+    wordbookDataParams(item) {
+      let obj = {};
+      if (item.setting.wordbook.params) {
+        item.setting.wordbook.params.forEach(item => {
+          obj[item.p_name] = item.p_value;
+        });
+      }
+      if (item.settingObj.wordbook) {
+        obj.autograph = item.settingObj.wordbook.autograph;
+      }
+      let df = item.explicitDefaultVal;
+      if (df != 'firstOption') {
+        obj.keyword = df;
+      }
+      return obj;
+    },
+    async getWordbookFirstOption(item) {
+      try {
+        let obj = this.wordbookDataParams(item);
+        let { data } = (await this.getWordbookData(item.setting.wordbook, obj)) || {};
+        this.handleWordbookData(item, data, obj);
+      } catch (err) {
+        console.log(err);
+      }
+    },
+
+    dropdownVisibleChange(open, item, config = {}) {
+      if (item.comType != 'SelectMuiWordBook') return;
+      if (open) {
+        let obj = this.wordbookDataParams(item);
+        this.getWordbookData(item.setting.wordbook, obj).then(({ data }) => {
+          this.handleWordbookData(item, data, obj);
+        });
+      }
+    },
+    handleFirstDef(item, rows) {
+      // 初始化获取值
+      let showKeys = item?.setting?.wordbook?.showKeys || [];
+      let initSearch = this.isOut ? item.initSearch : this.initSearch;
+      if (initSearch) return;
+      let df = item.explicitDefaultVal;
+      if (df) {
+        let defval = [];
+        if (df === 'firstOption') {
+          let [v, k] = rows;
+          //  如果有添加提示标题，取第二个
+          if (showKeys.length > 0 && item.hasFieldList) {
+            v = k;
+          }
+          v && (defval = [v.myName]);
+        } else {
+          let f = rows.find(v => v.myName.includes(df));
+          if (f) {
+            defval = [f.myName];
+          }
+        }
+        item.value = [...defval];
+        item.search_DefaultValue = [...defval];
+      }
+      this.isOut ? this.$set(item, 'initSearch', true) : (this.initSearch = true);
+    },
+    handleWordbookData(item, data, params) {
+      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);
+      this.handleFirstDef(item, rows);
+    },
+    getWordbookData(o, obj) {
+      let { id, filterKeys, wordbookType } = o;
+      !this.isOut && (this.fetchingWordbook = true);
+      let resFieldKeys = Array.isArray(filterKeys) ? JSON.stringify(filterKeys) : filterKeys;
+      let params = {
+        wordbookId: id,
+        fieldKeys: resFieldKeys,
+        wordbookType: wordbookType || 'WORDBOOK',
+        asyncCount: 1, // 开启性能模式
+        ...obj
+      };
+      return this.handleGetConfigApi(params, 'requestGetWordbookData', { fields: o })
+        .then(res => {
+          !this.isOut && (this.fetchingWordbook = false);
+          if (typeof res.data === 'object') {
+            res.data.reqParams = params;
+          }
+          return res;
+        })
+        .catch(() => {
+          !this.isOut && (this.fetchingWordbook = false);
+        });
+    }
+  }
+};

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

@@ -1,89 +1,97 @@
-import { WidgetCfgMaps } from '../components/render-widget/widgetCfgMaps';
-import { WidgetTypeEnums, DatePresetValEnums } from '../components/render-widget/enums';
-
-function randomkey() {
-  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, c => {
-    const r = (Math.random() * 16) | 0;
-    const v = c === "x" ? r : (r & 0x3) | 0x8;
-    return v.toString(16);
-  });
-}
-
-// 外层换行
-const BlockEle = [WidgetTypeEnums.CHECKBOX_GROUP];
-
-export default {
-  methods: {
-    isRender(cfg) {
-      return cfg.widgetCfg?.isRender;
-    },
-    getDefValByRenderWidget(cfg) {
-      const { widgetType, defaultValue, defValueUnit } = cfg.widgetCfg || {};
-      const Widget = WidgetCfgMaps.get(widgetType);
-      let defVal;
-      if (Widget) {
-        const { setDefaultValue } = Widget;
-        if (setDefaultValue) defVal = setDefaultValue(defaultValue, defValueUnit);
-      }
-      return defVal;
-    },
-    initRenderWidgetCfg(cfg) {
-      const isRender = this.isRender(cfg);
-      if (!isRender) return isRender;
-
-      const { widgetType } = cfg.widgetCfg || {};
-
-      this.$set(cfg, "_frontId", randomkey());
-      this.$set(cfg, "isRender", isRender);
-      this.$set(cfg, "widgetType", widgetType);
-      this.$set(cfg, "con", "EQ");
-
-      if (BlockEle.includes(widgetType)) this.$set(cfg, "_isBlock", true); 
-
-      this.$set(cfg, 'value', this.getDefValByRenderWidget(cfg));
-
-      return isRender;
-    },
-    getRenderSearchConObj(cfg) {
-      const isRender = this.isRender(cfg);
-      if (!isRender) return null;
-      const { columnName, con, value, widgetType } = cfg;
-      
-      let unit = null;
-      // 时间组件 unit 设置为自定义
-      const dateWidgetTypes = [WidgetTypeEnums.DATE, WidgetTypeEnums.DATE_TIME];
-      if (dateWidgetTypes.includes(widgetType)) {
-        unit = DatePresetValEnums.CUSTOM;
-      }
-
-      const val = Array.isArray(value) ? value : value ? [value] : [];
-
-      return {
-        field_key: columnName,
-        con,
-        value: val.length > 0 ? val : null,
-        unit,
-      }
-    },
-    getDefValByRenderConObj(conObj, cfg) {
-      const isRender = this.isRender(cfg);
-      if (!isRender) return null;
-      const { widgetType, multiple } = cfg.widgetCfg || {};
-      const { value } = conObj;
-      if ((widgetType === WidgetTypeEnums.SELECT || widgetType === WidgetTypeEnums.CHECKBOX_GROUP) && multiple) {
-        return Array.isArray(value) ? value : value ? [value] : [];
-      }
-      return !Array.isArray(value) ? value : value[0];
-    },
-    isExistDefValByRenderWidget(cfg) {
-      const { defaultValue, defValueUnit } = cfg.widgetCfg || {};
-      return !!(defaultValue || defValueUnit);
-    },
-    resetRenderWidgetValue(cfg) {
-      const isRender = this.isRender(cfg);
-      if (!isRender) return isRender;
-      cfg.value = undefined;
-      return isRender;
-    }
-  },
-}
+import { WidgetCfgMaps } from '../components/render-widget/widgetCfgMaps';
+import { WidgetTypeEnums, DatePresetValEnums } from '../components/render-widget/enums';
+
+function randomkey() {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
+    const r = (Math.random() * 16) | 0;
+    const v = c === 'x' ? r : (r & 0x3) | 0x8;
+    return v.toString(16);
+  });
+}
+
+// 外层换行
+const BlockEle = [WidgetTypeEnums.CHECKBOX_GROUP, WidgetTypeEnums.DATE_RANGE_QUICK];
+
+export default {
+  methods: {
+    isRender(cfg) {
+      return cfg.widgetCfg?.isRender;
+    },
+    getDefValByRenderWidget(cfg) {
+      const { widgetType, defaultValue, defValueUnit } = cfg.widgetCfg || {};
+      const Widget = WidgetCfgMaps.get(widgetType);
+      let defVal;
+      if (Widget) {
+        const { setDefaultValue } = Widget;
+        if (setDefaultValue) defVal = setDefaultValue(defaultValue, defValueUnit);
+      }
+      return defVal;
+    },
+    initRenderWidgetCfg(cfg) {
+      const isRender = this.isRender(cfg);
+      if (!isRender) return isRender;
+
+      const { widgetType } = cfg.widgetCfg || {};
+
+      this.$set(cfg, '_frontId', randomkey());
+      this.$set(cfg, 'isRender', isRender);
+      this.$set(cfg, 'widgetType', widgetType);
+      this.$set(cfg, 'con', 'EQ');
+
+      if (BlockEle.includes(widgetType)) this.$set(cfg, '_isBlock', true);
+
+      this.$set(cfg, 'value', this.getDefValByRenderWidget(cfg));
+
+      return isRender;
+    },
+    getRenderSearchConObj(cfg) {
+      const isRender = this.isRender(cfg);
+      if (!isRender) return null;
+      const { columnName, con, value, widgetType } = cfg;
+
+      let unit = null;
+      // 时间组件 unit 设置为自定义
+      const dateWidgetTypes = [WidgetTypeEnums.DATE, WidgetTypeEnums.DATE_TIME];
+      if (dateWidgetTypes.includes(widgetType)) {
+        unit = DatePresetValEnums.CUSTOM;
+      }
+
+      const val = Array.isArray(value) ? value : value ? [value] : [];
+
+      return {
+        field_key: columnName,
+        con,
+        value: val.length > 0 ? val : null,
+        unit
+      };
+    },
+    getDefValByRenderConObj(conObj, cfg) {
+      const isRender = this.isRender(cfg);
+      if (!isRender) return null;
+      const { widgetType, multiple } = cfg.widgetCfg || {};
+      const { value } = conObj;
+      if ((widgetType === WidgetTypeEnums.SELECT || widgetType === WidgetTypeEnums.CHECKBOX_GROUP) && multiple) {
+        return Array.isArray(value) ? value : value ? [value] : [];
+      }
+      return !Array.isArray(value) ? value : value[0];
+    },
+    isExplicitDefaultVal(cfg) {
+      const { explicitDefaultVal } = cfg.widgetCfg || {};
+      return explicitDefaultVal === 'firstOption';
+    },
+    isExistDefValByRenderWidget(cfg) {
+      const { defaultValue, defValueUnit } = cfg.widgetCfg || {};
+      if (this.isExplicitDefaultVal(cfg)) return true;
+      return !!(defaultValue || defValueUnit);
+    },
+    resetRenderWidgetValue(cfg) {
+      const isRender = this.isRender(cfg);
+      if (!isRender) return isRender;
+      if (cfg.widgetType == 'DATE_RANGE_QUICK') {
+        cfg.con = undefined;
+      }
+      cfg.value = undefined;
+      return isRender;
+    }
+  }
+};

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

@@ -1,128 +1,128 @@
-function monthToYear(v) {
-  v = Number(v) || 0;
-  const y = Math.floor(v / 12);
-  const m = v % 12;
-  return (y ? `${y}年` : "") + (m ? (m == 6 ? `半${y ? "" : "年"}` : `${m}个月`) : "");
-}
-import moment from 'moment';
-import 'moment/locale/zh-cn';
-export default {
-  methods: {
-    validConObj(conObj, fieldList, fieldSearchLimit) {
-      if (!fieldSearchLimit || !conObj?.length || !fieldList?.length) return true;
-      const fieldKeyToIdx = fieldList.reduce((obj, item, i) => {
-        obj[item.columnName] = i;
-        return obj;
-      }, {});
-      const validDate = (item, field, limit) => {
-        let max = limit.value;
-        let time = 0,
-          timeCrossLimit = max;
-        if (!max) return true;
-        const conToMonth = {
-          TODAY: 1 / 30,
-          TOMORROW: 1 / 30,
-          YESTERDAY: 1 / 30,
-          THIS_WEEK: 7 / 30,
-          NEXT_WEEK: 7 / 30,
-          LAST_WEEK: 7 / 30,
-          THIS_MONTH: 1,
-          NEXT_MONTH: 1,
-          LAST_MONTH: 1,
-          THIS_SEASON: 3,
-          NEXT_SEASON: 3,
-          LAST_SEASON: 3,
-          THIS_YEAR: 12,
-          NEXT_YEAR: 12,
-          LAST_YEAR: 12
-        };
-        const unitToMonth = {
-          HOUR: 1 / 24 / 30,
-          DAY: 1 / 30,
-          WEEK: 7 / 30,
-          MONTH: 1,
-          QUARTER: 3,
-          YEAR: 12
-        };
-        const con = item.con;
-        if (con === "IN") {
-          // 获取日期选择类型值
-          const { start_val, end_val } = item;
-          if ((!start_val && end_val) || (start_val && !end_val)) {
-            this.$message.warning(`请选择${field.title}${start_val ? "截止" : "起始"}日期`);
-            return;
-          }
-          if (start_val && end_val) {
-            time = moment(end_val).valueOf();
-            max = moment(start_val)
-              .add(timeCrossLimit, "month")
-              .valueOf();
-          }
-        } else if (conToMonth[con]) {
-          // 获取con  能转换月份的值
-          time = conToMonth[con];
-        } else if (",IN_THE_PAST,IN_THE_FUTURE,".includes(`,${con},`)) {
-          // 获取范围类型
-          const { value, unit } = item;
-          const u = unitToMonth[unit] || 1;
-          time = Math.floor(Number(value) * Number(u) * 100) / 100;
-        } else if (",IN_THE_PAST_DI,IN_THE_FUTURE_DI,".includes(`,${con},`)) {
-          // 指定范围类型值
-          const { unit } = item;
-          time = unitToMonth[unit] || 0;
-        }
-        const result = time <= max;
-        if (!result) {
-          const title = field.title || "";
-          this.$message.warning(`${title}最大查询跨度${monthToYear(limit.value)}`);
-        }
-        return result;
-      };
-      const validFn = item => {
-        const field_key = item.field_key;
-        const field = fieldList[fieldKeyToIdx[field_key]];
-        const limit = fieldSearchLimit[field_key];
-        if (!field || !limit) return true;
-        if (limit.type === "time") {
-          return validDate(item, field, limit);
-        }
-        return true;
-      };
-      const flag = conObj.every(validFn);
-      return flag;
-    },
-    // 根据搜索限制规则获取默认值
-    getSearchDefValueByLimit(field, searchLimit) {
-      const limit = searchLimit[field.columnName];
-      if (limit) {
-        if (limit.type === "time") {
-          const { way, defValue } = limit;
-          const isBefore = way == 1;
-          const v1 = this.$moment();
-          const v2 = v1.clone().add("month", defValue * (isBefore ? -1 : 1));
-          return isBefore ? [v2, v1] : [v1, v2];
-        }
-      }
-    },
-    formatSearchLimit(limitList, freeze = true) {
-      const formatTips = {
-        time(item) {
-          const { value, defValue } = item;
-          return `默认查询${monthToYear(defValue)}，最大查询跨度${monthToYear(value)}`;
-        }
-      };
-      const data = limitList.reduce((obj, item) => {
-        const { key } = item;
-        if (key) {
-          const tips = formatTips[item.type] ? formatTips[item.type](item) : "";
-          obj[key] = {
-            ...item,
-            tips
-          };
-        }
-        return obj;
-      }, {});
-      return freeze ? Object.freeze(data) : data;
-    }
-  }
-};
+function monthToYear(v) {
+  v = Number(v) || 0;
+  const y = Math.floor(v / 12);
+  const m = v % 12;
+  return (y ? `${y}年` : "") + (m ? (m == 6 ? `半${y ? "" : "年"}` : `${m}个月`) : "");
+}
+import moment from 'moment';
+import 'moment/locale/zh-cn';
+export default {
+  methods: {
+    validConObj(conObj, fieldList, fieldSearchLimit) {
+      if (!fieldSearchLimit || !conObj?.length || !fieldList?.length) return true;
+      const fieldKeyToIdx = fieldList.reduce((obj, item, i) => {
+        obj[item.columnName] = i;
+        return obj;
+      }, {});
+      const validDate = (item, field, limit) => {
+        let max = limit.value;
+        let time = 0,
+          timeCrossLimit = max;
+        if (!max) return true;
+        const conToMonth = {
+          TODAY: 1 / 30,
+          TOMORROW: 1 / 30,
+          YESTERDAY: 1 / 30,
+          THIS_WEEK: 7 / 30,
+          NEXT_WEEK: 7 / 30,
+          LAST_WEEK: 7 / 30,
+          THIS_MONTH: 1,
+          NEXT_MONTH: 1,
+          LAST_MONTH: 1,
+          THIS_SEASON: 3,
+          NEXT_SEASON: 3,
+          LAST_SEASON: 3,
+          THIS_YEAR: 12,
+          NEXT_YEAR: 12,
+          LAST_YEAR: 12
+        };
+        const unitToMonth = {
+          HOUR: 1 / 24 / 30,
+          DAY: 1 / 30,
+          WEEK: 7 / 30,
+          MONTH: 1,
+          QUARTER: 3,
+          YEAR: 12
+        };
+        const con = item.con;
+        if (con === "IN") {
+          // 获取日期选择类型值
+          const { start_val, end_val } = item;
+          if ((!start_val && end_val) || (start_val && !end_val)) {
+            this.$message.warning(`请选择${field.title}${start_val ? "截止" : "起始"}日期`);
+            return;
+          }
+          if (start_val && end_val) {
+            time = moment(end_val).valueOf();
+            max = moment(start_val)
+              .add(timeCrossLimit, "month")
+              .valueOf();
+          }
+        } else if (conToMonth[con]) {
+          // 获取con  能转换月份的值
+          time = conToMonth[con];
+        } else if (",IN_THE_PAST,IN_THE_FUTURE,".includes(`,${con},`)) {
+          // 获取范围类型
+          const { value, unit } = item;
+          const u = unitToMonth[unit] || 1;
+          time = Math.floor(Number(value) * Number(u) * 100) / 100;
+        } else if (",IN_THE_PAST_DI,IN_THE_FUTURE_DI,".includes(`,${con},`)) {
+          // 指定范围类型值
+          const { unit } = item;
+          time = unitToMonth[unit] || 0;
+        }
+        const result = time <= max;
+        if (!result) {
+          const title = field.title || "";
+          this.$message.warning(`${title}最大查询跨度${monthToYear(limit.value)}`);
+        }
+        return result;
+      };
+      const validFn = item => {
+        const field_key = item.field_key;
+        const field = fieldList[fieldKeyToIdx[field_key]];
+        const limit = fieldSearchLimit[field_key];
+        if (!field || !limit) return true;
+        if (limit.type === "time") {
+          return validDate(item, field, limit);
+        }
+        return true;
+      };
+      const flag = conObj.every(validFn);
+      return flag;
+    },
+    // 根据搜索限制规则获取默认值
+    getSearchDefValueByLimit(field, searchLimit) {
+      const limit = searchLimit[field.columnName];
+      if (limit) {
+        if (limit.type === "time") {
+          const { way, defValue } = limit;
+          const isBefore = way == 1;
+          const v1 = this.$moment();
+          const v2 = v1.clone().add("month", defValue * (isBefore ? -1 : 1));
+          return isBefore ? [v2, v1] : [v1, v2];
+        }
+      }
+    },
+    formatSearchLimit(limitList, freeze = true) {
+      const formatTips = {
+        time(item) {
+          const { value, defValue } = item;
+          return `默认查询${monthToYear(defValue)}，最大查询跨度${monthToYear(value)}`;
+        }
+      };
+      const data = limitList.reduce((obj, item) => {
+        const { key } = item;
+        if (key) {
+          const tips = formatTips[item.type] ? formatTips[item.type](item) : "";
+          obj[key] = {
+            ...item,
+            tips
+          };
+        }
+        return obj;
+      }, {});
+      return freeze ? Object.freeze(data) : data;
+    }
+  }
+};