@aplus-frontend/ui 7.10.4 → 7.10.5

package/es/src/business/ap-upload/apUpload.vue.mjs

@@ -1,4 +1,4 @@
-import { defineComponent as _, ref as m, computed as d, provide as t, createElementBlock as U, openBlock as c, normalizeClass as h, unref as r, createBlock as O, resolveDynamicComponent as R, mergeProps as z, createSlots as j, renderList as A, withCtx as $, renderSlot as k, normalizeProps as B, guardReactiveProps as T } from "vue";
+import { defineComponent as _, ref as m, computed as d, provide as t, createElementBlock as U, openBlock as c, normalizeClass as h, unref as r, createBlock as O, resolveDynamicComponent as R, mergeProps as k, createSlots as z, renderList as j, withCtx as A, renderSlot as $, normalizeProps as B, guardReactiveProps as T } from "vue";
 import { Form as w } from "@aplus-frontend/antdv";
 import "../../config-provider/index.mjs";
 import "./components/MultipleFile.vue.mjs";
@@ -92,22 +92,26 @@ const K = ["id"], me = /* @__PURE__ */ _({
     baseDirName: {
       type: String,
       default: "Frontend-Upload"
+    },
+    bucket: {
+      type: String,
+      default: void 0
     }
   },
   emits: ["update:value"],
   setup(f, { expose: g, emit: v }) {
     const { t: n, lang: y } = q();
     L(n), D(n, y);
-    const { b: C } = P("ap-upload"), S = I("ap-upload"), s = m(null), e = f, b = v, x = {
+    const { b } = P("ap-upload"), C = I("ap-upload"), i = m(null), e = f, S = v, x = {
       singleFile: H,
       multipleFile: G,
       picture: V
-    }, i = w.useInjectFormItemContext(), F = d({
+    }, s = w.useInjectFormItemContext(), F = d({
       get() {
         return e.value;
       },
       set(o) {
-        b("update:value", o), i?.onFieldChange(), e.onChange?.(o);
+        S("update:value", o), s?.onFieldChange(), e.onChange?.(o);
       }
     }), a = J("apUpload");
     t("value", F), t("dirName", e.dirName ?? a.value?.dirName), t(
@@ -116,31 +120,31 @@ const K = ["id"], me = /* @__PURE__ */ _({
     ), t("accept", e.accept ?? a.value?.accept ?? ""), t("maxSize", e.maxSize), t("title", e.title), t("subTitle", e.subTitle), t("maxCount", e.maxCount), t("beforeUpload", e.beforeUpload), t("customRequest", e.customRequest), t("baseDirName", e.baseDirName ?? "Frontend-Upload"), t(
       "getOssAccess",
       e.getOssAccess ?? a.value?.getOssAccess
-    ), t("maxSizeErrorMsg", e.maxSizeErrorMsg), t("maxCountErrorMsg", e.maxCountErrorMsg), t("acceptErrorMsg", e.acceptErrorMsg), t("onRemove", e.onRemove), t("showUploadErrorMsg", e.showUploadErrorMsg);
+    ), t("maxSizeErrorMsg", e.maxSizeErrorMsg), t("maxCountErrorMsg", e.maxCountErrorMsg), t("acceptErrorMsg", e.acceptErrorMsg), t("onRemove", e.onRemove), t("showUploadErrorMsg", e.showUploadErrorMsg), t("bucket", e.bucket);
     const N = d(() => l.value === 0), l = m(0);
     t("uploadingCount", l);
     function E() {
-      p(void 0);
+      u(void 0);
     }
-    function p(o) {
-      s?.value?.setValue?.(o);
+    function u(o) {
+      i?.value?.setValue?.(o);
     }
     return g({
       done: N,
       clear: E,
-      setValue: p
+      setValue: u
     }), (o, Q) => (c(), U("div", {
-      id: r(i)?.id.value,
-      class: h([r(C)(), r(S)])
+      id: r(s)?.id.value,
+      class: h([r(b)(), r(C)])
     }, [
-      (c(), O(R(x[e.type]), z(o.$attrs, {
+      (c(), O(R(x[e.type]), k(o.$attrs, {
         ref_key: "uploadRef",
-        ref: s
-      }), j({ _: 2 }, [
-        A(Object.keys(o.$slots), (u) => ({
-          name: u,
-          fn: $((M) => [
-            k(o.$slots, u, B(T(M || {})))
+        ref: i
+      }), z({ _: 2 }, [
+        j(Object.keys(o.$slots), (p) => ({
+          name: p,
+          fn: A((M) => [
+            $(o.$slots, p, B(T(M || {})))
           ])
         }))
       ]), 1040))

package/es/src/business/ap-upload/components/MultipleFile.vue2.mjs

@@ -1,93 +1,93 @@
-import { defineComponent as X, inject as a, ref as Y, watch as Z, nextTick as ee, createElementBlock as U, openBlock as w, normalizeClass as oe, unref as s, createVNode as x, withCtx as k, createElementVNode as I, createTextVNode as te, toDisplayString as M, withModifiers as ae, createCommentVNode as se, createBlock as ne, resolveDynamicComponent as re } from "vue";
-import { UploadOutlined as le, VerticalAlignBottomOutlined as ie } from "@ant-design/icons-vue";
-import { message as c, Upload as ue, Button as ce } from "@aplus-frontend/antdv";
+import { defineComponent as Y, inject as a, ref as Z, watch as ee, nextTick as oe, createElementBlock as b, openBlock as x, normalizeClass as te, unref as n, createVNode as y, withCtx as U, createElementVNode as S, createTextVNode as ae, toDisplayString as L, withModifiers as se, createCommentVNode as ne, createBlock as re, resolveDynamicComponent as le } from "vue";
+import { UploadOutlined as ie, VerticalAlignBottomOutlined as ce } from "@ant-design/icons-vue";
+import { message as p, Upload as ue, Button as pe } from "@aplus-frontend/antdv";
 import "../../../config-provider/index.mjs";
-import { useOss as pe, getOssInstance as S } from "../hooks/useOss.mjs";
-import de from "../style/index.mjs";
-import { fileMatchesAccept as me, getAcceptText as fe } from "../utils/accept.mjs";
-import { getPath as ge, getName as he, getReturnData as L } from "../utils/returnData.mjs";
-import { useGlobalConfig as ve } from "../../../config-provider/hooks/use-global-config.mjs";
-import { useLocale as we } from "../../../config-provider/hooks/use-locale.mjs";
-import { useNamespace as xe } from "../../../config-provider/hooks/use-namespace.mjs";
-const ye = { class: "multiple-file-context" }, Ce = { key: 0 }, Ue = { key: 1 }, Le = /* @__PURE__ */ X({
+import { useOss as de, getOssInstance as z } from "../hooks/useOss.mjs";
+import me from "../style/index.mjs";
+import { fileMatchesAccept as fe, getAcceptText as ge } from "../utils/accept.mjs";
+import { getPath as he, getName as ve, getReturnData as B } from "../utils/returnData.mjs";
+import { useGlobalConfig as we } from "../../../config-provider/hooks/use-global-config.mjs";
+import { useLocale as xe } from "../../../config-provider/hooks/use-locale.mjs";
+import { useNamespace as ye } from "../../../config-provider/hooks/use-namespace.mjs";
+const ke = { class: "multiple-file-context" }, Ce = { key: 0 }, be = { key: 1 }, ze = /* @__PURE__ */ Y({
   __name: "MultipleFile",
-  setup(ke, { expose: z }) {
-    const E = ve(
+  setup(Ue, { expose: D }) {
+    const N = we(
       "downloadCenterTriggerConfig"
-    ), { t: r } = we(), { b: B } = xe("ap-upload-multiple-file"), D = de("ap-upload"), { put: O } = pe(), P = a("dirName"), V = a("baseDirName"), y = a("accept") || "*", N = a("maxSize") ?? 500, q = a("title") || r("ap.apUpload.uploadFile"), m = a("subTitle"), l = a("maxCount") ?? 10, p = a("uploadingCount"), b = a("beforeUpload"), _ = a("customRequest"), F = a("getOssAccess"), j = a("maxSizeErrorMsg"), $ = a("maxCountErrorMsg"), G = a("acceptErrorMsg"), T = a("onRemove"), C = a("showUploadErrorMsg"), n = a("value"), i = [], f = a("needName"), d = Y(null);
-    Z(
-      () => n?.value,
+    ), { t: l } = xe(), { b: O } = ye("ap-upload-multiple-file"), P = me("ap-upload"), { put: V } = de(), q = a("dirName"), j = a("baseDirName"), k = a("accept") || "*", E = a("maxSize") ?? 500, $ = a("title") || l("ap.apUpload.uploadFile"), f = a("subTitle"), i = a("maxCount") ?? 10, d = a("uploadingCount"), _ = a("beforeUpload"), F = a("customRequest"), g = a("getOssAccess"), G = a("maxSizeErrorMsg"), W = a("maxCountErrorMsg"), H = a("acceptErrorMsg"), T = a("onRemove"), C = a("showUploadErrorMsg"), A = a("bucket"), r = a("value"), c = [], h = a("needName"), m = Z(null);
+    ee(
+      () => r?.value,
       function(e) {
-        !d?.value?.fileList?.length && e && A(e);
+        !m?.value?.fileList?.length && e && R(e);
       },
       { immediate: !0 }
     );
-    function A(e) {
+    function R(e) {
       if (!e) {
-        u = [], d.value.fileList = [], n.value = void 0, i.splice(0, i.length);
+        u = [], m.value.fileList = [], r.value = void 0, c.splice(0, c.length);
         return;
       }
-      ee(() => {
+      oe(() => {
         const o = e.map((t) => {
-          const h = ge(f, t), Q = he(f, t), v = new File(
+          const s = he(h, t), M = ve(h, t), w = new File(
             [t],
-            Q,
+            M,
             {}
           );
-          return v.response = h, v.uid = h, v.status = "done", v;
+          return w.response = s, w.uid = s, w.status = "done", w;
         });
-        if (l && o.length > l) {
-          c.warning(
-            r("ap.apUpload.fileInitializationException", {
-              maxCount: l
+        if (i && o.length > i) {
+          p.warning(
+            l("ap.apUpload.fileInitializationException", {
+              maxCount: i
             })
           );
           return;
         }
         o.forEach((t) => {
-          u.push(t), i.push({
+          u.push(t), c.push({
             uid: t.uid,
             path: t.response
           });
-        }), d.value.fileList = o, n.value = e;
+        }), m.value.fileList = o, r.value = e;
       });
     }
-    z({ setValue: A });
-    let u = [], R;
-    function g(e) {
+    D({ setValue: R });
+    let u = [], I;
+    function v(e) {
       setTimeout(() => {
-        const o = d.value.fileList.findIndex(
+        const o = m.value.fileList.findIndex(
           (t) => t.uid === e.uid
         );
-        o >= 0 && d.value.fileList.splice(o, 1);
+        o >= 0 && m.value.fileList.splice(o, 1);
       });
     }
-    async function W(e) {
-      if (l && l > 1 && u.length >= l)
-        return clearTimeout(R), R = setTimeout(() => {
-          c.warning(
-            $ || r("ap.apUpload.maxUploadFiles", {
-              maxCount: l
+    async function J(e) {
+      if (i && i > 1 && u.length >= i)
+        return clearTimeout(I), I = setTimeout(() => {
+          p.warning(
+            W || l("ap.apUpload.maxUploadFiles", {
+              maxCount: i
             })
           );
-        }), g(e), !1;
-      if (e.size > N * 1024 * 1024)
-        return c.warning(
-          j || r("ap.apUpload.maxUploadFileSize", {
-            maxSize: N
+        }), v(e), !1;
+      if (e.size > E * 1024 * 1024)
+        return p.warning(
+          G || l("ap.apUpload.maxUploadFileSize", {
+            maxSize: E
           })
-        ), g(e), !1;
-      if (!me(e, y))
-        return c.warning(
-          G || r("ap.apUpload.fileFormatNotSupported")
-        ), g(e), !1;
-      if (typeof b == "function" && await b(e) === !1)
-        return g(e), !1;
-      l && l === 1 && (u = [], n.value = void 0), u.push(e);
+        ), v(e), !1;
+      if (!fe(e, k))
+        return p.warning(
+          H || l("ap.apUpload.fileFormatNotSupported")
+        ), v(e), !1;
+      if (typeof _ == "function" && await _(e) === !1)
+        return v(e), !1;
+      i && i === 1 && (u = [], r.value = void 0), u.push(e);
     }
-    async function H(e) {
-      if (p.value++, typeof _ == "function") {
-        _({
+    async function K(e) {
+      if (d.value++, typeof F == "function") {
+        F({
           onProgress: (o) => {
             setTimeout(() => {
               e.onProgress({
@@ -96,70 +96,71 @@ const ye = { class: "multiple-file-context" }, Ce = { key: 0 }, Ue = { key: 1 },
             });
           },
           onError: (o) => {
-            C && c.warning(o || r("ap.apUpload.networkAnomaly")), setTimeout(() => {
+            C && p.warning(o || l("ap.apUpload.networkAnomaly")), setTimeout(() => {
               e.onError({
                 name: o,
                 message: o
               });
-            }), p.value--;
+            }), d.value--;
           },
           onSuccess: (o) => {
             setTimeout(() => {
               e.onSuccess(o);
-            }), n.value = [
-              ...n.value || [],
-              L(f, o, e.file.name)
-            ], i.push({
+            }), r.value = [
+              ...r.value || [],
+              B(h, o, e.file.name)
+            ], c.push({
               uid: e.file.uid,
               path: o
-            }), p.value--;
+            }), d.value--;
           },
           file: e.file
         });
         return;
       }
       try {
-        const o = await S(F);
-        e.file.oss = o, O({
+        const o = await (A ? g(A) : g()), t = await z(async () => o);
+        e.file.oss = t, V({
           file: e.file,
-          dirName: P,
-          oss: o,
-          successCallBack(t) {
-            e.onSuccess(t), n.value = [
-              ...n.value || [],
-              L(f, t, e.file.name)
-            ], i.push({
+          dirName: q,
+          oss: t,
+          successCallBack(s) {
+            e.onSuccess(s), r.value = [
+              ...r.value || [],
+              B(h, s, e.file.name)
+            ], c.push({
               uid: e.file.uid,
-              path: t
-            }), p.value--;
+              path: s
+            }), d.value--;
           },
-          errorCallBack(t) {
-            C && c.warning(t || r("ap.apUpload.networkAnomaly")), e.onError({
-              name: t,
-              message: t
-            }), p.value--;
+          errorCallBack(s) {
+            C && p.warning(s || l("ap.apUpload.networkAnomaly")), e.onError({
+              name: s,
+              message: s
+            }), d.value--;
           },
-          progressCallBack(t) {
+          progressCallBack(s) {
             e.onProgress({
-              percent: t
+              percent: s
             });
           },
-          baseDirName: V
+          baseDirName: j,
+          bucket: o?.bucket
         });
       } catch (o) {
-        C && c.warning(
-          typeof o?.message == "string" ? o.message : r("ap.apUpload.networkAnomaly")
+        C && p.warning(
+          typeof o?.message == "string" ? o.message : l("ap.apUpload.networkAnomaly")
         ), e.onError({
-          name: o?.message || r("ap.apUpload.networkAnomaly"),
-          message: o?.message || r("ap.apUpload.networkAnomaly")
-        }), p.value--;
+          name: o?.message || l("ap.apUpload.networkAnomaly"),
+          message: o?.message || l("ap.apUpload.networkAnomaly")
+        }), d.value--;
       }
     }
-    function J(e) {
+    function Q(e) {
       if (T && T?.(e), e.response) {
-        if (Array.isArray(n.value)) {
-          const t = i.findIndex((h) => h.uid === e.uid);
-          t >= 0 && (n?.value.splice(t, 1), i.splice(t, 1)), n.value.length === 0 && (n.value = void 0);
+        if (Array.isArray(r.value)) {
+          const t = c.findIndex((s) => s.uid === e.uid);
+          t >= 0 && (r?.value.splice(t, 1), c.splice(t, 1)), r.value.length === 0 && (r.value = void 0);
         }
       } else
         e?.oss?.pauseUpload();
@@ -168,64 +169,68 @@ const ye = { class: "multiple-file-context" }, Ce = { key: 0 }, Ue = { key: 1 },
       );
       return u.splice(o, 1), Promise.resolve(!0);
     }
-    const K = async (e) => {
-      if (E.value?.trigger) {
+    const X = async (e) => {
+      if (N.value?.trigger) {
         let o = [e].map((t) => ({
           objectName: t.response,
           fileName: t.name
         }));
-        E.value?.trigger?.(o);
-      } else
-        (await S(F)).downloadFile([
+        N.value?.trigger?.(o);
+      } else {
+        const o = e.response?.match(/^([^:]+):(.*)$/), t = o?.[1], s = o?.[2] ?? e.response;
+        (await z(
+          () => t ? g?.(t) : g?.()
+        )).downloadFile([
           {
-            path: e.response,
+            path: s,
             fileName: e.name
           }
         ]);
+      }
     };
-    return (e, o) => (w(), U("div", {
-      class: oe({
-        [s(B)()]: !0,
-        [s(D) ?? ""]: !0
+    return (e, o) => (x(), b("div", {
+      class: te({
+        [n(O)()]: !0,
+        [n(P) ?? ""]: !0
       })
     }, [
-      x(s(ue), {
+      y(n(ue), {
         ref_key: "uploadRef",
-        ref: d,
-        accept: s(y),
+        ref: m,
+        accept: n(k),
         multiple: "",
-        "max-count": s(l),
+        "max-count": n(i),
         progress: {
           strokeWidth: 3,
           showInfo: !1,
           strokeColor: "#0070FF"
         },
-        "before-upload": W,
-        "custom-request": H,
+        "before-upload": J,
+        "custom-request": K,
         "show-upload-list": { showDownloadIcon: !0, showRemoveIcon: !0 },
-        onRemove: J,
-        onDownload: K
+        onRemove: Q,
+        onDownload: X
       }, {
-        downloadIcon: k(() => [
-          x(s(ie))
+        downloadIcon: U(() => [
+          y(n(ce))
         ]),
-        default: k(() => [
-          I("div", ye, [
-            x(s(ce), { class: "file-btn" }, {
-              default: k(() => [
-                x(s(le)),
-                te(" " + M(s(q)), 1)
+        default: U(() => [
+          S("div", ke, [
+            y(n(pe), { class: "file-btn" }, {
+              default: U(() => [
+                y(n(ie)),
+                ae(" " + L(n($)), 1)
               ]),
               _: 1
             }),
-            I("div", {
+            S("div", {
               class: "sub-title",
-              onClick: o[0] || (o[0] = ae(() => {
+              onClick: o[0] || (o[0] = se(() => {
               }, ["stop"]))
             }, [
-              typeof s(m) == "string" ? (w(), U("div", Ce, M(s(m) || `${s(r)("ap.apUpload.supportExtension")}：${s(fe)(s(y))}`), 1)) : s(m) ? (w(), U("div", Ue, [
-                (w(), ne(re(s(m))))
-              ])) : se("", !0)
+              typeof n(f) == "string" ? (x(), b("div", Ce, L(n(f) || `${n(l)("ap.apUpload.supportExtension")}：${n(ge)(n(k))}`), 1)) : n(f) ? (x(), b("div", be, [
+                (x(), re(le(n(f))))
+              ])) : ne("", !0)
             ])
           ])
         ]),
@@ -235,5 +240,5 @@ const ye = { class: "multiple-file-context" }, Ce = { key: 0 }, Ue = { key: 1 },
   }
 });
 export {
-  Le as default
+  ze as default
 };