cnhis-design-vue 3.3.3-beta.3 → 3.3.3-beta.31

package/es/components/table-filter/src/components/classify-filter/components/Date.vue2.js

@@ -1,10 +1,11 @@
 import { defineComponent, computed, openBlock, createElementBlock, createVNode, unref, isRef, createBlock, createCommentVNode } from 'vue';
 import DatePicker from '../../../../../date-picker/index.js';
 import { NSelect } from 'naive-ui';
-import { WidgetTypeEnums, WidgetOptionEnums, WidgetValEnums } from '../../../types/enums.js';
+import { WidgetOptionEnums, WidgetTypeEnums, WidgetValEnums } from '../../../types/enums.js';
 import { WidgetDateOptionEnums } from '../../render-widget/helpers/enums.js';
 import { widgetDateValOptions } from '../../render-widget/helpers/dateExtraMap.js';
 import { setDateDisabled, setTimeDisabled } from '../../render-widget/helpers/dateDisabled.js';
+import { parseDateShortcuts } from '../../../tool/date.js';
 
 const _hoisted_1 = {
   style: {
@@ -28,9 +29,13 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     presetVal: {
       type: String,
       default: null
+    },
+    customDate: {
+      type: String,
+      default: null
     }
   },
-  emits: ["update:modelValue", "update:presetVal"],
+  emits: ["update:modelValue", "update:presetVal", "update:customDate"],
   setup(__props, {
     emit
   }) {
@@ -45,9 +50,16 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     });
     const presetValCp = computed({
       set(val) {
+        if ((optionSetting == null ? void 0 : optionSetting.value) === WidgetOptionEnums.CUSTOM_TIME) {
+          emit("update:customDate", val);
+          return;
+        }
         emit("update:presetVal", val);
       },
       get() {
+        if ((optionSetting == null ? void 0 : optionSetting.value) === WidgetOptionEnums.CUSTOM_TIME) {
+          return props.customDate;
+        }
         return props.presetVal;
       }
     });
@@ -75,6 +87,29 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       var _a;
       const optSetting = optionSetting.value || WidgetOptionEnums.ALL;
       if (compType.value && optSetting) {
+        if (optSetting === WidgetOptionEnums.CUSTOM_TIME) {
+          const shortList = parseDateShortcuts(props.paramCfg);
+          if ((shortList == null ? void 0 : shortList.length) > 0) {
+            let options2 = shortList.map((opt) => {
+              return {
+                label: opt.name,
+                value: opt.name
+              };
+            });
+            options2.unshift({
+              label: function() {
+                var _a2, _b, _c;
+                try {
+                  return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.345")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.345")) || "\u81EA\u5B9A\u4E49\u8F93\u5165";
+                } catch (e) {
+                  return "\u81EA\u5B9A\u4E49\u8F93\u5165";
+                }
+              }(),
+              value: WidgetValEnums.CUSTOM
+            });
+            return options2;
+          }
+        }
         const typeStr = `${compType.value}_${optSetting}`;
         const useType = WidgetDateOptionEnums[typeStr];
         const baseList = (_a = widgetDateValOptions[useType]) != null ? _a : [];

package/es/components/table-filter/src/components/classify-filter/components/DateRange.vue.d.ts

@@ -12,6 +12,10 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: null;
     };
+    customDate: {
+        type: StringConstructor;
+        default: null;
+    };
 }, {
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         paramCfg: {
@@ -26,11 +30,16 @@ declare const _default: import("vue").DefineComponent<{
             type: StringConstructor;
             default: null;
         };
+        customDate: {
+            type: StringConstructor;
+            default: null;
+        };
     }>> & {
         "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
         "onUpdate:presetVal"?: ((...args: any[]) => any) | undefined;
+        "onUpdate:customDate"?: ((...args: any[]) => any) | undefined;
     }>>;
-    emit: (event: "update:modelValue" | "update:presetVal", ...args: any[]) => void;
+    emit: (event: "update:modelValue" | "update:presetVal" | "update:customDate", ...args: any[]) => void;
     startDate: import("vue").Ref<any>;
     endDate: import("vue").Ref<any>;
     valueFormat: import("vue").ComputedRef<string>;
@@ -51,6 +60,7 @@ declare const _default: import("vue").DefineComponent<{
         value: string;
     }[]>;
     presetValCp: import("vue").WritableComputedRef<string>;
+    customDateCp: import("vue").WritableComputedRef<string>;
     handleChange: (val: any, type: 'start' | 'end') => void;
     isStartDateDisabled: (ts: number) => boolean;
     timeStartDisabled: (ts: number) => {
@@ -226,7 +236,7 @@ declare const _default: import("vue").DefineComponent<{
         NEXT_YEAR: string;
         LAST_YEAR: string;
     };
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "update:presetVal")[], "update:modelValue" | "update:presetVal", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "update:presetVal" | "update:customDate")[], "update:modelValue" | "update:presetVal" | "update:customDate", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     paramCfg: {
         type: ObjectConstructor;
         default: null;
@@ -239,12 +249,18 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: null;
     };
