cnhis-design-vue 3.3.3-release.9 → 3.4.0-beta.1

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

@@ -30,6 +30,8 @@ declare const _default: import("vue").DefineComponent<{
     menuProps: {
         class: string;
     };
+    specialDateRange: string[];
+    specialCustomDateRange: string[];
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         actionList_prop: {
             type: PropType<IClassifyListType>;
@@ -104,6 +106,11 @@ declare const _default: import("vue").DefineComponent<{
     getParamCfg: (key: string) => any;
     initFilterConditions: (tableId: string, rawConditions: import("../../../../../components/table-filter/src/types").ISearchConfigType) => Promise<void>;
     getRawFilterConditions: () => any[];
+    dateTypeList: string[];
+    getOptions: (key: string) => {
+        label: string;
+        value: string;
+    }[];
     handleEditDisplayCategory: (item: ICategoryItemType) => void;
     handleDisplayCategoryAddState: () => void;
     findConditionByDisplayCategory: (sid: string) => unknown;
@@ -124,6 +131,10 @@ declare const _default: import("vue").DefineComponent<{
     AddCircleSharp: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
     CloseOutline: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
     ValueCfg: import("vue").DefineComponent<{
+        item: {
+            type: ObjectConstructor;
+            default: null;
+        };
         paramCfg: {
             type: ObjectConstructor;
             default: null;
@@ -145,6 +156,10 @@ declare const _default: import("vue").DefineComponent<{
         };
     }, {
         props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
+            item: {
+                type: ObjectConstructor;
+                default: null;
+            };
             paramCfg: {
                 type: ObjectConstructor;
                 default: null;
@@ -180,6 +195,10 @@ declare const _default: import("vue").DefineComponent<{
             componentCfg: {
                 type: ObjectConstructor;
             };
+            item: {
+                type: ObjectConstructor;
+                required: true;
+            };
             paramCfg: {
                 type: ObjectConstructor;
                 default: null;
@@ -201,6 +220,10 @@ declare const _default: import("vue").DefineComponent<{
                 componentCfg: {
                     type: ObjectConstructor;
                 };
+                item: {
+                    type: ObjectConstructor;
+                    required: true;
+                };
                 paramCfg: {
                     type: ObjectConstructor;
                     default: null;
@@ -223,6 +246,7 @@ declare const _default: import("vue").DefineComponent<{
                 "onUpdate:customDate"?: ((...args: any[]) => any) | undefined;
             }>>;
             emit: (event: "update:modelValue" | "update:presetVal" | "update:customDate", ...args: any[]) => void;
+            filterType: import("vue").ComputedRef<"1" | "2" | "3">;
             valueCp: import("vue").WritableComputedRef<any>;
             presetValCp: import("vue").WritableComputedRef<string>;
             dateType: any;
@@ -369,6 +393,109 @@ declare const _default: import("vue").DefineComponent<{
                 holidays: Date[];
             }>>;
             NSelect: any;
+            DateOption: import("vue").DefineComponent<{
+                filterType: {
+                    type: StringConstructor;
+                    required: true;
+                };
+                modelValue: {
+                    type: (ArrayConstructor | NumberConstructor | StringConstructor)[];
+                    default: null;
+                };
+                presetVal: {
+                    type: StringConstructor;
+                    default: null;
+                };
+                dateType: {
+                    type: StringConstructor;
+                };
+                isDateDisabled: {
+                    type: FunctionConstructor;
+                };
+                timeDisabled: {
+                    type: FunctionConstructor;
+                };
+                valueFormat: {
+                    type: StringConstructor;
+                };
+            }, {
+                widgetOptions: {
+                    label: string;
+                    value: string;
+                }[];
+                widgetRangeOptions: {
+                    label: string;
+                    value: string;
+                }[];
+                startDateNum: import("vue").Ref<any>;
+                endDateNum: import("vue").Ref<any>;
+                props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
+                    filterType: {
+                        type: StringConstructor;
+                        required: true;
+                    };
+                    modelValue: {
+                        type: (ArrayConstructor | NumberConstructor | StringConstructor)[];
+                        default: null;
+                    };
+                    presetVal: {
+                        type: StringConstructor;
+                        default: null;
+                    };
+                    dateType: {
+                        type: StringConstructor;
+                    };
+                    isDateDisabled: {
+                        type: FunctionConstructor;
+                    };
+                    timeDisabled: {
+                        type: FunctionConstructor;
+                    };
+                    valueFormat: {
+                        type: StringConstructor;
+                    };
+                }>> & {
+                    "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
+                    "onUpdate:presetVal"?: ((...args: any[]) => any) | undefined;
+                }>>;
+                emit: (event: "update:modelValue" | "update:presetVal", ...args: any[]) => void;
+                valueCp: import("vue").WritableComputedRef<any>;
+                presetValCp: import("vue").WritableComputedRef<string>;
+                handleChange: (val: any, type: "start" | "end") => void;
+                NSelect: any;
+                NInputNumber: any;
+            }, 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<{
+                filterType: {
+                    type: StringConstructor;
+                    required: true;
+                };
+                modelValue: {
+                    type: (ArrayConstructor | NumberConstructor | StringConstructor)[];
+                    default: null;
+                };
+                presetVal: {
+                    type: StringConstructor;
+                    default: null;
+                };
+                dateType: {
+                    type: StringConstructor;
+                };
+                isDateDisabled: {
+                    type: FunctionConstructor;
+                };
+                timeDisabled: {
+                    type: FunctionConstructor;
+                };
+                valueFormat: {
+                    type: StringConstructor;
+                };
+            }>> & {
+                "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
+                "onUpdate:presetVal"?: ((...args: any[]) => any) | undefined;
+            }, {
+                modelValue: string | number | unknown[];
+                presetVal: string;
+            }>;
             WidgetValEnums: {
                 CUSTOM: string;
                 FIRST_VAL: string;
@@ -404,6 +531,10 @@ declare const _default: import("vue").DefineComponent<{
             componentCfg: {
                 type: ObjectConstructor;
             };
+            item: {
+                type: ObjectConstructor;
+                required: true;
+            };
             paramCfg: {
                 type: ObjectConstructor;
                 default: null;
@@ -881,6 +1012,10 @@ declare const _default: import("vue").DefineComponent<{
             paramCfg: Record<string, any>;
         }>;
         DateRange: import("vue").DefineComponent<{
+            item: {
+                type: ObjectConstructor;
+                required: true;
+            };
             paramCfg: {
                 type: ObjectConstructor;
                 default: null;
@@ -899,6 +1034,10 @@ declare const _default: import("vue").DefineComponent<{
             };
         }, {
             props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
+                item: {
+                    type: ObjectConstructor;
+                    required: true;
+                };
                 paramCfg: {
                     type: ObjectConstructor;
                     default: null;
@@ -923,6 +1062,7 @@ declare const _default: import("vue").DefineComponent<{
             emit: (event: "update:modelValue" | "update:presetVal" | "update:customDate", ...args: any[]) => void;
             startDate: import("vue").Ref<any>;
             endDate: import("vue").Ref<any>;
+            filterType: import("vue").ComputedRef<"1" | "2" | "3">;
             valueFormat: import("vue").ComputedRef<string>;
             dateFormat: import("vue").ComputedRef<string>;
             compType: import("vue").ComputedRef<any>;
@@ -941,7 +1081,7 @@ declare const _default: import("vue").DefineComponent<{
                 value: string;
             }[]>;
             presetValCp: import("vue").WritableComputedRef<string>;
-            customDateCp: import("vue").WritableComputedRef<string>;
+            valueDateCp: import("vue").WritableComputedRef<unknown>;
             handleChange: (val: any, type: "start" | "end") => void;
             isStartDateDisabled: (ts: number) => boolean;
             timeStartDisabled: (ts: number) => {
@@ -1086,6 +1226,109 @@ declare const _default: import("vue").DefineComponent<{
                 to: string | false | HTMLElement;
                 holidays: Date[];
             }>>;
+            DateOption: import("vue").DefineComponent<{
+                filterType: {
+                    type: StringConstructor;
+                    required: true;
+                };
+                modelValue: {
+                    type: (ArrayConstructor | NumberConstructor | StringConstructor)[];
+                    default: null;
+                };
+                presetVal: {
+                    type: StringConstructor;
+                    default: null;
+                };
+                dateType: {
+                    type: StringConstructor;
+                };
+                isDateDisabled: {
+                    type: FunctionConstructor;
+                };
+                timeDisabled: {
+                    type: FunctionConstructor;
+                };
+                valueFormat: {
+                    type: StringConstructor;
+                };
+            }, {
+                widgetOptions: {
+                    label: string;
+                    value: string;
+                }[];
+                widgetRangeOptions: {
+                    label: string;
+                    value: string;
+                }[];
+                startDateNum: import("vue").Ref<any>;
+                endDateNum: import("vue").Ref<any>;
+                props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
+                    filterType: {
+                        type: StringConstructor;
+                        required: true;
+                    };
+                    modelValue: {
+                        type: (ArrayConstructor | NumberConstructor | StringConstructor)[];
+                        default: null;
+                    };
+                    presetVal: {
+                        type: StringConstructor;
+                        default: null;
+                    };
+                    dateType: {
+                        type: StringConstructor;
+                    };
+                    isDateDisabled: {
+                        type: FunctionConstructor;
+                    };
+                    timeDisabled: {
+                        type: FunctionConstructor;
+                    };
+                    valueFormat: {
+                        type: StringConstructor;
+                    };
+                }>> & {
+                    "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
+                    "onUpdate:presetVal"?: ((...args: any[]) => any) | undefined;
+                }>>;
+                emit: (event: "update:modelValue" | "update:presetVal", ...args: any[]) => void;
+                valueCp: import("vue").WritableComputedRef<any>;
+                presetValCp: import("vue").WritableComputedRef<string>;
+                handleChange: (val: any, type: "start" | "end") => void;
+                NSelect: any;
+                NInputNumber: any;
+            }, 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<{
+                filterType: {
+                    type: StringConstructor;
+                    required: true;
+                };
+                modelValue: {
+                    type: (ArrayConstructor | NumberConstructor | StringConstructor)[];
+                    default: null;
+                };
+                presetVal: {
+                    type: StringConstructor;
+                    default: null;
+                };
+                dateType: {
+                    type: StringConstructor;
+                };
+                isDateDisabled: {
+                    type: FunctionConstructor;
+                };
+                timeDisabled: {
+                    type: FunctionConstructor;
+                };
+                valueFormat: {
+                    type: StringConstructor;
+                };
+            }>> & {
+                "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
+                "onUpdate:presetVal"?: ((...args: any[]) => any) | undefined;
+            }, {
+                modelValue: string | number | unknown[];
+                presetVal: string;
+            }>;
             WidgetValEnums: {
                 CUSTOM: string;
                 FIRST_VAL: string;
@@ -1118,6 +1361,10 @@ declare const _default: import("vue").DefineComponent<{
                 LAST_YEAR: string;
             };
         }, 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<{
+            item: {
+                type: ObjectConstructor;
+                required: true;
+            };
             paramCfg: {
                 type: ObjectConstructor;
                 default: null;
@@ -1270,6 +1517,10 @@ declare const _default: import("vue").DefineComponent<{
             SELECTTREEDYNAMIC: string;
         };
     }, 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<{
+        item: {
+            type: ObjectConstructor;
+            default: null;
+        };
         paramCfg: {
             type: ObjectConstructor;
             default: null;
@@ -1296,6 +1547,7 @@ declare const _default: import("vue").DefineComponent<{
         "onUpdate:customDate"?: ((...args: any[]) => any) | undefined;
     }, {
         modelValue: string | number | unknown[];
+        item: Record<string, any>;
         paramCfg: Record<string, any>;
         presetVal: string;
         isAccurate: boolean;
@@ -1304,11 +1556,12 @@ declare const _default: import("vue").DefineComponent<{
     ConditionEnums: {
         NULL: string;
         EQUAL: string;
+        CUSTOM_RANGE: string;
+        IN_THE_PAST: string;
+        IN_THE_FUTURE: string;
+        IN_THE_PAST_DI: string;
+        IN_THE_FUTURE_DI: string;
     };
-    conditionOptions: {
-        label: string;
-        value: string;
-    }[];
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("cancelSaveAdd" | "saveAdd")[], "cancelSaveAdd" | "saveAdd", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     actionList_prop: {
         type: PropType<IClassifyListType>;

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

@@ -2,10 +2,10 @@ import { createElementVNode, defineComponent, useAttrs, reactive, ref, provide,
 import { useMessage, NSpin, NInput, NIcon, NButton, NSelect, NTooltip } from 'naive-ui';
 import { CloseOutline, AddOutline, AddCircleSharp } from '@vicons/ionicons5';
 import ValueCfg from './ValueCfg.vue.js';
-import { ConditionEnums, DataTypeEnums } from '../../types/enums.js';
+import { ConditionEnums, DataTypeEnums, WidgetTypeEnums } from '../../types/enums.js';
 import { useDisplayCategory } from './hooks/useDisplayCategory.js';
 import { useFilterConditions } from './hooks/useFilterConditions.js';
-import { conditionOptions } from './helpers/options.js';
+import { dateConditionOptions, baseConditionOptions } from './helpers/options.js';
 import { InjectionClassifyFilterList } from '../../constants/index.js';
 
 const _hoisted_1 = {
@@ -93,6 +93,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     const menuProps = {
       class: "classify-fieldkey-popover"
     };
+    const specialDateRange = [ConditionEnums.IN_THE_PAST, ConditionEnums.IN_THE_FUTURE, ConditionEnums.IN_THE_PAST_DI, ConditionEnums.IN_THE_FUTURE_DI];
+    const specialCustomDateRange = [ConditionEnums.CUSTOM_RANGE];
     const $attrs = useAttrs();
     const FormState = reactive({
       className: "",
@@ -126,6 +128,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       initFilterConditions,
       getRawFilterConditions
     } = useFilterConditions(toRef(FormState, "filterConditions"), props.searchFieldList, DataTypeEnums.API);
+    const dateTypeList = [WidgetTypeEnums.DATE_RANGE_INNER, WidgetTypeEnums.DATETIME_RANGE_INNER];
+    function getOptions(key) {
+      const item = getParamCfg(key);
+      return dateTypeList.includes(item.type) ? dateConditionOptions : baseConditionOptions;
+    }
     function handleEditDisplayCategory(item) {
       item.disabled = false;
       setTimeout(() => {
@@ -203,7 +210,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           presetVal,
           customDate
         }) => {
-          return !key || !condition || condition === ConditionEnums.EQUAL && !value && !presetVal && !customDate;
+          var _a;
+          return !key || !condition || condition === ConditionEnums.EQUAL && !value && !presetVal && !customDate || specialDateRange.includes(condition) && (!value || !presetVal) || specialCustomDateRange.includes(condition) && (!value || ((_a = (value != null ? value : "").split("~")) == null ? void 0 : _a.length) < 2 || !presetVal);
         });
         if (isEmpty) {
           $message.warning(function() {
@@ -381,7 +389,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             value: item.condition,
             to: "body",
             filterable: "",
-            options: unref(conditionOptions),
+            options: getOptions(item.key),
             "onUpdate:value": ($event) => unref(updateCondition)(index, $event)
           }, null, 8, ["value", "options", "onUpdate:value"])) : createCommentVNode("v-if", true), createCommentVNode(function() {
             var _a, _b, _c;
@@ -390,7 +398,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             } catch (e) {
               return "\u81EA\u5B9A\u4E49";
             }
-          }()), item.key && item.condition && item.condition !== unref(ConditionEnums).NULL ? (openBlock(), createBlock(ValueCfg, {
+          }()), item.key && item.condition && item.condition !== unref(ConditionEnums).NULL && item.condition !== unref(ConditionEnums).NOT_NULL ? (openBlock(), createBlock(ValueCfg, {
             key: 1,
             modelValue: item.value,
             "onUpdate:modelValue": ($event) => item.value = $event,
@@ -400,8 +408,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             "onUpdate:isAccurate": ($event) => item.isAccurateSearch = $event,
             customDate: item.customDate,
             "onUpdate:customDate": ($event) => item.customDate = $event,
+            item,
             "param-cfg": unref(getParamCfg)(item.key)
-          }, null, 8, ["modelValue", "onUpdate:modelValue", "presetVal", "onUpdate:presetVal", "isAccurate", "onUpdate:isAccurate", "customDate", "onUpdate:customDate", "param-cfg"])) : createCommentVNode("v-if", true), createVNode(unref(NTooltip), {
+          }, null, 8, ["modelValue", "onUpdate:modelValue", "presetVal", "onUpdate:presetVal", "isAccurate", "onUpdate:isAccurate", "customDate", "onUpdate:customDate", "item", "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

@@ -315,7 +315,7 @@ declare const _default: import("vue").DefineComponent<{
     value: string;
     placeholder: string;
     unit: string;
-    clearable: boolean;
     valueFormat: string;
+    clearable: boolean;
 }>;
 export default _default;

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

@@ -225,7 +225,7 @@ declare const _default: import("vue").DefineComponent<{
     type: ITypeDate;
     value: string;
     placeholder: string;
-    clearable: boolean;
     valueFormat: string;
+    clearable: boolean;
 }>;
 export default _default;

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

@@ -72,7 +72,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         return;
       }
       let resultDate = null;
-      const quickBtnVal = props.radioValue === (date == null ? void 0 : date.value) ? "" : date.value;
+      const quickBtnVal = props.radioValue === (date == null ? void 0 : date.con) ? "" : date.con;
       if (quickBtnVal) {
         resultDate = isRange.value ? formatDateRangeInfo(quickBtnVal, props.dateFormat, optionSetting.value) : presetValToTimestamp(quickBtnVal, props.dateFormat);
       }

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

@@ -336,8 +336,8 @@ declare const _default: import("vue").DefineComponent<{
     type: ITypeDate;
     value: string;
     unit: string;
-    clearable: boolean;
     valueFormat: string;
+    clearable: boolean;
     startPlaceholder: string;
     endPlaceholder: string;
 }>;

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

@@ -420,8 +420,8 @@ declare const DateInner: import("vue").DefineComponent<{
     value: string;
     placeholder: string;
     unit: string;
-    clearable: boolean;
     valueFormat: string;
+    clearable: boolean;
 }>;
 declare const DateOut: import("vue").DefineComponent<{
     componentCfg: {
@@ -647,8 +647,8 @@ declare const DateOut: import("vue").DefineComponent<{
     type: "date" | "datetime";
     value: string;
     placeholder: string;
-    clearable: boolean;
     valueFormat: string;
+    clearable: boolean;
 }>;
 declare const DateRangeInner: import("vue").DefineComponent<{
     componentCfg: {
@@ -985,8 +985,8 @@ declare const DateRangeInner: import("vue").DefineComponent<{
     type: "date" | "datetime";
     value: string;
     unit: string;
-    clearable: boolean;
     valueFormat: string;
+    clearable: boolean;
     startPlaceholder: string;
     endPlaceholder: string;
 }>;

package/es/components/table-filter/src/components/render-widget/helpers/dateExtraMap.js

@@ -595,8 +595,22 @@ const baseDateRangeInner = {
     }(),
     con: WidgetValEnums.PAST_HALF_YEAR
   }, {
-    name: "\u8FD1\u4E00\u5E74",
-    title: "\u8FD1\u4E00\u5E74",
+    name: function() {
+      var _a, _b, _c;
+      try {
+        return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.667")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.667")) || "\u8FD1\u4E00\u5E74";
+      } catch (e) {
+        return "\u8FD1\u4E00\u5E74";
+      }
+    }(),
+    title: function() {
+      var _a, _b, _c;
+      try {
+        return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.667")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.667")) || "\u8FD1\u4E00\u5E74";
+      } catch (e) {
+        return "\u8FD1\u4E00\u5E74";
+      }
+    }(),
     con: WidgetValEnums.PAST_YEAR
   }],
   [WidgetOptionEnums.PAST_TIME]: [{
@@ -834,8 +848,22 @@ const baseDateRangeInner = {
     }(),
     con: WidgetValEnums.PAST_HALF_YEAR
   }, {
-    name: "\u8FD1\u4E00\u5E74",
-    title: "\u8FD1\u4E00\u5E74",
+    name: function() {
+      var _a, _b, _c;
+      try {
+        return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.667")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.667")) || "\u8FD1\u4E00\u5E74";
+      } catch (e) {
+        return "\u8FD1\u4E00\u5E74";
+      }
+    }(),
+    title: function() {
+      var _a, _b, _c;
+      try {
+        return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.667")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.667")) || "\u8FD1\u4E00\u5E74";
+      } catch (e) {
+        return "\u8FD1\u4E00\u5E74";
+      }
+    }(),
     con: WidgetValEnums.PAST_YEAR
   }],
   [WidgetOptionEnums.FUTURE_TIME]: [{

package/es/components/table-filter/src/components/render-widget/helpers/presetValToTimestamp.d.ts

@@ -1,3 +1,4 @@
 export declare const presetValToTimestamp: (presetVal: string, format?: string, isOrigin?: boolean) => any;
 export declare const formatDateRangeInfo: (key: string, format?: string, optionSetting?: string, isOrigin?: boolean) => string | number | any[];
+export declare const formatSpecialDateRange: (conObj: any, format?: string) => string;
 export declare const presetValToDateRangestr: (presetVal: string, format?: string) => string | null;

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

@@ -1,5 +1,5 @@
 import { DateRangeOutDefEnums, DatePresetValEnums, DateRangeInnerValEnums } from '../enums.js';
-import { WidgetOptionEnums } from '../../../types/enums.js';
+import { WidgetOptionEnums, ConditionEnums } from '../../../types/enums.js';
 import { dateDisabledCollect } from './dateDisabled.js';
 import moment from 'moment';
 
@@ -142,6 +142,42 @@ const formatDateRangeInfo = (key, format = "x", optionSetting = WidgetOptionEnum
   }
   return [];
 };
+const formatSpecialDateRange = (conObj, format = "x") => {
+  if (Array.isArray(conObj.value) && conObj.con && conObj.unit) {
+    let num = 0;
+    let startNum = 0;
+    let endNum = 0;
+    const getStartAndEndValue = (result) => {
+      const [start, end] = result.split("~");
+      if (start.trim())
+        startNum = Number(start.trim());
+      if (end.trim())
+        endNum = Number(end.trim());
+    };
+    ConditionEnums.CUSTOM_RANGE === conObj.con ? getStartAndEndValue(conObj.value[0]) : num = Number(conObj.value);
+    const unit = conObj.unit.toLowerCase();
+    switch (conObj.con) {
+      case ConditionEnums.CUSTOM_RANGE: {
+        const startResult = startNum < 0 ? moment().subtract(Math.abs(startNum), unit).startOf("day").format(format) : moment().add(startNum, unit).startOf("day").format(format);
+        const endResult = endNum < 0 ? moment().subtract(Math.abs(endNum), unit).endOf("day").format(format) : moment().add(endNum, unit).endOf("day").format(format);
+        return `${startResult} ~ ${endResult}`;
+      }
+      case ConditionEnums.IN_THE_PAST: {
+        return `${moment().subtract(num, unit).startOf("day").format(format)} ~ ${moment().format(format)}`;
+      }
+      case ConditionEnums.IN_THE_FUTURE: {
+        return `${moment().format(format)} ~ ${moment().add(num, unit).endOf("day").format(format)}`;
+      }
+      case ConditionEnums.IN_THE_PAST_DI: {
+        return `${moment().subtract(num, unit).startOf("day").format(format)} ~ ${moment().subtract(num, unit).endOf("day").format(format)}`;
+      }
+      case ConditionEnums.IN_THE_FUTURE_DI: {
+        return `${moment().add(num, unit).startOf("day").format(format)} ~ ${moment().add(num, unit).endOf("day").format(format)}`;
+      }
+    }
+  }
+  return "";
+};
 const dateRangeOutMap = new Map([...dateRangeMapInner, [DateRangeOutDefEnums.PAST_WEEK, () => [moment().subtract(6, "days").startOf("day"), moment().endOf("day")]], [DateRangeOutDefEnums.PAST_MONTH, () => [moment().subtract(1, "months").startOf("day"), moment().endOf("day")]], [DateRangeOutDefEnums.PAST_HALF_YEAR, () => [moment().subtract(6, "months").startOf("day"), moment().endOf("day")]]]);
 const presetValToDateRangestr = (presetVal, format = "x") => {
   if (!dateRangeOutMap.has(presetVal))
@@ -155,4 +191,4 @@ const presetValToDateRangestr = (presetVal, format = "x") => {
   return null;
 };
 
-export { formatDateRangeInfo, presetValToDateRangestr, presetValToTimestamp };
+export { formatDateRangeInfo, formatSpecialDateRange, presetValToDateRangestr, presetValToTimestamp };

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

@@ -735,8 +735,8 @@ export declare const WidgetCfgMaps: Map<string, {
         value: string;
         placeholder: string;
         unit: string;
-        clearable: boolean;
         valueFormat: string;
+        clearable: boolean;
     }>;
     props: {
         type: string;
@@ -976,8 +976,8 @@ export declare const WidgetCfgMaps: Map<string, {
         type: "date" | "datetime";
         value: string;
         placeholder: string;
-        clearable: boolean;
         valueFormat: string;
+        clearable: boolean;
     }>;
     props: {
         type: string;
@@ -1328,8 +1328,8 @@ export declare const WidgetCfgMaps: Map<string, {
         type: "date" | "datetime";
         value: string;
         unit: string;
-        clearable: boolean;
         valueFormat: string;
+        clearable: boolean;
         startPlaceholder: string;
         endPlaceholder: string;
     }>;