lw-cdp-ui 1.1.33 → 1.1.34

package/dist/components/lwFormMini/index.vue

@@ -296,8 +296,7 @@ export default {
       handler(val, old) {
         if (this.hasConfig && this.isChange) {
           let form = this.flattenObject(val)
-          console.log(this.form, form)
-          // this.form = Object.assign(this.form, form)
+          this.form = Object.assign(this.form, form)
         }
       },
       deep: true

package/dist/components/lwUpload/index.vue

@@ -21,7 +21,9 @@
         <div class="lw-upload__img-actions"
              v-if="!disabled">
           <span class="del"
-                @click="handleRemove(index)"><el-icon><el-icon-delete /></el-icon></span>
+                @click="handleRemove(index)">
+            <el-icon><el-icon-delete /></el-icon>
+          </span>
         </div>
       </div>
     </template>
@@ -159,6 +161,11 @@ export default {
   },
   methods: {
     newFile(url) {
+      if (this.multiple) {
+        this.fileList = url
+      } else {
+        this.fileList = [url]
+      }
       if (url) {
         this.file = {
           status: "success",
@@ -174,7 +181,12 @@ export default {
     },
     clearFiles() {
       URL.revokeObjectURL(this.file?.tempFile)
-      this.value = ""
+      if (this.multiple) {
+        this.value = this.fileList
+      } else {
+        this.value = ""
+      }
+      
       this.file = null
       this.$nextTick(() => {
         this.$refs.uploader?.clearFiles()
@@ -204,11 +216,12 @@ export default {
       }
     },
     before(file) {
+      console.log(file.type)
       const acceptIncludes = this.accept.replace(/\s/g, "").split(",").includes(file.type)
       if (!acceptIncludes) {
         this.$notify.warning({
-          title: '上传文件警告',
-          message: '选择的文件非图像类文件'
+          title: '上传文件错误',
+          message: '选择的文件类型不对'
         })
         this.clearFiles()
         return false
@@ -383,7 +396,7 @@ export default {
   align-items: center;
   flex-direction: column;
 }
-.lw-upload{
+.lw-upload {
   display: flex;
   align-items: center;
   flex-wrap: wrap;

package/dist/lw-cdp-ui.esm.js

@@ -5349,7 +5349,7 @@ const lwTable = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_render
   },
   methods: {
     newFile(e) {
-      e ? this.file = {
+      this.multiple ? this.fileList = e : this.fileList = [e], e ? this.file = {
         status: "success",
         url: e
       } : this.file = null;
@@ -5359,7 +5359,7 @@ const lwTable = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_render
     },
     clearFiles() {
       var e;
-      URL.revokeObjectURL((e = this.file) == null ? void 0 : e.tempFile), this.value = "", this.file = null, this.$nextTick(() => {
+      URL.revokeObjectURL((e = this.file) == null ? void 0 : e.tempFile), this.multiple ? this.value = this.fileList : this.value = "", this.file = null, this.$nextTick(() => {
         var t;
         (t = this.$refs.uploader) == null || t.clearFiles();
       });
@@ -5373,10 +5373,10 @@ const lwTable = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_render
       this.file = e, e.status == "ready" && (e.tempFile = URL.createObjectURL(e.raw));
     },
     before(e) {
-      if (!this.accept.replace(/\s/g, "").split(",").includes(e.type))
+      if (console.log(e.type), !this.accept.replace(/\s/g, "").split(",").includes(e.type))
         return this.$notify.warning({
-          title: "上传文件警告",
-          message: "选择的文件非图像类文件"
+          title: "上传文件错误",
+          message: "选择的文件类型不对"
         }), this.clearFiles(), !1;
       if (!(e.size / 1024 / 1024 < this.maxSize))
         return this.$message.warning(`上传文件大小不能超过 ${this.maxSize}MB!`), this.clearFiles(), !1;
@@ -5522,7 +5522,7 @@ function _sfc_render$h(e, t, n, c, a, p) {
     }, 8, ["style", "auto-upload", "disabled", "show-file-list", "action", "name", "data", "accept", "limit", "http-request", "on-change", "before-upload", "on-success", "on-error", "on-exceed"])) : createCommentVNode("", !0)
   ], 2);
 }
-const lwUpload = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["render", _sfc_render$h], ["__scopeId", "data-v-3acad1cb"]]), _sfc_main$g = {
+const lwUpload = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["render", _sfc_render$h], ["__scopeId", "data-v-b47fd3b5"]]), _sfc_main$g = {
   components: {
     lwUpload
   },
@@ -6254,7 +6254,7 @@ const lwForm = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["render", _sfc_render$
       handler(e, t) {
         if (this.hasConfig && this.isChange) {
           let n = this.flattenObject(e);
-          console.log(this.form, n);
+          this.form = Object.assign(this.form, n);
         }
       },
       deep: !0
@@ -6701,7 +6701,7 @@ function _sfc_render$f(e, t, n, c, a, p) {
     [u, n.loading]
   ]);
 }
-const lwFormMini = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["render", _sfc_render$f], ["__scopeId", "data-v-5946a29a"]]), config$1 = {
+const lwFormMini = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["render", _sfc_render$f], ["__scopeId", "data-v-b5d200ce"]]), config$1 = {
   icons: [
     {
       name: "默认",