@tmagic/form 1.4.15 → 1.4.17

package/dist/tmagic-form.js

@@ -2455,7 +2455,7 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
     const props = __props;
     const emit = __emit;
     useAddField(props.prop);
-    props.model[props.name] = datetimeFormatter(props.model[props.name], "");
+    props.model[props.name] = datetimeFormatter(props.model[props.name], "", "YYYY/MM/DD");
     const changeHandler = (v) => {
       emit("change", v);
     };
@@ -2467,8 +2467,8 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
         size: _ctx.size,
         placeholder: _ctx.config.placeholder,
         disabled: _ctx.disabled,
-        format: _ctx.config.format,
-        "value-format": _ctx.config.valueFormat || "YYYY/MM/DD HH:mm:ss",
+        format: _ctx.config.format || "YYYY/MM/DD",
+        "value-format": _ctx.config.valueFormat || "YYYY/MM/DD",
         onChange: changeHandler
       }, null, 8, ["modelValue", "size", "placeholder", "disabled", "format", "value-format"]);
     };
@@ -2532,7 +2532,11 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
           return;
         }
         if (Array.isArray(v)) {
-          props.model[item] = datetimeFormatter(v[index]?.toString(), "");
+          props.model[item] = datetimeFormatter(
+            v[index]?.toString(),
+            "",
+            props.config.valueFormat || "YYYY/MM/DD HH:mm:ss"
+          );
         } else {
           props.model[item] = void 0;
         }
@@ -2544,7 +2548,7 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
         emit(
           "change",
           value2.map((item) => {
-            if (item) return datetimeFormatter(item, "");
+            if (item) return datetimeFormatter(item, "", props.config.valueFormat || "YYYY/MM/DD HH:mm:ss");
             return void 0;
           })
         );
@@ -2567,8 +2571,11 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
         "unlink-panels": true,
         disabled: _ctx.disabled,
         "default-time": _ctx.config.defaultTime,
+        "value-format": _ctx.config.valueFormat || "YYYY/MM/DD HH:mm:ss",
+        "date-format": _ctx.config.dateFormat || "YYYY/MM/DD",
+        "time-format": _ctx.config.timeFormat || "HH:mm:ss",
         onChange: changeHandler
-      }, null, 8, ["modelValue", "size", "disabled", "default-time"]);
+      }, null, 8, ["modelValue", "size", "disabled", "default-time", "value-format", "date-format", "time-format"]);
     };
   }
 });
@@ -2599,7 +2606,11 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
       if (value === "Invalid Date") {
         props.model[props.name] = "";
       } else {
-        props.model[props.name] = datetimeFormatter(props.model[props.name], "", props.config.valueFormat);
+        props.model[props.name] = datetimeFormatter(
+          props.model[props.name],
+          "",
+          props.config.valueFormat || "YYYY/MM/DD HH:mm:ss"
+        );
       }
     }
     const changeHandler = (v) => {
@@ -4164,7 +4175,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
           return;
         }
         if (Array.isArray(v)) {
-          props.model[item] = datetimeFormatter(v[index]?.toString(), "");
+          props.model[item] = v[index];
         } else {
           props.model[item] = void 0;
         }

package/dist/tmagic-form.umd.cjs

@@ -2454,7 +2454,7 @@
       const props = __props;
       const emit = __emit;
       useAddField(props.prop);
-      props.model[props.name] = utils.datetimeFormatter(props.model[props.name], "");
+      props.model[props.name] = utils.datetimeFormatter(props.model[props.name], "", "YYYY/MM/DD");
       const changeHandler = (v) => {
         emit("change", v);
       };
@@ -2466,8 +2466,8 @@
           size: _ctx.size,
           placeholder: _ctx.config.placeholder,
           disabled: _ctx.disabled,
-          format: _ctx.config.format,
-          "value-format": _ctx.config.valueFormat || "YYYY/MM/DD HH:mm:ss",
+          format: _ctx.config.format || "YYYY/MM/DD",
+          "value-format": _ctx.config.valueFormat || "YYYY/MM/DD",
           onChange: changeHandler
         }, null, 8, ["modelValue", "size", "placeholder", "disabled", "format", "value-format"]);
       };
@@ -2531,7 +2531,11 @@
             return;
           }
           if (Array.isArray(v)) {
-            props.model[item] = utils.datetimeFormatter(v[index]?.toString(), "");
+            props.model[item] = utils.datetimeFormatter(
+              v[index]?.toString(),
+              "",
+              props.config.valueFormat || "YYYY/MM/DD HH:mm:ss"
+            );
           } else {
             props.model[item] = void 0;
           }
@@ -2543,7 +2547,7 @@
           emit(
             "change",
             value2.map((item) => {
-              if (item) return utils.datetimeFormatter(item, "");
+              if (item) return utils.datetimeFormatter(item, "", props.config.valueFormat || "YYYY/MM/DD HH:mm:ss");
               return void 0;
             })
           );
