From e9a38b0b4d9fabc571b7d9cdc8929914f5e2a367 Mon Sep 17 00:00:00 2001 From: Zeke Zhang <958414905@qq.com> Date: Sun, 3 Mar 2024 14:22:08 +0800 Subject: [PATCH] refactor: replace CreateFormBlockInitializers to blockInitializers:createForm --- .../add-child/CreateChildInitializer.tsx | 2 +- .../add-new/CreateActionInitializer.tsx | 2 +- .../form-create/schemaSettings.test.ts | 2 +- .../__e2e__/form-create/templatesOfBug.ts | 6 ++--- .../table/__e2e__/templatesOfBug.ts | 2 +- .../antd/association-field/schema.ts | 2 +- .../buttons/TabPaneInitializers.tsx | 2 +- packages/core/test/src/e2e/templatesOfPage.ts | 26 +++++++++---------- .../plugin-acl/src/client/__e2e__/utils.ts | 2 +- .../src/client/DuplicateActionInitializer.tsx | 2 +- .../src/client/__e2e__/utils.ts | 2 +- .../src/client/__e2e__/utils.ts | 2 +- .../plugin-iframe-block/src/client/index.ts | 2 +- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/packages/core/client/src/modules/actions/add-child/CreateChildInitializer.tsx b/packages/core/client/src/modules/actions/add-child/CreateChildInitializer.tsx index 58a237a6f4..d365db4e3a 100644 --- a/packages/core/client/src/modules/actions/add-child/CreateChildInitializer.tsx +++ b/packages/core/client/src/modules/actions/add-child/CreateChildInitializer.tsx @@ -40,7 +40,7 @@ export const CreateChildInitializer = (props) => { grid: { type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', properties: {}, }, }, diff --git a/packages/core/client/src/modules/actions/add-new/CreateActionInitializer.tsx b/packages/core/client/src/modules/actions/add-new/CreateActionInitializer.tsx index ad3eb2383c..783a2876f4 100644 --- a/packages/core/client/src/modules/actions/add-new/CreateActionInitializer.tsx +++ b/packages/core/client/src/modules/actions/add-new/CreateActionInitializer.tsx @@ -43,7 +43,7 @@ export const CreateActionInitializer = () => { grid: { type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', properties: {}, }, }, diff --git a/packages/core/client/src/modules/blocks/data-blocks/form/__e2e__/form-create/schemaSettings.test.ts b/packages/core/client/src/modules/blocks/data-blocks/form/__e2e__/form-create/schemaSettings.test.ts index 4de6a0684d..143932c065 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/form/__e2e__/form-create/schemaSettings.test.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/form/__e2e__/form-create/schemaSettings.test.ts @@ -980,7 +980,7 @@ test.describe('creation form block schema settings', () => { version: '2.0', type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', 'x-uid': 'w224zhqyair', 'x-async': false, 'x-index': 1, diff --git a/packages/core/client/src/modules/blocks/data-blocks/form/__e2e__/form-create/templatesOfBug.ts b/packages/core/client/src/modules/blocks/data-blocks/form/__e2e__/form-create/templatesOfBug.ts index 9f77d8448d..dbea204f9b 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/form/__e2e__/form-create/templatesOfBug.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/form/__e2e__/form-create/templatesOfBug.ts @@ -1830,7 +1830,7 @@ export const T2993: PageConfig = { version: '2.0', type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', properties: { kvyqrrxvggn: { _isJSONSchemaObject: true, @@ -2412,7 +2412,7 @@ export const T2615: PageConfig = { version: '2.0', type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', properties: { '8ei3tsaojf6': { _isJSONSchemaObject: true, @@ -3325,7 +3325,7 @@ export const T2845: PageConfig = { version: '2.0', type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', 'x-index': 1, properties: { '8ei3tsaojf6': { diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/templatesOfBug.ts b/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/templatesOfBug.ts index 213b21f585..e75b9d27bf 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/templatesOfBug.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/table/__e2e__/templatesOfBug.ts @@ -468,7 +468,7 @@ export const T2187 = { version: '2.0', type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', properties: { qvyfk3a9a2g: { _isJSONSchemaObject: true, diff --git a/packages/core/client/src/schema-component/antd/association-field/schema.ts b/packages/core/client/src/schema-component/antd/association-field/schema.ts index 76331ff1e8..1223057b5f 100644 --- a/packages/core/client/src/schema-component/antd/association-field/schema.ts +++ b/packages/core/client/src/schema-component/antd/association-field/schema.ts @@ -35,7 +35,7 @@ export default { grid: { type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', properties: {}, }, }, diff --git a/packages/core/client/src/schema-initializer/buttons/TabPaneInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/TabPaneInitializers.tsx index 9e019ed614..d2a4b498e7 100644 --- a/packages/core/client/src/schema-initializer/buttons/TabPaneInitializers.tsx +++ b/packages/core/client/src/schema-initializer/buttons/TabPaneInitializers.tsx @@ -18,7 +18,7 @@ export const TabPaneInitializers = (props?: any) => { if (!initializer) { initializer = 'RecordBlockInitializers'; if (isCreate || !record) { - initializer = 'CreateFormBlockInitializers'; + initializer = 'blockInitializers:createForm'; } else if (isBulkEdit) { initializer = 'BulkEditBlockInitializers'; } diff --git a/packages/core/test/src/e2e/templatesOfPage.ts b/packages/core/test/src/e2e/templatesOfPage.ts index a87be8b28a..ff82f8452c 100644 --- a/packages/core/test/src/e2e/templatesOfPage.ts +++ b/packages/core/test/src/e2e/templatesOfPage.ts @@ -1315,7 +1315,7 @@ export const oneEmptyTableBlockWithActions: PageConfig = { version: '2.0', type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', 'x-uid': 'k0zm3uifn6v', 'x-async': false, 'x-index': 1, @@ -1720,7 +1720,7 @@ export const oneEmptyTableBlockWithActions: PageConfig = { version: '2.0', type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', 'x-uid': 'vtcnkzcaeec', 'x-async': false, 'x-index': 1, @@ -1922,7 +1922,7 @@ export const oneTableBlockWithActionsAndFormBlocks: PageConfig = { version: '2.0', type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', properties: { '7tcjyx5gipn': { _isJSONSchemaObject: true, @@ -4003,7 +4003,7 @@ export const oneTableBlockWithAddNewAndViewAndEditAndBasicFields: PageConfig = { version: '2.0', type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', properties: { '7soqvrflnps': { _isJSONSchemaObject: true, @@ -6381,7 +6381,7 @@ export const oneTableBlockWithAddNewAndViewAndEditAndChoicesFields: PageConfig = version: '2.0', type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', properties: { xgwlijx7tl0: { _isJSONSchemaObject: true, @@ -7818,7 +7818,7 @@ export const oneTableBlockWithAddNewAndViewAndEditAndMediaFields: PageConfig = { version: '2.0', type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', properties: { q5fy0fkcotq: { _isJSONSchemaObject: true, @@ -8910,7 +8910,7 @@ export const oneTableBlockWithAddNewAndViewAndEditAndDatetimeFields: PageConfig version: '2.0', type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', properties: { '54z7u3t354f': { _isJSONSchemaObject: true, @@ -9889,7 +9889,7 @@ export const oneTableBlockWithAddNewAndViewAndEditAndAssociationFields: PageConf version: '2.0', type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', properties: { '8yo09nilrra': { _isJSONSchemaObject: true, @@ -11514,7 +11514,7 @@ export const oneTableBlockWithAddNewAndViewAndEditAndAdvancedFields: PageConfig version: '2.0', type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', properties: { jykx4mc4tan: { _isJSONSchemaObject: true, @@ -12728,7 +12728,7 @@ export const oneTableBlockWithAddNewAndViewAndEditAndSystemInfoFields: PageConfi version: '2.0', type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', properties: { zmbofsdker4: { _isJSONSchemaObject: true, @@ -15516,7 +15516,7 @@ export const oneTableSubformWithMultiLevelAssociationFields: PageConfig = { version: '2.0', type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', 'x-uid': 'ezrqm7whaxk', 'x-async': false, 'x-index': 1, @@ -17232,7 +17232,7 @@ export const oneTableSubtableWithMultiLevelAssociationFields: PageConfig = { version: '2.0', type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', 'x-uid': 'hhhjt2axsd2', 'x-async': false, 'x-index': 1, @@ -18246,7 +18246,7 @@ export const formBlockDefaultValueTemplate: PageConfig = { version: '2.0', type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', properties: { ec8k6t8hyfd: { _isJSONSchemaObject: true, diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/utils.ts b/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/utils.ts index 216e4e0f1e..a885972d4b 100644 --- a/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/utils.ts +++ b/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/utils.ts @@ -116,7 +116,7 @@ export const oneTableBlock: PageConfig = { type: 'void', version: '2.0', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', _isJSONSchemaObject: true, properties: { f3q7xmyiyl4: { diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateActionInitializer.tsx b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateActionInitializer.tsx index e70d18f8f2..57677c8c9c 100644 --- a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateActionInitializer.tsx +++ b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateActionInitializer.tsx @@ -38,7 +38,7 @@ export const DuplicateActionInitializer = (props) => { grid: { type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', properties: {}, }, }, diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/__e2e__/utils.ts b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/__e2e__/utils.ts index e857172353..441976dfe6 100644 --- a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/__e2e__/utils.ts +++ b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/__e2e__/utils.ts @@ -465,7 +465,7 @@ export const oneEmptyTableBlockWithDuplicateActions: PageConfig = { version: '2.0', type: 'void', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', 'x-uid': 'vtcnkzcaeec', 'x-async': false, 'x-index': 1, diff --git a/packages/plugins/@nocobase/plugin-action-print/src/client/__e2e__/utils.ts b/packages/plugins/@nocobase/plugin-action-print/src/client/__e2e__/utils.ts index 51debcd72f..7995c46314 100644 --- a/packages/plugins/@nocobase/plugin-action-print/src/client/__e2e__/utils.ts +++ b/packages/plugins/@nocobase/plugin-action-print/src/client/__e2e__/utils.ts @@ -503,7 +503,7 @@ export const oneCalenderWithViewAction: PageConfig = { type: 'void', version: '2.0', 'x-component': 'Grid', - 'x-initializer': 'CreateFormBlockInitializers', + 'x-initializer': 'blockInitializers:createForm', _isJSONSchemaObject: true, properties: { '7e9xtqdm96x': { diff --git a/packages/plugins/@nocobase/plugin-iframe-block/src/client/index.ts b/packages/plugins/@nocobase/plugin-iframe-block/src/client/index.ts index fc575e195b..87119f125c 100644 --- a/packages/plugins/@nocobase/plugin-iframe-block/src/client/index.ts +++ b/packages/plugins/@nocobase/plugin-iframe-block/src/client/index.ts @@ -13,7 +13,7 @@ export class IframeBlockPlugin extends Plugin { Component: 'IframeBlockInitializer', }); - const createFormBlockInitializers = this.app.schemaInitializerManager.get('CreateFormBlockInitializers'); + const createFormBlockInitializers = this.app.schemaInitializerManager.get('blockInitializers:createForm'); createFormBlockInitializers?.add('otherBlocks.iframe', { title: '{{t("Iframe")}}', Component: 'IframeBlockInitializer',