cnhis-design-vue 3.3.3-beta.7 → 3.3.3-beta.72

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,7 @@ 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 $attrs = useAttrs();
     const FormState = reactive({
       className: "",
@@ -126,6 +127,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(() => {
@@ -200,9 +206,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 || specialDateRange.includes(condition) && (!value || !presetVal);
         });
         if (isEmpty) {
           $message.warning(function() {
@@ -380,7 +387,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;
@@ -389,7 +396,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,
@@ -397,8 +404,11 @@ 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,
+            item,
             "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", "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

@@ -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>;
@@ -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/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>;

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

@@ -3,6 +3,7 @@ import { WidgetDateOptionEnums } from '../../helpers/enums.js';
 import { widgetDateValOptions } from '../../helpers/dateExtraMap.js';
 import { formatDateRangeInfo, presetValToTimestamp } from '../../helpers/presetValToTimestamp.js';
 import { WidgetOptionEnums } from '../../../../types/enums.js';
+import { parseDateShortcuts } from '../../../../tool/date.js';
 
 const _hoisted_1 = {
   class: "radio-date-group"
@@ -42,18 +43,36 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       return (_a = props.componentCfg) == null ? void 0 : _a.rangeFilter;
     });
     function initData() {
-      var _a, _b;
+      var _a, _b, _c;
       const {
         originType
       } = (_a = props.componentCfg) == null ? void 0 : _a.widgetCfg;
       const optSetting = optionSetting.value || WidgetOptionEnums.ALL;
       const typeStr = `${originType}_${optSetting}${isRange.value ? "_RANGE" : ""}`;
+      if (optionSetting.value === WidgetOptionEnums.CUSTOM_TIME) {
+        const shortList = parseDateShortcuts((_b = props.componentCfg) == null ? void 0 : _b.widgetCfg);
+        if ((shortList == null ? void 0 : shortList.length) > 0) {
+          dateList.value = shortList.map((item) => {
+            return {
+              ...item,
+              con: item.name
+            };
+          });
+        }
+        return;
+      }
       const useType = WidgetDateOptionEnums[typeStr];
-      dateList.value = (_b = widgetDateValOptions[useType]) != null ? _b : [];
+      dateList.value = (_c = widgetDateValOptions[useType]) != null ? _c : [];
     }
-    function handleRadioClick(value) {
+    function handleRadioClick(date) {
+      if (optionSetting.value === WidgetOptionEnums.CUSTOM_TIME) {
+        const realDate = isRange.value ? `${date.parseValue[0]} ~ ${date.parseValue[1]}` : date.parseValue[0];
+        emit("clickQuickBtn", realDate);
+        emit("changeRadioValue", date.name);
+        return;
+      }
       let resultDate = null;
-      const quickBtnVal = props.radioValue === value ? "" : 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);
       }
@@ -66,8 +85,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         return openBlock(), createElementBlock("span", {
           key: date.con,
           class: normalizeClass(["radio-date-item", __props.radioValue === date.con ? "radio-date-item-active" : ""]),
-          onClick: ($event) => handleRadioClick(date.con)
-        }, toDisplayString(date.title), 11, _hoisted_2);
+          onClick: ($event) => handleRadioClick(date)
+        }, toDisplayString(date.title || date.name), 11, _hoisted_2);
       }), 128))]);
     };
   }

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

@@ -272,7 +272,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>;
@@ -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/DateRangeOut.vue2.js

@@ -6,6 +6,7 @@ import { WidgetOptionEnums } from '../../../types/enums.js';
 import { DateExtraOptions, DateExtraMap } from '../helpers/dateExtraMap.js';
 import { formatDateRangeInfo } from '../helpers/presetValToTimestamp.js';
 import { setDateDisabled, setTimeDisabled } from '../helpers/dateDisabled.js';
+import { parseDateShortcuts } from '../../../tool/date.js';
 
 var _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "DateRangeOut",
