cnhis-design-vue 3.3.3-beta.65 → 3.3.3-beta.66

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

@@ -1,7 +1,8 @@
-import { defineComponent, computed, openBlock, createElementBlock, createVNode, unref, isRef, createBlock, createCommentVNode } from 'vue';
+import { defineComponent, computed, openBlock, createElementBlock, unref, Fragment, createVNode, isRef, createBlock, createCommentVNode } from 'vue';
 import DatePicker from '../../../../../date-picker/index.js';
 import { NSelect } from 'naive-ui';
-import { WidgetOptionEnums, WidgetTypeEnums, WidgetValEnums } from '../../../types/enums.js';
+import DateOption from './Base/DateOption.vue.js';
+import { ConditionEnums, WidgetOptionEnums, WidgetTypeEnums, WidgetValEnums } from '../../../types/enums.js';
 import { WidgetDateOptionEnums } from '../../render-widget/helpers/enums.js';
 import { widgetDateValOptions } from '../../render-widget/helpers/dateExtraMap.js';
 import { setDateDisabled, setTimeDisabled } from '../../render-widget/helpers/dateDisabled.js';
@@ -18,6 +19,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     componentCfg: {
       type: Object
     },
+    item: {
+      type: Object,
+      required: true
+    },
     paramCfg: {
       type: Object,
       default: null
@@ -40,6 +45,27 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     emit
   }) {
     const props = __props;
+    const filterType = computed(() => {
+      switch (props.item.condition) {
+        case ConditionEnums.EQUAL:
+        case ConditionEnums.NEQ:
+          return "1";
+        case ConditionEnums.BIG:
+        case ConditionEnums.LESS:
+        case ConditionEnums.BIGEQ:
+        case ConditionEnums.LESSEQ:
+          return "2";
+        case ConditionEnums.L_:
+        case ConditionEnums.N_:
+        case ConditionEnums.IN_THE_PAST:
+        case ConditionEnums.IN_THE_FUTURE:
+        case ConditionEnums.IN_THE_PAST_DI:
+        case ConditionEnums.IN_THE_FUTURE_DI:
+          return "3";
+        default:
+          return "1";
+      }
+    });
     const valueCp = computed({
       set(val) {
         emit("update:modelValue", val);
@@ -141,7 +167,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       return setTimeDisabled(ts, optionSetting.value);
     }
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1, [createVNode(unref(NSelect), {
+      return openBlock(), createElementBlock("div", _hoisted_1, [unref(filterType) === "1" ? (openBlock(), createElementBlock(Fragment, {
+        key: 0
+      }, [createVNode(unref(NSelect), {
         style: {
           "width": "120px"
         },
@@ -161,7 +189,18 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         valueFormat: unref(valueFormat),
         "formatted-value": unref(valueCp),
         "onUpdate:formatted-value": _cache[1] || (_cache[1] = ($event) => isRef(valueCp) ? valueCp.value = $event : null)
-      }, null, 8, ["type", "valueFormat", "formatted-value"])) : createCommentVNode("v-if", true)]);
+      }, null, 8, ["type", "valueFormat", "formatted-value"])) : createCommentVNode("v-if", true)], 64)) : (openBlock(), createBlock(DateOption, {
+        key: 1,
+        filterType: unref(filterType),
+        dateType: unref(dateType),
+        isDateDisabled,
+        timeDisabled,
+        valueFormat: unref(valueFormat),
+        modelValue: unref(valueCp),
+        "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => isRef(valueCp) ? valueCp.value = $event : null),
+        presetVal: unref(presetValCp),
+        "onUpdate:presetVal": _cache[3] || (_cache[3] = ($event) => isRef(presetValCp) ? presetValCp.value = $event : null)
+      }, null, 8, ["filterType", "dateType", "valueFormat", "modelValue", "presetVal"]))]);
     };
   }
 });

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

@@ -1,5 +1,9 @@
 import { PropType } from 'vue';
 declare const _default: import("vue").DefineComponent<{
+    item: {
+        type: ObjectConstructor;
+        required: true;
+    };
     paramCfg: {
         type: ObjectConstructor;
         default: null;
@@ -18,6 +22,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;
@@ -42,6 +50,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>;
@@ -205,6 +214,231 @@ 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;
+        }[];
+        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>;
+        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[];
+        }>>;
+        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;
@@ -237,6 +471,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;

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

