@hzab/form-render 1.5.0 → 1.5.1

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# @hzab/form-render@1.5.1
+
+fix: schemaScope 使用 Ref 缓存，解决 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",
   "description": "",
   "main": "src",
   "scripts": {

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,
     });