cnhis-design-vue 3.3.3-beta.70 → 3.3.3-beta.73

package/es/components/form-config/src/components/FormConfigEdit.vue.d.ts

@@ -384,14 +384,14 @@ declare const _default: import("vue").DefineComponent<{
             compareMap?: {
                 NULL?: ((v1: any, v2: any) => boolean) | undefined;
                 EQ?: ((v1: any, v2: any) => boolean) | undefined;
-                NOT_NULL?: ((v1: any, v2: any) => boolean) | undefined;
-                NEQ?: ((v1: any, v2: any) => boolean) | undefined;
                 BIG?: ((v1: any, v2: any) => boolean) | undefined;
                 LESS?: ((v1: any, v2: any) => boolean) | undefined;
                 BIGEQ?: ((v1: any, v2: any) => boolean) | undefined;
                 LESSEQ?: ((v1: any, v2: any) => boolean) | undefined;
                 CL?: ((v1: any, v2: any) => boolean) | undefined;
                 NC?: ((v1: any, v2: any) => boolean) | undefined;
+                NEQ?: ((v1: any, v2: any) => boolean) | undefined;
+                NOT_NULL?: ((v1: any, v2: any) => boolean) | undefined;
             } | undefined;
         }[] | undefined;
         show_mode?: import("../../../../shared/types").LowCodeTypes.showModeType | undefined;
@@ -663,14 +663,14 @@ declare const _default: import("vue").DefineComponent<{
                     compareMap?: {
                         NULL?: ((v1: any, v2: any) => boolean) | undefined;
                         EQ?: ((v1: any, v2: any) => boolean) | undefined;
-                        NOT_NULL?: ((v1: any, v2: any) => boolean) | undefined;
-                        NEQ?: ((v1: any, v2: any) => boolean) | undefined;
                         BIG?: ((v1: any, v2: any) => boolean) | undefined;
                         LESS?: ((v1: any, v2: any) => boolean) | undefined;
                         BIGEQ?: ((v1: any, v2: any) => boolean) | undefined;
                         LESSEQ?: ((v1: any, v2: any) => boolean) | undefined;
                         CL?: ((v1: any, v2: any) => boolean) | undefined;
                         NC?: ((v1: any, v2: any) => boolean) | undefined;
+                        NEQ?: ((v1: any, v2: any) => boolean) | undefined;
+                        NOT_NULL?: ((v1: any, v2: any) => boolean) | undefined;
                     } | undefined;
                 }[] | undefined;
                 show_mode?: import("../../../../shared/types").LowCodeTypes.showModeType | undefined;
@@ -932,14 +932,14 @@ declare const _default: import("vue").DefineComponent<{
                 compareMap?: {
                     NULL?: ((v1: any, v2: any) => boolean) | undefined;
                     EQ?: ((v1: any, v2: any) => boolean) | undefined;
-                    NOT_NULL?: ((v1: any, v2: any) => boolean) | undefined;
-                    NEQ?: ((v1: any, v2: any) => boolean) | undefined;
                     BIG?: ((v1: any, v2: any) => boolean) | undefined;
                     LESS?: ((v1: any, v2: any) => boolean) | undefined;
                     BIGEQ?: ((v1: any, v2: any) => boolean) | undefined;
                     LESSEQ?: ((v1: any, v2: any) => boolean) | undefined;
                     CL?: ((v1: any, v2: any) => boolean) | undefined;
                     NC?: ((v1: any, v2: any) => boolean) | undefined;
+                    NEQ?: ((v1: any, v2: any) => boolean) | undefined;
+                    NOT_NULL?: ((v1: any, v2: any) => boolean) | undefined;
                 } | undefined;
             }[] | undefined;
             show_mode?: import("../../../../shared/types").LowCodeTypes.showModeType | undefined;
@@ -1209,14 +1209,14 @@ declare const _default: import("vue").DefineComponent<{
                 compareMap?: {
                     NULL?: ((v1: any, v2: any) => boolean) | undefined;
                     EQ?: ((v1: any, v2: any) => boolean) | undefined;
-                    NOT_NULL?: ((v1: any, v2: any) => boolean) | undefined;
-                    NEQ?: ((v1: any, v2: any) => boolean) | undefined;
                     BIG?: ((v1: any, v2: any) => boolean) | undefined;
                     LESS?: ((v1: any, v2: any) => boolean) | undefined;
                     BIGEQ?: ((v1: any, v2: any) => boolean) | undefined;
                     LESSEQ?: ((v1: any, v2: any) => boolean) | undefined;
                     CL?: ((v1: any, v2: any) => boolean) | undefined;
                     NC?: ((v1: any, v2: any) => boolean) | undefined;
+                    NEQ?: ((v1: any, v2: any) => boolean) | undefined;
+                    NOT_NULL?: ((v1: any, v2: any) => boolean) | undefined;
                 } | undefined;
             }[] | undefined;
             show_mode?: import("../../../../shared/types").LowCodeTypes.showModeType | undefined;

