Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(comp:table): inconsecutive fixed columns are not fixed #1835

Merged
merged 1 commit into from
Jan 25, 2024
Merged

fix(comp:table): inconsecutive fixed columns are not fixed #1835

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 26 additions & 17 deletions packages/components/table/src/composables/useColumns.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,17 +291,20 @@ function useFixedColumns(flattedColumnsWithScrollBar: ComputedRef<(TableColumnMe
const fixedColumns = computed(() => {
const fixedStartColumns: (TableColumnMerged | TableColumnScrollBar)[] = []
const fixedEndColumns: (TableColumnMerged | TableColumnScrollBar)[] = []
const fixedColumnIndexMap: Record<VKey, number> = {}

flattedColumnsWithScrollBar.value.forEach(column => {
const { fixed } = column
flattedColumnsWithScrollBar.value.forEach((column, index) => {
const { key, fixed } = column
if (fixed === 'start') {
fixedStartColumns.push(column)
fixedColumnIndexMap[key] = index
} else if (fixed === 'end') {
fixedEndColumns.push(column)
fixedColumnIndexMap[key] = index
}
})

return { fixedStartColumns, fixedEndColumns }
return { fixedStartColumns, fixedEndColumns, fixedColumnIndexMap }
})
const fixedColumnKeys = computed(() => {
const { fixedStartColumns, fixedEndColumns } = fixedColumns.value
Expand Down Expand Up @@ -344,32 +347,38 @@ function useColumnOffsets(
fixedColumns: ComputedRef<{
fixedStartColumns: (TableColumnMerged | TableColumnScrollBar)[]
fixedEndColumns: (TableColumnMerged | TableColumnScrollBar)[]
fixedColumnIndexMap: Record<VKey, number>
}>,
columnWidthsMap: Ref<Record<VKey, number>>,
columnCount: Ref<number>,
) {
const columnOffsets = computed(() =>
calculateOffsets(
fixedColumns.value.fixedStartColumns,
fixedColumns.value.fixedEndColumns.filter(column => column.type !== 'scroll-bar'),
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(() =>
calculateOffsets(
fixedColumns.value.fixedStartColumns,
fixedColumns.value.fixedEndColumns,
)
})
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,
) {
Expand All @@ -383,15 +392,15 @@ function calculateOffsets(
const column = startColumns[index]
const width = columnWidthsMap[column.key] ?? column.width ?? 0

startOffsets[column.key] = { index, offset: startOffset }
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: columnCount - index - 1, offset: endOffset }
endOffsets[column.key] = { index: columnIndexMap[column.key] ?? columnCount - index - 1, offset: endOffset }
endOffset += width
}

Expand Down