lw-cdp-ui 1.1.32 → 1.1.33

package/dist/components/lwFormMini/index.vue

@@ -296,7 +296,8 @@ export default {
       handler(val, old) {
         if (this.hasConfig && this.isChange) {
           let form = this.flattenObject(val)
-          this.form = Object.assign(this.form, form)
+          console.log(this.form, form)
+          // this.form = Object.assign(this.form, form)
         }
       },
       deep: true
@@ -449,11 +450,7 @@ export default {
     // prop NAME
     getPropName(item) {
       if (item.component == 'checkbox' || item.component == 'upload') {
-        if (item.name) {
-          return `${item.name}.${item.options.items[0].name}`
-        } else {
-          return item.options.items[0].name
-        }
+        return item.options.items[0].name
 
       } else {
         return item.name

package/dist/components/lwTableForm/index.vue

@@ -39,10 +39,10 @@
         <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]"
-                       :title="_item.label"></lw-upload>
+            <lw-upload v-model="row[_item.name]"></lw-upload>
             <div class="error-tips">
-              {{ row['errorMsg'][_item.name] }}</div>
+              {{ row['errorMsg'][_item.name] }}
+            </div>
 
           </el-col>
         </template>
@@ -130,14 +130,19 @@
         <!-- number -->
         <template v-else-if="item.component=='number'">
           <el-input-number v-model="row[item.name]"
+                           :disabled="item.options?.disabled"
+                           :min="item?.options?.min"
+                           :max="item?.options?.max"
                            size="small"
-                           :disabled="isDisabled(item, row)"
-                           v-bind="{
-                                  min: item?.options?.min !== undefined ? item.options.min : null,
-                                  max: item?.options?.max !== undefined ? item.options.max : null,
-                                  placeholder: item?.options?.placeholder || ''
-                                }"
-                           controls-position="right"></el-input-number>
+                           :step="item?.options?.step || 1"
+                           :precision="item?.options?.precision"
+                           :placeholder="item?.options?.placeholder || ''"
+                           :controls-position="item?.options?.controlsPosition || 'right'">
+            <template v-if="item?.options?.suffix"
+                      #suffix>
+              <span>{{ item.options.suffix }}</span>
+            </template>
+          </el-input-number>
 
         </template>
         <!-- radio -->
@@ -201,7 +206,7 @@
         </template>
 
         <!-- 按钮 -->
-        <template v-else-if="item.component == 'operation' && !isView">
+        <template v-else-if="item.component == 'operation'">
           <!-- 默认新增/删除 -->
           <span v-for="o in item.options.addDelete"
                 :key="o"

package/dist/components/lwUpload/index.vue

@@ -169,17 +169,15 @@ export default {
       }
     },
     handleRemove(index) {
-      if (this.multiple) {
-        this.fileList.splice(index, 1)
-      }
+      this.fileList.splice(index, 1)
       this.clearFiles()
     },
     clearFiles() {
-      URL.revokeObjectURL(this.file.tempFile)
+      URL.revokeObjectURL(this.file?.tempFile)
       this.value = ""
       this.file = null
       this.$nextTick(() => {
-        this.$refs.uploader.clearFiles()
+        this.$refs.uploader?.clearFiles()
       })
     },
     change(file, files) {
@@ -241,7 +239,6 @@ export default {
       }
       var response = this.parseData(res, file)
       file.url = response.src
-      console.log(this.fileList)
       this.fileList.push(file.url)
       if (this.multiple) {
         this.value = this.fileList
@@ -287,149 +284,140 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-// 表单错误状态样式
-.el-form-item.is-error {
-  .lw-upload {
-    .el-upload--picture-card {
-      border-color: var(--el-color-danger);
-    }
-  }
+.el-form-item.is-error .lw-upload .el-upload--picture-card {
+  border-color: var(--el-color-danger);
 }
 
-// 上传组件通用样式
-.lw-upload {
-  display: flex;
-  gap: 10px;
-  width: 100%;
-  flex-wrap: wrap;
-  justify-content: left;
-  .el-upload--picture-card {
-    border-radius: 0;
-  }
+.lw-upload .el-upload--picture-card {
+  border-radius: 0;
+}
 
-  .uploader,
-  :deep(.el-upload) {
-    width: 100%;
-    height: 100%;
-  }
+.lw-upload .uploader,
+.lw-upload:deep(.el-upload) {
+  width: 100%;
+  height: 100%;
+}
 
-  &__img {
-    width: 100%;
-    height: 100%;
-    position: relative;
+.lw-upload__img {
+  width: 100%;
+  height: 100%;
+  position: relative;
+}
 
-    .image {
-      width: 100%;
-      height: 100%;
-    }
+.lw-upload__img .image {
+  width: 100%;
+  height: 100%;
+}
 
-    &-actions {
-      position: absolute;
-      top: 0;
-      right: 0;
-      display: none;
+.lw-upload__img-actions {
+  position: absolute;
+  top: 0;
+  right: 0;
+  display: none;
+}
 
-      span {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        width: 25px;
-        height: 25px;
-        cursor: pointer;
-        color: #fff;
+.lw-upload__img-actions span {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 25px;
+  height: 25px;
+  cursor: pointer;
+  color: #fff;
+}
 
-        i {
-          font-size: 12px;
-        }
+.lw-upload__img-actions span i {
+  font-size: 12px;
+}
 
-        &.del {
-          background: #f56c6c;
-        }
-      }
-    }
+.lw-upload__img-actions .del {
+  background: #f56c6c;
+}
 
-    &:hover {
-      &-actions {
-        display: block;
-      }
-    }
-  }
+.lw-upload__img:hover .lw-upload__img-actions {
+  display: block;
+}
 
-  &__img-slot {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    width: 100%;
-    height: 100%;
-    font-size: 12px;
-    background-color: var(--el-fill-color-lighter);
-  }
+.lw-upload__img-slot {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100%;
+  font-size: 12px;
+  background-color: var(--el-fill-color-lighter);
+}
 
-  &__uploading {
-    width: 100%;
-    height: 100%;
-    position: relative;
+.lw-upload__uploading {
+  width: 100%;
+  height: 100%;
+  position: relative;
+}
 
-    .image {
-      width: 100%;
-      height: 100%;
-    }
+.lw-upload__progress {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: var(--el-overlay-color-lighter);
+  z-index: 1;
+  padding: 10px;
+}
 
-    &__progress {
-      position: absolute;
-      width: 100%;
-      height: 100%;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      background-color: var(--el-overlay-color-lighter);
-      z-index: 1;
-      padding: 10px;
+.lw-upload__progress .el-progress {
+  width: 100%;
+}
 
-      .el-progress {
-        width: 100%;
-      }
-    }
-  }
+.lw-upload__uploading .image {
+  width: 100%;
+  height: 100%;
+}
 
-  .file-empty {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    flex-direction: column;
+.lw-upload .file-empty {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+}
+.lw-upload{
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 10px;
+}
 
-    i {
-      font-size: 28px;
-    }
+.lw-upload .file-empty i {
+  font-size: 28px;
+}
 
-    h4 {
-      font-size: 12px;
-      font-weight: normal;
-      color: #8c939d;
-      margin-top: 8px;
-    }
-  }
+.lw-upload .file-empty h4 {
+  font-size: 12px;
+  font-weight: normal;
+  color: #8c939d;
+  margin-top: 8px;
+}
 
-  &.lw-upload-round {
-    border-radius: 50%;
-    overflow: hidden;
+.lw-upload.lw-upload-round {
+  border-radius: 50%;
+  overflow: hidden;
+}
 
-    .el-upload--picture-card {
-      border-radius: 50%;
-    }
+.lw-upload.lw-upload-round .el-upload--picture-card {
+  border-radius: 50%;
+}
 
-    .lw-upload__img-actions {
-      top: auto;
-      left: 0;
-      right: 0;
-      bottom: 0;
+.lw-upload.lw-upload-round .lw-upload__img-actions {
+  top: auto;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
 
-      span {
-        width: 100%;
-      }
-    }
-  }
+.lw-upload.lw-upload-round .lw-upload__img-actions span {
+  width: 100%;
 }
 </style>