diff --git a/lerna.json b/lerna.json index 65faa14938..d816818fb2 100644 --- a/lerna.json +++ b/lerna.json @@ -2,9 +2,7 @@ "version": "1.6.0-alpha.7", "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 654caf1f62..0b4b86d3f2 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();