lw-cdp-ui 1.1.50 → 1.1.52

package/dist/components/lwFormMini/index.vue

@@ -30,6 +30,7 @@
 
           <!-- 表单内容 -->
           <el-form-item v-else
+                        :class="{ 'form-item-name-null': !item?.label }"
                         :prop="getPropName(item)"
                         :rules="rulesHandle(item)">
             <template #label>
@@ -524,7 +525,13 @@ export default {
   font-weight: bold;
   margin-bottom: 10px;
   margin-top: 10px;
-  // border-top: 1px solid #efefef;
+  border-top: 10px solid #f5f7fa;
   padding-top: 20px;
 }
+
+:deep(.form-item-name-null) {
+  > .el-form-item__label {
+    display: none !important;
+  }
+}
 </style>

package/dist/components/lwTableForm/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-table :data="tableData"
+  <el-table :data="dataList"
             stripe
             ref="table"
             :columns="config.formItems"
@@ -285,6 +285,15 @@
       </template>
     </el-table-column>
   </el-table>
+  <div v-if="isPagination && tableData.length > pageSize"
+       class="pagination-body">
+    <el-pagination size="small"
+                   background
+                   :page-size="pageSize"
+                   v-model:current-page="currentPage"
+                   layout="prev, pager, next"
+                   :total="tableData.length" />
+  </div>
   <div v-if="!isView"
        class="btn-list">
     <el-button type="primary"
@@ -306,15 +315,17 @@ export default {
     modelValue: { type: Object, default: () => { } },
     config: { type: Object, default: () => { } },
     maxHeight: { type: String, default: 'calc(100vh - 280px)' },
-    /**
-     * 是否是查看模式
-     */
+    //  是否是查看模式
     isView: { type: Boolean, default: false },
+    //  是否分页
+    isPagination: { type: Boolean, default: false },
   },
   data() {
     return {
       tableData: [],
       tagValue: '',
+      currentPage: 1,
+      pageSize: 8,
       ids: [],
       internalUpdate: true,
       tagVisible: false,
@@ -347,7 +358,20 @@ export default {
     hasValue() {
       return Object.keys(this.modelValue).length > 0
     },
+    dataList() {
+      if (!this.isPagination) {
+        // 如果不需要分页，直接返回所有数据
+        return this.tableData;
+      }
+
+      const currentPage = this.currentPage; // 当前页码
 
+      // 计算分页起始位置
+      const startIndex = (currentPage - 1) * this.pageSize;
+
+      // 返回分页后的数据
+      return this.tableData.slice(startIndex, startIndex + this.pageSize);
+    }
   },
   mounted() {
     this.tableData = this.flattenObject(this.modelValue)
@@ -362,7 +386,7 @@ export default {
           if (obj.hasOwnProperty(key)) {
             const newKey = prefix ? `${prefix}.${key}` : key;
 
-            if (typeof obj[key] === 'object' && obj[key] !== null && !Array.isArray(obj[key])) {
+            if ( key != 'errorMsg' && typeof obj[key] === 'object' && obj[key] !== null && !Array.isArray(obj[key])) {
               // 递归处理嵌套对象
               Object.assign(result, getObj(obj[key], newKey));
             } else {
@@ -449,7 +473,7 @@ export default {
           }
         });
       });
-
+      console.log(tableData)
       if (validationMessages.length > 0) {
         this.$message.warning(`校验失败,存在必填字段为空,请检查`)
         return true; // 如果有校验失败
@@ -554,27 +578,6 @@ export default {
       })
       return obj1;
     },
-    //处理动态禁用
-    hideHandle(item, row) {
-      if (typeof item.hideHandle === 'string') {
-        // eslint-disable-next-line no-eval
-        const exp = eval(item.hideHandle.replace(/\$/g, "row"))
-        return exp
-      } else if (typeof item.hideHandle === 'boolean') {
-        return item.hideHandle
-      }
-      return false
-    },
-    //处理动态必填
-    rulesHandle(item) {
-      if (item.requiredHandle) {
-        // eslint-disable-next-line no-eval
-        const exp = eval(item.requiredHandle.replace(/\$/g, "form"))
-        var requiredRule = item.rules.find(t => 'required' in t)
-        requiredRule.required = exp
-      }
-      return item.rules
-    },
     // 删除tag
     tagClose(tag, item) {
       item.splice(item.indexOf(tag), 1)
@@ -652,4 +655,9 @@ export default {
     width: 100%;
   }
 }
+.pagination-body {
+  padding-top: 10px;
+  display: flex;
+  justify-content: flex-end;
+}
 </style>

package/dist/components/lwUpload/index.vue

@@ -71,7 +71,7 @@
                 fit="cover"></el-image>
     </div>
 
-    <div class="el-upload__tip">
+    <div v-if="tip" class="el-upload__tip">
       {{tip}}
     </div>
   </div>
@@ -351,6 +351,7 @@ export default {
 
 .lw-upload .el-upload--picture-card {
   border-radius: 0;
+  height: 100%;
 }
 
 .lw-upload .uploader,
@@ -452,7 +453,7 @@ export default {
   align-items: center;
   flex-wrap: wrap;
   gap: 10px;
-  margin-bottom: 10px;
+  // margin-bottom: 10px;
 }
 
 .lw-upload .file-empty i {