Merge remote-tracking branch 'origin/develop' into 1887-refactor-tool…

…tip-scroll
VisActor · Jun 13, 2024 · f10dc51 · f10dc51
2 parents 74e166e + 984aaa5
commit f10dc51
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 130 deletions.
diff --git a/common/changes/@visactor/vtable/1167-feature-selected-highlight_2024-06-05-03-27.json b/common/changes/@visactor/vtable/1167-feature-selected-highlight_2024-06-05-03-27.json
diff --git a/.../changes/@visactor/vtable/1848-feature-icon-tooltip-delay-disappear_2024-06-05-10-34.json b/.../changes/@visactor/vtable/1848-feature-icon-tooltip-delay-disappear_2024-06-05-10-34.json
diff --git a/common/changes/@visactor/vtable/1865-refactor-updatepivotsortstate_2024-06-07-12-32.json b/common/changes/@visactor/vtable/1865-refactor-updatepivotsortstate_2024-06-07-12-32.json
diff --git a/common/changes/@visactor/vtable/1873-feature-keyboard-arrow-shiftCtrl_2024-06-11-12-07.json b/common/changes/@visactor/vtable/1873-feature-keyboard-arrow-shiftCtrl_2024-06-11-12-07.json
diff --git a/common/changes/@visactor/vtable/1882-bug-inlineFront-icon_2024-06-12-04-01.json b/common/changes/@visactor/vtable/1882-bug-inlineFront-icon_2024-06-12-04-01.json
diff --git a/common/changes/@visactor/vtable/1899-bug-drill-down-icon-can-not-click_2024-06-12-10-50.json b/common/changes/@visactor/vtable/1899-bug-drill-down-icon-can-not-click_2024-06-12-10-50.json
diff --git a/common/changes/@visactor/vtable/feat-export-icon_2024-06-05-07-00.json b/common/changes/@visactor/vtable/feat-export-icon_2024-06-05-07-00.json
diff --git a/common/changes/@visactor/vtable/feat-inputEditorConfig_2024-06-05-03-03.json b/common/changes/@visactor/vtable/feat-inputEditorConfig_2024-06-05-03-03.json
diff --git a/common/changes/@visactor/vtable/fix-bug-fix-for-fs_2024-06-12-04-05.json b/common/changes/@visactor/vtable/fix-bug-fix-for-fs_2024-06-12-04-05.json
diff --git a/common/changes/@visactor/vtable/fix-bug-fix-for-fs_2024-06-12-04-06.json b/common/changes/@visactor/vtable/fix-bug-fix-for-fs_2024-06-12-04-06.json
diff --git a/common/changes/@visactor/vtable/fix-bug-fix-for-fs_2024-06-12-04-07.json b/common/changes/@visactor/vtable/fix-bug-fix-for-fs_2024-06-12-04-07.json
diff --git a/common/changes/@visactor/vtable/fix-ellipsis_2024-06-11-08-30.json b/common/changes/@visactor/vtable/fix-ellipsis_2024-06-11-08-30.json
diff --git a/...le/feat-text-stroke_2024-06-05-07-42.json → ...ge-cell-size-update_2024-06-13-04-41.json b/...le/feat-text-stroke_2024-06-05-07-42.json → ...ge-cell-size-update_2024-06-13-04-41.json
@@ -2,7 +2,7 @@
   "changes": [
     {
       "packageName": "@visactor/vtable",
-      "comment": "feat: add strokeColor style #1847",
+      "comment": "fix: fix merge cell size update #1869",
       "type": "none"
     }
   ],

diff --git a/packages/vtable/src/scenegraph/group-creater/cell-helper.ts b/packages/vtable/src/scenegraph/group-creater/cell-helper.ts
@@ -739,7 +739,7 @@ export function dealWithMergeCellSize(
     for (let row = range.start.row; row <= range.end.row; row++) {
       const cellGroup = table.scenegraph.getCell(col, row, true);
 
-      if (cellGroup.role === 'cell' && range.start.row !== range.end.row && cellGroup.contentWidth !== cellWidth) {
+      if (cellGroup.role === 'cell' && range.start.row !== range.end.row && cellGroup.contentHeight !== cellHeight) {
         updateCellContentHeight(
           cellGroup,
           cellHeight,
@@ -752,7 +752,7 @@ export function dealWithMergeCellSize(
           // 'middle'
         );
       }
-      if (cellGroup.role === 'cell' && range.start.col !== range.end.col && cellGroup.contentHeight !== cellHeight) {
+      if (cellGroup.role === 'cell' && range.start.col !== range.end.col && cellGroup.contentWidth !== cellWidth) {
         updateCellContentWidth(
           cellGroup,
           cellWidth,

diff --git a/packages/vtable/src/scenegraph/layout/frozen.ts b/packages/vtable/src/scenegraph/layout/frozen.ts
@@ -17,6 +17,9 @@ export function dealFrozen(scene: Scenegraph) {
     }
   } else if (scene.table.frozenColCount < scene.table.rowHeaderLevelCount) {
     // move columnGroup from rowHeaderGroup into bodyGroup(from cornerHeaderGroup into colHeaderGroup)
+    scene.bodyGroup.setAttribute('height', scene.rowHeaderGroup.attribute.height);
+    scene.bodyGroup.setAttribute('y', scene.rowHeaderGroup.attribute.y);
+    scene.colHeaderGroup.setAttribute('height', scene.cornerHeaderGroup.attribute.height);
     for (let i = 0; i < scene.table.rowHeaderLevelCount - scene.table.frozenColCount; i++) {
       moveColumnFromRowHeaderToBody(scene);
       moveColumnFromCornerHeaderToColHeader(scene);
@@ -47,6 +50,9 @@ export function dealFrozen(scene: Scenegraph) {
 export function resetFrozen(scene: Scenegraph) {
   if (scene.frozenColCount > scene.table.frozenColCount) {
     // move columnGroup from rowHeaderGroup into bodyGroup(from cornerHeaderGroup into colHeaderGroup)
+    scene.bodyGroup.setAttribute('height', scene.rowHeaderGroup.attribute.height);
+    scene.bodyGroup.setAttribute('y', scene.rowHeaderGroup.attribute.y);
+    scene.colHeaderGroup.setAttribute('height', scene.cornerHeaderGroup.attribute.height);
     for (let i = 0; i < scene.frozenColCount - scene.table.frozenColCount; i++) {
       moveColumnFromRowHeaderToBody(scene);
       moveColumnFromCornerHeaderToColHeader(scene);