@@ -1,9 +1,10 @@
-import { defineComponent, ref, computed, watch, openBlock, createElementBlock, createVNode, unref, isRef, withCtx, toDisplayString, createCommentVNode } from 'vue';
+import { defineComponent, ref, computed, watch, openBlock, createElementBlock, unref, Fragment, createVNode, isRef, withCtx, toDisplayString, createCommentVNode, createBlock } from 'vue';
 import { NSelect, NPopover } from 'naive-ui';
 import DatePicker from '../../../../../date-picker/index.js';
+import DateOption from './Base/DateOption.vue.js';
 import moment from 'moment';
 import { isString } from 'lodash-es';
-import { WidgetOptionEnums, WidgetTypeEnums, WidgetValEnums } from '../../../types/enums.js';
+import { ConditionEnums, WidgetOptionEnums, WidgetTypeEnums, WidgetValEnums } from '../../../types/enums.js';
 import { WidgetDateOptionEnums } from '../../render-widget/helpers/enums.js';
 import { widgetDateValOptions } from '../../render-widget/helpers/dateExtraMap.js';
 import { dateDisabledCollect, isStartDateRangeDisabled, isTimeStartRangeDisabled, isEndDateRangeDisabled, isTimeEndRangeDisabled } from '../../render-widget/helpers/dateDisabled.js';
@@ -29,6 +30,10 @@ const _hoisted_4 = {
 var _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "DateRange",
   props: {
+    item: {
+      type: Object,
+      required: true
+    },
     paramCfg: {
       type: Object,
       default: null
@@ -53,6 +58,27 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     const props = __props;
     const startDate = ref();
     const endDate = ref();
+    const filterType = computed(() => {
+      switch (props.item.condition) {
+        case ConditionEnums.EQUAL:
+        case ConditionEnums.NEQ:
+          return "1";
+        case ConditionEnums.BIG:
+        case ConditionEnums.LESS:
+        case ConditionEnums.BIGEQ:
+        case ConditionEnums.LESSEQ:
+          return "2";
+        case ConditionEnums.L_:
+        case ConditionEnums.N_:
+        case ConditionEnums.IN_THE_PAST:
+        case ConditionEnums.IN_THE_FUTURE:
+        case ConditionEnums.IN_THE_PAST_DI:
+        case ConditionEnums.IN_THE_FUTURE_DI:
+          return "3";
+        default:
+          return "1";
+      }
+    });
     const valueFormat = computed(() => {
       let formateStr = "";
       switch (compType.value) {
@@ -220,6 +246,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           endDate.value = moment(end.trim()).valueOf();
         return;
       }
+      if (val && filterType.value !== "1") {
+        const v = typeof val === "number" ? String(val) : val;
+        emit("update:modelValue", v);
+      }
       startDate.value = endDate.value = null;
     }, {
       immediate: true
@@ -250,7 +280,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       return isTimeEndRangeDisabled(ts, optionSetting.value, startDate.value);
     }
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1, [createVNode(unref(NSelect), {
+      return openBlock(), createElementBlock("div", _hoisted_1, [unref(filterType) === "1" ? (openBlock(), createElementBlock(Fragment, {
+        key: 0
+      }, [createVNode(unref(NSelect), {
         style: {
           "width": "120px"
         },
@@ -298,7 +330,16 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         }, null, 8, ["type", "default-time", "valueFormat", "placeholder", "value"])]),
         default: withCtx(() => [unref(endDateFormat) ? (openBlock(), createElementBlock("span", _hoisted_4, toDisplayString(unref(endDateFormat)), 1)) : createCommentVNode("v-if", true)]),
         _: 1
-      }, 8, ["disabled"])])) : createCommentVNode("v-if", true)]);
+      }, 8, ["disabled"])])) : createCommentVNode("v-if", true)], 64)) : (openBlock(), createBlock(DateOption, {
+        key: 1,
+        filterType: unref(filterType),
+        dateType: unref(dateType),
+        valueFormat: unref(valueFormat),
+        modelValue: __props.modelValue,
+        "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => isRef(modelValue) ? modelValue.value = $event : null),
+        presetVal: unref(presetValCp),
+        "onUpdate:presetVal": _cache[4] || (_cache[4] = ($event) => isRef(presetValCp) ? presetValCp.value = $event : null)
+      }, null, 8, ["filterType", "dateType", "valueFormat", "modelValue", "presetVal"]))]);
     };
   }
 });