From f36bc41a11b17341f5b6b157c1b5dbbb89d51ae7 Mon Sep 17 00:00:00 2001 From: Zeke Zhang <958414905@qq.com> Date: Sat, 13 Apr 2024 09:14:46 +0800 Subject: [PATCH] =?UTF-8?q?fix(addText):=20should=20use=20FormItemSchemaTo?= =?UTF-8?q?olbar=20instead=20of=20BlockSchema=E2=80=A6=20(#3963)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(addText): should use FormItemSchemaToolbar instead of BlockSchemaToolbar * chore: unskip * fix: add component Slider --- .../BlockSchemaComponentProvider.tsx | 27 ++++++++++--------- .../ReadPrettyFormItemInitializers.tsx | 4 +-- .../grid-card/__e2e__/schemaSettings.test.ts | 2 +- .../grid-card/gridCardBlockSettings.ts | 3 +-- .../markdown/MarkdownFormItemInitializer.tsx | 2 +- .../client/BulkEditFormItemInitializers.tsx | 4 +-- 6 files changed, 22 insertions(+), 20 deletions(-) diff --git a/packages/core/client/src/block-provider/BlockSchemaComponentProvider.tsx b/packages/core/client/src/block-provider/BlockSchemaComponentProvider.tsx index d7d8afbeda..48abde42d1 100644 --- a/packages/core/client/src/block-provider/BlockSchemaComponentProvider.tsx +++ b/packages/core/client/src/block-provider/BlockSchemaComponentProvider.tsx @@ -1,14 +1,27 @@ +import { Slider } from 'antd'; import React from 'react'; import { Plugin } from '../application/Plugin'; import { ActionSchemaToolbar } from '../modules/actions/ActionSchemaToolbar'; import { BlockSchemaToolbar } from '../modules/blocks/BlockSchemaToolbar'; +import { useDetailsWithPaginationDecoratorProps } from '../modules/blocks/data-blocks/details-multi/hooks/useDetailsWithPaginationDecoratorProps'; +import { useDetailsWithPaginationProps } from '../modules/blocks/data-blocks/details-multi/hooks/useDetailsWithPaginationProps'; +import { useDetailsDecoratorProps } from '../modules/blocks/data-blocks/details-single/hooks/useDetailsDecoratorProps'; +import { useDetailsProps } from '../modules/blocks/data-blocks/details-single/hooks/useDetailsProps'; import { FormItemSchemaToolbar } from '../modules/blocks/data-blocks/form/FormItemSchemaToolbar'; import { useCreateFormBlockDecoratorProps } from '../modules/blocks/data-blocks/form/hooks/useCreateFormBlockDecoratorProps'; import { useCreateFormBlockProps } from '../modules/blocks/data-blocks/form/hooks/useCreateFormBlockProps'; import { useEditFormBlockDecoratorProps } from '../modules/blocks/data-blocks/form/hooks/useEditFormBlockDecoratorProps'; import { useEditFormBlockProps } from '../modules/blocks/data-blocks/form/hooks/useEditFormBlockProps'; +import { useGridCardBlockDecoratorProps } from '../modules/blocks/data-blocks/grid-card/hooks/useGridCardBlockDecoratorProps'; +import { useListBlockDecoratorProps } from '../modules/blocks/data-blocks/list/hooks/useListBlockDecoratorProps'; +import { useTableSelectorDecoratorProps } from '../modules/blocks/data-blocks/table-selector/hooks/useTableSelectorDecoratorProps'; import { TableColumnSchemaToolbar } from '../modules/blocks/data-blocks/table/TableColumnSchemaToolbar'; +import { useTableBlockDecoratorProps } from '../modules/blocks/data-blocks/table/hooks/useTableBlockDecoratorProps'; +import { useTableBlockProps } from '../modules/blocks/data-blocks/table/hooks/useTableBlockProps'; import { CollapseItemSchemaToolbar } from '../modules/blocks/filter-blocks/collapse/CollapseItemSchemaToolbar'; +import { useCollapseBlockDecoratorProps } from '../modules/blocks/filter-blocks/collapse/hooks/useCollapseBlockDecoratorProps'; +import { useFilterFormBlockDecoratorProps } from '../modules/blocks/filter-blocks/form/hooks/useFilterFormBlockDecoratorProps'; +import { useFilterFormBlockProps } from '../modules/blocks/filter-blocks/form/hooks/useFilterFormBlockProps'; import { SchemaComponentOptions } from '../schema-component'; import { RecordLink, useParamsFromRecord, useSourceIdFromParentRecord, useSourceIdFromRecord } from './BlockProvider'; import { DetailsBlockProvider, useDetailsBlockProps } from './DetailsBlockProvider'; @@ -16,21 +29,9 @@ import { FilterFormBlockProvider } from './FilterFormBlockProvider'; import { FormBlockProvider, useFormBlockProps } from './FormBlockProvider'; import { FormFieldProvider, useFormFieldProps } from './FormFieldProvider'; import { TableBlockProvider } from './TableBlockProvider'; -import { useTableBlockProps } from '../modules/blocks/data-blocks/table/hooks/useTableBlockProps'; import { TableFieldProvider, useTableFieldProps } from './TableFieldProvider'; import { TableSelectorProvider, useTableSelectorProps } from './TableSelectorProvider'; import * as bp from './hooks'; -import { useTableBlockDecoratorProps } from '../modules/blocks/data-blocks/table/hooks/useTableBlockDecoratorProps'; -import { useListBlockDecoratorProps } from '../modules/blocks/data-blocks/list/hooks/useListBlockDecoratorProps'; -import { useTableSelectorDecoratorProps } from '../modules/blocks/data-blocks/table-selector/hooks/useTableSelectorDecoratorProps'; -import { useCollapseBlockDecoratorProps } from '../modules/blocks/filter-blocks/collapse/hooks/useCollapseBlockDecoratorProps'; -import { useFilterFormBlockProps } from '../modules/blocks/filter-blocks/form/hooks/useFilterFormBlockProps'; -import { useFilterFormBlockDecoratorProps } from '../modules/blocks/filter-blocks/form/hooks/useFilterFormBlockDecoratorProps'; -import { useGridCardBlockDecoratorProps } from '../modules/blocks/data-blocks/grid-card/hooks/useGridCardBlockDecoratorProps'; -import { useDetailsProps } from '../modules/blocks/data-blocks/details-single/hooks/useDetailsProps'; -import { useDetailsWithPaginationProps } from '../modules/blocks/data-blocks/details-multi/hooks/useDetailsWithPaginationProps'; -import { useDetailsDecoratorProps } from '../modules/blocks/data-blocks/details-single/hooks/useDetailsDecoratorProps'; -import { useDetailsWithPaginationDecoratorProps } from '../modules/blocks/data-blocks/details-multi/hooks/useDetailsWithPaginationDecoratorProps'; // TODO: delete this, replaced by `BlockSchemaComponentPlugin` export const BlockSchemaComponentProvider: React.FC = (props) => { @@ -45,6 +46,7 @@ export const BlockSchemaComponentProvider: React.FC = (props) => { FormFieldProvider, DetailsBlockProvider, RecordLink, + Slider, }} scope={{ ...bp, @@ -100,6 +102,7 @@ export class BlockSchemaComponentPlugin extends Plugin { FormItemSchemaToolbar, CollapseItemSchemaToolbar, TableColumnSchemaToolbar, + Slider: Slider as any, }); } diff --git a/packages/core/client/src/modules/blocks/data-blocks/details-single/ReadPrettyFormItemInitializers.tsx b/packages/core/client/src/modules/blocks/data-blocks/details-single/ReadPrettyFormItemInitializers.tsx index f13296ed5c..05396d58da 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/details-single/ReadPrettyFormItemInitializers.tsx +++ b/packages/core/client/src/modules/blocks/data-blocks/details-single/ReadPrettyFormItemInitializers.tsx @@ -82,7 +82,7 @@ export const readPrettyFormItemInitializers_deprecated = new CompatibleSchemaIni 'x-editable': false, 'x-decorator': 'FormItem', // 'x-designer': 'Markdown.Void.Designer', - 'x-toolbar': 'BlockSchemaToolbar', + 'x-toolbar': 'FormItemSchemaToolbar', 'x-settings': 'blockSettings:markdown', 'x-component': 'Markdown.Void', 'x-component-props': { @@ -127,7 +127,7 @@ export const readPrettyFormItemInitializers = new CompatibleSchemaInitializer( 'x-editable': false, 'x-decorator': 'FormItem', // 'x-designer': 'Markdown.Void.Designer', - 'x-toolbar': 'BlockSchemaToolbar', + 'x-toolbar': 'FormItemSchemaToolbar', 'x-settings': 'blockSettings:markdown', 'x-component': 'Markdown.Void', 'x-component-props': { diff --git a/packages/core/client/src/modules/blocks/data-blocks/grid-card/__e2e__/schemaSettings.test.ts b/packages/core/client/src/modules/blocks/data-blocks/grid-card/__e2e__/schemaSettings.test.ts index 86666e8e88..56a192820f 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/grid-card/__e2e__/schemaSettings.test.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/grid-card/__e2e__/schemaSettings.test.ts @@ -49,7 +49,7 @@ test.describe('grid card block schema settings', () => { }); // https://nocobase.height.app/T-3813 - test.skip('set the count of columns displayed in a row of new version', async ({ page, mockPage, mockRecords }) => { + test('set the count of columns displayed in a row of new version', async ({ page, mockPage, mockRecords }) => { const nocoPage = await mockPage(T3813).waitForInit(); await mockRecords('general', 10); await nocoPage.goto(); diff --git a/packages/core/client/src/modules/blocks/data-blocks/grid-card/gridCardBlockSettings.ts b/packages/core/client/src/modules/blocks/data-blocks/grid-card/gridCardBlockSettings.ts index 471ef3171a..14bf2cea5b 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/grid-card/gridCardBlockSettings.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/grid-card/gridCardBlockSettings.ts @@ -1,7 +1,6 @@ import { ArrayItems } from '@formily/antd-v5'; import { ISchema } from '@formily/json-schema'; import { useField, useFieldSchema } from '@formily/react'; -import { Slider } from 'antd'; import _ from 'lodash'; import { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; @@ -36,7 +35,7 @@ export const gridCardBlockSettings = new SchemaSettings({ const columnCountSchema = useMemo(() => { return { - 'x-component': Slider, + 'x-component': 'Slider', 'x-decorator': 'FormItem', 'x-component-props': { min: 1, diff --git a/packages/core/client/src/modules/blocks/other-blocks/markdown/MarkdownFormItemInitializer.tsx b/packages/core/client/src/modules/blocks/other-blocks/markdown/MarkdownFormItemInitializer.tsx index 7bea997b33..e50a8f267b 100644 --- a/packages/core/client/src/modules/blocks/other-blocks/markdown/MarkdownFormItemInitializer.tsx +++ b/packages/core/client/src/modules/blocks/other-blocks/markdown/MarkdownFormItemInitializer.tsx @@ -15,7 +15,7 @@ export const MarkdownFormItemInitializer = () => { 'x-editable': false, 'x-decorator': 'FormItem', // 'x-designer': 'Markdown.Void.Designer', - 'x-toolbar': 'BlockSchemaToolbar', + 'x-toolbar': 'FormItemSchemaToolbar', 'x-settings': 'blockSettings:markdown', 'x-component': 'Markdown.Void', 'x-component-props': { diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditFormItemInitializers.tsx b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditFormItemInitializers.tsx index 40be91046f..6f30f3581c 100644 --- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditFormItemInitializers.tsx +++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditFormItemInitializers.tsx @@ -30,7 +30,7 @@ export const BulkEditFormItemInitializers_deprecated = new CompatibleSchemaIniti 'x-editable': false, 'x-decorator': 'FormItem', // 'x-designer': 'Markdown.Void.Designer', - 'x-toolbar': 'BlockSchemaToolbar', + 'x-toolbar': 'FormItemSchemaToolbar', 'x-settings': 'blockSettings:markdown', 'x-component': 'Markdown.Void', 'x-component-props': { @@ -67,7 +67,7 @@ export const bulkEditFormItemInitializers = new CompatibleSchemaInitializer( 'x-editable': false, 'x-decorator': 'FormItem', // 'x-designer': 'Markdown.Void.Designer', - 'x-toolbar': 'BlockSchemaToolbar', + 'x-toolbar': 'FormItemSchemaToolbar', 'x-settings': 'blockSettings:markdown', 'x-component': 'Markdown.Void', 'x-component-props': {