@keyblade/pro-components 1.13.2 → 1.13.3

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,13 +1,13 @@
-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 ge, mergeModels as J, useSlots as pe, useModel as he, ref as m, computed as w, watch as K, resolveComponent as Ie, createElementBlock as xe, openBlock as X, createVNode as Ue, createBlock as ye, createCommentVNode as Ce, normalizeClass as Be, createSlots as we, 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 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";
+import Ee from "./cropper.vue.js";
+import { defaultImageUploadCheckOptions as Me, defaultImageUploadCompressorOptions as Se, defaultImageUploadCropOptions as be, oneTravelImageCheckAndTransform as Le, oneTravelImageCompressor as Oe } from "@keyblade/one-travel";
+const $e = "keyblade-pro-image-upload";
 var R, _, ee;
-const We = /* @__PURE__ */ me({
+const He = /* @__PURE__ */ ge({
   __name: "image-upload",
   props: /* @__PURE__ */ J({
     action: {},
@@ -41,18 +41,16 @@ const We = /* @__PURE__ */ me({
   }),
   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) => {
+    const O = pe(), r = he(y, "modelValue"), e = y, oe = le, S = m(), $ = m(), p = m(), h = m([]), n = m(), c = m(), s = m(), ne = w(() => e.accept.map((a) => `.${a}`).join(",")), f = w(() => L([e.checkOptions, Me]) || {}), C = w(() => L([e.compressorOptions, Se]) || {}), B = w(() => L([e.cropOptions, be]) || {}), 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) => {
+      }), 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 se(a));
         } catch {
-          E();
+          M();
         } finally {
           k();
         }
@@ -93,22 +91,22 @@ const We = /* @__PURE__ */ me({
       oe("cropperImgLoad", a);
     };
     K(n, async () => {
-      var w, E, b, F, z, j, Q, T, V, W, H, N, P, q, D, G;
+      var E, M, b, F, z, j, Q, T, V, W, H, N, P, q, D, G;
       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) {
+      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 Le(l, l.name, {
           imageMaxSize: f.value.maxSize,
           imageAllowedType: f.value.allowedType,
           imageMinWidth: f.value.minWidth,
@@ -183,7 +181,7 @@ const We = /* @__PURE__ */ me({
           n.value,
           v.compress
         );
-        const o = await Le(i, {
+        const o = await Oe(i, {
           maxSize: C.value.maxSize,
           size: C.value.size,
           excludeAllowedTypes: (P = C.value.excludeAllowedTypes) == null ? void 0 : P.map((x) => `image/${x}`)
@@ -217,7 +215,7 @@ const We = /* @__PURE__ */ me({
       ), t(i);
     });
     let I;
-    return K(
+    K(
       () => c.value,
       () => {
         var a;
@@ -227,15 +225,18 @@ const We = /* @__PURE__ */ me({
           duration: 0
         }) : (a = I == null ? void 0 : I.close) == null || a.call(I);
       }
-    ), ae({
+    );
+    const me = w(() => r.value.every((a) => a.status && ["done", "error"].includes(a.status)));
+    return ae({
       uploadInsRef: S,
-      cropperInsRef: $
+      cropperInsRef: $,
+      isUploadComplete: me
     }), (a, l) => {
       var u, d;
-      const t = he("a-upload");
-      return X(), Ie("div", null, [
-        xe(t, {
-          class: Ce([`${Oe}-upload`]),
+      const t = Ie("a-upload");
+      return X(), xe("div", null, [
+        Ue(t, {
+          class: Be([`${$e}-upload`]),
           ref_key: "uploadInsRef",
           ref: S,
           "list-type": "picture-card",
@@ -256,7 +257,7 @@ const We = /* @__PURE__ */ me({
           onExceedLimit: re,
           onSuccess: ue,
           onError: de
-        }, Be({ _: 2 }, [
+        }, we({ _: 2 }, [
           (u = Z(O)) != null && u.image ? {
             name: "image",
             fn: Y(({ fileItem: i }) => [
@@ -272,7 +273,7 @@ const We = /* @__PURE__ */ me({
             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 ? (X(), ye(Ee, {
           key: 0,
           ref_key: "cropperInsRef",
           ref: $,
@@ -282,11 +283,11 @@ const We = /* @__PURE__ */ me({
           onCancel: ce,
           onConfirm: fe,
           onImgLoad: ve
-        }, null, 8, ["file", "index", "options"])) : ye("", !0)
+        }, null, 8, ["file", "index", "options"])) : Ce("", !0)
       ]);
     };
   }
 });
 export {
-  We as default
+  He 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.3",
   "private": false,
   "type": "module",
   "main": "es/index.js",