cnhis-design-vue 2.1.126 → 2.1.127

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.1.126",
+  "version": "2.1.127",
   "description": "前端业务UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",

package/packages/grid/src/grid.js

@@ -8,7 +8,6 @@ import 'xe-utils';
 import VXETable from 'vxe-table';
 import VXETablePluginAntd from 'vxe-table-plugin-antd';
 import Grid from 'vxe-table/lib/grid';
-import 'vxe-table/lib/style.css';
 import 'vxe-table-plugin-antd/dist/style.css';
 
 VXETable.use(VXETablePluginAntd);

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

@@ -17,20 +17,43 @@ export const WidgetTypeEnums = {
 export const DatePresetValEnums = {
   CUSTOM: 'CUSTOM', // 自定义输入，特殊处理
 
-  NOW: 'NOW',
-  TODAY: 'TODAY',
-  TODAY_START: 'TODAY_START',
-  TODAY_END: 'TODAY_END',
-  TOMORROW: 'TOMORROW',
-  TOMORROW_START: 'TOMORROW_START',
-  TOMORROW_END: 'TOMORROW_END',
-  YESTERDAY: 'YESTERDAY',
-  YESTERDAY_START: 'YESTERDAY_START',
-  YESTERDAY_END: 'YESTERDAY_END',
-
-  WEEK_START: 'THIS_WEEK_START',
-  WEEK_END: 'THIS_WEEK_END',
-
-  MONTH_START: 'THIS_MONTH_START',
-  MONTH_END: 'THIS_MONTH_END'
+  NOW: 'NOW', // 当前
+  TODAY: 'TODAY', // 今天
+  TODAY_START: 'TODAY_START', // 今天初
+  TODAY_END: 'TODAY_END', // 今天未
+
+  TOMORROW: 'TOMORROW', // 明天
+  TOMORROW_START: 'TOMORROW_START', // 明天初
+  TOMORROW_END: 'TOMORROW_END', // 明天未
+
+  YESTERDAY: 'YESTERDAY', // 昨天
+  YESTERDAY_START: 'YESTERDAY_START', // 昨天初
+  YESTERDAY_END: 'YESTERDAY_END', // 昨天未
+
+  THIS_WEEK: 'THIS_WEEK', // 本周
+  WEEK_START: 'THIS_WEEK_START', // 本周初
+  WEEK_END: 'THIS_WEEK_END', // 本周未
+  NEXT_WEEK: 'NEXT_WEEK', // 下周
+  LAST_WEEK: 'LAST_WEEK', // 上周
+  PAST_WEEK: 'PAST_WEEK', // 近一周(7天)
+
+  THIS_MONTH: 'THIS_MONTH', // 本月
+  MONTH_START: 'THIS_MONTH_START', // 本月初
+  MONTH_END: 'THIS_MONTH_END', // 本月未
+  NEXT_MONTH: 'NEXT_MONTH', // 下月
+  LAST_MONTH: 'LAST_MONTH', // 上月
+  PAST_MONTH: 'PAST_MONTH', // 近一个月(30天)
+
+  THIS_QUARTER: 'THIS_QUARTER', // 本季度
+  NEXT_QUARTER: 'NEXT_QUARTER', // 上季度
+  LAST_QUARTER: 'LAST_QUARTER', // 下季度
+  QUARTER_START: 'THIS_QUARTER_START', // 季度初
+  QUARTER_END: 'THIS_QUARTER_END', // 季度未
+
+  THIS_YEAR: 'THIS_YEAR', // 今年
+  YEAR_START: 'THIS_YEAR_START', // 今年初
+  YEAR_END: 'THIS_YEAR_END', // 今年未
+  NEXT_YEAR: 'NEXT_YEAR', // 明年
+  LAST_YEAR: 'LAST_YEAR', // 去年
+  PAST_HALF_YEAR: 'PAST_HALF_YEAR' // 近半年(182天)
 };

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

@@ -1,68 +1,282 @@
 import { DatePresetValEnums } from '../enums';
 import moment from 'moment';
 
+const isPastTime = type => {
+  return type === 'DATETIME_PAST';
+};
+const isFutureTime = type => {
+  return type === 'DATETIME_FUTURE';
+};
+
+const nowTime = moment();
+
 const Maps = new Map([
+  [DatePresetValEnums.NOW, () => moment()],
+  [DatePresetValEnums.TODAY, () => [moment().startOf('day'), moment().endOf('day')]],
+  [DatePresetValEnums.TODAY_START, () => moment().startOf('day')],
+  [DatePresetValEnums.TODAY_END, () => moment().endOf('day')],
   [
-    DatePresetValEnums.NOW,
-    () => moment(),
+    DatePresetValEnums.TOMORROW,
+    () => [
+      moment()
+        .add(1, 'days')
+        .startOf('day'),
+      moment()
+        .add(1, 'days')
+        .endOf('day')
+    ]
   ],
   [
-    DatePresetValEnums.TODAY,
-    () => moment().startOf("day"),
+    DatePresetValEnums.TOMORROW_START,
+    () =>
+      moment()
+        .add(1, 'days')
+        .startOf('day')
   ],
   [
-    DatePresetValEnums.TODAY_START,
-    () => moment().startOf("day")
+    DatePresetValEnums.TOMORROW_END,
+    () =>
+      moment()
+        .add(1, 'days')
+        .endOf('day')
   ],
   [
-    DatePresetValEnums.TODAY_END,
-    () => moment().endOf("day")
+    DatePresetValEnums.YESTERDAY,
+    () => [
+      moment()
+        .subtract(1, 'days')
+        .startOf('day'),
+      moment()
+        .subtract(1, 'days')
+        .endOf('day')
+    ]
   ],
   [
-    DatePresetValEnums.TOMORROW,
-    () => moment().add(1, "days").startOf("day"),
+    DatePresetValEnums.YESTERDAY_START,
+    () =>
+      moment()
+        .subtract(1, 'days')
+        .startOf('day')
   ],
   [
-    DatePresetValEnums.TOMORROW_START,
-    () => moment().add(1, "days").startOf("day")
+    DatePresetValEnums.YESTERDAY_END,
+    () =>
+      moment()
+        .subtract(1, 'days')
+        .endOf('day')
   ],
+  // week
+  [DatePresetValEnums.WEEK_START, () => moment().startOf('week')],
+  [DatePresetValEnums.WEEK_END, () => moment().endOf('week')],
+
   [
-    DatePresetValEnums.TOMORROW_END,
-    () => moment().add(1, "days").endOf("day")
+    DatePresetValEnums.THIS_WEEK,
+    type => {
+      let start = moment().startOf('week');
+      let end = moment().endOf('week');
+      if (isPastTime(type)) {
+        end = nowTime;
+      }
+      if (isFutureTime(type)) {
+        start = nowTime;
+      }
+      return [start, end];
+    }
   ],
   [
-    DatePresetValEnums.YESTERDAY,
-    () => moment().subtract(1, "days").startOf("day"),
+    DatePresetValEnums.NEXT_WEEK,
+    () => [
+      moment()
+        .add(1, 'weeks')
+        .startOf('week'),
+      moment()
+        .add(1, 'weeks')
+        .endOf('week')
+    ]
   ],
   [
-    DatePresetValEnums.YESTERDAY_START,
-    () => moment().subtract(1, "days").startOf("day")
+    DatePresetValEnums.LAST_WEEK,
+    () => [
+      moment()
+        .subtract(1, 'weeks')
+        .startOf('week'),
+      moment()
+        .subtract(1, 'weeks')
+        .endOf('week')
+    ]
   ],
   [
-    DatePresetValEnums.YESTERDAY_END,
-    () => moment().subtract(1, "days").endOf("day")
+    DatePresetValEnums.PAST_WEEK,
+    type => {
+      let start = moment()
+        .subtract(7, 'days')
+        .startOf('day');
+      let end = moment().endOf('day');
+      if (isPastTime(type)) {
+        end = nowTime;
+      }
+      return [start, end];
+    }
+  ],
+  // month
+  [
+    DatePresetValEnums.THIS_MONTH,
+    type => {
+      let start = moment().startOf('month');
+      let end = moment().endOf('month');
+      if (isPastTime(type)) {
+        end = nowTime;
+      }
+      if (isFutureTime(type)) {
+        start = nowTime;
+      }
+      return [start, end];
+    }
+  ],
+  [DatePresetValEnums.MONTH_START, () => moment().startOf('month')],
+  [DatePresetValEnums.MONTH_END, () => moment().endOf('month')],
+  [
+    DatePresetValEnums.NEXT_MONTH,
+    () => [
+      moment()
+        .add(1, 'months')
+        .startOf('month'),
+      moment()
+        .add(1, 'months')
+        .endOf('month')
+    ]
+  ],
+  [
+    DatePresetValEnums.LAST_MONTH,
+    () => [
+      moment()
+        .subtract(1, 'months')
+        .startOf('month'),
+      moment()
+        .subtract(1, 'months')
+        .endOf('month')
+    ]
+  ],
+  [
+    DatePresetValEnums.PAST_MONTH,
+    type => {
+      let start = moment()
+        .subtract(30, 'days')
+        .startOf('day');
+      let end = moment().endOf('day');
+      if (isPastTime(type)) {
+        end = nowTime;
+      }
+      return [start, end];
+    }
+  ],
+  // quarter
+  [
+    DatePresetValEnums.THIS_QUARTER,
+    type => {
+      let start = moment().startOf('quarter');
+      let end = moment().endOf('quarter');
+      if (isPastTime(type)) {
+        end = nowTime;
+      }
+      if (isFutureTime(type)) {
+        start = nowTime;
+      }
+      return [start, end];
+    }
+  ],
+  [
+    DatePresetValEnums.NEXT_QUARTER,
+    () => [
+      moment()
+        .add(1, 'quarters')
+        .startOf('quarter'),
+      moment()
+        .add(1, 'quarters')
+        .endOf('quarter')
+    ]
   ],
   [
-    DatePresetValEnums.WEEK_START,
-    () => moment().startOf("week")
+    DatePresetValEnums.LAST_QUARTER,
+    () => [
+      moment()
+        .subtract(1, 'quarters')
+        .startOf('quarter'),
+      moment()
+        .subtract(1, 'quarters')
+        .endOf('quarter')
+    ]
   ],
+  [DatePresetValEnums.QUARTER_START, () => moment().startOf('quarter')],
+  [DatePresetValEnums.QUARTER_END, () => moment().endOf('quarter')],
+  // year
   [
-    DatePresetValEnums.WEEK_END,
-    () => moment().endOf("week")
+    DatePresetValEnums.THIS_YEAR,
+    type => {
+      let start = moment().startOf('year');
+      let end = moment().endOf('year');
+      if (isPastTime(type)) {
+        end = nowTime;
+      }
+      if (isFutureTime(type)) {
+        start = nowTime;
+      }
+      return [start, end];
+    }
   ],
+  [DatePresetValEnums.YEAR_START, () => moment().startOf('year')],
+  [DatePresetValEnums.YEAR_END, () => moment().endOf('year')],
   [
-    DatePresetValEnums.MONTH_START,
-    () => moment().startOf("month")
+    DatePresetValEnums.NEXT_YEAR,
+    () => [
+      moment()
+        .add(1, 'years')
+        .startOf('year'),
+      moment()
+        .add(1, 'years')
+        .endOf('year')
+    ]
   ],
   [
-    DatePresetValEnums.MONTH_END,
-    () => moment().endOf("month")
+    DatePresetValEnums.LAST_YEAR,
+    () => [
+      moment()
+        .subtract(1, 'years')
+        .startOf('year'),
+      moment()
+        .subtract(1, 'years')
+        .endOf('year')
+    ]
   ],
-])
+  [
+    DatePresetValEnums.PAST_HALF_YEAR,
+    type => {
+      let start = moment()
+        .subtract(182, 'days')
+        .startOf('day');
+      let end = moment().endOf('day');
+      if (isPastTime(type)) {
+        end = nowTime;
+      }
+      return [start, end];
+    }
+  ]
+]);
 
