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

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

@@ -31,6 +31,7 @@ declare const _default: import("vue").DefineComponent<{
         class: string;
     };
     specialDateRange: string[];
+    specialCustomDateRange: string[];
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         actionList_prop: {
             type: PropType<IClassifyListType>;
@@ -422,6 +423,12 @@ declare const _default: import("vue").DefineComponent<{
                     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;
@@ -454,135 +461,7 @@ declare const _default: import("vue").DefineComponent<{
                 emit: (event: "update:modelValue" | "update:presetVal", ...args: any[]) => void;
                 valueCp: import("vue").WritableComputedRef<any>;
                 presetValCp: import("vue").WritableComputedRef<string>;
-                CDatePicker: import("../../../../../shared/types").SFCWithInstall<import("vue").DefineComponent<{
-                    updateUnchangedValue: {
-                        type: BooleanConstructor;
-                    };
-                    onConfirm: {
-                        type: FunctionConstructor;
-                    };
-                    formattedValue: {
-                        type: PropType<(string | [string, string]) | null | undefined>;
-                    };
-                    placeholder: {
-                        type: StringConstructor;
-                    };
-                    allowedInvalidValue: {
-                        type: StringConstructor;
-                    };
-                    to: {
-                        type: PropType<string | false | HTMLElement>;
-                        default: string;
-                    };
-                    holidays: {
-                        type: PropType<Date[]>;
-                        default: () => never[];
-                    };
-                    type: {
-                        type: StringConstructor;
-                        default: string;
-                    };
-                    isDateDisabled: {
-                        type: PropType<(current: number, ...arg: any[]) => boolean>;
-                    };
-                }, {
-                    attrs: {
-                        [x: string]: unknown;
-                    };
-                    props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
-                        updateUnchangedValue: {
-                            type: BooleanConstructor;
-                        };
-                        onConfirm: {
-                            type: FunctionConstructor;
-                        };
-                        formattedValue: {
-                            type: PropType<(string | [string, string]) | null | undefined>;
-                        };
-                        placeholder: {
-                            type: StringConstructor;
-                        };
-                        allowedInvalidValue: {
-                            type: StringConstructor;
-                        };
-                        to: {
-                            type: PropType<string | false | HTMLElement>;
-                            default: string;
-                        };
-                        holidays: {
-                            type: PropType<Date[]>;
-                            default: () => never[];
-                        };
-                        type: {
-                            type: StringConstructor;
-                            default: string;
-                        };
-                        isDateDisabled: {
-                            type: PropType<(current: number, ...arg: any[]) => boolean>;
-                        };
-                    }>> & {
-                        "onUpdate:formatted-value"?: ((...args: any[]) => any) | undefined;
-                    }>>;
-                    emit: (event: "update:formatted-value", ...args: any[]) => void;
-                    datePickerRef: import("vue").Ref<import("../../../../../shared/types").AnyObject | null>;
-                    panelInstRef: import("vue").Ref<null>;
-                    placeholderRef: import("vue").Ref<any>;
-                    oldValue: string;
-                    currentFormattedValue: import("vue").WritableComputedRef<(string | [string, string]) | null | undefined>;
-                    isDateTime: import("vue").ComputedRef<boolean>;
-                    formatRef: import("vue").ComputedRef<string>;
-                    panelFormatRef: import("vue").ComputedRef<string | [string, string]>;
-                    _isDateDisabled: import("vue").ComputedRef<(current: number, ...arg: any[]) => boolean>;
-                    focus: () => any;
-                    blur: () => any;
-                    handleConfirm: (target: HTMLInputElement) => void;
-                    onUpdateShow: (show: boolean) => Promise<void>;
-                    watchers: import("../../../../../shared/types").AnyFn[];
-                    stopWatcher: () => void;
-                    setHoliday: (show: boolean) => Promise<void>;
-                    onConfirm: (...args: any[]) => Promise<void>;
-                    isAllowedInvalidValue: (value: (string | [string, string]) | null | undefined) => boolean | "" | undefined;
-                    setShortcutValue: (type: "month" | "week") => Promise<void>;
-                    NDatePicker: any;
-                }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:formatted-value"[], "update:formatted-value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-                    updateUnchangedValue: {
-                        type: BooleanConstructor;
-                    };
-                    onConfirm: {
-                        type: FunctionConstructor;
-                    };
-                    formattedValue: {
-                        type: PropType<(string | [string, string]) | null | undefined>;
-                    };
-                    placeholder: {
-                        type: StringConstructor;
-                    };
-                    allowedInvalidValue: {
-                        type: StringConstructor;
-                    };
-                    to: {
-                        type: PropType<string | false | HTMLElement>;
-                        default: string;
-                    };
-                    holidays: {
-                        type: PropType<Date[]>;
-                        default: () => never[];
-                    };
-                    type: {
-                        type: StringConstructor;
-                        default: string;
-                    };
-                    isDateDisabled: {
-                        type: PropType<(current: number, ...arg: any[]) => boolean>;
-                    };
-                }>> & {
-                    "onUpdate:formatted-value"?: ((...args: any[]) => any) | undefined;
-                }, {
-                    type: string;
-                    updateUnchangedValue: boolean;
-                    to: string | false | HTMLElement;
-                    holidays: Date[];
-                }>>;
+                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<{
@@ -1377,6 +1256,12 @@ declare const _default: import("vue").DefineComponent<{
                     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;
@@ -1409,135 +1294,7 @@ declare const _default: import("vue").DefineComponent<{
                 emit: (event: "update:modelValue" | "update:presetVal", ...args: any[]) => void;
                 valueCp: import("vue").WritableComputedRef<any>;
                 presetValCp: import("vue").WritableComputedRef<string>;
-                CDatePicker: import("../../../../../shared/types").SFCWithInstall<import("vue").DefineComponent<{
-                    updateUnchangedValue: {
-                        type: BooleanConstructor;
-                    };
-                    onConfirm: {
-                        type: FunctionConstructor;
-                    };
-                    formattedValue: {
-                        type: PropType<(string | [string, string]) | null | undefined>;
-                    };
-                    placeholder: {
-                        type: StringConstructor;
-                    };
-                    allowedInvalidValue: {
-                        type: StringConstructor;
-                    };
-                    to: {
-                        type: PropType<string | false | HTMLElement>;
-                        default: string;
-                    };
-                    holidays: {
-                        type: PropType<Date[]>;
-                        default: () => never[];
-                    };
-                    type: {
-                        type: StringConstructor;
-                        default: string;
-                    };
-                    isDateDisabled: {
-                        type: PropType<(current: number, ...arg: any[]) => boolean>;
-                    };
-                }, {
-                    attrs: {
-                        [x: string]: unknown;
-                    };
-                    props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
-                        updateUnchangedValue: {
-                            type: BooleanConstructor;
-                        };
-                        onConfirm: {
-                            type: FunctionConstructor;
-                        };
-                        formattedValue: {
-                            type: PropType<(string | [string, string]) | null | undefined>;
-                        };
-                        placeholder: {
-                            type: StringConstructor;
-                        };
-                        allowedInvalidValue: {
-                            type: StringConstructor;
-                        };
-                        to: {
-                            type: PropType<string | false | HTMLElement>;
-                            default: string;
-                        };
-                        holidays: {
-                            type: PropType<Date[]>;
-                            default: () => never[];
-                        };
-                        type: {
-                            type: StringConstructor;
-                            default: string;
-                        };
-                        isDateDisabled: {
-                            type: PropType<(current: number, ...arg: any[]) => boolean>;
-                        };
-                    }>> & {
-                        "onUpdate:formatted-value"?: ((...args: any[]) => any) | undefined;
-                    }>>;
-                    emit: (event: "update:formatted-value", ...args: any[]) => void;
-                    datePickerRef: import("vue").Ref<import("../../../../../shared/types").AnyObject | null>;
-                    panelInstRef: import("vue").Ref<null>;
-                    placeholderRef: import("vue").Ref<any>;
-                    oldValue: string;
-                    currentFormattedValue: import("vue").WritableComputedRef<(string | [string, string]) | null | undefined>;
-                    isDateTime: import("vue").ComputedRef<boolean>;
-                    formatRef: import("vue").ComputedRef<string>;
-                    panelFormatRef: import("vue").ComputedRef<string | [string, string]>;
-                    _isDateDisabled: import("vue").ComputedRef<(current: number, ...arg: any[]) => boolean>;
-                    focus: () => any;
-                    blur: () => any;
-                    handleConfirm: (target: HTMLInputElement) => void;
-                    onUpdateShow: (show: boolean) => Promise<void>;
-                    watchers: import("../../../../../shared/types").AnyFn[];
-                    stopWatcher: () => void;
-                    setHoliday: (show: boolean) => Promise<void>;
-                    onConfirm: (...args: any[]) => Promise<void>;
-                    isAllowedInvalidValue: (value: (string | [string, string]) | null | undefined) => boolean | "" | undefined;
-                    setShortcutValue: (type: "month" | "week") => Promise<void>;
-                    NDatePicker: any;
-                }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:formatted-value"[], "update:formatted-value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-                    updateUnchangedValue: {
-                        type: BooleanConstructor;
-                    };
-                    onConfirm: {
-                        type: FunctionConstructor;
-                    };
-                    formattedValue: {
-                        type: PropType<(string | [string, string]) | null | undefined>;
-                    };
-                    placeholder: {
-                        type: StringConstructor;
-                    };
-                    allowedInvalidValue: {
-                        type: StringConstructor;
-                    };
-                    to: {
-                        type: PropType<string | false | HTMLElement>;
-                        default: string;
-                    };
-                    holidays: {
-                        type: PropType<Date[]>;
-                        default: () => never[];
-                    };
-                    type: {
-                        type: StringConstructor;
-                        default: string;
-                    };
-                    isDateDisabled: {
-                        type: PropType<(current: number, ...arg: any[]) => boolean>;
-                    };
-                }>> & {
-                    "onUpdate:formatted-value"?: ((...args: any[]) => any) | undefined;
-                }, {
-                    type: string;
-                    updateUnchangedValue: boolean;
-                    to: string | false | HTMLElement;
-                    holidays: Date[];
-                }>>;
+                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<{
@@ -1799,6 +1556,7 @@ 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;

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

@@ -94,6 +94,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       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: "",
@@ -209,7 +210,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           presetVal,
           customDate
         }) => {
-          return !key || !condition || condition === ConditionEnums.EQUAL && !value && !presetVal && !customDate || specialDateRange.includes(condition) && (!value || !presetVal);
+          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() {

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

@@ -144,9 +144,24 @@ const formatDateRangeInfo = (key, format = "x", optionSetting = WidgetOptionEnum
 };
 const formatSpecialDateRange = (conObj, format = "x") => {
   if (Array.isArray(conObj.value) && conObj.con && conObj.unit) {
-    const num = Number(conObj.value);
+    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)}`;
       }

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

@@ -13,7 +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 specialDateRange = [ConditionEnums.CUSTOM_RANGE, 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) {

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

@@ -81,6 +81,7 @@ export declare const WidgetValEnums: {
 export declare const ConditionEnums: {
     NULL: string;
     EQUAL: string;
+    CUSTOM_RANGE: string;
     IN_THE_PAST: string;
     IN_THE_FUTURE: string;
     IN_THE_PAST_DI: string;

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

@@ -81,6 +81,7 @@ const WidgetValEnums = {
 const ConditionEnums = {
   NULL: "NULL",
   EQUAL: "EQ",
+  CUSTOM_RANGE: "CUSTOM_RANGE",
   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/package.json.js

@@ -1,5 +1,5 @@
 var name = "@cnhis-design-vue/shared";
-var version = "3.3.3-beta.73";
+var version = "3.3.3-beta.75";
 var main = "index.ts";
 var peerDependencies = {
 	"naive-ui": "^2.30.0",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.3.3-beta.73",
+	"version": "3.3.3-beta.75",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -62,7 +62,6 @@
 		"video.js": "^7.19.2",
 		"videojs-contrib-hls": "^5.15.0",
 		"viewerjs": "^1.10.5",
-		"vue": "^3.2.0",
 		"vue-simple-uploader": "^1.0.0-beta.5",
 		"xe-utils": "^3.5.4"
 	},
@@ -74,5 +73,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "5ec3ef73116c73fd6f677c8df243b773b4742008"
+	"gitHead": "585f553ca4e29cb4d932e6a3a7b684f06ad8c106"
 }