@visactor/vtable 0.12.0-alpha.11 → 0.12.0-alpha.3

package/cjs/scenegraph/hover-state.js

@@ -24,4 +24,4 @@ class HoverState {
 }
 
 exports.HoverState = HoverState;
-//# sourceMappingURL=hover-state.js.map
+//# sourceMappingURL=hover-state.js.map

package/cjs/scenegraph/refresh-node/update-chart.js

@@ -22,7 +22,7 @@ function clearChartCacheImage(scenegraph) {
     for (let c = scenegraph.proxy.colStart; c <= scenegraph.proxy.colEnd; c++) {
         scenegraph.getColGroup(c).getChildren().forEach((cellNode => {
             cellNode.children.forEach((node => {
-                "chart" === node.type && (node.cacheCanvas = null);
+                "chart" === node.type && (node.cacheCanvas = null, node.addUpdateBoundTag());
             }));
         }));
     }

package/cjs/scenegraph/refresh-node/update-chart.js.map

@@ -1 +1 @@
-{"version":3,"sources":["scenegraph/refresh-node/update-chart.ts"],"names":[],"mappings":"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","file":"update-chart.js","sourcesContent":["import { isEqual } from '@visactor/vutils';\nimport type { PivotChart } from '../../PivotChart';\nimport { CartesianAxis } from '../../components/axis/axis';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport type { Chart } from '../graphic/chart';\nimport type { Group } from '../graphic/group';\nimport type { Scenegraph } from '../scenegraph';\nimport type { PivotHeaderLayoutMap } from '../../layout/pivot-header-layout';\n\n/** 供调整列宽后更新chart使用 */\nexport function updateChartSize(scenegraph: Scenegraph, col: number) {\n  // 将调整列宽的后面的面也都一起需要调整viewbox。  TODO：columnResizeType支持后需要根据变化的列去调整，范围可能变多或者变少\n  for (let c = col; c <= scenegraph.proxy.colEnd; c++) {\n    const columnGroup = scenegraph.getColGroup(c);\n    // const chartInstance = (columnGroup.attribute as any)?.chartInstance;\n    // if (chartInstance) {\n    columnGroup.getChildren().forEach((cellNode: Group) => {\n      const width = scenegraph.table.getColWidth(cellNode.col);\n      const height = scenegraph.table.getRowHeight(cellNode.row);\n\n      cellNode.children.forEach((node: Chart) => {\n        if ((node as any).type === 'chart') {\n          // 调试问题使用\n          // if (columnGroup.col === 2) {\n          //   columnGroup.AABBBounds.width();\n          //   node.AABBBounds.width();\n          //   console.log(\n          //     'set viewbox y1',\n          //     Math.ceil(cellNode.globalAABBBounds.y1 + node.attribute.cellPadding[0] + scenegraph.table.scrollTop),\n          //     node.globalAABBBounds.height()\n          //   );\n\n          //   console.log(\n          //     'updateChartSize',\n          //     columnGroup,\n          //     columnGroup.globalAABBBounds.y1,\n          //     cellNode.globalAABBBounds.y1,\n          //     node.globalAABBBounds.y1\n          //   );\n          // }\n\n          node.cacheCanvas = null;\n          node.setAttribute('width', Math.ceil(width - node.attribute.cellPadding[3] - node.attribute.cellPadding[1]));\n          node.setAttribute(\n            'height',\n            Math.ceil(height - node.attribute.cellPadding[0] - node.attribute.cellPadding[2])\n          );\n\n          // node.setAttribute('viewBox', {\n          //   x1: Math.ceil(cellNode.globalAABBBounds.x1 + node.attribute.cellPadding[3] + scenegraph.table.scrollLeft),\n          //   x2: Math.ceil(\n          //     cellNode.globalAABBBounds.x1 + width - node.attribute.cellPadding[1] + scenegraph.table.scrollLeft\n          //   ),\n          //   y1: Math.ceil(cellNode.globalAABBBounds.y1 + node.attribute.cellPadding[0] + scenegraph.table.scrollTop),\n          //   y2: Math.ceil(\n          //     cellNode.globalAABBBounds.y1 + height - node.attribute.cellPadding[2] + scenegraph.table.scrollTop\n          //   )\n          // });\n        }\n      });\n    });\n    // }\n  }\n}\n\n/** 清理所有chart节点的 图表缓存图片 */\nexport function clearChartCacheImage(scenegraph: Scenegraph) {\n  // 将调整列宽的后面的面也都一起需要调整viewbox。  TODO：columnResizeType支持后需要根据变化的列去调整，范围可能变多或者变少\n  for (let c = scenegraph.proxy.colStart; c <= scenegraph.proxy.colEnd; c++) {\n    const columnGroup = scenegraph.getColGroup(c);\n    columnGroup.getChildren().forEach((cellNode: Group) => {\n      cellNode.children.forEach((node: Chart) => {\n        if ((node as any).type === 'chart') {\n          node.cacheCanvas = null;\n          // node.addUpdateBoundTag();\n        }\n      });\n    });\n  }\n}\n\n/** 更新所有的图表chart节点上缓存attribute中的data数据 */\nexport function updateChartData(scenegraph: Scenegraph) {\n  const table = scenegraph.table;\n  // 将调整列宽的后面的面也都一起需要调整viewbox。  TODO：columnResizeType支持后需要根据变化的列去调整，范围可能变多或者变少\n  for (let c = scenegraph.proxy.colStart; c <= scenegraph.proxy.colEnd; c++) {\n    const columnGroup = scenegraph.getColGroup(c);\n    columnGroup.getChildren().forEach((cellNode: Group) => {\n      const col = cellNode.col;\n      const row = cellNode.row;\n      cellNode.children.forEach((node: Chart) => {\n        if ((node as any).type === 'chart') {\n          node.updateData(table.getCellValue(col, row));\n          const newAxes = table.internalProps.layoutMap.getChartAxes(col, row);\n          node.setAttribute('axes', newAxes);\n          const chartSpec = node.attribute.spec;\n          chartSpec.axes = newAxes;\n          node.setAttribute('spec', chartSpec);\n          // node.addUpdateBoundTag();\n        }\n      });\n    });\n  }\n\n  // update left axes\n  updateTableAxes(scenegraph.rowHeaderGroup, scenegraph.table);\n  // update top axes\n  updateTableAxes(scenegraph.colHeaderGroup, scenegraph.table);\n  // update right axes\n  updateTableAxes(scenegraph.rightFrozenGroup, scenegraph.table);\n  // update bottom axes\n  updateTableAxes(scenegraph.bottomFrozenGroup, scenegraph.table);\n}\n/** 组织图表数据状态_selectedDataItemsInChart 更新选中的图表图元状态 */\nexport function updateChartState(scenegraph: Scenegraph, datum: any) {\n  const table = scenegraph.table;\n  if (table.isPivotChart()) {\n    const preSelectItemsCount = (table as PivotChart)._selectedDataItemsInChart.length;\n    if ((datum === null || datum?.length === 0 || Object.keys(datum).length === 0) && preSelectItemsCount === 0) {\n      //避免无效的更新\n      return;\n    }\n    // (table as PivotChart)._selectedDataItemsInChart = [];\n    const newSelectedDataItemsInChart = [];\n    if (Array.isArray(datum)) {\n      datum.forEach((dataItem: any) => {\n        if (dataItem && dataItem.key !== 0 && Object.keys(dataItem).length > 0) {\n          //本以为没有点击到图元上 datum为空 发现是{key:0}或者{}\n          const selectedState = {};\n          for (const itemKey in dataItem) {\n            if (!itemKey.startsWith('VGRAMMAR_') && !itemKey.startsWith('__VCHART')) {\n              selectedState[itemKey] = dataItem[itemKey];\n            }\n          }\n          newSelectedDataItemsInChart.push(selectedState);\n        }\n      });\n    } else if (datum && datum.key !== 0 && Object.keys(datum).length > 0) {\n      //本以为没有点击到图元上 datum为空 发现是{key:0}或者{}\n      const selectedState = {};\n      for (const itemKey in datum) {\n        if (!itemKey.startsWith('VGRAMMAR_') && !itemKey.startsWith('__VCHART')) {\n          selectedState[itemKey] = datum[itemKey];\n        }\n      }\n      newSelectedDataItemsInChart.push(selectedState);\n    }\n    //避免无效的更新\n    if (!isEqual((table as PivotChart)._selectedDataItemsInChart, newSelectedDataItemsInChart)) {\n      (table as PivotChart)._selectedDataItemsInChart = newSelectedDataItemsInChart;\n      (table.internalProps.layoutMap as PivotHeaderLayoutMap).updateDataStateToChartInstance();\n      // 清楚chart缓存图片\n      clearChartCacheImage(scenegraph);\n      table.scenegraph.updateNextFrame();\n    }\n  }\n}\n\n/**\n * @description: update table axis component\n * @param {Group} containerGroup\n * @param {BaseTableAPI} table\n * @return {*}\n */\nfunction updateTableAxes(containerGroup: Group, table: BaseTableAPI) {\n  containerGroup.forEachChildren((column: Group) => {\n    if (column.role === 'column') {\n      column.forEachChildren((cell: Group) => {\n        if (cell.role === 'cell') {\n          let isAxisComponent = false;\n          cell.forEachChildren((mark: Group) => {\n            if (mark.name === 'axis') {\n              isAxisComponent = true;\n              return true;\n            }\n            return false;\n          });\n          if (isAxisComponent) {\n            const axisConfig = table.internalProps.layoutMap.getAxisConfigInPivotChart(cell.col, cell.row);\n            const axis = new CartesianAxis(axisConfig, cell.attribute.width, cell.attribute.height, table);\n            cell.clear();\n            cell.appendChild(axis.component);\n            axis.overlap();\n          }\n        }\n      });\n    }\n  });\n}\n"]}
+{"version":3,"sources":["scenegraph/refresh-node/update-chart.ts"],"names":[],"mappings":"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","file":"update-chart.js","sourcesContent":["import { isEqual } from '@visactor/vutils';\nimport type { PivotChart } from '../../PivotChart';\nimport { CartesianAxis } from '../../components/axis/axis';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport type { Chart } from '../graphic/chart';\nimport type { Group } from '../graphic/group';\nimport type { Scenegraph } from '../scenegraph';\nimport type { PivotHeaderLayoutMap } from '../../layout/pivot-header-layout';\n\n/** 供调整列宽后更新chart使用 */\nexport function updateChartSize(scenegraph: Scenegraph, col: number) {\n  // 将调整列宽的后面的面也都一起需要调整viewbox。  TODO：columnResizeType支持后需要根据变化的列去调整，范围可能变多或者变少\n  for (let c = col; c <= scenegraph.proxy.colEnd; c++) {\n    const columnGroup = scenegraph.getColGroup(c);\n    // const chartInstance = (columnGroup.attribute as any)?.chartInstance;\n    // if (chartInstance) {\n    columnGroup.getChildren().forEach((cellNode: Group) => {\n      const width = scenegraph.table.getColWidth(cellNode.col);\n      const height = scenegraph.table.getRowHeight(cellNode.row);\n\n      cellNode.children.forEach((node: Chart) => {\n        if ((node as any).type === 'chart') {\n          // 调试问题使用\n          // if (columnGroup.col === 2) {\n          //   columnGroup.AABBBounds.width();\n          //   node.AABBBounds.width();\n          //   console.log(\n          //     'set viewbox y1',\n          //     Math.ceil(cellNode.globalAABBBounds.y1 + node.attribute.cellPadding[0] + scenegraph.table.scrollTop),\n          //     node.globalAABBBounds.height()\n          //   );\n\n          //   console.log(\n          //     'updateChartSize',\n          //     columnGroup,\n          //     columnGroup.globalAABBBounds.y1,\n          //     cellNode.globalAABBBounds.y1,\n          //     node.globalAABBBounds.y1\n          //   );\n          // }\n\n          node.cacheCanvas = null;\n          node.setAttribute('width', Math.ceil(width - node.attribute.cellPadding[3] - node.attribute.cellPadding[1]));\n          node.setAttribute(\n            'height',\n            Math.ceil(height - node.attribute.cellPadding[0] - node.attribute.cellPadding[2])\n          );\n\n          // node.setAttribute('viewBox', {\n          //   x1: Math.ceil(cellNode.globalAABBBounds.x1 + node.attribute.cellPadding[3] + scenegraph.table.scrollLeft),\n          //   x2: Math.ceil(\n          //     cellNode.globalAABBBounds.x1 + width - node.attribute.cellPadding[1] + scenegraph.table.scrollLeft\n          //   ),\n          //   y1: Math.ceil(cellNode.globalAABBBounds.y1 + node.attribute.cellPadding[0] + scenegraph.table.scrollTop),\n          //   y2: Math.ceil(\n          //     cellNode.globalAABBBounds.y1 + height - node.attribute.cellPadding[2] + scenegraph.table.scrollTop\n          //   )\n          // });\n        }\n      });\n    });\n    // }\n  }\n}\n\n/** 清理所有chart节点的 图表缓存图片 */\nexport function clearChartCacheImage(scenegraph: Scenegraph) {\n  // 将调整列宽的后面的面也都一起需要调整viewbox。  TODO：columnResizeType支持后需要根据变化的列去调整，范围可能变多或者变少\n  for (let c = scenegraph.proxy.colStart; c <= scenegraph.proxy.colEnd; c++) {\n    const columnGroup = scenegraph.getColGroup(c);\n    columnGroup.getChildren().forEach((cellNode: Group) => {\n      cellNode.children.forEach((node: Chart) => {\n        if ((node as any).type === 'chart') {\n          node.cacheCanvas = null;\n          node.addUpdateBoundTag();\n        }\n      });\n    });\n  }\n}\n\n/** 更新所有的图表chart节点上缓存attribute中的data数据 */\nexport function updateChartData(scenegraph: Scenegraph) {\n  const table = scenegraph.table;\n  // 将调整列宽的后面的面也都一起需要调整viewbox。  TODO：columnResizeType支持后需要根据变化的列去调整，范围可能变多或者变少\n  for (let c = scenegraph.proxy.colStart; c <= scenegraph.proxy.colEnd; c++) {\n    const columnGroup = scenegraph.getColGroup(c);\n    columnGroup.getChildren().forEach((cellNode: Group) => {\n      const col = cellNode.col;\n      const row = cellNode.row;\n      cellNode.children.forEach((node: Chart) => {\n        if ((node as any).type === 'chart') {\n          node.updateData(table.getCellValue(col, row));\n          const newAxes = table.internalProps.layoutMap.getChartAxes(col, row);\n          node.setAttribute('axes', newAxes);\n          const chartSpec = node.attribute.spec;\n          chartSpec.axes = newAxes;\n          node.setAttribute('spec', chartSpec);\n          // node.addUpdateBoundTag();\n        }\n      });\n    });\n  }\n\n  // update left axes\n  updateTableAxes(scenegraph.rowHeaderGroup, scenegraph.table);\n  // update top axes\n  updateTableAxes(scenegraph.colHeaderGroup, scenegraph.table);\n  // update right axes\n  updateTableAxes(scenegraph.rightFrozenGroup, scenegraph.table);\n  // update bottom axes\n  updateTableAxes(scenegraph.bottomFrozenGroup, scenegraph.table);\n}\n/** 组织图表数据状态_selectedDataItemsInChart 更新选中的图表图元状态 */\nexport function updateChartState(scenegraph: Scenegraph, datum: any) {\n  const table = scenegraph.table;\n  if (table.isPivotChart()) {\n    const preSelectItemsCount = (table as PivotChart)._selectedDataItemsInChart.length;\n    if ((datum === null || datum?.length === 0 || Object.keys(datum).length === 0) && preSelectItemsCount === 0) {\n      //避免无效的更新\n      return;\n    }\n    // (table as PivotChart)._selectedDataItemsInChart = [];\n    const newSelectedDataItemsInChart = [];\n    if (Array.isArray(datum)) {\n      datum.forEach((dataItem: any) => {\n        if (dataItem && dataItem.key !== 0 && Object.keys(dataItem).length > 0) {\n          //本以为没有点击到图元上 datum为空 发现是{key:0}或者{}\n          const selectedState = {};\n          for (const itemKey in dataItem) {\n            if (!itemKey.startsWith('VGRAMMAR_') && !itemKey.startsWith('__VCHART')) {\n              selectedState[itemKey] = dataItem[itemKey];\n            }\n          }\n          newSelectedDataItemsInChart.push(selectedState);\n        }\n      });\n    } else if (datum && datum.key !== 0 && Object.keys(datum).length > 0) {\n      //本以为没有点击到图元上 datum为空 发现是{key:0}或者{}\n      const selectedState = {};\n      for (const itemKey in datum) {\n        if (!itemKey.startsWith('VGRAMMAR_') && !itemKey.startsWith('__VCHART')) {\n          selectedState[itemKey] = datum[itemKey];\n        }\n      }\n      newSelectedDataItemsInChart.push(selectedState);\n    }\n    //避免无效的更新\n    if (!isEqual((table as PivotChart)._selectedDataItemsInChart, newSelectedDataItemsInChart)) {\n      (table as PivotChart)._selectedDataItemsInChart = newSelectedDataItemsInChart;\n      (table.internalProps.layoutMap as PivotHeaderLayoutMap).updateDataStateToChartInstance();\n      // 清楚chart缓存图片\n      clearChartCacheImage(scenegraph);\n      table.scenegraph.updateNextFrame();\n    }\n  }\n}\n\n/**\n * @description: update table axis component\n * @param {Group} containerGroup\n * @param {BaseTableAPI} table\n * @return {*}\n */\nfunction updateTableAxes(containerGroup: Group, table: BaseTableAPI) {\n  containerGroup.forEachChildren((column: Group) => {\n    if (column.role === 'column') {\n      column.forEachChildren((cell: Group) => {\n        if (cell.role === 'cell') {\n          let isAxisComponent = false;\n          cell.forEachChildren((mark: Group) => {\n            if (mark.name === 'axis') {\n              isAxisComponent = true;\n              return true;\n            }\n            return false;\n          });\n          if (isAxisComponent) {\n            const axisConfig = table.internalProps.layoutMap.getAxisConfigInPivotChart(cell.col, cell.row);\n            const axis = new CartesianAxis(axisConfig, cell.attribute.width, cell.attribute.height, table);\n            cell.clear();\n            cell.appendChild(axis.component);\n            axis.overlap();\n          }\n        }\n      });\n    }\n  });\n}\n"]}

package/cjs/scenegraph/scenegraph.js

@@ -316,10 +316,10 @@ class Scenegraph {
                 content: icon.tooltip.title,
                 referencePosition: {
                     rect: {
-                        left: left - this.table.tableX,
-                        right: right - this.table.tableX,
-                        top: top - this.table.tableY,
-                        bottom: bottom - this.table.tableY,
+                        left: left,
+                        right: right,
+                        top: top,
+                        bottom: bottom,
                         width: icon.globalAABBBounds.width(),
                         height: icon.globalAABBBounds.height()
                     },
@@ -723,5 +723,5 @@ function hideIcon(scene, cellGroup, visibleTime) {
     }));
 }
 
-exports.Scenegraph = Scenegraph;
 //# sourceMappingURL=scenegraph.js.map
+exports.Scenegraph = Scenegraph;