package/es/components/form-config/src/components/FormConfigEventSetting.vue.d.ts

@@ -28,14 +28,14 @@ declare const _default: import("vue").DefineComponent<{
         compareMap?: {
             NULL?: ((v1: any, v2: any) => boolean) | undefined;
             EQ?: ((v1: any, v2: any) => boolean) | undefined;
-            NOT_NULL?: ((v1: any, v2: any) => boolean) | undefined;
-            NEQ?: ((v1: any, v2: any) => boolean) | undefined;
             BIG?: ((v1: any, v2: any) => boolean) | undefined;
             LESS?: ((v1: any, v2: any) => boolean) | undefined;
             BIGEQ?: ((v1: any, v2: any) => boolean) | undefined;
             LESSEQ?: ((v1: any, v2: any) => boolean) | undefined;
             CL?: ((v1: any, v2: any) => boolean) | undefined;
             NC?: ((v1: any, v2: any) => boolean) | undefined;
+            NEQ?: ((v1: any, v2: any) => boolean) | undefined;
+            NOT_NULL?: ((v1: any, v2: any) => boolean) | undefined;
         } | undefined;
         isRestoreDefault?: boolean | undefined;
         sqlExpression?: string | undefined;

package/es/components/form-render/src/components/renderer/date.d.ts

@@ -37,7 +37,9 @@ export declare const DATE: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:value"[], "update:value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    [key: string]: any;
+}>, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:value"[], "update:value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     onChange: {};
     disabled: {
         type: BooleanConstructor;

package/es/components/form-render/src/components/renderer/date.js

@@ -1,4 +1,4 @@
-import { defineComponent, computed, watch, ref, onMounted, inject, createVNode, mergeProps } from 'vue';
+import { defineComponent, computed, watch, ref, onMounted, inject, h, createVNode, mergeProps } from 'vue';
 import { generateTimeFormat } from '../../../../../shared/utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { useEventListener } from '@vueuse/core';
@@ -192,17 +192,19 @@ const script = /* @__PURE__ */ defineComponent({
     } = useLocale("DatePicker");
     return () => {
       var _a;
-      return (globProps == null ? void 0 : globProps.lazyRender) && showText.value ? createVNode("div", {
-        "class": ["form-render__textMode--input n-input", {
+      return (globProps == null ? void 0 : globProps.lazyRender) && showText.value ? h("div", {
+        class: ["form-render__textMode--input n-input", {
           "form-render__textMode--inputDisabled": props.disabled
         }],
-        "tabindex": 0,
-        "onFocus": onFocus
-      }, [[valueRef.value ? createVNode("span", null, [valueRef.value]) : createVNode("span", {
-        "class": "form-render__textMode--inputPlaceholder"
-      }, [props.placeholder || ((_a = localeRef.value) == null ? void 0 : _a.datetimePlaceholder)]), createVNode(script$1, {
-        "class": "form-render__textMode--dateIcon n-base-icon n-date-picker-icon"
-      }, null)]]) : createVNode(DatePicker, mergeProps({
+        tabindex: 0,
+        onFocus
+      }, [h("span", {
+        class: {
+          "form-render__textMode--inputPlaceholder": !valueRef.value
+        }
+      }, valueRef.value || props.placeholder || ((_a = localeRef.value) == null ? void 0 : _a.datetimePlaceholder)), h(script$1, {
+        class: "form-render__textMode--dateIcon n-base-icon n-date-picker-icon"
+      })]) : createVNode(DatePicker, mergeProps({
         "ref": datePickerRef,
         "key": key.value,
         "disabled": props.disabled,

package/es/components/iho-chat/src/components/ChatMain.vue2.js

@@ -603,7 +603,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         }, {
           default: withCtx(() => [!unref(isAudioOrVideoMessage)(item.content) ? (openBlock(), createElementBlock(Fragment, {
             key: 0
-          }, [createCommentVNode(' <n-button\n												quaternary\n												size="tiny"\n												@click="(event: MouseEvent) => handleSelectLabel(event, item.id)"\n											>\n												<template #icon>\n													<n-icon size="17" :component="HappyOutline" />\n												</template>\n											</n-button> '), createVNode(unref(NButton), {
+          }, [createCommentVNode(' <n-button\r\n												quaternary\r\n												size="tiny"\r\n												@click="(event: MouseEvent) => handleSelectLabel(event, item.id)"\r\n											>\r\n												<template #icon>\r\n													<n-icon size="17" :component="HappyOutline" />\r\n												</template>\r\n											</n-button> '), createVNode(unref(NButton), {
             quaternary: "",
             size: "tiny",
             onClick: () => setReferenceMsg(item)

package/es/components/iho-chat/src/components/PersonProfile.vue2.js

@@ -225,7 +225,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           round: "",
           size: 100,
           onClickCapture: _cache[0] || (_cache[0] = ($event) => showLargeAvatar.value = true)
-        }, null, 8, ["src"]), createCommentVNode(' <n-upload abstract accept="image/*" @change="onChange">\n							<n-upload-trigger #="{ handleClick }" abstract>\n								<n-button\n									circle\n									secondary\n									class="edit-avatar"\n									v-show="userDetail.id === state.userInfo.id"\n									@click="handleClick"\n								>\n									<template #icon>\n										<n-icon size="16" color="#666666" :component="Camera" />\n									</template>\n								</n-button>\n							</n-upload-trigger>\n						</n-upload> '), createElementVNode("div", _hoisted_4, [createElementVNode("h4", null, [createElementVNode("label", _hoisted_5, toDisplayString(userDetail.name), 1), withDirectives(createElementVNode("label", {
+        }, null, 8, ["src"]), createCommentVNode(' <n-upload abstract accept="image/*" @change="onChange">\r\n							<n-upload-trigger #="{ handleClick }" abstract>\r\n								<n-button\r\n									circle\r\n									secondary\r\n									class="edit-avatar"\r\n									v-show="userDetail.id === state.userInfo.id"\r\n									@click="handleClick"\r\n								>\r\n									<template #icon>\r\n										<n-icon size="16" color="#666666" :component="Camera" />\r\n									</template>\r\n								</n-button>\r\n							</n-upload-trigger>\r\n						</n-upload> '), createElementVNode("div", _hoisted_4, [createElementVNode("h4", null, [createElementVNode("label", _hoisted_5, toDisplayString(userDetail.name), 1), withDirectives(createElementVNode("label", {
           class: normalizeClass(["iho-chatRole", unref(isDoctorRole)(userDetail.roleInfo) ? "isDoctor" : ""])
         }, toDisplayString(unref(getRoleName)(userDetail.roleInfo)), 3), [[vShow, unref(getRoleName)(userDetail.roleInfo)]])]), createElementVNode("p", null, toDisplayString(userDetail.orgName), 1)]), createVNode(unref(NButton), {
           strong: "",

package/es/components/index.js

@@ -86,7 +86,7 @@ import AudioSdk from './audio-sdk/index.js';
 export { default as CAudioSdk } from './audio-sdk/index.js';
 export { default as CInsuranceSDK } from './card-reader-sdk/src/insuranceSDK.js';
 export { default as CCardReaderSDK } from './card-reader-sdk/src/cardReaderSDK.js';
-export { formatDateRangeInfo, presetValToDateRangestr, presetValToTimestamp } from './table-filter/src/components/render-widget/helpers/presetValToTimestamp.js';
+export { formatDateRangeInfo, formatSpecialDateRange, presetValToDateRangestr, presetValToTimestamp } from './table-filter/src/components/render-widget/helpers/presetValToTimestamp.js';
 export { DatePresetValEnums, DateRangeInnerValEnums, DateRangeOutDefEnums } from './table-filter/src/components/render-widget/enums.js';
 export { createOpacityColor, useTheme } from '../shared/hooks/useTheme.js';
 export { handleInputEvent, useDateTime } from '../shared/hooks/useDateTime.js';

package/es/components/shortcut-setter/index.d.ts

@@ -174,14 +174,14 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
             compareMap?: {
                 NULL?: ((v1: any, v2: any) => boolean) | undefined;
                 EQ?: ((v1: any, v2: any) => boolean) | undefined;
-                NOT_NULL?: ((v1: any, v2: any) => boolean) | undefined;
-                NEQ?: ((v1: any, v2: any) => boolean) | undefined;
                 BIG?: ((v1: any, v2: any) => boolean) | undefined;
                 LESS?: ((v1: any, v2: any) => boolean) | undefined;
                 BIGEQ?: ((v1: any, v2: any) => boolean) | undefined;
                 LESSEQ?: ((v1: any, v2: any) => boolean) | undefined;
                 CL?: ((v1: any, v2: any) => boolean) | undefined;
                 NC?: ((v1: any, v2: any) => boolean) | undefined;
+                NEQ?: ((v1: any, v2: any) => boolean) | undefined;
+                NOT_NULL?: ((v1: any, v2: any) => boolean) | undefined;
             } | undefined;
         }[] | undefined;
         show_mode?: import("../../shared/types").LowCodeTypes.showModeType | undefined;

package/es/components/shortcut-setter/src/ShortcutSetter.vue.d.ts

@@ -177,14 +177,14 @@ declare const _default: import("vue").DefineComponent<{
             compareMap?: {
                 NULL?: ((v1: any, v2: any) => boolean) | undefined;
                 EQ?: ((v1: any, v2: any) => boolean) | undefined;
-                NOT_NULL?: ((v1: any, v2: any) => boolean) | undefined;
-                NEQ?: ((v1: any, v2: any) => boolean) | undefined;
                 BIG?: ((v1: any, v2: any) => boolean) | undefined;
                 LESS?: ((v1: any, v2: any) => boolean) | undefined;
                 BIGEQ?: ((v1: any, v2: any) => boolean) | undefined;
                 LESSEQ?: ((v1: any, v2: any) => boolean) | undefined;
                 CL?: ((v1: any, v2: any) => boolean) | undefined;
                 NC?: ((v1: any, v2: any) => boolean) | undefined;
+                NEQ?: ((v1: any, v2: any) => boolean) | undefined;
+                NOT_NULL?: ((v1: any, v2: any) => boolean) | undefined;
             } | undefined;
         }[] | undefined;
         show_mode?: import("../../../shared/types").LowCodeTypes.showModeType | undefined;

package/es/components/table-filter/index.js

@@ -1,2 +1,2 @@
-export { formatDateRangeInfo, presetValToDateRangestr, presetValToTimestamp } from './src/components/render-widget/helpers/presetValToTimestamp.js';
+export { formatDateRangeInfo, formatSpecialDateRange, presetValToDateRangestr, presetValToTimestamp } from './src/components/render-widget/helpers/presetValToTimestamp.js';
 export { DatePresetValEnums, DateRangeInnerValEnums, DateRangeOutDefEnums } from './src/components/render-widget/enums.js';

package/es/components/table-filter/src/components/classify-filter/helpers/options.js

@@ -21,126 +21,52 @@ const baseConditionOptions = [{
   }(),
   value: ConditionEnums.NULL
 }];
-const dateConditionOptions = [...baseConditionOptions, {
-  label: function() {
-    var _a, _b, _c;
-    try {
-      return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.339")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.339")) || "\u4E0D\u4E3A\u7A7A";
-    } catch (e) {
-      return "\u4E0D\u4E3A\u7A7A";
-    }
-  }(),
-  value: ConditionEnums.NOT_NULL
-}, {
-  label: function() {
-    var _a, _b, _c;
-    try {
-      return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.318")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.318")) || "\u4E0D\u7B49\u4E8E";
-    } catch (e) {
-      return "\u4E0D\u7B49\u4E8E";
-    }
-  }(),
-  value: ConditionEnums.NEQ
-}, {
-  label: function() {
-    var _a, _b, _c;
-    try {
-      return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.319")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.319")) || "\u5927\u4E8E";
-    } catch (e) {
-      return "\u5927\u4E8E";
-    }
-  }(),
-  value: ConditionEnums.BIG
-}, {
-  label: function() {
-    var _a, _b, _c;
-    try {
-      return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.320")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.320")) || "\u5C0F\u4E8E";
-    } catch (e) {
-      return "\u5C0F\u4E8E";
-    }
-  }(),
-  value: ConditionEnums.LESS
-}, {
-  label: function() {
-    var _a, _b, _c;
-    try {
-      return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.321")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.321")) || "\u5927\u4E8E\u7B49\u4E8E";
-    } catch (e) {
-      return "\u5927\u4E8E\u7B49\u4E8E";
-    }
-  }(),
-  value: ConditionEnums.BIGEQ
-}, {
-  label: function() {
-    var _a, _b, _c;
-    try {
-      return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.322")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.322")) || "\u5C0F\u4E8E\u7B49\u4E8E";
-    } catch (e) {
-      return "\u5C0F\u4E8E\u7B49\u4E8E";
-    }
-  }(),
-  value: ConditionEnums.LESSEQ
-}, {
-  label: function() {
-    var _a, _b, _c;
-    try {
-      return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.332")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.332")) || "\u4EE5\u524D";
-    } catch (e) {
-      return "\u4EE5\u524D";
-    }
-  }(),
-  value: ConditionEnums.L_
-}, {
-  label: function() {
-    var _a, _b, _c;
-    try {
-      return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.333")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.333")) || "\u4EE5\u540E";
-    } catch (e) {
-      return "\u4EE5\u540E";
-    }
-  }(),
-  value: ConditionEnums.N_
-}, {
-  label: function() {
-    var _a, _b, _c;
-    try {
-      return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.334")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.334")) || "\u8FC7\u53BB\u5185";
-    } catch (e) {
-      return "\u8FC7\u53BB\u5185";
-    }
-  }(),
-  value: ConditionEnums.IN_THE_PAST
-}, {
-  label: function() {
-    var _a, _b, _c;
-    try {
-      return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.335")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.335")) || "\u672A\u6765\u5185";
-    } catch (e) {
-      return "\u672A\u6765\u5185";
-    }
-  }(),
-  value: ConditionEnums.IN_THE_FUTURE
-}, {
-  label: function() {
-    var _a, _b, _c;
-    try {
-      return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.336")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.336")) || "\u8FC7\u53BB\u7B2C";
-    } catch (e) {
-      return "\u8FC7\u53BB\u7B2C";
-    }
-  }(),
-  value: ConditionEnums.IN_THE_PAST_DI
-}, {
-  label: function() {
-    var _a, _b, _c;
-    try {
-      return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.337")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.337")) || "\u672A\u6765\u7B2C";
-    } catch (e) {
-      return "\u672A\u6765\u7B2C";
-    }
-  }(),
-  value: ConditionEnums.IN_THE_FUTURE_DI
-}];
+const dateConditionOptions = [
+  ...baseConditionOptions,
+  {
+    label: function() {
+      var _a, _b, _c;
+      try {
+        return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.334")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.334")) || "\u8FC7\u53BB\u5185";
+      } catch (e) {
+        return "\u8FC7\u53BB\u5185";
+      }
+    }(),
+    value: ConditionEnums.IN_THE_PAST
+  },
+  {
+    label: function() {
+      var _a, _b, _c;
+      try {
+        return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.335")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.335")) || "\u672A\u6765\u5185";
+      } catch (e) {
+        return "\u672A\u6765\u5185";
+      }
+    }(),
+    value: ConditionEnums.IN_THE_FUTURE
+  },
+  {
+    label: function() {
+      var _a, _b, _c;
+      try {
+        return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.336")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.336")) || "\u8FC7\u53BB\u7B2C";
+      } catch (e) {
+        return "\u8FC7\u53BB\u7B2C";
+      }
+    }(),
+    value: ConditionEnums.IN_THE_PAST_DI
+  },
+  {
+    label: function() {
+      var _a, _b, _c;
+      try {
+        return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.337")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.337")) || "\u672A\u6765\u7B2C";
+      } catch (e) {
+        return "\u672A\u6765\u7B2C";
+      }
+    }(),
+    value: ConditionEnums.IN_THE_FUTURE_DI
+  }
+];
 
 export { baseConditionOptions, dateConditionOptions };

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

