From 2a655146122f466621e7a10c54be801b5e7543be Mon Sep 17 00:00:00 2001 From: yangd Date: Thu, 3 Jan 2019 16:53:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3table=E4=B8=ADrender?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- types/table.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/types/table.d.ts b/types/table.d.ts index 1d90c5c4..1805ea61 100644 --- a/types/table.d.ts +++ b/types/table.d.ts @@ -240,7 +240,7 @@ export declare interface TableColumn { render?: ( h?: CreateElement, params?: TableColumnRenderParams - ) => TableRenderCreateElementResult; + ) => VNode; /** * 自定义列头显示内容,传入参数有两个,column 和 index,分别为当前列数据和当前列索引,不支持渲染自定义组件 * @param h Render函数 @@ -249,7 +249,7 @@ export declare interface TableColumn { renderHeader?: ( h?: CreateElement, params?: TableColumnRenderHeadParams - ) => TableRenderCreateElementResult; + ) => VNode; /** * 对应列是否可以排序,如果设置为 custom,则代表用户希望远程排序, * 需要监听 Table 的 on- sort - change 事件,默认false From a5722e4518fa1f962a1fd48572ae57d7e55c3262 Mon Sep 17 00:00:00 2001 From: yangd Date: Thu, 3 Jan 2019 16:57:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3table=E4=B8=ADrender?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E8=BF=94=E5=9B=9E=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- types/iview.components.d.ts | 2 +- types/table.d.ts | 22 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/types/iview.components.d.ts b/types/iview.components.d.ts index a3b4eeba..4b776517 100644 --- a/types/iview.components.d.ts +++ b/types/iview.components.d.ts @@ -52,7 +52,7 @@ export { Slider } from './slider'; export { Spin } from './spin'; export { Steps, StepsStep } from './steps'; export { Switch, Switch as ISwitch } from './switch'; -export { Table, TableColumn, TableRenderCreateElementData, TableColumnRenderParams, TableRenderCreateElementResult, TableColumnRenderHeadParams, TableExportCsvParams } from './table'; +export { Table, TableColumn, TableRenderCreateElementData, TableColumnRenderParams, TableColumnRenderHeadParams, TableExportCsvParams } from './table'; export { Tabs, TabPane } from './tabs'; export { Tag } from './tag'; export { Time } from './time'; diff --git a/types/table.d.ts b/types/table.d.ts index 1805ea61..3621a167 100644 --- a/types/table.d.ts +++ b/types/table.d.ts @@ -357,28 +357,6 @@ export declare interface TableColumnRenderParams { index?: number; } -export declare interface TableRenderCreateElementResult { - child?: object; - children?: Array; - componentInstance?: object; - componentOptions?: object; - context?: object; - data?: object; - elm?: object; - functionalContext?: object; - isCloned?: boolean; - isComment?: boolean; - isOnce?: boolean; - isRootInsert?: boolean; - isStatic?: boolean; - key?: object; - ns?: object; - parent?: object; - raw?: boolean; - tag?: string; - text?: object; -} - export declare interface TableColumnRenderHeadParams { /** * 当前列数据