@aplus-frontend/ui 7.10.3 → 7.10.5

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

@@ -1,30 +1,33 @@
 import { createOssInstance as r } from "@aplus-frontend/oss";
-let n, o, t;
-function p(s, e, a) {
-  n = s, o = e, a && (t = a);
+let a, c, n;
+function g(e, t, s) {
+  a = e, c = t, s && (n = s);
 }
 const i = {
   "zh-cn": "zh_CN",
   en: "en_US"
 };
-function c() {
-  return i[o.value] ?? "zh_CN";
+function l() {
+  return i[c.value] ?? "zh_CN";
 }
-async function g() {
-  if (!t)
-    throw new Error(`${n("ap.apUpload.pleasePass")}getOssAccess`);
-  const s = r();
+async function O({ bucket: e } = {}) {
+  if (!n)
+    throw new Error(`${a("ap.apUpload.pleasePass")}getOssAccess`);
+  const t = await (e ? n(e) : n()), s = r();
   return await s.initOssClient({
-    getOssAccess: t,
-    locale: c(),
-    onFailure: (e) => {
+    getOssAccess: async () => t,
+    locale: l(),
+    onFailure: (o) => {
       throw new Error(
-        typeof e?.message == "string" ? e.message : n("ap.apUpload.FailedToObtainOssTemporaryPermissions")
+        typeof o?.message == "string" ? o.message : a("ap.apUpload.FailedToObtainOssTemporaryPermissions")
       );
     }
-  }), s;
+  }), {
+    oss: s,
+    bucket: t?.bucket
+  };
 }
 export {
-  g as getOssInstance,
-  p as injectHookOss
+  O as getOssInstance,
+  g as injectHookOss
 };

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

@@ -1,7 +1,7 @@
 import { UploadFile, UploadChangeParam, UploadProps } from '@aplus-frontend/antdv';
 import { accessCreate } from '@aplus-frontend/oss';
 import { VNodeChild } from 'vue';
-export type ApUploadGetOssAccess = () => Promise<accessCreate>;
+export type ApUploadGetOssAccess = (bucket?: string) => Promise<accessCreate>;
 type Parameters<T extends (...args: any) => any> = T extends (...args: infer P) => any ? P : never;
 export type ApUploadFile<T = any> = UploadFile<T> & {
     ossDestroy?: () => any;
@@ -11,6 +11,7 @@ export type ApUploadCustomRequest = (option: Omit<Parameters<Exclude<UploadProps
     file?: ApUploadFile;
 }, props?: {
     dirName?: string;
+    bucket?: string;
 }) => void;
 export type ApUploadBaseProps<T = any> = {
     dirName: string;
@@ -23,6 +24,7 @@ export type ApUploadBaseProps<T = any> = {
     customRequest?: ApUploadCustomRequest;
     maxSizeErrorMsg?: string;
     acceptErrorMsg?: string;
+    bucket?: string;
 };
 export type ApUploadSingleProps<T = any> = ApUploadBaseProps<T> & {
     title?: VNodeChild;

package/es/src/business/ap-upload-file/utils/upload.mjs

@@ -1,14 +1,14 @@
 import { message as i } from "@aplus-frontend/antdv";
-import { getOssInstance as g } from "../hook/useOss.mjs";
-import { fileMatchesAccept as f } from "./accept.mjs";
+import { getOssInstance as d } from "../hook/useOss.mjs";
+import { fileMatchesAccept as x } from "./accept.mjs";
 let o;
-function U(e) {
+function C(e) {
   o = e;
 }
 function m(e, r, a) {
   e.status = r, e.error = a;
 }
-function S(e, r, a) {
+function z(e, r, a) {
   if (a?.maxCount && a.maxCount > 1 && r.length >= a.maxCount) {
     const t = a?.maxCountErrorMsg || o("ap.apUpload.maxUploadFiles", {
       maxCount: a.maxCount
@@ -21,42 +21,44 @@ function S(e, r, a) {
     });
     return i.warning(t), m(e, "error", t), !1;
   }
-  if (!f(e, a.accept)) {
+  if (!x(e, a.accept)) {
     const t = a?.acceptErrorMsg || o("ap.apUpload.fileFormatNotSupported");
     return i.warning(t), m(e, "error", t), !1;
   }
   return !0;
 }
-const C = async (e, r) => {
-  const { file: a, onError: t, onProgress: u, onSuccess: l } = e;
+const M = async (e, r) => {
+  const { file: a, onError: t, onProgress: l, onSuccess: g } = e;
   try {
-    const n = await (await g())?.put({
+    const { oss: c, bucket: u } = await d({
+      bucket: r?.bucket
+    }), s = await c?.put({
       dirName: r?.dirName,
       fileName: a?.name,
       data: a,
-      progressCallBack: (s) => {
-        u?.({
-          percent: s
+      progressCallBack: (n) => {
+        l?.({
+          percent: n
         });
       }
     });
-    if (n.status === 204)
+    if (s.status === 204)
       return;
-    if (n.status === 200) {
-      const { saveUrl: s } = n;
-      l?.({
+    if (s.status === 200) {
+      const { saveUrl: n } = s, f = u && n ? `${u}:${n}` : n;
+      g?.({
         fileName: a?.name,
-        path: s
+        path: f
       });
     } else
-      t?.(n?.message || o("ap.apUpload.networkAnomaly"));
+      t?.(s?.message || o("ap.apUpload.networkAnomaly"));
   } catch (c) {
     t?.(c);
   }
 };
 export {
   m as changeFileStatus,
-  U as injectUtilUpload,
-  S as uploadBeforeUpload,
-  C as uploadCustomRequest
+  C as injectUtilUpload,
+  z as uploadBeforeUpload,
+  M as uploadCustomRequest
 };

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.5";
 export default _default;

package/es/src/version.mjs

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

package/lib/src/ap-field/interface.d.ts

@@ -211,7 +211,7 @@ export type ApFieldTreeSelectExpose = Omit<ApFieldSelectExpose, 'request'> & {
      */
     request: (currentNode?: LegacyDataNode, clear?: boolean) => Promise<void>;
 };
-export type ApFieldSliderProps = BasicApFieldProps<SliderProps> & {
+export type ApFieldSliderProps = BasicApFieldProps<Partial<SliderProps>> & {
     emptyText?: string;
     defaultValue?: number | [number, number];
 };