@keyblade/pro-components 1.12.6 → 1.12.8

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

@@ -1,9 +1,9 @@
-import { defineComponent as se, mergeModels as G, useModel as ce, ref as m, computed as M, watch as J, resolveComponent as fe, openBlock as K, createElementBlock as ve, createVNode as me, normalizeClass as ge, createBlock as pe, createCommentVNode as Ie } from "vue";
-import { Message as x } from "@arco-design/web-vue";
+import { defineComponent as se, mergeModels as G, useModel as ce, ref as m, computed as M, watch as J, resolveComponent as fe, openBlock as K, createElementBlock as ve, createVNode as me, normalizeClass as ge, createBlock as pe, createCommentVNode as he } 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 he from "./cropper.vue.js";
+import Ie from "./cropper.vue.js";
 import { defaultImageUploadCheckOptions as xe, defaultImageUploadCompressorOptions as Ue, defaultImageUploadCropOptions as Ce, oneTravelImageCheckAndTransform as ye, oneTravelImageCompressor as Be } from "@keyblade/one-travel";
 const Ee = "keyblade-pro-image-upload";
 var X, Y, Z;
@@ -40,14 +40,14 @@ const Fe = /* @__PURE__ */ se({
   }),
   emits: /* @__PURE__ */ G(["cropperImgLoad"], ["update:modelValue"]),
   setup(C, { expose: A, emit: R }) {
-    const i = ce(C, "modelValue"), e = C, _ = R, S = m(), O = m(), g = m(), p = m(
+    const i = ce(C, "modelValue"), e = C, _ = R, S = m(), O = m(), p = m(), h = m(
       []
-    ), n = m(), c = m(), d = m(), ee = M(() => e.accept.map((a) => `.${a}`).join(",")), f = M(() => L([e.checkOptions, xe]) || {}), y = M(() => L([e.compressorOptions, Ue]) || {}), B = M(() => L([e.cropOptions, Ce]) || {}), ae = (a) => {
-      var t, r, s, u;
-      const l = (u = (s = (r = (t = S.value) == null ? void 0 : t.$el) == null ? void 0 : r.querySelector) == null ? void 0 : s.call(r, "input")) == null ? void 0 : u.files;
-      return l && l.length > 0 && (d.value = {
+    ), n = m(), c = m(), s = m(), ee = M(() => e.accept.map((a) => `.${a}`).join(",")), f = M(() => L([e.checkOptions, xe]) || {}), y = M(() => L([e.compressorOptions, Ue]) || {}), B = M(() => L([e.cropOptions, Ce]) || {}), ae = (a) => {
+      var t, r, d, u;
+      const l = (u = (d = (r = (t = S.value) == null ? void 0 : t.$el) == null ? void 0 : r.querySelector) == null ? void 0 : d.call(r, "input")) == null ? void 0 : u.files;
+      return l && l.length > 0 && (s.value = {
         selectCount: l.length
-      }), e != null && e.onBeforeUpload ? e == null ? void 0 : e.onBeforeUpload(a) : d.value && (e != null && e.singleLimit) && d.value.selectCount > (e == null ? void 0 : e.singleLimit) ? (d.value.handleIndex === void 0 ? (d.value.handleIndex = 0, x.error(`单次最多可选择${e == null ? void 0 : e.singleLimit}张图片`)) : d.value.handleIndex += 1, d.value.handleIndex === d.value.selectCount - 1 && (d.value = void 0), !1) : new Promise(async (E, w) => {
+      }), 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, w) => {
         try {
           E(await ie(a));
         } catch {
@@ -60,7 +60,7 @@ const Fe = /* @__PURE__ */ se({
       const l = i.value.findIndex((t) => t.uid === a.uid);
       return i.value.splice(l, 1), i.value = [...i.value], !1;
     }, oe = (a, l) => {
-      e != null && e.onExceed ? e == null || e.onExceed(a, l) : (x.error(`单次最多可选择${(e == null ? void 0 : e.limit) || 1}张图片`), i.value = a);
+      e != null && e.onExceed ? e == null || e.onExceed(a, l) : (g.error(`单次最多可选择${(e == null ? void 0 : e.limit) || 1}张图片`), i.value = a);
     }, ne = async (a) => {
       if (e != null && e.onSuccess)
         e == null || e.onSuccess(a);
@@ -79,24 +79,24 @@ const Fe = /* @__PURE__ */ se({
         i.value.splice(l, 1);
       });
     }, ie = (a) => new Promise((l, t) => {
-      p.value.push({ file: a, resolve: l, reject: t }), p.value.length === 1 && !n.value && $();
+      h.value.push({ file: a, resolve: l, reject: t }), h.value.length === 1 && !n.value && $();
     }), $ = () => {
-      n.value === void 0 ? n.value = 0 : n.value + 1 >= p.value.length ? (n.value = void 0, p.value = []) : n.value += 1;
+      n.value === void 0 ? n.value = 0 : n.value + 1 >= h.value.length ? (n.value = void 0, h.value = []) : n.value += 1;
     }, re = () => {
       var a;
-      (a = g.value) == null || a.reject();
+      (a = p.value) == null || a.reject();
     }, ue = (a) => {
       var l;
-      (l = g.value) == null || l.resolve(a);
+      (l = p.value) == null || l.resolve(a);
     }, de = (a) => {
       _("cropperImgLoad", a);
     };
     J(n, async () => {
-      var E, w, b, k, F, z, j, Q, V, H, W, N, P, T, q, D;
-      if (n.value === void 0 || p.value.length === 0)
+      var E, w, b, k, F, z, j, Q, V, W, H, N, P, T, q, D;
+      if (n.value === void 0 || h.value.length === 0)
         return;
-      const a = p.value[n.value], { file: l, resolve: t, reject: r } = a;
-      let s = l.name, u = l;
+      const a = h.value[n.value], { file: l, resolve: t, reject: r } = a;
+      let d = l.name, u = l;
       if ((E = f.value) != null && E.enable) {
         c.value = {
           loading: !0,
@@ -126,16 +126,16 @@ const Fe = /* @__PURE__ */ se({
             errorMessage: o == null ? void 0 : o.errorMessage
           }
         ), !o.success)
-          return (k = f.value) != null && k.showErrorMessage && x.error((o == null ? void 0 : o.errorMessage) || "图片校验及转换失败"), r();
+          return (k = f.value) != null && k.showErrorMessage && g.error((o == null ? void 0 : o.errorMessage) || "图片校验及转换失败"), r();
         if (o != null && o.hasTransform) {
-          const h = s == null ? void 0 : s.split(".");
-          h.pop(), s = `${h.join(",")}.jpg`, u = new File([o.file], s, {
+          const x = d == null ? void 0 : d.split(".");
+          x.pop(), d = `${x.join(",")}.jpg`, u = new File([o.file], d, {
             type: o.file.type
           });
         } else
           u = o.file;
       }
-      if ((F = B.value) != null && F.enable) {
+      if ((F = B.value) != null && F.enable && !d.endsWith(".gif")) {
         (z = e == null ? void 0 : e.onInnerBeforeUploadStart) == null || z.call(
           e,
           l,
@@ -143,8 +143,8 @@ const Fe = /* @__PURE__ */ se({
           v.crop
         );
         try {
-          (j = B.value) != null && j.customCrop ? u = await B.value.customCrop(u) : u = await new Promise((o, h) => {
-            g.value = { file: u, resolve: o, reject: h };
+          (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(
             e,
             l,
@@ -167,12 +167,12 @@ const Fe = /* @__PURE__ */ se({
               },
               errorMessage: "图片剪裁失败"
             }
-          ), (H = B.value) != null && H.showErrorMessage && x.error("图片剪裁失败"), r();
+          ), (W = B.value) != null && W.showErrorMessage && g.error("图片剪裁失败"), r();
         } finally {
-          g.value = void 0;
+          p.value = void 0;
         }
       }
-      if ((W = y.value) != null && W.enable) {
+      if ((H = y.value) != null && H.enable) {
         c.value = {
           loading: !0,
           text: `第${n.value + 1}张图片处理中，请稍等`
@@ -185,7 +185,7 @@ const Fe = /* @__PURE__ */ se({
         const o = await Be(u, {
           maxSize: y.value.maxSize,
           size: y.value.size,
-          excludeAllowedTypes: (P = y.value.excludeAllowedTypes) == null ? void 0 : P.map((h) => `image/${h}`)
+          excludeAllowedTypes: (P = y.value.excludeAllowedTypes) == null ? void 0 : P.map((x) => `image/${x}`)
         });
         if (c.value = void 0, (T = e == null ? void 0 : e.onInnerBeforeUploadEnd) == null || T.call(
           e,
@@ -200,8 +200,8 @@ const Fe = /* @__PURE__ */ se({
             errorMessage: o == null ? void 0 : o.errorMessage
           }
         ), !o.success)
-          return (q = y.value) != null && q.showErrorMessage && x.error((o == null ? void 0 : o.errorMessage) || "图片压缩失败"), r();
-        u = new File([o.file], s, {
+          return (q = y.value) != null && q.showErrorMessage && g.error((o == null ? void 0 : o.errorMessage) || "图片压缩失败"), r();
+        u = new File([o.file], d, {
           type: o.file.type
         });
       }
@@ -220,7 +220,7 @@ const Fe = /* @__PURE__ */ se({
       () => c.value,
       () => {
         var a;
-        c.value ? I = x.loading({
+        c.value ? I = g.loading({
           content: c.value.text,
           id: "image-upload-id",
           duration: 0
@@ -255,17 +255,17 @@ const Fe = /* @__PURE__ */ se({
           onSuccess: ne,
           onError: te
         }, null, 8, ["class", "tip", "file-list", "action", "headers", "data", "name", "accept", "multiple", "limit", "disabled"]),
-        g.value && n.value !== void 0 ? (K(), pe(he, {
+        p.value && n.value !== void 0 ? (K(), pe(Ie, {
           key: 0,
           ref_key: "cropperInsRef",
           ref: O,
-          file: g.value.file,
+          file: p.value.file,
           index: n.value,
           options: B.value,
           onCancel: re,
           onConfirm: ue,
           onImgLoad: de
-        }, null, 8, ["file", "index", "options"])) : Ie("", !0)
+        }, null, 8, ["file", "index", "options"])) : he("", !0)
       ]);
     };
   }

package/package.json

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