@hzab/form-render 1.6.21-beta1 → 1.7.1

package/CHANGELOG.md

@@ -1,6 +1,10 @@
-# @hzab/form-render@1.6.21
+# @hzab/form-render@1.7.1
+feat: 文件上传组件删除后重走数据处理逻辑
 
-refactor: upload 接入 utils upload utils
+# @hzab/form-render@1.7.0
+
+refactor: upload 接入 @hzab/utils upload utils
+feat: components 支持通过项目初始化时全局进行挂载 setFormilyGlobalComponents。便于对 formRender 进行组件拆分
 
 # @hzab/form-render@1.6.20
 

package/README.md

@@ -10,6 +10,29 @@ formily schema 表单渲染组件
 
 ## 示例
 
+#### 项目初始化时挂载全局组件
+
+```jsx
+import { setFormilyGlobalComponents } from "@hzab/utils/src/formily/global-components";
+
+// 挂载 Test1 组件到 formRender 组件
+setFormilyGlobalComponents({
+  Test1() {
+    return <div>Test1</div>;
+  },
+});
+
+// 挂载 Test2 组件到 formRender 组件
+setFormilyGlobalComponents({
+  Test2() {
+    return <div>Test2</div>;
+  },
+  Test3() {
+    return <div>Test3</div>;
+  },
+});
+```
+
 ```jsx
 import FormRender from "@hzab/form-render";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/form-render",
-  "version": "1.6.21-beta1",
+  "version": "1.7.1",
   "description": "",
   "main": "src",
   "scripts": {
@@ -21,6 +21,7 @@
   "devDependencies": {
     "@hzab/data-model": "^1.8.8",
     "@hzab/permissions": "^0.1.1",
+    "@hzab/utils": "^1.0.6",
     "@hzab/webpack-config": "0.0.12",
     "@types/react": "^17.0.62",
     "@types/react-dom": "^17.0.20",
@@ -34,7 +35,7 @@
     "typescript": "^4.9.4"
   },
   "peerDependencies": {
-    "@hzab/utils": ">=1.0.5",
+    "@hzab/utils": ">=1.0.6",
     "antd": "4.x",
     "axios": ">=1.6.2",
     "react": ">=16.8.0",

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

@@ -1,4 +1,4 @@
-export * from "@hzab/utils/src/file/fileType";
-import { getFileTypeStr } from "@hzab/utils/src/file/fileType";
-
-export const checkFileType = getFileTypeStr;
+export * from "@hzab/utils/src/file/fileType";
+import { getFileTypeStr } from "@hzab/utils/src/file/fileType";
+
+export const checkFileType = getFileTypeStr;

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

@@ -184,7 +184,7 @@ export const handleInputItem = (data, opt: IHandlerOpt) => {
   if (typeof _data === "string") {
     const obj = getFileNameObj(_data);
     file.id = obj?.id;
-    file.uid = file.id;
+    file.uid = file.id || nanoidNumALetters();
     file.url = _data;
     file.storeUrl = _data;
     file.name = getFullFileName(file.url);

package/src/components/Upload/uploader.jsx

@@ -109,8 +109,8 @@ export function Uploader({ onChange, ...props }) {
           typeof promiseRes === "object"
             ? promiseRes.url
             : promiseRes || _file.ossUrl || typeof _file === "string"
-              ? _file
-              : "";
+            ? _file
+            : "";
 
         if (typeof _file.url === "string") {
           _files[i].url = _file.url;
@@ -153,8 +153,13 @@ export function Uploader({ onChange, ...props }) {
   }, [value]);
 
   const onRemove = (file) => {
-    const files = (fileList || []).filter((v) => v.url !== file.url);
-    onChange && onChange(files);
+    const files = (fileList || []).filter((v) => v.uid !== file.uid);
+    let _files = [...files];
+    // 处理出参格式
+    _files = handleOutputFileList(_files, {
+      ...fileListConf,
+    });
+    onChange && onChange(_files);
   };
 
   // 自定义请求逻辑

package/src/index.tsx

@@ -30,6 +30,7 @@ import {
   ArrayCards,
 } from "c-formily-antd";
 import { Card, Slider, Rate } from "antd";
+import { getFormilyGlobalComponents } from "@hzab/utils/src/formily/global-components";
 
 // 自定义组件
 import * as customComponents from "./components/index";
@@ -67,8 +68,6 @@ const antdComponents = {
   ArrayCards,
 };
 
-const noop = () => {};
-
 const FormRender = forwardRef((props: any, parentRef) => {
   /** schema scope 解决父级无 schema Scope 导致 scope 对象刷新的问题 */
   const schemaScopeRef = useRef<{ _$tempData: Object }>();
@@ -112,6 +111,7 @@ const FormRender = forwardRef((props: any, parentRef) => {
         Slider,
         Rate,
         ...customComponents,
+        ...getFormilyGlobalComponents(),
         ...props.components,
       },
       scope: schemaScopeRef.current,