@visactor/vtable 0.13.2-alpha.5 → 0.13.2

package/cjs/scenegraph/layout/move-cell.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/layout/move-cell.ts"],"names":[],"mappings":"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","file":"move-cell.js","sourcesContent":["import { Group } from '@visactor/vrender';\nimport { getCellMergeInfo } from '../utils/get-cell-merge';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\n\nconst groupForPosition = new Group({});\n\nexport function moveHeaderPosition(\n  colSource: number,\n  rowSource: number,\n  colTarget: number,\n  rowTarget: number,\n  table: BaseTableAPI\n) {\n  const scene = table.scenegraph;\n\n  // 判断方向\n  const cellLocation = table.getCellLocation(colTarget, rowTarget);\n  const direction = cellLocation === 'columnHeader' ? 'column' : cellLocation === 'rowHeader' ? 'row' : undefined;\n\n  let sourceColStart = 0;\n  let sourceRowStart = 0;\n  let sourceColEnd = 0;\n  let sourceRowEnd = 0;\n  let targetColStart = 0;\n  let targetRowStart = 0;\n  let targetColEnd = 0;\n  let targetRowEnd = 0;\n  if (direction === 'column') {\n    const sourceMergeInfo = getCellMergeInfo(table, colSource, rowSource);\n    const targetMergeInfo = getCellMergeInfo(table, colTarget, rowTarget);\n    if (sourceMergeInfo && targetMergeInfo) {\n      sourceColStart = sourceMergeInfo.start.col;\n      sourceColEnd = sourceMergeInfo.end.col;\n      targetColStart = targetMergeInfo.start.col;\n      targetColEnd = targetMergeInfo.end.col;\n    } else {\n      sourceColStart = colSource;\n      sourceColEnd = colSource;\n      targetColStart = colTarget;\n      targetColEnd = colTarget;\n    }\n    sourceRowStart = rowSource;\n    sourceRowEnd = table.rowCount - 1;\n    targetRowStart = rowTarget;\n    targetRowEnd = table.rowCount - 1;\n  } else if (direction === 'row') {\n    const sourceMergeInfo = getCellMergeInfo(table, colSource, rowSource);\n    const targetMergeInfo = getCellMergeInfo(table, colTarget, rowTarget);\n    if (sourceMergeInfo && targetMergeInfo) {\n      sourceRowStart = sourceMergeInfo.start.row;\n      sourceRowEnd = sourceMergeInfo.end.row;\n      targetRowStart = targetMergeInfo.start.row;\n      targetRowEnd = targetMergeInfo.end.row;\n    } else {\n      sourceRowStart = rowSource;\n      sourceRowEnd = rowSource;\n      targetRowStart = rowTarget;\n      targetRowEnd = rowTarget;\n    }\n    sourceColStart = colSource;\n    sourceColEnd = table.colCount - 1;\n    targetColStart = colTarget;\n    targetColEnd = table.colCount - 1;\n  }\n\n  const updateColStart = Math.min(sourceColStart, targetColStart);\n  const updateColEnd = Math.max(sourceColEnd, targetColEnd);\n  const updateRowStart = Math.min(sourceRowStart, targetRowStart);\n  const updateRowEnd = Math.max(sourceRowEnd, targetRowEnd);\n\n  // 更新columnGroup列宽\n  for (let col = updateColStart; col <= updateColEnd; col++) {\n    const columnHeaderGroup = table.scenegraph.getColGroup(col, true);\n    const columnGroup = table.scenegraph.getColGroup(col);\n    if (columnHeaderGroup) {\n      columnHeaderGroup.setAttribute('width', table.getColWidth(col));\n    }\n    if (columnGroup) {\n      columnGroup.setAttribute('width', table.getColWidth(col));\n    }\n  }\n\n  // 更新容器尺寸\n  scene.updateContainerAttrWidthAndX();\n  scene.updateContainer();\n\n  for (let col = updateColStart; col <= updateColEnd; col++) {\n    // 将该列的chartInstance清除掉\n    const columnGroup = table.scenegraph.getColGroup(col);\n    columnGroup?.setAttribute('chartInstance', undefined);\n    // 更新单元格记录全量属性，不更新column theme\n    for (let row = updateRowStart; row <= updateRowEnd; row++) {\n      scene.updateCellContent(col, row);\n    }\n  }\n}\n\nfunction changeCell(colSource: number, rowSource: number, colTarget: number, rowTarget: number, table: BaseTableAPI) {\n  // 记录基础属性\n  const scene = table.scenegraph;\n  const sourceCellGroup = scene.getCell(colSource, rowSource, true);\n  const targetCellGroup = scene.getCell(colTarget, rowTarget, true);\n  if (sourceCellGroup.role === 'empty' || targetCellGroup.role === 'empty') {\n    return;\n  }\n  const sourceParent = sourceCellGroup.parent as Group;\n  const targetParent = targetCellGroup.parent as Group;\n  const { x: sourceX, y: sourceY } = sourceCellGroup.attribute;\n  const { x: targetX, y: targetY } = targetCellGroup.attribute;\n\n  // 判断merge属性\n  let sourceDeltaCol;\n  let sourceDeltaRow;\n  let targetDeltaCol;\n  let targetDeltaRow;\n  const sourceMergeCol = sourceCellGroup.mergeCol;\n  const sourceMergeRow = sourceCellGroup.mergeRow;\n  const targetMergeCol = targetCellGroup.mergeCol;\n  const targetMergeRow = targetCellGroup.mergeRow;\n  if (typeof sourceMergeCol === 'number' && typeof sourceMergeRow === 'number') {\n    sourceDeltaCol = sourceMergeCol - colSource;\n    sourceDeltaRow = sourceMergeRow - rowSource;\n  }\n  if (typeof targetMergeCol === 'number' && typeof targetMergeRow === 'number') {\n    targetDeltaCol = targetMergeCol - colTarget;\n    targetDeltaRow = targetMergeRow - rowTarget;\n  }\n\n  // 更新位置\n  targetParent.insertAfter(groupForPosition, targetCellGroup);\n  sourceParent.insertAfter(targetCellGroup, sourceCellGroup);\n  targetParent.insertAfter(sourceCellGroup, groupForPosition);\n  targetParent.removeChild(groupForPosition);\n\n  // 更新属性\n  sourceCellGroup.setAttributes({\n    x: targetX,\n    y: targetY\n  });\n  sourceCellGroup.col = colTarget;\n  sourceCellGroup.row = rowTarget;\n\n  targetCellGroup.setAttributes({\n    x: sourceX,\n    y: sourceY\n  });\n  targetCellGroup.col = colSource;\n  targetCellGroup.row = rowSource;\n  if (typeof sourceDeltaCol === 'number' && typeof sourceDeltaRow === 'number') {\n    sourceCellGroup.mergeCol = sourceCellGroup.col + sourceDeltaCol;\n    sourceCellGroup.mergeRow = sourceCellGroup.row + sourceDeltaRow;\n  }\n  if (typeof targetDeltaCol === 'number' && typeof targetDeltaRow === 'number') {\n    targetCellGroup.mergeCol = targetCellGroup.col + targetDeltaCol;\n    targetCellGroup.mergeRow = targetCellGroup.row + targetDeltaRow;\n  }\n}\n"]}
+{"version":3,"sources":["scenegraph/layout/move-cell.ts"],"names":[],"mappings":"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","file":"move-cell.js","sourcesContent":["import { Group } from '@visactor/vrender';\nimport { getCellMergeInfo } from '../utils/get-cell-merge';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\n\nconst groupForPosition = new Group({});\n\nexport function moveHeaderPosition(\n  colSource: number,\n  rowSource: number,\n  colTarget: number,\n  rowTarget: number,\n  table: BaseTableAPI\n) {\n  const scene = table.scenegraph;\n\n  // 判断方向\n  const cellLocation = table.getCellLocation(colTarget, rowTarget);\n  const direction = cellLocation === 'columnHeader' ? 'column' : cellLocation === 'rowHeader' ? 'row' : undefined;\n\n  let sourceColStart = 0;\n  let sourceRowStart = 0;\n  let sourceColEnd = 0;\n  let sourceRowEnd = 0;\n  let targetColStart = 0;\n  let targetRowStart = 0;\n  let targetColEnd = 0;\n  let targetRowEnd = 0;\n  if (direction === 'column') {\n    const sourceMergeInfo = getCellMergeInfo(table, colSource, rowSource);\n    const targetMergeInfo = getCellMergeInfo(table, colTarget, rowTarget);\n    if (sourceMergeInfo && targetMergeInfo) {\n      sourceColStart = sourceMergeInfo.start.col;\n      sourceColEnd = sourceMergeInfo.end.col;\n      targetColStart = targetMergeInfo.start.col;\n      targetColEnd = targetMergeInfo.end.col;\n    } else {\n      sourceColStart = colSource;\n      sourceColEnd = colSource;\n      targetColStart = colTarget;\n      targetColEnd = colTarget;\n    }\n    sourceRowStart = rowSource;\n    sourceRowEnd = table.rowCount - 1;\n    targetRowStart = rowTarget;\n    targetRowEnd = table.rowCount - 1;\n  } else if (direction === 'row') {\n    const sourceMergeInfo = getCellMergeInfo(table, colSource, rowSource);\n    const targetMergeInfo = getCellMergeInfo(table, colTarget, rowTarget);\n    if (sourceMergeInfo && targetMergeInfo) {\n      sourceRowStart = sourceMergeInfo.start.row;\n      sourceRowEnd = sourceMergeInfo.end.row;\n      targetRowStart = targetMergeInfo.start.row;\n      targetRowEnd = targetMergeInfo.end.row;\n    } else {\n      sourceRowStart = rowSource;\n      sourceRowEnd = rowSource;\n      targetRowStart = rowTarget;\n      targetRowEnd = rowTarget;\n    }\n    sourceColStart = colSource;\n    sourceColEnd = table.colCount - 1;\n    targetColStart = colTarget;\n    targetColEnd = table.colCount - 1;\n  }\n\n  const updateColStart = Math.min(sourceColStart, targetColStart);\n  const updateColEnd = Math.max(sourceColEnd, targetColEnd);\n  const updateRowStart = Math.min(sourceRowStart, targetRowStart);\n  const updateRowEnd = Math.max(sourceRowEnd, targetRowEnd);\n\n  // 更新columnGroup列宽\n  for (let col = updateColStart; col <= updateColEnd; col++) {\n    const columnHeaderGroup = table.scenegraph.getColGroup(col, true);\n    const columnGroup = table.scenegraph.getColGroup(col);\n    if (columnHeaderGroup) {\n      columnHeaderGroup.setAttribute('width', table.getColWidth(col));\n    }\n    if (columnGroup) {\n      columnGroup.setAttribute('width', table.getColWidth(col));\n    }\n  }\n\n  // 更新容器尺寸\n  // scene.updateContainerAttrWidthAndX();\n  scene.updateContainer();\n\n  for (let col = updateColStart; col <= updateColEnd; col++) {\n    // 将该列的chartInstance清除掉\n    const columnGroup = table.scenegraph.getColGroup(col);\n    columnGroup?.setAttribute('chartInstance', undefined);\n    // 更新单元格记录全量属性，不更新column theme\n    for (let row = updateRowStart; row <= updateRowEnd; row++) {\n      scene.updateCellContent(col, row);\n    }\n  }\n}\n\nfunction changeCell(colSource: number, rowSource: number, colTarget: number, rowTarget: number, table: BaseTableAPI) {\n  // 记录基础属性\n  const scene = table.scenegraph;\n  const sourceCellGroup = scene.getCell(colSource, rowSource, true);\n  const targetCellGroup = scene.getCell(colTarget, rowTarget, true);\n  if (sourceCellGroup.role === 'empty' || targetCellGroup.role === 'empty') {\n    return;\n  }\n  const sourceParent = sourceCellGroup.parent as Group;\n  const targetParent = targetCellGroup.parent as Group;\n  const { x: sourceX, y: sourceY } = sourceCellGroup.attribute;\n  const { x: targetX, y: targetY } = targetCellGroup.attribute;\n\n  // 判断merge属性\n  let sourceDeltaCol;\n  let sourceDeltaRow;\n  let targetDeltaCol;\n  let targetDeltaRow;\n  const sourceMergeCol = sourceCellGroup.mergeCol;\n  const sourceMergeRow = sourceCellGroup.mergeRow;\n  const targetMergeCol = targetCellGroup.mergeCol;\n  const targetMergeRow = targetCellGroup.mergeRow;\n  if (typeof sourceMergeCol === 'number' && typeof sourceMergeRow === 'number') {\n    sourceDeltaCol = sourceMergeCol - colSource;\n    sourceDeltaRow = sourceMergeRow - rowSource;\n  }\n  if (typeof targetMergeCol === 'number' && typeof targetMergeRow === 'number') {\n    targetDeltaCol = targetMergeCol - colTarget;\n    targetDeltaRow = targetMergeRow - rowTarget;\n  }\n\n  // 更新位置\n  targetParent.insertAfter(groupForPosition, targetCellGroup);\n  sourceParent.insertAfter(targetCellGroup, sourceCellGroup);\n  targetParent.insertAfter(sourceCellGroup, groupForPosition);\n  targetParent.removeChild(groupForPosition);\n\n  // 更新属性\n  sourceCellGroup.setAttributes({\n    x: targetX,\n    y: targetY\n  });\n  sourceCellGroup.col = colTarget;\n  sourceCellGroup.row = rowTarget;\n\n  targetCellGroup.setAttributes({\n    x: sourceX,\n    y: sourceY\n  });\n  targetCellGroup.col = colSource;\n  targetCellGroup.row = rowSource;\n  if (typeof sourceDeltaCol === 'number' && typeof sourceDeltaRow === 'number') {\n    sourceCellGroup.mergeCol = sourceCellGroup.col + sourceDeltaCol;\n    sourceCellGroup.mergeRow = sourceCellGroup.row + sourceDeltaRow;\n  }\n  if (typeof targetDeltaCol === 'number' && typeof targetDeltaRow === 'number') {\n    targetCellGroup.mergeCol = targetCellGroup.col + targetDeltaCol;\n    targetCellGroup.mergeRow = targetCellGroup.row + targetDeltaRow;\n  }\n}\n"]}

package/cjs/scenegraph/scenegraph.js

@@ -337,8 +337,7 @@ class Scenegraph {
         iconBack && iconBack.setAttribute("visible", !1), icon.attribute.hoverImage && icon.attribute.image !== icon.attribute.originImage && (icon.image = icon.attribute.originImage);
     }
     updateColWidth(col, detaX, skipUpdateContainer) {
-        (0, update_width_1.updateColWidth)(this, col, Math.round(detaX)), skipUpdateContainer || (this.updateContainerAttrWidthAndX(), 
-        this.updateContainer());
+        (0, update_width_1.updateColWidth)(this, col, Math.round(detaX)), skipUpdateContainer || this.updateContainer();
     }
     updateChartSize(col) {
         (0, update_chart_1.updateChartSize)(this, col);
@@ -475,9 +474,9 @@ class Scenegraph {
     }
     afterScenegraphCreated() {
         this.isPivot || this.transpose || this.component.setFrozenColumnShadow(this.table.frozenColCount - 1), 
-        this.table.stateManeger.checkFrozen(), this.updateContainerAttrWidthAndX(), this.updateContainer(), 
-        this.createFrameBorder(), this.updateBorderSizeAndPosition(), this.component.updateScrollBar(), 
-        (0, stick_text_1.handleTextStick)(this.table), this.updateNextFrame();
+        this.table.stateManeger.checkFrozen(), this.updateContainer(), this.createFrameBorder(), 
+        this.updateBorderSizeAndPosition(), this.component.updateScrollBar(), (0, stick_text_1.handleTextStick)(this.table), 
+        this.updateNextFrame();
     }
     dealWidthMode() {
         const table = this.table;
@@ -583,13 +582,16 @@ class Scenegraph {
         (0, move_cell_1.moveHeaderPosition)(colSource, rowSource, colTarget, rowTarget, this.table);
     }
     updateContainerAttrWidthAndX() {
-        const cornerX = (0, update_container_1.updateContainerChildrenX)(this.cornerHeaderGroup), rowHeaderX = (0, 
-        update_container_1.updateContainerChildrenX)(this.rowHeaderGroup), colHeaderX = (0, 
-        update_container_1.updateContainerChildrenX)(this.colHeaderGroup), bodyX = (0, update_container_1.updateContainerChildrenX)(this.bodyGroup), rightX = (0, 
-        update_container_1.updateContainerChildrenX)(this.rightFrozenGroup);
-        (0, update_container_1.updateContainerChildrenX)(this.bottomFrozenGroup), (0, update_container_1.updateContainerChildrenX)(this.leftBottomCornerGroup), 
-        (0, update_container_1.updateContainerChildrenX)(this.rightTopCornerGroup), (0, 
-        update_container_1.updateContainerChildrenX)(this.rightBottomCornerGroup), this.cornerHeaderGroup.setDeltaWidth(cornerX - this.cornerHeaderGroup.attribute.width), 
+        var _a, _b, _c;
+        const cornerX = (0, update_container_1.updateContainerChildrenX)(this.cornerHeaderGroup, 0), rowHeaderX = (0, 
+        update_container_1.updateContainerChildrenX)(this.rowHeaderGroup, 0), colHeaderX = this.colHeaderGroup.hasChildNodes() ? (0, 
+        update_container_1.updateContainerChildrenX)(this.colHeaderGroup, this.colHeaderGroup.firstChild.col > 0 ? this.table.getColsWidth(null !== (_a = this.table.frozenColCount) && void 0 !== _a ? _a : 0, this.colHeaderGroup.firstChild.col - 1) : 0) : 0, bodyX = this.bodyGroup.hasChildNodes() ? (0, 
+        update_container_1.updateContainerChildrenX)(this.bodyGroup, this.bodyGroup.firstChild.col > 0 ? this.table.getColsWidth(null !== (_b = this.table.frozenColCount) && void 0 !== _b ? _b : 0, this.bodyGroup.firstChild.col - 1) : 0) : 0, rightX = (0, 
+        update_container_1.updateContainerChildrenX)(this.rightFrozenGroup, 0);
+        this.bottomFrozenGroup.hasChildNodes() && (0, update_container_1.updateContainerChildrenX)(this.bottomFrozenGroup, this.bottomFrozenGroup.firstChild.col > 0 ? this.table.getColsWidth(null !== (_c = this.table.frozenColCount) && void 0 !== _c ? _c : 0, this.bottomFrozenGroup.firstChild.col - 1) : 0), 
+        (0, update_container_1.updateContainerChildrenX)(this.leftBottomCornerGroup, 0), 
+        (0, update_container_1.updateContainerChildrenX)(this.rightTopCornerGroup, 0), (0, 
+        update_container_1.updateContainerChildrenX)(this.rightBottomCornerGroup, 0), this.cornerHeaderGroup.setDeltaWidth(cornerX - this.cornerHeaderGroup.attribute.width), 
         this.leftBottomCornerGroup.setDeltaWidth(cornerX - this.leftBottomCornerGroup.attribute.width), 
         this.colHeaderGroup.setDeltaWidth(colHeaderX - this.colHeaderGroup.attribute.width), 
         this.rightFrozenGroup.setDeltaWidth(colHeaderX - this.rightFrozenGroup.attribute.width), 
@@ -602,7 +604,7 @@ class Scenegraph {
         this.bottomFrozenGroup.setAttribute("x", this.rowHeaderGroup.attribute.width), this.bodyGroup.setAttribute("x", this.rowHeaderGroup.attribute.width);
     }
     updateContainer() {
-        this.updateTableSize();
+        this.updateContainerAttrWidthAndX(), this.updateTableSize();
         const oldHorizontalBarPos = this.table.stateManeger.scroll.horizontalBarPos, oldVerticalBarPos = this.table.stateManeger.scroll.verticalBarPos;
         this.component.updateScrollBar(), this.table.stateManeger.setScrollLeft(oldHorizontalBarPos), 
         this.table.stateManeger.setScrollTop(oldVerticalBarPos), this.updateNextFrame();