mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 16:34:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: workflowManual:customForm:configureFields

Browse Source
This commit is contained in:
Zeke Zhang 2024-03-07 19:06:15 +08:00
parent 507c606b44
commit 53bcdb87a0
4 changed files with 45 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/customFormBlocks.test.ts
View File

@ -83,15 +83,13 @@ test.describe('field data entry', () => {
await page.mouse.move(300, 0, { steps: 100 });
// 获取自定义表单的随机值
const configureFieldsButton = page.locator(
'button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-"]',
'button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-"]',
);
const ariaLabel = await configureFieldsButton.getAttribute('aria-label');
const randomValue = ariaLabel.split('-').pop();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByLabel(`designer-schema-settings-CardItem-SimpleDesigner-${randomValue}`).hover();
await page.getByRole('menuitem', { name: 'Edit block title' }).click();
@ -99,9 +97,7 @@ test.describe('field data entry', () => {
await page.getByLabel('Edit block title').getByRole('textbox').fill(blockTitle);
await page.getByRole('button', { name: 'OK', exact: true }).click();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByRole('menuitem', { name: 'Single line text' }).click();
await page
@ -230,15 +226,13 @@ test.describe('field data entry', () => {
await page.mouse.move(300, 0, { steps: 100 });
// 获取自定义表单的随机值
const configureFieldsButton = page.locator(
'button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-"]',
'button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-"]',
);
const ariaLabel = await configureFieldsButton.getAttribute('aria-label');
const randomValue = ariaLabel.split('-').pop();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByLabel(`designer-schema-settings-CardItem-SimpleDesigner-${randomValue}`).hover();
await page.getByRole('menuitem', { name: 'Edit block title' }).click();
@ -246,9 +240,7 @@ test.describe('field data entry', () => {
await page.getByLabel('Edit block title').getByRole('textbox').fill(blockTitle);
await page.getByRole('button', { name: 'OK', exact: true }).click();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByRole('menuitem', { name: 'Long text' }).click();
await page
@ -377,15 +369,13 @@ test.describe('field data entry', () => {
await page.mouse.move(300, 0, { steps: 100 });
// 获取自定义表单的随机值
const configureFieldsButton = page.locator(
'button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-"]',
'button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-"]',
);
const ariaLabel = await configureFieldsButton.getAttribute('aria-label');
const randomValue = ariaLabel.split('-').pop();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByLabel(`designer-schema-settings-CardItem-SimpleDesigner-${randomValue}`).hover();
await page.getByRole('menuitem', { name: 'Edit block title' }).click();
@ -393,9 +383,7 @@ test.describe('field data entry', () => {
await page.getByLabel('Edit block title').getByRole('textbox').fill(blockTitle);
await page.getByRole('button', { name: 'OK', exact: true }).click();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByRole('menuitem', { name: 'Phone' }).click();
await page
@ -524,15 +512,13 @@ test.describe('field data entry', () => {
await page.mouse.move(300, 0, { steps: 100 });
// 获取自定义表单的随机值
const configureFieldsButton = page.locator(
'button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-"]',
'button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-"]',
);
const ariaLabel = await configureFieldsButton.getAttribute('aria-label');
const randomValue = ariaLabel.split('-').pop();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByLabel(`designer-schema-settings-CardItem-SimpleDesigner-${randomValue}`).hover();
await page.getByRole('menuitem', { name: 'Edit block title' }).click();
@ -540,9 +526,7 @@ test.describe('field data entry', () => {
await page.getByLabel('Edit block title').getByRole('textbox').fill(blockTitle);
await page.getByRole('button', { name: 'OK', exact: true }).click();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByRole('menuitem', { name: 'Email' }).click();
await page
@ -671,15 +655,13 @@ test.describe('field data entry', () => {
await page.mouse.move(300, 0, { steps: 100 });
// 获取自定义表单的随机值
const configureFieldsButton = page.locator(
'button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-"]',
'button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-"]',
);
const ariaLabel = await configureFieldsButton.getAttribute('aria-label');
const randomValue = ariaLabel.split('-').pop();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByLabel(`designer-schema-settings-CardItem-SimpleDesigner-${randomValue}`).hover();
await page.getByRole('menuitem', { name: 'Edit block title' }).click();
@ -687,9 +669,7 @@ test.describe('field data entry', () => {
await page.getByLabel('Edit block title').getByRole('textbox').fill(blockTitle);
await page.getByRole('button', { name: 'OK', exact: true }).click();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByRole('menuitem', { name: 'Integer' }).click();
await page
@ -818,15 +798,13 @@ test.describe('field data entry', () => {
await page.mouse.move(300, 0, { steps: 100 });
// 获取自定义表单的随机值
const configureFieldsButton = page.locator(
'button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-"]',
'button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-"]',
);
const ariaLabel = await configureFieldsButton.getAttribute('aria-label');
const randomValue = ariaLabel.split('-').pop();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByLabel(`designer-schema-settings-CardItem-SimpleDesigner-${randomValue}`).hover();
await page.getByRole('menuitem', { name: 'Edit block title' }).click();
@ -834,9 +812,7 @@ test.describe('field data entry', () => {
await page.getByLabel('Edit block title').getByRole('textbox').fill(blockTitle);
await page.getByRole('button', { name: 'OK', exact: true }).click();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByRole('menuitem', { name: 'Number' }).click();
await page
@ -965,15 +941,13 @@ test.describe('field data entry', () => {
await page.mouse.move(300, 0, { steps: 100 });
// 获取自定义表单的随机值
const configureFieldsButton = page.locator(
'button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-"]',
'button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-"]',
);
const ariaLabel = await configureFieldsButton.getAttribute('aria-label');
const randomValue = ariaLabel.split('-').pop();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByLabel(`designer-schema-settings-CardItem-SimpleDesigner-${randomValue}`).hover();
await page.getByRole('menuitem', { name: 'Edit block title' }).click();
@ -981,9 +955,7 @@ test.describe('field data entry', () => {
await page.getByLabel('Edit block title').getByRole('textbox').fill(blockTitle);
await page.getByRole('button', { name: 'OK', exact: true }).click();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByRole('menuitem', { name: 'Percent' }).click();
await page
@ -1112,15 +1084,13 @@ test.describe('field data entry', () => {
await page.mouse.move(300, 0, { steps: 100 });
// 获取自定义表单的随机值
const configureFieldsButton = page.locator(
'button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-"]',
'button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-"]',
);
const ariaLabel = await configureFieldsButton.getAttribute('aria-label');
const randomValue = ariaLabel.split('-').pop();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByLabel(`designer-schema-settings-CardItem-SimpleDesigner-${randomValue}`).hover();
await page.getByRole('menuitem', { name: 'Edit block title' }).click();
@ -1128,9 +1098,7 @@ test.describe('field data entry', () => {
await page.getByLabel('Edit block title').getByRole('textbox').fill(blockTitle);
await page.getByRole('button', { name: 'OK', exact: true }).click();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByRole('menuitem', { name: 'Checkbox', exact: true }).click();
await page
@ -1259,15 +1227,13 @@ test.describe('field data entry', () => {
await page.mouse.move(300, 0, { steps: 100 });
// 获取自定义表单的随机值
const configureFieldsButton = page.locator(
'button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-"]',
'button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-"]',
);
const ariaLabel = await configureFieldsButton.getAttribute('aria-label');
const randomValue = ariaLabel.split('-').pop();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByLabel(`designer-schema-settings-CardItem-SimpleDesigner-${randomValue}`).hover();
await page.getByRole('menuitem', { name: 'Edit block title' }).click();
@ -1275,9 +1241,7 @@ test.describe('field data entry', () => {
await page.getByLabel('Edit block title').getByRole('textbox').fill(blockTitle);
await page.getByRole('button', { name: 'OK', exact: true }).click();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByRole('menuitem', { name: 'Single select', exact: true }).click();
await page
@ -1413,15 +1377,13 @@ test.describe('field data entry', () => {
await page.mouse.move(300, 0, { steps: 100 });
// 获取自定义表单的随机值
const configureFieldsButton = page.locator(
'button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-"]',
'button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-"]',
);
const ariaLabel = await configureFieldsButton.getAttribute('aria-label');
const randomValue = ariaLabel.split('-').pop();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByLabel(`designer-schema-settings-CardItem-SimpleDesigner-${randomValue}`).hover();
await page.getByRole('menuitem', { name: 'Edit block title' }).click();
@ -1429,9 +1391,7 @@ test.describe('field data entry', () => {
await page.getByLabel('Edit block title').getByRole('textbox').fill(blockTitle);
await page.getByRole('button', { name: 'OK', exact: true }).click();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByRole('menuitem', { name: 'Multiple select', exact: true }).click();
await page
@ -1574,15 +1534,13 @@ test.describe('field data entry', () => {
await page.mouse.move(300, 0, { steps: 100 });
// 获取自定义表单的随机值
const configureFieldsButton = page.locator(
'button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-"]',
'button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-"]',
);
const ariaLabel = await configureFieldsButton.getAttribute('aria-label');
const randomValue = ariaLabel.split('-').pop();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByLabel(`designer-schema-settings-CardItem-SimpleDesigner-${randomValue}`).hover();
await page.getByRole('menuitem', { name: 'Edit block title' }).click();
@ -1590,9 +1548,7 @@ test.describe('field data entry', () => {
await page.getByLabel('Edit block title').getByRole('textbox').fill(blockTitle);
await page.getByRole('button', { name: 'OK', exact: true }).click();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByRole('menuitem', { name: 'Radio group', exact: true }).click();
await page
@ -1727,15 +1683,13 @@ test.describe('field data entry', () => {
await page.mouse.move(300, 0, { steps: 100 });
// 获取自定义表单的随机值
const configureFieldsButton = page.locator(
'button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-"]',
'button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-"]',
);
const ariaLabel = await configureFieldsButton.getAttribute('aria-label');
const randomValue = ariaLabel.split('-').pop();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByLabel(`designer-schema-settings-CardItem-SimpleDesigner-${randomValue}`).hover();
await page.getByRole('menuitem', { name: 'Edit block title' }).click();
@ -1743,9 +1697,7 @@ test.describe('field data entry', () => {
await page.getByLabel('Edit block title').getByRole('textbox').fill(blockTitle);
await page.getByRole('button', { name: 'OK', exact: true }).click();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByRole('menuitem', { name: 'Checkbox group', exact: true }).click();
await page
@ -1886,15 +1838,13 @@ test.describe('field data entry', () => {
await page.mouse.move(300, 0, { steps: 100 });
// 获取自定义表单的随机值
const configureFieldsButton = page.locator(
'button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-"]',
'button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-"]',
);
const ariaLabel = await configureFieldsButton.getAttribute('aria-label');
const randomValue = ariaLabel.split('-').pop();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByLabel(`designer-schema-settings-CardItem-SimpleDesigner-${randomValue}`).hover();
await page.getByRole('menuitem', { name: 'Edit block title' }).click();
@ -1902,9 +1852,7 @@ test.describe('field data entry', () => {
await page.getByLabel('Edit block title').getByRole('textbox').fill(blockTitle);
await page.getByRole('button', { name: 'OK', exact: true }).click();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByRole('menuitem', { name: 'Datetime', exact: true }).click();
await page

10
packages/plugins/@nocobase/plugin-workflow-manual/src/client/__e2e__/datablocks.test.ts
View File

@ -728,15 +728,13 @@ test.describe('field data', () => {
await page.mouse.move(300, 0, { steps: 100 });
// 获取自定义表单的随机值
const configureFieldsButton = page.locator(
'button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-"]',
'button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-"]',
);
const ariaLabel = await configureFieldsButton.getAttribute('aria-label');
const randomValue = ariaLabel.split('-').pop();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByLabel(`designer-schema-settings-CardItem-SimpleDesigner-${randomValue}`).hover();
await page.getByRole('menuitem', { name: 'Edit block title' }).click();
@ -744,9 +742,7 @@ test.describe('field data', () => {
await page.getByLabel('Edit block title').getByRole('textbox').fill(blockTitle);
await page.getByRole('button', { name: 'OK', exact: true }).click();
await page
.locator(
`button[aria-label^="schema-initializer-Grid-fieldInitializers:workflowManualCustomForm-${randomValue}"]`,
)
.locator(`button[aria-label^="schema-initializer-Grid-workflowManual:customForm:configureFields-${randomValue}"]`)
.hover();
await page.getByRole('menuitem', { name: 'Single line text' }).click();
await page

4
packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/forms/custom.tsx
View File

@ -103,7 +103,7 @@ function CustomFormBlockInitializer() {
grid: {
type: 'void',
'x-component': 'Grid',
'x-initializer': 'fieldInitializers:workflowManualCustomForm',
'x-initializer': 'workflowManual:customForm:configureFields',
},
actions: {
type: 'void',
@ -335,7 +335,7 @@ export const addCustomFormField_deprecated = new CompatibleSchemaInitializer({
export const addCustomFormField = new CompatibleSchemaInitializer(
{
name: 'fieldInitializers:workflowManualCustomForm',
name: 'workflowManual:customForm:configureFields',
wrap: gridRowColWrap,
insertPosition: 'beforeEnd',
title: "{{t('Configure fields')}}",

2
packages/plugins/@nocobase/plugin-workflow/src/server/migrations/20230411034722-manual-multi-form.ts
View File

@ -113,7 +113,7 @@ function migrateConfig({ schema = {}, actions = [] }: { schema: any; actions: nu
},
properties: {
grid: Object.assign(formBlock.properties.grid, {
'x-initializer': 'fieldInitializers:workflowManualCustomForm',
'x-initializer': 'workflowManual:customForm:configureFields',
}),
// 7.
actions: {