@hzab/form-render 1.6.20 → 1.6.21-beta

package/CHANGELOG.md

@@ -1,5 +1,10 @@
+# @hzab/form-render@1.6.21
+
+refactor: upload 接入 utils upload utils
+
 # @hzab/form-render@1.6.20
-feat: 新增 TreeCheckbox的readOnly属性
+
+feat: 新增 TreeCheckbox 的 readOnly 属性
 
 # @hzab/form-render@1.6.19
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/form-render",
-  "version": "1.6.20",
+  "version": "1.6.21-beta",
   "description": "",
   "main": "src",
   "scripts": {
@@ -19,7 +19,7 @@
   "author": "CaiYansong",
   "license": "ISC",
   "devDependencies": {
-    "@hzab/data-model": "^1.2.0",
+    "@hzab/data-model": "^1.8.8",
     "@hzab/permissions": "^0.1.1",
     "@hzab/webpack-config": "0.0.12",
     "@types/react": "^17.0.62",
@@ -44,6 +44,7 @@
     "@formily/core": "2.3.1",
     "@formily/react": "2.3.1",
     "@formily/reactive-react": "2.3.1",
+    "@hzab/utils": "^1.0.4",
     "@turf/turf": "^6.5.0",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-react": "^1.0.6",

package/src/components/Upload/common/OfflineUpload.ts

@@ -1,339 +1,5 @@
-import { axios } from "@hzab/data-model";
+import { OfflineUpload } from "@hzab/utils/src/upload/OfflineUpload";
 
-import { getFileNameByFileObj } from "./fileName";
-import { formatDirStr, mergeDirStr } from "./utils";
-
-/**
- * 获取上传相关配置入参
- */
-export interface IGetSignatureOpt {
-  /**
-   * 配置接口地址
-   */
-  serverUrl?: string;
-  /**
-   * axios 实例
-   */
-  axios?: Object;
-  /**
-   * axios 配置
-   */
-  axiosConf?: Object;
-  /**
-   * 请求入参
-   */
-  params?: {
-    path?: string;
-  };
-}
-
-export interface IOfflineUploadProps {
-  /**
-   * axios 实例
-   */
-  axios?: Object;
-  /**
-   * axios 配置
-   */
-  axiosConf?: Object;
-  /**
-   * 配置接口地址
-   */
-  serverUrl?: string;
-  /**
-   * 获取配置接口请求入参
-   */
-  signatureParams?: {
-    path?: string;
-  };
-}
-
-/**
- * 文件上传入参
- */
-export interface IUploadOpt {
-  /**
-   * 配置接口地址
-   */
-  serverUrl?: string;
-  /**
-   * 是否开启 Hash 命名
-   */
-  useHashName?: boolean;
-  /**
-   * 文件上传接口地址
-   */
-  uploadUrl?: string;
-  /**
-   * 获取配置接口请求入参
-   */
-  params?: {
-    path?: string;
-    // 兼容 老数据
-    dir?: string;
-  };
-  /**
-   * 文件上传请求入参
-   */
-  ossParams?: {
-    path?: string;
-    // 兼容 老数据
-    dir?: string;
-  };
-  /**
-   * axios 实例
-   */
-  axios?: Object;
-  /**
-   * axios 配置
-   */
-  axiosConf?: Object;
-}
-
-/**
- * 获取上传配置
- * @param opt
- * @returns
- */
-export function getSignature(opt: IGetSignatureOpt = {}) {
-  const { serverUrl = "/api/v1/upload/init" } = opt;
-  // 减 10 秒，避免发起请求时 刚好过期的情况
-  const { axios: _ax = axios, params = {}, axiosConf } = opt;
-  if (
-    window._$offlineSignatureRes &&
-    window._$offlineSignatureRes.data &&
-    serverUrl + JSON.stringify(params) === window._$offlineSignatureRes.serverUrlParams &&
-    Date.now() - window._$offlineSignatureRes.__saveTime < window._$offlineSignatureRes.expireTimeMillis - 10000
-  ) {
-    return Promise.resolve(window._$offlineSignatureRes.data);
-  }
-  // 处理 path 格式，必须为非 / 开头， /  结尾。如： test/
-  params.path = formatDirStr(params.path);
-
-  return _ax
-    .post(
-      serverUrl,
-      {
-        ...params,
-      },
-      {
-        ...axiosConf,
-      },
-    )
-    .then((res) => {
-      if (res?.data?.code === 500) {
-        return Promise.reject(res.data);
-      }
-      if (res?.data?.code === 200) {
-        window._$offlineSignatureRes = {
-          data: res?.data?.data,
-        };
-        if (window._$offlineSignatureRes) {
-          window._$offlineSignatureRes.__saveTime = Date.now();
-          window._$offlineSignatureRes.serverUrlParams = serverUrl + JSON.stringify(params);
-        }
-        return window._$offlineSignatureRes.data;
-      }
-    });
-}
-
-export interface IGetPreviewUrlsOpt {
-  previewUrl?: string;
-  params?: Object;
-  axios?: Object;
-  axiosConf?: Object;
-}
-
-/**
- * 获取预览地址-批量
- * @param urlList
- * @param opt
- * @returns
- */
-export const getPreviewUrls = function (urlList, opt: IGetPreviewUrlsOpt = {}) {
-  return new Promise(async (resolve, reject) => {
-    const { axios: _ax = axios, axiosConf, previewUrl } = opt || {};
-
-    const _axios = _ax;
-
-    let _list = urlList;
-    if (_list && !Array.isArray(_list)) {
-      _list = [_list];
-    }
-
-    return _axios
-      .post(previewUrl || "/api/v1/upload/preview", _list, { ...axiosConf })
-      .then((res) => {
-        if (res?.data?.code == 200) {
-          resolve(res?.data?.data);
-        } else {
-          reject(res);
-        }
-        return res;
-      })
-      .catch((err) => {
-        console.error("offline upload err", err);
-        reject(err);
-        return Promise.reject(err);
-      });
-  });
-};
-
-/**
- * 获取预览地址
- * @param url
- * @param opt
- * @returns
- */
-export const getPreviewUrl = function (url, opt: IGetPreviewUrlsOpt = {}) {
-  return new Promise(async (resolve, reject) => {
-    const { axios: _ax = axios, axiosConf, previewUrl } = opt || {};
-
-    const _axios = _ax;
-
-    return _axios
-      .post(previewUrl || "/api/v1/upload/preview", [url], { ...axiosConf })
-      .then((res) => {
-        if (res?.data?.code == 200) {
-          resolve(res?.data?.data?.[0]);
-        } else {
-          reject(res);
-        }
-        return res;
-      })
-      .catch((err) => {
-        console.error("offline upload err", err);
-        reject(err);
-        return Promise.reject(err);
-      });
-  });
-};
-
-/**
- * 私有部署版文件上传
- */
-export class OfflineUpload {
-  axios;
-  axiosConf;
-  serverUrl;
-  signatureParams;
-  constructor(props: IOfflineUploadProps = {}) {
-    this.axios = props.axios || axios;
-    this.axiosConf = props.axiosConf || {};
-    this.serverUrl = props.serverUrl || "/api/v1/upload/init";
-    this.signatureParams = props.signatureParams || {};
-  }
-
-  getSignature(serverUrl = this.serverUrl, opt) {
-    // path 前缀 oss-upload 文件目录
-    opt.params.path = mergeDirStr("web-upload/", opt.params.path ?? opt.params.dir);
-    return getSignature({
-      ...opt,
-      serverUrl,
-      axios: opt?.axios || this.axios,
-      axiosConf: { ...this.axiosConf, ...opt?.axiosConf },
-    });
-  }
-
-  upload(file, opt: IUploadOpt = {}) {
-    return new Promise(async (resolve, reject) => {
-      // filename 表示待上传的本地文件名称。
-      const filename = getFileNameByFileObj(file, opt);
-      try {
-        const fileInfo = await this.getSignature(opt.serverUrl || this.serverUrl, {
-          ...opt,
-          params: {
-            /** 最终保存的文件名称（不传默认文件名） */
-            filename,
-            /** 存储路径（不传默认基础路径） */
-            path: opt.params?.dir || this.signatureParams?.dir,
-            /** 文件存储平台（1、s3，2、本地存储，3、FTP，默认s3） */
-            platformCode: undefined,
-            ...this.signatureParams,
-            ...opt.params,
-          },
-        });
-        const { uploadUrl, ossParams: propOssParams } = opt || {};
-        const formData = new FormData();
-        formData.set("fileInfo", fileInfo);
-        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(uploadUrl || "/api/v1/upload/execute", formData, { ...this.axiosConf, ...opt?.axiosConf })
-          .then((res) => {
-            if (res?.data?.code == 200) {
-              resolve(res?.data?.data);
-            } else {
-              reject(res);
-            }
-            return res;
-          })
-          .catch((err) => {
-            console.error("offline upload err", err);
-            reject(err);
-            return Promise.reject(err);
-          });
-      } catch (error) {
-        reject(error);
-        return Promise.reject(error);
-      }
-    });
-  }
-
-  /**
-   * 获取预览地址
-   * @param urlList
-   * @param opt
-   * @returns
-   */
-  getPreviewUrls(urlList, opt) {
-    return getPreviewUrls(urlList, {
-      ...opt,
-      axios: opt?.axios || this.axios,
-      axiosConf: { ...this.axiosConf, ...opt?.axiosConf },
-    });
-  }
-}
-
-/**
- * 批量处理预览地址
- * @param fileList
- * @param opt
- * @returns
- */
-export const handlePreviewUrls = async function (fileList, opt: IGetPreviewUrlsOpt) {
-  const res = await getPreviewUrls(
-    fileList?.map((it) => it.storeUrl || it.url),
-    {
-      ...opt,
-    },
-  );
-
-  fileList.forEach((it, i) => {
-    // TODO: storeUrl 来源于【本地 url 直接使用预览地址，解决 previewFile 无法正常使用 previewUrl 的问题】
-    if (!it.storeUrl) {
-      it.storeUrl = it.url;
-    }
-    // TODO: 本地 url 直接使用预览地址，解决 previewFile 无法正常使用 previewUrl 的问题
-    it.url = res[i].presignedUrl;
-
-    // 常规预览地址写法
-    it.previewUrl = res[i].presignedUrl;
-    if (it.uploadInfo) {
-      it.uploadInfo.previewUrl = it.previewUrl;
-    }
-  });
-  return fileList;
-};
+export * from "@hzab/utils/src/upload/OfflineUpload";
 
 export default OfflineUpload;

package/src/components/Upload/common/fileName.ts

@@ -1,4 +1,4 @@
-import { nanoid } from "./nanoid";
+import { nanoidNumALetters } from "./nanoid";
 
 /**
  * 获取文件后缀
@@ -72,7 +72,7 @@ export const mergeFileName = function (fileName, str = "") {
  * @returns
  */
 export const getUFileName = function (fileName) {
-  return mergeFileName(getFileName(fileName) || "rc-upload", "-" + `~kid-${nanoid()}~` + `${Date.now()}`);
+  return mergeFileName(getFileName(fileName) || "rc-upload", "-" + `~kid-${nanoidNumALetters()}~` + `${Date.now()}`);
 };
 
 /**
@@ -88,7 +88,7 @@ export const getFileNameByFileObj = (file, opt: any) => {
     return _fileName;
   }
   // id、时间、文件类型
-  const id = file.id || file.uid || nanoid();
+  const id = file.id || file.uid || nanoidNumALetters();
   return mergeFileName(
     _fileName,
     "-" +

package/src/components/Upload/common/handleIOFileList.ts

@@ -1,6 +1,6 @@
 import { getFileURL, getFileType, isBase64Str } from "./utils";
 import { getUFileName, getFileName, getFullFileName, getFileExt, getFileNameObj } from "./fileName";
-import { nanoid } from "./nanoid";
+import { nanoidNumALetters } from "./nanoid";
 
 /**
  * 出入参归一化
@@ -218,7 +218,7 @@ export const handleInputItem = (data, opt: IHandlerOpt) => {
   }
   if (!file.id) {
     file.id =
-      file.uid || `${getFileName(file.url || file.name || file.filename) || "rc-upload"}-${Date.now()}-${nanoid()}`;
+      file.uid || `${getFileName(file.url || file.name || file.filename) || "rc-upload"}-${Date.now()}-${nanoidNumALetters()}`;
   }
   if (!file.name) {
     file.name = file.id;

package/src/components/Upload/common/nanoid.ts

@@ -1,7 +1,5 @@
-import { customAlphabet } from "nanoid";
-/**
- * 指定 nanoid 字符集合
- */
-export const alphabet = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+export * from "@hzab/utils/src/nanoid";
 
-export const nanoid = customAlphabet(alphabet, 8);
+import { nanoidNumALetters } from "@hzab/utils/src/nanoid";
+
+export const nanoid = nanoidNumALetters;

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

@@ -1,106 +1,5 @@
-import { axios } from "@hzab/data-model";
-import { getFileNameByFileObj } from "./fileName";
-import { formatDirStr, mergeDirStr } from "./utils";
-
-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;
-  // 处理 dir 格式，必须为非 / 开头， /  结尾。如： test/
-  params.dir = formatDirStr(params.dir);
-
-  return _ax
-    .get(serverUrl, {
-      ...axiosConf,
-      params: {
-        isPublic: 1,
-        ...params,
-      },
-    })
-    .then((res) => {
-      window.__ossSignatureRes = res?.data?.data ?? res?.data ?? res;
-      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";
-    this.signatureParams = props.signatureParams || {};
-  }
-
-  getSignature(serverUrl = this.serverUrl, opt) {
-    // dir 前缀 oss-upload 文件目录
-    opt.params.dir = mergeDirStr("web-upload/", opt.params.dir);
-    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(opt.serverUrl || this.serverUrl, {
-        ...opt,
-        params: { ...this.signatureParams, ...opt.params },
-      });
-
-      const { ossParams: propOssParams, useHashName } = opt || {};
-      const formData = new FormData();
-      // key 表示上传到 Bucket 内的 Object 的完整路径，例如 exampledir/exampleobject.txtObject，完整路径中不能包含 Bucket 名称。
-      // filename 表示待上传的本地文件名称。
-      const filename = getFileNameByFileObj(file, opt);
-      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 { axios, getSignature, OssUploadUtil } from "@hzab/utils/src/upload/OssUploadUtil";
+console.log('OssUploadUtil', OssUploadUtil);
 
 /**
  * 处理文件上传逻辑
@@ -111,7 +10,8 @@ class OssUpload {
 export async function handleOssUpload(files, opt) {
   const _files = files;
   const { ossUrl, signatureParams, ossParams, axiosConf, useHashName } = opt || {};
-  const ossUpload = new OssUpload({
+  const ossUpload = new OssUploadUtil({
+    ...opt,
     axios: opt.axios,
     axiosConf: axiosConf,
     serverUrl: ossUrl || "/api/v1/user/oss/getWebOssConfig",
@@ -154,6 +54,6 @@ export async function handleOssUpload(files, opt) {
   });
 }
 
-export { axios };
+export { axios, getSignature };
 
-export default OssUpload;
+export default OssUploadUtil;

package/src/components/Upload/common/utils.js

@@ -1,4 +1,5 @@
-import { nanoid } from "nanoid";
+
+
 
 /**
  * 格式化 dir 字符串，必须为非 / 开头， /  结尾。如： test/