@hzab/form-render-mobile 1.1.7 → 1.2.0

package/CHANGELOG.md

@@ -1,8 +1,8 @@
-# @hzab/form-render-mobile@1.1.6
+# @hzab/form-render-mobile@1.1.7
 
 feat:支持配置摄像头相关配置
 
-# @hzab/form-render-mobile@1.1.5
+# @hzab/form-render-mobile@1.1.6
 
 fix: 修复 || 加上 三元判断
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/form-render-mobile",
-  "version": "1.1.7",
+  "version": "1.2.0",
   "description": "formily-form-render-mobile",
   "main": "src",
   "scripts": {

package/src/components/Uploader/common/ossUpload.js

@@ -1,106 +1,5 @@
 import { axios } from "@hzab/data-model";
-
-export function getSignature(opt = {}) {
-  const { serverUrl = "/api/v1/user/oss/getWebOssConfig" } = opt;
-  // 减 10 秒，避免发起请求时 刚好过期的情况
-  if (
-    window.__ossSignatureRes &&
-    serverUrl === window.__ossSignatureRes.serverUrl &&
-    Date.now() - window.__ossSignatureRes.__saveTime < window.__ossSignatureRes.expireTimeMillis - 10000
-  ) {
-    return Promise.resolve(window.__ossSignatureRes);
-  }
-  const { axios: _ax = axios, params = {}, axiosConf } = opt;
-  return _ax
-    .get(serverUrl, {
-      ...axiosConf,
-      params: {
-        isPublic: 1,
-        ...params,
-      },
-    })
-    .then((res) => {
-      window.__ossSignatureRes = res?.data?.data;
-      if (window.__ossSignatureRes) {
-        window.__ossSignatureRes.__saveTime = Date.now();
-        window.__ossSignatureRes.serverUrl = serverUrl;
-      }
-      return window.__ossSignatureRes;
-    });
-}
-
-class OssUpload {
-  constructor(props = {}) {
-    this.axios = props.axios || axios;
-    this.axiosConf = props.axiosConf || {};
-    this.serverUrl = props.serverUrl || "/api/v1/user/oss/getWebOssConfig";
-  }
-
-  getSignature(serverUrl = this.serverUrl, opt) {
-    return getSignature({
-      ...opt,
-      serverUrl,
-      axios: opt?.axios || this.axios,
-      axiosConf: { ...this.axiosConf, ...opt?.axiosConf },
-    });
-  }
-
-  upload(file, opt = {}) {
-    return new Promise(async (resolve, reject) => {
-      const ossParams = await this.getSignature(this.serverUrl, {
-        ...opt,
-        params: opt.signatureParams,
-      });
-
-      const { ossParams: propOssParams } = opt || {};
-      const formData = new FormData();
-      // key 表示上传到 Bucket 内的 Object 的完整路径，例如 exampledir/exampleobject.txtObject，完整路径中不能包含 Bucket 名称。
-      // filename 表示待上传的本地文件名称。
-      let filename = file?.name;
-      if (file?.name) {
-        const nameArr = file?.name.match(/^(.+)\.(.+)$/);
-        if (nameArr && nameArr.length > 2) {
-          filename = `${nameArr[1]}_${Date.now()}_${Math.round(Math.random() * 1000)}.${nameArr[2]}`;
-        }
-      }
-      if (!filename) {
-        filename = `${Date.now()}.${file.type?.replace(/\w+\/, ''/)}`;
-      }
-      const key = `${ossParams?.dir}${filename}`;
-      formData.set("key", key);
-      formData.set("OSSAccessKeyId", ossParams.accessid);
-      formData.set("policy", ossParams.policy);
-      formData.set("Signature", ossParams.signature);
-      if (ossParams.callback) {
-        formData.set("callback", ossParams.callback);
-      }
-      formData.set("success_action_status", 200);
-      formData.set("file", file);
-
-      if (propOssParams) {
-        for (const key in propOssParams) {
-          if (Object.hasOwnProperty.call(propOssParams, key)) {
-            formData.set(key, propOssParams[key]);
-          }
-        }
-      }
-
-      const _axios = opt?.axios || this.axios;
-
-      return _axios
-        .post(ossParams.host, formData, { ...this.axiosConf, ...opt?.axiosConf })
-        .then((res) => {
-          resolve(res);
-          return res;
-        })
-        .catch((err) => {
-          console.error("oss upload err", err);
-          reject(err);
-          return Promise.reject(err);
-        });
-    });
-  }
-}
+import OssUpload from "@hzab/utils/src/upload/ossUpload";
 
 /**
  * 处理文件上传逻辑
@@ -128,8 +27,10 @@ export async function handleOssUpload(files, opt) {
       promise.push(
         new Promise(async (resolve, reject) => {
           const f = (await (beforeUpload && beforeUpload(file, { reject }))) || file;
+
           ossUpload
             .upload(f, {
+              ...opt,
               signatureParams: {
                 isPublic: 1,
                 ...(signatureParams || {}),