From 9a93490dd27ff19cbbc0b044dc8949e02cd0cc7c Mon Sep 17 00:00:00 2001 From: Katherine Date: Wed, 25 Dec 2024 19:32:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20o2o=20association=20field=20not=20=20dis?= =?UTF-8?q?playing=20target=20collection=20field=20in=E2=80=A6=20(#5921)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: o2o association field not displaying target collection field in detail and form block * fix: test --- lerna.json | 4 +--- packages/core/client/src/schema-initializer/utils.ts | 2 +- .../src/client/__e2e__/schemaSettings.test.ts | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lerna.json b/lerna.json index 3916d54a89..e293e724b2 100644 --- a/lerna.json +++ b/lerna.json @@ -2,9 +2,7 @@ "version": "1.4.15", "npmClient": "yarn", "useWorkspaces": true, - "npmClientArgs": [ - "--ignore-engines" - ], + "npmClientArgs": ["--ignore-engines"], "command": { "version": { "forcePublish": true, diff --git a/packages/core/client/src/schema-initializer/utils.ts b/packages/core/client/src/schema-initializer/utils.ts index 0fdd6968cd..04d243e5c5 100644 --- a/packages/core/client/src/schema-initializer/utils.ts +++ b/packages/core/client/src/schema-initializer/utils.ts @@ -512,7 +512,7 @@ export const useAssociatedFormItemInitializerFields = (options?: any) => { const form = useForm(); const { t } = useTranslation(); const { readPretty = form.readPretty, block = 'Form' } = options || {}; - const interfaces = block === 'Form' ? ['m2o'] : ['o2o', 'oho', 'obo', 'm2o']; + const interfaces = block === 'Form' ? ['m2o', 'obo', 'oho'] : ['o2o', 'oho', 'obo', 'm2o']; const groups = fields ?.filter((field) => { diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/__e2e__/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/__e2e__/schemaSettings.test.ts index b415f8f645..33d8f30a36 100644 --- a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/__e2e__/schemaSettings.test.ts +++ b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/__e2e__/schemaSettings.test.ts @@ -50,8 +50,8 @@ test.describe('direct duplicate & copy into the form and continue to fill in', ( await page.mouse.move(300, 0); await page.getByLabel('schema-initializer-Grid-form:configureFields-general').hover(); await page.getByRole('menuitem', { name: 'singleLineText' }).click(); - await page.getByRole('menuitem', { name: 'oneToOneBelongsTo' }).click(); - await page.getByRole('menuitem', { name: 'oneToOneHasOne' }).click(); + await page.getByRole('menuitem', { name: 'oneToOneBelongsTo' }).first().click(); + await page.getByRole('menuitem', { name: 'oneToOneHasOne' }).first().click(); await page.getByRole('menuitem', { name: 'oneToMany' }).click(); await page.getByRole('menuitem', { name: 'manyToOne', exact: true }).click(); await page.getByRole('menuitem', { name: 'manyToMany' }).click();