diff --git a/packages/core/client/src/schema-initializer/buttons/FormItemInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/FormItemInitializers.tsx index 2c2b6f195..55d0d36dd 100644 --- a/packages/core/client/src/schema-initializer/buttons/FormItemInitializers.tsx +++ b/packages/core/client/src/schema-initializer/buttons/FormItemInitializers.tsx @@ -1,51 +1,60 @@ +import { union } from 'lodash'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { SchemaInitializer } from '../SchemaInitializer'; import { gridRowColWrap, useAssociatedFormItemInitializerFields, useFormItemInitializerFields } from '../utils'; -import { union } from 'lodash'; // 表单里配置字段 export const FormItemInitializers = (props: any) => { const { t } = useTranslation(); const { insertPosition, component } = props; - const associationFields = useAssociatedFormItemInitializerFields({readPretty: true, block: 'Form'}); + const associationFields = useAssociatedFormItemInitializerFields({ readPretty: true, block: 'Form' }); return ( 0 ? [{ - type: 'divider', - }, { - type: 'itemGroup', - title: t('Display association fields'), - children: associationFields, - }] : [], - [{ - type: 'divider', - }, - { - type: 'item', - title: t('Add text'), - component: 'BlockInitializer', - schema: { - type: 'void', - 'x-editable': false, - 'x-decorator': 'FormItem', - 'x-designer': 'Markdown.Void.Designer', - 'x-component': 'Markdown.Void', - 'x-component-props': { - content: t('This is a demo text, **supports Markdown syntax**.'), + items={union( + [ + { + type: 'itemGroup', + title: t('Display fields'), + children: useFormItemInitializerFields(), + }, + ], + associationFields.length > 0 + ? [ + { + type: 'divider', + }, + { + type: 'itemGroup', + title: t('Display association fields'), + children: associationFields, + }, + ] + : [], + [ + { + type: 'divider', + }, + { + type: 'item', + title: t('Add text'), + component: 'BlockInitializer', + schema: { + type: 'void', + 'x-editable': false, + 'x-decorator': 'FormItem', + 'x-designer': 'Markdown.Void.Designer', + 'x-component': 'Markdown.Void', + 'x-component-props': { + content: t('This is a demo text, **supports Markdown syntax**.'), + }, }, }, - }, - ])} + ], + )} insertPosition={insertPosition} component={component} title={component ? null : t('Configure fields')} diff --git a/packages/core/client/src/schema-initializer/buttons/ReadPrettyFormItemInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/ReadPrettyFormItemInitializers.tsx index 278ad53a2..02301bbcc 100644 --- a/packages/core/client/src/schema-initializer/buttons/ReadPrettyFormItemInitializers.tsx +++ b/packages/core/client/src/schema-initializer/buttons/ReadPrettyFormItemInitializers.tsx @@ -1,50 +1,59 @@ +import { union } from 'lodash'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { SchemaInitializer } from '../SchemaInitializer'; import { gridRowColWrap, useAssociatedFormItemInitializerFields, useFormItemInitializerFields } from '../utils'; -import { union } from 'lodash'; export const ReadPrettyFormItemInitializers = (props: any) => { const { t } = useTranslation(); const { insertPosition, component } = props; - const associationFields = useAssociatedFormItemInitializerFields({readPretty: true, block: 'Form'}); - + const associationFields = useAssociatedFormItemInitializerFields({ readPretty: true, block: 'Form' }); + return ( 0 ? [{ - type: 'divider', - }, { - type: 'itemGroup', - title: t('Display association fields'), - children: associationFields, - }] : [], - [{ - type: 'divider', - }, - { - type: 'item', - title: t('Add text'), - component: 'BlockInitializer', - schema: { - type: 'void', - 'x-editable': false, - 'x-decorator': 'FormItem', - 'x-designer': 'Markdown.Void.Designer', - 'x-component': 'Markdown.Void', - 'x-component-props': { - content: t('This is a demo text, **supports Markdown syntax**.'), + items={union( + [ + { + type: 'itemGroup', + title: t('Display fields'), + children: useFormItemInitializerFields(), + }, + ], + associationFields.length > 0 + ? [ + { + type: 'divider', + }, + { + type: 'itemGroup', + title: t('Display association fields'), + children: associationFields, + }, + ] + : [], + [ + { + type: 'divider', + }, + { + type: 'item', + title: t('Add text'), + component: 'BlockInitializer', + schema: { + type: 'void', + 'x-editable': false, + 'x-decorator': 'FormItem', + 'x-designer': 'Markdown.Void.Designer', + 'x-component': 'Markdown.Void', + 'x-component-props': { + content: t('This is a demo text, **supports Markdown syntax**.'), + }, }, }, - }, - ])} + ], + )} insertPosition={insertPosition} component={component} title={component ? null : t('Configure fields')}