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

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

@@ -1071,7 +1071,7 @@ declare const _default: import("vue").DefineComponent<{
             value: string;
         }[]>;
         presetValCp: import("vue").WritableComputedRef<string>;
-        customDateCp: import("vue").WritableComputedRef<string>;
+        valueDateCp: import("vue").WritableComputedRef<unknown>;
         handleChange: (val: any, type: "start" | "end") => void;
         isStartDateDisabled: (ts: number) => boolean;
         timeStartDisabled: (ts: number) => {

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

@@ -69,7 +69,7 @@ declare const _default: import("vue").DefineComponent<{
         value: string;
     }[]>;
     presetValCp: import("vue").WritableComputedRef<string>;
-    customDateCp: import("vue").WritableComputedRef<string>;
+    valueDateCp: import("vue").WritableComputedRef<unknown>;
     handleChange: (val: any, type: 'start' | 'end') => void;
     isStartDateDisabled: (ts: number) => boolean;
     timeStartDisabled: (ts: number) => {

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

@@ -229,16 +229,22 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         return props.presetVal;
       }
     });
-    computed({
+    const valueDateCp = computed({
       set(val) {
-        emit("update:customDate", val);
+        if (val && filterType.value !== "1") {
+          const v = typeof val === "number" ? String(val) : val;
+          emit("update:modelValue", v);
+        }
       },
       get() {
-        return props.customDate;
+        if (props.modelValue && filterType.value !== "1") {
+          return props.modelValue;
+        }
+        return null;
       }
     });
     watch(() => props.modelValue, (val) => {
-      if (val && isString(val) && val.includes("~")) {
+      if (val && filterType.value !== "1" && isString(val) && val.includes("~")) {
         const [start, end] = val.split("~");
         if (start.trim())
           startDate.value = moment(start.trim()).valueOf();
@@ -246,10 +252,6 @@ 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
@@ -335,8 +337,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         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),
+        modelValue: unref(valueDateCp),
+        "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => isRef(valueDateCp) ? valueDateCp.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"]))]);

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

@@ -1010,7 +1010,7 @@ declare const DateRange: import("vue").DefineComponent<{
         value: string;
     }[]>;
     presetValCp: import("vue").WritableComputedRef<string>;
-    customDateCp: import("vue").WritableComputedRef<string>;
+    valueDateCp: import("vue").WritableComputedRef<unknown>;
     handleChange: (val: any, type: "start" | "end") => void;
     isStartDateDisabled: (ts: number) => boolean;
     timeStartDisabled: (ts: number) => {

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

@@ -1201,7 +1201,7 @@ declare const _default: import("vue").DefineComponent<{
                 value: string;
             }[]>;
             presetValCp: import("vue").WritableComputedRef<string>;
-            customDateCp: import("vue").WritableComputedRef<string>;
+            valueDateCp: import("vue").WritableComputedRef<unknown>;
             handleChange: (val: any, type: "start" | "end") => void;
             isStartDateDisabled: (ts: number) => boolean;
             timeStartDisabled: (ts: number) => {

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.69";
+var version = "3.3.3-beta.70";
 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.69",
+	"version": "3.3.3-beta.70",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -74,5 +74,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "9d93ee205dff646c62e3b97d0787942d3df46bb4"
+	"gitHead": "de4b2b644125c3a247095747b62852bf71ac2aef"
 }