fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-06 05:59:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
Zeke Zhang 2024-07-14 13:02:34 +08:00
commit 6f788ccb4f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/client/src/block-provider/FormBlockProvider.tsx
View File

@ -151,7 +151,7 @@ export const useFormBlockContext = () => {
/** /**
* @internal * @internal
*/ */
export const useFormBlockProps = () => { export const useFormBlockProps = (shouldClearInitialValues = false) => {
const ctx = useFormBlockContext(); const ctx = useFormBlockContext();
const treeParentRecord = useTreeParentRecord(); const treeParentRecord = useTreeParentRecord();
useEffect(() => { useEffect(() => {
@ -169,7 +169,9 @@ export const useFormBlockProps = () => {
if (form) { if (form) {
// form 字段中可能一开始就存在一些默认值（比如设置了字段默认值的模板区块）。在编辑表单中， // form 字段中可能一开始就存在一些默认值（比如设置了字段默认值的模板区块）。在编辑表单中，
// 这些默认值是不需要的，需要清除掉，不然会导致一些问题。比如：https://github.com/nocobase/nocobase/issues/4868 // 这些默认值是不需要的，需要清除掉，不然会导致一些问题。比如：https://github.com/nocobase/nocobase/issues/4868
form.initialValues = {}; if (shouldClearInitialValues) {
form.initialValues = {};
}
form.setInitialValues(ctx.service?.data?.data); form.setInitialValues(ctx.service?.data?.data);
} }
} }

2
packages/core/client/src/modules/blocks/data-blocks/form/hooks/useEditFormBlockProps.ts
View File

@ -10,5 +10,5 @@
import { useFormBlockProps } from '../../../../../block-provider/FormBlockProvider'; import { useFormBlockProps } from '../../../../../block-provider/FormBlockProvider';
export function useEditFormBlockProps() { export function useEditFormBlockProps() {
return useFormBlockProps(); return useFormBlockProps(true);
} }