From 9d2a9d8703143a2868c632d98da4e5a9cae52a4d Mon Sep 17 00:00:00 2001 From: 07akioni <07akioni2@gmail.com> Date: Sun, 25 Jul 2021 18:39:12 +0800 Subject: [PATCH] fix(data-table): type error --- src/data-table/src/TableParts/Header.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/data-table/src/TableParts/Header.tsx b/src/data-table/src/TableParts/Header.tsx index 78bfd3514..fa41bbe18 100644 --- a/src/data-table/src/TableParts/Header.tsx +++ b/src/data-table/src/TableParts/Header.tsx @@ -51,7 +51,7 @@ export default defineComponent({ mergedSortStateRef, componentId, scrollPartRef, - tableLayoutRef, + mergedTableLayoutRef, handleTableBodyScroll, doUpdateSorter, doUncheckAll, @@ -92,7 +92,7 @@ export default defineComponent({ cols: colsRef, mergedTheme: mergedThemeRef, checkOptions: checkOptionsRef, - tableLayout: tableLayoutRef, + mergedTableLayout: mergedTableLayoutRef, handleMouseenter, handleCheckboxUpdateChecked, handleColHeaderClick, @@ -114,6 +114,7 @@ export default defineComponent({ checkOptions, componentId, discrete, + mergedTableLayout, handleColHeaderClick, handleCheckboxUpdateChecked } = this @@ -232,7 +233,7 @@ export default defineComponent({ class={`${mergedClsPrefix}-data-table-table`} style={{ minWidth: formatLength(scrollX), - tableLayout: discrete || hasEllipsis ? 'fixed' : this.tableLayout + tableLayout: mergedTableLayout }} >