+    customDate: {
+        type: StringConstructor;
+        default: null;
+    };
 }>> & {
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
     "onUpdate:presetVal"?: ((...args: any[]) => any) | undefined;
+    "onUpdate:customDate"?: ((...args: any[]) => any) | undefined;
 }, {
     modelValue: string | number | unknown[];
     paramCfg: Record<string, any>;
     presetVal: string;
+    customDate: string;
 }>;
 export default _default;

package/es/components/table-filter/src/components/classify-filter/components/DateRange.vue2.js

@@ -7,6 +7,7 @@ import { WidgetOptionEnums, WidgetTypeEnums, WidgetValEnums } from '../../../typ
 import { WidgetDateOptionEnums } from '../../render-widget/helpers/enums.js';
 import { widgetDateValOptions } from '../../render-widget/helpers/dateExtraMap.js';
 import { dateDisabledCollect, isStartDateRangeDisabled, isTimeStartRangeDisabled, isEndDateRangeDisabled, isTimeEndRangeDisabled } from '../../render-widget/helpers/dateDisabled.js';
+import { parseDateShortcuts } from '../../../tool/date.js';
 
 const _hoisted_1 = {
   style: {
@@ -39,9 +40,13 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     presetVal: {
       type: String,
       default: null
+    },
+    customDate: {
+      type: String,
+      default: null
     }
   },
-  emits: ["update:modelValue", "update:presetVal"],
+  emits: ["update:modelValue", "update:presetVal", "update:customDate"],
   setup(__props, {
     emit
   }) {
@@ -136,6 +141,29 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       var _a;
       const optSetting = optionSetting.value || WidgetOptionEnums.ALL;
       if (compType.value && optSetting) {
+        if (optSetting === WidgetOptionEnums.CUSTOM_TIME) {
+          const shortList = parseDateShortcuts(props.paramCfg);
+          if ((shortList == null ? void 0 : shortList.length) > 0) {
+            let options2 = shortList.map((opt) => {
+              return {
+                label: opt.name,
+                value: opt.name
+              };
+            });
+            options2.unshift({
+              label: function() {
+                var _a2, _b, _c;
+                try {
+                  return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.345")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.345")) || "\u81EA\u5B9A\u4E49\u8F93\u5165";
+                } catch (e) {
+                  return "\u81EA\u5B9A\u4E49\u8F93\u5165";
+                }
+              }(),
+              value: WidgetValEnums.CUSTOM
+            });
+            return options2;
+          }
+        }
         const typeStr = `${compType.value}_${optSetting}_RANGE`;
         const useType = WidgetDateOptionEnums[typeStr];
         const baseList = (_a = widgetDateValOptions[useType]) != null ? _a : [];
@@ -162,12 +190,27 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     });
     const presetValCp = computed({
       set(val) {
+        if ((optionSetting == null ? void 0 : optionSetting.value) === WidgetOptionEnums.CUSTOM_TIME) {
+          emit("update:customDate", val);
+          return;
+        }
         emit("update:presetVal", val);
       },
       get() {
+        if ((optionSetting == null ? void 0 : optionSetting.value) === WidgetOptionEnums.CUSTOM_TIME) {
+          return props.customDate;
+        }
         return props.presetVal;
       }
     });
