@hzab/form-render 1.5.0 → 1.5.1-beta

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# @hzab/form-render@1.6.0
+
+feat: 私有部署文件上传
+
+# @hzab/form-render@1.5.1
+
+fix: schemaScope 使用 Ref 缓存，解决 onChange tempData 更新问题
+
 # @hzab/form-render@1.5.0
 
 feat: ossUpload 文件目录配置 dir 前缀 oss-upload 文件目录；dir 格式格式化

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/form-render",
-  "version": "1.5.0",
+  "version": "1.5.1-beta",
   "description": "",
   "main": "src",
   "scripts": {

package/src/components/Upload/README.md

@@ -32,6 +32,7 @@
 | beforeUploadCheck    | Function | 否   | -        | 追加的 beforeUpload 检查，返回 Promise.reject() 进行拦截                             |
 | templateUrl          | string   | 否   | -        | 模板下载的地址                                                                       |
 | templateDownloadText | string   | 否   | 模板下载 | 模板下载按钮的文案                                                                   |
+| uploadParams         | Object   | 否   | {}       | 文件上传接口入参                                                                     |
 
 ### fileListConf 结果数据配置
 
@@ -49,3 +50,15 @@
 | axiosConf       | Object | 否   | -      | axios 配置                                                     |
 | signatureParams | Object | 否   | -      | 请求 oss 上传地址接口的入参                                    |
 | serverUrl       | string | 否   | -      | 请求 oss 上传地址的接口，默认 /api/v1/user/oss/getWebOssConfig |
+
+#### signatureParams
+
+| 参数    | 类型   | 必填 | 默认值 | 说明                                                                          |
+| ------- | ------ | ---- | ------ | ----------------------------------------------------------------------------- |
+| fileAcl | string | 否   | -      | 是否是私有域上传 private-私有，public-read-公共读，public-read-write-公共读写 |
+
+### uploadParams
+
+| 参数    | 类型   | 必填 | 默认值 | 说明                                                                          |
+| ------- | ------ | ---- | ------ | ----------------------------------------------------------------------------- |
+| fileAcl | string | 否   | -      | 是否是私有域上传 private-私有，public-read-公共读，public-read-write-公共读写 |

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

@@ -0,0 +1,335 @@
+import { axios } from "@hzab/data-model";
+
+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;
+  /**
+   * 文件上传接口地址
+   */
+  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);
+      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 default OfflineUpload;

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

@@ -1,19 +1,57 @@
 import LUploadOss from "./ossUpload";
+import OfflineUpload from "./OfflineUpload";
 
