fix(descriotion): fix type #228

vbenjs · Feb 3, 2021 · 4909a4c · JohnNiang · Feb 4, 2021 · 4909a4c
1 parent 1d0ec36
commit 4909a4c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/components/Description/src/index.tsx b/src/components/Description/src/index.tsx
@@ -1,6 +1,7 @@
 import type { DescOptions, DescInstance, DescItem } from './types';
 
 import { defineComponent, computed, ref, unref, CSSProperties } from 'vue';
+import { get } from 'lodash-es';
 import { Descriptions } from 'ant-design-vue';
 import { DescriptionsProps } from 'ant-design-vue/es/descriptions/index';
 import { CollapseContainer, CollapseContainerOptions } from '/@/components/Container/index';
@@ -91,8 +92,11 @@ export default defineComponent({
           return null;
         }
 
-        const getContent = () =>
-          isFunction(render) ? render(data?.[field], data) : unref(data) && unref(data)[field];
+        const getContent = () => {
+          const _data = unref(data);
+          const getField = get(_data, field);
+          return isFunction(render) ? render(getField, _data) : getField ?? '';
+        };
 
         const width = contentMinWidth;
         return (

diff --git a/src/components/Description/src/types.ts b/src/components/Description/src/types.ts
@@ -17,7 +17,7 @@ export interface DescItem {
   // render
   render?: (
     val: string,
-    data: Recordable
+    data: Record<string, any>
   ) => VNode | undefined | JSX.Element | Element | string | number;
 }