@@ -2566,8 +2570,11 @@
           "unlink-panels": true,
           disabled: _ctx.disabled,
           "default-time": _ctx.config.defaultTime,
+          "value-format": _ctx.config.valueFormat || "YYYY/MM/DD HH:mm:ss",
+          "date-format": _ctx.config.dateFormat || "YYYY/MM/DD",
+          "time-format": _ctx.config.timeFormat || "HH:mm:ss",
           onChange: changeHandler
-        }, null, 8, ["modelValue", "size", "disabled", "default-time"]);
+        }, null, 8, ["modelValue", "size", "disabled", "default-time", "value-format", "date-format", "time-format"]);
       };
     }
   });
@@ -2598,7 +2605,11 @@
         if (value === "Invalid Date") {
           props.model[props.name] = "";
         } else {
-          props.model[props.name] = utils.datetimeFormatter(props.model[props.name], "", props.config.valueFormat);
+          props.model[props.name] = utils.datetimeFormatter(
+            props.model[props.name],
+            "",
+            props.config.valueFormat || "YYYY/MM/DD HH:mm:ss"
+          );
         }
       }
       const changeHandler = (v) => {
@@ -4163,7 +4174,7 @@
             return;
           }
           if (Array.isArray(v)) {
-            props.model[item] = utils.datetimeFormatter(v[index]?.toString(), "");
+            props.model[item] = v[index];
           } else {
             props.model[item] = void 0;
           }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.4.15",