+    computed({
+      set(val) {
+        emit("update:customDate", val);
+      },
+      get() {
+        return props.customDate;
+      }
+    });
     watch(() => props.modelValue, (val) => {
       if (val && isString(val) && val.includes("~")) {
         const [start, end] = val.split("~");

package/es/components/table-filter/src/components/classify-filter/components/SelectFilter.vue.d.ts

@@ -40,6 +40,7 @@ declare const _default: import("vue").DefineComponent<{
         SELECT_TIME: string;
         PAST_TIME: string;
         FUTURE_TIME: string;
+        CUSTOM_TIME: string;
     };
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:modelValue"[], "update:modelValue", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     paramCfg: {

package/es/components/table-filter/src/components/classify-filter/components/index.d.ts

@@ -14,6 +14,10 @@ declare const Date: import("vue").DefineComponent<{
         type: StringConstructor;
         default: null;
     };
+    customDate: {
+        type: StringConstructor;
+        default: null;
+    };
 }, {
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         componentCfg: {
@@ -31,11 +35,16 @@ declare const Date: import("vue").DefineComponent<{
             type: StringConstructor;
             default: null;
         };
+        customDate: {
+            type: StringConstructor;
+            default: null;
+        };
     }>> & {
         "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
         "onUpdate:presetVal"?: ((...args: any[]) => any) | undefined;
+        "onUpdate:customDate"?: ((...args: any[]) => any) | undefined;
     }>>;
-    emit: (event: "update:modelValue" | "update:presetVal", ...args: any[]) => void;
+    emit: (event: "update:modelValue" | "update:presetVal" | "update:customDate", ...args: any[]) => void;
     valueCp: import("vue").WritableComputedRef<any>;
     presetValCp: import("vue").WritableComputedRef<string>;
     dateType: any;
@@ -213,7 +222,7 @@ declare const Date: import("vue").DefineComponent<{
         NEXT_YEAR: string;
         LAST_YEAR: string;
     };
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "update:presetVal")[], "update:modelValue" | "update:presetVal", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "update:presetVal" | "update:customDate")[], "update:modelValue" | "update:presetVal" | "update:customDate", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     componentCfg: {
         type: ObjectConstructor;
     };
@@ -229,13 +238,19 @@ declare const Date: import("vue").DefineComponent<{
         type: StringConstructor;
         default: null;
     };
+    customDate: {
+        type: StringConstructor;
+        default: null;
+    };
 }>> & {
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
     "onUpdate:presetVal"?: ((...args: any[]) => any) | undefined;
+    "onUpdate:customDate"?: ((...args: any[]) => any) | undefined;
 }, {
     modelValue: string | number | unknown[];
     paramCfg: Record<string, any>;
     presetVal: string;
+    customDate: string;
 }>;
 declare const InputFilter: import("vue").DefineComponent<{
     paramCfg: {
@@ -365,6 +380,7 @@ declare const SelectFilter: import("vue").DefineComponent<{
         SELECT_TIME: string;
         PAST_TIME: string;
         FUTURE_TIME: string;
+        CUSTOM_TIME: string;
     };
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:modelValue"[], "update:modelValue", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     paramCfg: {
@@ -699,6 +715,10 @@ declare const DateRange: import("vue").DefineComponent<{
         type: StringConstructor;
         default: null;
     };
+    customDate: {
+        type: StringConstructor;
+        default: null;
+    };
 }, {
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         paramCfg: {
@@ -713,11 +733,16 @@ declare const DateRange: import("vue").DefineComponent<{
             type: StringConstructor;
             default: null;
         };
+        customDate: {
+            type: StringConstructor;
+            default: null;
+        };
     }>> & {
         "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
         "onUpdate:presetVal"?: ((...args: any[]) => any) | undefined;
+        "onUpdate:customDate"?: ((...args: any[]) => any) | undefined;
     }>>;
-    emit: (event: "update:modelValue" | "update:presetVal", ...args: any[]) => void;
+    emit: (event: "update:modelValue" | "update:presetVal" | "update:customDate", ...args: any[]) => void;
     startDate: import("vue").Ref<any>;
     endDate: import("vue").Ref<any>;
     valueFormat: import("vue").ComputedRef<string>;
@@ -738,6 +763,7 @@ declare const DateRange: import("vue").DefineComponent<{
         value: string;
     }[]>;
     presetValCp: import("vue").WritableComputedRef<string>;
+    customDateCp: import("vue").WritableComputedRef<string>;
     handleChange: (val: any, type: "start" | "end") => void;
     isStartDateDisabled: (ts: number) => boolean;
     timeStartDisabled: (ts: number) => {
@@ -913,7 +939,7 @@ declare const DateRange: import("vue").DefineComponent<{
         NEXT_YEAR: string;
         LAST_YEAR: string;
     };
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "update:presetVal")[], "update:modelValue" | "update:presetVal", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "update:presetVal" | "update:customDate")[], "update:modelValue" | "update:presetVal" | "update:customDate", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     paramCfg: {
         type: ObjectConstructor;
         default: null;
@@ -926,13 +952,19 @@ declare const DateRange: import("vue").DefineComponent<{
         type: StringConstructor;
         default: null;
     };
+    customDate: {
+        type: StringConstructor;
+        default: null;
+    };
 }>> & {
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
     "onUpdate:presetVal"?: ((...args: any[]) => any) | undefined;
+    "onUpdate:customDate"?: ((...args: any[]) => any) | undefined;
 }, {
     modelValue: string | number | unknown[];
     paramCfg: Record<string, any>;
     presetVal: string;
+    customDate: string;
 }>;
 declare const SelectLabel: import("vue").DefineComponent<{
     paramCfg: {

package/es/components/table-filter/src/components/classify-filter/hooks/useFilterConditions.js

@@ -51,7 +51,8 @@ const useFilterConditions = (filterConditions, selectList, dataType) => {
       condition: null,
       value: null,
       presetVal: null,
-      dynamicBaseList: []
+      dynamicBaseList: [],
+      customDate: null
     });
   };
   const delFilterCondition = (index) => {

package/es/components/table-filter/src/components/classify-filter/index.vue.d.ts

@@ -73,6 +73,7 @@ declare const _default: import("vue").DefineComponent<{
             value: string;
             isAccurateSearch?: boolean | undefined;
             accurateSearchKey?: string | undefined;
+            customDate?: string | undefined;
         }[];
     };
     loading: import("vue").Ref<boolean>;
@@ -138,6 +139,10 @@ declare const _default: import("vue").DefineComponent<{
         isAccurate: {
             type: BooleanConstructor;
         };
+        customDate: {
+            type: StringConstructor;
+            default: null;
+        };
     }, {
         props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
             paramCfg: {
@@ -155,15 +160,21 @@ declare const _default: import("vue").DefineComponent<{
             isAccurate: {
                 type: BooleanConstructor;
             };
+            customDate: {
+                type: StringConstructor;
+                default: null;
+            };
         }>> & {
             "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
             "onUpdate:isAccurate"?: ((...args: any[]) => any) | undefined;
             "onUpdate:presetVal"?: ((...args: any[]) => any) | undefined;
+            "onUpdate:customDate"?: ((...args: any[]) => any) | undefined;
         }>>;
-        emit: (event: "update:modelValue" | "update:isAccurate" | "update:presetVal", ...args: any[]) => void;
+        emit: (event: "update:modelValue" | "update:isAccurate" | "update:presetVal" | "update:customDate", ...args: any[]) => void;
         valueCp: import("vue").WritableComputedRef<any>;
         presetValCp: import("vue").WritableComputedRef<string>;
         isAccurateCp: import("vue").WritableComputedRef<boolean>;
+        customDateCp: import("vue").WritableComputedRef<string>;
         widgetType: import("vue").ComputedRef<any>;
         Date: import("vue").DefineComponent<{
             componentCfg: {
@@ -181,6 +192,10 @@ declare const _default: import("vue").DefineComponent<{
                 type: StringConstructor;
                 default: null;
             };
+            customDate: {
+                type: StringConstructor;
+                default: null;
+            };
         }, {
             props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
                 componentCfg: {
@@ -198,11 +213,16 @@ declare const _default: import("vue").DefineComponent<{
                     type: StringConstructor;
                     default: null;
                 };
+                customDate: {
+                    type: StringConstructor;
+                    default: null;
+                };
             }>> & {
                 "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
                 "onUpdate:presetVal"?: ((...args: any[]) => any) | undefined;
+                "onUpdate:customDate"?: ((...args: any[]) => any) | undefined;
             }>>;
-            emit: (event: "update:modelValue" | "update:presetVal", ...args: any[]) => void;
+            emit: (event: "update:modelValue" | "update:presetVal" | "update:customDate", ...args: any[]) => void;
             valueCp: import("vue").WritableComputedRef<any>;
             presetValCp: import("vue").WritableComputedRef<string>;
             dateType: any;
@@ -380,7 +400,7 @@ declare const _default: import("vue").DefineComponent<{
                 NEXT_YEAR: string;
                 LAST_YEAR: string;
             };
-        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "update:presetVal")[], "update:modelValue" | "update:presetVal", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "update:presetVal" | "update:customDate")[], "update:modelValue" | "update:presetVal" | "update:customDate", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
             componentCfg: {
                 type: ObjectConstructor;
             };
@@ -396,13 +416,19 @@ declare const _default: import("vue").DefineComponent<{
                 type: StringConstructor;
                 default: null;
             };
+            customDate: {
+                type: StringConstructor;
+                default: null;
+            };
         }>> & {
             "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
             "onUpdate:presetVal"?: ((...args: any[]) => any) | undefined;
+            "onUpdate:customDate"?: ((...args: any[]) => any) | undefined;
         }, {
             modelValue: string | number | unknown[];
             paramCfg: Record<string, any>;
             presetVal: string;
+            customDate: string;
         }>;
         InputFilter: import("vue").DefineComponent<{
             paramCfg: {
@@ -532,6 +558,7 @@ declare const _default: import("vue").DefineComponent<{
                 SELECT_TIME: string;
                 PAST_TIME: string;
                 FUTURE_TIME: string;
+                CUSTOM_TIME: string;
             };
         }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:modelValue"[], "update:modelValue", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
             paramCfg: {
@@ -866,6 +893,10 @@ declare const _default: import("vue").DefineComponent<{
                 type: StringConstructor;
                 default: null;
             };
+            customDate: {
+                type: StringConstructor;
+                default: null;
+            };
         }, {
             props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
                 paramCfg: {
@@ -880,11 +911,16 @@ declare const _default: import("vue").DefineComponent<{
                     type: StringConstructor;
                     default: null;
                 };
+                customDate: {
+                    type: StringConstructor;
+                    default: null;
+                };
             }>> & {
                 "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
                 "onUpdate:presetVal"?: ((...args: any[]) => any) | undefined;
+                "onUpdate:customDate"?: ((...args: any[]) => any) | undefined;
             }>>;
-            emit: (event: "update:modelValue" | "update:presetVal", ...args: any[]) => void;
+            emit: (event: "update:modelValue" | "update:presetVal" | "update:customDate", ...args: any[]) => void;
             startDate: import("vue").Ref<any>;
             endDate: import("vue").Ref<any>;
             valueFormat: import("vue").ComputedRef<string>;
@@ -905,6 +941,7 @@ declare const _default: import("vue").DefineComponent<{
                 value: string;
             }[]>;
             presetValCp: import("vue").WritableComputedRef<string>;
+            customDateCp: import("vue").WritableComputedRef<string>;
             handleChange: (val: any, type: "start" | "end") => void;
             isStartDateDisabled: (ts: number) => boolean;
             timeStartDisabled: (ts: number) => {
@@ -1080,7 +1117,7 @@ declare const _default: import("vue").DefineComponent<{
                 NEXT_YEAR: string;
                 LAST_YEAR: string;
             };
-        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "update:presetVal")[], "update:modelValue" | "update:presetVal", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "update:presetVal" | "update:customDate")[], "update:modelValue" | "update:presetVal" | "update:customDate", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
             paramCfg: {
                 type: ObjectConstructor;
                 default: null;
@@ -1093,13 +1130,19 @@ declare const _default: import("vue").DefineComponent<{
                 type: StringConstructor;
                 default: null;
             };
+            customDate: {
+                type: StringConstructor;
+                default: null;
+            };
         }>> & {
             "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
             "onUpdate:presetVal"?: ((...args: any[]) => any) | undefined;
+            "onUpdate:customDate"?: ((...args: any[]) => any) | undefined;
         }, {
             modelValue: string | number | unknown[];
             paramCfg: Record<string, any>;
             presetVal: string;
+            customDate: string;
         }>;
         SelectLabel: import("vue").DefineComponent<{
             paramCfg: {
@@ -1226,7 +1269,7 @@ declare const _default: import("vue").DefineComponent<{
             SELECTTREE: string;
             SELECTTREEDYNAMIC: string;
         };
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "update:isAccurate" | "update:presetVal")[], "update:modelValue" | "update:isAccurate" | "update:presetVal", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "update:isAccurate" | "update:presetVal" | "update:customDate")[], "update:modelValue" | "update:isAccurate" | "update:presetVal" | "update:customDate", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         paramCfg: {
             type: ObjectConstructor;
             default: null;
@@ -1242,15 +1285,21 @@ declare const _default: import("vue").DefineComponent<{
         isAccurate: {
             type: BooleanConstructor;
         };
+        customDate: {
+            type: StringConstructor;
+            default: null;
+        };
     }>> & {
         "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
         "onUpdate:isAccurate"?: ((...args: any[]) => any) | undefined;
         "onUpdate:presetVal"?: ((...args: any[]) => any) | undefined;
+        "onUpdate:customDate"?: ((...args: any[]) => any) | undefined;
     }, {
         modelValue: string | number | unknown[];
         paramCfg: Record<string, any>;
         presetVal: string;
         isAccurate: boolean;
+        customDate: string;
     }>;
     ConditionEnums: {
         NULL: string;

package/es/components/table-filter/src/components/classify-filter/index.vue2.js

@@ -200,9 +200,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           key,
           condition,
           value,
-          presetVal
+          presetVal,
+          customDate
         }) => {
-          return !key || !condition || condition === ConditionEnums.EQUAL && !value && !presetVal;
+          return !key || !condition || condition === ConditionEnums.EQUAL && !value && !presetVal && !customDate;
         });
         if (isEmpty) {
           $message.warning(function() {
@@ -397,8 +398,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             "onUpdate:presetVal": ($event) => item.presetVal = $event,
             isAccurate: item.isAccurateSearch,
             "onUpdate:isAccurate": ($event) => item.isAccurateSearch = $event,
+            customDate: item.customDate,
+            "onUpdate:customDate": ($event) => item.customDate = $event,
             "param-cfg": unref(getParamCfg)(item.key)
-          }, null, 8, ["modelValue", "onUpdate:modelValue", "presetVal", "onUpdate:presetVal", "isAccurate", "onUpdate:isAccurate", "param-cfg"])) : createCommentVNode("v-if", true), createVNode(unref(NTooltip), {
+          }, null, 8, ["modelValue", "onUpdate:modelValue", "presetVal", "onUpdate:presetVal", "isAccurate", "onUpdate:isAccurate", "customDate", "onUpdate:customDate", "param-cfg"])) : createCommentVNode("v-if", true), createVNode(unref(NTooltip), {
             title: function() {
               var _a, _b, _c;
               try {

package/es/components/table-filter/src/components/render-widget/components/DateInner.vue.d.ts

@@ -254,7 +254,7 @@ declare const _default: import("vue").DefineComponent<{
         optionSetting: import("vue").ComputedRef<any>;
         isRange: import("vue").ComputedRef<any>;
         initData: () => void;
-        handleRadioClick: (value: string) => void;
+        handleRadioClick: (date: any) => void;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("clickQuickBtn" | "changeRadioValue")[], "clickQuickBtn" | "changeRadioValue", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         componentCfg: {
             type: PropType<AnyObject>;

package/es/components/table-filter/src/components/render-widget/components/DateOut.vue2.js

@@ -6,6 +6,7 @@ import { WidgetOptionEnums } from '../../../types/enums.js';
 import { DateExtraOptions, DateExtraMap } from '../helpers/dateExtraMap.js';
 import { setDateDisabled, setTimeDisabled } from '../helpers/dateDisabled.js';
 import { presetValToTimestamp } from '../helpers/presetValToTimestamp.js';
+import { parseDateShortcuts } from '../../../tool/date.js';
 
 var _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "DateOut",
@@ -85,13 +86,23 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       return setTimeDisabled(ts, optionSetting.value);
     }
     function init() {
-      var _a, _b;
+      var _a, _b, _c;
       const {
         originType
       } = (_a = props.componentCfg) == null ? void 0 : _a.widgetCfg;
       const type = `${originType}_${optionSetting.value || WidgetOptionEnums.ALL}`;
       const shortOptions = (_b = DateExtraOptions[DateExtraMap[type]]) != null ? _b : [];
       let optionsObj = {};
+      if (optionSetting.value === WidgetOptionEnums.CUSTOM_TIME) {
+        const shortList = parseDateShortcuts((_c = props.componentCfg) == null ? void 0 : _c.widgetCfg);
+        if ((shortList == null ? void 0 : shortList.length) > 0) {
+          shortList.forEach((item) => {
+            optionsObj[item.name] = item == null ? void 0 : item.timestamp[0];
+          });
+        }
+        rangeShortcuts.value = optionsObj;
+        return;
+      }
       shortOptions.forEach(({
         label,
         value

package/es/components/table-filter/src/components/render-widget/components/DateQuickBtn/index.vue.d.ts

@@ -43,7 +43,7 @@ declare const _default: import("vue").DefineComponent<{
     optionSetting: import("vue").ComputedRef<any>;
     isRange: import("vue").ComputedRef<any>;
     initData: () => void;
-    handleRadioClick: (value: string) => void;
+    handleRadioClick: (date: any) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("clickQuickBtn" | "changeRadioValue")[], "clickQuickBtn" | "changeRadioValue", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     componentCfg: {
         type: PropType<AnyObject>;