cnhis-design-vue 2.1.125 → 2.1.127

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;
     },