@aplus-frontend/ui 7.10.3 → 7.10.4

package/es/src/business/ap-download/ap-download.vue.d.ts

@@ -1,4 +1,4 @@
-import { ApDownLoadProps, downloadCallbackResponse } from './interface';
+import { ApDownLoadProps, downloadCallbackResponse, ApDownLoadNeedNameModel } from './interface';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
 import { ButtonType } from '@aplus-frontend/antdv/es/button';
 type __VLS_Props = ApDownLoadProps;
@@ -19,6 +19,7 @@ declare const __VLS_component: DefineComponent<__VLS_Props, {}, {}, {}, {}, Comp
     size: "small" | "large" | "middle";
     type: ButtonType;
     disabled: boolean;
+    needName: ApDownLoadNeedNameModel;
 }, {}, {}, {}, string, ComponentProvideOptions, false, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
 export default _default;

package/es/src/business/ap-download/ap-download.vue.mjs

@@ -40,20 +40,20 @@ const M = {
     variant: {},
     text: {},
     fileName: {},
-    needName: { type: [Boolean, Object] },
+    needName: { type: [Boolean, Object], default: void 0 },
     getOssAccess: {}
   },
   emits: ["downloadCallback"],
   setup(C, { emit: N }) {
-    const r = N, n = z(!1), { lang: b } = G(), w = A(), h = s(() => b.value === "zh-cn" ? "zh_CN" : "en_US"), e = C, l = y("apUpload"), c = y(
+    const r = N, l = z(!1), { lang: b } = G(), v = A(), w = s(() => b.value === "zh-cn" ? "zh_CN" : "en_US"), e = C, n = y("apUpload"), c = y(
       "downloadCenterTriggerConfig"
-    ), d = s(() => e.disabled), v = s(() => e.size), { getInnerWrapperClass: _ } = P(v, d), k = s(() => e.getOssAccess || l.value?.getOssAccess), B = async () => {
+    ), d = s(() => e.disabled), h = s(() => e.size), { getInnerWrapperClass: _ } = P(h, d), k = s(() => e.getOssAccess || n.value?.getOssAccess), B = async () => {
       if (!e.disabled) {
-        n.value = !0;
+        l.value = !0;
         try {
           if (c.value?.trigger) {
             let a = g(
-              e.needName ?? l?.value?.needName,
+              e.needName ?? n?.value?.needName,
               e.fileName
             ).map((p) => ({
               objectName: p.path,
@@ -63,10 +63,10 @@ const M = {
           } else {
             const a = await (await E(
               k.value,
-              t(h)
+              t(w)
             )).downloadFile(
               g(
-                e.needName ?? l?.value?.needName,
+                e.needName ?? n?.value?.needName,
                 e.fileName
               )
             );
@@ -75,7 +75,7 @@ const M = {
         } catch (o) {
           console.error(o);
         } finally {
-          n.value = !1;
+          l.value = !1;
         }
       }
     };
@@ -89,10 +89,10 @@ const M = {
         m("div", {
           class: j(t(_))
         }, [
-          n.value ? (i(), f("span", M, [
+          l.value ? (i(), f("span", M, [
             I(t(U), { spin: !0 })
           ])) : u("", !0),
-          t(w).icon ? (i(), f("span", R, [
+          t(v).icon ? (i(), f("span", R, [
             F(o.$slots, "icon")
           ])) : u("", !0),
           m("span", W, T(o.text), 1)

package/es/src/business/ap-image/ApImage.vue2.mjs

@@ -1,16 +1,16 @@
-import { defineComponent as M, computed as n, ref as S, watchEffect as U, createBlock as p, openBlock as l, unref as a, mergeProps as f, withCtx as j, renderSlot as B, normalizeProps as E, guardReactiveProps as L, createElementVNode as g, normalizeClass as x, createElementBlock as D, Fragment as P, renderList as R, resolveDynamicComponent as T, createVNode as z } from "vue";
-import { DownloadOutlined as V } from "@ant-design/icons-vue";
-import { Image as W } from "@aplus-frontend/antdv";
-import { omit as G } from "lodash-unified";
+import { defineComponent as S, computed as n, ref as j, watchEffect as B, createBlock as h, openBlock as i, unref as o, mergeProps as v, withCtx as E, renderSlot as F, normalizeProps as L, guardReactiveProps as U, createElementVNode as b, normalizeClass as W, createElementBlock as x, Fragment as D, renderList as P, resolveDynamicComponent as R, createVNode as T } from "vue";
+import { DownloadOutlined as z } from "@ant-design/icons-vue";
+import { Image as V } from "@aplus-frontend/antdv";
+import { omit as $ } from "lodash-unified";
 import "../../config-provider/index.mjs";
-import { injectLocaleToOss as $, getOssInstance as q, getSignatureUrl as H } from "./hooks/useOss.mjs";
+import { injectLocaleToOss as G, getOssInstance as q, getSignatureUrl as H } from "./hooks/useOss.mjs";
 import J from "./imgs/admin-fallback.jpg.mjs";
 import K from "./imgs/user-fallback.jpg.mjs";
 import Q from "./style/index.mjs";
 import { useNamespace as X } from "../../config-provider/hooks/use-namespace.mjs";
-import { useGlobalConfig as c } from "../../config-provider/hooks/use-global-config.mjs";
+import { useGlobalConfig as m } from "../../config-provider/hooks/use-global-config.mjs";
 import { useLocale as Y } from "../../config-provider/hooks/use-locale.mjs";
-const ue = /* @__PURE__ */ M({
+const ue = /* @__PURE__ */ S({
   __name: "ApImage",
   props: {
     getOssAccess: {},
@@ -23,78 +23,81 @@ const ue = /* @__PURE__ */ M({
     uiMode: {},
     preview: { type: [Boolean, Object], default: !0 }
   },
-  setup(v) {
-    const { b: i } = X("ap-image"), m = Q("ap-image"), e = v, u = {
+  setup(k) {
+    const { b: u } = X("ap-image"), p = Q("ap-image"), e = k, d = {
       aplus: K,
       admin: J
-    }, b = c("apImage", { uiMode: "aplus" }), h = c("apUpload"), d = c(
+    }, w = m("apImage", { uiMode: "aplus" }), C = m("apUpload"), f = m(
       "downloadCenterTriggerConfig"
-    ), k = n(
-      () => e.uiMode || b.value?.uiMode
-    ), { t: w, lang: C } = Y(), O = n(
-      () => e.getOssAccess || h.value?.getOssAccess
-    ), y = n(
-      () => u[k.value] || u.aplus
-    ), A = n(() => e?.fallback || y.value), s = S("");
-    $(w, C), U(async () => {
+    ), O = n(
+      () => e.uiMode || w.value?.uiMode
+    ), { t: y, lang: A } = Y(), g = n(
+      () => e.getOssAccess || C.value?.getOssAccess
+    ), N = n(
+      () => d[O.value] || d.aplus
+    ), I = n(() => e?.fallback || N.value), s = j("");
+    G(y, A), B(async () => {
       if (!e?.src) {
         s.value = "";
         return;
       }
-      if (!e.src?.startsWith("Frontend-Upload")) {
+      if (e.src?.startsWith("http") || e.src?.startsWith("data:")) {
         s.value = e.src;
         return;
       }
       try {
-        const t = await q(O.value), r = await H({
-          oss: t,
-          fileName: e.src
+        const a = e.src?.match(/^([^:]+):(.*)$/), r = a?.[1], t = a?.[2] ?? e.src, l = await q(
+          () => r ? g.value?.(r) : g.value?.(),
+          r
+        ), c = await H({
+          oss: l,
+          fileName: t
         });
-        r && (s.value = r);
+        c && (s.value = c);
       } catch {
         s.value = "";
       }
     });
-    async function N() {
+    async function _() {
       if (!e?.src)
         return;
-      const t = e.src, r = e.fileName ?? e.src;
-      if (!e.src?.startsWith("Frontend-Upload")) {
-        I(t, r);
+      const a = e.src, r = e.fileName ?? e.src;
+      if (e.src?.startsWith("http") || e.src?.startsWith("data:")) {
+        M(a, r);
         return;
       }
-      if (d.value?.trigger) {
-        let o = [
+      if (f.value?.trigger) {
+        let t = [
           {
-            objectName: t,
+            objectName: a,
             fileName: r
           }
         ];
-        await d.value?.trigger(o);
+        await f.value?.trigger(t);
       }
     }
-    const I = (t, r) => {
-      const o = document.createElement("a");
-      o.href = t, o.rel = "noopener noreferrer", o.setAttribute("download", r), document.body.appendChild(o), o.click(), document.body.removeChild(o);
+    const M = (a, r) => {
+      const t = document.createElement("a");
+      t.href = a, t.rel = "noopener noreferrer", t.setAttribute("download", r), document.body.appendChild(t), t.click(), document.body.removeChild(t);
     };
-    return (t, r) => (l(), p(a(W), f({
-      class: [a(i)(), a(m)]
+    return (a, r) => (i(), h(o(V), v({
+      class: [o(u)(), o(p)]
     }, {
-      ...a(G)(e, ["src", "getOssAccess"]),
-      fallback: A.value,
+      ...o($)(e, ["src", "getOssAccess"]),
+      fallback: I.value,
       src: s.value
     }), {
-      toolbarRender: j((o) => [
-        B(t.$slots, "toolbarRender", E(L({ ...o })), () => [
-          g("div", {
-            class: x([a(i)("toolbar"), a(m)])
+      toolbarRender: E((t) => [
+        F(a.$slots, "toolbarRender", L(U({ ...t })), () => [
+          b("div", {
+            class: W([o(u)("toolbar"), o(p)])
           }, [
-            (l(!0), D(P, null, R(o.originalNodes, (_, F) => (l(), p(T(_), f({ ref_for: !0 }, e, { key: F }), null, 16))), 128)),
-            g("div", {
+            (i(!0), x(D, null, P(t.originalNodes, (l, c) => (i(), h(R(l), v({ ref_for: !0 }, e, { key: c }), null, 16))), 128)),
+            b("div", {
               class: "ant-image-preview-operations-operation",
-              onClick: N
+              onClick: _
             }, [
-              z(a(V))
+              T(o(z))
             ])
           ], 2)
         ])

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

@@ -3,7 +3,7 @@ import { Ref } from 'vue';
 import { Translator } from '../../../config-provider';
 type GetOssAccess = () => Promise<accessCreate>;
 export declare function injectLocaleToOss(tValue: Translator, langValue: Ref<string>): void;
-export declare function getOssInstance(getOssAccess?: GetOssAccess): Promise<Oss>;
+export declare function getOssInstance(getOssAccess?: GetOssAccess, bucket?: string): Promise<Oss>;
 export declare function getSignatureUrl({ oss, fileName }: {
     oss: Oss;
     fileName: string;

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

@@ -1,46 +1,48 @@
-import { createOssInstance as c } from "@aplus-frontend/oss";
-const l = 1e4;
-let n, r;
-function f(e, s) {
-  n = e, r = s;
+import { createOssInstance as u } from "@aplus-frontend/oss";
+const g = 1e4;
+let n, i;
+function _(t, s) {
+  n = t, i = s;
 }
-const p = {
+const f = {
   "zh-cn": "zh_CN",
   en: "en_US"
 };
-function u() {
-  return p[r.value] ?? "zh_CN";
+function m() {
+  return f[i.value] ?? "zh_CN";
 }
-let t;
-async function m(e) {
-  if (!e)
+const c = /* @__PURE__ */ new Map();
+async function w(t, s) {
+  if (!t)
     throw new Error(`${n("ap.apUpload.pleasePass")}getOssAccess`);
-  return t?.createDate && t.createDate < Date.now() + l && t?.oss || (t = {
-    oss: new Promise((s, i) => {
-      const a = c();
-      a.initOssClient({
-        getOssAccess: e,
-        locale: u(),
-        onFailure: (o) => {
-          i(
-            typeof o?.message == "string" ? o.message : n("ap.apUpload.FailedToObtainOssTemporaryPermissions")
+  const a = s || "ap_image_default_bucket";
+  let e = c.get(a);
+  return e?.createDate && e.createDate < Date.now() + g && e?.oss || (e = {
+    oss: new Promise((l, p) => {
+      const o = u();
+      o.initOssClient({
+        getOssAccess: t,
+        locale: m(),
+        onFailure: (r) => {
+          p(
+            typeof r?.message == "string" ? r.message : n("ap.apUpload.FailedToObtainOssTemporaryPermissions")
           );
         }
       }).then(() => {
-        s(a);
+        l(o);
       });
     }),
     createDate: Date.now()
-  }), t.oss;
+  }, c.set(a, e)), e.oss;
 }
-function O({
-  oss: e,
+function U({
+  oss: t,
   fileName: s
 }) {
-  return e.getSignatureUrl(s);
+  return t.getSignatureUrl(s);
 }
 export {
-  m as getOssInstance,
-  O as getSignatureUrl,
-  f as injectLocaleToOss
+  w as getOssInstance,
+  U as getSignatureUrl,
+  _ as injectLocaleToOss
 };

package/es/src/business/ap-image/interface.d.ts

@@ -1,7 +1,7 @@
 import { accessCreate } from '@aplus-frontend/oss';
 import { UiModeType } from '../../config-provider';
 export interface ApImageProps {
-    getOssAccess?: () => Promise<accessCreate>;
+    getOssAccess?: (bucket?: string) => Promise<accessCreate>;
     width?: number | string;
     height?: number | string;
     alt?: string;

package/es/src/business/ap-upload/apUpload.vue.d.ts

@@ -181,8 +181,8 @@ declare const __VLS_component: DefineComponent<ExtractPropTypes<{
     value: string | unknown[] | Record<string, any>;
     maxCount: number;
     maxSize: number;
-    getOssAccess: GetOssAccess;
     needName: boolean | Record<string, any>;
+    getOssAccess: GetOssAccess;
     accept: string;
     beforeUpload: BeforeUpload;
     onRemove: Function;

package/es/src/config-provider/constants.d.ts

@@ -1,5 +1,5 @@
 import { DefaultOptionType } from '@aplus-frontend/antdv/es/select';
-import { client } from '@aplus-frontend/oss';
+import { accessCreate } from '@aplus-frontend/oss';
 import { InjectionKey, Ref, VNode } from 'vue';
 import { Recordable } from '../type';
 import { ConfigProviderProps } from './config-provider-props';
@@ -18,7 +18,7 @@ export type ApiType = {
 };
 export type ApUploadConfig = {
     dirName?: string;
-    getOssAccess?: Parameters<typeof client.initOssClient>[0]['getOssAccess'];
+    getOssAccess?: (bucket?: string) => Promise<accessCreate>;
     needName?: boolean | {
         pathKey?: string;
         nameKey?: string;

package/es/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "7.10.3";
+declare const _default: "7.10.4";
 export default _default;

package/es/src/version.mjs

@@ -1,4 +1,4 @@
-const e = "7.10.3";
+const e = "7.10.4";
 export {
   e as default
 };

package/lib/src/business/ap-download/ap-download.vue.d.ts

@@ -1,4 +1,4 @@
-import { ApDownLoadProps, downloadCallbackResponse } from './interface';
+import { ApDownLoadProps, downloadCallbackResponse, ApDownLoadNeedNameModel } from './interface';
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
 import { ButtonType } from '@aplus-frontend/antdv/es/button';
 type __VLS_Props = ApDownLoadProps;
@@ -19,6 +19,7 @@ declare const __VLS_component: DefineComponent<__VLS_Props, {}, {}, {}, {}, Comp
     size: "small" | "large" | "middle";
     type: ButtonType;
     disabled: boolean;
+    needName: ApDownLoadNeedNameModel;
 }, {}, {}, {}, string, ComponentProvideOptions, false, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
 export default _default;

package/lib/src/business/ap-download/ap-download.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),k=require("@ant-design/icons-vue"),_=require("@aplus-frontend/antdv"),h=require("lodash-unified");require("../../config-provider/index.js");const w=require("./hooks/index.js"),B=require("./hooks/useStyle.js"),d=require("./utils/getFileInfo.js"),O=require("../../config-provider/hooks/use-locale.js"),u=require("../../config-provider/hooks/use-global-config.js"),q={key:0,class:"spin"},z={key:1,class:"icon"},S={class:"text"},I=e.defineComponent({name:"ApDownload",__name:"ap-download",props:{prefixCls:{},type:{default:"link"},htmlType:{},shape:{},size:{default:"middle"},loading:{type:[Boolean,Object]},disabled:{type:Boolean,default:!1},ghost:{type:Boolean},block:{type:Boolean},danger:{type:Boolean},icon:{},href:{},target:{},title:{},onClick:{},onMousedown:{},autoInsertSpace:{type:Boolean},iconPosition:{},color:{},variant:{},text:{},fileName:{},needName:{type:[Boolean,Object]},getOssAccess:{}},emits:["downloadCallback"],setup(p,{emit:f}){const l=f,s=e.ref(!1),{lang:m}=O.useLocale(),g=e.useSlots(),C=e.computed(()=>m.value==="zh-cn"?"zh_CN":"en_US"),t=p,a=u.useGlobalConfig("apUpload"),i=u.useGlobalConfig("downloadCenterTriggerConfig"),c=e.computed(()=>t.disabled),y=e.computed(()=>t.size),{getInnerWrapperClass:b}=B.useStyle(y,c),N=e.computed(()=>t.getOssAccess||a.value?.getOssAccess),v=async()=>{if(!t.disabled){s.value=!0;try{if(i.value?.trigger){let n=d.getFileInfo(t.needName??a?.value?.needName,t.fileName).map(r=>({objectName:r.path,fileName:r.fileName}));await i.value?.trigger(n),l("downloadCallback",n)}else{const n=await(await w.useOssInit(N.value,e.unref(C))).downloadFile(d.getFileInfo(t.needName??a?.value?.needName,t.fileName));l("downloadCallback",n)}}catch(o){console.error(o)}finally{s.value=!1}}};return(o,n)=>(e.openBlock(),e.createBlock(e.unref(_.Button),e.mergeProps(e.unref(h.omit)(t,["getOssAccess","fileName","needName"]),{type:t.type,size:t.size,disabled:c.value,onClick:v}),{default:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass(e.unref(b))},[s.value?(e.openBlock(),e.createElementBlock("span",q,[e.createVNode(e.unref(k.LoadingOutlined),{spin:!0})])):e.createCommentVNode("",!0),e.unref(g).icon?(e.openBlock(),e.createElementBlock("span",z,[e.renderSlot(o.$slots,"icon")])):e.createCommentVNode("",!0),e.createElementVNode("span",S,e.toDisplayString(o.text),1)],2)]),_:3},16,["type","size","disabled"]))}});exports.default=I;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),k=require("@ant-design/icons-vue"),_=require("@aplus-frontend/antdv"),h=require("lodash-unified");require("../../config-provider/index.js");const w=require("./hooks/index.js"),B=require("./hooks/useStyle.js"),d=require("./utils/getFileInfo.js"),O=require("../../config-provider/hooks/use-locale.js"),u=require("../../config-provider/hooks/use-global-config.js"),q={key:0,class:"spin"},z={key:1,class:"icon"},S={class:"text"},I=e.defineComponent({name:"ApDownload",__name:"ap-download",props:{prefixCls:{},type:{default:"link"},htmlType:{},shape:{},size:{default:"middle"},loading:{type:[Boolean,Object]},disabled:{type:Boolean,default:!1},ghost:{type:Boolean},block:{type:Boolean},danger:{type:Boolean},icon:{},href:{},target:{},title:{},onClick:{},onMousedown:{},autoInsertSpace:{type:Boolean},iconPosition:{},color:{},variant:{},text:{},fileName:{},needName:{type:[Boolean,Object],default:void 0},getOssAccess:{}},emits:["downloadCallback"],setup(p,{emit:f}){const l=f,s=e.ref(!1),{lang:m}=O.useLocale(),g=e.useSlots(),C=e.computed(()=>m.value==="zh-cn"?"zh_CN":"en_US"),t=p,a=u.useGlobalConfig("apUpload"),i=u.useGlobalConfig("downloadCenterTriggerConfig"),c=e.computed(()=>t.disabled),y=e.computed(()=>t.size),{getInnerWrapperClass:b}=B.useStyle(y,c),N=e.computed(()=>t.getOssAccess||a.value?.getOssAccess),v=async()=>{if(!t.disabled){s.value=!0;try{if(i.value?.trigger){let n=d.getFileInfo(t.needName??a?.value?.needName,t.fileName).map(r=>({objectName:r.path,fileName:r.fileName}));await i.value?.trigger(n),l("downloadCallback",n)}else{const n=await(await w.useOssInit(N.value,e.unref(C))).downloadFile(d.getFileInfo(t.needName??a?.value?.needName,t.fileName));l("downloadCallback",n)}}catch(o){console.error(o)}finally{s.value=!1}}};return(o,n)=>(e.openBlock(),e.createBlock(e.unref(_.Button),e.mergeProps(e.unref(h.omit)(t,["getOssAccess","fileName","needName"]),{type:t.type,size:t.size,disabled:c.value,onClick:v}),{default:e.withCtx(()=>[e.createElementVNode("div",{class:e.normalizeClass(e.unref(b))},[s.value?(e.openBlock(),e.createElementBlock("span",q,[e.createVNode(e.unref(k.LoadingOutlined),{spin:!0})])):e.createCommentVNode("",!0),e.unref(g).icon?(e.openBlock(),e.createElementBlock("span",z,[e.renderSlot(o.$slots,"icon")])):e.createCommentVNode("",!0),e.createElementVNode("span",S,e.toDisplayString(o.text),1)],2)]),_:3},16,["type","size","disabled"]))}});exports.default=I;

package/lib/src/business/ap-image/ApImage.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),y=require("@ant-design/icons-vue"),_=require("@aplus-frontend/antdv"),I=require("lodash-unified");require("../../config-provider/index.js");const n=require("./hooks/useOss.js"),M=require("./imgs/admin-fallback.jpg.js"),A=require("./imgs/user-fallback.jpg.js"),B=require("./style/index.js"),S=require("../../config-provider/hooks/use-namespace.js"),c=require("../../config-provider/hooks/use-global-config.js"),U=require("../../config-provider/hooks/use-locale.js"),F=e.defineComponent({__name:"ApImage",props:{getOssAccess:{},width:{},height:{},alt:{},fallback:{},src:{},fileName:{},uiMode:{},preview:{type:[Boolean,Object],default:!0}},setup(f){const{b:l}=S.useNamespace("ap-image"),u=B.default("ap-image"),r=f,i={aplus:A.default,admin:M.default},p=c.useGlobalConfig("apImage",{uiMode:"aplus"}),m=c.useGlobalConfig("apUpload"),d=c.useGlobalConfig("downloadCenterTriggerConfig"),g=e.computed(()=>r.uiMode||p.value?.uiMode),{t:b,lang:v}=U.useLocale(),k=e.computed(()=>r.getOssAccess||m.value?.getOssAccess),C=e.computed(()=>i[g.value]||i.aplus),h=e.computed(()=>r?.fallback||C.value),s=e.ref("");n.injectLocaleToOss(b,v),e.watchEffect(async()=>{if(!r?.src){s.value="";return}if(!r.src?.startsWith("Frontend-Upload")){s.value=r.src;return}try{const a=await n.getOssInstance(k.value),o=await n.getSignatureUrl({oss:a,fileName:r.src});o&&(s.value=o)}catch{s.value=""}});async function w(){if(!r?.src)return;const a=r.src,o=r.fileName??r.src;if(!r.src?.startsWith("Frontend-Upload")){q(a,o);return}if(d.value?.trigger){let t=[{objectName:a,fileName:o}];await d.value?.trigger(t)}}const q=(a,o)=>{const t=document.createElement("a");t.href=a,t.rel="noopener noreferrer",t.setAttribute("download",o),document.body.appendChild(t),t.click(),document.body.removeChild(t)};return(a,o)=>(e.openBlock(),e.createBlock(e.unref(_.Image),e.mergeProps({class:[e.unref(l)(),e.unref(u)]},{...e.unref(I.omit)(r,["src","getOssAccess"]),fallback:h.value,src:s.value}),{toolbarRender:e.withCtx(t=>[e.renderSlot(a.$slots,"toolbarRender",e.normalizeProps(e.guardReactiveProps({...t})),()=>[e.createElementVNode("div",{class:e.normalizeClass([e.unref(l)("toolbar"),e.unref(u)])},[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(t.originalNodes,(O,N)=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(O),e.mergeProps({ref_for:!0},r,{key:N}),null,16))),128)),e.createElementVNode("div",{class:"ant-image-preview-operations-operation",onClick:w},[e.createVNode(e.unref(y.DownloadOutlined))])],2)])]),_:3},16,["class"]))}});exports.default=F;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),y=require("@ant-design/icons-vue"),_=require("@aplus-frontend/antdv"),I=require("lodash-unified");require("../../config-provider/index.js");const l=require("./hooks/useOss.js"),M=require("./imgs/admin-fallback.jpg.js"),A=require("./imgs/user-fallback.jpg.js"),B=require("./style/index.js"),S=require("../../config-provider/hooks/use-namespace.js"),u=require("../../config-provider/hooks/use-global-config.js"),j=require("../../config-provider/hooks/use-locale.js"),E=e.defineComponent({__name:"ApImage",props:{getOssAccess:{},width:{},height:{},alt:{},fallback:{},src:{},fileName:{},uiMode:{},preview:{type:[Boolean,Object],default:!0}},setup(g){const{b:i}=S.useNamespace("ap-image"),d=B.default("ap-image"),t=g,f={aplus:A.default,admin:M.default},b=u.useGlobalConfig("apImage",{uiMode:"aplus"}),v=u.useGlobalConfig("apUpload"),m=u.useGlobalConfig("downloadCenterTriggerConfig"),h=e.computed(()=>t.uiMode||b.value?.uiMode),{t:k,lang:C}=j.useLocale(),p=e.computed(()=>t.getOssAccess||v.value?.getOssAccess),w=e.computed(()=>f[h.value]||f.aplus),q=e.computed(()=>t?.fallback||w.value),o=e.ref("");l.injectLocaleToOss(k,C),e.watchEffect(async()=>{if(!t?.src){o.value="";return}if(t.src?.startsWith("http")||t.src?.startsWith("data:")){o.value=t.src;return}try{const r=t.src?.match(/^([^:]+):(.*)$/),s=r?.[1],a=r?.[2]??t.src,n=await l.getOssInstance(()=>s?p.value?.(s):p.value?.(),s),c=await l.getSignatureUrl({oss:n,fileName:a});c&&(o.value=c)}catch{o.value=""}});async function O(){if(!t?.src)return;const r=t.src,s=t.fileName??t.src;if(t.src?.startsWith("http")||t.src?.startsWith("data:")){N(r,s);return}if(m.value?.trigger){let a=[{objectName:r,fileName:s}];await m.value?.trigger(a)}}const N=(r,s)=>{const a=document.createElement("a");a.href=r,a.rel="noopener noreferrer",a.setAttribute("download",s),document.body.appendChild(a),a.click(),document.body.removeChild(a)};return(r,s)=>(e.openBlock(),e.createBlock(e.unref(_.Image),e.mergeProps({class:[e.unref(i)(),e.unref(d)]},{...e.unref(I.omit)(t,["src","getOssAccess"]),fallback:q.value,src:o.value}),{toolbarRender:e.withCtx(a=>[e.renderSlot(r.$slots,"toolbarRender",e.normalizeProps(e.guardReactiveProps({...a})),()=>[e.createElementVNode("div",{class:e.normalizeClass([e.unref(i)("toolbar"),e.unref(d)])},[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(a.originalNodes,(n,c)=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n),e.mergeProps({ref_for:!0},t,{key:c}),null,16))),128)),e.createElementVNode("div",{class:"ant-image-preview-operations-operation",onClick:O},[e.createVNode(e.unref(y.DownloadOutlined))])],2)])]),_:3},16,["class"]))}});exports.default=E;

package/lib/src/business/ap-image/hooks/useOss.d.ts

@@ -3,7 +3,7 @@ import { Ref } from 'vue';
 import { Translator } from '../../../config-provider';
 type GetOssAccess = () => Promise<accessCreate>;
 export declare function injectLocaleToOss(tValue: Translator, langValue: Ref<string>): void;
-export declare function getOssInstance(getOssAccess?: GetOssAccess): Promise<Oss>;
+export declare function getOssInstance(getOssAccess?: GetOssAccess, bucket?: string): Promise<Oss>;
 export declare function getSignatureUrl({ oss, fileName }: {
     oss: Oss;
     fileName: string;

package/lib/src/business/ap-image/hooks/useOss.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("@aplus-frontend/oss"),l=1e4;let n,r;function u(e,s){n=e,r=s}const g={"zh-cn":"zh_CN",en:"en_US"};function p(){return g[r.value]??"zh_CN"}let t;async function O(e){if(!e)throw new Error(`${n("ap.apUpload.pleasePass")}getOssAccess`);return t?.createDate&&t.createDate<Date.now()+l&&t?.oss||(t={oss:new Promise((s,c)=>{const a=i.createOssInstance();a.initOssClient({getOssAccess:e,locale:p(),onFailure:o=>{c(typeof o?.message=="string"?o.message:n("ap.apUpload.FailedToObtainOssTemporaryPermissions"))}}).then(()=>{s(a)})}),createDate:Date.now()}),t.oss}function f({oss:e,fileName:s}){return e.getSignatureUrl(s)}exports.getOssInstance=O;exports.getSignatureUrl=f;exports.injectLocaleToOss=u;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const g=require("@aplus-frontend/oss"),p=1e4;let n,i;function O(t,s){n=t,i=s}const f={"zh-cn":"zh_CN",en:"en_US"};function m(){return f[i.value]??"zh_CN"}const c=new Map;async function T(t,s){if(!t)throw new Error(`${n("ap.apUpload.pleasePass")}getOssAccess`);const a=s||"ap_image_default_bucket";let e=c.get(a);return e?.createDate&&e.createDate<Date.now()+p&&e?.oss||(e={oss:new Promise((l,u)=>{const o=g.createOssInstance();o.initOssClient({getOssAccess:t,locale:m(),onFailure:r=>{u(typeof r?.message=="string"?r.message:n("ap.apUpload.FailedToObtainOssTemporaryPermissions"))}}).then(()=>{l(o)})}),createDate:Date.now()},c.set(a,e)),e.oss}function U({oss:t,fileName:s}){return t.getSignatureUrl(s)}exports.getOssInstance=T;exports.getSignatureUrl=U;exports.injectLocaleToOss=O;

package/lib/src/business/ap-image/interface.d.ts

@@ -1,7 +1,7 @@
 import { accessCreate } from '@aplus-frontend/oss';
 import { UiModeType } from '../../config-provider';
 export interface ApImageProps {
-    getOssAccess?: () => Promise<accessCreate>;
+    getOssAccess?: (bucket?: string) => Promise<accessCreate>;
     width?: number | string;
     height?: number | string;
     alt?: string;

package/lib/src/business/ap-upload/apUpload.vue.d.ts

@@ -181,8 +181,8 @@ declare const __VLS_component: DefineComponent<ExtractPropTypes<{
     value: string | unknown[] | Record<string, any>;
     maxCount: number;
     maxSize: number;
-    getOssAccess: GetOssAccess;
     needName: boolean | Record<string, any>;
+    getOssAccess: GetOssAccess;
     accept: string;
     beforeUpload: BeforeUpload;
     onRemove: Function;

package/lib/src/config-provider/constants.d.ts

@@ -1,5 +1,5 @@
 import { DefaultOptionType } from '@aplus-frontend/antdv/es/select';
-import { client } from '@aplus-frontend/oss';
+import { accessCreate } from '@aplus-frontend/oss';
 import { InjectionKey, Ref, VNode } from 'vue';
 import { Recordable } from '../type';
 import { ConfigProviderProps } from './config-provider-props';
@@ -18,7 +18,7 @@ export type ApiType = {
 };
 export type ApUploadConfig = {
     dirName?: string;
-    getOssAccess?: Parameters<typeof client.initOssClient>[0]['getOssAccess'];
+    getOssAccess?: (bucket?: string) => Promise<accessCreate>;
     needName?: boolean | {
         pathKey?: string;
         nameKey?: string;

package/lib/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "7.10.3";
+declare const _default: "7.10.4";
 export default _default;

package/lib/src/version.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="7.10.3";exports.default=e;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="7.10.4";exports.default=e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "7.10.3",
+  "version": "7.10.4",
   "main": "./lib/index.js",
   "type": "module",
   "files": [