Merge branch 'master' into feat/Waterfall

2023-10-07 15:17:16 +08:00
parent 90eb00f869 4d14246de5
commit 69ec5f0d7d
1 changed files with 3 additions and 1 deletions
--- a/src/components/Descriptions/src/Descriptions.vue
+++ b/src/components/Descriptions/src/Descriptions.vue
@@ -16,6 +16,8 @@ const { getPrefixCls } = useDesign()

 const prefixCls = getPrefixCls('descriptions')

+const defaultData = '-'
+
 export default defineComponent({
  name: 'Descriptions',
  props: {
@@ -115,7 +117,7 @@ export default defineComponent({
                            default: () =>
                              item.slots?.default
                                ? item.slots?.default(props.data)
-                                : get(props.data, item.field)
+                                : get(props.data, item.field) ?? defaultData
                          }}
                        </ElDescriptionsItem>
                      )