+  "version": "1.4.17",
   "name": "@tmagic/form",
   "type": "module",
   "sideEffects": [
@@ -43,19 +43,19 @@
     "@types/lodash-es": "^4.17.4",
     "@types/node": "^18.19.0",
     "@types/sortablejs": "^1.15.8",
-    "@vitejs/plugin-vue": "^5.0.4",
+    "@vitejs/plugin-vue": "^5.1.1",
     "@vue/compiler-sfc": "^3.4.27",
     "@vue/test-utils": "^2.4.6",
     "rimraf": "^3.0.2",
     "sass": "^1.77.0",
-    "vite": "^5.3.1",
+    "vite": "^5.3.5",
     "vue-tsc": "^2.0.19"
   },
   "peerDependencies": {
-    "vue": "^3.4.27",
+    "vue": "^3.4.35",
     "typescript": "*",
-    "@tmagic/design": "1.4.15",
-    "@tmagic/utils": "1.4.15"
+    "@tmagic/design": "1.4.17",
+    "@tmagic/utils": "1.4.17"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/fields/Date.vue

@@ -5,8 +5,8 @@
     :size="size"
     :placeholder="config.placeholder"
     :disabled="disabled"
-    :format="config.format"
-    :value-format="config.valueFormat || 'YYYY/MM/DD HH:mm:ss'"
+    :format="config.format || 'YYYY/MM/DD'"
+    :value-format="config.valueFormat || 'YYYY/MM/DD'"
     @change="changeHandler"
   ></TMagicDatePicker>
 </template>
@@ -30,7 +30,7 @@ const emit = defineEmits<{
 
 useAddField(props.prop);
 
-props.model[props.name] = datetimeFormatter(props.model[props.name], '');
+props.model[props.name] = datetimeFormatter(props.model[props.name], '', 'YYYY/MM/DD');
 
 const changeHandler = (v: string) => {
   emit('change', v);

package/src/fields/DateTime.vue

@@ -37,7 +37,11 @@ if (props.model) {
   if (value === 'Invalid Date') {
     props.model[props.name] = '';
   } else {
-    props.model[props.name] = datetimeFormatter(props.model[props.name], '', props.config.valueFormat);
+    props.model[props.name] = datetimeFormatter(
+      props.model[props.name],
+      '',
+      props.config.valueFormat || 'YYYY/MM/DD HH:mm:ss',
+    );
   }
 }
 

package/src/fields/Daterange.vue

@@ -9,6 +9,9 @@
     :unlink-panels="true"
     :disabled="disabled"
     :default-time="config.defaultTime"
+    :value-format="config.valueFormat || 'YYYY/MM/DD HH:mm:ss'"
+    :date-format="config.dateFormat || 'YYYY/MM/DD'"
+    :time-format="config.timeFormat || 'HH:mm:ss'"
     @change="changeHandler"
   ></TMagicDatePicker>
 </template>
@@ -71,7 +74,11 @@ const setValue = (v: Date[] | Date) => {
       return;
     }
     if (Array.isArray(v)) {
-      props.model[item] = datetimeFormatter(v[index]?.toString(), '');
+      props.model[item] = datetimeFormatter(
+        v[index]?.toString(),
+        '',
+        props.config.valueFormat || 'YYYY/MM/DD HH:mm:ss',
+      );
     } else {
       props.model[item] = undefined;
     }
@@ -85,7 +92,7 @@ const changeHandler = (v: Date[]) => {
     emit(
       'change',
       value.map((item?: Date) => {
-        if (item) return datetimeFormatter(item, '');
+        if (item) return datetimeFormatter(item, '', props.config.valueFormat || 'YYYY/MM/DD HH:mm:ss');
         return undefined;
       }),
     );

package/src/fields/Timerange.vue

@@ -17,7 +17,6 @@
 import { ref, watch } from 'vue';
 
 import { TMagicTimePicker } from '@tmagic/design';
-import { datetimeFormatter } from '@tmagic/utils';
 
 import type { DaterangeConfig, FieldProps } from '../schema';
 import { useAddField } from '../utils/useAddField';
@@ -59,7 +58,7 @@ const setValue = (v: Date[] | Date) => {
       return;
     }
     if (Array.isArray(v)) {
-      props.model[item] = datetimeFormatter(v[index]?.toString(), '');
+      props.model[item] = v[index];
     } else {
       props.model[item] = undefined;
     }

package/src/schema.ts

@@ -296,6 +296,9 @@ export interface DaterangeConfig extends FormItem {
   type: 'daterange';
   defaultTime?: Date[];
   names?: string[];
+  valueFormat?: string;
+  dateFormat?: string;
+  timeFormat?: string;
 }
 
 /**

package/types/Form.vue.d.ts

@@ -5,20 +5,20 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
     /** 表单值 */
     initValues: Record<string, any>;
     /** 需对比的值（开启对比模式时传入） */
-    lastValues?: Record<string, any> | undefined;
+    lastValues?: Record<string, any>;
     /** 是否开启对比模式 */
-    isCompare?: boolean | undefined;
-    parentValues?: Record<string, any> | undefined;
-    labelWidth?: string | undefined;
-    disabled?: boolean | undefined;
-    height?: string | undefined;
-    stepActive?: string | number | undefined;
-    size?: "large" | "default" | "small" | undefined;
-    inline?: boolean | undefined;
-    labelPosition?: string | undefined;
-    keyProp?: string | undefined;
-    popperClass?: string | undefined;
-    extendState?: ((state: FormState) => Record<string, any> | Promise<Record<string, any>>) | undefined;
+    isCompare?: boolean;
+    parentValues?: Record<string, any>;
+    labelWidth?: string;
+    disabled?: boolean;
+    height?: string;
+    stepActive?: string | number;
+    size?: "small" | "default" | "large";
+    inline?: boolean;
+    labelPosition?: string;
+    keyProp?: string;
+    popperClass?: string;
+    extendState?: (state: FormState) => Record<string, any> | Promise<Record<string, any>>;
 }>, {
     config: () => never[];
     initValues: () => {};
@@ -33,13 +33,13 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
     labelPosition: string;
     keyProp: string;
 }>, {
-    values: import("vue").Ref<FormValue>;
-    lastValuesProcessed: import("vue").Ref<FormValue>;
+    values: import("vue").Ref<FormValue, FormValue>;
+    lastValuesProcessed: import("vue").Ref<FormValue, FormValue>;
     formState: FormState;
-    initialized: import("vue").Ref<boolean>;
+    initialized: import("vue").Ref<boolean, boolean>;
     changeHandler: () => void;
     resetForm: () => any;
-    submitForm: (native?: boolean | undefined) => Promise<any>;
+    submitForm: (native?: boolean) => Promise<any>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     change: (...args: any[]) => void;
     error: (...args: any[]) => void;
@@ -51,20 +51,20 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
     /** 表单值 */
     initValues: Record<string, any>;
     /** 需对比的值（开启对比模式时传入） */
-    lastValues?: Record<string, any> | undefined;
+    lastValues?: Record<string, any>;
     /** 是否开启对比模式 */
-    isCompare?: boolean | undefined;
-    parentValues?: Record<string, any> | undefined;
-    labelWidth?: string | undefined;
-    disabled?: boolean | undefined;
-    height?: string | undefined;
-    stepActive?: string | number | undefined;
-    size?: "large" | "default" | "small" | undefined;
-    inline?: boolean | undefined;
-    labelPosition?: string | undefined;
-    keyProp?: string | undefined;
-    popperClass?: string | undefined;
-    extendState?: ((state: FormState) => Record<string, any> | Promise<Record<string, any>>) | undefined;
+    isCompare?: boolean;
+    parentValues?: Record<string, any>;
+    labelWidth?: string;
+    disabled?: boolean;
+    height?: string;
+    stepActive?: string | number;
+    size?: "small" | "default" | "large";
+    inline?: boolean;
+    labelPosition?: string;
+    keyProp?: string;
+    popperClass?: string;
+    extendState?: (state: FormState) => Record<string, any> | Promise<Record<string, any>>;
 }>, {
     config: () => never[];
     initValues: () => {};