Skip to content

fix(frozen-layout): skip border nodes during row movement #3785

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

Merged
fangsmile merged 1 commit into from
Apr 23, 2025
Merged

fix(frozen-layout): skip border nodes during row movement #3785

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
75 changes: 51 additions & 24 deletions packages/vtable/src/scenegraph/layout/frozen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,8 +543,11 @@ function moveRowFromBodyToColHeader(scene: Scenegraph) {
let hasSetedHeight = false;
// deal with bodyGroup
for (let i = 0; i < scene.bodyGroup.childrenCount; i++) {
const colGroup = scene.bodyGroup.children[i] as Group;
const rowCell = colGroup.firstChild as Group;
const child = scene.bodyGroup.children[i];
if (!checkBeforeMove(child)) {
continue;
}
const rowCell = child.firstChild as Group;
scene.colHeaderGroup.children[i]?.appendChild(rowCell);
// update container width
if (!hasSetedHeight) {
Expand All @@ -559,8 +562,11 @@ function moveRowFromRowHeaderToCornerHeader(scene: Scenegraph) {
let hasSetedHeight = false;
// deal with rowHeaderGroup
for (let i = 0; i < scene.rowHeaderGroup.childrenCount; i++) {
const colGroup = scene.rowHeaderGroup.children[i] as Group;
const rowCell = colGroup.firstChild as Group;
const child = scene.rowHeaderGroup.children[i];
if (!checkBeforeMove(child)) {
continue;
}
const rowCell = child.firstChild as Group;
scene.cornerHeaderGroup.children[i]?.appendChild(rowCell);
// update container width
if (!hasSetedHeight) {
Expand All @@ -578,8 +584,11 @@ function moveRowFromRightToTopRightCorner(scene: Scenegraph) {
let hasSetedHeight = false;
// deal with rowHeaderGroup
for (let i = 0; i < scene.rightFrozenGroup.childrenCount; i++) {
const colGroup = scene.rightFrozenGroup.children[i] as Group;
const rowCell = colGroup.firstChild as Group;
const child = scene.rightFrozenGroup.children[i];
if (!checkBeforeMove(child)) {
continue;
}
const rowCell = child.firstChild as Group;
scene.rightTopCornerGroup.children[i]?.appendChild(rowCell);
// update container width
if (!hasSetedHeight) {
Expand All @@ -597,10 +606,17 @@ function moveRowFromColHeaderToBody(scene: Scenegraph) {
let hasSetedHeight = false;
// deal with bodyGroup
for (let i = 0; i < scene.colHeaderGroup.childrenCount; i++) {
const colGroup = scene.colHeaderGroup.children[i] as Group;
const rowCell = colGroup.lastChild as Group;
insertBefore(scene.bodyGroup.children[i] as Group, rowCell, scene.bodyGroup.children[i].firstChild as Group);
// update container width
const child = scene.colHeaderGroup.children[i];
if (!checkBeforeMove(child)) {
continue;
}
const target = scene.bodyGroup.children[i] as Group;
if (!target) {
continue;
}
const rowCell = child.lastChild as Group;
insertBefore(target, rowCell, target.firstChild as Group);
// 更新高度
if (!hasSetedHeight) {
scene.colHeaderGroup.setAttribute('height', scene.colHeaderGroup.attribute.height - rowCell.attribute.height);
scene.bodyGroup.setAttribute('height', scene.bodyGroup.attribute.height + rowCell.attribute.height);
Expand All @@ -613,14 +629,17 @@ function moveRowFromCornerHeaderToRowHeader(scene: Scenegraph) {
let hasSetedHeight = false;
// deal with rowHeaderGroup
for (let i = 0; i < scene.cornerHeaderGroup.childrenCount; i++) {
const colGroup = scene.cornerHeaderGroup.children[i] as Group;
const rowCell = colGroup.lastChild as Group;
const child = scene.cornerHeaderGroup.children[i];
if (!checkBeforeMove(child)) {
continue;
}
const target = scene.rowHeaderGroup.children[i] as Group;
if (!target) {
continue;
}
const rowCell = child.lastChild as Group;
// scene.rowHeaderGroup.children[i]?.appendChild(rowCell);
insertBefore(
scene.rowHeaderGroup.children[i] as Group,
rowCell,
scene.rowHeaderGroup.children[i].firstChild as Group
);
insertBefore(target, rowCell, target.firstChild as Group);
// update container width
if (!hasSetedHeight) {
scene.cornerHeaderGroup.setAttribute(
Expand All @@ -637,14 +656,17 @@ function moveRowFromTopRightCornerToRight(scene: Scenegraph) {
let hasSetedHeight = false;
// deal with rowHeaderGroup
for (let i = 0; i < scene.rightTopCornerGroup.childrenCount; i++) {
const colGroup = scene.rightTopCornerGroup.children[i] as Group;
const rowCell = colGroup.lastChild as Group;
const child = scene.rightTopCornerGroup.children[i];
if (!checkBeforeMove(child)) {
continue;
}
const target = scene.rightFrozenGroup.children[i] as Group;
if (!target) {
continue;
}
const rowCell = child.lastChild as Group;
// scene.rightFrozenGroup.children[i]?.appendChild(rowCell);
insertBefore(
scene.rightFrozenGroup.children[i] as Group,
rowCell,
scene.rightFrozenGroup.children[i].firstChild as Group
);
insertBefore(target, rowCell, target.firstChild as Group);
// update container width
if (!hasSetedHeight) {
scene.rightTopCornerGroup.setAttribute(
Expand All @@ -656,3 +678,8 @@ function moveRowFromTopRightCornerToRight(scene: Scenegraph) {
}
}
}

function checkBeforeMove(child: any) {
// 跳过非 Group 类型或名为 'table-border-rect' 的边框节点
return child instanceof Group && child?.name !== 'table-border-rect';
}
Loading