@visactor/vtable 0.9.1-alpha.4 → 0.9.1

package/cjs/scenegraph/stick-text/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/stick-text/index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["import type { IGraphic } from '@visactor/vrender';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport { PIVOT_TABLE_EVENT_TYPE } from '../../ts-types/pivot-table/PIVOT_TABLE_EVENT_TYPE';\nimport type { Group } from '../graphic/group';\nimport type { WrapText } from '../graphic/text';\n\nexport function handleTextStick(table: BaseTableAPI) {\n  const changedCells: { col: number; row: number }[] = [];\n  table.listen(PIVOT_TABLE_EVENT_TYPE.SCROLL, e => {\n    // reset all changed cell height\n    changedCells.forEach(cellPos => {\n      const cellGroup = table.scenegraph.getCell(cellPos.col, cellPos.row);\n      cellGroup.forEachChildren((child: IGraphic) => {\n        child.setAttributes({\n          dy: 0,\n          dx: 0\n        });\n      });\n    });\n    changedCells.length = 0;\n\n    const { scrollTop, scrollLeft } = e;\n    if (scrollTop) {\n      const frozenRowsHeight = table.getFrozenRowsHeight();\n      const { row } = table.getRowAt(scrollTop + frozenRowsHeight + 1);\n      // ergodic all cells in this row, find the header cell with textStick style enabled\n      for (let col = 0; col < table.colCount; col++) {\n        if (table.isHeader(col, row) && table._getCellStyle(col, row)?.textStick) {\n          // adjust cell vertical layout\n          const cellGroup = table.scenegraph.getCell(col, row);\n          adjustCellContentVerticalLayout(cellGroup, frozenRowsHeight);\n\n          // record cell info\n          changedCells.push({ col, row });\n        }\n      }\n    }\n\n    if (scrollLeft) {\n      const frozenRowsWidth = table.getFrozenColsWidth();\n      const { col } = table.getColAt(scrollLeft + frozenRowsWidth + 1);\n      // ergodic all cells in this col, find the header cell with textStick style enabled\n      for (let row = 0; row < table.rowCount; row++) {\n        if (table.isHeader(col, row) && table._getCellStyle(col, row)?.textStick) {\n          // adjust cell horizontal layout\n          const cellGroup = table.scenegraph.getCell(col, row);\n          adjustCellContentHorizontalLayout(cellGroup, frozenRowsWidth);\n\n          // record cell info\n          changedCells.push({ col, row });\n        }\n      }\n    }\n  });\n}\n\n/*\n * adjust cell content vertical layout\n * @param {Group} cellGroup\n * @param {number} scrollTop\n */\nfunction adjustCellContentVerticalLayout(cellGroup: Group, scrollTop: number) {\n  // get text element\n  const text = cellGroup.getChildByName('text', true) as WrapText;\n  if (!text) {\n    return;\n  }\n  text.AABBBounds.width();\n  const textTop = text.globalAABBBounds.y1;\n\n  if (textTop < scrollTop) {\n    const deltaHeight = textTop - scrollTop;\n    // text is out of view, move all elements down\n    cellGroup.forEachChildren((child: IGraphic) => {\n      child.setAttribute('dy', -deltaHeight + 2); // 2 is the buffer\n    });\n  }\n}\n\n/*\n * adjust cell content horizontal layout\n * @param {Group} cellGroup\n * @param {number} scrollLeft\n */\nfunction adjustCellContentHorizontalLayout(cellGroup: Group, scrollLeft: number) {\n  // get text element\n  const text = cellGroup.getChildByName('text', true) as WrapText;\n  if (!text) {\n    return;\n  }\n  text.AABBBounds.width();\n  const textLeft = text.globalAABBBounds.x1;\n\n  if (textLeft < scrollLeft) {\n    const deltaWidth = textLeft - scrollLeft;\n    // text is out of view, move all elements right\n    cellGroup.forEachChildren((child: IGraphic) => {\n      child.setAttribute('dx', -deltaWidth + 2); // 2 is the buffer\n    });\n  }\n}\n"]}
+{"version":3,"sources":["scenegraph/stick-text/index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["import type { IGraphic } from '@visactor/vrender';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport { PIVOT_TABLE_EVENT_TYPE } from '../../ts-types/pivot-table/PIVOT_TABLE_EVENT_TYPE';\nimport type { Group } from '../graphic/group';\nimport type { WrapText } from '../graphic/text';\nimport type { PivotHeaderLayoutMap } from '../../layout/pivot-header-layout';\nconst changedCells: { col: number; row: number }[] = [];\nexport function handleTextStick(table: BaseTableAPI) {\n  changedCells.forEach(cellPos => {\n    const cellGroup = table.scenegraph.getCell(cellPos.col, cellPos.row);\n    cellGroup.forEachChildren((child: IGraphic) => {\n      child.setAttributes({\n        dy: 0,\n        dx: 0\n      });\n    });\n  });\n  changedCells.length = 0;\n\n  const { scrollTop, scrollLeft, frozenRowCount, frozenColCount } = table;\n  const frozenRowsHeight = table.getFrozenRowsHeight();\n  const frozenColsWidth = table.getFrozenColsWidth();\n  // 计算非冻结\n  const { row: rowStart } = table.getRowAt(scrollTop + frozenRowsHeight + 1);\n  const { col: colStart } = table.getColAt(scrollLeft + frozenColsWidth + 1);\n  const rowEnd =\n    table.getAllRowsHeight() > table.tableNoFrameHeight\n      ? table.getRowAt(scrollTop + table.tableNoFrameHeight - 1).row\n      : table.rowCount - 1;\n  const colEnd =\n    table.getAllColsWidth() > table.tableNoFrameWidth\n      ? table.getColAt(scrollLeft + table.tableNoFrameWidth - 1).col\n      : table.colCount - 1;\n  // 列表头单元格\n  for (let row = 0; row < frozenRowCount; row++) {\n    for (let col = 0; col <= colEnd; col++) {\n      if (table._getCellStyle(col, row)?.textStick) {\n        const cellGroup = table.scenegraph.getCell(col, row);\n        // adjust cell Horizontal\n        adjustCellContentHorizontalLayout(cellGroup, 0, table.tableNoFrameWidth);\n        changedCells.push({ col, row });\n      }\n    }\n  }\n\n  if (rowStart === -1) {\n    return;\n  }\n  // 行表头单元格\n  for (let row = rowStart; row <= rowEnd; row++) {\n    for (let col = 0; col < frozenColCount; col++) {\n      if (\n        table._getCellStyle(col, row)?.textStick &&\n        (table.internalProps.layoutMap as PivotHeaderLayoutMap).rowHierarchyType !== 'tree'\n      ) {\n        const cellGroup = table.scenegraph.getCell(col, row);\n        // adjust cell vertical\n        adjustCellContentVerticalLayout(cellGroup, frozenRowsHeight, table.tableNoFrameHeight);\n        changedCells.push({ col, row });\n      }\n    }\n  }\n  // body单元格\n  for (let row = rowStart; row <= rowEnd; row++) {\n    for (let col = colStart; col <= colEnd; col++) {\n      if (table._getCellStyle(col, row)?.textStick) {\n        const cellGroup = table.scenegraph.getCell(col, row);\n        // adjust cell vertical\n        adjustCellContentVerticalLayout(cellGroup, frozenRowsHeight, table.tableNoFrameHeight);\n        // adjust cell Horizontal\n        adjustCellContentHorizontalLayout(cellGroup, frozenColsWidth, table.tableNoFrameWidth);\n        changedCells.push({ col, row });\n      }\n    }\n  }\n}\n\n/*\n * adjust cell content vertical layout\n * @param {Group} cellGroup\n * @param {number} scrollTop\n */\nfunction adjustCellContentVerticalLayout(cellGroup: Group, minTop: number, maxTop: number) {\n  // get text element\n  const text = cellGroup.getChildByName('text', true) as WrapText;\n  if (!text) {\n    return;\n  }\n  text.AABBBounds.width();\n  const textTop = text.globalAABBBounds.y1;\n  const textBottom = text.globalAABBBounds.y2;\n\n  if (textTop < minTop) {\n    const deltaHeight = textTop - minTop;\n    // text is out of view, move all elements down\n    cellGroup.forEachChildren((child: IGraphic) => {\n      child.setAttribute('dy', -deltaHeight + 2); // 2 is the buffer\n    });\n  } else if (textBottom > maxTop) {\n    const deltaHeight = textBottom - maxTop;\n    // text is out of view, move all elements down\n    cellGroup.forEachChildren((child: IGraphic) => {\n      child.setAttribute('dy', -deltaHeight); // 2 is the buffer\n    });\n  }\n}\n\n/*\n * adjust cell content horizontal layout\n * @param {Group} cellGroup\n * @param {number} scrollLeft\n */\nfunction adjustCellContentHorizontalLayout(cellGroup: Group, minLeft: number, maxLeft: number) {\n  // get text element\n  const text = cellGroup.getChildByName('text', true) as WrapText;\n  if (!text) {\n    return;\n  }\n  text.AABBBounds.width();\n  const textLeft = text.globalAABBBounds.x1;\n  const textRight = text.globalAABBBounds.x2;\n  if (textLeft < minLeft) {\n    const deltaWidth = textLeft - minLeft;\n    // text is out of view, move all elements right\n    cellGroup.forEachChildren((child: IGraphic) => {\n      child.setAttribute('dx', -deltaWidth + 2); // 2 is the buffer\n    });\n  } else if (textRight > maxLeft) {\n    const deltaWidth = textRight - maxLeft;\n    // text is out of view, move all elements down\n    cellGroup.forEachChildren((child: IGraphic) => {\n      child.setAttribute('dx', -deltaWidth); // 2 is the buffer\n    });\n  }\n}\n"]}

package/cjs/scenegraph/style/frame-border.d.ts

@@ -1,5 +1,5 @@
 import type { TableFrameStyle } from '../../ts-types';
 import type { Group } from '../graphic/group';
-export declare function createFrameBorder(group: Group, frameTheme: TableFrameStyle | undefined, role: string, strokeArray?: [boolean, boolean, boolean, boolean]): void;
+export declare function createFrameBorder(group: Group, frameTheme: TableFrameStyle | undefined, role: string, strokeArray: [boolean, boolean, boolean, boolean] | undefined, justForXYPosition?: boolean): void;
 export declare function updateFrameBorder(group: Group, frameTheme: TableFrameStyle | undefined, strokeArray: [boolean, boolean, boolean, boolean]): void;
 export declare function updateFrameBorderSize(group: Group): void;

package/cjs/scenegraph/style/frame-border.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 
 const vrender_1 = require("@visactor/vrender"), vutils_1 = require("@visactor/vutils"), padding_1 = require("../utils/padding");
 
-function createFrameBorder(group, frameTheme, role, strokeArray) {
+function createFrameBorder(group, frameTheme, role, strokeArray, justForXYPosition) {
     var _a, _b, _c, _d, _e, _f;
     if (!frameTheme) return;
-    const isTableGroup = "table" === role, {shadowBlur: shadowBlur, shadowOffsetX: shadowOffsetX, shadowOffsetY: shadowOffsetY, shadowColor: shadowColor, roundCornerRadius: roundCornerRadius, borderColor: borderColor, borderLineWidth: borderLineWidth, borderLineDash: borderLineDash} = frameTheme, groupAttributes = {}, rectAttributes = {
+    const isTableGroup = "table" === role, {shadowBlur: shadowBlur, shadowOffsetX: shadowOffsetX, shadowOffsetY: shadowOffsetY, shadowColor: shadowColor, cornerRadius: cornerRadius, borderColor: borderColor, borderLineWidth: borderLineWidth, borderLineDash: borderLineDash} = frameTheme, groupAttributes = {}, rectAttributes = {
         pickable: !1
     };
     shadowBlur && isTableGroup && (rectAttributes.shadowBlur = shadowBlur, rectAttributes.shadowOffsetX = shadowOffsetX, 
@@ -19,15 +19,15 @@ function createFrameBorder(group, frameTheme, role, strokeArray) {
     rectAttributes.fill = !1, rectAttributes.stroke = getStroke(borderColor, strokeArray), 
     rectAttributes.lineWidth = borderLineWidth, borderLineDash && (rectAttributes.lineDash = borderLineDash), 
     rectAttributes.lineCap = "square"), Array.isArray(borderColor) && (rectAttributes.strokeArrayColor = (0, 
-    padding_1.getPadding)(borderColor)), Array.isArray(borderLineWidth) && (rectAttributes.strokeArrayWidth = (0, 
-    padding_1.getPadding)(borderLineWidth), rectAttributes.lineWidth = 1), roundCornerRadius && (rectAttributes.borderRadius = roundCornerRadius, 
-    groupAttributes.borderRadius = roundCornerRadius);
+    padding_1.getQuadProps)(borderColor)), Array.isArray(borderLineWidth) && (rectAttributes.strokeArrayWidth = (0, 
+    padding_1.getQuadProps)(borderLineWidth), rectAttributes.lineWidth = 1), cornerRadius && (rectAttributes.cornerRadius = cornerRadius, 
+    groupAttributes.cornerRadius = cornerRadius);
     const borderTop = rectAttributes.strokeArrayWidth ? rectAttributes.strokeArrayWidth[0] : null !== (_a = rectAttributes.lineWidth) && void 0 !== _a ? _a : 0, borderRight = rectAttributes.strokeArrayWidth ? rectAttributes.strokeArrayWidth[1] : null !== (_b = rectAttributes.lineWidth) && void 0 !== _b ? _b : 0, borderBottom = rectAttributes.strokeArrayWidth ? rectAttributes.strokeArrayWidth[2] : null !== (_c = rectAttributes.lineWidth) && void 0 !== _c ? _c : 0, borderLeft = rectAttributes.strokeArrayWidth ? rectAttributes.strokeArrayWidth[3] : null !== (_d = rectAttributes.lineWidth) && void 0 !== _d ? _d : 0;
     if (isTableGroup && (rectAttributes.shadowBlur || rectAttributes.lineWidth)) {
         const deltaX = (null !== (_e = rectAttributes.shadowBlur) && void 0 !== _e ? _e : 0) + (borderLeft + borderRight) / 2, deltaY = (null !== (_f = rectAttributes.shadowBlur) && void 0 !== _f ? _f : 0) + (borderTop + borderBottom) / 2;
-        groupAttributes.x = group.attribute.x + deltaX, groupAttributes.y = group.attribute.y + deltaY;
+        groupAttributes.x = deltaX, groupAttributes.y = deltaY;
     }
-    if (group.setAttributes(groupAttributes), rectAttributes.stroke) if (rectAttributes.x = borderLeft / 2, 
+    if (group.setAttributes(groupAttributes), !justForXYPosition && rectAttributes.stroke) if (rectAttributes.x = borderLeft / 2, 
     rectAttributes.y = borderTop / 2, rectAttributes.pickable = !1, isTableGroup) {
         rectAttributes.x = group.attribute.x - borderLeft / 2, rectAttributes.y = group.attribute.y - borderTop / 2, 
         rectAttributes.width = group.attribute.width + borderLeft / 2 + borderRight / 2, 

package/cjs/scenegraph/style/frame-border.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/style/frame-border.ts"],"names":[],"mappings":"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","file":"frame-border.js","sourcesContent":["import type { IGroupGraphicAttribute, IRectGraphicAttribute } from '@visactor/vrender';\nimport { createRect } from '@visactor/vrender';\nimport type { TableFrameStyle } from '../../ts-types';\nimport type { Group } from '../graphic/group';\nimport { isArray } from '@visactor/vutils';\nimport { getPadding } from '../utils/padding';\n\n/**\n * @description: create frame border\n * @param {Group} group\n * @param {TableFrameStyle} frameTheme\n * @param {string} role\n * @param {[boolean, boolean, boolean, boolean]} strokeArray\n * @return {*}\n */\nexport function createFrameBorder(\n  group: Group,\n  frameTheme: TableFrameStyle | undefined,\n  role: string,\n  strokeArray?: [boolean, boolean, boolean, boolean] // to do 处理成0b001111形式\n) {\n  if (!frameTheme) {\n    return;\n  }\n\n  const isTableGroup = role === 'table';\n\n  const {\n    shadowBlur,\n    shadowOffsetX,\n    shadowOffsetY,\n    shadowColor,\n    roundCornerRadius,\n    borderColor,\n    borderLineWidth,\n    borderLineDash\n  } = frameTheme;\n\n  const groupAttributes: IGroupGraphicAttribute = {};\n  const rectAttributes: IRectGraphicAttribute = {\n    pickable: false\n  };\n  // 处理shadow\n  if (shadowBlur && isTableGroup) {\n    // 只有table才能配置shadow\n    rectAttributes.shadowBlur = shadowBlur;\n    rectAttributes.shadowOffsetX = shadowOffsetX;\n    rectAttributes.shadowOffsetY = shadowOffsetY;\n    rectAttributes.shadowColor = shadowColor;\n    rectAttributes.stroke = true;\n    rectAttributes.stroke = shadowColor;\n    rectAttributes.lineWidth = 1;\n\n    rectAttributes.fill = true;\n    rectAttributes.fillOpacity = 0.01;\n  }\n\n  // 处理边框\n  if (borderLineWidth) {\n    rectAttributes.stroke = true;\n    rectAttributes.fill = false;\n    rectAttributes.stroke = getStroke(borderColor, strokeArray);\n    rectAttributes.lineWidth = borderLineWidth as number;\n    borderLineDash && (rectAttributes.lineDash = borderLineDash as number[]);\n    rectAttributes.lineCap = 'square';\n  }\n\n  if (Array.isArray(borderColor)) {\n    (rectAttributes as any).strokeArrayColor = getPadding(borderColor as any);\n  }\n  if (Array.isArray(borderLineWidth)) {\n    (rectAttributes as any).strokeArrayWidth = getPadding(borderLineWidth);\n    (rectAttributes as any).lineWidth = 1;\n  }\n\n  if (roundCornerRadius) {\n    rectAttributes.borderRadius = roundCornerRadius;\n    groupAttributes.borderRadius = roundCornerRadius;\n  }\n\n  const borderTop = (rectAttributes as any).strokeArrayWidth\n    ? (rectAttributes as any).strokeArrayWidth[0]\n    : (rectAttributes.lineWidth as number) ?? 0;\n  const borderRight = (rectAttributes as any).strokeArrayWidth\n    ? (rectAttributes as any).strokeArrayWidth[1]\n    : (rectAttributes.lineWidth as number) ?? 0;\n  const borderBottom = (rectAttributes as any).strokeArrayWidth\n    ? (rectAttributes as any).strokeArrayWidth[2]\n    : (rectAttributes.lineWidth as number) ?? 0;\n  const borderLeft = (rectAttributes as any).strokeArrayWidth\n    ? (rectAttributes as any).strokeArrayWidth[3]\n    : (rectAttributes.lineWidth as number) ?? 0;\n\n  // 处理边框引起的宽度高度变化（只对最外层tableGroup生效）\n  if (isTableGroup && (rectAttributes.shadowBlur || rectAttributes.lineWidth)) {\n    const deltaX = (rectAttributes.shadowBlur ?? 0) + (borderLeft + borderRight) / 2;\n    const deltaY = (rectAttributes.shadowBlur ?? 0) + (borderTop + borderBottom) / 2;\n\n    groupAttributes.x = group.attribute.x + deltaX;\n    groupAttributes.y = group.attribute.y + deltaY;\n    // 宽度高度在tableNoFrameWidth&tableNoFrameHeight中处理\n    // groupAttributes.width = group.attribute.width - deltaX - deltaX;\n    // groupAttributes.height = group.attribute.height - deltaY - deltaY;\n  }\n  group.setAttributes(groupAttributes);\n\n  if (rectAttributes.stroke) {\n    rectAttributes.x = borderLeft / 2;\n    rectAttributes.y = borderTop / 2;\n    rectAttributes.pickable = false;\n    if (isTableGroup) {\n      rectAttributes.x = group.attribute.x - borderLeft / 2;\n      rectAttributes.y = group.attribute.y - borderTop / 2;\n      rectAttributes.width = group.attribute.width + borderLeft / 2 + borderRight / 2;\n      rectAttributes.height = group.attribute.height + borderTop / 2 + borderBottom / 2;\n      const borderRect = createRect(rectAttributes);\n      borderRect.name = 'table-border-rect';\n      group.parent.insertBefore(borderRect, group);\n      (group as any).border = borderRect;\n    } else {\n      // rectAttributes.x = rectAttributes.lineWidth / 2;\n      // rectAttributes.y = rectAttributes.lineWidth / 2;\n      rectAttributes.width = group.attribute.width - borderLeft / 2 - borderRight / 2;\n      rectAttributes.height = group.attribute.height - borderTop / 2 - borderBottom / 2;\n      const borderRect = createRect(rectAttributes);\n      borderRect.name = 'border-rect';\n      group.addChild(borderRect);\n      (group as any).border = borderRect;\n    }\n  }\n}\n\n/**\n * @description: update frame border stroke atrribute\n * @param {Group} group\n * @param {TableFrameStyle} frameTheme\n * @param {array} strokeArray stroke boolean array\n * @return {*}\n */\nexport function updateFrameBorder(\n  group: Group,\n  frameTheme: TableFrameStyle | undefined,\n  strokeArray: [boolean, boolean, boolean, boolean] // to do 处理成0b001111形式\n) {\n  const { borderColor } = frameTheme;\n  group.border?.setAttribute('stroke', getStroke(borderColor, strokeArray));\n}\n\nfunction getStroke(borderColor: string | string[], strokeArray: boolean[] | undefined) {\n  let stroke: boolean | string | (boolean | string)[] = true;\n  if (strokeArray && !isArray(borderColor)) {\n    stroke = strokeArray.map(stroke => {\n      if (stroke) {\n        return borderColor;\n      }\n      return false;\n    });\n  } else if (strokeArray) {\n    stroke = strokeArray;\n  } else if (!strokeArray && !isArray(borderColor)) {\n    stroke = borderColor;\n  } else if (isArray(borderColor)) {\n    stroke = true;\n  }\n  return stroke;\n}\n\n/**\n * @description: update frame border size when group size change\n * @param {Group} group\n * @return {*}\n */\nexport function updateFrameBorderSize(group: Group) {\n  if (!group.border) {\n    return;\n  }\n  const borderTop = (group.border.attribute as any).strokeArrayWidth\n    ? (group.border.attribute as any).strokeArrayWidth[0]\n    : (group.border.attribute.lineWidth as number) ?? 0;\n  const borderRight = (group.border.attribute as any).strokeArrayWidth\n    ? (group.border.attribute as any).strokeArrayWidth[1]\n    : (group.border.attribute.lineWidth as number) ?? 0;\n  const borderBottom = (group.border.attribute as any).strokeArrayWidth\n    ? (group.border.attribute as any).strokeArrayWidth[2]\n    : (group.border.attribute.lineWidth as number) ?? 0;\n  const borderLeft = (group.border.attribute as any).strokeArrayWidth\n    ? (group.border.attribute as any).strokeArrayWidth[3]\n    : (group.border.attribute.lineWidth as number) ?? 0;\n\n  group.border.setAttributes({\n    width: group.attribute.width - borderLeft / 2 - borderRight / 2,\n    height: group.attribute.height - borderTop / 2 - borderBottom / 2\n  });\n}\n"]}
+{"version":3,"sources":["scenegraph/style/frame-border.ts"],"names":[],"mappings":"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","file":"frame-border.js","sourcesContent":["import type { IGroupGraphicAttribute, IRectGraphicAttribute } from '@visactor/vrender';\nimport { createRect } from '@visactor/vrender';\nimport type { TableFrameStyle } from '../../ts-types';\nimport type { Group } from '../graphic/group';\nimport { isArray } from '@visactor/vutils';\nimport { getQuadProps } from '../utils/padding';\n\n/**\n * @description: create frame border\n * @param {Group} group\n * @param {TableFrameStyle} frameTheme\n * @param {string} role\n * @param {[boolean, boolean, boolean, boolean]} strokeArray\n * @return {*}\n */\nexport function createFrameBorder(\n  group: Group,\n  frameTheme: TableFrameStyle | undefined,\n  role: string,\n  strokeArray: [boolean, boolean, boolean, boolean] | undefined, // to do 处理成0b001111形式\n  justForXYPosition?: boolean\n) {\n  if (!frameTheme) {\n    return;\n  }\n\n  const isTableGroup = role === 'table';\n\n  const {\n    shadowBlur,\n    shadowOffsetX,\n    shadowOffsetY,\n    shadowColor,\n    cornerRadius,\n    borderColor,\n    borderLineWidth,\n    borderLineDash\n  } = frameTheme;\n\n  const groupAttributes: IGroupGraphicAttribute = {};\n  const rectAttributes: IRectGraphicAttribute = {\n    pickable: false\n  };\n  // 处理shadow\n  if (shadowBlur && isTableGroup) {\n    // 只有table才能配置shadow\n    rectAttributes.shadowBlur = shadowBlur;\n    rectAttributes.shadowOffsetX = shadowOffsetX;\n    rectAttributes.shadowOffsetY = shadowOffsetY;\n    rectAttributes.shadowColor = shadowColor;\n    rectAttributes.stroke = true;\n    rectAttributes.stroke = shadowColor;\n    rectAttributes.lineWidth = 1;\n\n    rectAttributes.fill = true;\n    rectAttributes.fillOpacity = 0.01;\n  }\n\n  // 处理边框\n  if (borderLineWidth) {\n    rectAttributes.stroke = true;\n    rectAttributes.fill = false;\n    rectAttributes.stroke = getStroke(borderColor, strokeArray);\n    rectAttributes.lineWidth = borderLineWidth as number;\n    borderLineDash && (rectAttributes.lineDash = borderLineDash as number[]);\n    rectAttributes.lineCap = 'square';\n  }\n\n  if (Array.isArray(borderColor)) {\n    (rectAttributes as any).strokeArrayColor = getQuadProps(borderColor as any);\n  }\n  if (Array.isArray(borderLineWidth)) {\n    (rectAttributes as any).strokeArrayWidth = getQuadProps(borderLineWidth);\n    (rectAttributes as any).lineWidth = 1;\n  }\n\n  if (cornerRadius) {\n    rectAttributes.cornerRadius = cornerRadius;\n    groupAttributes.cornerRadius = cornerRadius;\n  }\n\n  const borderTop = (rectAttributes as any).strokeArrayWidth\n    ? (rectAttributes as any).strokeArrayWidth[0]\n    : (rectAttributes.lineWidth as number) ?? 0;\n  const borderRight = (rectAttributes as any).strokeArrayWidth\n    ? (rectAttributes as any).strokeArrayWidth[1]\n    : (rectAttributes.lineWidth as number) ?? 0;\n  const borderBottom = (rectAttributes as any).strokeArrayWidth\n    ? (rectAttributes as any).strokeArrayWidth[2]\n    : (rectAttributes.lineWidth as number) ?? 0;\n  const borderLeft = (rectAttributes as any).strokeArrayWidth\n    ? (rectAttributes as any).strokeArrayWidth[3]\n    : (rectAttributes.lineWidth as number) ?? 0;\n\n  // 处理边框引起的宽度高度变化（只对最外层tableGroup生效）\n  if (isTableGroup && (rectAttributes.shadowBlur || rectAttributes.lineWidth)) {\n    const deltaX = (rectAttributes.shadowBlur ?? 0) + (borderLeft + borderRight) / 2;\n    const deltaY = (rectAttributes.shadowBlur ?? 0) + (borderTop + borderBottom) / 2;\n\n    groupAttributes.x = deltaX;\n    groupAttributes.y = deltaY;\n    // 宽度高度在tableNoFrameWidth&tableNoFrameHeight中处理\n    // groupAttributes.width = group.attribute.width - deltaX - deltaX;\n    // groupAttributes.height = group.attribute.height - deltaY - deltaY;\n  }\n  group.setAttributes(groupAttributes);\n\n  if (justForXYPosition) {\n    return;\n  }\n\n  if (rectAttributes.stroke) {\n    rectAttributes.x = borderLeft / 2;\n    rectAttributes.y = borderTop / 2;\n    rectAttributes.pickable = false;\n    if (isTableGroup) {\n      rectAttributes.x = group.attribute.x - borderLeft / 2;\n      rectAttributes.y = group.attribute.y - borderTop / 2;\n      rectAttributes.width = group.attribute.width + borderLeft / 2 + borderRight / 2;\n      rectAttributes.height = group.attribute.height + borderTop / 2 + borderBottom / 2;\n      const borderRect = createRect(rectAttributes);\n      borderRect.name = 'table-border-rect';\n      group.parent.insertBefore(borderRect, group);\n      (group as any).border = borderRect;\n    } else {\n      // rectAttributes.x = rectAttributes.lineWidth / 2;\n      // rectAttributes.y = rectAttributes.lineWidth / 2;\n      rectAttributes.width = group.attribute.width - borderLeft / 2 - borderRight / 2;\n      rectAttributes.height = group.attribute.height - borderTop / 2 - borderBottom / 2;\n      const borderRect = createRect(rectAttributes);\n      borderRect.name = 'border-rect';\n      group.addChild(borderRect);\n      (group as any).border = borderRect;\n    }\n  }\n}\n\n/**\n * @description: update frame border stroke atrribute\n * @param {Group} group\n * @param {TableFrameStyle} frameTheme\n * @param {array} strokeArray stroke boolean array\n * @return {*}\n */\nexport function updateFrameBorder(\n  group: Group,\n  frameTheme: TableFrameStyle | undefined,\n  strokeArray: [boolean, boolean, boolean, boolean] // to do 处理成0b001111形式\n) {\n  const { borderColor } = frameTheme;\n  group.border?.setAttribute('stroke', getStroke(borderColor, strokeArray));\n}\n\nfunction getStroke(borderColor: string | string[], strokeArray: boolean[] | undefined) {\n  let stroke: boolean | string | (boolean | string)[] = true;\n  if (strokeArray && !isArray(borderColor)) {\n    stroke = strokeArray.map(stroke => {\n      if (stroke) {\n        return borderColor;\n      }\n      return false;\n    });\n  } else if (strokeArray) {\n    stroke = strokeArray;\n  } else if (!strokeArray && !isArray(borderColor)) {\n    stroke = borderColor;\n  } else if (isArray(borderColor)) {\n    stroke = true;\n  }\n  return stroke;\n}\n\n/**\n * @description: update frame border size when group size change\n * @param {Group} group\n * @return {*}\n */\nexport function updateFrameBorderSize(group: Group) {\n  if (!group.border) {\n    return;\n  }\n  const borderTop = (group.border.attribute as any).strokeArrayWidth\n    ? (group.border.attribute as any).strokeArrayWidth[0]\n    : (group.border.attribute.lineWidth as number) ?? 0;\n  const borderRight = (group.border.attribute as any).strokeArrayWidth\n    ? (group.border.attribute as any).strokeArrayWidth[1]\n    : (group.border.attribute.lineWidth as number) ?? 0;\n  const borderBottom = (group.border.attribute as any).strokeArrayWidth\n    ? (group.border.attribute as any).strokeArrayWidth[2]\n    : (group.border.attribute.lineWidth as number) ?? 0;\n  const borderLeft = (group.border.attribute as any).strokeArrayWidth\n    ? (group.border.attribute as any).strokeArrayWidth[3]\n    : (group.border.attribute.lineWidth as number) ?? 0;\n\n  group.border.setAttributes({\n    width: group.attribute.width - borderLeft / 2 - borderRight / 2,\n    height: group.attribute.height - borderTop / 2 - borderBottom / 2\n  });\n}\n"]}

package/cjs/scenegraph/utils/deal-promise-data.d.ts

@@ -0,0 +1,2 @@
+import type { BaseTableAPI } from '../../ts-types/base-table';
+export declare function dealPromiseData(dataPromise: Promise<null>, tabel: BaseTableAPI, callback: () => void): void;

package/cjs/scenegraph/utils/deal-promise-data.js

@@ -0,0 +1,14 @@
+"use strict";
+
+function dealPromiseData(dataPromise, tabel, callback) {
+    dataPromise.then((() => {
+        callback(), tabel.scenegraph.updateNextFrame();
+    })).catch((err => {
+        console.error(err);
+    }));
+}
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.dealPromiseData = void 0, exports.dealPromiseData = dealPromiseData;
+//# sourceMappingURL=deal-promise-data.js.map

package/cjs/scenegraph/utils/deal-promise-data.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["scenegraph/utils/deal-promise-data.ts"],"names":[],"mappings":";;;AAEA,SAAgB,eAAe,CAAC,WAA0B,EAAE,KAAmB,EAAE,QAAoB;IACnG,WAAW;SACR,IAAI,CAAC,GAAG,EAAE;QACT,QAAQ,EAAE,CAAC;QACX,KAAK,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC;IACrC,CAAC,CAAC;SACD,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;QACpB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC,CAAC,CAAC;AACP,CAAC;AATD,0CASC","file":"deal-promise-data.js","sourcesContent":["import type { BaseTableAPI } from '../../ts-types/base-table';\n\nexport function dealPromiseData(dataPromise: Promise<null>, tabel: BaseTableAPI, callback: () => void) {\n  dataPromise\n    .then(() => {\n      callback();\n      tabel.scenegraph.updateNextFrame();\n    })\n    .catch((err: Error) => {\n      console.error(err);\n    });\n}\n"]}

package/cjs/scenegraph/utils/empty-group.d.ts

@@ -0,0 +1,2 @@
+import { Group } from '../graphic/group';
+export declare const emptyGroup: Group;

package/cjs/scenegraph/utils/empty-group.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.emptyGroup = void 0;
+
+const group_1 = require("../graphic/group");
+
+exports.emptyGroup = new group_1.Group({}), exports.emptyGroup.role = "empty";
+//# sourceMappingURL=empty-group.js.map

package/cjs/scenegraph/utils/empty-group.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["scenegraph/utils/empty-group.ts"],"names":[],"mappings":";;;AAAA,4CAAyC;AAE5B,QAAA,UAAU,GAAG,IAAI,aAAK,CAAC,EAAE,CAAC,CAAC;AACxC,kBAAU,CAAC,IAAI,GAAG,OAAO,CAAC","file":"empty-group.js","sourcesContent":["import { Group } from '../graphic/group';\n\nexport const emptyGroup = new Group({});\nemptyGroup.role = 'empty';\n"]}

package/cjs/scenegraph/utils/get-hierarchy-offset.d.ts

@@ -0,0 +1,2 @@
+import type { BaseTableAPI } from '../../ts-types/base-table';
+export declare function getHierarchyOffset(col: number, row: number, table: BaseTableAPI): number;

package/cjs/scenegraph/utils/get-hierarchy-offset.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.getHierarchyOffset = void 0;
+
+const ts_types_1 = require("../../ts-types");
+
+function getHierarchyOffset(col, row, table) {
+    var _a, _b, _c;
+    let cellHierarchyIndent = 0;
+    const layoutMap = table.internalProps.layoutMap;
+    if (layoutMap.isHeader(col, row)) {
+        const hd = layoutMap.getHeader(col, row);
+        (null == hd ? void 0 : hd.hierarchyLevel) && (cellHierarchyIndent = (null !== (_a = hd.hierarchyLevel) && void 0 !== _a ? _a : 0) * (null !== (_b = layoutMap.rowHierarchyIndent) && void 0 !== _b ? _b : 0));
+    } else {
+        const define = table.getBodyColumnDefine(col, row);
+        if (null == define ? void 0 : define.tree) {
+            const indexArr = table.dataSource.getIndexKey(table.getRecordIndexByRow(col, row));
+            cellHierarchyIndent = Array.isArray(indexArr) && table.getHierarchyState(col, row) !== ts_types_1.HierarchyState.none ? (indexArr.length - 1) * (null !== (_c = layoutMap.hierarchyIndent) && void 0 !== _c ? _c : 0) : 0;
+        }
+    }
+    return cellHierarchyIndent;
+}
+
+exports.getHierarchyOffset = getHierarchyOffset;
+//# sourceMappingURL=get-hierarchy-offset.js.map

package/cjs/scenegraph/utils/get-hierarchy-offset.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["scenegraph/utils/get-hierarchy-offset.ts"],"names":[],"mappings":";;;AAEA,6CAAgD;AAGhD,SAAgB,kBAAkB,CAAC,GAAW,EAAE,GAAW,EAAE,KAAmB;;IAE9E,IAAI,mBAAmB,GAAG,CAAC,CAAC;IAC5B,MAAM,SAAS,GAAG,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC;IAEhD,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;QAChC,MAAM,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACzC,IAAI,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,cAAc,EAAE;YACtB,mBAAmB,GAAG,CAAC,MAAA,EAAE,CAAC,cAAc,mCAAI,CAAC,CAAC,GAAG,CAAC,MAAC,SAAkC,CAAC,kBAAkB,mCAAI,CAAC,CAAC,CAAC;SAChH;KACF;SAAM;QAGL,MAAM,MAAM,GAAG,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACnD,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,EAAE;YAChB,MAAM,QAAQ,GAAG,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;YACnF,mBAAmB;gBACjB,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,yBAAc,CAAC,IAAI;oBAClF,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,MAAC,SAAmC,CAAC,eAAe,mCAAI,CAAC,CAAC;oBACrF,CAAC,CAAC,CAAC,CAAC;SACT;KACF;IAED,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAxBD,gDAwBC","file":"get-hierarchy-offset.js","sourcesContent":["import type { SimpleHeaderLayoutMap } from '../../layout';\nimport type { PivotHeaderLayoutMap } from '../../layout/pivot-header-layout';\nimport { HierarchyState } from '../../ts-types';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\n\nexport function getHierarchyOffset(col: number, row: number, table: BaseTableAPI): number {\n  // 处理树形展开\n  let cellHierarchyIndent = 0;\n  const layoutMap = table.internalProps.layoutMap;\n  //判断是否为表头\n  if (layoutMap.isHeader(col, row)) {\n    const hd = layoutMap.getHeader(col, row);\n    if (hd?.hierarchyLevel) {\n      cellHierarchyIndent = (hd.hierarchyLevel ?? 0) * ((layoutMap as PivotHeaderLayoutMap).rowHierarchyIndent ?? 0);\n    }\n  } else {\n    // 基本表格表身body单元格 如果是树形展开 需要考虑缩进值\n    // const cellHierarchyState = table.getHierarchyState(col, row);\n    const define = table.getBodyColumnDefine(col, row);\n    if (define?.tree) {\n      const indexArr = table.dataSource.getIndexKey(table.getRecordIndexByRow(col, row));\n      cellHierarchyIndent =\n        Array.isArray(indexArr) && table.getHierarchyState(col, row) !== HierarchyState.none\n          ? (indexArr.length - 1) * ((layoutMap as SimpleHeaderLayoutMap).hierarchyIndent ?? 0)\n          : 0;\n    }\n  }\n\n  return cellHierarchyIndent;\n}\n"]}

package/cjs/scenegraph/utils/padding.d.ts

@@ -1 +1 @@
-export declare function getPadding(paddingOrigin: number | number[]): [number, number, number, number];
+export declare function getQuadProps(paddingOrigin: number | number[]): [number, number, number, number];

package/cjs/scenegraph/utils/padding.js

@@ -2,15 +2,15 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.getPadding = void 0;
+}), exports.getQuadProps = void 0;
 
 const vrender_1 = require("@visactor/vrender");
 
-function getPadding(paddingOrigin) {
+function getQuadProps(paddingOrigin) {
     let padding = (0, vrender_1.parsePadding)(paddingOrigin);
     return "number" == typeof padding || "string" == typeof padding ? padding = [ padding, padding, padding, padding ] : Array.isArray(padding) && (padding = padding.slice(0)), 
     padding;
 }
 
-exports.getPadding = getPadding;
+exports.getQuadProps = getQuadProps;
 //# sourceMappingURL=padding.js.map

package/cjs/scenegraph/utils/padding.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/utils/padding.ts"],"names":[],"mappings":";;;AAAA,+CAAiD;AAEjD,SAAgB,UAAU,CAAC,aAAgC;IACzD,IAAI,OAAO,GAAG,IAAA,sBAAY,EAAC,aAAa,CAAC,CAAC;IAC1C,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC9D,OAAO,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;KAChD;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QACjC,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAQ,CAAC;KACnC;IACD,OAAO,OAAc,CAAC;AACxB,CAAC;AARD,gCAQC","file":"padding.js","sourcesContent":["import { parsePadding } from '@visactor/vrender';\n\nexport function getPadding(paddingOrigin: number | number[]): [number, number, number, number] {\n  let padding = parsePadding(paddingOrigin);\n  if (typeof padding === 'number' || typeof padding === 'string') {\n    padding = [padding, padding, padding, padding];\n  } else if (Array.isArray(padding)) {\n    padding = padding.slice(0) as any;\n  }\n  return padding as any;\n}\n"]}
+{"version":3,"sources":["scenegraph/utils/padding.ts"],"names":[],"mappings":";;;AAAA,+CAAiD;AAEjD,SAAgB,YAAY,CAAC,aAAgC;IAC3D,IAAI,OAAO,GAAG,IAAA,sBAAY,EAAC,aAAa,CAAC,CAAC;IAC1C,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC9D,OAAO,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;KAChD;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QACjC,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAQ,CAAC;KACnC;IACD,OAAO,OAAc,CAAC;AACxB,CAAC;AARD,oCAQC","file":"padding.js","sourcesContent":["import { parsePadding } from '@visactor/vrender';\n\nexport function getQuadProps(paddingOrigin: number | number[]): [number, number, number, number] {\n  let padding = parsePadding(paddingOrigin);\n  if (typeof padding === 'number' || typeof padding === 'string') {\n    padding = [padding, padding, padding, padding];\n  } else if (Array.isArray(padding)) {\n    padding = padding.slice(0) as any;\n  }\n  return padding as any;\n}\n"]}

package/cjs/scenegraph/utils/text-icon-layout.d.ts

@@ -3,7 +3,8 @@ import type { ColumnIconOption } from '../../ts-types';
 import type { Group } from '../graphic/group';
 import { Icon } from '../graphic/icon';
 import type { Scenegraph } from '../scenegraph';
-export declare function createCellContent(cellGroup: Group, icons: ColumnIconOption[] | null, textStr: string, padding: [number, number, number, number], autoColWidth: boolean, autoRowHeight: boolean, autoWrapText: boolean, lineClamp: number | undefined, cellWidth: number, cellHeight: number, textAlign: CanvasTextAlign, textBaseline: CanvasTextBaseline, cellTheme?: IThemeSpec): void;
-export declare function dealWithIcon(icon: ColumnIconOption, mark?: Icon): Icon;
+import type { BaseTableAPI } from '../../ts-types/base-table';
+export declare function createCellContent(cellGroup: Group, icons: ColumnIconOption[] | null, textStr: string, padding: [number, number, number, number], autoColWidth: boolean, autoRowHeight: boolean, autoWrapText: boolean, lineClamp: number | undefined, cellWidth: number, cellHeight: number, textAlign: CanvasTextAlign, textBaseline: CanvasTextBaseline, table: BaseTableAPI, cellTheme?: IThemeSpec): void;
+export declare function dealWithIcon(icon: ColumnIconOption, mark?: Icon, col?: number, row?: number, table?: BaseTableAPI): Icon;
 export declare function updateCellContentWidth(cellGroup: Group, distWidth: number, detaX: number, autoRowHeight: boolean, padding: [number, number, number, number], textAlign: CanvasTextAlign, textBaseline: CanvasTextBaseline, scene: Scenegraph): boolean;
 export declare function updateCellContentHeight(cellGroup: Group, distHeight: number, detaY: number, autoRowHeight: boolean, padding: [number, number, number, number], textAlign: CanvasTextAlign, textBaseline: CanvasTextBaseline): void;

package/cjs/scenegraph/utils/text-icon-layout.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.updateCellContentHeight = exports.updateCellContentWidth = exports.dealWithIcon = exports.createCellContent = void 0;
 
-const vrender_1 = require("@visactor/vrender"), util_1 = require("../../tools/util"), ts_types_1 = require("../../ts-types"), cell_content_1 = require("../component/cell-content"), icon_1 = require("../graphic/icon"), text_1 = require("../graphic/text"), get_cell_merge_1 = require("./get-cell-merge");
+const vrender_1 = require("@visactor/vrender"), util_1 = require("../../tools/util"), ts_types_1 = require("../../ts-types"), cell_content_1 = require("../component/cell-content"), icon_1 = require("../graphic/icon"), text_1 = require("../graphic/text"), get_cell_merge_1 = require("./get-cell-merge"), get_hierarchy_offset_1 = require("./get-hierarchy-offset"), vutils_1 = require("@visactor/vutils");
 
-function createCellContent(cellGroup, icons, textStr, padding, autoColWidth, autoRowHeight, autoWrapText, lineClamp, cellWidth, cellHeight, textAlign, textBaseline, cellTheme) {
+function createCellContent(cellGroup, icons, textStr, padding, autoColWidth, autoRowHeight, autoWrapText, lineClamp, cellWidth, cellHeight, textAlign, textBaseline, table, cellTheme) {
     var _a, _b, _c;
     const leftIcons = [], rightIcons = [], contentLeftIcons = [], contentRightIcons = [], inlineFrontIcons = [], inlineEndIcons = [], absoluteLeftIcons = [], absoluteRightIcons = [];
     let contentWidth, contentHeight, leftIconWidth = 0, leftIconHeight = 0, rightIconWidth = 0, rightIconHeight = 0, absoluteLeftIconWidth = 0, absoluteRightIconWidth = 0;
@@ -43,31 +43,31 @@ function createCellContent(cellGroup, icons, textStr, padding, autoColWidth, aut
             }
         })), leftIcons.forEach((icon => {
             var _a, _b, _c;
-            const iconMark = dealWithIcon(icon);
+            const iconMark = dealWithIcon(icon, void 0, cellGroup.col, cellGroup.row, table);
             iconMark.role = "icon-left", iconMark.name = icon.name, iconMark.setAttribute("x", leftIconWidth + (null !== (_a = iconMark.attribute.marginLeft) && void 0 !== _a ? _a : 0)), 
             leftIconWidth += iconMark.AABBBounds.width() + (null !== (_b = iconMark.attribute.marginLeft) && void 0 !== _b ? _b : 0) + (null !== (_c = iconMark.attribute.marginRight) && void 0 !== _c ? _c : 0), 
             leftIconHeight = Math.max(leftIconHeight, iconMark.AABBBounds.height()), cellGroup.appendChild(iconMark);
         })), rightIcons.forEach((icon => {
             var _a, _b, _c;
-            const iconMark = dealWithIcon(icon);
+            const iconMark = dealWithIcon(icon, void 0, cellGroup.col, cellGroup.row, table);
             iconMark.role = "icon-right", iconMark.name = icon.name, iconMark.setAttribute("x", rightIconWidth + (null !== (_a = iconMark.attribute.marginLeft) && void 0 !== _a ? _a : 0)), 
             rightIconWidth += iconMark.AABBBounds.width() + (null !== (_b = iconMark.attribute.marginLeft) && void 0 !== _b ? _b : 0) + (null !== (_c = iconMark.attribute.marginRight) && void 0 !== _c ? _c : 0), 
             rightIconHeight = Math.max(rightIconHeight, iconMark.AABBBounds.height()), cellGroup.appendChild(iconMark);
         })), absoluteLeftIcons.forEach((icon => {
             var _a, _b, _c;
-            const iconMark = dealWithIcon(icon);
+            const iconMark = dealWithIcon(icon, void 0, cellGroup.col, cellGroup.row, table);
             iconMark.role = "icon-absolute-left", iconMark.name = icon.name, iconMark.setAttribute("x", absoluteLeftIconWidth + (null !== (_a = iconMark.attribute.marginLeft) && void 0 !== _a ? _a : 0)), 
             absoluteLeftIconWidth += iconMark.AABBBounds.width() + (null !== (_b = iconMark.attribute.marginLeft) && void 0 !== _b ? _b : 0) + (null !== (_c = iconMark.attribute.marginRight) && void 0 !== _c ? _c : 0), 
             cellGroup.appendChild(iconMark);
         })), absoluteRightIcons.forEach((icon => {
             var _a, _b, _c;
-            const iconMark = dealWithIcon(icon);
+            const iconMark = dealWithIcon(icon, void 0, cellGroup.col, cellGroup.row, table);
             iconMark.role = "icon-absolute-right", iconMark.name = icon.name, iconMark.setAttribute("x", absoluteRightIconWidth + (null !== (_a = iconMark.attribute.marginLeft) && void 0 !== _a ? _a : 0)), 
             absoluteRightIconWidth += iconMark.AABBBounds.width() + (null !== (_b = iconMark.attribute.marginLeft) && void 0 !== _b ? _b : 0) + (null !== (_c = iconMark.attribute.marginRight) && void 0 !== _c ? _c : 0), 
             cellGroup.appendChild(iconMark);
         })), 0 === inlineFrontIcons.length && 0 === inlineEndIcons.length) {
-            const attribute = {
-                text: (0, util_1.convertInternal)(textStr).replace(/\r?\n/g, "\n").replace(/\r/g, "\n").split("\n"),
+            const text = (0, util_1.convertInternal)(textStr).replace(/\r?\n/g, "\n").replace(/\r/g, "\n").split("\n"), attribute = {
+                text: 1 !== text.length || autoWrapText ? text : text[0],
                 maxLineWidth: autoColWidth ? 1 / 0 : cellWidth - (padding[1] + padding[3]) - leftIconWidth - rightIconWidth,
                 textBaseline: "top",
                 heightLimit: autoRowHeight ? -1 : cellHeight - (padding[0] + padding[2]),
@@ -106,24 +106,26 @@ function createCellContent(cellGroup, icons, textStr, padding, autoColWidth, aut
                 align: textAlign,
                 baseline: textBaseline
             }), contentLeftIcons.forEach((icon => {
-                const iconMark = dealWithIcon(icon);
+                const iconMark = dealWithIcon(icon, void 0, cellGroup.col, cellGroup.row, table);
                 iconMark.role = "icon-content-left", iconMark.name = icon.name, cellContent.addLeftOccupyingIcon(iconMark);
             })), contentRightIcons.forEach((icon => {
-                const iconMark = dealWithIcon(icon);
+                const iconMark = dealWithIcon(icon, void 0, cellGroup.col, cellGroup.row, table);
                 iconMark.role = "icon-content-right", iconMark.name = icon.name, cellContent.addRightOccupyingIcon(iconMark);
             })), cellContent.addContent(textMark), cellGroup.appendChild(cellContent), cellContent.layout(), 
             contentWidth = cellContent.AABBBounds.width(), contentHeight = cellContent.AABBBounds.height();
         } else cellGroup.firstChild ? cellGroup.insertBefore(textMark, cellGroup.firstChild) : cellGroup.appendChild(textMark), 
         contentWidth = textMark.AABBBounds.width(), contentHeight = textMark.AABBBounds.height();
     } else {
-        const attribute = {
-            text: (0, util_1.convertInternal)(textStr).replace(/\r?\n/g, "\n").replace(/\r/g, "\n").split("\n"),
-            maxLineWidth: autoColWidth ? 1 / 0 : cellWidth - (padding[1] + padding[3]),
+        const text = (0, util_1.convertInternal)(textStr).replace(/\r?\n/g, "\n").replace(/\r/g, "\n").split("\n"), hierarchyOffset = (0, 
+        get_hierarchy_offset_1.getHierarchyOffset)(cellGroup.col, cellGroup.row, table), attribute = {
+            text: 1 !== text.length || autoWrapText ? text : text[0],
+            maxLineWidth: autoColWidth ? 1 / 0 : cellWidth - (padding[1] + padding[3] + hierarchyOffset),
             textBaseline: "top",
             autoWrapText: autoWrapText,
             lineClamp: lineClamp,
             heightLimit: autoRowHeight ? -1 : cellHeight - (padding[0] + padding[2]),
-            pickable: !1
+            pickable: !1,
+            dx: hierarchyOffset
         }, wrapText = new text_1.WrapText(cellTheme && cellTheme.text ? Object.assign({}, cellTheme.text, attribute) : attribute);
         wrapText.name = "text", cellGroup.appendChild(wrapText), contentWidth = wrapText.AABBBounds.width(), 
         contentHeight = wrapText.AABBBounds.height();
@@ -139,12 +141,15 @@ function createCellContent(cellGroup, icons, textStr, padding, autoColWidth, aut
     });
 }
 
-function dealWithIcon(icon, mark) {
+function dealWithIcon(icon, mark, col, row, table) {
     var _a, _b, _c, _d, _e, _f;
     const iconAttribute = {};
-    if ("image" === icon.type ? iconAttribute.image = icon.src : ("svg" === icon.type || "svg" in icon) && (iconAttribute.image = icon.svg), 
+    "image" === icon.type ? iconAttribute.image = icon.src : ("svg" === icon.type || "svg" in icon) && (iconAttribute.image = icon.svg), 
     iconAttribute.width = icon.width, iconAttribute.height = icon.height, iconAttribute.visibleTime = null !== (_a = icon.visibleTime) && void 0 !== _a ? _a : "always", 
-    iconAttribute.funcType = icon.funcType, iconAttribute.marginLeft = null !== (_b = icon.marginLeft) && void 0 !== _b ? _b : 0, 
+    iconAttribute.funcType = icon.funcType;
+    let hierarchyOffset = 0;
+    if ((0, vutils_1.isNumber)(col) && (0, vutils_1.isNumber)(row) && table && (icon.funcType === ts_types_1.IconFuncTypeEnum.collapse || icon.funcType === ts_types_1.IconFuncTypeEnum.expand) && (hierarchyOffset = (0, 
+    get_hierarchy_offset_1.getHierarchyOffset)(col, row, table)), iconAttribute.marginLeft = (null !== (_b = icon.marginLeft) && void 0 !== _b ? _b : 0) + hierarchyOffset, 
     iconAttribute.marginRight = null !== (_c = icon.marginRight) && void 0 !== _c ? _c : 0, 
     icon.interactive && (iconAttribute.pickable = !1), icon.hover && (iconAttribute.backgroundWidth = null !== (_d = icon.hover.width) && void 0 !== _d ? _d : icon.width, 
     iconAttribute.backgroundHeight = null !== (_e = icon.hover.width) && void 0 !== _e ? _e : icon.width, 
@@ -196,10 +201,10 @@ function updateCellContentWidth(cellGroup, distWidth, detaX, autoRowHeight, padd
         let newHeight = Math.max(leftIconHeight, contentHeight, rightIconHeight);
         if (isCellHeightUpdate(scene, cellGroup, newHeight + padding[0] + padding[2], oldCellHeight)) return !0;
         newHeight = cellGroup.attribute.height - (padding[0] + padding[2]), cellGroup.forEachChildren((child => {
-            "rect" !== child.type && ("mark" === child.name ? child.setAttribute("y", 0) : "middle" === textBaseline ? child.setAttribute("y", padding[0] + (newHeight - child.AABBBounds.height()) / 2) : "bottom" === textBaseline ? child.setAttribute("y", padding[0] + newHeight - child.AABBBounds.height()) : child.setAttribute("y", padding[0]));
+            "rect" !== child.type && "chart" !== child.type && ("mark" === child.name ? child.setAttribute("y", 0) : "middle" === textBaseline ? child.setAttribute("y", padding[0] + (newHeight - child.AABBBounds.height()) / 2) : "bottom" === textBaseline ? child.setAttribute("y", padding[0] + newHeight - child.AABBBounds.height()) : child.setAttribute("y", padding[0]));
         }));
     } else "middle" !== textBaseline && "bottom" !== textBaseline || cellGroup.forEachChildren((child => {
-        "rect" !== child.type && ("mark" === child.name ? child.setAttribute("y", 0) : "middle" === textBaseline ? child.setAttribute("y", (cellGroup.attribute.height - padding[2] + padding[0] - child.AABBBounds.height()) / 2) : "bottom" === textBaseline ? child.setAttribute("y", cellGroup.attribute.height - child.AABBBounds.height() - padding[2]) : child.setAttribute("y", padding[0]));
+        "rect" !== child.type && "chart" !== child.type && ("mark" === child.name ? child.setAttribute("y", 0) : "middle" === textBaseline ? child.setAttribute("y", (cellGroup.attribute.height - padding[2] + padding[0] - child.AABBBounds.height()) / 2) : "bottom" === textBaseline ? child.setAttribute("y", cellGroup.attribute.height - child.AABBBounds.height() - padding[2]) : child.setAttribute("y", padding[0]));
     }));
     return !1;
 }