@@ -30,6 +30,7 @@ declare const _default: import("vue").DefineComponent<{
     menuProps: {
         class: string;
     };
+    specialDateRange: string[];
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         actionList_prop: {
             type: PropType<IClassifyListType>;
@@ -1798,14 +1799,6 @@ declare const _default: import("vue").DefineComponent<{
     ConditionEnums: {
         NULL: string;
         EQUAL: string;
-        NOT_NULL: string;
-        NEQ: string;
-        BIG: string;
-        LESS: string;
-        BIGEQ: string;
-        LESSEQ: string;
-        L_: string;
-        N_: string;
         IN_THE_PAST: string;
         IN_THE_FUTURE: string;
         IN_THE_PAST_DI: string;

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

@@ -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,7 +127,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       initFilterConditions,
       getRawFilterConditions
     } = useFilterConditions(toRef(FormState, "filterConditions"), props.searchFieldList, DataTypeEnums.API);
-    const dateTypeList = [WidgetTypeEnums.DATE, WidgetTypeEnums.DATE_TIME, WidgetTypeEnums.DATE_RANGE_INNER, WidgetTypeEnums.DATETIME_RANGE_INNER];
+    const dateTypeList = [WidgetTypeEnums.DATE_RANGE_INNER, WidgetTypeEnums.DATETIME_RANGE_INNER];
     function getOptions(key) {
       const item = getParamCfg(key);
       return dateTypeList.includes(item.type) ? dateConditionOptions : baseConditionOptions;
@@ -208,7 +209,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           presetVal,
           customDate
         }) => {
-          return !key || !condition || condition === ConditionEnums.EQUAL && !value && !presetVal && !customDate;
+          return !key || !condition || condition === ConditionEnums.EQUAL && !value && !presetVal && !customDate || specialDateRange.includes(condition) && (!value || !presetVal);
         });
         if (isEmpty) {
           $message.warning(function() {

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/hooks/useAdvanced.js

@@ -1,6 +1,6 @@
-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';
@@ -13,6 +13,7 @@ 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) {
@@ -153,10 +154,10 @@ 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) {

package/es/components/table-filter/src/types/enums.d.ts

@@ -81,14 +81,6 @@ export declare const WidgetValEnums: {
 export declare const ConditionEnums: {
     NULL: string;
     EQUAL: string;
-    NOT_NULL: string;
-    NEQ: string;
-    BIG: string;
-    LESS: string;
-    BIGEQ: string;
-    LESSEQ: string;
-    L_: string;
-    N_: string;
     IN_THE_PAST: string;
     IN_THE_FUTURE: string;
     IN_THE_PAST_DI: string;

package/es/components/table-filter/src/types/enums.js

@@ -81,14 +81,6 @@ const WidgetValEnums = {
 const ConditionEnums = {
   NULL: "NULL",
   EQUAL: "EQ",
-  NOT_NULL: "NOT_NULL",
-  NEQ: "NEQ",
-  BIG: "BIG",
-  LESS: "LESS",
-  BIGEQ: "BIGEQ",
-  LESSEQ: "LESSEQ",
-  L_: "L_",
-  N_: "N_",
   IN_THE_PAST: "IN_THE_PAST",
   IN_THE_FUTURE: "IN_THE_FUTURE",
   IN_THE_PAST_DI: "IN_THE_PAST_DI",

package/es/env.d.ts

@@ -1,25 +1,25 @@
-/// <reference types="vite/client" />
-
-interface ImportMetaEnv {
-  readonly VITE_APP_TYPE: string;
-  // 更多环境变量...
-}
-
-interface ImportMeta {
-  readonly env: ImportMetaEnv;
-}
-
-declare module '*.vue' {
-// @ts-ignore
-  import type { App, defineComponent } from 'vue';
-  // // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
-  // // const component: DefineComponent<{}, {}, any>
-  const component: ReturnType<typeof defineComponent> & {
-    install(app: App): void;
-  };
-  // @ts-ignore
-  export default component;
-}
-
-declare module '*.js';
-
+/// <reference types="vite/client" />
+
+interface ImportMetaEnv {
+  readonly VITE_APP_TYPE: string;
+  // 更多环境变量...
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}
+
+declare module '*.vue' {
+// @ts-ignore
+  import type { App, defineComponent } from 'vue';
+  // // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
+  // // const component: DefineComponent<{}, {}, any>
+  const component: ReturnType<typeof defineComponent> & {
+    install(app: App): void;
+  };
+  // @ts-ignore
+  export default component;
+}
+
+declare module '*.js';
+

package/es/shared/hooks/useDateTime.js

@@ -98,7 +98,7 @@ function handleFormatInput(target, format, selection, full) {
   if (selection) {
     start = start || result.length + 1;
     end = end || result.length + 1;
-    target.setSelectionRange(start, end);
+    setTimeout(() => target.setSelectionRange(start, end));
   }
   return changed;
 }

package/es/shared/package.json.js

@@ -1,9 +1,9 @@
 var name = "@cnhis-design-vue/shared";
-var version = "3.3.3-beta.70";
+var version = "3.3.3-beta.73";
 var main = "index.ts";
 var peerDependencies = {
 	"naive-ui": "^2.30.0",
-	vue: "^3.2.0"
+	vue: "^3.5.0"
 };
 var dependencies = {
 	"@vicons/ionicons5": "^0.12.0",