@visactor/vtable 0.23.1 → 0.23.2

package/es/scenegraph/style/corner-cell.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/scenegraph/style/corner-cell.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,MAAM,UAAU,gBAAgB,CAAC,SAAgB,EAAE,UAAsB;IACvE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,UAAU,CAAC;IAE7E,MAAM,cAAc,GAA0B;QAC5C,CAAC,EAAE,CAAC;QACJ,CAAC,EAAE,CAAC;QACJ,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,CAAC;QACT,OAAO,EAAE,KAAK;QACd,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,OAAiB;KACxB,CAAC;IACF,cAAc,CAAC,MAAM,GAAG,SAAS,CAAC,WAAqB,EAAE,SAAS,CAAC,CAAC;IACpE,cAAc,CAAC,SAAS,GAAG,eAAyB,CAAC;IACrD,cAAc,IAAI,CAAC,cAAc,CAAC,QAAQ,GAAG,cAA0B,CAAC,CAAC;IACzE,cAAc,CAAC,OAAO,GAAG,QAAQ,CAAC;IAClC,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;QAC7B,cAAsB,CAAC,gBAAgB,GAAG,YAAY,CAAC,WAAkB,CAAC,CAAC;KAC7E;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;QACjC,cAAsB,CAAC,gBAAgB,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;QACxE,cAAsB,CAAC,SAAS,GAAG,CAAC,CAAC;KACvC;IAGD,SAAS,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;IACxC,SAAS,CAAC,IAAI,GAAG,eAAe,CAAC;IACjC,OAAO,SAAS,CAAC;AACnB,CAAC","file":"corner-cell.js","sourcesContent":["import type { IRectGraphicAttribute } from './../../vrender';\nimport type { ThemeStyle } from '../../ts-types';\nimport type { Group } from '../graphic/group';\nimport { getStroke } from './frame-border';\nimport { getQuadProps } from '../utils/padding';\n\nexport function createCornerCell(cellGroup: Group, frameTheme: ThemeStyle) {\n  const { bgColor, borderColor, borderLineWidth, borderLineDash } = frameTheme;\n\n  const rectAttributes: IRectGraphicAttribute = {\n    x: 0,\n    y: 0,\n    width: 0,\n    height: 0,\n    visible: false,\n    pickable: true,\n    fill: bgColor as string\n  };\n  rectAttributes.stroke = getStroke(borderColor as string, undefined);\n  rectAttributes.lineWidth = borderLineWidth as number;\n  borderLineDash && (rectAttributes.lineDash = borderLineDash as number[]);\n  rectAttributes.lineCap = 'square';\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  // const cornerCellGroup = new Group(rectAttributes);\n  cellGroup.setAttributes(rectAttributes);\n  cellGroup.role = 'corner-frozen';\n  return cellGroup;\n}\n"]}
+{"version":3,"sources":["../src/scenegraph/style/corner-cell.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,MAAM,UAAU,gBAAgB,CAAC,SAAgB,EAAE,UAAsB;IACvE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,UAAU,CAAC;IAE7E,MAAM,cAAc,GAA0B;QAC5C,CAAC,EAAE,CAAC;QACJ,CAAC,EAAE,CAAC;QACJ,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,CAAC;QACT,OAAO,EAAE,KAAK;QACd,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,OAAiB;KACxB,CAAC;IACF,cAAc,CAAC,MAAM,GAAG,SAAS,CAAC,WAAqB,EAAE,SAAS,CAAC,CAAC;IACpE,cAAc,CAAC,SAAS,GAAG,eAAyB,CAAC;IACrD,cAAc,IAAI,CAAC,cAAc,CAAC,QAAQ,GAAG,cAA0B,CAAC,CAAC;IACzE,cAAc,CAAC,OAAO,GAAG,MAAM,CAAC;IAChC,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;QAC7B,cAAsB,CAAC,gBAAgB,GAAG,YAAY,CAAC,WAAkB,CAAC,CAAC;KAC7E;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;QACjC,cAAsB,CAAC,gBAAgB,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;QACxE,cAAsB,CAAC,SAAS,GAAG,CAAC,CAAC;KACvC;IAGD,SAAS,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;IACxC,SAAS,CAAC,IAAI,GAAG,eAAe,CAAC;IACjC,OAAO,SAAS,CAAC;AACnB,CAAC","file":"corner-cell.js","sourcesContent":["import type { IRectGraphicAttribute } from './../../vrender';\nimport type { ThemeStyle } from '../../ts-types';\nimport type { Group } from '../graphic/group';\nimport { getStroke } from './frame-border';\nimport { getQuadProps } from '../utils/padding';\n\nexport function createCornerCell(cellGroup: Group, frameTheme: ThemeStyle) {\n  const { bgColor, borderColor, borderLineWidth, borderLineDash } = frameTheme;\n\n  const rectAttributes: IRectGraphicAttribute = {\n    x: 0,\n    y: 0,\n    width: 0,\n    height: 0,\n    visible: false,\n    pickable: true,\n    fill: bgColor as string\n  };\n  rectAttributes.stroke = getStroke(borderColor as string, undefined);\n  rectAttributes.lineWidth = borderLineWidth as number;\n  borderLineDash && (rectAttributes.lineDash = borderLineDash as number[]);\n  rectAttributes.lineCap = 'butt';\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  // const cornerCellGroup = new Group(rectAttributes);\n  cellGroup.setAttributes(rectAttributes);\n  cellGroup.role = 'corner-frozen';\n  return cellGroup;\n}\n"]}

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

@@ -17,7 +17,7 @@ export function createFrameBorder(group, frameTheme, role, strokeArray, justForX
     rectAttributes.stroke = !0, rectAttributes.stroke = shadowColor, rectAttributes.lineWidth = 1, 
     hasShadow = !0), borderLineWidth && (rectAttributes.stroke = !0, rectAttributes.fill = !1, 
     rectAttributes.stroke = getStroke(borderColor, strokeArray), rectAttributes.lineWidth = borderLineWidth, 
-    borderLineDash && (rectAttributes.lineDash = borderLineDash), rectAttributes.lineCap = "square"), 
+    borderLineDash && (rectAttributes.lineDash = borderLineDash), rectAttributes.lineCap = "butt"), 
     Array.isArray(borderColor) && (rectAttributes.strokeArrayColor = getQuadProps(borderColor)), 
     Array.isArray(borderLineWidth) && (rectAttributes.strokeArrayWidth = getQuadProps(borderLineWidth), 
     rectAttributes.lineWidth = 1), cornerRadius && (rectAttributes.cornerRadius = cornerRadius, 

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/scenegraph/style/frame-border.ts"],"names":[],"mappings":"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","file":"frame-border.js","sourcesContent":["import type { IGroupGraphicAttribute, IRect, IRectGraphicAttribute } from './../../vrender';\nimport { createGroup, createRect } from './../../vrender';\nimport type { TableFrameStyle } from '../../ts-types';\nimport type { Group } from '../graphic/group';\nimport { isArray } from '@visactor/vutils';\nimport { getQuadProps } from '../utils/padding';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\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  let hasShadow = false;\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    hasShadow = true;\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      if (frameTheme.innerBorder) {\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      } else {\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      }\n\n      let shadowRect;\n      let borderRect;\n      if (hasShadow) {\n        rectAttributes.fill = 'white';\n        (rectAttributes as any).notAdjustPos = true;\n        // rectAttributes.globalCompositeOperation = 'source-over';\n\n        // first draw group\n        borderRect = createGroup(rectAttributes);\n        borderRect.name = 'table-border-rect';\n\n        // second draw rect\n        shadowRect = createRect({\n          x: borderLeft / 2,\n          y: borderTop / 2,\n          width: group.attribute.width,\n          height: group.attribute.height,\n          fill: 'red',\n          cornerRadius: group.attribute.cornerRadius,\n          globalCompositeOperation: 'destination-out'\n        });\n        borderRect.addChild(shadowRect);\n\n        // hack for vrender globalCompositeOperation&clip render problem\n        const hackRect = createRect({\n          width: 1,\n          height: 1,\n          fill: 'transparent',\n          pickable: false\n        });\n        borderRect.addChild(hackRect);\n      } else {\n        borderRect = createRect(rectAttributes);\n        borderRect.name = 'table-border-rect';\n      }\n\n      // to be fixed: border index in shadow mode\n      if (frameTheme.innerBorder && !hasShadow) {\n        group.parent.insertAfter(borderRect, group);\n      } else {\n        group.parent.insertBefore(borderRect, group);\n      }\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\nexport function 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  if (group.border.type === 'group') {\n    (group.border.firstChild as IRect).setAttributes({\n      width: group.attribute.width,\n      height: group.attribute.height\n    });\n  }\n}\n\nexport function updateCornerRadius(table: BaseTableAPI) {\n  if (!table.theme.frameStyle.cornerRadius) {\n    return;\n  }\n  const cornerRadius = table.theme.frameStyle.cornerRadius;\n  const {\n    cornerHeaderGroup,\n    colHeaderGroup,\n    rowHeaderGroup,\n    bodyGroup,\n    rightTopCornerGroup,\n    leftBottomCornerGroup,\n    rightBottomCornerGroup,\n    rightFrozenGroup,\n    bottomFrozenGroup\n  } = table.scenegraph;\n\n  // reset corner radius\n  cornerHeaderGroup.setAttribute('cornerRadius', 0);\n  colHeaderGroup.setAttribute('cornerRadius', 0);\n  rowHeaderGroup.setAttribute('cornerRadius', 0);\n  bodyGroup.setAttribute('cornerRadius', 0);\n  rightTopCornerGroup.setAttribute('cornerRadius', 0);\n  leftBottomCornerGroup.setAttribute('cornerRadius', 0);\n  rightBottomCornerGroup.setAttribute('cornerRadius', 0);\n  rightFrozenGroup.setAttribute('cornerRadius', 0);\n  bottomFrozenGroup.setAttribute('cornerRadius', 0);\n\n  // left top\n  if (cornerHeaderGroup.attribute.width > 0 && cornerHeaderGroup.attribute.height > 0) {\n    setCornerRadius(cornerHeaderGroup, [cornerRadius, 0, 0, 0]);\n  } else if (colHeaderGroup.attribute.height > 0) {\n    setCornerRadius(colHeaderGroup, [cornerRadius, 0, 0, 0]);\n  } else if (rowHeaderGroup.attribute.width > 0) {\n    setCornerRadius(rowHeaderGroup, [cornerRadius, 0, 0, 0]);\n  } else {\n    setCornerRadius(bodyGroup, [cornerRadius, 0, 0, 0]);\n  }\n\n  // left bottom\n  if (leftBottomCornerGroup.attribute.width > 0 && leftBottomCornerGroup.attribute.height > 0) {\n    setCornerRadius(leftBottomCornerGroup, [0, 0, 0, cornerRadius]);\n  } else if (bottomFrozenGroup.attribute.height > 0) {\n    setCornerRadius(bottomFrozenGroup, [0, 0, 0, cornerRadius]);\n  } else if (rowHeaderGroup.attribute.width > 0) {\n    setCornerRadius(rowHeaderGroup, [0, 0, 0, cornerRadius]);\n  } else {\n    setCornerRadius(bodyGroup, [0, 0, 0, cornerRadius]);\n  }\n\n  // right top\n  if (rightTopCornerGroup.attribute.width > 0 && rightTopCornerGroup.attribute.height > 0) {\n    setCornerRadius(rightTopCornerGroup, [0, cornerRadius, 0, 0]);\n  } else if (colHeaderGroup.attribute.height > 0) {\n    setCornerRadius(colHeaderGroup, [0, cornerRadius, 0, 0]);\n  } else if (rightFrozenGroup.attribute.width > 0) {\n    setCornerRadius(rightFrozenGroup, [0, cornerRadius, 0, 0]);\n  } else {\n    setCornerRadius(bodyGroup, [0, cornerRadius, 0, 0]);\n  }\n\n  // right bottom\n  if (rightBottomCornerGroup.attribute.width > 0 && rightBottomCornerGroup.attribute.height > 0) {\n    setCornerRadius(rightBottomCornerGroup, [0, 0, cornerRadius, 0]);\n  } else if (rightFrozenGroup.attribute.width > 0) {\n    setCornerRadius(rightFrozenGroup, [0, 0, cornerRadius, 0]);\n  } else if (bottomFrozenGroup.attribute.height > 0) {\n    setCornerRadius(bottomFrozenGroup, [0, 0, cornerRadius, 0]);\n  } else {\n    setCornerRadius(bodyGroup, [0, 0, cornerRadius, 0]);\n  }\n}\n\nfunction setCornerRadius(group: Group, cornerRadius: number[]) {\n  group.setAttribute('cornerRadius', cornerRadius);\n  if (group.border) {\n    group.border.setAttribute('cornerRadius', cornerRadius);\n  }\n}\n"]}
+{"version":3,"sources":["../src/scenegraph/style/frame-border.ts"],"names":[],"mappings":"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","file":"frame-border.js","sourcesContent":["import type { IGroupGraphicAttribute, IRect, IRectGraphicAttribute } from './../../vrender';\nimport { createGroup, createRect } from './../../vrender';\nimport type { TableFrameStyle } from '../../ts-types';\nimport type { Group } from '../graphic/group';\nimport { isArray } from '@visactor/vutils';\nimport { getQuadProps } from '../utils/padding';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\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  let hasShadow = false;\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    hasShadow = true;\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 = 'butt';\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      if (frameTheme.innerBorder) {\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      } else {\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      }\n\n      let shadowRect;\n      let borderRect;\n      if (hasShadow) {\n        rectAttributes.fill = 'white';\n        (rectAttributes as any).notAdjustPos = true;\n        // rectAttributes.globalCompositeOperation = 'source-over';\n\n        // first draw group\n        borderRect = createGroup(rectAttributes);\n        borderRect.name = 'table-border-rect';\n\n        // second draw rect\n        shadowRect = createRect({\n          x: borderLeft / 2,\n          y: borderTop / 2,\n          width: group.attribute.width,\n          height: group.attribute.height,\n          fill: 'red',\n          cornerRadius: group.attribute.cornerRadius,\n          globalCompositeOperation: 'destination-out'\n        });\n        borderRect.addChild(shadowRect);\n\n        // hack for vrender globalCompositeOperation&clip render problem\n        const hackRect = createRect({\n          width: 1,\n          height: 1,\n          fill: 'transparent',\n          pickable: false\n        });\n        borderRect.addChild(hackRect);\n      } else {\n        borderRect = createRect(rectAttributes);\n        borderRect.name = 'table-border-rect';\n      }\n\n      // to be fixed: border index in shadow mode\n      if (frameTheme.innerBorder && !hasShadow) {\n        group.parent.insertAfter(borderRect, group);\n      } else {\n        group.parent.insertBefore(borderRect, group);\n      }\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\nexport function 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  if (group.border.type === 'group') {\n    (group.border.firstChild as IRect).setAttributes({\n      width: group.attribute.width,\n      height: group.attribute.height\n    });\n  }\n}\n\nexport function updateCornerRadius(table: BaseTableAPI) {\n  if (!table.theme.frameStyle.cornerRadius) {\n    return;\n  }\n  const cornerRadius = table.theme.frameStyle.cornerRadius;\n  const {\n    cornerHeaderGroup,\n    colHeaderGroup,\n    rowHeaderGroup,\n    bodyGroup,\n    rightTopCornerGroup,\n    leftBottomCornerGroup,\n    rightBottomCornerGroup,\n    rightFrozenGroup,\n    bottomFrozenGroup\n  } = table.scenegraph;\n\n  // reset corner radius\n  cornerHeaderGroup.setAttribute('cornerRadius', 0);\n  colHeaderGroup.setAttribute('cornerRadius', 0);\n  rowHeaderGroup.setAttribute('cornerRadius', 0);\n  bodyGroup.setAttribute('cornerRadius', 0);\n  rightTopCornerGroup.setAttribute('cornerRadius', 0);\n  leftBottomCornerGroup.setAttribute('cornerRadius', 0);\n  rightBottomCornerGroup.setAttribute('cornerRadius', 0);\n  rightFrozenGroup.setAttribute('cornerRadius', 0);\n  bottomFrozenGroup.setAttribute('cornerRadius', 0);\n\n  // left top\n  if (cornerHeaderGroup.attribute.width > 0 && cornerHeaderGroup.attribute.height > 0) {\n    setCornerRadius(cornerHeaderGroup, [cornerRadius, 0, 0, 0]);\n  } else if (colHeaderGroup.attribute.height > 0) {\n    setCornerRadius(colHeaderGroup, [cornerRadius, 0, 0, 0]);\n  } else if (rowHeaderGroup.attribute.width > 0) {\n    setCornerRadius(rowHeaderGroup, [cornerRadius, 0, 0, 0]);\n  } else {\n    setCornerRadius(bodyGroup, [cornerRadius, 0, 0, 0]);\n  }\n\n  // left bottom\n  if (leftBottomCornerGroup.attribute.width > 0 && leftBottomCornerGroup.attribute.height > 0) {\n    setCornerRadius(leftBottomCornerGroup, [0, 0, 0, cornerRadius]);\n  } else if (bottomFrozenGroup.attribute.height > 0) {\n    setCornerRadius(bottomFrozenGroup, [0, 0, 0, cornerRadius]);\n  } else if (rowHeaderGroup.attribute.width > 0) {\n    setCornerRadius(rowHeaderGroup, [0, 0, 0, cornerRadius]);\n  } else {\n    setCornerRadius(bodyGroup, [0, 0, 0, cornerRadius]);\n  }\n\n  // right top\n  if (rightTopCornerGroup.attribute.width > 0 && rightTopCornerGroup.attribute.height > 0) {\n    setCornerRadius(rightTopCornerGroup, [0, cornerRadius, 0, 0]);\n  } else if (colHeaderGroup.attribute.height > 0) {\n    setCornerRadius(colHeaderGroup, [0, cornerRadius, 0, 0]);\n  } else if (rightFrozenGroup.attribute.width > 0) {\n    setCornerRadius(rightFrozenGroup, [0, cornerRadius, 0, 0]);\n  } else {\n    setCornerRadius(bodyGroup, [0, cornerRadius, 0, 0]);\n  }\n\n  // right bottom\n  if (rightBottomCornerGroup.attribute.width > 0 && rightBottomCornerGroup.attribute.height > 0) {\n    setCornerRadius(rightBottomCornerGroup, [0, 0, cornerRadius, 0]);\n  } else if (rightFrozenGroup.attribute.width > 0) {\n    setCornerRadius(rightFrozenGroup, [0, 0, cornerRadius, 0]);\n  } else if (bottomFrozenGroup.attribute.height > 0) {\n    setCornerRadius(bottomFrozenGroup, [0, 0, cornerRadius, 0]);\n  } else {\n    setCornerRadius(bodyGroup, [0, 0, cornerRadius, 0]);\n  }\n}\n\nfunction setCornerRadius(group: Group, cornerRadius: number[]) {\n  group.setAttribute('cornerRadius', cornerRadius);\n  if (group.border) {\n    group.border.setAttribute('cornerRadius', cornerRadius);\n  }\n}\n"]}

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

@@ -1,3 +1,5 @@
+import { isValid } from "@visactor/vutils";
+
 import { HierarchyState } from "../../ts-types";
 
 export function getHierarchyOffset(col, row, table) {
@@ -6,12 +8,14 @@ export function getHierarchyOffset(col, row, table) {
     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));
+        isValid(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), 
+        layoutMap.rowHierarchyTextStartAlignment && !table.internalProps.headerHelper.getHierarchyIcon(col, row) && (cellHierarchyIndent += table.internalProps.headerHelper.getHierarchyIconWidth()));
     } else {
         const define = table.getBodyColumnDefine(col, row);
         if (null == define ? void 0 : define.tree) {
             const indexArr = table.dataSource.getIndexKey(table.getRecordShowIndexByCell(col, row));
-            cellHierarchyIndent = Array.isArray(indexArr) && table.getHierarchyState(col, row) !== HierarchyState.none ? (indexArr.length - 1) * (null !== (_c = layoutMap.hierarchyIndent) && void 0 !== _c ? _c : 0) : 0;
+            cellHierarchyIndent = Array.isArray(indexArr) && table.getHierarchyState(col, row) !== HierarchyState.none ? (indexArr.length - 1) * (null !== (_c = layoutMap.hierarchyIndent) && void 0 !== _c ? _c : 0) : 0, 
+            layoutMap.hierarchyTextStartAlignment && !table.internalProps.bodyHelper.getHierarchyIcon(col, row) && (cellHierarchyIndent += table.internalProps.bodyHelper.getHierarchyIconWidth());
         }
     }
     return cellHierarchyIndent;

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/scenegraph/utils/get-hierarchy-offset.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGhD,MAAM,UAAU,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,CAAe,CAAC;QACvD,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,IAAK,MAAuB,aAAvB,MAAM,uBAAN,MAAM,CAAmB,IAAI,EAAE;YAClC,MAAM,QAAQ,GAAG,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,wBAAwB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;YACxF,mBAAmB;gBACjB,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,cAAc,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","file":"get-hierarchy-offset.js","sourcesContent":["import type { SimpleHeaderLayoutMap } from '../../layout';\nimport type { PivotHeaderLayoutMap } from '../../layout/pivot-header-layout';\nimport type { ColumnDefine } from '../../ts-types';\nimport { HierarchyState } from '../../ts-types';\nimport type { BaseTableAPI, HeaderData } 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) as HeaderData;\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 as ColumnDefine)?.tree) {\n      const indexArr = table.dataSource.getIndexKey(table.getRecordShowIndexByCell(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"]}
+{"version":3,"sources":["../src/scenegraph/utils/get-hierarchy-offset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAI3C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGhD,MAAM,UAAU,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,CAAe,CAAC;QACvD,IAAI,OAAO,CAAC,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,cAAc,CAAC,EAAE;YAC/B,mBAAmB,GAAG,CAAC,MAAA,EAAE,CAAC,cAAc,mCAAI,CAAC,CAAC,GAAG,CAAC,MAAC,SAAkC,CAAC,kBAAkB,mCAAI,CAAC,CAAC,CAAC;YAC/G,IACG,SAAkC,CAAC,8BAA8B;gBAClE,CAAC,KAAK,CAAC,aAAa,CAAC,YAAY,CAAC,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,EAC5D;gBACA,mBAAmB,IAAI,KAAK,CAAC,aAAa,CAAC,YAAY,CAAC,qBAAqB,EAAE,CAAC;aACjF;SACF;KACF;SAAM;QAGL,MAAM,MAAM,GAAG,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACnD,IAAK,MAAuB,aAAvB,MAAM,uBAAN,MAAM,CAAmB,IAAI,EAAE;YAClC,MAAM,QAAQ,GAAG,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,wBAAwB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;YACxF,mBAAmB;gBACjB,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,cAAc,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;YACR,IACG,SAAmC,CAAC,2BAA2B;gBAChE,CAAC,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,EAC1D;gBACA,mBAAmB,IAAI,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,qBAAqB,EAAE,CAAC;aAC/E;SACF;KACF;IAED,OAAO,mBAAmB,CAAC;AAC7B,CAAC","file":"get-hierarchy-offset.js","sourcesContent":["import { isValid } from '@visactor/vutils';\nimport type { SimpleHeaderLayoutMap } from '../../layout';\nimport type { PivotHeaderLayoutMap } from '../../layout/pivot-header-layout';\nimport type { ColumnDefine } from '../../ts-types';\nimport { HierarchyState } from '../../ts-types';\nimport type { BaseTableAPI, HeaderData } 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) as HeaderData;\n    if (isValid(hd?.hierarchyLevel)) {\n      cellHierarchyIndent = (hd.hierarchyLevel ?? 0) * ((layoutMap as PivotHeaderLayoutMap).rowHierarchyIndent ?? 0);\n      if (\n        (layoutMap as PivotHeaderLayoutMap).rowHierarchyTextStartAlignment &&\n        !table.internalProps.headerHelper.getHierarchyIcon(col, row)\n      ) {\n        cellHierarchyIndent += table.internalProps.headerHelper.getHierarchyIconWidth();\n      }\n    }\n  } else {\n    // 基本表格表身body单元格 如果是树形展开 需要考虑缩进值\n    // const cellHierarchyState = table.getHierarchyState(col, row);\n    const define = table.getBodyColumnDefine(col, row);\n    if ((define as ColumnDefine)?.tree) {\n      const indexArr = table.dataSource.getIndexKey(table.getRecordShowIndexByCell(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      if (\n        (layoutMap as SimpleHeaderLayoutMap).hierarchyTextStartAlignment &&\n        !table.internalProps.bodyHelper.getHierarchyIcon(col, row)\n      ) {\n        cellHierarchyIndent += table.internalProps.bodyHelper.getHierarchyIconWidth();\n      }\n    }\n  }\n\n  return cellHierarchyIndent;\n}\n"]}

package/es/state/state.js

@@ -205,12 +205,12 @@ export class StateManager {
         return checkMultiCellInSelect(cellPosStart, cellPosEnd, this.select.ranges, this.select.highlightScope);
     }
     updateHoverIcon(col, row, target, cellGroup, event) {
-        var _a, _b, _c, _d, _e, _f;
-        if (target === (null === (_a = this.residentHoverIcon) || void 0 === _a ? void 0 : _a.icon)) return;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        if ((null === (_a = this.residentHoverIcon) || void 0 === _a ? void 0 : _a.icon) && target === (null === (_b = this.residentHoverIcon) || void 0 === _b ? void 0 : _b.icon)) return;
         const iconInfo = getIconAndPositionFromTarget(target);
         if (iconInfo) if ("richtext-icon" === iconInfo.type) {
             const inlineIcon = iconInfo.icon;
-            if (this.hoverIcon.icon && this.hoverIcon.icon !== (null === (_c = this.residentHoverIcon) || void 0 === _c ? void 0 : _c.icon) && (this.table.scenegraph.setIconNormalStyle(this.hoverIcon.icon, this.hoverIcon.col, this.hoverIcon.row), 
+            if (this.hoverIcon.icon && this.hoverIcon.icon !== (null === (_d = this.residentHoverIcon) || void 0 === _d ? void 0 : _d.icon) && (this.table.scenegraph.setIconNormalStyle(this.hoverIcon.icon, this.hoverIcon.col, this.hoverIcon.row), 
             this.hoverIcon.col = -1, this.hoverIcon.col = -1, this.hoverIcon.icon = null, this.table.scenegraph.updateNextFrame()), 
             inlineIcon.attribute.tooltip) {
                 const tooltipOptions = {
@@ -219,16 +219,16 @@ export class StateManager {
                         rect: iconInfo.position,
                         placement: inlineIcon.attribute.tooltip.placement
                     },
-                    style: Object.assign({}, null === (_d = this.table.internalProps.theme) || void 0 === _d ? void 0 : _d.tooltipStyle, null === (_e = inlineIcon.tooltip) || void 0 === _e ? void 0 : _e.style)
+                    style: Object.assign({}, null === (_e = this.table.internalProps.theme) || void 0 === _e ? void 0 : _e.tooltipStyle, null === (_f = inlineIcon.tooltip) || void 0 === _f ? void 0 : _f.style, null === (_h = null === (_g = inlineIcon.attribute) || void 0 === _g ? void 0 : _g.tooltip) || void 0 === _h ? void 0 : _h.style)
                 };
                 this.table.internalProps.tooltipHandler.isBinded(tooltipOptions) || this.table.showTooltip(col, row, tooltipOptions);
             }
         } else {
             const icon = iconInfo.icon;
-            icon !== this.hoverIcon.icon && (this.hoverIcon.icon && this.hoverIcon.icon !== (null === (_f = this.residentHoverIcon) || void 0 === _f ? void 0 : _f.icon) && this.table.scenegraph.setIconNormalStyle(this.hoverIcon.icon, this.hoverIcon.col, this.hoverIcon.row), 
+            icon !== this.hoverIcon.icon && (this.hoverIcon.icon && this.hoverIcon.icon !== (null === (_j = this.residentHoverIcon) || void 0 === _j ? void 0 : _j.icon) && this.table.scenegraph.setIconNormalStyle(this.hoverIcon.icon, this.hoverIcon.col, this.hoverIcon.row), 
             this.hoverIcon.col = col, this.hoverIcon.row = row, this.hoverIcon.icon = icon, 
             this.table.scenegraph.setIconHoverStyle(icon, col, row, cellGroup), this.table.scenegraph.updateNextFrame());
-        } else this.hoverIcon.icon && this.hoverIcon.icon !== (null === (_b = this.residentHoverIcon) || void 0 === _b ? void 0 : _b.icon) && (this.table.scenegraph.setIconNormalStyle(this.hoverIcon.icon, this.hoverIcon.col, this.hoverIcon.row), 
+        } else this.hoverIcon.icon && this.hoverIcon.icon !== (null === (_c = this.residentHoverIcon) || void 0 === _c ? void 0 : _c.icon) && (this.table.scenegraph.setIconNormalStyle(this.hoverIcon.icon, this.hoverIcon.col, this.hoverIcon.row), 
         this.hoverIcon.col = -1, this.hoverIcon.col = -1, this.hoverIcon.icon = null, this.table.scenegraph.updateNextFrame());
     }
     isResizeCol() {
@@ -241,14 +241,16 @@ export class StateManager {
         return this.select.selecting;
     }
     endSelectCells(fireListener = !0) {
-        if (this.select.selecting = !1, 0 === this.select.ranges.length) return;
-        selectEnd(this.table.scenegraph);
-        const lastCol = this.select.ranges[this.select.ranges.length - 1].end.col, lastRow = this.select.ranges[this.select.ranges.length - 1].end.row;
-        fireListener && this.table.fireListeners(TABLE_EVENT_TYPE.SELECTED_CELL, {
-            ranges: this.select.ranges,
-            col: lastCol,
-            row: lastRow
-        });
+        if (this.select.selecting) {
+            if (this.select.selecting = !1, 0 === this.select.ranges.length) return;
+            selectEnd(this.table.scenegraph);
+            const lastCol = this.select.ranges[this.select.ranges.length - 1].end.col, lastRow = this.select.ranges[this.select.ranges.length - 1].end.row;
+            fireListener && this.table.fireListeners(TABLE_EVENT_TYPE.SELECTED_CELL, {
+                ranges: this.select.ranges,
+                col: lastCol,
+                row: lastRow
+            });
+        }
     }
     endResizeCol() {
         setTimeout((() => {