Merge pull request #1274 from VisActor/1269-bug-pivot-tree-indent-inv…

…alid 1269 bug pivot tree indent invalid
VisActor · Mar 13, 2024 · 5767744 · 5767744
2 parents 04923cd + d4d5bcb
commit 5767744
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/common/changes/@visactor/vtable/1269-bug-pivot-tree-indent-invalid_2024-03-13-08-22.json b/common/changes/@visactor/vtable/1269-bug-pivot-tree-indent-invalid_2024-03-13-08-22.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: pivot tree mode when use headerIcon the indent value invalid #1269\n\n",
+      "type": "none",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "[email protected]"
+}
diff --git a/packages/vtable/src/scenegraph/utils/text-icon-layout.ts b/packages/vtable/src/scenegraph/utils/text-icon-layout.ts
@@ -199,10 +199,15 @@ export function createCellContent(
           _contentOffset = -table.theme._contentOffset;
         }
       }
+      const hierarchyOffset = range
+        ? getHierarchyOffset(range.start.col, range.start.row, table)
+        : getHierarchyOffset(cellGroup.col, cellGroup.row, table);
       const text = convertInternal(textStr).replace(/\r?\n/g, '\n').replace(/\r/g, '\n').split('\n');
       const attribute = {
         text: text.length === 1 ? text[0] : text,
-        maxLineWidth: autoColWidth ? Infinity : cellWidth - (padding[1] + padding[3]) - leftIconWidth - rightIconWidth,
+        maxLineWidth: autoColWidth
+          ? Infinity
+          : cellWidth - (padding[1] + padding[3]) - leftIconWidth - rightIconWidth - hierarchyOffset,
         // fill: true,
         // textAlign: 'left',
         textBaseline: 'top',
@@ -213,7 +218,7 @@ export function createCellContent(
         lineClamp,
         wordBreak: 'break-word',
         whiteSpace: text.length === 1 && !autoWrapText ? 'no-wrap' : 'normal',
-        dx: _contentOffset
+        dx: _contentOffset + (!contentLeftIcons.length && !contentRightIcons.length ? hierarchyOffset : 0)
       };
       const wrapText = new Text(cellTheme.text ? (Object.assign({}, cellTheme.text, attribute) as any) : attribute);
       wrapText.name = 'text';