-
Notifications
You must be signed in to change notification settings - Fork 138
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(comp:table): refactor table column width measure logic (#1899)
1. measured width should be used in table header fix holder 2. table content colgroup width is set using width config in columns
- Loading branch information
Showing
8 changed files
with
182 additions
and
159 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
packages/components/table/src/composables/useColumnOffsets.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| /** | ||
| * @license | ||
| * | ||
| * Use of this source code is governed by an MIT-style license that can be | ||
| * found in the LICENSE file at https://github.com/IDuxFE/idux/blob/main/LICENSE | ||
| */ | ||
|
|
||
| import type { VKey } from '@idux/cdk/utils' | ||
|
|
||
| import { type ComputedRef, type Ref, computed } from 'vue' | ||
|
|
||
| import { TableColumnMerged, TableColumnScrollBar } from './useColumns' | ||
|
|
||
| export interface ColumnOffsetsContext { | ||
| columnOffsets: ComputedRef<{ | ||
| starts: Record<VKey, { index: number; offset: number }> | ||
| ends: Record<VKey, { index: number; offset: number }> | ||
| }> | ||
| columnOffsetsWithScrollBar: ComputedRef<{ | ||
| starts: Record<VKey, { index: number; offset: number }> | ||
| ends: Record<VKey, { index: number; offset: number }> | ||
| }> | ||
| } | ||
|
|
||
| export function useColumnOffsets( | ||
| fixedColumns: ComputedRef<{ | ||
| fixedStartColumns: (TableColumnMerged | TableColumnScrollBar)[] | ||
| fixedEndColumns: (TableColumnMerged | TableColumnScrollBar)[] | ||
| fixedColumnIndexMap: Record<VKey, number> | ||
| }>, | ||
| columnWidthsMap: Ref<Record<VKey, number>>, | ||
| columnCount: Ref<number>, | ||
| ): ColumnOffsetsContext { | ||
| const columnOffsets = computed(() => { | ||
| const { fixedStartColumns, fixedEndColumns, fixedColumnIndexMap } = fixedColumns.value | ||
| return calculateOffsets( | ||
| fixedStartColumns, | ||
| fixedEndColumns.filter(column => column.type !== 'scroll-bar'), | ||
| fixedColumnIndexMap, | ||
| columnWidthsMap.value, | ||
| columnCount.value - 1, | ||
| ) | ||
| }) | ||
| const columnOffsetsWithScrollBar = computed(() => { | ||
| const { fixedStartColumns, fixedEndColumns, fixedColumnIndexMap } = fixedColumns.value | ||
| return calculateOffsets( | ||
| fixedStartColumns, | ||
| fixedEndColumns, | ||
| fixedColumnIndexMap, | ||
| columnWidthsMap.value, | ||
| columnCount.value, | ||
| ) | ||
| }) | ||
| return { columnOffsets, columnOffsetsWithScrollBar } | ||
| } | ||
|
|
||
| function calculateOffsets( | ||
| startColumns: (TableColumnMerged | TableColumnScrollBar)[], | ||
| endColumns: (TableColumnMerged | TableColumnScrollBar)[], | ||
| columnIndexMap: Record<VKey, number>, | ||
| columnWidthsMap: Record<VKey, number>, | ||
| columnCount: number, | ||
| ) { | ||
| const startOffsets: Record<VKey, { index: number; offset: number }> = {} | ||
| const endOffsets: Record<VKey, { index: number; offset: number }> = {} | ||
|
|
||
| let startOffset = 0 | ||
| let endOffset = 0 | ||
|
|
||
| for (let index = 0; index < startColumns.length; index++) { | ||
| const column = startColumns[index] | ||
| const width = columnWidthsMap[column.key] ?? column.width ?? 0 | ||
|
|
||
| startOffsets[column.key] = { index: columnIndexMap[column.key] ?? index, offset: startOffset } | ||
| startOffset += width | ||
| } | ||
|
|
||
| for (let index = 0; index < endColumns.length; index++) { | ||
| const column = endColumns[endColumns.length - index - 1] | ||
| const width = columnWidthsMap[column.key] ?? column.width ?? 0 | ||
|
|
||
| endOffsets[column.key] = { index: columnIndexMap[column.key] ?? columnCount - index - 1, offset: endOffset } | ||
| endOffset += width | ||
| } | ||
|
|
||
| return { | ||
| starts: startOffsets, | ||
| ends: endOffsets, | ||
| } | ||
| } |
42 changes: 42 additions & 0 deletions
42
packages/components/table/src/composables/useColumnWidthMeasure.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /** | ||
| * @license | ||
| * | ||
| * Use of this source code is governed by an MIT-style license that can be | ||
| * found in the LICENSE file at https://github.com/IDuxFE/idux/blob/main/LICENSE | ||
| */ | ||
|
|
||
| import type { TableColumnMerged } from './useColumns' | ||
| import type { VKey } from '@idux/cdk/utils' | ||
|
|
||
| import { type ComputedRef, type Ref, ref, watch } from 'vue' | ||
|
|
||
| export interface ColumnWidthMeasureContext { | ||
| measuredColumnWidthMap: Ref<Record<VKey, number>> | ||
| changeColumnWidth: (key: VKey, width: number | false) => void | ||
| } | ||
|
|
||
| export function useColumnWidthMeasure(flattedColumns: ComputedRef<TableColumnMerged[]>): ColumnWidthMeasureContext { | ||
| const measuredColumnWidthMap = ref<Record<VKey, number>>({}) | ||
|
|
||
| const changeColumnWidth = (key: VKey, width: number | false) => { | ||
| if (width === false) { | ||
| delete measuredColumnWidthMap.value[key] | ||
| } else { | ||
| measuredColumnWidthMap.value[key] = width | ||
| } | ||
| } | ||
|
|
||
| watch(flattedColumns, columns => { | ||
| const columnKeySet = new Set(columns.map(column => column.key)) | ||
| Object.keys(measuredColumnWidthMap).forEach(key => { | ||
| if (!columnKeySet.has(key)) { | ||
| delete measuredColumnWidthMap.value[key] | ||
| } | ||
| }) | ||
| }) | ||
|
|
||
| return { | ||
| measuredColumnWidthMap, | ||
| changeColumnWidth, | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.