From 0ddd73cf3be791e40abbfe6c27e3d0e0fd14773c Mon Sep 17 00:00:00 2001 From: chenos Date: Fri, 9 Dec 2022 10:42:30 +0800 Subject: [PATCH] fix(record-picker): show N/A when no value --- .../antd/record-picker/ReadPrettyRecordPicker.tsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/core/client/src/schema-component/antd/record-picker/ReadPrettyRecordPicker.tsx b/packages/core/client/src/schema-component/antd/record-picker/ReadPrettyRecordPicker.tsx index a2453f1ec..660a3afd3 100644 --- a/packages/core/client/src/schema-component/antd/record-picker/ReadPrettyRecordPicker.tsx +++ b/packages/core/client/src/schema-component/antd/record-picker/ReadPrettyRecordPicker.tsx @@ -16,6 +16,13 @@ interface IEllipsisWithTooltipRef { setPopoverVisible: (boolean) => void; } +const toValue = (value, placeholder) => { + if (value === null || value === undefined) { + return placeholder; + } + return value; +}; + export const ReadPrettyRecordPicker: React.FC = observer((props: any) => { const { ellipsis } = props; const fieldSchema = useFieldSchema(); @@ -34,8 +41,7 @@ export const ReadPrettyRecordPicker: React.FC = observer((props: any) => { const ellipsisWithTooltipRef = useRef(); const renderRecords = () => toArr(field.value).map((record, index, arr) => { - const val = - compile(record?.[fieldNames?.label || 'label']) || record?.[fieldNames?.value || 'value'] || record?.id; + const val = toValue(compile(record?.[fieldNames?.label || 'label']), 'N/A'); return (