diff --git a/packages/core/client/src/block-provider/hooks/index.ts b/packages/core/client/src/block-provider/hooks/index.ts index 28c498082..3ef2ec37c 100644 --- a/packages/core/client/src/block-provider/hooks/index.ts +++ b/packages/core/client/src/block-provider/hooks/index.ts @@ -164,7 +164,7 @@ export const useCreateActionProps = () => { // const values = omitBy(formValues, (value) => isEqual(JSON.stringify(value), '[{}]')); if (addChild) { const treeParentField = getTreeParentField(); - values[treeParentField?.name ?? 'parent'] = currentRecord?.__parent; + values[treeParentField?.name ?? 'parent'] = omit(currentRecord?.__parent, ['children']); values[treeParentField?.foreignKey ?? 'parentId'] = currentRecord?.__parent?.id; } actionField.data = field.data || {}; @@ -182,10 +182,10 @@ export const useCreateActionProps = () => { ? triggerWorkflows.map((row) => [row.workflowKey, row.context].filter(Boolean).join('!')).join(',') : undefined, }); + setVisible?.(false); actionField.data.loading = false; actionField.data.data = data; __parent?.service?.refresh?.(); - setVisible?.(false); if (!onSuccess?.successMessage) { message.success(t('Saved successfully')); await form.reset(); diff --git a/packages/core/client/src/schema-component/antd/expand-action/Expand.Action.tsx b/packages/core/client/src/schema-component/antd/expand-action/Expand.Action.tsx index 640e28378..19a1a3aa5 100644 --- a/packages/core/client/src/schema-component/antd/expand-action/Expand.Action.tsx +++ b/packages/core/client/src/schema-component/antd/expand-action/Expand.Action.tsx @@ -2,6 +2,7 @@ import { css } from '@emotion/css'; import { useFieldSchema } from '@formily/react'; import { Button } from 'antd'; import React from 'react'; +import { useCompile } from '../../hooks'; import { useTableBlockContext, useTableSelectorContext } from '../../../block-provider'; import { Icon } from '../../../icon'; @@ -52,6 +53,7 @@ export const ExpandAction = (props) => { const isTableSelector = schema.parent?.parent?.['x-decorator'] === 'TableSelectorProvider'; const ctx = isTableSelector ? ctxSelector : ctxBlock; const { titleExpand, titleCollapse, iconExpand, iconCollapse } = schema['x-component-props'] || {}; + const compile = useCompile(); return (
{ctx?.params['tree'] && ( @@ -62,8 +64,8 @@ export const ExpandAction = (props) => { icon={} type={props.type} > - {props.children[1]} - {ctx?.expandFlag ? titleCollapse : titleExpand} + {props.children?.[1]} + {ctx?.expandFlag ? compile(titleCollapse) : compile(titleExpand)} )}
diff --git a/packages/core/client/src/schema-initializer/items/ExpandActionInitializer.tsx b/packages/core/client/src/schema-initializer/items/ExpandActionInitializer.tsx index 3ec845537..3002d6276 100644 --- a/packages/core/client/src/schema-initializer/items/ExpandActionInitializer.tsx +++ b/packages/core/client/src/schema-initializer/items/ExpandActionInitializer.tsx @@ -1,16 +1,14 @@ import React from 'react'; -import { useTranslation } from 'react-i18next'; import { ActionInitializer } from './ActionInitializer'; export const ExpandActionInitializer = (props) => { - const { t } = useTranslation(); const schema = { 'x-action': 'expandAll', 'x-component': 'Action', 'x-designer': 'Expand.Action.Design', 'x-component-props': { - titleExpand: t('Expand all'), - titleCollapse: t('Collapse all'), + titleExpand: "{{t('Expand all')}}", + titleCollapse: "{{t('Collapse all')}}", iconExpand: 'nodeexpandoutlined', iconCollapse: 'nodecollapseoutlined', component: 'Expand.Action',