lw-cdp-ui 1.2.2 → 1.2.4

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') {

package/dist/components/lwLayout/components/tags.vue

@@ -1,23 +1,23 @@
 <template>
   <div class="adminui-tags">
-    <ul ref="tags">
-      <draggable v-model="$store.state.viewTags.viewTags"
-          @change="changeTages"
-                 itemKey="name">
-        <template #item="{element: tag, index}" keyName="tag">
-          <li v-bind:key="tag"
-              :class="[isActive(tag)?'active':'',tag.meta.affix?'affix':'' ]"
-              @contextmenu.prevent="openContextMenu($event, tag)">
-            <router-link :to="tag">
-              <span>{{ getIdName(tag) }}</span>
-              <el-icon v-if="!tag.meta.affix"
-                       @click.prevent.stop='closeSelectedTag(tag)'><el-icon-close /></el-icon>
-            </router-link>
-          </li>
-        </template>
-      </draggable>
-
-    </ul>
+    <draggable v-model="$store.state.viewTags.viewTags"
+               @change="changeTages"
+               class="context-menu-list"
+               ref="tags"
+               itemKey="name">
+      <template #item="{element: tag, index}"
+                keyName="tag">
+        <li v-bind:key="tag"
+            :class="[isActive(tag)?'active':'',tag.meta.affix?'affix':'' ]"
+            @contextmenu.prevent="openContextMenu($event, tag)">
+          <router-link :to="tag">
+            <span>{{ getIdName(tag) }}</span>
+            <el-icon v-if="!tag.meta.affix"
+                     @click.prevent.stop='closeSelectedTag(tag)'><el-icon-close /></el-icon>
+          </router-link>
+        </li>
+      </template>
+    </draggable>
   </div>
 
   <transition name="el-zoom-in-top">
@@ -90,19 +90,6 @@ export default {
     },
     $route(e) {
       this.addViewTags(e);
-      //判断标签容器是否出现滚动条
-      this.$nextTick(() => {
-        const tags = this.$refs.tags
-        if (tags && tags.scrollWidth > tags.clientWidth) {
-          //确保当前标签在可视范围内
-          let targetTag = tags.querySelector(".active")
-          targetTag.scrollIntoView()
-          //显示提示
-          if (!this.tipDisplayed) {
-            this.tipVisible = true
-          }
-        }
-      })
     },
     contextMenuVisible(value) {
       var _this = this;
@@ -157,7 +144,7 @@ export default {
       return null
     },
     // 拖动排序
-    changeTages (val) {
+    changeTages(val) {
       this.$tool.data.set('RouteTags', this.$store.state.viewTags.viewTags)
     },
     //增加tag
@@ -169,6 +156,20 @@ export default {
         this.$store.commit("pushKeepLive", route.name)
         this.$tool.data.set('RouteTags', this.$store.state.viewTags.viewTags)
       }
+
+      //判断标签容器是否出现滚动条
+      this.$nextTick(() => {
+        const tags = document.querySelector(".context-menu-list")
+        if (tags && tags.scrollWidth > tags.clientWidth) {
+          //确保当前标签在可视范围内
+          let targetTag = tags.querySelector(".active")
+          targetTag.scrollIntoView()
+          //显示提示
+          if (!this.tipDisplayed) {
+            this.tipVisible = true
+          }
+        }
+      })
     },
     //高亮tag
     isActive(route) {
@@ -289,7 +290,7 @@ export default {
     },
     //横向滚动
     scrollInit() {
-      const scrollDiv = this.$refs.tags;
+      const scrollDiv = document.querySelector('.context-menu-list')
       scrollDiv.addEventListener('mousewheel', handler, false) || scrollDiv.addEventListener("DOMMouseScroll", handler, false)
       function handler(event) {
         const detail = event.wheelDelta || event.detail;
@@ -383,8 +384,4 @@ export default {
 .tags-tip p {
   margin-bottom: 10px;
 }
-
-.dark .contextmenu li {
-  color: var(--el-text-color-primary);
-}
 </style>