@@ -98,13 +99,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}_RANGE`;
       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;
+          });
+        }
+        rangeShortcuts.value = optionsObj;
+        return;
+      }
       shortOptions.forEach(({
         label,
         value

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

@@ -359,7 +359,7 @@ declare const DateInner: 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: import("vue").PropType<import("../../../../../../shared/types").AnyObject>;
@@ -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: {
@@ -921,7 +921,7 @@ declare const DateRangeInner: 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: import("vue").PropType<import("../../../../../../shared/types").AnyObject>;
@@ -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,27 @@ const formatDateRangeInfo = (key, format = "x", optionSetting = WidgetOptionEnum
   }
   return [];
 };
+const formatSpecialDateRange = (conObj, format = "x") => {
+  if (Array.isArray(conObj.value) && conObj.con && conObj.unit) {
+    const num = Number(conObj.value);
+    const unit = conObj.unit.toLowerCase();
+    switch (conObj.con) {
+      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 +176,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

@@ -674,7 +674,7 @@ export declare const WidgetCfgMaps: Map<string, {
             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: import("vue").PropType<import("../../../../../shared/types").AnyObject>;
@@ -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;
@@ -1264,7 +1264,7 @@ export declare const WidgetCfgMaps: Map<string, {
             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: import("vue").PropType<import("../../../../../shared/types").AnyObject>;
@@ -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;
     }>;

package/es/components/table-filter/src/hooks/useAdvanced.d.ts

@@ -19,6 +19,7 @@ export default function useAdvanced(): {
             defaultValue: any;
             defValueUnit: any;
             optionSetting: string | undefined;
+            dateShortcuts: any[] | undefined;
             multiple: boolean;
             manualMapping: boolean | null | undefined;
             showWholeOption: boolean | undefined;
@@ -42,6 +43,7 @@ export default function useAdvanced(): {
         accurateSearch: any;
         extendKey: string;
         extendType: string;
+        dateShortcuts: any[];
     }[];
     getCacheDef: (item: ISearchType, cacheList: string[]) => string | string[];
     transformClassifyChild: (conObjList: any, searchFieldList: any[]) => any;

package/es/components/table-filter/src/hooks/useAdvanced.js

@@ -1,7 +1,9 @@
-import { WidgetOptionEnums, WidgetTypeEnums, selectModeEnums, WidgetValEnums } from '../types/enums.js';
+import { WidgetOptionEnums, ConditionEnums, WidgetTypeEnums, selectModeEnums, WidgetValEnums } from '../types/enums.js';
 import { isString } from 'lodash-es';
-import { formatDateRangeInfo, presetValToTimestamp } from '../components/render-widget/helpers/presetValToTimestamp.js';
+import { formatSpecialDateRange, formatDateRangeInfo, presetValToTimestamp } from '../components/render-widget/helpers/presetValToTimestamp.js';
 import { DatePresetValEnums } from '../components/render-widget/enums.js';
+import { parseDateShortcuts } from '../tool/date.js';
+import moment from 'moment';
 
 const advanceOptionSettingMap = {
   [WidgetOptionEnums.RADIO]: "0",
@@ -11,10 +13,11 @@ const advanceOptionSettingMap = {
   [WidgetOptionEnums.PAST_TIME]: "2",
   [WidgetOptionEnums.FUTURE_TIME]: "3"
 };
+const specialDateRange = [ConditionEnums.IN_THE_PAST, ConditionEnums.IN_THE_FUTURE, ConditionEnums.IN_THE_PAST_DI, ConditionEnums.IN_THE_FUTURE_DI];
 const limitValue = 10;
 function useAdvanced() {
   function transformDataToFieldCfg(advancedFilterCfg) {
-    var _a, _b;
+    var _a, _b, _c;
     return {
       title: advancedFilterCfg.title,
       alias: advancedFilterCfg.customTitle,
@@ -26,7 +29,8 @@ function useAdvanced() {
       advanceColWidth: advancedFilterCfg.width,
       accurateSearch: advancedFilterCfg.accurateSearch ? advancedFilterCfg.accurateSearch : {},
       extendKey: (_a = advancedFilterCfg.extendKey) != null ? _a : "",
-      extendType: (_b = advancedFilterCfg.extendType) != null ? _b : ""
+      extendType: (_b = advancedFilterCfg.extendType) != null ? _b : "",
+      dateShortcuts: (_c = advancedFilterCfg.dateShortcuts) != null ? _c : []
     };
   }
   function transformData(advancedFilterData, extendData) {
@@ -45,7 +49,8 @@ function useAdvanced() {
         optionType,
         filterExplicit,
         rangeFilter,
-        componentProps
+        componentProps,
+        dateShortcuts
       } = item;
       const settingObj = {};
       const cfg = transformDataToFieldCfg(item);
@@ -103,6 +108,7 @@ function useAdvanced() {
         defaultValue: defVal,
         defValueUnit: defValUnit,
         optionSetting: optionType,
+        dateShortcuts,
         multiple: optionType === WidgetOptionEnums.MULTIPLE || widgetType === WidgetTypeEnums.SELECTLABEL,
         manualMapping: optionInfo == null ? void 0 : optionInfo.manualMapping,
         showWholeOption: optionInfo == null ? void 0 : optionInfo.showWholeOption,
@@ -138,6 +144,7 @@ function useAdvanced() {
     let collectExtendKeys = [];
     if (conObjList && conObjList.length > 0) {
       conObjList.forEach((conObj) => {
+        var _a;
         const curKey = conObj.field_key;
         let curValue = "";
         const curQuickSearchObj = searchFieldList.find((quickSearchObj) => quickSearchObj.name === curKey);
@@ -147,10 +154,21 @@ function useAdvanced() {
           }
           if (conObj.unit && conObj.unit !== DatePresetValEnums.CUSTOM) {
             if (curQuickSearchObj.type === WidgetTypeEnums.DATE) {
-              curValue = curQuickSearchObj.rangeFilter ? formatDateRangeInfo(conObj.unit, "YYYY-MM-DD", curQuickSearchObj.optionType) : presetValToTimestamp(conObj.unit, "YYYY-MM-DD");
+              curValue = curQuickSearchObj.rangeFilter ? specialDateRange.includes(conObj.con) ? formatSpecialDateRange(conObj, "YYYY-MM-DD") : formatDateRangeInfo(conObj.unit, "YYYY-MM-DD", curQuickSearchObj.optionType) : presetValToTimestamp(conObj.unit, "YYYY-MM-DD");
             }
             if (curQuickSearchObj.type === WidgetTypeEnums.DATE_TIME) {
-              curValue = curQuickSearchObj.rangeFilter ? formatDateRangeInfo(conObj.unit, "YYYY-MM-DD HH:mm:ss", curQuickSearchObj.optionType) : presetValToTimestamp(conObj.unit, "YYYY-MM-DD HH:mm:ss");
+              curValue = curQuickSearchObj.rangeFilter ? specialDateRange.includes(conObj.con) ? formatSpecialDateRange(conObj, "YYYY-MM-DD HH:mm:ss") : formatDateRangeInfo(conObj.unit, "YYYY-MM-DD HH:mm:ss", curQuickSearchObj.optionType) : presetValToTimestamp(conObj.unit, "YYYY-MM-DD HH:mm:ss");
+            }
+          }
+          if (conObj.customDate && conObj.unit === DatePresetValEnums.CUSTOM) {
+            const type = curQuickSearchObj.type === WidgetTypeEnums.DATE ? "YYYY-MM-DD" : "YYYY-MM-DD HH:mm:ss";
+            const shortList = parseDateShortcuts(curQuickSearchObj);
+            if (shortList == null ? void 0 : shortList.length) {
+              const curShort = shortList.find((item) => item.name === conObj.customDate);
+              if ((_a = curShort == null ? void 0 : curShort.parseValue) == null ? void 0 : _a.length) {
+                const dateList = curShort == null ? void 0 : curShort.parseValue.map((item) => moment(item).format(type));
+                curValue = curQuickSearchObj.type === WidgetTypeEnums.DATE ? dateList[0] : `${dateList[0]} ~ ${dateList[1]}`;
+              }
             }
           }
           if (curQuickSearchObj == null ? void 0 : curQuickSearchObj.extendKey) {

package/es/components/table-filter/src/hooks/useRenderWidget.js

@@ -58,6 +58,7 @@ function useRenderWidget() {
     return isRender;
   }
   function getRenderSearchConObj(cfg) {
+    var _a;
     const isRender = isRenderFunc(cfg);
     if (!isRender)
       return null;
@@ -77,6 +78,9 @@ function useRenderWidget() {
       value: val.length > 0 ? val : null,
       unit
     };
+    if (((_a = cfg == null ? void 0 : cfg.widgetCfg) == null ? void 0 : _a.optionSetting) === WidgetOptionEnums.CUSTOM_TIME) {
+      obj.unit = "";
+    }
     if (cfg.accurateSearch.switchEnable) {
       obj.isAccurateSearch = cfg.isAccurateSearchVal;
       obj.accurateSearchKey = cfg.accurateSearch.searchKey;

package/es/components/table-filter/src/tool/baseOptions.js

@@ -181,7 +181,14 @@ const widgetDateRangeOptions = [{
   }(),
   value: DateRangeOutDefEnums.PAST_HALF_YEAR
 }, {
-  label: "\u8FD1\u4E00\u5E74",
+  label: 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";
+    }
+  }(),
   value: DateRangeOutDefEnums.PAST_YEAR
 }];
 

package/es/components/table-filter/src/tool/date.d.ts

@@ -0,0 +1,3 @@
+import { AnyObject } from '../../../../shared/types';
+import { ICustomDateType } from '../../../../components/table-filter/src/types';
+export declare const parseDateShortcuts: (row: AnyObject) => ICustomDateType[];