lw-cdp-ui 1.1.33 → 1.1.35

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

@@ -2,29 +2,34 @@
   <div class="lw-upload"
        :class="{ 'lw-upload-round': round }">
 
-    <template v-for="(f, index) in fileList">
-      <div class="lw-upload__img"
-           :style="style">
-        <el-image class="image"
-                  :src="f"
-                  :preview-src-list="fileList"
-                  fit="cover"
-                  hide-on-click-modal
-                  append-to-body
-                  :z-index="9999">
-          <template #placeholder>
-            <div class="lw-upload__img-slot">
-              Loading...
-            </div>
-          </template>
-        </el-image>
-        <div class="lw-upload__img-actions"
-             v-if="!disabled">
-          <span class="del"
-                @click="handleRemove(index)"><el-icon><el-icon-delete /></el-icon></span>
+    <div v-if="fileList.length > 0"
+         class="view-img-list">
+      <template v-for="(f, index) in fileList">
+        <div class="lw-upload__img"
+             :style="style">
+          <el-image class="image"
+                    :src="f"
+                    :preview-src-list="fileList"
+                    fit="cover"
+                    hide-on-click-modal
+                    append-to-body
+                    :z-index="9999">
+            <template #placeholder>
+              <div class="lw-upload__img-slot">
+                Loading...
+              </div>
+            </template>
+          </el-image>
+          <div class="lw-upload__img-actions"
+               v-if="!disabled">
+            <span class="del"
+                  @click="handleRemove(index)">
+              <el-icon><el-icon-delete /></el-icon>
+            </span>
+          </div>
         </div>
-      </div>
-    </template>
+      </template>
+    </div>
 
     <div v-if="file && file.status != 'success'"
          class="lw-upload__uploading">
@@ -66,13 +71,12 @@
           </div>
         </div>
       </slot>
-      <template #tip>
-        <div class="el-upload__tip">
-          {{tip}}
-        </div>
-      </template>
     </el-upload>
+    <div class="el-upload__tip">
+      {{tip}}
+    </div>
   </div>
+
 </template>
 
 <script>
