mirror of
https://gitee.com/xuliangzhan_admin/vxe-table.git
synced 2026-01-21 05:27:57 +08:00
修复虚拟滚动导致与固定列导致合并列显示错乱问题
This commit is contained in:
@@ -593,6 +593,7 @@ export default defineComponent({
|
||||
let { fixedColumn, fixedType, tableColumn } = props
|
||||
const { keyboardConfig, showOverflow: allColumnOverflow, spanMethod, mouseConfig } = tableProps
|
||||
const { tableData, mergeList, scrollXLoad, scrollYLoad, isAllOverflow } = tableReactData
|
||||
const { visibleColumn } = tableInternalData
|
||||
const { slots } = tableContext
|
||||
const sYOpts = computeSYOpts.value
|
||||
const emptyOpts = computeEmptyOpts.value
|
||||
@@ -602,6 +603,8 @@ export default defineComponent({
|
||||
if (fixedType) {
|
||||
if ((!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) && (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
|
||||
tableColumn = fixedColumn
|
||||
} else {
|
||||
tableColumn = visibleColumn
|
||||
}
|
||||
}
|
||||
let emptyContent: string | VxeGlobalRendererHandles.RenderResult
|
||||
|
||||
Reference in New Issue
Block a user