lw-cdp-ui 1.2.4 → 1.2.6

package/dist/components/lwFormJson/JsonItem.vue

@@ -73,10 +73,12 @@
              class="tool-list">
           <el-icon class="btn"
                    size="14"
-                   @click="copyItem(item, index)"><el-icon-copy-document /></el-icon>
+                   @click="copyItem(item, index)"
+                   title="复制"><el-icon-copy-document /></el-icon>
           <el-icon class="btn"
                    size="14"
-                   @click="deleteItem(index)"><el-icon-delete /></el-icon>
+                   @click="deleteItem(index)"
+                   title="删除"><el-icon-delete /></el-icon>
         </div>
 
       </el-col>
@@ -248,7 +250,8 @@ export default {
   z-index: 9;
   position: absolute;
 }
-:deep(.el-form-item--label-right),:deep(.el-form-item--label-left) {
+:deep(.el-form-item--label-right),
+:deep(.el-form-item--label-left) {
   .el-form-item__label {
     position: relative;
     .add-btn {

package/dist/components/lwFormJson/StatsConfig.vue

@@ -304,6 +304,26 @@
         </template>
 
       </div>
+
+      <div class="form-title">表单校验</div>
+      <div class="form-body">
+        <el-form-item label="提交校验">
+          <el-select v-model="item.rules"
+                     multiple
+                     clearable
+                     placeholder="请选择">
+            <el-option v-for="item in rules"
+                       :label="item.label"
+                       :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="隐藏校验">
+          <el-input v-model="item.hideHandle"
+                    placeholder="请输入"
+                    clearable />
+        </el-form-item>
+
+      </div>
     </template>
     <template v-else>
       <div class="form-title">表单样式</div>
@@ -336,7 +356,17 @@ export default {
   data() {
     return {
       tagVisible: {},
-      tagValue: ''
+      tagValue: '',
+      rules: [
+        {
+          label: '必填',
+          value: { required: true, message: '请输入', trigger: 'blur' }
+        },
+        {
+          label: '必选',
+          value: { required: true, message: '请选择', trigger: 'change' }
+        },
+      ]
     }
   },
   props: {

package/dist/components/lwFormJson/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-container>
+  <el-container :style="{ maxHeight }">
     <el-aside v-if="hideTool"
               width="200px"
               class="form-json-body">
@@ -108,7 +108,9 @@ export default {
      *   ...
      * }
      * **/
-    config: { type: Object, default: () => { } },
+    config: { type: Object, default: () => { return {} } },
+    // 最大高度
+    maxHeight: { type: String, default: 'calc(100vh - 137px)' },
     // 自定义组件
     custom: { type: Array, default: () => [] },
     // 是否显示加载中
@@ -141,17 +143,13 @@ export default {
       deep: true
     },
     config: {
-      handler() {
+      handler(val) {
         this.render()
+        this.localConfig = JSON.parse(JSON.stringify(val))
       },
+      immediate: true,
       deep: true
     },
-    // form: {
-    //   handler(val) {
-    //     this.$emit("update:modelValue", val)
-    //   },
-    //   deep: true
-    // },
     localConfig: {
       handler(val) {
         this.render(val)
@@ -240,13 +238,12 @@ export default {
       }
 
       let form = parse(config.formItems, this.modelValue);
-      this.form = {
+      form = {
         ...this.modelValue,
         ...form
       }
-
-      this.$emit("update:modelValue", this.parseNestedObject(this.form));
-      this.localConfig = this.config;
+      this.form = this.parseNestedObject(form)
+      this.$emit("update:modelValue", this.form);
     },
     parseNestedObject(obj) {
       const result = {};
@@ -261,7 +258,10 @@ export default {
           current = current[k];
         });
 
-        delete obj[key]
+        if (keys.length > 1) {
+          delete obj[key]
+        }
+
       }
       return result;
     },
@@ -306,6 +306,9 @@ export default {
 
 <style lang="scss" scoped>
 .menu-list {
+  :deep(.el-collapse) {
+    border-top: 0;
+  }
   .menu-list-title {
     :deep(.el-collapse-item__header) {
       font-weight: bold;

package/dist/components/lwFormMini/FormItem.vue

@@ -279,6 +279,7 @@ export default {
   },
   methods: {
     flattenObject(obj, key, defaultValue = '') {
+      console.log(obj, key)
       if (!key || !obj) { return false }
       const keys = key.split('.');  // 将路径拆分成数组
 
@@ -296,6 +297,7 @@ export default {
       return current;
     },
     unflattenObject(obj, path, value) {
+      if (!path || !obj) { return false }
       const keys = path.split('.'); // 按点分隔路径
       let current = obj; // 指向传入的对象（如 this.form）
 

package/dist/components/lwFormMini/index.vue

@@ -127,14 +127,16 @@ export default {
       deep: true
     },
     config: {
-      handler() {
+      handler(val) {
         this.render()
         if (this.showMenu) {
           this.$nextTick(() => {
             this.handleScroll()
           })
         }
+        this.localConfig = JSON.parse(JSON.stringify(val))
       },
+      immediate: true,
       deep: true
     },
     localConfig: {
@@ -207,14 +209,12 @@ export default {
       }
 
       let form = parse(config.formItems, this.modelValue);
-
-      this.form = {
+      form = {
         ...this.modelValue,
         ...form
       }
-
-      this.$emit("update:modelValue", this.parseNestedObject(this.form));
-      this.localConfig = this.config;
+      this.form = this.parseNestedObject(form)
+      this.$emit("update:modelValue", this.form);
     },
 
     parseNestedObject(obj) {

package/dist/components/lwTable/index.vue

@@ -31,6 +31,26 @@
                        :sortable="t.sortable"
                        :show-overflow-tooltip="t.tooltip"
                        :key="t">
+        <template #header="{ column, $index }">
+          <template v-if="!t?.header">
+            {{ t.title }}
+            <el-tooltip v-if="t.tips">
+              <template #content>
+                <span style="max-width: 300px; display: inline-block;">
+                  {{ t.tips }}
+                </span>
+              </template>
+              <el-icon><component :is="t.icon || 'el-icon-question-filled'" /></el-icon>
+            </el-tooltip>
+          </template>
+          <slot v-else
+                :name="t.header"
+                :scope="{column, $index, t}">
+            <el-tag type="danger">
+              [{{ item.header }}]没有这个自定义表头
+            </el-tag>
+          </slot>
+        </template>
         <template #default="scope">
           <!-- 操作 -->
           <template v-if="t?.operation">