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

Merge branch 'main' into next

Browse Source
This commit is contained in:
nocobase[bot] 2024-12-25 11:32:57 +00:00
commit ec8c2677b7
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lerna.json
View File

@ -2,9 +2,7 @@
"version": "1.5.0-beta.17",
"npmClient": "yarn",
"useWorkspaces": true,
"npmClientArgs": [
"--ignore-engines"
],
"npmClientArgs": ["--ignore-engines"],
"command": {
"version": {
"forcePublish": true,

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

@ -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) => {

4
packages/plugins/@nocobase/plugin-action-duplicate/src/client/__e2e__/schemaSettings.test.ts
View File

@ -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();