@dt-frames/ui 2.0.22 → 2.0.24

package/es/components/form/index.js

@@ -906,6 +906,7 @@ function useFormEvents({
   }
   function _setValue(data, isReset = false) {
     data = isArray(data) ? data : [data];
+    let oldValues = getFormValues();
     let obj = {};
     data.map((it) => {
       let name = isArray(it.name) ? it.name[0] : it.name;
@@ -917,15 +918,24 @@ function useFormEvents({
         obj[name] = props.defaultValue;
     });
     if (isReset) {
-      let oldValues = getFormValues();
       let oldObj = {};
       Object.keys(oldValues).map((key) => oldObj[key] = null);
       obj = {
         ...oldObj,
         ...obj
       };
+      setFormValues(obj);
+    } else {
+      Object.keys(obj).forEach((key) => {
+        if (obj[key] !== null) {
+          obj[key];
+        }
+      });
+      setFormValues({
+        ...obj,
+        ...oldValues
+      });
     }
-    setFormValues(obj);
   }
   async function clearValidate(name) {
     await unref(formElRef)?.clearValidate(name);
@@ -1051,7 +1061,7 @@ function useFormValues({
     if (!isObject(model))
       return {};
     const vals = {};
-    let comMap = getComMap();
+    let comMap = getComMap(), extraNames = [];
     for (let [key, val] of Object.entries(model)) {
       let component = comMap.get(key)?.component;
       if (!key || Array.isArray(val) && val.length === 0 || isFunction(val)) {
@@ -1059,11 +1069,12 @@ function useFormValues({
       }
       if (component) {
         if (SINGLE_DATA_TYPE.includes(component)) {
-          val = dayjs(val).valueOf();
+          val = val ? dayjs(val).valueOf() : null;
         } else if (MULTIFY_DATA_TYPE.includes(component)) {
           val = (val || []).map((it) => dayjs(it).valueOf());
           if (comMap.get(key).extraName?.length) {
             comMap.get(key).extraName.map((it, i) => {
+              extraNames.push(it);
               set(vals, it, val.length > 0 ? val[i] : null);
             });
           }
@@ -1072,7 +1083,9 @@ function useFormValues({
       if (isString(val)) {
         val = val.trim();
       }
-      set(vals, key, val);
+      if (!extraNames.includes(key)) {
+        set(vals, key, val);
+      }
     }
     return vals;
   }

package/es/components/form/src/props.d.ts

@@ -16,7 +16,7 @@ export declare const BasicProps: {
         default: () => {};
     };
     layout: {
-        type: PropType<"vertical" | "inline" | "horizontal">;
+        type: PropType<"inline" | "horizontal" | "vertical">;
         default: string;
     };
     labelWidth: {
@@ -41,8 +41,8 @@ export declare const BasicProps: {
     };
     rowProps: {
         type: PropType<Partial<import("vue").ExtractPropTypes<{
-            align: PropType<"middle" | "top" | "bottom" | "stretch">;
-            justify: PropType<"center" | "space-around" | "space-between" | "end" | "start">;
+            align: PropType<"stretch" | "bottom" | "top" | "middle">;
+            justify: PropType<"space-around" | "space-between" | "center" | "end" | "start">;
             prefixCls: StringConstructor;
             gutter: {
                 type: PropType<import("ant-design-vue/lib/grid/Row").Gutter | [import("ant-design-vue/lib/grid/Row").Gutter, import("ant-design-vue/lib/grid/Row").Gutter]>;
@@ -62,7 +62,7 @@ export declare const BasicProps: {
         type: NumberConstructor;
     };
     size: {
-        type: PropType<"small" | "large" | "middle">;
+        type: PropType<"large" | "small" | "middle">;
     };
     disabled: {
         type: BooleanConstructor;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dt-frames/ui",
-	"version": "2.0.22",
+	"version": "2.0.24",
 	"type": "module",
 	"license": "MIT",
 	"main": "./src/index.ts",