@keyblade/pro-components 1.13.2 → 1.13.4

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

@@ -599,6 +599,7 @@ declare const __VLS_component: import('vue').DefineComponent<__VLS_PublicProps,
         listType: import('@arco-design/web-vue/es/upload/interfaces').ListType;
     }> | undefined>;
     cropperInsRef: import('vue').Ref<any, any>;
+    isUploadComplete: import('vue').ComputedRef<boolean>;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     "update:modelValue": (value: FileItem[]) => any;
 } & {
@@ -609,9 +610,9 @@ declare const __VLS_component: import('vue').DefineComponent<__VLS_PublicProps,
 }>, {
     name: string;
     accept: string[];
+    disabled: boolean;
     multiple: boolean;
     singleLimit: number;
-    disabled: boolean;
     hideInnerBeforeUploadLoading: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {
     uploadInsRef: unknown;

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

@@ -1,31 +1,31 @@
-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 { defineComponent as he, mergeModels as Y, useSlots as Ie, useModel as xe, ref as m, computed as w, watch as Z, resolveComponent as Ue, createElementBlock as Ce, openBlock as N, createVNode as ye, createBlock as Be, createCommentVNode as we, normalizeClass as Ee, createSlots as Me, withCtx as A, unref as R, renderSlot as _ } 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 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 We = /* @__PURE__ */ me({
+import Se from "./cropper.vue.js";
+import { defaultImageUploadCheckOptions as be, defaultImageUploadCompressorOptions as Le, defaultImageUploadCropOptions as Oe, oneTravelImageCheckAndTransform as $e, oneTravelImageCompressor as ke } from "@keyblade/one-travel";
+const ze = "keyblade-pro-image-upload";
+var ee, ae, le;
+const qe = /* @__PURE__ */ he({
   __name: "image-upload",
-  props: /* @__PURE__ */ J({
+  props: /* @__PURE__ */ Y({
     action: {},
     handlerResponse: {},
     headers: {},
     data: {},
-    name: { default: (R = U) == null ? void 0 : R.name },
+    name: { default: (ee = U) == null ? void 0 : ee.name },
     tip: {},
     accept: { default: () => {
-      var y;
-      return ((y = U) == null ? void 0 : y.accept) || [];
+      var C;
+      return ((C = U) == null ? void 0 : C.accept) || [];
     } },
     multiple: { type: Boolean, default: U.multiple },
     singleLimit: { default: U.singleLimit },
     limit: {},
     exceedTip: {},
-    disabled: { type: Boolean, default: (_ = U) == null ? void 0 : _.disabled },
-    hideInnerBeforeUploadLoading: { type: Boolean, default: (ee = U) == null ? void 0 : ee.hideInnerBeforeUploadLoading },
+    disabled: { type: Boolean, default: (ae = U) == null ? void 0 : ae.disabled },
+    hideInnerBeforeUploadLoading: { type: Boolean, default: (le = U) == null ? void 0 : le.hideInnerBeforeUploadLoading },
     checkOptions: {},
     compressorOptions: {},
     cropOptions: {},
@@ -39,76 +39,74 @@ const We = /* @__PURE__ */ me({
     modelValue: { required: !0 },
     modelModifiers: {}
   }),
-  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(), 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;
+  emits: /* @__PURE__ */ Y(["cropperImgLoad"], ["update:modelValue"]),
+  setup(C, { expose: oe, emit: ne }) {
+    const O = Ie(), u = xe(C, "modelValue"), e = C, te = ne, S = m(), $ = m(), p = m(), h = m([]), n = m(), c = m(), s = m(), ie = w(() => e.accept.map((a) => `.${a}`).join(",")), f = w(() => L([e.checkOptions, be]) || {}), y = w(() => L([e.compressorOptions, Le]) || {}), B = w(() => L([e.cropOptions, Oe]) || {}), re = (a) => {
+      var i, d, t, r;
+      const l = (r = (t = (d = (i = S.value) == null ? void 0 : i.$el) == null ? void 0 : d.querySelector) == null ? void 0 : t.call(d, "input")) == null ? void 0 : r.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) => {
+      }), 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 (E, M) => {
         try {
-          w(await se(a));
+          E(await fe(a));
         } catch {
-          E();
+          M();
         } finally {
           k();
         }
       });
-    }, ie = async (a) => {
-      const l = r.value.findIndex((t) => t.uid === a.uid);
-      return r.value.splice(l, 1), r.value = [...r.value], !1;
-    }, re = (a, l) => {
-      e != null && e.onExceed ? e == null || e.onExceed(a, l) : (g.error(e.exceedTip ?? `超过数量上限，最多上传${(e == null ? void 0 : e.limit) || 1}张`), r.value = a);
     }, ue = async (a) => {
+      const l = u.value.findIndex((i) => i.uid === a.uid);
+      return u.value.splice(l, 1), u.value = [...u.value], !1;
+    }, de = (a, l) => {
+      e != null && e.onExceed ? e == null || e.onExceed(a, l) : (g.error(e.exceedTip ?? `超过数量上限，最多上传${(e == null ? void 0 : e.limit) || 1}张`), u.value = a);
+    }, se = 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((u) => u.uid === a.uid);
-        l.success ? r.value[t] = {
-          ...r.value[t],
+        const l = await e.handlerResponse(a.response), i = u.value.findIndex((d) => d.uid === a.uid);
+        l.success ? u.value[i] = {
+          ...u.value[i],
           ...l
-        } : r.value.splice(t, 1);
+        } : u.value.splice(i, 1);
       }
-    }, de = (a) => {
+    }, ce = (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);
+        const l = u.value.findIndex((i) => i.uid === a.uid);
+        u.value.splice(l, 1);
       });
-    }, se = (a) => new Promise((l, t) => {
-      h.value.push({ file: a, resolve: l, reject: t }), h.value.length === 1 && !n.value && k();
+    }, fe = (a) => new Promise((l, i) => {
+      h.value.push({ file: a, resolve: l, reject: i }), 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;
-    }, ce = () => {
+    }, ve = () => {
       var a;
       (a = p.value) == null || a.reject();
-    }, fe = (a) => {
+    }, me = (a) => {
       var l;
       (l = p.value) == null || l.resolve(a);
-    }, ve = (a) => {
-      oe("cropperImgLoad", a);
+    }, ge = (a) => {
+      te("cropperImgLoad", a);
     };
-    K(n, async () => {
-      var w, E, b, F, z, j, Q, T, V, W, H, N, P, q, D, G;
+    Z(n, async () => {
+      var E, M, b, z, j, Q, T, V, W, F, H, P, q, D, G, J, K, X;
       if (n.value === void 0 || h.value.length === 0)
         return;
-      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) {
+      const a = h.value[n.value], { file: l, resolve: i, reject: d } = a;
+      let t = l.name, r = l;
+      if ((E = f.value) != null && E.enable) {
         c.value = {
           loading: !0,
           text: `第${n.value + 1}张图片检测中，请稍等`
-        }, (E = e == null ? void 0 : e.onInnerBeforeUploadStart) == null || E.call(
+        }, (M = e == null ? void 0 : e.onInnerBeforeUploadStart) == null || M.call(
           e,
           l,
           n.value,
           v.check
         );
-        const o = await be(l, l.name, {
+        const o = await $e(l, l.name, {
           imageMaxSize: f.value.maxSize,
           imageAllowedType: f.value.allowedType,
           imageMinWidth: f.value.minWidth,
@@ -127,26 +125,26 @@ const We = /* @__PURE__ */ me({
             errorMessage: o == null ? void 0 : o.errorMessage
           }
         ), !o.success)
-          return (F = f.value) != null && F.showErrorMessage && g.error((o == null ? void 0 : o.errorMessage) || "图片校验及转换失败"), u();
+          return (z = f.value) != null && z.showErrorMessage && g.error((o == null ? void 0 : o.errorMessage) || "图片校验及转换失败"), d();
         if (o != null && o.hasTransform) {
-          const x = d == null ? void 0 : d.split(".");
-          x.pop(), d = `${x.join(",")}.jpg`, i = new File([o.file], d, {
+          const x = t == null ? void 0 : t.split(".");
+          x.pop(), t = `${x.join(",")}.jpg`, r = new File([o.file], t, {
             type: o.file.type
           });
         } else
-          i = o.file;
+          r = o.file;
       }
-      if ((z = B.value) != null && z.enable && !d.endsWith(".gif")) {
-        (j = e == null ? void 0 : e.onInnerBeforeUploadStart) == null || j.call(
+      if ((j = B.value) != null && j.enable && !((T = (Q = t == null ? void 0 : t.toLocaleLowerCase) == null ? void 0 : Q.call(t)) != null && T.endsWith(".gif"))) {
+        (V = e == null ? void 0 : e.onInnerBeforeUploadStart) == null || V.call(
           e,
           l,
           n.value,
           v.crop
         );
         try {
-          (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 };
-          }), (T = e == null ? void 0 : e.onInnerBeforeUploadEnd) == null || T.call(
+          (W = B.value) != null && W.customCrop ? r = await B.value.customCrop(r) : r = await new Promise((o, x) => {
+            p.value = { file: r, resolve: o, reject: x };
+          }), (F = e == null ? void 0 : e.onInnerBeforeUploadEnd) == null || F.call(
             e,
             l,
             n.value,
@@ -156,7 +154,7 @@ const We = /* @__PURE__ */ me({
             }
           );
         } catch {
-          return (V = e == null ? void 0 : e.onInnerBeforeUploadEnd) == null || V.call(
+          return (H = e == null ? void 0 : e.onInnerBeforeUploadEnd) == null || H.call(
             e,
             l,
             n.value,
@@ -168,27 +166,27 @@ const We = /* @__PURE__ */ me({
               },
               errorMessage: "图片剪裁失败"
             }
-          ), (W = B.value) != null && W.showErrorMessage && g.error("图片剪裁失败"), u();
+          ), (P = B.value) != null && P.showErrorMessage && g.error("图片剪裁失败"), d();
         } finally {
           p.value = void 0;
         }
       }
-      if ((H = C.value) != null && H.enable) {
+      if ((q = y.value) != null && q.enable) {
         c.value = {
           loading: !0,
           text: `第${n.value + 1}张图片处理中，请稍等`
-        }, (N = e == null ? void 0 : e.onInnerBeforeUploadStart) == null || N.call(
+        }, (D = e == null ? void 0 : e.onInnerBeforeUploadStart) == null || D.call(
           e,
           l,
           n.value,
           v.compress
         );
-        const o = await Le(i, {
-          maxSize: C.value.maxSize,
-          size: C.value.size,
-          excludeAllowedTypes: (P = C.value.excludeAllowedTypes) == null ? void 0 : P.map((x) => `image/${x}`)
+        const o = await ke(r, {
+          maxSize: y.value.maxSize,
+          size: y.value.size,
+          excludeAllowedTypes: (G = y.value.excludeAllowedTypes) == null ? void 0 : G.map((x) => `image/${x}`)
         });
-        if (c.value = void 0, (q = e == null ? void 0 : e.onInnerBeforeUploadEnd) == null || q.call(
+        if (c.value = void 0, (J = e == null ? void 0 : e.onInnerBeforeUploadEnd) == null || J.call(
           e,
           l,
           n.value,
@@ -201,12 +199,12 @@ const We = /* @__PURE__ */ me({
             errorMessage: o == null ? void 0 : o.errorMessage
           }
         ), !o.success)
-          return (D = C.value) != null && D.showErrorMessage && g.error((o == null ? void 0 : o.errorMessage) || "图片压缩失败"), u();
-        i = new File([o.file], d, {
+          return (K = y.value) != null && K.showErrorMessage && g.error((o == null ? void 0 : o.errorMessage) || "图片压缩失败"), d();
+        r = new File([o.file], t, {
           type: o.file.type
         });
       }
-      c.value = void 0, (G = e == null ? void 0 : e.onInnerBeforeUploadEnd) == null || G.call(
+      c.value = void 0, (X = e == null ? void 0 : e.onInnerBeforeUploadEnd) == null || X.call(
         e,
         l,
         n.value,
@@ -214,10 +212,10 @@ const We = /* @__PURE__ */ me({
         {
           success: !0
         }
-      ), t(i);
+      ), i(r);
     });
     let I;
-    return K(
+    Z(
       () => c.value,
       () => {
         var a;
@@ -227,66 +225,69 @@ const We = /* @__PURE__ */ me({
           duration: 0
         }) : (a = I == null ? void 0 : I.close) == null || a.call(I);
       }
-    ), ae({
+    );
+    const pe = w(() => u.value.every((a) => a.status && ["done", "error"].includes(a.status)));
+    return oe({
       uploadInsRef: S,
-      cropperInsRef: $
+      cropperInsRef: $,
+      isUploadComplete: pe
     }), (a, l) => {
-      var u, d;
-      const t = he("a-upload");
-      return X(), Ie("div", null, [
-        xe(t, {
-          class: Ce([`${Oe}-upload`]),
+      var d, t;
+      const i = Ue("a-upload");
+      return N(), Ce("div", null, [
+        ye(i, {
+          class: Ee([`${ze}-upload`]),
           ref_key: "uploadInsRef",
           ref: S,
           "list-type": "picture-card",
           tip: a.tip || "上传",
           "image-preview": "",
-          "file-list": r.value,
-          "onUpdate:fileList": l[0] || (l[0] = (i) => r.value = i),
+          "file-list": u.value,
+          "onUpdate:fileList": l[0] || (l[0] = (r) => u.value = r),
           action: a.action,
           headers: a.headers,
           data: a.data,
           name: a.name,
-          accept: ne.value,
+          accept: ie.value,
           multiple: a.multiple,
           limit: a.limit,
           disabled: a.disabled,
-          "on-before-upload": te,
-          "on-before-remove": ie,
-          onExceedLimit: re,
-          onSuccess: ue,
-          onError: de
-        }, Be({ _: 2 }, [
-          (u = Z(O)) != null && u.image ? {
+          "on-before-upload": re,
+          "on-before-remove": ue,
+          onExceedLimit: de,
+          onSuccess: se,
+          onError: ce
+        }, Me({ _: 2 }, [
+          (d = R(O)) != null && d.image ? {
             name: "image",
-            fn: Y(({ fileItem: i }) => [
-              A(a.$slots, "image", { fileItem: i })
+            fn: A(({ fileItem: r }) => [
+              _(a.$slots, "image", { fileItem: r })
             ]),
             key: "0"
           } : void 0,
-          (d = Z(O)) != null && d["upload-button"] ? {
+          (t = R(O)) != null && t["upload-button"] ? {
             name: "upload-button",
-            fn: Y(() => [
-              A(a.$slots, "upload-button")
+            fn: 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, {
+        p.value && n.value !== void 0 ? (N(), Be(Se, {
           key: 0,
           ref_key: "cropperInsRef",
           ref: $,
           file: p.value.file,
           index: n.value,
           options: B.value,
-          onCancel: ce,
-          onConfirm: fe,
-          onImgLoad: ve
-        }, null, 8, ["file", "index", "options"])) : ye("", !0)
+          onCancel: ve,
+          onConfirm: me,
+          onImgLoad: ge
+        }, null, 8, ["file", "index", "options"])) : we("", !0)
       ]);
     };
   }
 });
 export {
-  We as default
+  qe as default
 };

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

@@ -521,6 +521,7 @@ declare const ProImageUpload: {
             listType: import('@arco-design/web-vue/es/upload/interfaces').ListType;
         }> | undefined>;
         cropperInsRef: import('vue').Ref<any, any>;
+        isUploadComplete: import('vue').ComputedRef<boolean>;
     }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
         "update:modelValue": (value: import('@arco-design/web-vue').FileItem[]) => any;
     } & {
@@ -528,9 +529,9 @@ declare const ProImageUpload: {
     }, import('vue').PublicProps, {
         name: string;
         accept: string[];
+        disabled: boolean;
         multiple: boolean;
         singleLimit: number;
-        disabled: boolean;
         hideInnerBeforeUploadLoading: boolean;
     }, false, {}, {}, import('vue').GlobalComponents, import('vue').GlobalDirectives, string, {
         uploadInsRef: unknown;
@@ -1099,12 +1100,13 @@ declare const ProImageUpload: {
             listType: import('@arco-design/web-vue/es/upload/interfaces').ListType;
         }> | undefined>;
         cropperInsRef: import('vue').Ref<any, any>;
+        isUploadComplete: import('vue').ComputedRef<boolean>;
     }, {}, {}, {}, {
         name: string;
         accept: string[];
+        disabled: boolean;
         multiple: boolean;
         singleLimit: number;
-        disabled: boolean;
         hideInnerBeforeUploadLoading: boolean;
     }>;
     __isFragment?: never;
@@ -1631,6 +1633,7 @@ declare const ProImageUpload: {
         listType: import('@arco-design/web-vue/es/upload/interfaces').ListType;
     }> | undefined>;
     cropperInsRef: import('vue').Ref<any, any>;
+    isUploadComplete: import('vue').ComputedRef<boolean>;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     "update:modelValue": (value: import('@arco-design/web-vue').FileItem[]) => any;
 } & {
@@ -1638,9 +1641,9 @@ declare const ProImageUpload: {
 }, string, {
     name: string;
     accept: string[];
+    disabled: boolean;
     multiple: boolean;
     singleLimit: number;
-    disabled: boolean;
     hideInnerBeforeUploadLoading: boolean;
 }, {}, string, {}, import('vue').GlobalComponents, import('vue').GlobalDirectives, string, import('vue').ComponentProvideOptions> & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps & (new () => {
     $slots: {

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

@@ -1,4 +1,4 @@
-import { FileItem } from '@arco-design/web-vue';
+import { FileItem, UploadInstance } from '@arco-design/web-vue';
 import { ImageUploadCheckOptions, ImageUploadCompressorOptions, ImageUploadCropOptions } from '@keyblade/one-travel';
 export declare enum EImageUploadInnerBeforeUploadStep {
     check = 1,
@@ -75,3 +75,19 @@ export interface ImageUploadOptions {
         errorMessage?: string;
     }) => void;
 }
+export interface ImageUploadBeforeUploadQueue {
+    file: File;
+    resolve: (file: File) => void;
+    reject: () => void;
+}
+/**
+ * 导出实例对象
+ */
+export interface ImageUploadRef {
+    /** 原始上传组件实例对象 */
+    uploadInsRef: UploadInstance;
+    /** 剪裁组件对象 */
+    cropperInsRef: any;
+    /** 是否上传完成 */
+    isUploadComplete: boolean;
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@keyblade/pro-components",
   "description": "KeyBlade Pro Components",
   "author": "yangshuai <704807396@qq.com>",
-  "version": "1.13.2",
+  "version": "1.13.4",
   "private": false,
   "type": "module",
   "main": "es/index.js",
@@ -26,7 +26,7 @@
     "vue-cropper": "^1.1.4",
     "vue-global-config": "^0.6.3",
     "dayjs": "^1.11.18",
-    "@keyblade/one-travel": "^3.0.1"
+    "@keyblade/one-travel": "^3.0.2"
   },
   "peerDependencies": {
     "vue": "^3.4.27"