Merge branch 'next' into develop

This commit is contained in:
nocobase[bot] 2025-02-10 09:14:25 +00:00
commit bbae7f6d5b
2 changed files with 5 additions and 2 deletions

View File

@ -67,7 +67,7 @@ test.describe('single page menu schema settings', () => {
page, page,
showMenu: async () => { showMenu: async () => {
await page.locator('.ant-layout-header').getByText('single page', { exact: true }).hover(); await page.locator('.ant-layout-header').getByText('single page', { exact: true }).hover();
await page.getByRole('button', { name: 'designer-schema-settings-' }).hover(); await page.getByRole('button', { name: 'designer-schema-settings-' }).click();
}, },
supportedOptions: ['Edit', 'Move to', 'Insert before', 'Insert after', 'Delete'], supportedOptions: ['Edit', 'Move to', 'Insert before', 'Insert after', 'Delete'],
}); });

View File

@ -235,7 +235,7 @@ function getSubscriber({
if (fieldName === 'display' && lastState?.value === 'hidden') { if (fieldName === 'display' && lastState?.value === 'hidden') {
field.display = 'visible'; field.display = 'visible';
field.data = field.data || {}; field.data = field.data || {};
// 在 FormItem 中使用这个属性来判断字段是否被隐藏 // 在 FormItem 中使用这个属性来判断字段是否被隐藏
field.data.hidden = true; field.data.hidden = true;
requestAnimationFrame(() => { requestAnimationFrame(() => {
@ -245,6 +245,9 @@ function getSubscriber({
}); });
} else { } else {
field[fieldName] = lastState?.value; field[fieldName] = lastState?.value;
field.data = field.data || {};
// 在 FormItem 中有使用这个属性来判断字段是否被隐藏
field.data.hidden = false;
requestAnimationFrame(() => { requestAnimationFrame(() => {
field.setState((state) => { field.setState((state) => {
state[fieldName] = lastState?.value; state[fieldName] = lastState?.value;