-export const presetValToTimestamp = (presetVal, format = "x") => {
+const presetValToTimestamp = (presetVal, format = 'x', openSetting) => {
   if (!Maps.has(presetVal)) return;
   const fun = Maps.get(presetVal);
+  const funVal = fun(openSetting);
+
+  const isX = format === 'x' || format === 'X';
+  if (funVal && Array.isArray(funVal)) {
+    return funVal.map(v => {
+      const val = v.format(format);
+      return isX ? Number(val) : val;
+    });
+  }
   const val = fun().format(format);
-  return format === "x" || format === "X" ? Number(val) : val;
+  return isX ? Number(val) : val;
 };
+
+export { presetValToTimestamp };

package/packages/table-filter/src/components/render-widget/index.vue

@@ -75,11 +75,11 @@ export default {
       return `unset`;
     },
     initComponentProps(cfg) {
-      const { widgetType, alias, title, placeholder: customPlaceholder, widgetCfg, fieldType, explicitRequired } = cfg;
+      const { widgetType, alias, title, placeholder: customPlaceholder, widgetCfg, fieldType, explicitRequired, optionSetting } = cfg;
       const { props, handlerProps } = WidgetCfgMaps.get(widgetType);
       let Props = { ...props };
       if (handlerProps) {
-        Props = handlerProps(Props, { ...widgetCfg, title: alias || title, fieldType, isQuick: this.isQuick, explicitRequired });
+        Props = handlerProps(Props, { ...widgetCfg, title: alias || title, fieldType, isQuick: this.isQuick, explicitRequired, optionSetting });
       }
       if (customPlaceholder) {
         Props.placeholder = customPlaceholder;
@@ -107,11 +107,13 @@ export default {
 
 
       const EventsBySearch = eventsBySearch.reduce((evts, item) => {
-        const { name, handler } = item;
+        const { name, handler, isDebounce } = item;
         let eventHandler = this.search;
         if (handler) {
           eventHandler = (e) => {
-            handler(e, this.search, props);
+            // 搜索框需要防抖
+            let curMethod = isDebounce ? this.debounceSearch : this.search
+            handler(e, curMethod, props, cfg);
           };
         }
         return {
@@ -129,6 +131,7 @@ export default {
   },
   created() {
     this.handleWordBookSearchRender = debounce(this.handleWordBookSearchDef, 300)
+    this.debounceSearch = debounce(this.search, 300)
     this.initComponentProps(this.cfg);
   },
   render() {

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

@@ -6,6 +6,21 @@ import { presetValToTimestamp } from './helpers/presetValToTimestamp';
 
 const SetDefVal = defaultValue => defaultValue;
 
+// 日期默认值
+const handleDateDef = (defaultValue, defValueUnit, { format, rangeFilter, optionSetting }) => {
+  let resDate = presetValToTimestamp(defValueUnit, format, optionSetting);
+  if (rangeFilter) {
+    // 范围
+    if (!resDate) return [];
+    if (!Array.isArray(resDate)) return [resDate, resDate];
+  } else {
+    // 非范围
+    if (!resDate) return null;
+    if (resDate && Array.isArray(resDate) && resDate[0]) return resDate[0];
+  }
+  return resDate;
+};
+
 export const WidgetCfgMaps = new Map([
   [
     WidgetTypeEnums.INPUT_NUMBER,
@@ -97,9 +112,9 @@ export const WidgetCfgMaps = new Map([
         const Props = { ...props, placeholder: `请选择${title}`, allowClear };
         return Props;
       },
-      setDefaultValue(defaultValue, defValueUnit) {
+      setDefaultValue(defaultValue, defValueUnit, { rangeFilter, optionSetting }) {
         if (defValueUnit && defValueUnit !== DatePresetValEnums.CUSTOM) {
-          return presetValToTimestamp(defValueUnit, 'YYYY-MM-DD HH:mm:ss');
+          return handleDateDef(defaultValue, defValueUnit, { rangeFilter, optionSetting, format: 'YYYY-MM-DD' });
         }
         return defaultValue;
       }
@@ -118,9 +133,9 @@ export const WidgetCfgMaps = new Map([
         const Props = { ...props, placeholder: `请选择${title}`, allowClear };
         return Props;
       },
-      setDefaultValue(defaultValue, defValueUnit) {
+      setDefaultValue(defaultValue, defValueUnit, { rangeFilter, optionSetting }) {
         if (defValueUnit && defValueUnit !== DatePresetValEnums.CUSTOM) {
-          return presetValToTimestamp(defValueUnit, 'YYYY-MM-DD HH:mm:ss');
+          return handleDateDef(defaultValue, defValueUnit, { rangeFilter, optionSetting, format: 'YYYY-MM-DD HH:mm:ss' });
         }
         return defaultValue;
       }
@@ -171,10 +186,9 @@ export const WidgetCfgMaps = new Map([
         const Props = { ...props, placeholder: [`起始${title}`, `截止${title}`], allowClear };
         return Props;
       },
-      setDefaultValue(defaultValue, defValueUnit) {
+      setDefaultValue(defaultValue, defValueUnit, { rangeFilter, optionSetting }) {
         if (defValueUnit && defValueUnit !== DatePresetValEnums.CUSTOM) {
-          let resDate = presetValToTimestamp(defValueUnit, 'YYYY-MM-DD');
-          return [resDate, resDate];
+          return handleDateDef(defaultValue, defValueUnit, { rangeFilter, optionSetting, format: 'YYYY-MM-DD' });
         }
         if (!defaultValue || (defaultValue && !Array.isArray(defaultValue))) {
           return [];
@@ -196,10 +210,10 @@ export const WidgetCfgMaps = new Map([
         const Props = { ...props, placeholder: [`起始${title}`, `截止${title}`], allowClear };
         return Props;
       },
-      setDefaultValue(defaultValue, defValueUnit) {
+      setDefaultValue(defaultValue, defValueUnit, { rangeFilter, optionSetting }) {
         if (defValueUnit && defValueUnit !== DatePresetValEnums.CUSTOM) {
-          let resDate = presetValToTimestamp(defValueUnit, 'YYYY-MM-DD HH:mm:ss');
-          return [resDate, resDate];
+          let res = handleDateDef(defaultValue, defValueUnit, { rangeFilter, optionSetting, format: 'YYYY-MM-DD HH:mm:ss' });
+          return res;
         }
         if (!defaultValue || (defaultValue && !Array.isArray(defaultValue))) {
           return [];
@@ -213,10 +227,23 @@ export const WidgetCfgMaps = new Map([
     {
       component: DateRangeQuick,
       props: {},
-      handlerProps(props, { fieldType, explicitRequired } = {}) {
+      handlerProps(props, { fieldType, explicitRequired, title } = {}) {
         const allowClear = explicitRequired != 1;
         let str = fieldType === 'DATE' ? '日期' : '时间';
         const Props = { ...props, placeholderS: `开始${str}`, placeholderE: `结束${str}`, fieldType, allowClear };
+        // 非范围类
+        if (!props.rangeFilter) {
+          const valueFormat = fieldType === 'DATE' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss';
+          const showTime = fieldType === 'DATE' ? false : { defaultValue: moment('00:00:00', 'HH:mm:ss') };
+          const placeholder = `请选择${title}`;
+          Object.assign(Props, {
+            allowClear: true,
+            valueFormat,
+            showToday: false,
+            showTime,
+            placeholder
+          });
+        }
         return Props;
       },
       setDefaultValue: SetDefVal

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

@@ -636,14 +636,16 @@ export const outQuickSearchFn = {
             if (attr === 'BIRTHDAY') {
               this.$set(el, 'showFormat', 'MM-DD');
               this.$set(el, 'showTime', false);
-            } else if (['TODAY', 'TOMORROW', 'YESTERDAY'].includes(el.explicitDefaultVal)) {
-              // 如果外显默认是 以上三个，展示一个框，时间不可选
-              let [v] = value;
-              this.$set(el, 'showFormat', 'YYYY-MM-DD');
-              this.$set(el, 'showTime', false);
-              this.$set(el, 'com', 'DayPicker');
-              this.$set(el, 'value', v || moment());
-            } else {
+            }
+            // else if (['TODAY', 'TOMORROW', 'YESTERDAY'].includes(el.explicitDefaultVal)) {
+            //   // 如果外显默认是 以上三个，展示一个框，时间不可选
+            //   let [v] = value;
+            //   this.$set(el, 'showFormat', 'YYYY-MM-DD');
+            //   this.$set(el, 'showTime', false);
+            //   this.$set(el, 'com', 'DayPicker');
+            //   this.$set(el, 'value', v || moment());
+            // }
+            else {
               this.$set(el, 'showFormat', 'YYYY-MM-DD HH:mm:ss');
               this.$set(el, 'showTime', true);
             }

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

@@ -23,12 +23,12 @@ export default {
       return cfg.widgetCfg?.isRender;
     },
     getDefValByRenderWidget(cfg) {
-      const { widgetType, defaultValue, defValueUnit } = cfg.widgetCfg || {};
+      const { widgetType, defaultValue, defValueUnit, rangeFilter } = cfg.widgetCfg || {};
       const Widget = WidgetCfgMaps.get(widgetType);
       let defVal;
       if (Widget) {
         const { setDefaultValue } = Widget;
-        if (setDefaultValue) defVal = setDefaultValue(defaultValue, defValueUnit);
+        if (setDefaultValue) defVal = setDefaultValue(defaultValue, defValueUnit, { rangeFilter, openSetting: cfg?.optionSetting });
       }
       return defVal;
     },