@keyblade/pro-components 1.12.12 → 1.12.13

package/es/pro-image-upload/image-upload.vue.d.ts

@@ -602,8 +602,8 @@ declare const __VLS_component: import('vue').DefineComponent<__VLS_PublicProps,
 } & {
     cropperImgLoad: (value: File) => any;
 }, string, import('vue').PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
-    onCropperImgLoad?: ((value: File) => any) | undefined;
     "onUpdate:modelValue"?: ((value: FileItem[]) => any) | undefined;
+    onCropperImgLoad?: ((value: File) => any) | undefined;
 }>, {
     name: string;
     accept: string[];

package/es/pro-image-upload/image-upload.vue.js

@@ -1,30 +1,30 @@
-import { defineComponent as fe, mergeModels as G, useModel as ve, ref as m, computed as M, watch as J, resolveComponent as me, createElementBlock as ge, openBlock as K, createVNode as pe, createBlock as he, createCommentVNode as Ie, normalizeClass as xe, withCtx as X, renderSlot as Y } from "vue";
+import { defineComponent as me, mergeModels as J, useSlots as ge, useModel as pe, ref as m, computed as M, watch as K, resolveComponent as he, createElementBlock as Ie, openBlock as X, createVNode as xe, createBlock as Ue, createCommentVNode as ye, normalizeClass as Ce, createSlots as Be, withCtx as Y, unref as Z, renderSlot as A } from "vue";
 import { Message as g } from "@arco-design/web-vue";
 import { conclude as L } from "vue-global-config";
 import { EImageUploadInnerBeforeUploadStep as v } from "./types.js";
 import { defaultImageUploadOptions as U } from "./constant.js";
-import Ue from "./cropper.vue.js";
-import { defaultImageUploadCheckOptions as Ce, defaultImageUploadCompressorOptions as ye, defaultImageUploadCropOptions as Be, oneTravelImageCheckAndTransform as we, oneTravelImageCompressor as Ee } from "@keyblade/one-travel";
-const Me = "keyblade-pro-image-upload";
-var Z, A, R;
-const je = /* @__PURE__ */ fe({
+import we from "./cropper.vue.js";
+import { defaultImageUploadCheckOptions as Ee, defaultImageUploadCompressorOptions as Me, defaultImageUploadCropOptions as Se, oneTravelImageCheckAndTransform as be, oneTravelImageCompressor as Le } from "@keyblade/one-travel";
+const Oe = "keyblade-pro-image-upload";
+var R, _, ee;
+const He = /* @__PURE__ */ me({
   __name: "image-upload",
-  props: /* @__PURE__ */ G({
+  props: /* @__PURE__ */ J({
     action: {},
     handlerResponse: {},
     headers: {},
     data: {},
-    name: { default: (Z = U) == null ? void 0 : Z.name },
+    name: { default: (R = U) == null ? void 0 : R.name },
     tip: {},
     accept: { default: () => {
-      var C;
-      return ((C = U) == null ? void 0 : C.accept) || [];
+      var y;
+      return ((y = U) == null ? void 0 : y.accept) || [];
     } },
     multiple: { type: Boolean, default: U.multiple },
     singleLimit: { default: U.singleLimit },
     limit: {},
-    disabled: { type: Boolean, default: (A = U) == null ? void 0 : A.disabled },
-    hideInnerBeforeUploadLoading: { type: Boolean, default: (R = U) == null ? void 0 : R.hideInnerBeforeUploadLoading },
+    disabled: { type: Boolean, default: (_ = U) == null ? void 0 : _.disabled },
+    hideInnerBeforeUploadLoading: { type: Boolean, default: (ee = U) == null ? void 0 : ee.hideInnerBeforeUploadLoading },
     checkOptions: {},
     compressorOptions: {},
     cropOptions: {},
@@ -38,65 +38,65 @@ const je = /* @__PURE__ */ fe({
     modelValue: { required: !0 },
     modelModifiers: {}
   }),
-  emits: /* @__PURE__ */ G(["cropperImgLoad"], ["update:modelValue"]),
-  setup(C, { expose: _, emit: ee }) {
-    const r = ve(C, "modelValue"), e = C, ae = ee, b = m(), O = m(), p = m(), h = m(
+  emits: /* @__PURE__ */ J(["cropperImgLoad"], ["update:modelValue"]),
+  setup(y, { expose: ae, emit: le }) {
+    const O = ge(), r = pe(y, "modelValue"), e = y, oe = le, S = m(), $ = m(), p = m(), h = m(
       []
-    ), n = m(), c = m(), s = m(), le = M(() => e.accept.map((a) => `.${a}`).join(",")), f = M(() => L([e.checkOptions, Ce]) || {}), y = M(() => L([e.compressorOptions, ye]) || {}), B = M(() => L([e.cropOptions, Be]) || {}), oe = (a) => {
-      var t, i, d, u;
-      const l = (u = (d = (i = (t = b.value) == null ? void 0 : t.$el) == null ? void 0 : i.querySelector) == null ? void 0 : d.call(i, "input")) == null ? void 0 : u.files;
+    ), n = m(), c = m(), s = m(), ne = M(() => e.accept.map((a) => `.${a}`).join(",")), f = M(() => L([e.checkOptions, Ee]) || {}), C = M(() => L([e.compressorOptions, Me]) || {}), B = M(() => L([e.cropOptions, Se]) || {}), te = (a) => {
+      var t, u, d, i;
+      const l = (i = (d = (u = (t = S.value) == null ? void 0 : t.$el) == null ? void 0 : u.querySelector) == null ? void 0 : d.call(u, "input")) == null ? void 0 : i.files;
       return l && l.length > 0 && (s.value = {
         selectCount: l.length
       }), e != null && e.onBeforeUpload ? e == null ? void 0 : e.onBeforeUpload(a) : s.value && (e != null && e.singleLimit) && s.value.selectCount > (e == null ? void 0 : e.singleLimit) ? (s.value.handleIndex === void 0 ? (s.value.handleIndex = 0, g.clear(), g.error(`单次最多可选择${e == null ? void 0 : e.singleLimit}张图片`)) : s.value.handleIndex += 1, s.value.handleIndex === s.value.selectCount - 1 && (s.value = void 0), !1) : new Promise(async (w, E) => {
         try {
-          w(await ue(a));
+          w(await se(a));
         } catch {
           E();
         } finally {
-          $();
+          k();
         }
       });
-    }, ne = async (a) => {
+    }, ie = async (a) => {
       const l = r.value.findIndex((t) => t.uid === a.uid);
       return r.value.splice(l, 1), r.value = [...r.value], !1;
-    }, te = (a, l) => {
+    }, re = (a, l) => {
       e != null && e.onExceed ? e == null || e.onExceed(a, l) : (g.error(`单次最多可选择${(e == null ? void 0 : e.limit) || 1}张图片`), r.value = a);
-    }, ie = async (a) => {
+    }, ue = async (a) => {
       if (e != null && e.onSuccess)
         e == null || e.onSuccess(a);
       else {
         if (!(e != null && e.handlerResponse))
           return;
-        const l = await e.handlerResponse(a.response), t = r.value.findIndex((i) => i.uid === a.uid);
+        const l = await e.handlerResponse(a.response), t = r.value.findIndex((u) => u.uid === a.uid);
         l.success ? r.value[t] = {
           ...r.value[t],
           ...l
         } : r.value.splice(t, 1);
       }
-    }, re = (a) => {
+    }, de = (a) => {
       e != null && e.onError ? e == null || e.onError(a) : setTimeout(() => {
         const l = r.value.findIndex((t) => t.uid === a.uid);
         r.value.splice(l, 1);
       });
-    }, ue = (a) => new Promise((l, t) => {
-      h.value.push({ file: a, resolve: l, reject: t }), h.value.length === 1 && !n.value && $();
-    }), $ = () => {
+    }, se = (a) => new Promise((l, t) => {
+      h.value.push({ file: a, resolve: l, reject: t }), h.value.length === 1 && !n.value && k();
+    }), k = () => {
       n.value === void 0 ? n.value = 0 : n.value + 1 >= h.value.length ? (n.value = void 0, h.value = []) : n.value += 1;
-    }, de = () => {
+    }, ce = () => {
       var a;
       (a = p.value) == null || a.reject();
-    }, se = (a) => {
+    }, fe = (a) => {
       var l;
       (l = p.value) == null || l.resolve(a);
-    }, ce = (a) => {
-      ae("cropperImgLoad", a);
+    }, ve = (a) => {
+      oe("cropperImgLoad", a);
     };
-    J(n, async () => {
-      var w, E, S, k, F, z, j, Q, V, W, H, N, P, T, q, D;
+    K(n, async () => {
+      var w, E, b, F, z, j, Q, V, W, H, N, P, T, q, D, G;
       if (n.value === void 0 || h.value.length === 0)
         return;
-      const a = h.value[n.value], { file: l, resolve: t, reject: i } = a;
-      let d = l.name, u = l;
+      const a = h.value[n.value], { file: l, resolve: t, reject: u } = a;
+      let d = l.name, i = l;
       if ((w = f.value) != null && w.enable) {
         c.value = {
           loading: !0,
@@ -107,7 +107,7 @@ const je = /* @__PURE__ */ fe({
           n.value,
           v.check
         );
-        const o = await we(l, l.name, {
+        const o = await be(l, l.name, {
           imageMaxSize: f.value.maxSize,
           imageAllowedType: f.value.allowedType,
           imageMinWidth: f.value.minWidth,
@@ -115,7 +115,7 @@ const je = /* @__PURE__ */ fe({
           imageMaxWidth: f.value.maxWidth,
           imageMaxHeight: f.value.maxHeight
         });
-        if (c.value = void 0, (S = e == null ? void 0 : e.onInnerBeforeUploadEnd) == null || S.call(
+        if (c.value = void 0, (b = e == null ? void 0 : e.onInnerBeforeUploadEnd) == null || b.call(
           e,
           l,
           n.value,
@@ -126,26 +126,26 @@ const je = /* @__PURE__ */ fe({
             errorMessage: o == null ? void 0 : o.errorMessage
           }
         ), !o.success)
-          return (k = f.value) != null && k.showErrorMessage && g.error((o == null ? void 0 : o.errorMessage) || "图片校验及转换失败"), i();
+          return (F = f.value) != null && F.showErrorMessage && g.error((o == null ? void 0 : o.errorMessage) || "图片校验及转换失败"), u();
         if (o != null && o.hasTransform) {
           const x = d == null ? void 0 : d.split(".");
-          x.pop(), d = `${x.join(",")}.jpg`, u = new File([o.file], d, {
+          x.pop(), d = `${x.join(",")}.jpg`, i = new File([o.file], d, {
             type: o.file.type
           });
         } else
-          u = o.file;
+          i = o.file;
       }
-      if ((F = B.value) != null && F.enable && !d.endsWith(".gif")) {
-        (z = e == null ? void 0 : e.onInnerBeforeUploadStart) == null || z.call(
+      if ((z = B.value) != null && z.enable && !d.endsWith(".gif")) {
+        (j = e == null ? void 0 : e.onInnerBeforeUploadStart) == null || j.call(
           e,
           l,
           n.value,
           v.crop
         );
         try {
-          (j = B.value) != null && j.customCrop ? u = await B.value.customCrop(u) : u = await new Promise((o, x) => {
-            p.value = { file: u, resolve: o, reject: x };
-          }), (Q = e == null ? void 0 : e.onInnerBeforeUploadEnd) == null || Q.call(
+          (Q = B.value) != null && Q.customCrop ? i = await B.value.customCrop(i) : i = await new Promise((o, x) => {
+            p.value = { file: i, resolve: o, reject: x };
+          }), (V = e == null ? void 0 : e.onInnerBeforeUploadEnd) == null || V.call(
             e,
             l,
             n.value,
@@ -155,7 +155,7 @@ const je = /* @__PURE__ */ fe({
             }
           );
         } catch {
-          return (V = e == null ? void 0 : e.onInnerBeforeUploadEnd) == null || V.call(
+          return (W = e == null ? void 0 : e.onInnerBeforeUploadEnd) == null || W.call(
             e,
             l,
             n.value,
@@ -167,27 +167,27 @@ const je = /* @__PURE__ */ fe({
               },
               errorMessage: "图片剪裁失败"
             }
-          ), (W = B.value) != null && W.showErrorMessage && g.error("图片剪裁失败"), i();
+          ), (H = B.value) != null && H.showErrorMessage && g.error("图片剪裁失败"), u();
         } finally {
           p.value = void 0;
         }
       }
-      if ((H = y.value) != null && H.enable) {
+      if ((N = C.value) != null && N.enable) {
         c.value = {
           loading: !0,
           text: `第${n.value + 1}张图片处理中，请稍等`
-        }, (N = e == null ? void 0 : e.onInnerBeforeUploadStart) == null || N.call(
+        }, (P = e == null ? void 0 : e.onInnerBeforeUploadStart) == null || P.call(
           e,
           l,
           n.value,
           v.compress
         );
-        const o = await Ee(u, {
-          maxSize: y.value.maxSize,
-          size: y.value.size,
-          excludeAllowedTypes: (P = y.value.excludeAllowedTypes) == null ? void 0 : P.map((x) => `image/${x}`)
+        const o = await Le(i, {
+          maxSize: C.value.maxSize,
+          size: C.value.size,
+          excludeAllowedTypes: (T = C.value.excludeAllowedTypes) == null ? void 0 : T.map((x) => `image/${x}`)
         });
-        if (c.value = void 0, (T = e == null ? void 0 : e.onInnerBeforeUploadEnd) == null || T.call(
+        if (c.value = void 0, (q = e == null ? void 0 : e.onInnerBeforeUploadEnd) == null || q.call(
           e,
           l,
           n.value,
@@ -200,12 +200,12 @@ const je = /* @__PURE__ */ fe({
             errorMessage: o == null ? void 0 : o.errorMessage
           }
         ), !o.success)
-          return (q = y.value) != null && q.showErrorMessage && g.error((o == null ? void 0 : o.errorMessage) || "图片压缩失败"), i();
-        u = new File([o.file], d, {
+          return (D = C.value) != null && D.showErrorMessage && g.error((o == null ? void 0 : o.errorMessage) || "图片压缩失败"), u();
+        i = new File([o.file], d, {
           type: o.file.type
         });
       }
-      c.value = void 0, (D = e == null ? void 0 : e.onInnerBeforeUploadEnd) == null || D.call(
+      c.value = void 0, (G = e == null ? void 0 : e.onInnerBeforeUploadEnd) == null || G.call(
         e,
         l,
         n.value,
@@ -213,10 +213,10 @@ const je = /* @__PURE__ */ fe({
         {
           success: !0
         }
-      ), t(u);
+      ), t(i);
     });
     let I;
-    return J(
+    return K(
       () => c.value,
       () => {
         var a;
@@ -226,16 +226,17 @@ const je = /* @__PURE__ */ fe({
           duration: 0
         }) : (a = I == null ? void 0 : I.close) == null || a.call(I);
       }
-    ), _({
-      uploadInsRef: b,
-      cropperInsRef: O
+    ), ae({
+      uploadInsRef: S,
+      cropperInsRef: $
     }), (a, l) => {
-      const t = me("a-upload");
-      return K(), ge("div", null, [
-        pe(t, {
-          class: xe([`${Me}-upload`]),
+      var u, d;
+      const t = he("a-upload");
+      return X(), Ie("div", null, [
+        xe(t, {
+          class: Ce([`${Oe}-upload`]),
           ref_key: "uploadInsRef",
-          ref: b,
+          ref: S,
           "list-type": "picture-card",
           tip: a.tip || "上传",
           "image-preview": "",
@@ -245,39 +246,46 @@ const je = /* @__PURE__ */ fe({
           headers: a.headers,
           data: a.data,
           name: a.name,
-          accept: le.value,
+          accept: ne.value,
           multiple: a.multiple,
           limit: a.limit,
           disabled: a.disabled,
-          "on-before-upload": oe,
-          "on-before-remove": ne,
-          onExceedLimit: te,
-          onSuccess: ie,
-          onError: re
-        }, {
-          image: X(({ fileItem: i }) => [
-            Y(a.$slots, "image", { fileItem: i })
-          ]),
-          "upload-button": X(() => [
-            Y(a.$slots, "upload-button")
-          ]),
-          _: 3
-        }, 8, ["class", "tip", "file-list", "action", "headers", "data", "name", "accept", "multiple", "limit", "disabled"]),
-        p.value && n.value !== void 0 ? (K(), he(Ue, {
+          "on-before-upload": te,
+          "on-before-remove": ie,
+          onExceedLimit: re,
+          onSuccess: ue,
+          onError: de
+        }, Be({ _: 2 }, [
+          (u = Z(O)) != null && u.image ? {
+            name: "image",
+            fn: Y(({ fileItem: i }) => [
+              A(a.$slots, "image", { fileItem: i })
+            ]),
+            key: "0"
+          } : void 0,
+          (d = Z(O)) != null && d["upload-button"] ? {
+            name: "upload-button",
+            fn: Y(() => [
+              A(a.$slots, "upload-button")
+            ]),
+            key: "1"
+          } : void 0
+        ]), 1032, ["class", "tip", "file-list", "action", "headers", "data", "name", "accept", "multiple", "limit", "disabled"]),
+        p.value && n.value !== void 0 ? (X(), Ue(we, {
           key: 0,
           ref_key: "cropperInsRef",
-          ref: O,
+          ref: $,
           file: p.value.file,
           index: n.value,
           options: B.value,
-          onCancel: de,
-          onConfirm: se,
-          onImgLoad: ce
-        }, null, 8, ["file", "index", "options"])) : Ie("", !0)
+          onCancel: ce,
+          onConfirm: fe,
+          onImgLoad: ve
+        }, null, 8, ["file", "index", "options"])) : ye("", !0)
       ]);
     };
   }
 });
 export {
-  je as default
+  He as default
 };

package/es/pro-image-upload/index.d.ts

@@ -41,8 +41,8 @@ declare const ProImageUpload: {
             errorMessage?: string;
         }) => void;
     }> & Readonly<{
-        onCropperImgLoad?: ((value: File) => any) | undefined;
         "onUpdate:modelValue"?: ((value: import('@arco-design/web-vue').FileItem[]) => any) | undefined;
+        onCropperImgLoad?: ((value: File) => any) | undefined;
     }>, {
         uploadInsRef: import('vue').Ref<import('vue').CreateComponentPublicInstanceWithMixins<Readonly<{
             fileList?: unknown;
@@ -618,8 +618,8 @@ declare const ProImageUpload: {
             errorMessage?: string;
         }) => void;
     }> & Readonly<{
-        onCropperImgLoad?: ((value: File) => any) | undefined;
         "onUpdate:modelValue"?: ((value: import('@arco-design/web-vue').FileItem[]) => any) | undefined;
+        onCropperImgLoad?: ((value: File) => any) | undefined;
     }>, {
         uploadInsRef: import('vue').Ref<import('vue').CreateComponentPublicInstanceWithMixins<Readonly<{
             fileList?: unknown;
@@ -1149,8 +1149,8 @@ declare const ProImageUpload: {
         errorMessage?: string;
     }) => void;
 }> & Readonly<{
-    onCropperImgLoad?: ((value: File) => any) | undefined;
     "onUpdate:modelValue"?: ((value: import('@arco-design/web-vue').FileItem[]) => any) | undefined;
+    onCropperImgLoad?: ((value: File) => any) | undefined;
 }>, {
     uploadInsRef: import('vue').Ref<import('vue').CreateComponentPublicInstanceWithMixins<Readonly<{
         fileList?: unknown;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@keyblade/pro-components",
   "description": "KeyBlade Pro Components",
   "author": "yangshuai <704807396@qq.com>",
-  "version": "1.12.12",
+  "version": "1.12.13",
   "private": false,
   "type": "module",
   "main": "es/index.js",