lw-cdp-ui 1.2.2 → 1.2.3

package/dist/components/lwFormJson/index.vue

@@ -146,12 +146,12 @@ export default {
       },
       deep: true
     },
-    form: {
-      handler(val) {
-        this.$emit("update:modelValue", val)
-      },
-      deep: true
-    },
+    // form: {
+    //   handler(val) {
+    //     this.$emit("update:modelValue", val)
+    //   },
+    //   deep: true
+    // },
     localConfig: {
       handler(val) {
         this.render(val)
@@ -239,10 +239,32 @@ export default {
         return result;
       }
 
-      this.form = parse(config.formItems, this.modelValue);
-      this.$emit("update:modelValue", this.form);
+      let form = parse(config.formItems, this.modelValue);
+      this.form = {
+        ...this.modelValue,
+        ...form
+      }
+
+      this.$emit("update:modelValue", this.parseNestedObject(this.form));
       this.localConfig = this.config;
     },
+    parseNestedObject(obj) {
+      const result = {};
+      for (const [key, value] of Object.entries(obj)) {
+        const keys = key.split('.');
+        let current = result;
+
+        keys.forEach((k, index) => {
+          if (!current[k]) {
+            current[k] = index === keys.length - 1 ? value : {};
+          }
+          current = current[k];
+        });
+
+        delete obj[key]
+      }
+      return result;
+    },
 
     //数据验证
     validate(valid, obj) {

package/dist/components/lwFormMini/FormItem.vue

@@ -268,10 +268,10 @@ export default {
       handler(val) {
         if (val.component === 'checkbox' || val.component === 'upload') {
           val.options?.items?.forEach((option) => {
-            this.unflattenObject(this.form, option.name, option[option.name])
+            this.unflattenObject(this.form, option.name, option.value)
           });
         } else {
-          this.unflattenObject(this.form, this.item.name, val[this.item.name])
+          this.unflattenObject(this.form, this.item.name, val.value)
         }
       },
       deep: true
@@ -281,6 +281,7 @@ export default {
     flattenObject(obj, key, defaultValue = '') {
       if (!key || !obj) { return false }
       const keys = key.split('.');  // 将路径拆分成数组
+
       let current = obj;
       // 遍历路径并逐层查找
       for (let i = 0; i < keys.length; i++) {
@@ -291,7 +292,7 @@ export default {
         // 否则，继续向下查找
         current = current[keys[i]];
       }
-
+      
       return current;
     },
     unflattenObject(obj, path, value) {
@@ -310,6 +311,8 @@ export default {
           current = current[key]; // 进入下一层
         }
       });
+
+
     },
     // 删除tag
     tagClose(tag, item) {
@@ -437,11 +440,11 @@ export default {
   }
 }
 
-:deep(.el-tag){
-  &+.button-new-tag{
+:deep(.el-tag) {
+  & + .button-new-tag {
     margin-left: 10px;
   }
-  &+.w-20{
+  & + .w-20 {
     margin-left: 10px;
   }
 }

package/dist/components/lwFormMini/index.vue

@@ -135,20 +135,12 @@ export default {
           })
         }
       },
-      immediate: true,
-      deep: true
-    },
-    form: {
-      handler(val) {
-        this.$emit("update:modelValue", val)
-      },
       deep: true
     },
     localConfig: {
       handler(val) {
         this.render(val)
         this.$emit("update:config", val)
-
       },
       deep: true
     },
@@ -206,6 +198,7 @@ export default {
               result[item.name] = existingValue ?? (item.value !== undefined ? Number(item.value) : item.options?.min || 0);
             } else {
               result[item.name] = existingValue ?? item.value;
+
             }
           }
         });
@@ -213,10 +206,35 @@ export default {
         return result;
       }
 
-      this.form = parse(config.formItems, this.modelValue);
-      this.$emit("update:modelValue", this.form);
+      let form = parse(config.formItems, this.modelValue);
+
+      this.form = {
+        ...this.modelValue,
+        ...form
+      }
+
+      this.$emit("update:modelValue", this.parseNestedObject(this.form));
       this.localConfig = this.config;
     },
+
+    parseNestedObject(obj) {
+      const result = {};
+      for (const [key, value] of Object.entries(obj)) {
+        const keys = key.split('.');
+        let current = result;
+
+        keys.forEach((k, index) => {
+          if (!current[k]) {
+            current[k] = index === keys.length - 1 ? value : {};
+          }
+          current = current[k];
+        });
+
+        delete obj[key]
+      }
+      return result;
+    },
+
     //处理动态隐藏
     hideHandle(item) {
       if (typeof item?.hideHandle === 'string') {