@@ -159,6 +163,11 @@ export default {
   },
   methods: {
     newFile(url) {
+      if (this.multiple) {
+        this.fileList = url
+      } else {
+        this.fileList = url ? [url] : []
+      }
       if (url) {
         this.file = {
           status: "success",
@@ -174,7 +183,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 +218,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,11 +398,15 @@ export default {
   align-items: center;
   flex-direction: column;
 }
-.lw-upload{
+.lw-upload {
+  width: 100%;
+}
+.view-img-list {
   display: flex;
   align-items: center;
   flex-wrap: wrap;
   gap: 10px;
+  margin-bottom: 10px;
 }
 
 .lw-upload .file-empty i {

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

@@ -1265,7 +1265,7 @@ const iframeView = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["render", _sfc_ren
 }, _hoisted_5$7 = ["onClick"], _hoisted_6$5 = { class: "adminui-header-right" }, _hoisted_7$5 = { class: "aminui-wrapper" }, _hoisted_8$5 = {
   key: 0,
   class: "adminui-side-top"
-}, _hoisted_9$3 = { class: "adminui-side-scroll" }, _hoisted_10$3 = { class: "aminui-body el-container" }, _hoisted_11$3 = {
+}, _hoisted_9$4 = { class: "adminui-side-scroll" }, _hoisted_10$3 = { class: "aminui-body el-container" }, _hoisted_11$3 = {
   class: "adminui-main",
   id: "adminui-main"
 }, _hoisted_12$2 = {
@@ -1342,7 +1342,7 @@ function _sfc_render$q(e, t, n, c, a, p) {
           p.menuIsCollapse ? createCommentVNode("", !0) : (openBlock(), createElementBlock("div", _hoisted_8$5, [
             createElementVNode("h2", null, toDisplayString(a.pmenu.meta.title), 1)
           ])),
-          createElementVNode("div", _hoisted_9$3, [
+          createElementVNode("div", _hoisted_9$4, [
             createVNode(V, null, {
               default: withCtx(() => [
                 createVNode(b, {
@@ -3459,7 +3459,7 @@ const JSEncrypt = /* @__PURE__ */ getDefaultExportFromCjs(jsencrypt_minExports),
 }, _hoisted_4$8 = {
   class: "img",
   src: _imports_2
-}, _hoisted_5$6 = { class: "login_main" }, _hoisted_6$4 = { class: "login_registered" }, _hoisted_7$4 = { class: "login-form" }, _hoisted_8$4 = { class: "title-name" }, _hoisted_9$2 = { class: "login_config" }, _hoisted_10$2 = { class: "login-form" }, _hoisted_11$2 = { class: "title-name" };
+}, _hoisted_5$6 = { class: "login_main" }, _hoisted_6$4 = { class: "login_registered" }, _hoisted_7$4 = { class: "login-form" }, _hoisted_8$4 = { class: "title-name" }, _hoisted_9$3 = { class: "login_config" }, _hoisted_10$2 = { class: "login-form" }, _hoisted_11$2 = { class: "title-name" };
 function _sfc_render$p(e, t, n, c, a, p) {
   const _ = resolveComponent("el-button"), m = resolveComponent("el-form-item"), g = resolveComponent("el-input"), b = resolveComponent("el-option"), V = resolveComponent("el-select"), v = resolveComponent("el-form"), $ = resolveComponent("Lang"), I = resolveComponent("el-checkbox"), x = resolveComponent("el-col"), L = resolveComponent("el-row");
   return openBlock(), createElementBlock("div", _hoisted_1$h, [
@@ -3611,7 +3611,7 @@ function _sfc_render$p(e, t, n, c, a, p) {
           }, 8, ["model", "rules"])
         ])
       ], 64)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-        createElementVNode("div", _hoisted_9$2, [
+        createElementVNode("div", _hoisted_9$3, [
           createVNode($)
         ]),
         createElementVNode("div", _hoisted_10$2, [
@@ -4011,7 +4011,7 @@ const SearchDate = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_ren
       displayValue: c
     };
   }
-}, _hoisted_1$g = { class: "dates-container" }, _hoisted_2$e = { class: "dates-panel" }, _hoisted_3$a = { class: "panel-label" }, _hoisted_4$7 = { class: "dates-side" }, _hoisted_5$5 = { class: "sidebar-list" }, _hoisted_6$3 = { class: "text" }, _hoisted_7$3 = ["onClick"], _hoisted_8$3 = { class: "panel-label" }, _hoisted_9$1 = { class: "dates-side-top" }, _hoisted_10$1 = { class: "sidebar-list" }, _hoisted_11$1 = { class: "item" }, _hoisted_12$1 = { class: "text" };
+}, _hoisted_1$g = { class: "dates-container" }, _hoisted_2$e = { class: "dates-panel" }, _hoisted_3$a = { class: "panel-label" }, _hoisted_4$7 = { class: "dates-side" }, _hoisted_5$5 = { class: "sidebar-list" }, _hoisted_6$3 = { class: "text" }, _hoisted_7$3 = ["onClick"], _hoisted_8$3 = { class: "panel-label" }, _hoisted_9$2 = { class: "dates-side-top" }, _hoisted_10$1 = { class: "sidebar-list" }, _hoisted_11$1 = { class: "item" }, _hoisted_12$1 = { class: "text" };
 function _sfc_render$l(e, t, n, c, a, p) {
   const _ = resolveComponent("el-icon-calendar"), m = resolveComponent("el-icon"), g = resolveComponent("el-input"), b = resolveComponent("el-date-picker"), V = resolveComponent("Close"), v = resolveComponent("el-tab-pane"), $ = resolveComponent("el-icon-close"), I = resolveComponent("el-tabs");
   return openBlock(), createElementBlock("div", _hoisted_1$g, [
@@ -4127,7 +4127,7 @@ function _sfc_render$l(e, t, n, c, a, p) {
                   key: 0,
                   to: ".range-picker-" + n.item.prop + " .el-picker-panel__sidebar"
                 }, [
-                  createElementVNode("div", _hoisted_9$1, [
+                  createElementVNode("div", _hoisted_9$2, [
                     createElementVNode("div", _hoisted_10$1, [
                       withDirectives(createElementVNode("div", _hoisted_11$1, [
                         createElementVNode("div", _hoisted_12$1, toDisplayString(e.value[0]) + "~" + toDisplayString(e.value[1]), 1),
@@ -4813,7 +4813,7 @@ const _sfc_main$i = {
       changeColWidth: U
     };
   }
-}, _hoisted_1$d = { class: "baseTablePage-wrap" }, _hoisted_2$b = { key: 0 }, _hoisted_3$9 = { key: 1 }, _hoisted_4$6 = { key: 1 }, _hoisted_5$4 = ["innerHTML", "onClick"], _hoisted_6$2 = ["innerHTML"], _hoisted_7$2 = { key: 2 }, _hoisted_8$2 = { key: 3 }, _hoisted_9 = { key: 0 }, _hoisted_10 = { key: 4 }, _hoisted_11 = { style: { "margin-bottom": "5px" } }, _hoisted_12 = { key: 5 }, _hoisted_13 = { key: 6 }, _hoisted_14 = { key: 7 }, _hoisted_15 = ["src"], _hoisted_16 = { key: 8 }, _hoisted_17 = { key: 9 }, _hoisted_18 = { key: 10 }, _hoisted_19 = ["onClick"], _hoisted_20 = { key: 1 }, _hoisted_21 = ["onClick"], _hoisted_22 = { key: 11 }, _hoisted_23 = {
+}, _hoisted_1$d = { class: "baseTablePage-wrap" }, _hoisted_2$b = { key: 0 }, _hoisted_3$9 = { key: 1 }, _hoisted_4$6 = { key: 1 }, _hoisted_5$4 = ["innerHTML", "onClick"], _hoisted_6$2 = ["innerHTML"], _hoisted_7$2 = { key: 2 }, _hoisted_8$2 = { key: 3 }, _hoisted_9$1 = { key: 0 }, _hoisted_10 = { key: 4 }, _hoisted_11 = { style: { "margin-bottom": "5px" } }, _hoisted_12 = { key: 5 }, _hoisted_13 = { key: 6 }, _hoisted_14 = { key: 7 }, _hoisted_15 = ["src"], _hoisted_16 = { key: 8 }, _hoisted_17 = { key: 9 }, _hoisted_18 = { key: 10 }, _hoisted_19 = ["onClick"], _hoisted_20 = { key: 1 }, _hoisted_21 = ["onClick"], _hoisted_22 = { key: 11 }, _hoisted_23 = {
   key: 0,
   class: "pagination-block"
 }, _hoisted_24 = { class: "tool-block" }, _hoisted_25 = { class: "dropdown-trigger" }, _hoisted_26 = { class: "fix-num" };
@@ -5012,7 +5012,7 @@ function _sfc_render$i(e, t, n, c, a, p) {
               }, 1032, ["value-key", "modelValue", "onUpdate:modelValue", "onChange"])) : (openBlock(!0), createElementBlock(Fragment, { key: 1 }, renderList(B.options, (u, d) => (openBlock(), createElementBlock("span", {
                 key: u + d
               }, [
-                E.row[B.dataIndex] == u[B.editValue || "code"] ? (openBlock(), createElementBlock("span", _hoisted_9, [
+                E.row[B.dataIndex] == u[B.editValue || "code"] ? (openBlock(), createElementBlock("span", _hoisted_9$1, [
                   u.statusColor ? (openBlock(), createElementBlock("span", {
                     key: 0,
                     style: normalizeStyle(`background-color: ${u.statusColor}; border-radius: 100%; padding: 4px; display: inline-block; margin-right: 5px;`)
@@ -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] : [], 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;
@@ -5424,50 +5424,55 @@ const lwTable = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_render
   }
 }, _hoisted_1$c = {
   key: 0,
-  class: "lw-upload__img-actions"
-}, _hoisted_2$a = ["onClick"], _hoisted_3$8 = {
+  class: "view-img-list"
+}, _hoisted_2$a = {
   key: 0,
+  class: "lw-upload__img-actions"
+}, _hoisted_3$8 = ["onClick"], _hoisted_4$5 = {
+  key: 1,
   class: "lw-upload__uploading"
-}, _hoisted_4$5 = { class: "lw-upload__progress" }, _hoisted_5$3 = { class: "el-upload--picture-card" }, _hoisted_6$1 = { class: "file-empty" }, _hoisted_7$1 = { key: 0 }, _hoisted_8$1 = { class: "el-upload__tip" };
+}, _hoisted_5$3 = { class: "lw-upload__progress" }, _hoisted_6$1 = { class: "el-upload--picture-card" }, _hoisted_7$1 = { class: "file-empty" }, _hoisted_8$1 = { key: 0 }, _hoisted_9 = { class: "el-upload__tip" };
 function _sfc_render$h(e, t, n, c, a, p) {
   const _ = resolveComponent("el-image"), m = resolveComponent("el-icon-delete"), g = resolveComponent("el-icon"), b = resolveComponent("el-progress"), V = resolveComponent("el-upload");
   return openBlock(), createElementBlock("div", {
     class: normalizeClass(["lw-upload", { "lw-upload-round": n.round }])
   }, [
-    (openBlock(!0), createElementBlock(Fragment, null, renderList(a.fileList, (v, $) => (openBlock(), createElementBlock("div", {
-      class: "lw-upload__img",
-      style: normalizeStyle(a.style)
-    }, [
-      createVNode(_, {
-        class: "image",
-        src: v,
-        "preview-src-list": a.fileList,
-        fit: "cover",
-        "hide-on-click-modal": "",
-        "append-to-body": "",
-        "z-index": 9999
-      }, {
-        placeholder: withCtx(() => t[0] || (t[0] = [
-          createElementVNode("div", { class: "lw-upload__img-slot" }, " Loading... ", -1)
-        ])),
-        _: 2
-      }, 1032, ["src", "preview-src-list"]),
-      n.disabled ? createCommentVNode("", !0) : (openBlock(), createElementBlock("div", _hoisted_1$c, [
-        createElementVNode("span", {
-          class: "del",
-          onClick: (I) => p.handleRemove($)
-        }, [
-          createVNode(g, null, {
-            default: withCtx(() => [
-              createVNode(m)
-            ]),
-            _: 1
-          })
-        ], 8, _hoisted_2$a)
-      ]))
-    ], 4))), 256)),
-    a.file && a.file.status != "success" ? (openBlock(), createElementBlock("div", _hoisted_3$8, [
-      createElementVNode("div", _hoisted_4$5, [
+    a.fileList.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_1$c, [
+      (openBlock(!0), createElementBlock(Fragment, null, renderList(a.fileList, (v, $) => (openBlock(), createElementBlock("div", {
+        class: "lw-upload__img",
+        style: normalizeStyle(a.style)
+      }, [
+        createVNode(_, {
+          class: "image",
+          src: v,
+          "preview-src-list": a.fileList,
+          fit: "cover",
+          "hide-on-click-modal": "",
+          "append-to-body": "",
+          "z-index": 9999
+        }, {
+          placeholder: withCtx(() => t[0] || (t[0] = [
+            createElementVNode("div", { class: "lw-upload__img-slot" }, " Loading... ", -1)
+          ])),
+          _: 2
+        }, 1032, ["src", "preview-src-list"]),
+        n.disabled ? createCommentVNode("", !0) : (openBlock(), createElementBlock("div", _hoisted_2$a, [
+          createElementVNode("span", {
+            class: "del",
+            onClick: (I) => p.handleRemove($)
+          }, [
+            createVNode(g, null, {
+              default: withCtx(() => [
+                createVNode(m)
+              ]),
+              _: 1
+            })
+          ], 8, _hoisted_3$8)
+        ]))
+      ], 4))), 256))
+    ])) : createCommentVNode("", !0),
+    a.file && a.file.status != "success" ? (openBlock(), createElementBlock("div", _hoisted_4$5, [
+      createElementVNode("div", _hoisted_5$3, [
         createVNode(b, {
           percentage: a.file.percentage,
           "text-inside": !0,
@@ -5481,7 +5486,7 @@ function _sfc_render$h(e, t, n, c, a, p) {
       }, null, 8, ["src"])
     ])) : createCommentVNode("", !0),
     a.fileList.length < n.limit ? (openBlock(), createBlock(V, {
-      key: 1,
+      key: 2,
       class: "uploader",
       style: normalizeStyle(a.style),
       ref: "uploader",
@@ -5500,29 +5505,27 @@ function _sfc_render$h(e, t, n, c, a, p) {
       "on-error": p.error,
       "on-exceed": p.handleExceed
     }, {
-      tip: withCtx(() => [
-        createElementVNode("div", _hoisted_8$1, toDisplayString(n.tip), 1)
-      ]),
       default: withCtx(() => [
         renderSlot(e.$slots, "default", {}, () => [
-          createElementVNode("div", _hoisted_5$3, [
-            createElementVNode("div", _hoisted_6$1, [
+          createElementVNode("div", _hoisted_6$1, [
+            createElementVNode("div", _hoisted_7$1, [
               createVNode(g, null, {
                 default: withCtx(() => [
                   (openBlock(), createBlock(resolveDynamicComponent(n.icon)))
                 ]),
                 _: 1
               }),
-              n.title ? (openBlock(), createElementBlock("h4", _hoisted_7$1, toDisplayString(n.title), 1)) : createCommentVNode("", !0)
+              n.title ? (openBlock(), createElementBlock("h4", _hoisted_8$1, toDisplayString(n.title), 1)) : createCommentVNode("", !0)
             ])
           ])
         ], !0)
       ]),
       _: 3
-    }, 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)
+    }, 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),
+    createElementVNode("div", _hoisted_9, toDisplayString(n.tip), 1)
   ], 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-f1a7c1ee"]]), _sfc_main$g = {
   components: {
     lwUpload
   },
@@ -6254,7 +6257,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 +6704,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: "默认",