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

Merge branch 'main' into next

Browse Source
This commit is contained in:
GitHub Actions Bot 2024-07-25 02:50:03 +00:00
commit 09e3cb4996
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/client/src/schema-initializer/items/InitializerWithSwitch.tsx
View File

@ -10,8 +10,8 @@
import { merge } from '@formily/shared'; import { merge } from '@formily/shared';
import React from 'react'; import React from 'react';
import { useCurrentSchema } from '../utils';
import { SchemaInitializerSwitch, useSchemaInitializer } from '../../application'; import { SchemaInitializerSwitch, useSchemaInitializer } from '../../application';
import { useCurrentSchema } from '../utils';
export const InitializerWithSwitch = (props) => { export const InitializerWithSwitch = (props) => {
const { type, schema, item, remove: passInRemove, disabled } = props; const { type, schema, item, remove: passInRemove, disabled } = props;

1
packages/core/client/src/schema-initializer/utils.ts
View File

@ -763,6 +763,7 @@ export const useCurrentSchema = (action: string, key: string, find = findSchema,
form?.query(new RegExp(`${schema.parent.name}.${schema.name}$`)).forEach((field: Field) => { form?.query(new RegExp(`${schema.parent.name}.${schema.name}$`)).forEach((field: Field) => {
// 如果字段被删掉，那么在提交的时候不应该提交这个字段 // 如果字段被删掉，那么在提交的时候不应该提交这个字段
field.setValue?.(undefined); field.setValue?.(undefined);
field.setInitialValue?.(undefined);
}); });
schema && rm(schema, remove); schema && rm(schema, remove);
}, },

1
packages/core/client/src/schema-settings/SchemaSettings.tsx
View File

@ -495,6 +495,7 @@ export const SchemaSettingsRemove: FC<SchemaSettingsRemoveProps> = (props) => {
form?.query(new RegExp(`${fieldSchema.parent.name}.${fieldSchema.name}$`)).forEach((field: Field) => { form?.query(new RegExp(`${fieldSchema.parent.name}.${fieldSchema.name}$`)).forEach((field: Field) => {
// 如果字段被删掉，那么在提交的时候不应该提交这个字段 // 如果字段被删掉，那么在提交的时候不应该提交这个字段
field.setValue?.(undefined); field.setValue?.(undefined);
field.setInitialValue?.(undefined);
}); });
removeDataBlock(fieldSchema['x-uid']); removeDataBlock(fieldSchema['x-uid']);
}, },