cnhis-design-vue 2.1.127 → 2.1.128

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

@@ -6,21 +6,6 @@ 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,
@@ -112,9 +97,9 @@ export const WidgetCfgMaps = new Map([
         const Props = { ...props, placeholder: `请选择${title}`, allowClear };
         return Props;
       },
-      setDefaultValue(defaultValue, defValueUnit, { rangeFilter, optionSetting }) {
+      setDefaultValue(defaultValue, defValueUnit) {
         if (defValueUnit && defValueUnit !== DatePresetValEnums.CUSTOM) {
-          return handleDateDef(defaultValue, defValueUnit, { rangeFilter, optionSetting, format: 'YYYY-MM-DD' });
+          return presetValToTimestamp(defValueUnit, 'YYYY-MM-DD HH:mm:ss');
         }
         return defaultValue;
       }
@@ -133,9 +118,9 @@ export const WidgetCfgMaps = new Map([
         const Props = { ...props, placeholder: `请选择${title}`, allowClear };
         return Props;
       },
-      setDefaultValue(defaultValue, defValueUnit, { rangeFilter, optionSetting }) {
+      setDefaultValue(defaultValue, defValueUnit) {
         if (defValueUnit && defValueUnit !== DatePresetValEnums.CUSTOM) {
-          return handleDateDef(defaultValue, defValueUnit, { rangeFilter, optionSetting, format: 'YYYY-MM-DD HH:mm:ss' });
+          return presetValToTimestamp(defValueUnit, 'YYYY-MM-DD HH:mm:ss');
         }
         return defaultValue;
       }
@@ -186,9 +171,10 @@ export const WidgetCfgMaps = new Map([
         const Props = { ...props, placeholder: [`起始${title}`, `截止${title}`], allowClear };
         return Props;
       },
-      setDefaultValue(defaultValue, defValueUnit, { rangeFilter, optionSetting }) {
+      setDefaultValue(defaultValue, defValueUnit) {
         if (defValueUnit && defValueUnit !== DatePresetValEnums.CUSTOM) {
-          return handleDateDef(defaultValue, defValueUnit, { rangeFilter, optionSetting, format: 'YYYY-MM-DD' });
+          let resDate = presetValToTimestamp(defValueUnit, 'YYYY-MM-DD');
+          return [resDate, resDate];
         }
         if (!defaultValue || (defaultValue && !Array.isArray(defaultValue))) {
           return [];
@@ -210,10 +196,10 @@ export const WidgetCfgMaps = new Map([
         const Props = { ...props, placeholder: [`起始${title}`, `截止${title}`], allowClear };
         return Props;
       },
-      setDefaultValue(defaultValue, defValueUnit, { rangeFilter, optionSetting }) {
+      setDefaultValue(defaultValue, defValueUnit) {
         if (defValueUnit && defValueUnit !== DatePresetValEnums.CUSTOM) {
-          let res = handleDateDef(defaultValue, defValueUnit, { rangeFilter, optionSetting, format: 'YYYY-MM-DD HH:mm:ss' });
-          return res;
+          let resDate = presetValToTimestamp(defValueUnit, 'YYYY-MM-DD HH:mm:ss');
+          return [resDate, resDate];
         }
         if (!defaultValue || (defaultValue && !Array.isArray(defaultValue))) {
           return [];
@@ -227,23 +213,10 @@ export const WidgetCfgMaps = new Map([
     {
       component: DateRangeQuick,
       props: {},
-      handlerProps(props, { fieldType, explicitRequired, title } = {}) {
+      handlerProps(props, { fieldType, explicitRequired } = {}) {
         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,16 +636,14 @@ 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, rangeFilter } = cfg.widgetCfg || {};
+      const { widgetType, defaultValue, defValueUnit } = cfg.widgetCfg || {};
       const Widget = WidgetCfgMaps.get(widgetType);
       let defVal;
       if (Widget) {
         const { setDefaultValue } = Widget;
-        if (setDefaultValue) defVal = setDefaultValue(defaultValue, defValueUnit, { rangeFilter, openSetting: cfg?.optionSetting });
+        if (setDefaultValue) defVal = setDefaultValue(defaultValue, defValueUnit);
       }
       return defVal;
     },