mirror/naive-ui
2
0
Fork 0
mirror of https://github.com/tusen-ai/naive-ui.git synced 2024-12-21 04:50:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(data-table): type error

Browse Source
This commit is contained in:
07akioni 2021-07-25 18:39:12 +08:00
parent 78c3845f5e
commit 9d2a9d8703
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/data-table/src/TableParts/Header.tsx
View File

@ -51,7 +51,7 @@ export default defineComponent({
mergedSortStateRef, mergedSortStateRef,
componentId, componentId,
scrollPartRef, scrollPartRef,
tableLayoutRef, mergedTableLayoutRef,
handleTableBodyScroll, handleTableBodyScroll,
doUpdateSorter, doUpdateSorter,
doUncheckAll, doUncheckAll,
@ -92,7 +92,7 @@ export default defineComponent({
cols: colsRef, cols: colsRef,
mergedTheme: mergedThemeRef, mergedTheme: mergedThemeRef,
checkOptions: checkOptionsRef, checkOptions: checkOptionsRef,
tableLayout: tableLayoutRef, mergedTableLayout: mergedTableLayoutRef,
handleMouseenter, handleMouseenter,
handleCheckboxUpdateChecked, handleCheckboxUpdateChecked,
handleColHeaderClick, handleColHeaderClick,
@ -114,6 +114,7 @@ export default defineComponent({
checkOptions, checkOptions,
componentId, componentId,
discrete, discrete,
mergedTableLayout,
handleColHeaderClick, handleColHeaderClick,
handleCheckboxUpdateChecked handleCheckboxUpdateChecked
} = this } = this
@ -232,7 +233,7 @@ export default defineComponent({
class={`${mergedClsPrefix}-data-table-table`} class={`${mergedClsPrefix}-data-table-table`}
style={{ style={{
minWidth: formatLength(scrollX), minWidth: formatLength(scrollX),
tableLayout: discrete || hasEllipsis ? 'fixed' : this.tableLayout tableLayout: mergedTableLayout
}} }}
> >
<colgroup> <colgroup>