lw-cdp-ui 1.1.38 → 1.1.40

package/dist/components/lwForm/index.vue

@@ -439,8 +439,8 @@ export default {
   },
   watch: {
     modelValue(val, old) {
-      if (this.hasConfig) {
-        this.deepMerge(this.form, JSON.parse(JSON.stringify(this.modelValue)))
+      if (this.hasConfig && this.hasValue) {
+        this.deepMerge(this.form, JSON.parse(JSON.stringify(val)))
       }
     },
     config() {
@@ -458,7 +458,7 @@ export default {
       return Object.keys(this.config).length > 0
     },
     hasValue() {
-      return Object.keys(this.modelValue).length > 0
+      return this?.modelValue ? Object.keys(this.modelValue).length > 0 : false
     },
 
   },

package/dist/components/lwTable/index.vue

@@ -234,6 +234,15 @@
                          color="var(--el-color-primary)" />
           </span>
 
+          <!-- 自定义插槽 -->
+          <template v-else-if="t.slot">
+            <slot :name="t.component"
+                  :row="scope.row">
+              <el-tag type="danger">[{{t.component}}]
+                没有这个默认组件也未自定义插槽内容</el-tag>
+            </slot>
+          </template>
+
           <!-- 常规渲染 -->
           <template v-else>
             {{ scope.row[t.dataIndex]  ? scope.row[t.dataIndex] :scope.row[t.dataIndex] === 0?'0':''  }}

package/dist/components/lwTableForm/index.vue

@@ -11,7 +11,7 @@
                      :min-width="item.minWidth"
                      :key="index"
                      :label="item.label"
-                     :prop="item?.options?.name ? `${item.name}.${item.options.name}` : item.name"
+                     :prop="getPropName(item)"
                      :align="item.align ?? 'left'"
                      :fixed="item.fixed"
                      :sortable="item.sortable"
@@ -39,7 +39,17 @@
         <template v-else-if="item.component=='upload'">
           <el-col v-for="(_item, _index) in item.options.items"
                   :key="_index">
-            <lw-upload v-model="row[_item.name]"></lw-upload>
+            <lw-upload v-model="row[_item.name]"
+                       :maxSize="_item.maxSize"
+                       :accept="_item.accept"
+                       :title="_item.label"
+                       :parseData="item.parseData"
+                       :disabled="_item?.disabled"
+                       :multiple="_item?.multiple"
+                       :limit="_item?.limit"
+                       :returnFile="_item?.returnFile"
+                       :tip="_item?.tip"
+                       :apiObj="item.apiObj"></lw-upload>
             <div class="error-tips">
               {{ row['errorMsg'][_item.name] }}
             </div>
@@ -267,16 +277,7 @@
         <!-- 错误提示 -->
         <div v-if="row.errorMsg"
              class="error-tips">
-          <template
-                    v-if="item.component != 'checkbox' && item.component != 'upload'">
-            <template v-if="item?.options?.name && row['errorMsg'][item.name]">
-              {{ row['errorMsg'][item.name][item.options.name] }}
-            </template>
-            <template v-else>
-              {{ row['errorMsg'][item?.name] }}
-            </template>
-
-          </template>
+          {{ row['errorMsg'][item?.name] }}
         </div>
       </template>
     </el-table-column>
@@ -312,27 +313,26 @@ export default {
       tableData: [],
       tagValue: '',
       ids: [],
-      isChange: true,
+      internalUpdate: true,
       tagVisible: false,
     }
   },
   watch: {
     tableData: {
-      async handler(val) {
-        this.isChange = false;
-        setTimeout(() => {
-          this.isChange = true
-        }, 1000)
-        this.$emit("update:modelValue", await this.unflattenObject(val))
+      handler(val) {
+        if (!this.internalUpdate) {
+          this.$emit("update:modelValue", this.unflattenObject(val));
+        }
+        this.internalUpdate = false;
       },
       deep: true
     },
     modelValue: {
-      async handler(val) {
-        if (this.isChange) {
-          this.tableData = await this.flattenObject(val)
+      handler(val) {
+        if (!this.internalUpdate) {
+          this.internalUpdate = true; // 设置标志位，避免递归
+          this.tableData = this.flattenObject(val);
         }
-        this.isChange = true;
       },
       deep: true
     }
@@ -417,26 +417,14 @@ export default {
             item.rules.forEach((rule) => {
               let isVal = false;
               if (item.component == 'checkbox' || item.component == 'upload') {
-                if (item.name) {
-                  const value = {};
-                  item.options.items.forEach((option) => {
-                    if (this.isEmpty(data[item.name][option.name])) {
-                      if (!data?.errorMsg) {
-                        data.errorMsg = {}
-                      }
-                      data['errorMsg'][item.name][option.name] = rule.message
-                    }
-                  })
-                } else if (item?.options?.items) {
-                  item.options.items.forEach((option) => {
-                    if (this.isEmpty(data[item.name])) {
-                      if (!data?.errorMsg) {
-                        data.errorMsg = {}
-                      }
-                      data['errorMsg'][item.name] = rule.message
+                item.options.items.forEach((option) => {
+                  if (this.isEmpty(data[option.name])) {
+                    if (!data?.errorMsg) {
+                      data.errorMsg = {}
                     }
-                  });
-                }
+                    data['errorMsg'][option.name] = rule.message
+                  }
+                })
               } else {
                 if (rule.required && this.isEmpty(data[item.name])) {
                   if (!data?.errorMsg) {
@@ -589,17 +577,20 @@ export default {
     // 增加tag
     tagInputConfirm(item, row) {
       if (this.tagValue) {
-        if (item?.options?.name) {
-          row[item.name] = row[item.name] || {};
-          row[item.name][item.options.name] = row[item.name][item.options.name] || [];
-          row[item.name][item.options.name].push(this.tagValue)
-        } else {
-          row[item.name] = row[item.name] || []
-          row[item.name].push(this.tagValue)
-        }
+        row[item.name] = row[item.name] || []
+        row[item.name].push(this.tagValue)
       }
       row.tagVisible = false
       this.tagValue = ''
+    },
+    // prop NAME
+    getPropName(item) {
+      if (item.component == 'checkbox' || item.component == 'upload') {
+        return item.options.items[0].name
+
+      } else {
+        return item.name
+      }
     }
   }
 }