@aplus-frontend/ui 7.10.3 → 7.10.5

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

@@ -1,228 +1,231 @@
-import { defineComponent as se, inject as o, ref as g, watch as re, computed as ie, createElementBlock as N, openBlock as h, normalizeClass as ce, unref as t, createElementVNode as r, createCommentVNode as E, toDisplayString as b, normalizeStyle as ue, createBlock as pe, withModifiers as de, createVNode as ve } from "vue";
-import { DeleteOutlined as fe } from "@ant-design/icons-vue";
-import { message as c, Progress as me } from "@aplus-frontend/antdv";
+import { defineComponent as re, inject as o, ref as h, watch as ce, computed as ie, createElementBlock as S, openBlock as k, normalizeClass as ue, unref as a, createElementVNode as r, createCommentVNode as E, toDisplayString as x, normalizeStyle as pe, createBlock as de, withModifiers as ve, createVNode as fe } from "vue";
+import { DeleteOutlined as me } from "@ant-design/icons-vue";
+import { message as p, Progress as ge } from "@aplus-frontend/antdv";
 import "../../../config-provider/index.mjs";
-import { useToken as ge } from "../../../config-provider/hooks/use-token.mjs";
-import $ from "../assets/single-file-icon.png.mjs";
-import { useOss as he, useOssInit as _e } from "../hooks/useOss.mjs";
-import ke from "../style/index.mjs";
-import { fileMatchesAccept as ye, getAcceptText as we } from "../utils/accept.mjs";
-import { getName as Ue, getReturnData as q } from "../utils/returnData.mjs";
-import { useLocale as De } from "../../../config-provider/hooks/use-locale.mjs";
-import { useNamespace as Ce } from "../../../config-provider/hooks/use-namespace.mjs";
-const Fe = ["accept"], Se = {
+import { useToken as he } from "../../../config-provider/hooks/use-token.mjs";
+import j from "../assets/single-file-icon.png.mjs";
+import { useOss as ke, getOssInstance as _e } from "../hooks/useOss.mjs";
+import ye from "../style/index.mjs";
+import { fileMatchesAccept as we, getAcceptText as Ue } from "../utils/accept.mjs";
+import { getName as De, getReturnData as G } from "../utils/returnData.mjs";
+import { useLocale as Ce } from "../../../config-provider/hooks/use-locale.mjs";
+import { useNamespace as be } from "../../../config-provider/hooks/use-namespace.mjs";
+const Fe = ["accept"], Ne = {
   key: 0,
   class: "state-un"
-}, Ne = ["src"], Ee = { class: "state-un-title" }, be = { class: "state-un-subtitle" }, xe = {
+}, Se = ["src"], Ee = { class: "state-un-title" }, xe = { class: "state-un-subtitle" }, ze = {
   key: 1,
   class: "state-ing"
-}, ze = { class: "left" }, Ae = ["src"], Re = { class: "center" }, Be = { class: "center-progress" }, Je = /* @__PURE__ */ se({
+}, Ae = { class: "left" }, Re = ["src"], Be = { class: "center" }, Me = { class: "center-progress" }, Ke = /* @__PURE__ */ re({
   __name: "SingleFile",
-  setup(Me, { expose: j }) {
-    const { t: s } = De(), { b: x } = Ce("ap-upload-single-file"), G = ke("ap-upload"), { put: W, client: z } = he(), H = o("dirName"), J = o("baseDirName"), _ = o("accept") || "*", k = o("maxSize") ?? 500, K = o("title") || s("ap.apUpload.clickOrDragUpload"), y = o("subTitle"), { token: A } = ge(), i = o("value"), w = o("needName"), u = o("uploadingCount"), R = o("beforeUpload"), B = o("customRequest"), Q = o("getOssAccess"), X = o("maxSizeErrorMsg"), Y = o("acceptErrorMsg"), M = o("onRemove"), U = o("showUploadErrorMsg"), l = g(null);
-    re(
-      () => i?.value,
+  setup(Pe, { expose: W }) {
+    const { t: s } = Ce(), { b: z } = be("ap-upload-single-file"), H = ye("ap-upload"), { put: J } = ke(), K = o("dirName"), Q = o("baseDirName"), _ = o("accept") || "*", y = o("maxSize") ?? 500, X = o("title") || s("ap.apUpload.clickOrDragUpload"), w = o("subTitle"), { token: A } = he(), c = o("value"), U = o("needName"), d = o("uploadingCount"), R = o("beforeUpload"), B = o("customRequest"), M = o("getOssAccess"), Y = o("maxSizeErrorMsg"), Z = o("acceptErrorMsg"), P = o("onRemove"), D = o("showUploadErrorMsg"), T = o("bucket"), n = h(null);
+    let O;
+    ce(
+      () => c?.value,
       function(e) {
-        l.value === null && e && P(e);
+        n.value === null && e && L(e);
       },
       { immediate: !0 }
     );
-    function P(e) {
+    function L(e) {
       e ? setTimeout(() => {
-        const a = Ue(w, e);
-        n.value = 3, l.value = new File([e], a, {}), i.value = e;
-      }) : (n.value = 1, l.value = null, i.value = void 0);
+        const t = De(U, e);
+        l.value = 3, n.value = new File([e], t, {}), c.value = e;
+      }) : (l.value = 1, n.value = null, c.value = void 0);
     }
-    j({ setValue: P });
-    const n = g(1), d = g(0), v = g(null), T = ie(() => l.value && i?.value);
-    function Z() {
-      n.value === 1 && v.value?.click();
+    W({ setValue: L });
+    const l = h(1), f = h(0), m = h(null), V = ie(() => n.value && c?.value);
+    function ee() {
+      l.value === 1 && m.value?.click();
     }
-    function O(e) {
+    function I(e) {
       e.preventDefault(), e.stopPropagation();
     }
-    function ee(e) {
+    function te(e) {
       e.dataTransfer.dropEffect = "copy", e.preventDefault(), e.stopPropagation();
     }
     function ae(e) {
-      L(e);
+      $(e);
     }
-    function te(e) {
-      if (e.preventDefault(), e.stopPropagation(), n.value !== 1)
+    function oe(e) {
+      if (e.preventDefault(), e.stopPropagation(), l.value !== 1)
         return;
-      var a = e.dataTransfer, f = [], V = 0, I = a.files.length;
-      function p() {
-        V === I - 1 && ae(f), V++;
+      var t = e.dataTransfer, u = [], i = 0, q = t.files.length;
+      function v() {
+        i === q - 1 && ae(u), i++;
       }
-      if (a.items !== void 0)
-        for (var D = 0; D < a.items.length; D++) {
-          var C = a.items[D];
-          if (C.kind === "file" && C.webkitGetAsEntry().isFile) {
-            var ne = C.getAsFile();
-            f.push(ne), p();
+      if (t.items !== void 0)
+        for (var C = 0; C < t.items.length; C++) {
+          var b = t.items[C];
+          if (b.kind === "file" && b.webkitGetAsEntry().isFile) {
+            var se = b.getAsFile();
+            u.push(se), v();
           }
         }
       else
-        for (let S = 0; S < I; S++) {
-          var m = a.files[S];
-          if (m.type)
-            f.push(m), p();
+        for (let N = 0; N < q; N++) {
+          var g = t.files[N];
+          if (g.type)
+            u.push(g), v();
           else
             try {
               var F = new FileReader();
-              F.readAsDataURL(m.slice(0, 3)), F.addEventListener(
+              F.readAsDataURL(g.slice(0, 3)), F.addEventListener(
                 "load",
                 function() {
-                  f.push(m), p();
+                  u.push(g), v();
                 },
                 !1
               ), F.addEventListener(
                 "error",
                 function() {
-                  c.warning(s("ap.apUpload.foldersNotSupported")), p();
+                  p.warning(s("ap.apUpload.foldersNotSupported")), v();
                 },
                 !1
               );
             } catch {
-              c.warning(s("ap.apUpload.foldersNotSupported")), p();
+              p.warning(s("ap.apUpload.foldersNotSupported")), v();
             }
         }
     }
-    async function oe(e) {
-      const a = e.target;
-      await L(a?.files), v.value && (v.value.value = "");
+    async function ne(e) {
+      const t = e.target;
+      await $(t?.files), m.value && (m.value.value = "");
     }
-    async function L(e) {
+    async function $(e) {
       if (e?.length) {
-        if (e[0].size > k * 1024 * 1024) {
-          c.warning(
-            X || s("ap.apUpload.maxUploadFileSize", {
-              maxSize: k
+        if (e[0].size > y * 1024 * 1024) {
+          p.warning(
+            Y || s("ap.apUpload.maxUploadFileSize", {
+              maxSize: y
             })
           );
           return;
         }
-        if (!ye(e[0], _)) {
-          c.warning(
-            Y || s("ap.apUpload.fileFormatNotSupported")
+        if (!we(e[0], _)) {
+          p.warning(
+            Z || s("ap.apUpload.fileFormatNotSupported")
           );
           return;
         }
         if (typeof R == "function" && await R(e[0]) === !1)
           return;
-        if (l.value = e[0], n.value = 2, d.value = 0, u.value++, typeof B == "function") {
+        if (n.value = e[0], l.value = 2, f.value = 0, d.value++, typeof B == "function") {
           B({
-            onProgress: (a) => {
-              d.value = a;
+            onProgress: (t) => {
+              f.value = t;
             },
-            onError: (a) => {
-              U && c.warning(a || s("ap.apUpload.networkAnomaly")), n.value = 1, l.value = null, u.value--;
+            onError: (t) => {
+              D && p.warning(t || s("ap.apUpload.networkAnomaly")), l.value = 1, n.value = null, d.value--;
             },
-            onSuccess: (a) => {
-              i.value = q(
-                w,
-                a,
-                l.value.name
-              ), n.value = 3, u.value--;
+            onSuccess: (t) => {
+              c.value = G(
+                U,
+                t,
+                n.value.name
+              ), l.value = 3, d.value--;
             },
             file: e[0]
           });
           return;
         }
         try {
-          await _e(Q), W({
-            file: l.value,
-            dirName: H,
-            oss: z,
-            successCallBack(a) {
-              i.value = q(
-                w,
-                a,
-                l.value.name
-              ), n.value = 3, u.value--;
+          const t = await (T ? M(T) : M()), u = await _e(async () => t);
+          O = u, J({
+            file: n.value,
+            dirName: K,
+            oss: u,
+            successCallBack(i) {
+              c.value = G(
+                U,
+                i,
+                n.value.name
+              ), l.value = 3, d.value--;
             },
-            errorCallBack(a) {
-              U && c.warning(a || s("ap.apUpload.networkAnomaly")), n.value = 1, l.value = null, u.value--;
+            errorCallBack(i) {
+              D && p.warning(i || s("ap.apUpload.networkAnomaly")), l.value = 1, n.value = null, d.value--;
             },
-            progressCallBack(a) {
-              d.value = a;
+            progressCallBack(i) {
+              f.value = i;
             },
-            baseDirName: J
+            baseDirName: Q,
+            bucket: t?.bucket
           });
-        } catch (a) {
-          U && c.warning(
-            typeof a?.message == "string" ? a.message : s("ap.apUpload.networkAnomaly")
-          ), n.value = 1, l.value = null, u.value--;
+        } catch (t) {
+          D && p.warning(
+            typeof t?.message == "string" ? t.message : s("ap.apUpload.networkAnomaly")
+          ), l.value = 1, n.value = null, d.value--;
         }
       }
     }
     function le() {
-      M && M?.(l.value), l.value && !i?.value && z.pauseUpload(), n.value = 1, l.value = null, i.value = void 0;
+      P && P?.(n.value), n.value && !c?.value && O?.pauseUpload?.(), l.value = 1, n.value = null, c.value = void 0;
     }
-    return (e, a) => (h(), N("div", {
-      class: ce({
-        [t(x)()]: !0,
-        [t(x)("un")]: n.value === 1,
-        [t(G) ?? ""]: !0
+    return (e, t) => (k(), S("div", {
+      class: ue({
+        [a(z)()]: !0,
+        [a(z)("un")]: l.value === 1,
+        [a(H) ?? ""]: !0
       }),
-      onClick: Z,
-      onDragenter: O,
-      onDragover: ee,
-      onDragleave: O,
-      onDrop: te
+      onClick: ee,
+      onDragenter: I,
+      onDragover: te,
+      onDragleave: I,
+      onDrop: oe
     }, [
       r("input", {
         ref_key: "fileRef",
-        ref: v,
+        ref: m,
         style: { display: "none" },
         type: "file",
-        accept: t(_),
-        onChange: oe
+        accept: a(_),
+        onChange: ne
       }, null, 40, Fe),
-      n.value === 1 ? (h(), N("div", Se, [
+      l.value === 1 ? (k(), S("div", Ne, [
         r("img", {
           class: "state-un-icon",
-          src: t($)
-        }, null, 8, Ne),
-        r("div", Ee, b(t(K)), 1),
-        r("div", be, b(typeof t(y) == "string" && t(y).length > 0 ? t(y) : `${t(s)("ap.apUpload.supportExtension")}：${t(we)(
-          t(_)
-        )}，${t(s)("ap.apUpload.maxWarnUploadFileSize", {
-          maxSize: t(k)
+          src: a(j)
+        }, null, 8, Se),
+        r("div", Ee, x(a(X)), 1),
+        r("div", xe, x(typeof a(w) == "string" && a(w).length > 0 ? a(w) : `${a(s)("ap.apUpload.supportExtension")}：${a(Ue)(
+          a(_)
+        )}，${a(s)("ap.apUpload.maxWarnUploadFileSize", {
+          maxSize: a(y)
         })}`), 1)
       ])) : E("", !0),
-      [2, 3].includes(n.value) ? (h(), N("div", xe, [
-        r("div", ze, [
-          r("img", { src: t($) }, null, 8, Ae)
+      [2, 3].includes(l.value) ? (k(), S("div", ze, [
+        r("div", Ae, [
+          r("img", { src: a(j) }, null, 8, Re)
         ]),
-        r("div", Re, [
+        r("div", Be, [
           r("div", {
             class: "center-title",
-            style: ue({
-              color: T.value ? "#0070FF" : "#182948"
+            style: pe({
+              color: V.value ? "#0070FF" : "#182948"
             })
-          }, b(l.value?.name), 5),
-          r("div", Be, [
-            T.value ? E("", !0) : (h(), pe(t(me), {
+          }, x(n.value?.name), 5),
+          r("div", Me, [
+            V.value ? E("", !0) : (k(), de(a(ge), {
               key: 0,
-              percent: d.value,
+              percent: f.value,
               size: 4,
               "show-info": !1,
-              "trail-color": t(A).borderColorBase,
-              "stroke-color": t(A).colorPrimary
+              "trail-color": a(A).borderColorBase,
+              "stroke-color": a(A).colorPrimary
             }, null, 8, ["percent", "trail-color", "stroke-color"]))
           ])
         ]),
         r("div", {
           class: "right",
-          onClick: de(le, ["stop"])
+          onClick: ve(le, ["stop"])
         }, [
-          ve(t(fe))
+          fe(a(me))
         ])
       ])) : E("", !0)
     ], 34));
   }
 });
 export {
-  Je as default
+  Ke as default
 };

package/es/src/business/ap-upload/hooks/useOss.d.ts

@@ -4,7 +4,7 @@ import { Translator } from '../../../config-provider';
 export type { Oss } from '@aplus-frontend/oss';
 export type GetOssAccess = () => Promise<accessCreate>;
 export declare function injectLocaleToOss(tValue: Translator, langValue: Ref<string>): void;
-declare function put({ file, dirName, oss, successCallBack, errorCallBack, progressCallBack, baseDirName }: {
+declare function put({ file, dirName, oss, successCallBack, errorCallBack, progressCallBack, baseDirName, bucket }: {
     file: File;
     dirName: string;
     oss: Oss;
@@ -12,6 +12,7 @@ declare function put({ file, dirName, oss, successCallBack, errorCallBack, progr
     errorCallBack: (msg: string) => void;
     progressCallBack: (p: number) => void;
     baseDirName?: string;
+    bucket?: string;
 }): Promise<void>;
 export declare function useOss(): {
     client: Oss;

package/es/src/business/ap-upload/hooks/useOss.mjs

@@ -1,82 +1,83 @@
-import { client as i, createOssInstance as w } from "@aplus-frontend/oss";
-let n, l;
-function U(e, s) {
-  n = e, l = s;
+import { client as l, createOssInstance as d } from "@aplus-frontend/oss";
+let n, p;
+function F(s, e) {
+  n = s, p = e;
 }
-const g = {
+const O = {
   "zh-cn": "zh_CN",
   en: "en_US"
 };
-function p() {
-  return g[l.value] ?? "zh_CN";
+function c() {
+  return O[p.value] ?? "zh_CN";
 }
-async function d({
-  file: e,
-  dirName: s,
-  oss: t,
-  successCallBack: c,
-  errorCallBack: o,
-  progressCallBack: u,
-  baseDirName: f = "Frontend-Upload"
+async function U({
+  file: s,
+  dirName: e,
+  oss: o,
+  successCallBack: u,
+  errorCallBack: r,
+  progressCallBack: f,
+  baseDirName: m = "Frontend-Upload",
+  bucket: i
 }) {
-  if (!s) {
-    o("required dirName");
+  if (!e) {
+    r("required dirName");
     return;
   }
   try {
-    const a = await t.put({
-      fileName: e.name,
-      dirName: s,
-      data: e,
-      progressCallBack: (r) => {
-        u(r);
+    const a = await o.put({
+      fileName: s.name,
+      dirName: e,
+      data: s,
+      progressCallBack: (t) => {
+        f(t);
       },
-      baseDirName: f
+      baseDirName: m
     });
     if (a.status === 204)
       return;
     if (a.status === 200) {
-      const { saveUrl: r, previewUrl: m } = a;
-      c(r, m);
+      const { saveUrl: t, previewUrl: w } = a, g = i && t ? `${i}:${t}` : t;
+      u(g, w);
     } else
-      o(a?.message || n("ap.apUpload.networkAnomaly"));
+      r(a?.message || n("ap.apUpload.networkAnomaly"));
   } catch (a) {
-    o(a);
+    r(a);
   }
 }
-function O() {
-  return { client: i, put: d };
+function y() {
+  return { client: l, put: U };
 }
-async function h(e) {
-  if (!e)
+async function T(s) {
+  if (!s)
     throw new Error(`${n("ap.apUpload.pleasePass")}getOssAccess`);
-  return await i.initOssClient({
-    getOssAccess: e,
-    locale: p(),
-    onFailure: (s) => {
+  return await l.initOssClient({
+    getOssAccess: s,
+    locale: c(),
+    onFailure: (e) => {
       throw new Error(
-        typeof s?.message == "string" ? s.message : n("ap.apUpload.FailedToObtainOssTemporaryPermissions")
+        typeof e?.message == "string" ? e.message : n("ap.apUpload.FailedToObtainOssTemporaryPermissions")
       );
     }
-  }), O();
+  }), y();
 }
-async function F(e) {
-  if (!e)
+async function v(s) {
+  if (!s)
     throw new Error(`${n("ap.apUpload.pleasePass")}getOssAccess`);
-  const s = w();
-  return await s.initOssClient({
-    getOssAccess: e,
-    locale: p(),
-    onFailure: (t) => {
+  const e = d();
+  return await e.initOssClient({
+    getOssAccess: s,
+    locale: c(),
+    onFailure: (o) => {
       throw new Error(
-        typeof t?.message == "string" ? t.message : n("ap.apUpload.FailedToObtainOssTemporaryPermissions")
+        typeof o?.message == "string" ? o.message : n("ap.apUpload.FailedToObtainOssTemporaryPermissions")
       );
     }
-  }), s;
+  }), e;
 }
 export {
-  F as getOssInstance,
-  U as injectLocaleToOss,
-  O as useOss,
-  h as useOssInit
+  v as getOssInstance,
+  F as injectLocaleToOss,
+  y as useOss,
+  T as useOssInit
 };

package/es/src/business/ap-upload-file/ap-upload-single/ap-upload-single.vue.mjs

@@ -1,5 +1,5 @@
-import { defineComponent as M, computed as y, createBlock as C, openBlock as u, unref as e, mergeProps as G, withCtx as i, renderSlot as H, normalizeProps as J, guardReactiveProps as K, createElementVNode as s, normalizeClass as l, createElementBlock as v, createVNode as n, createTextVNode as m, toDisplayString as p, resolveDynamicComponent as F, h as N, Fragment as L } from "vue";
-import { Form as Q, UploadDragger as W, TypographyParagraph as b, Progress as X, Tooltip as P } from "@aplus-frontend/antdv";
+import { defineComponent as M, computed as b, createBlock as y, openBlock as u, unref as e, mergeProps as G, withCtx as i, renderSlot as H, normalizeProps as J, guardReactiveProps as K, createElementVNode as s, normalizeClass as l, createElementBlock as v, createVNode as n, createTextVNode as m, toDisplayString as p, resolveDynamicComponent as F, h as N, Fragment as L } from "vue";
+import { Form as Q, UploadDragger as W, TypographyParagraph as C, Progress as X, Tooltip as P } from "@aplus-frontend/antdv";
 import { FormItemInputContext as Y } from "@aplus-frontend/antdv/es/form/FormItemContext";
 import { omit as Z } from "lodash-unified";
 import { useToken as ee } from "../../../config-provider/hooks/use-token.mjs";
@@ -26,19 +26,20 @@ const Se = /* @__PURE__ */ M({
     customRequest: {},
     maxSizeErrorMsg: {},
     acceptErrorMsg: {},
+    bucket: {},
     title: { type: [Object, String, Number, Boolean, null, Array] },
     subTitle: { type: [Object, String, Number, Boolean, null, Array] }
   },
   emits: ["update:fileList"],
   setup(w, { emit: A }) {
-    const T = Y.useInject(), $ = y(() => T.status), d = w, q = A, B = Q.useInjectFormItemContext(), r = y({
+    const T = Y.useInject(), $ = b(() => T.status), d = w, q = A, B = Q.useInjectFormItemContext(), r = b({
       get() {
         return d.fileList || [];
       },
       set(c) {
         q("update:fileList", c), B?.onFieldChange();
       }
-    }), o = y(() => r.value?.[0]), O = ne("apUpload"), { t: U, lang: j } = ae(), {
+    }), o = b(() => r.value?.[0]), O = ne("apUpload"), { t: U, lang: j } = ae(), {
       title: z,
       subTitle: R,
       beforeUpload: E,
@@ -60,7 +61,7 @@ const Se = /* @__PURE__ */ M({
         "subTitle"
       ]);
     }
-    return (c, a) => (u(), C(e(W), G({
+    return (c, a) => (u(), y(e(W), G({
       ...c.$attrs,
       ..._(d)
     }, {
@@ -93,7 +94,7 @@ const Se = /* @__PURE__ */ M({
               s("div", {
                 class: l([e(t)("content-file-name"), e(t)("content-ing-name")])
               }, [
-                n(e(b), {
+                n(e(C), {
                   ellipsis: { rows: 2 },
                   tooltip: o.value.error
                 }, {
@@ -133,7 +134,7 @@ const Se = /* @__PURE__ */ M({
                     m(p(o.value?.error || "--"), 1)
                   ]),
                   default: i(() => [
-                    n(e(b), {
+                    n(e(C), {
                       ellipsis: { rows: 2 },
                       tooltip: o.value.error
                     }, {
@@ -169,7 +170,7 @@ const Se = /* @__PURE__ */ M({
                     m(p(o.value?.name || "--"), 1)
                   ]),
                   default: i(() => [
-                    n(e(b), {
+                    n(e(C), {
                       ellipsis: { rows: 2 },
                       tooltip: o.value.error
                     }, {
@@ -200,12 +201,12 @@ const Se = /* @__PURE__ */ M({
               s("div", {
                 class: l([e(t)("content-empty-title")])
               }, [
-                (u(), C(F(N(L, [e(z)]))))
+                (u(), y(F(N(L, [e(z)]))))
               ], 2),
               s("div", {
                 class: l([e(t)("content-empty-sub-title")])
               }, [
-                (u(), C(F(N(L, [e(R)]))))
+                (u(), y(F(N(L, [e(R)]))))
               ], 2)
             ], 2))
           ], 2)

package/es/src/business/ap-upload-file/hook/useOss.d.ts

@@ -5,4 +5,9 @@ import { ApUploadGetOssAccess } from '../interface';
 export type { Oss } from '@aplus-frontend/oss';
 export type GetOssAccess = () => Promise<accessCreate>;
 export declare function injectHookOss(tValue: Translator, langValue: Ref<string>, getOssAccessValue?: ApUploadGetOssAccess): void;
-export declare function getOssInstance(): Promise< Oss>;
+export declare function getOssInstance({ bucket }?: {
+    bucket?: string;
+}): Promise<{
+    oss: Oss;
+    bucket: string;
+}>;