zuaa
/
vue-vben-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(descriotion): fix type #228

This commit is contained in:
vben 2021-02-04 00:29:01 +08:00
parent 1d0ec3629f
commit 4909a4cb25
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/Description/src/index.tsx
View File

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

2
src/components/Description/src/types.ts
View File

@ -17,7 +17,7 @@ export interface DescItem {
// render // render
render?: ( render?: (
val: string, val: string,
data: Recordable data: Record<string, any>
) => VNode | undefined | JSX.Element | Element | string | number; ) => VNode | undefined | JSX.Element | Element | string | number;
} }