fix(client): build error

This commit is contained in:
chenos 2022-07-16 15:49:34 +08:00
parent e2949362ba
commit 600f13f4a0
2 changed files with 83 additions and 65 deletions

View File

@ -1,33 +1,41 @@
import { union } from 'lodash';
import React from 'react'; import React from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { SchemaInitializer } from '../SchemaInitializer'; import { SchemaInitializer } from '../SchemaInitializer';
import { gridRowColWrap, useAssociatedFormItemInitializerFields, useFormItemInitializerFields } from '../utils'; import { gridRowColWrap, useAssociatedFormItemInitializerFields, useFormItemInitializerFields } from '../utils';
import { union } from 'lodash';
// 表单里配置字段 // 表单里配置字段
export const FormItemInitializers = (props: any) => { export const FormItemInitializers = (props: any) => {
const { t } = useTranslation(); const { t } = useTranslation();
const { insertPosition, component } = props; const { insertPosition, component } = props;
const associationFields = useAssociatedFormItemInitializerFields({readPretty: true, block: 'Form'}); const associationFields = useAssociatedFormItemInitializerFields({ readPretty: true, block: 'Form' });
return ( return (
<SchemaInitializer.Button <SchemaInitializer.Button
wrap={gridRowColWrap} wrap={gridRowColWrap}
icon={'SettingOutlined'} icon={'SettingOutlined'}
items={union([ items={union<any>(
[
{ {
type: 'itemGroup', type: 'itemGroup',
title: t('Display fields'), title: t('Display fields'),
children: useFormItemInitializerFields(), children: useFormItemInitializerFields(),
}], },
associationFields.length > 0 ? [{ ],
associationFields.length > 0
? [
{
type: 'divider', type: 'divider',
}, { },
{
type: 'itemGroup', type: 'itemGroup',
title: t('Display association fields'), title: t('Display association fields'),
children: associationFields, children: associationFields,
}] : [], },
[{ ]
: [],
[
{
type: 'divider', type: 'divider',
}, },
{ {
@ -45,7 +53,8 @@ export const FormItemInitializers = (props: any) => {
}, },
}, },
}, },
])} ],
)}
insertPosition={insertPosition} insertPosition={insertPosition}
component={component} component={component}
title={component ? null : t('Configure fields')} title={component ? null : t('Configure fields')}

View File

@ -1,32 +1,40 @@
import { union } from 'lodash';
import React from 'react'; import React from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { SchemaInitializer } from '../SchemaInitializer'; import { SchemaInitializer } from '../SchemaInitializer';
import { gridRowColWrap, useAssociatedFormItemInitializerFields, useFormItemInitializerFields } from '../utils'; import { gridRowColWrap, useAssociatedFormItemInitializerFields, useFormItemInitializerFields } from '../utils';
import { union } from 'lodash';
export const ReadPrettyFormItemInitializers = (props: any) => { export const ReadPrettyFormItemInitializers = (props: any) => {
const { t } = useTranslation(); const { t } = useTranslation();
const { insertPosition, component } = props; const { insertPosition, component } = props;
const associationFields = useAssociatedFormItemInitializerFields({readPretty: true, block: 'Form'}); const associationFields = useAssociatedFormItemInitializerFields({ readPretty: true, block: 'Form' });
return ( return (
<SchemaInitializer.Button <SchemaInitializer.Button
wrap={gridRowColWrap} wrap={gridRowColWrap}
icon={'SettingOutlined'} icon={'SettingOutlined'}
items={union([ items={union<any>(
[
{ {
type: 'itemGroup', type: 'itemGroup',
title: t('Display fields'), title: t('Display fields'),
children: useFormItemInitializerFields(), children: useFormItemInitializerFields(),
}], },
associationFields.length > 0 ? [{ ],
associationFields.length > 0
? [
{
type: 'divider', type: 'divider',
}, { },
{
type: 'itemGroup', type: 'itemGroup',
title: t('Display association fields'), title: t('Display association fields'),
children: associationFields, children: associationFields,
}] : [], },
[{ ]
: [],
[
{
type: 'divider', type: 'divider',
}, },
{ {
@ -44,7 +52,8 @@ export const ReadPrettyFormItemInitializers = (props: any) => {
}, },
}, },
}, },
])} ],
)}
insertPosition={insertPosition} insertPosition={insertPosition}
component={component} component={component}
title={component ? null : t('Configure fields')} title={component ? null : t('Configure fields')}