diff --git a/packages/vtable-export/package.json b/packages/vtable-export/package.json index e000e7615..f893a3eda 100644 --- a/packages/vtable-export/package.json +++ b/packages/vtable-export/package.json @@ -23,6 +23,7 @@ } }, "scripts": { + "compile": "tsc --noEmit", "start": "vite ./demo", "build": "bundle --clean" }, @@ -86,4 +87,4 @@ "@types/react-is": "^17.0.3", "rollup-plugin-node-resolve": "5.2.0" } -} +} \ No newline at end of file diff --git a/packages/vtable-export/src/excel/index.ts b/packages/vtable-export/src/excel/index.ts index 7c99fb19c..056fc8898 100644 --- a/packages/vtable-export/src/excel/index.ts +++ b/packages/vtable-export/src/excel/index.ts @@ -4,7 +4,7 @@ import type { CellType, IVTable } from '../util/type'; import { getCellAlignment, getCellBorder, getCellFill, getCellFont } from './style'; import { updateCell, renderChart, graphicUtil } from '@visactor/vtable'; import { isArray } from '@visactor/vutils'; -import type { IRowSeriesNumber } from '@visactor/vtable/src/ts-types'; +import type { ColumnDefine, IRowSeriesNumber } from '@visactor/vtable/src/ts-types'; export async function exportVTableToExcel(tableInstance: IVTable) { const workbook = new ExcelJS.Workbook(); @@ -96,7 +96,9 @@ function addCell( const define = cellLocation !== 'body' ? tableInstance.getHeaderDefine(col, row) : tableInstance.getBodyColumnDefine(col, row); const mayHaveIcon = - cellLocation !== 'body' ? true : (define as IRowSeriesNumber)?.dragOrder || !!define?.icon || !!define?.tree; + cellLocation !== 'body' + ? true + : (define as IRowSeriesNumber)?.dragOrder || !!define?.icon || !!(define as ColumnDefine)?.tree; let icons; if (mayHaveIcon) { icons = tableInstance.getCellIcons(col, row); @@ -104,11 +106,11 @@ function addCell( let customRender; let customLayout; if (cellLocation !== 'body') { - customRender = define?.headerCustomRender; - customLayout = define?.headerCustomLayout; + customRender = (define as ColumnDefine)?.headerCustomRender; + customLayout = (define as ColumnDefine)?.headerCustomLayout; } else { - customRender = define?.customRender || tableInstance.customRender; - customLayout = define?.customLayout; + customRender = (define as ColumnDefine)?.customRender || tableInstance.customRender; + customLayout = (define as ColumnDefine)?.customLayout; } if ( diff --git a/packages/vtable/src/core/tableHelper.ts b/packages/vtable/src/core/tableHelper.ts index 25a874058..833de32e0 100644 --- a/packages/vtable/src/core/tableHelper.ts +++ b/packages/vtable/src/core/tableHelper.ts @@ -66,7 +66,7 @@ export function _setRecords(table: ListTableAPI, records: any[] = []): void { }); } -export function _setDataSource(table: ListTableAPI, dataSource: DataSource): void { +export function _setDataSource(table: BaseTableAPI, dataSource: DataSource): void { _dealWithUpdateDataSource(table, () => { if (dataSource) { if (dataSource instanceof DataSource) {