lw-cdp-ui 1.2.4 → 1.2.5

package/dist/components/lwFormJson/StatsConfig.vue

@@ -304,6 +304,31 @@
         </template>
 
       </div>
+
+      <div class="form-title">表单校验</div>
+      <div class="form-body">
+        <el-form-item label="输入校验">
+          <el-input v-model="item.rules"
+                    placeholder="请输入"
+                    clearable />
+        </el-form-item>
+        <el-form-item label="隐藏校验">
+          <el-input v-model="item.hideHandle"
+                    placeholder="请输入"
+                    clearable />
+        </el-form-item>
+        <el-form-item label="标题位置">
+          <el-select v-model="item.labelPosition"
+                     placeholder="请选择">
+            <el-option label="顶部"
+                       value="top" />
+            <el-option label="左"
+                       value="left" />
+            <el-option label="右"
+                       value="right" />
+          </el-select>
+        </el-form-item>
+      </div>
     </template>
     <template v-else>
       <div class="form-title">表单样式</div>
@@ -336,7 +361,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

@@ -108,7 +108,7 @@ export default {
      *   ...
      * }
      * **/
-    config: { type: Object, default: () => { } },
+    config: { type: Object, default: () => { return {} } },
     // 自定义组件
     custom: { type: Array, default: () => [] },
     // 是否显示加载中
@@ -146,12 +146,6 @@ export default {
       },
       deep: true
     },
-    // form: {
-    //   handler(val) {
-    //     this.$emit("update:modelValue", val)
-    //   },
-    //   deep: true
-    // },
     localConfig: {
       handler(val) {
         this.render(val)
@@ -240,13 +234,15 @@ export default {
       }
 
       let form = parse(config.formItems, this.modelValue);
-      this.form = {
+      form = {
         ...this.modelValue,
         ...form
       }
+      this.form = this.parseNestedObject(form)
+      this.$emit("update:modelValue", this.form);
+      this.localConfig = config;
+
 
-      this.$emit("update:modelValue", this.parseNestedObject(this.form));
-      this.localConfig = this.config;
     },
     parseNestedObject(obj) {
       const result = {};
@@ -261,7 +257,10 @@ export default {
           current = current[k];
         });
 
-        delete obj[key]
+        if (keys.length > 1) {
+          delete obj[key]
+        }
+
       }
       return result;
     },
@@ -306,6 +305,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/index.vue

@@ -207,14 +207,13 @@ 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);
+      this.localConfig = config;
     },
 
     parseNestedObject(obj) {

package/dist/components/lwTable/index.vue

@@ -31,6 +31,18 @@
                        :sortable="t.sortable"
                        :show-overflow-tooltip="t.tooltip"
                        :key="t">
+        <template #header="{ column, $index }">
+          <template v-if="!t?.header">
+            {{ t.title }}
+          </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">