-export const getOfflineUploadRequest = (props) => {
+/**
+ * 私有化部署文件上传
+ * @param opt
+ * @returns
+ */
+export const getOfflineUploadRequest = (opt) => {
+  const {
+    /** 是否是 私有域 存储，预览地址需要特殊处理 */
+    isPrivateStore,
+    UploadOss,
+    offlineServerUrl,
+    offlineUploadUrl,
+    offlinePreviewUrl,
+    ossOpt,
+    params,
+  } = opt || {};
   return ({ action, data, file, filename, headers, method, onSuccess, onProgress, onError }) => {
-    // TODO: 处理请求逻辑
-    file.ossPromise = new Promise((resolve) => {
-      resolve(file);
-    })
-      .then((file) => {
-        onSuccess(file);
-        return file;
+    const _UploadOss = UploadOss || OfflineUpload;
+    const offlineUpload = new _UploadOss({
+      serverUrl: offlineServerUrl,
+      previewUrl: offlinePreviewUrl,
+      ...ossOpt,
+    });
+    file.ossPromise = offlineUpload
+      .upload(file, {
+        uploadUrl: offlineUploadUrl,
+        params: {
+          ...(params || {}),
+        },
+      })
+      .then((res) => {
+        file.uploadInfo = res;
+        /** 上传存储的地址，用于获取对应的预览地址 */
+        file.storeUrl = res.url;
+        /** 预览地址 */
+        file.previewUrl = res.presignedUrl || res.url;
+        /** FIXME: 本地 url 直接使用预览地址，解决 previewFile 无法正常使用 previewUrl 的问题  */
+        file.url = file.previewUrl;
+        // file.url = file.storeUrl;
+        onSuccess(res);
+        return res;
       })
       .catch(onError);
   };
 };
 
+/**
+ * 阿里云 oss 文件上传
+ * @param opt
+ * @returns
+ */
 export const getOssUploadRequest = (opt) => {
   const { UploadOss, ossServerUrl, ossOpt, params } = opt || {};
   return ({ action, data, file, filename, headers, method, onSuccess, onProgress, onError }) => {
@@ -25,7 +63,6 @@ export const getOssUploadRequest = (opt) => {
     file.ossPromise = ossUpload
       .upload(file, {
         params: {
-          isPublic: 1,
           ...(params || {}),
         },
       })

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

@@ -1,5 +1,21 @@
 import { nanoid } from "./nanoid";
 
+/**
+ * 获取文件后缀
+ * @param fileUrl
+ * @returns
+ */
+export function getFileExt(fileUrl) {
+  if (typeof fileUrl !== "string") {
+    return;
+  }
+  const res = fileUrl?.match(/([^\/]+?)\.([^\/\.]+)$/);
+  if (res && res.length > 2) {
+    return res[2];
+  }
+  return fileUrl;
+}
+
 /**
  * 从 url 获取文件名称，不包含后缀
  * @param {*} fileName
@@ -55,11 +71,13 @@ export const mergeFileName = function (fileName, str = "") {
  * @returns
  */
 export const getUFileName = function (fileName) {
-  return mergeFileName(getFileName(fileName) || "rc-upload", `-${Date.now()}-${nanoid()}`);
+  return mergeFileName(getFileName(fileName) || "rc-upload", "-" + `~kid-${nanoid()}~` + `${Date.now()}`);
 };
 
 /**
  * 根据 file 对象获取文件名称，文件名称包含：初始名称、类型
+ * 数据存储格式 ~k[key]-[data]~ 如： ~ktime-1743649562530~
+ * key、data 中的 ~ 转为 _
  * @param file
  */
 export const getFileNameByFileObj = (file) => {
@@ -67,5 +85,56 @@ export const getFileNameByFileObj = (file) => {
   if (_fileName.indexOf("--Cs--") >= 0) {
     return _fileName;
   }
-  return mergeFileName(_fileName, `--Cs--${file.type?.replace(/[\/\-\+]/g, "_")}-${Date.now()}-${nanoid()}`);
+  // id、时间、文件类型
+  const id = file.id || file.uid || nanoid();
+  return mergeFileName(
+    _fileName,
+    "-" +
+      setFileNameObj({
+        id,
+        time: file.createTime ?? Date.now(),
+        type: (file.type || file.contentType)?.replace("/", "_"),
+      }),
+  );
+};
+
+/**
+ * 解析
+ * @param url
+ * @returns
+ */
+export const getFileNameObj = function (url): any {
+  const list = url.match(/~k([^-~]+)-([^~]*)~/g);
+  const res = {};
+  list?.forEach((it) => {
+    const arr = it?.match(/~k([^-~]+)-([^~]*)~/);
+    if (arr?.length >= 3) {
+      res[arr[1]] = arr[2];
+    }
+  });
+  return res;
+};
+
+/**
+ * 解析
+ * @param url
+ * @returns
+ */
+export function setFileNameObj(obj) {
+  return Object.keys(obj)
+    .map((key) => {
+      return `~k${key?.replace(/~/g, "_")}-${obj[key]?.toString()?.replace(/~/g, "_")}~`;
+    })
+    .join("");
+}
+
+/**
+ * 通过 key 获取对应的值
+ * @param url
+ * @param key
+ * @returns
+ */
+export const getValByKey = function (url, key) {
+  const reg = new RegExp(`~k${key?.replace(/~/g, "_")}-\([^~]*\)~`);
+  return url.match(reg)?.[1];
 };

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

@@ -1,5 +1,5 @@
 import { getFileURL, getFileType, isBase64Str } from "./utils";
-import { getUFileName, getFileName, getFullFileName } from "./fileName";
+import { getUFileName, getFileName, getFullFileName, getFileExt, getFileNameObj } from "./fileName";
 import { nanoid } from "./nanoid";
 
 /**
@@ -14,14 +14,29 @@ import { nanoid } from "./nanoid";
  * 出入参数据子项处理配置项
  */
 export interface IFile {
+  uid?: string;
   /** 唯一 id */
-  uid: string;
-  /** 存储的文件名称 */
-  name: string;
-  /** 上传的文件名称 */
-  sourceName: string;
+  id: string;
   /** 文件地址 */
   url: string;
+  /** 存储的文件地址 */
+  storeUrl: string;
+  /** 存储的文件名称 */
+  name?: string;
+  /** 存储的文件名称 */
+  filename?: string;
+  /** 上传的文件名称 */
+  originalFilename: string;
+  /** 基础路径 */
+  basePath?: string;
+  /** 存储路径 */
+  path?: string;
+  /** 文件后缀 */
+  ext?: string;
+  /** 文件类型 */
+  contentType: string;
+  /** 上传平台 */
+  platform: string;
   /** 文件预览地址 */
   previewUrl?: string;
   /** 文件类型 */
@@ -30,6 +45,8 @@ export interface IFile {
   size: number;
   /** 原始 file 文件 */
   originFileObj?: File;
+  /** 文件上传时间 */
+  createTime?: string;
   /** 最后更新时间戳 */
   lastModified?: number;
 }
@@ -50,21 +67,39 @@ export interface IHandlerOpt {
 
 /** 内部文件格式 */
 const fileTpl: IFile = {
+  /** 唯一 id */
   uid: "",
-  /** 上传的文件名称 */
-  sourceName: "",
-  /** 存储的文件名称 */
-  name: "",
+  id: "",
   /** 文件地址 */
   url: "",
-  /** 文件预览地址 */
-  previewUrl: "",
+  /** 存储的文件地址 */
+  storeUrl: "",
+  /** 存储的文件名称 */
+  name: "",
+  /** 存储的文件名称 */
+  filename: "",
+  /** 上传的文件名称 */
+  originalFilename: "",
+  /** 基础路径 */
+  basePath: "",
+  /** 存储路径 */
+  path: "",
+  /** 文件后缀 */
+  ext: "",
   /** 文件类型 */
   type: "",
+  /** 文件类型 */
+  contentType: "",
+  /** 文件预览地址 */
+  previewUrl: undefined,
   /** 文件大小 */
   size: undefined,
+  /** 上传平台 */
+  platform: undefined,
   /** 最后更新时间戳 */
   lastModified: undefined,
+  /** 文件上传时间 */
+  createTime: undefined,
   /** 源文件 */
   originFileObj: undefined,
 };
@@ -97,10 +132,16 @@ export const objStrToObj = function (objStr) {
  * @returns
  */
 export function mergePreviewConfig(uri, previewConfig) {
-  if (typeof uri !== "string") {
-    return uri;
+  let _uri = uri;
+  let basePath = "";
+  if (typeof _uri === "object") {
+    basePath = _uri.basePath;
+    _uri = _uri.previewUrl || _uri.url;
   }
-  let _uri = uri?.trim();
+  if (typeof _uri !== "string") {
+    return _uri;
+  }
+  _uri = _uri?.trim();
   // base64 直接返回
   if (isBase64Str(_uri)) {
     return _uri;
@@ -138,32 +179,61 @@ export const handleInputItem = (data, opt: IHandlerOpt) => {
   // 对象字符串 转为 对象
   const _data = objStrToObj(data);
   if (typeof _data === "string") {
+    const obj = getFileNameObj(_data);
+    file.id = obj?.id;
+    file.uid = file.id;
     file.url = _data;
-    file.sourceName = getFullFileName(file.url);
-    file.name = file.sourceName;
-    file.type = getFileType(_data);
+    file.storeUrl = _data;
+    file.name = getFullFileName(file.url);
+    file.filename = file.name;
+    file.originalFilename = getFullFileName(file.url);
+    file.type = getFileType(file.url);
+    file.ext = getFileExt(file.url);
   } else if (typeof _data === "object") {
     const sourceData = _data.originFileObj || _data;
-    file.uid = _data.uid;
+    file.id = _data.id || _data.uid;
     file.url = sourceData.url || sourceData.ossUrl;
-    file.sourceName = _data.sourceName || getFullFileName(file.url) || _data.name;
-    file.name = _data.name || getFullFileName(file.url);
-    file.type = _data.type;
-    file.size = _data.size;
+    file.storeUrl = file.url;
+    file.originalFilename = _data.originalFilename || getFullFileName(file.url) || _data.name;
+    file.name = _data.filename || _data.name || getFullFileName(file.url);
+    file.filename = file.name;
     file.originFileObj = data instanceof File ? data : undefined;
     file.lastModified = _data.lastModified;
+    /** 基础路径 */
+    file.basePath = _data.basePath;
+    /** 存储路径 */
+    file.path = _data.path;
+    /** 文件后缀 */
+    file.ext = getFileExt(file.url);
+    /** 文件类型 */
+    file.type = _data.contentType || _data.type;
+    /** 文件类型 */
+    file.contentType = file.type;
+    /** 文件大小 */
+    file.size = _data.size;
+    /** 上传平台 */
+    file.platform = _data.platform;
+    /** 上传平台 */
+    file.createTime = _data.createTime;
   }
-  if (!file.uid) {
-    file.uid = `${getFileName(file.url || file.name) || "rc-upload"}-${Date.now()}-${nanoid()}`;
+  if (!file.id) {
+    file.id =
+      file.uid || `${getFileName(file.url || file.name || file.filename) || "rc-upload"}-${Date.now()}-${nanoid()}`;
   }
   if (!file.name) {
-    file.name = file.uid;
+    file.name = file.id;
+  }
+  if (!file.filename) {
+    file.filename = file.name;
+  }
+  if (!file.storeUrl) {
+    file.storeUrl = file.url;
   }
 
   const { previewConfig } = opt || {};
 
   // 合并预览地址？
-  file.previewUrl = mergePreviewConfig(file.url, previewConfig);
+  file.previewUrl = mergePreviewConfig(file, previewConfig);
 
   return file;
 };
@@ -180,17 +250,8 @@ export const handleInputFileList = (fileList, opt: IHandlerOpt) => {
   let _fileList = fileList;
   const { listMode, split } = opt || {};
 
-  // 统一成数组格式
-  if (_fileList !== null && _fileList !== undefined && !Array.isArray(_fileList)) {
-    _fileList = [_fileList];
-  }
-
   // splitStr jsonStr 模式下 Upload 自动将字符串嵌套了数组，需要手动处理
   if (listMode === "splitStr" || listMode === "jsonStr") {
-    if (Array.isArray(_fileList) && _fileList.length === 1 && typeof _fileList[0] === "string") {
-      // @ts-ignore
-      _fileList = _fileList[0];
-    }
     if (typeof _fileList === "string") {
       if (listMode === "splitStr") {
         // @ts-ignore
@@ -203,6 +264,11 @@ export const handleInputFileList = (fileList, opt: IHandlerOpt) => {
     }
   }
 
+  // 统一成数组格式
+  if (_fileList !== null && _fileList !== undefined && !Array.isArray(_fileList)) {
+    _fileList = [_fileList];
+  }
+
   if (Array.isArray(_fileList)) {
     const arrRes = [];
     _fileList.forEach((it) => {
@@ -222,29 +288,51 @@ export const handleFileName = function () {};
  * @returns
  */
 export const formatItem = function (data) {
-  let url = data.url || (data instanceof File ? getFileURL(data) : data.url);
+  // TODO: storeUrl 来源于【本地 url 直接使用预览地址，解决 previewFile 无法正常使用 previewUrl 的问题】
+  const url = data.storeUrl || data.url || (data instanceof File ? getFileURL(data) : data.url);
+  const uid = data.uid ?? data.id ?? getUFileName(data.name || data.filename);
+  const filename = data.filename || data.uploadInfo?.filename || (data.url ? getFullFileName(data.url) : data.name);
   const res = {
+    uid: uid,
     /** 唯一 id */
-    uid: data.uid || getUFileName(data.name),
-    /** 上传的文件名称 */
-    sourceName: data.sourceName || data.name,
-    /** 存储的文件名称 */
-    name: data.url ? getFullFileName(data.url) : data.name,
+    id: uid,
     /** 文件地址 */
     url: url,
+    /** 存储的文件名称 */
+    name: filename,
+    /** 存储的文件名称 */
+    filename: filename,
+    /** 上传的文件名称 */
+    originalFilename: data.originalFilename || data.uploadInfo?.originalFilename || data.name || data.filename,
+    /** 基础路径 */
+    basePath: data.basePath || data.uploadInfo?.basePath,
+    /** 存储路径 */
+    path: data.path || data.uploadInfo?.path,
+    /** 文件后缀 */
+    ext: data.ext || data.uploadInfo?.ext || getFileExt(url),
     /** 文件类型 */
     type: data.type,
+    /** 文件类型 */
+    contentType: data.type,
     /** 文件大小 */
     size: data.size,
+    /** 上传平台 */
+    platform: data.platform || data.uploadInfo?.platform,
     /** 最后更新时间戳 */
     lastModified: data.lastModified,
+    /** 文件上传时间 */
+    createTime: data.createTime || data.uploadInfo?.createTime,
+    /** 源文件 */
     originFileObj: data instanceof File ? data : undefined,
   };
   if (!res.name) {
-    res.name = res.uid;
+    res.name = res.id ?? res.uid;
+  }
+  if (!res.filename) {
+    res.filename = res.id ?? res.uid;
   }
-  if (!res.sourceName) {
-    res.sourceName = res.name;
+  if (!res.originalFilename) {
+    res.originalFilename = res.name || res.filename;
   }
   return res;
 };

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

@@ -4,4 +4,4 @@ import { customAlphabet } from "nanoid";
  */
 export const alphabet = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
-export const nanoid = customAlphabet(alphabet, 10);
+export const nanoid = customAlphabet(alphabet, 8);

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

@@ -192,43 +192,3 @@ export function mergePreviewConfig(uri, previewConfig) {
 
   return uri;
 }
-
-/**
- * 处理传入的数据，数据格式统一转成 Array<fileObject>
- * @param {Array} fileList Array<fileObject|string>
- * @param {number} maxCount
- * @returns Array<fileObject>
- */
-export function handleInputFileList(_fileList, maxCount = 1, isFileObj, isOssUpload, previewConfig) {
-  const fileList = handleMaxCount(getArr(_fileList), maxCount);
-  if (fileList.length === 0) {
-    return fileList;
-  }
-  let resList = fileList;
-  if (!Array.isArray(resList)) {
-    resList = [resList];
-  }
-  resList = fileList.map((file, i) => {
-    if (typeof file === "string") {
-      const uid = nanoid();
-      return {
-        name: uid,
-        uid: uid,
-        ossUrl: file,
-        url: file,
-        // size: Infinity,
-      };
-    }
-    if (isFileObj && isOssUpload) {
-      file.url = mergePreviewConfig(file.ossUrl, previewConfig);
-    }
-    if (file && !file.uid) {
-      file.uid = nanoid();
-    }
-    if (file && !file.name) {
-      file.name = file.uid;
-    }
-    return file;
-  });
-  return resList;
-}

package/src/components/Upload/uploader-input.jsx

@@ -72,7 +72,7 @@ function Uploader(props) {
   }
 
   const [loading, setLoading] = useState(false);
-  const [fileList, setFileList] = useState(handleInputFileList(value, maxCount));
+  const [fileList, setFileList] = useState([]);
   useEffect(() => {
     setFileList(handleInputFileList(value, maxCount));
   }, [value]);

package/src/components/Upload/uploader.jsx

@@ -13,6 +13,7 @@ import { handleInputFileList, handleOutputFileList } from "./common/handleIOFile
 
 import PreviewModal, { hasPreviewRender, hasPreviewMedium } from "./components/PreviewModal";
 import { getOssUploadRequest, getOfflineUploadRequest } from "./common/customRequest";
+import { handlePreviewUrls } from "./common/OfflineUpload";
 
 import "./uploader.less";
 
@@ -62,6 +63,8 @@ export function Uploader({ onChange, ...props }) {
     isFileObj = false,
     isFileJson = false,
   } = props;
+  const isPrivateStore =
+    props.uploadParams?.fileAcl === "private" || props.ossOpt?.signatureParams?.fileAcl === "private";
 
   /**
    * 数据格式配置
@@ -69,14 +72,14 @@ export function Uploader({ onChange, ...props }) {
   const fileListConf = { ...defaultFileListConf, ...props.fileListConf };
 
   // 参数归一化，兼容老参数
-  const uploadMode = isOssUpload === true ? "oss" : _uploadMode;
-  if (isStrRes === true && isFileObj === false) {
+  const uploadMode = isOssUpload === true && _uploadMode === undefined ? "oss" : _uploadMode;
+  if (!fileListConf.itemMode && isStrRes === true && isFileObj === false) {
     fileListConf.itemMode = "url";
   }
-  if (isFileJson === true) {
+  if (!fileListConf.listMode && isFileJson === true) {
     fileListConf.listMode = "jsonStr";
   }
-  if (isFileObj === true) {
+  if (!fileListConf.itemMode && isFileObj === true) {
     fileListConf.itemMode = "object";
   }
 
@@ -101,7 +104,14 @@ export function Uploader({ onChange, ...props }) {
     for (let i = 0; i < _files.length; i++) {
       let _file = _files[i]?.originFileObj || _files[i];
       if (!_file.url) {
-        _file.url = (await _file.ossPromise) || _file.ossUrl || typeof _file === "string" ? _file : "";
+        const promiseRes = await _file.ossPromise;
+        _file.url =
+          typeof promiseRes === "object"
+            ? promiseRes.url
+            : promiseRes || _file.ossUrl || typeof _file === "string"
+            ? _file
+            : "";
+
         if (typeof _file.url === "string") {
           _files[i].url = _file.url;
         } else if (typeof _file?.url?.ossUrl === "string") {
@@ -128,7 +138,22 @@ export function Uploader({ onChange, ...props }) {
     if (!value) {
       return;
     }
-    setFileList(handleInputFileList(value, { ...fileListConf, maxCount, previewConfig }));
+
+    const list = handleInputFileList(value, { ...fileListConf, maxCount, previewConfig });
+
+    async function handlePreview() {
+      await handlePreviewUrls(list, {
+        ...props.ossOpt?.previewOpt,
+        previewUrl: props.offlinePreviewUrl,
+      });
+      setFileList(list);
+    }
+
+    if (uploadMode === "offline" && isPrivateStore) {
+      handlePreview();
+    } else {
+      setFileList(list);
+    }
   }, [value]);
 
   const onRemove = (file) => {
@@ -141,12 +166,17 @@ export function Uploader({ onChange, ...props }) {
   if (uploadMode === "oss") {
     customRequest = getOssUploadRequest({
       ...props,
+      isPrivateStore,
+      params: props.uploadParams || props.params,
       ossServerUrl: ossServerUrl || props.ossUrl,
     });
   } else if (uploadMode === "offline") {
     customRequest = getOfflineUploadRequest({
       ...props,
+      isPrivateStore,
+      params: props.uploadParams,
       ossServerUrl: ossServerUrl || props.ossUrl,
+      offlinePreviewUrl: props.offlinePreviewUrl,
     });
   }
 
@@ -231,6 +261,25 @@ export function Uploader({ onChange, ...props }) {
         window.open(fileUrl);
       }
     },
+    // previewFile(file) {
+    //   let promise = Promise.resolve(file?.previewUrl || file?.url || file);
+
+    //   // TODO: 文件上传之后执行了两次，但第二次的值没有生效并渲染出来。首次执行 file.ossPromise 为 undefined
+    //   // console.log("previewFile file", file);
+    //   // console.log("previewFile file.ossPromise", file.ossPromise);
+    //   // const { uploadParams, ossOpt } = props;
+    //   // // 私有域名获取预览地址
+    //   // if (file.url && uploadMode === "offline" && isPrivateStore) {
+    //   // promise = getPreviewUrl(file.url, {
+    //   //   ...ossOpt?.previewOpt,
+    //   //   previewUrl: props.offlinePreviewUrl,
+    //   // }).then((res) => {
+    //   //   return Promise.resolve(res.presignedUrl);
+    //   // });
+    //   // }
+
+    //   return promise;
+    // },
     ...(props || {}),
   };
 

package/src/index.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useImperativeHandle, forwardRef, useCallback } from "react";
+import React, { useEffect, useMemo, useImperativeHandle, forwardRef, useCallback, useRef } from "react";
 import { createForm } from "@formily/core";
 import { createSchemaField } from "@formily/react";
 import {
@@ -67,15 +67,16 @@ const antdComponents = {
   ArrayCards,
 };
 
-/** schema scope 解决父级无 schema Scope 导致 scope 对象刷新的问题 */
-let _schemaScope = { _$tempData: {} };
-
 const FormRender = forwardRef((props: any, parentRef) => {
-  if (props.schemaScope) {
-    _schemaScope = props.schemaScope;
+  /** schema scope 解决父级无 schema Scope 导致 scope 对象刷新的问题 */
+  const schemaScopeRef = useRef<{ _$tempData: Object }>();
+  if (props.schemaScope && !schemaScopeRef.current) {
+    schemaScopeRef.current = props.schemaScope;
+  } else if (!schemaScopeRef.current) {
+    schemaScopeRef.current = { _$tempData: {} };
   }
-  if (!props.schemaScope?._$tempData) {
-    _schemaScope._$tempData = {};
+  if (!schemaScopeRef.current?._$tempData) {
+    schemaScopeRef.current._$tempData = {};
   }
   const SchemaField = useCallback(
     createSchemaField({
@@ -111,7 +112,7 @@ const FormRender = forwardRef((props: any, parentRef) => {
         ...customComponents,
         ...props.components,
       },
-      scope: _schemaScope,
+      scope: schemaScopeRef.current,
     }),
     [],
   );
@@ -159,7 +160,7 @@ const FormRender = forwardRef((props: any, parentRef) => {
 
   const schema = useMemo(() => {
     return bindOnChange(props.schema, {
-      schemaScope: _schemaScope,
+      schemaScope: schemaScopeRef.current,
       onChange: props.onChange,
       formRender,
     });