From d5ccc3427038f06f2cc8d7c7ab763907edd30f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=9F=E8=B4=A4?= Date: Thu, 24 Aug 2023 22:38:59 +0800 Subject: [PATCH] feat(descriptions): support emptyText --- packages/descriptions/src/demos/columns.tsx | 2 +- packages/descriptions/src/index.tsx | 10 ++++++++++ tests/descriptions/__snapshots__/demo.test.ts.snap | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/descriptions/src/demos/columns.tsx b/packages/descriptions/src/demos/columns.tsx index 7d4418e51a04..36fe3a5ddb01 100644 --- a/packages/descriptions/src/demos/columns.tsx +++ b/packages/descriptions/src/demos/columns.tsx @@ -8,7 +8,6 @@ export default () => { return Promise.resolve({ success: true, data: { - id: '这是一段文本columns', date: '20200809', money: '1212100', money2: -12345.33, @@ -18,6 +17,7 @@ export default () => { }, }); }} + emptyText={'空'} columns={[ { title: '文本', diff --git a/packages/descriptions/src/index.tsx b/packages/descriptions/src/index.tsx index a59c689e9ab9..9779a31e5d6c 100644 --- a/packages/descriptions/src/index.tsx +++ b/packages/descriptions/src/index.tsx @@ -120,6 +120,11 @@ export type ProDescriptionsProps< dataSource?: RecordType; /** 受控数据源改变 */ onDataSourceChange?: (value: RecordType) => void; + + /** + *为空时候的默认值 + */ + emptyText?: React.ReactNode; }; /** @@ -155,6 +160,7 @@ export const FieldRender: React.FC< action: ProCoreActionType; index: number; editableUtils?: UseEditableMapUtilType; + emptyText?: React.ReactNode; } > = (props) => { const { @@ -182,6 +188,7 @@ export const FieldRender: React.FC< valueEnum, mode: mode || 'read', proFieldProps: { + emptyText: props.emptyText, render: render ? () => render?.(text, entity, index, action, { @@ -302,6 +309,7 @@ const schemaToDescriptionsItem = ( entity: any, action: ProCoreActionType, editableUtils?: UseEditableMapUtilType, + emptyText?: React.ReactNode, ) => { const options: JSX.Element[] = []; const isBigger58 = compareVersions(version, '5.8.0') >= 0; @@ -388,6 +396,7 @@ const schemaToDescriptionsItem = ( valueType={valueType} entity={entity} index={index} + emptyText={emptyText} action={action} editableUtils={editableUtils} /> @@ -587,6 +596,7 @@ const ProDescriptions = < action.dataSource || {}, actionRef?.current || action, editable ? editableUtils : undefined, + props.emptyText, ); /** 如果不是可编辑模式,没必要注入 ProForm */ diff --git a/tests/descriptions/__snapshots__/demo.test.ts.snap b/tests/descriptions/__snapshots__/demo.test.ts.snap index 62a9d821908b..d1538900ef84 100644 --- a/tests/descriptions/__snapshots__/demo.test.ts.snap +++ b/tests/descriptions/__snapshots__/demo.test.ts.snap @@ -825,6 +825,7 @@ exports[`descriptions demos 📸 renders ./packages/descriptions/src/demos/colum
- 这是一段文本columns + 空