@hzab/form-render 1.1.0 → 1.1.2

package/src/components/Upload/uploader.jsx

@@ -11,7 +11,7 @@ import React, { useEffect, useState } from "react";
 import { nanoid } from "nanoid";
 
 import { handleInputFileList, getFileName, getFileType } from "./common/utils";
-import UploadOss from "./common/ossUpload";
+import LUploadOss from "./common/ossUpload";
 
 import PreviewModal, { hasPreviewRender, hasPreviewMedium } from "./components/PreviewModal";
 
@@ -43,6 +43,9 @@ export function Uploader({ onChange, ...props }) {
     templateUrl,
     beforeUploadCheck,
     templateDownloadText = "模板下载",
+    isFileObj = false,
+    isFileJson = false,
+    UploadOss,
   } = props;
 
   const [fileList, setFileList] = useState([]);
@@ -60,8 +63,14 @@ export function Uploader({ onChange, ...props }) {
           _file = _file?.originFileObj;
         }
         // 从文件对象中获取 url，ossPromise 为上传中的文件，兼容 file 为字符串的情况
-        let str = (await _file.ossPromise) || _file.url || _file.ossUrl || _file;
-        _files[i] = str;
+
+        if (isFileObj) {
+          let { ossUrl, url, uid, name, type } = (await _file.ossPromise) || _file;
+          _files[i] = { ossUrl, url, uid, name, type };
+        } else {
+          let str = (await _file.ossPromise) || _file.url || _file.ossUrl || _file;
+          _files[i] = str;
+        }
       }
     }
     // 处理空数据情况
@@ -71,17 +80,25 @@ export function Uploader({ onChange, ...props }) {
       // maxCount 为 1 的时候返回结果去除数组
       _files = _files[0];
     }
-    onChange && onChange?.(_files);
+    onChange && onChange?.(isFileJson ? JSON.stringify(_files) : _files);
   };
 
   useEffect(() => {
     if (!value) {
       return;
     }
-    let _list = value;
+
+    let _list = [];
+    try {
+      _list = JSON.parse(value);
+    } catch (e) {
+      _list = value;
+    }
+
     if (typeof _list === "string") {
       _list = value.split(",");
     }
+
     if (Array.isArray(_list)) {
       _list = _list.map((res) => {
         if (typeof res === "string") {
@@ -173,7 +190,8 @@ export function Uploader({ onChange, ...props }) {
     },
     customRequest: isOssUpload
       ? function customRequest({ action, data, file, filename, headers, method, onSuccess, onProgress, onError }) {
-          const ossUpload = new UploadOss({
+          const _UploadOss = UploadOss || LUploadOss;
+          const ossUpload = new _UploadOss({
             serverUrl: ossUrl,
             ...ossOpt,
           });
@@ -188,7 +206,7 @@ export function Uploader({ onChange, ...props }) {
               file.url = res?.data?.data?.fileUrl ?? res?.data?.fileUrl ?? res?.fileUrl;
               file.ossUrl = file.url;
               onSuccess(file);
-              return file.ossUrl;
+              return isFileObj ? file : file.ossUrl;
             })
             .catch(onError);
         }