@hzab/form-render 1.7.6 → 1.7.8

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# @hzab/form-render@1.7.8
+
+fix: upload onRemove 数据处理
+
+# @hzab/form-render@1.7.7
+
+feat: scenario form-render
+
 # @hzab/form-render@1.7.6
 
 fix: ts 报错修复

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/form-render",
-  "version": "1.7.6",
+  "version": "1.7.8",
   "description": "",
   "main": "src",
   "scripts": {

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

@@ -54,7 +54,6 @@ export interface IFile {
   /** 最后更新时间戳 */
   lastModified?: number;
   thumbUrl?: string;
-
 }
 
 /**
@@ -69,9 +68,12 @@ export interface IHandlerOpt {
   itemMode: "object" | "file" | "url" | "jsonStr";
   /** 预览配置参数 */
   previewConfig?: Object;
-  thumbnailParams?: string,
-  selfUrlList?: string[]
-
+  thumbnailParams?: string;
+  selfUrlList?: string[];
+  /** maxCount === 1 时是否去除数组，直接返回内容 */
+  isResRemoveArr: boolean;
+  /** 最大文件数量 */
+  maxCount: number;
 }
 
 /** 内部文件格式 */
@@ -128,7 +130,9 @@ export const objStrToObj = function (objStr) {
     if (/^\[.*\]$|^\{.*\}$/.test(_objStr)) {
       try {
         _objStr = JSON.parse(_objStr);
-      } catch (error) { }
+      } catch (error) {
+        console.error(error);
+      }
     }
   }
   return _objStr;
@@ -191,7 +195,7 @@ export const handleInputItem = (data, opt: IHandlerOpt) => {
     console.warn("Upload handleInputData 请传入正确的数据");
     return data;
   }
-  const { thumbnailParams, selfUrlList } = opt
+  const { thumbnailParams, selfUrlList } = opt;
 
   let file = {
     ...fileTpl,
@@ -307,8 +311,6 @@ export const handleInputFileList = (fileList, opt: IHandlerOpt) => {
   return _fileList;
 };
 
-export const handleFileName = function () { };
-
 /**
  * 子项数据归一化
  * @param data
@@ -404,8 +406,15 @@ export const handleOutputFileList = function (fileList, opt: IHandlerOpt) {
 
   // 数组
   if (listMode === "array") {
-    return _fileList?.map((it) => handleUploadItem(it, opt));
+    const { isResRemoveArr, maxCount } = opt || {};
+    let _files = _fileList?.map((it) => handleUploadItem(it, opt));
+    if (isResRemoveArr && maxCount === 1) {
+      // maxCount 为 1 的时候返回结果去除数组包裹
+      _files = _files[0];
+    }
+    return _files;
   }
+
   // 序列化后的字符串
   if (listMode === "jsonStr") {
     return JSON.stringify(_fileList?.map((it) => handleUploadItem(it, opt)));

package/src/components/Upload/uploader.jsx

@@ -65,7 +65,7 @@ export function Uploader({ onChange, ...props }) {
     isFileJson = false,
     thumbnailParams = "image_process=resize,p_30",
     selfUrlList = ["https://self-oss.abt.hzabjt.com"],
-    readPretty
+    readPretty,
   } = props;
   const isPrivateStore =
     props.uploadParams?.fileAcl === "private" || props.ossOpt?.signatureParams?.fileAcl === "private";
@@ -109,12 +109,12 @@ export function Uploader({ onChange, ...props }) {
       let _file = _files[i]?.originFileObj || _files[i];
       if (!_file.url) {
         const promiseRes = await _file.ossPromise;
-        _file.url =
-          typeof promiseRes === "object"
-            ? promiseRes.url
-            : promiseRes || _file.ossUrl || typeof _file === "string"
-              ? _file
-              : "";
+        _file.url = "";
+        if (typeof promiseRes === "object") {
+          _file.url = promiseRes.url;
+        } else if (promiseRes || _file.ossUrl || typeof _file === "string") {
+          _file.url = _file;
+        }
 
         if (typeof _file.url === "string") {
           _files[i].url = _file.url;
@@ -127,14 +127,11 @@ export function Uploader({ onChange, ...props }) {
 
     // 处理出参格式
     _files = handleOutputFileList(_files, {
+      isResRemoveArr,
+      maxCount,
       ...fileListConf,
     });
 
-    if (isResRemoveArr && maxCount === 1 && Array.isArray(_files)) {
-      // maxCount 为 1 的时候返回结果去除数组
-      _files = _files[0];
-    }
-
     onChange && onChange?.(_files);
   };
 
@@ -158,7 +155,11 @@ export function Uploader({ onChange, ...props }) {
 
   const onRemove = (file) => {
     const files = (fileList || []).filter((v) => v.url !== file.url);
-    onChange && onChange(files);
+    // 处理出参格式
+    const _files = handleOutputFileList(files, {
+      ...fileListConf,
+    });
+    onChange && onChange(_files);
   };
 
   // 自定义请求逻辑
@@ -285,9 +286,9 @@ export function Uploader({ onChange, ...props }) {
   };
   const isShowUploadBtn = useMemo(() => {
     if (disabled || readOnly || readPretty) {
-      return null
+      return null;
     }
-    return (maxCount && maxCount > fileList.length ? (
+    return maxCount && maxCount > fileList.length ? (
       listType === "picture-card" ? (
         checking ? (
           "检测中"
@@ -299,8 +300,8 @@ export function Uploader({ onChange, ...props }) {
           {btnText}
         </Button>
       )
-    ) : null)
-  }, [maxCount, fileList, disabled, readOnly, readPretty, checking, btnText, listType])
+    ) : null;
+  }, [maxCount, fileList, disabled, readOnly, readPretty, checking, btnText, listType]);
   return (
     <>
       <AUpload className="oss-uploader" {..._uploadProps}>

package/src/index.tsx

@@ -70,15 +70,11 @@ const antdComponents = {
 
 const FormRender = forwardRef((props: any, parentRef) => {
   /** 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 (!schemaScopeRef.current?._$tempData) {
-    schemaScopeRef.current._$tempData = {};
-  }
+  const schemaScopeRef = useRef<{ _$tempData: Object }>({
+    scenario: "form-render",
+    _$tempData: {},
+    ...props.schemaScope,
+  });
   const SchemaField = useCallback(
     createSchemaField({
       components: {