@visactor/vtable 0.18.0-alpha.0 → 0.18.0-alpha.2

package/cjs/state/select/update-position.js

@@ -7,9 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 const ts_types_1 = require("../../ts-types");
 
 function updateSelectPosition(state, col, row, isShift, isCtrl, isSelectAll) {
+    var _a;
     const {table: table, interactionState: interactionState} = state, {scenegraph: scenegraph} = table, {highlightScope: highlightScope, disableHeader: disableHeader, cellPos: cellPos} = state.select;
     if ((disableHeader && table.isHeader(col, row) || "none" === highlightScope) && (col = -1, 
-    row = -1), -1 !== col && -1 !== row && state.select.ranges.length > 0) if (interactionState === ts_types_1.InteractionState.grabing) {
+    row = -1), -1 !== col && -1 !== row) if (interactionState === ts_types_1.InteractionState.grabing && state.select.ranges.length > 0) {
         const currentRange = state.select.ranges[state.select.ranges.length - 1];
         col > currentRange.start.col && col > currentRange.end.col && table._makeVisibleCell(col + 1, row), 
         row > currentRange.start.row && row > currentRange.end.row && table._makeVisibleCell(col, row + 1), 
@@ -29,80 +30,74 @@ function updateSelectPosition(state, col, row, isShift, isCtrl, isSelectAll) {
         });
         const currentRange = state.select.ranges[state.select.ranges.length - 1];
         scenegraph.updateCellSelectBorder(currentRange.start.col, currentRange.start.row, currentRange.end.col, currentRange.end.row);
-    } else if (-1 === cellPos.col || -1 === cellPos.row || -1 !== col && -1 !== row) {
-        if (interactionState === ts_types_1.InteractionState.default) {
+    } else if (-1 === cellPos.col || -1 === cellPos.row || -1 !== col && -1 !== row) if (interactionState !== ts_types_1.InteractionState.default || table.stateManager.isResizeCol()) {
+        if (interactionState === ts_types_1.InteractionState.grabing && !table.stateManager.isResizeCol()) {
+            -1 === cellPos.col && (cellPos.col = col), -1 === cellPos.row && (cellPos.row = row);
             const currentRange = state.select.ranges[state.select.ranges.length - 1];
-            if (isShift && currentRange) {
-                if ("cell" !== state.select.headerSelectMode && table.isColumnHeader(col, row)) {
-                    const startCol = Math.min(currentRange.start.col, currentRange.end.col, col), endCol = Math.max(currentRange.start.col, currentRange.end.col, col), startRow = Math.min(currentRange.start.row, currentRange.end.row, row), endRow = table.rowCount - 1;
-                    currentRange.start = {
-                        col: startCol,
-                        row: startRow
-                    }, currentRange.end = {
-                        col: endCol,
-                        row: endRow
-                    };
-                } else if ("cell" !== state.select.headerSelectMode && table.isRowHeader(col, row)) {
-                    const startCol = Math.min(currentRange.start.col, currentRange.end.col, col), endCol = table.colCount - 1, startRow = Math.min(currentRange.start.row, currentRange.end.row, row), endRow = Math.max(currentRange.start.row, currentRange.end.row, row);
-                    currentRange.start = {
-                        col: startCol,
-                        row: startRow
-                    }, currentRange.end = {
-                        col: endCol,
-                        row: endRow
-                    };
-                } else currentRange.end = {
-                    col: col,
-                    row: row
+            currentRange && (currentRange.end = {
+                col: col,
+                row: row
+            }), cellPos.col = col, cellPos.row = row, currentRange && scenegraph.updateCellSelectBorder(currentRange.start.col, currentRange.start.row, col, row);
+        }
+    } else {
+        const currentRange = state.select.ranges[state.select.ranges.length - 1];
+        if (isShift && currentRange) {
+            if ("cell" !== state.select.headerSelectMode && table.isColumnHeader(col, row)) {
+                const startCol = Math.min(currentRange.start.col, currentRange.end.col, col), endCol = Math.max(currentRange.start.col, currentRange.end.col, col), startRow = Math.min(currentRange.start.row, currentRange.end.row, row), endRow = table.rowCount - 1;
+                currentRange.start = {
+                    col: startCol,
+                    row: startRow
+                }, currentRange.end = {
+                    col: endCol,
+                    row: endRow
                 };
-                scenegraph.deleteLastSelectedRangeComponents(), scenegraph.updateCellSelectBorder(currentRange.start.col, currentRange.start.row, currentRange.end.col, currentRange.end.row);
-            } else {
-                if (-1 === cellPos.col || -1 === cellPos.row || isCtrl || (state.select.ranges = [], 
-                scenegraph.deleteAllSelectBorder()), "cell" !== state.select.headerSelectMode && table.isColumnHeader(col, row)) {
-                    const cellRange = table.getCellRange(col, row);
-                    state.select.ranges.push({
-                        start: {
-                            col: cellRange.start.col,
-                            row: row
-                        },
-                        end: {
-                            col: cellRange.end.col,
-                            row: table.rowCount - 1
-                        }
-                    });
-                } else if ("cell" !== state.select.headerSelectMode && table.isRowHeader(col, row)) {
-                    const cellRange = table.getCellRange(col, row);
-                    state.select.ranges.push({
-                        start: {
-                            col: col,
-                            row: cellRange.start.row
-                        },
-                        end: {
-                            col: table.colCount - 1,
-                            row: cellRange.end.row
-                        }
-                    });
-                } else state.select.ranges.push({
+            } else if ("cell" !== state.select.headerSelectMode && table.isRowHeader(col, row)) {
+                const startCol = Math.min(currentRange.start.col, currentRange.end.col, col), endCol = table.colCount - 1, startRow = Math.min(currentRange.start.row, currentRange.end.row, row), endRow = Math.max(currentRange.start.row, currentRange.end.row, row);
+                currentRange.start = {
+                    col: startCol,
+                    row: startRow
+                }, currentRange.end = {
+                    col: endCol,
+                    row: endRow
+                };
+            } else currentRange.end = {
+                col: col,
+                row: row
+            };
+            scenegraph.deleteLastSelectedRangeComponents(), scenegraph.updateCellSelectBorder(currentRange.start.col, currentRange.start.row, currentRange.end.col, currentRange.end.row);
+        } else {
+            if (-1 === cellPos.col || -1 === cellPos.row || isCtrl || (state.select.ranges = [], 
+            scenegraph.deleteAllSelectBorder()), "cell" !== state.select.headerSelectMode && table.isColumnHeader(col, row)) {
+                const cellRange = table.getCellRange(col, row);
+                state.select.ranges.push({
                     start: {
-                        col: col,
+                        col: cellRange.start.col,
                         row: row
                     },
                     end: {
+                        col: cellRange.end.col,
+                        row: table.rowCount - 1
+                    }
+                });
+            } else if ("cell" !== state.select.headerSelectMode && table.isRowHeader(col, row)) {
+                const cellRange = table.getCellRange(col, row);
+                state.select.ranges.push({
+                    start: {
                         col: col,
-                        row: row
+                        row: cellRange.start.row
+                    },
+                    end: {
+                        col: table.colCount - 1,
+                        row: cellRange.end.row
                     }
                 });
-                cellPos.col = col, cellPos.row = row;
-                const currentRange = state.select.ranges[state.select.ranges.length - 1];
-                scenegraph.updateCellSelectBorder(currentRange.start.col, currentRange.start.row, currentRange.end.col, currentRange.end.row);
+            } else if (col >= 0 && row >= 0) {
+                const cellRange = table.getCellRange(col, row);
+                state.select.ranges.push(cellRange);
             }
-        } else if (interactionState === ts_types_1.InteractionState.grabing) {
-            -1 === cellPos.col && (cellPos.col = col), -1 === cellPos.row && (cellPos.row = row);
-            const currentRange = state.select.ranges[state.select.ranges.length - 1];
-            currentRange.end = {
-                col: col,
-                row: row
-            }, cellPos.col = col, cellPos.row = row, scenegraph.updateCellSelectBorder(currentRange.start.col, currentRange.start.row, col, row);
+            cellPos.col = col, cellPos.row = row;
+            const currentRange = null === (_a = state.select.ranges) || void 0 === _a ? void 0 : _a[state.select.ranges.length - 1];
+            currentRange && scenegraph.updateCellSelectBorder(currentRange.start.col, currentRange.start.row, currentRange.end.col, currentRange.end.row);
         }
     } else cellPos.col = -1, cellPos.row = -1, state.select.ranges = [], scenegraph.deleteAllSelectBorder();
     scenegraph.updateNextFrame();

package/cjs/state/select/update-position.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/state/select/update-position.ts"],"names":[],"mappings":"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","file":"update-position.js","sourcesContent":["import type { Scenegraph } from '../../scenegraph/scenegraph';\nimport { InteractionState } from '../../ts-types';\nimport type { StateManager } from '../state';\n/**\n * @description: 更新select位置\n * @param {StateManager} state\n * @param {number} col\n * @param {number} row\n * @return {*}\n */\nexport function updateSelectPosition(\n  state: StateManager,\n  col: number,\n  row: number,\n  isShift: boolean,\n  isCtrl: boolean,\n  isSelectAll: boolean\n) {\n  const { table, interactionState } = state;\n  const { scenegraph } = table;\n  const { highlightScope, disableHeader, cellPos } = state.select;\n  if ((disableHeader && table.isHeader(col, row)) || highlightScope === 'none') {\n    col = -1;\n    row = -1;\n  }\n  // 如果这里不继续进行 会造成问题drag select first cell seleted repeatly https://github.com/VisActor/VTable/issues/611\n  // if (cellPos.col === col && cellPos.row === row) {\n  //   return;\n  // }\n  /** 完整显示选中单元格 自动滚动效果*/\n  if (col !== -1 && row !== -1 && state.select.ranges.length > 0) {\n    if (interactionState === InteractionState.grabing) {\n      const currentRange = state.select.ranges[state.select.ranges.length - 1];\n      if (col > currentRange.start.col && col > currentRange.end.col) {\n        //向右扩展\n        table._makeVisibleCell(col + 1, row);\n      }\n      if (row > currentRange.start.row && row > currentRange.end.row) {\n        //向右扩展\n        table._makeVisibleCell(col, row + 1);\n      }\n      if (col < currentRange.start.col && col < currentRange.end.col) {\n        //向右扩展\n        table._makeVisibleCell(col - 1, row);\n      }\n      if (row < currentRange.start.row && row < currentRange.end.row) {\n        //向右扩展\n        table._makeVisibleCell(col, row - 1);\n      }\n    } else {\n      table._makeVisibleCell(col, row);\n    }\n  }\n  if (isSelectAll) {\n    state.select.ranges = [];\n    scenegraph.deleteAllSelectBorder();\n    state.select.ranges.push({\n      start: { col: 0, row: 0 },\n      end: { col: table.colCount - 1, row: table.rowCount - 1 }\n    });\n    const currentRange = state.select.ranges[state.select.ranges.length - 1];\n    scenegraph.updateCellSelectBorder(\n      currentRange.start.col,\n      currentRange.start.row,\n      currentRange.end.col,\n      currentRange.end.row\n    );\n  } else if (cellPos.col !== -1 && cellPos.row !== -1 && (col === -1 || row === -1)) {\n    // 输入-1清空选中状态\n    // clearMultiSelect(scenegraph, ranges, highlightScope, singleStyle);\n    cellPos.col = -1;\n    cellPos.row = -1;\n    state.select.ranges = [];\n    // 隐藏select border\n    scenegraph.deleteAllSelectBorder();\n  } else if (interactionState === InteractionState.default) {\n    const currentRange = state.select.ranges[state.select.ranges.length - 1];\n    if (isShift && currentRange) {\n      if (state.select.headerSelectMode !== 'cell' && table.isColumnHeader(col, row)) {\n        const startCol = Math.min(currentRange.start.col, currentRange.end.col, col);\n        const endCol = Math.max(currentRange.start.col, currentRange.end.col, col);\n        const startRow = Math.min(currentRange.start.row, currentRange.end.row, row);\n        const endRow = table.rowCount - 1;\n\n        currentRange.start = { col: startCol, row: startRow };\n        currentRange.end = { col: endCol, row: endRow };\n      } else if (state.select.headerSelectMode !== 'cell' && table.isRowHeader(col, row)) {\n        const startCol = Math.min(currentRange.start.col, currentRange.end.col, col);\n        const endCol = table.colCount - 1;\n        const startRow = Math.min(currentRange.start.row, currentRange.end.row, row);\n        const endRow = Math.max(currentRange.start.row, currentRange.end.row, row);\n\n        currentRange.start = { col: startCol, row: startRow };\n        currentRange.end = { col: endCol, row: endRow };\n      } else {\n        currentRange.end = { col, row };\n      }\n      scenegraph.deleteLastSelectedRangeComponents();\n      scenegraph.updateCellSelectBorder(\n        currentRange.start.col,\n        currentRange.start.row,\n        currentRange.end.col,\n        currentRange.end.row\n      );\n      // } else if (isCtrl) {\n      //   cellPos.col = col;\n      //   cellPos.row = row;\n      //   state.select.ranges.push({\n      //     start: { col: cellPos.col, row: cellPos.row },\n      //     end: { col: cellPos.col, row: cellPos.row },\n      //   });\n      //   // 单选或多选的开始，只选中第一个单元格\n      //   // updateCellSelect(scenegraph, col, row, ranges, highlightScope, singleStyle);\n      //   scenegraph.setCellNormalStyle(col, row);\n      //   // 更新select border\n      //   // calculateAndUpdateMultiSelectBorder(scenegraph, col, row, col, row, state.select.ranges);\n      //   // 更新select border\n      //   scenegraph.updateCellSelectBorder(cellPos.col, cellPos.row, cellPos.col, cellPos.row);\n    } else {\n      // 单选或多选开始\n      if (cellPos.col !== -1 && cellPos.row !== -1 && !isCtrl) {\n        state.select.ranges = [];\n        scenegraph.deleteAllSelectBorder();\n      }\n      if (state.select.headerSelectMode !== 'cell' && table.isColumnHeader(col, row)) {\n        const cellRange = table.getCellRange(col, row);\n        state.select.ranges.push({\n          start: { col: cellRange.start.col, row },\n          end: { col: cellRange.end.col, row: table.rowCount - 1 }\n        });\n      } else if (state.select.headerSelectMode !== 'cell' && table.isRowHeader(col, row)) {\n        const cellRange = table.getCellRange(col, row);\n        state.select.ranges.push({\n          start: { col, row: cellRange.start.row },\n          end: { col: table.colCount - 1, row: cellRange.end.row }\n        });\n      } else {\n        state.select.ranges.push({\n          start: { col, row },\n          end: { col, row }\n        });\n      }\n      cellPos.col = col;\n      cellPos.row = row;\n      // scenegraph.setCellNormalStyle(col, row);\n      const currentRange = state.select.ranges[state.select.ranges.length - 1];\n      scenegraph.updateCellSelectBorder(\n        currentRange.start.col,\n        currentRange.start.row,\n        currentRange.end.col,\n        currentRange.end.row\n      );\n    }\n  } else if (interactionState === InteractionState.grabing) {\n    // 可能有cellPosStart从-1开始grabing的情况\n    if (cellPos.col === -1) {\n      cellPos.col = col;\n    }\n    if (cellPos.row === -1) {\n      cellPos.row = row;\n    }\n    const currentRange = state.select.ranges[state.select.ranges.length - 1];\n    currentRange.end = {\n      col,\n      row\n    };\n    cellPos.col = col;\n    cellPos.row = row;\n    scenegraph.updateCellSelectBorder(currentRange.start.col, currentRange.start.row, col, row);\n  }\n  scenegraph.updateNextFrame();\n}\nexport function selectEnd(scenegraph: Scenegraph) {\n  scenegraph.moveSelectingRangeComponentsToSelectedRangeComponents();\n}\n"]}
+{"version":3,"sources":["../src/state/select/update-position.ts"],"names":[],"mappings":"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","file":"update-position.js","sourcesContent":["import type { Scenegraph } from '../../scenegraph/scenegraph';\nimport { InteractionState } from '../../ts-types';\nimport type { StateManager } from '../state';\n/**\n * @description: 更新select位置\n * @param {StateManager} state\n * @param {number} col\n * @param {number} row\n * @return {*}\n */\nexport function updateSelectPosition(\n  state: StateManager,\n  col: number,\n  row: number,\n  isShift: boolean,\n  isCtrl: boolean,\n  isSelectAll: boolean\n) {\n  const { table, interactionState } = state;\n  const { scenegraph } = table;\n  const { highlightScope, disableHeader, cellPos } = state.select;\n  if ((disableHeader && table.isHeader(col, row)) || highlightScope === 'none') {\n    col = -1;\n    row = -1;\n  }\n  // 如果这里不继续进行 会造成问题drag select first cell seleted repeatly https://github.com/VisActor/VTable/issues/611\n  // if (cellPos.col === col && cellPos.row === row) {\n  //   return;\n  // }\n  /** 完整显示选中单元格 自动滚动效果*/\n  if (col !== -1 && row !== -1) {\n    if (interactionState === InteractionState.grabing && state.select.ranges.length > 0) {\n      const currentRange = state.select.ranges[state.select.ranges.length - 1];\n      if (col > currentRange.start.col && col > currentRange.end.col) {\n        //向右扩展\n        table._makeVisibleCell(col + 1, row);\n      }\n      if (row > currentRange.start.row && row > currentRange.end.row) {\n        //向右扩展\n        table._makeVisibleCell(col, row + 1);\n      }\n      if (col < currentRange.start.col && col < currentRange.end.col) {\n        //向右扩展\n        table._makeVisibleCell(col - 1, row);\n      }\n      if (row < currentRange.start.row && row < currentRange.end.row) {\n        //向右扩展\n        table._makeVisibleCell(col, row - 1);\n      }\n    } else {\n      table._makeVisibleCell(col, row);\n    }\n  }\n  if (isSelectAll) {\n    state.select.ranges = [];\n    scenegraph.deleteAllSelectBorder();\n    state.select.ranges.push({\n      start: { col: 0, row: 0 },\n      end: { col: table.colCount - 1, row: table.rowCount - 1 }\n    });\n    const currentRange = state.select.ranges[state.select.ranges.length - 1];\n    scenegraph.updateCellSelectBorder(\n      currentRange.start.col,\n      currentRange.start.row,\n      currentRange.end.col,\n      currentRange.end.row\n    );\n  } else if (cellPos.col !== -1 && cellPos.row !== -1 && (col === -1 || row === -1)) {\n    // 输入-1清空选中状态\n    // clearMultiSelect(scenegraph, ranges, highlightScope, singleStyle);\n    cellPos.col = -1;\n    cellPos.row = -1;\n    state.select.ranges = [];\n    // 隐藏select border\n    scenegraph.deleteAllSelectBorder();\n  } else if (interactionState === InteractionState.default && !table.stateManager.isResizeCol()) {\n    const currentRange = state.select.ranges[state.select.ranges.length - 1];\n    if (isShift && currentRange) {\n      if (state.select.headerSelectMode !== 'cell' && table.isColumnHeader(col, row)) {\n        const startCol = Math.min(currentRange.start.col, currentRange.end.col, col);\n        const endCol = Math.max(currentRange.start.col, currentRange.end.col, col);\n        const startRow = Math.min(currentRange.start.row, currentRange.end.row, row);\n        const endRow = table.rowCount - 1;\n\n        currentRange.start = { col: startCol, row: startRow };\n        currentRange.end = { col: endCol, row: endRow };\n      } else if (state.select.headerSelectMode !== 'cell' && table.isRowHeader(col, row)) {\n        const startCol = Math.min(currentRange.start.col, currentRange.end.col, col);\n        const endCol = table.colCount - 1;\n        const startRow = Math.min(currentRange.start.row, currentRange.end.row, row);\n        const endRow = Math.max(currentRange.start.row, currentRange.end.row, row);\n\n        currentRange.start = { col: startCol, row: startRow };\n        currentRange.end = { col: endCol, row: endRow };\n      } else {\n        currentRange.end = { col, row };\n      }\n      scenegraph.deleteLastSelectedRangeComponents();\n      scenegraph.updateCellSelectBorder(\n        currentRange.start.col,\n        currentRange.start.row,\n        currentRange.end.col,\n        currentRange.end.row\n      );\n      // } else if (isCtrl) {\n      //   cellPos.col = col;\n      //   cellPos.row = row;\n      //   state.select.ranges.push({\n      //     start: { col: cellPos.col, row: cellPos.row },\n      //     end: { col: cellPos.col, row: cellPos.row },\n      //   });\n      //   // 单选或多选的开始，只选中第一个单元格\n      //   // updateCellSelect(scenegraph, col, row, ranges, highlightScope, singleStyle);\n      //   scenegraph.setCellNormalStyle(col, row);\n      //   // 更新select border\n      //   // calculateAndUpdateMultiSelectBorder(scenegraph, col, row, col, row, state.select.ranges);\n      //   // 更新select border\n      //   scenegraph.updateCellSelectBorder(cellPos.col, cellPos.row, cellPos.col, cellPos.row);\n    } else {\n      // 单选或多选开始\n      if (cellPos.col !== -1 && cellPos.row !== -1 && !isCtrl) {\n        state.select.ranges = [];\n        scenegraph.deleteAllSelectBorder();\n      }\n      if (state.select.headerSelectMode !== 'cell' && table.isColumnHeader(col, row)) {\n        const cellRange = table.getCellRange(col, row);\n        state.select.ranges.push({\n          start: { col: cellRange.start.col, row },\n          end: { col: cellRange.end.col, row: table.rowCount - 1 }\n        });\n      } else if (state.select.headerSelectMode !== 'cell' && table.isRowHeader(col, row)) {\n        const cellRange = table.getCellRange(col, row);\n        state.select.ranges.push({\n          start: { col, row: cellRange.start.row },\n          end: { col: table.colCount - 1, row: cellRange.end.row }\n        });\n      } else if (col >= 0 && row >= 0) {\n        const cellRange = table.getCellRange(col, row);\n        state.select.ranges.push(cellRange);\n      }\n      cellPos.col = col;\n      cellPos.row = row;\n      // scenegraph.setCellNormalStyle(col, row);\n      const currentRange = state.select.ranges?.[state.select.ranges.length - 1];\n      currentRange &&\n        scenegraph.updateCellSelectBorder(\n          currentRange.start.col,\n          currentRange.start.row,\n          currentRange.end.col,\n          currentRange.end.row\n        );\n    }\n  } else if (interactionState === InteractionState.grabing && !table.stateManager.isResizeCol()) {\n    // 可能有cellPosStart从-1开始grabing的情况\n    if (cellPos.col === -1) {\n      cellPos.col = col;\n    }\n    if (cellPos.row === -1) {\n      cellPos.row = row;\n    }\n    const currentRange = state.select.ranges[state.select.ranges.length - 1];\n    currentRange &&\n      (currentRange.end = {\n        col,\n        row\n      });\n    cellPos.col = col;\n    cellPos.row = row;\n    currentRange && scenegraph.updateCellSelectBorder(currentRange.start.col, currentRange.start.row, col, row);\n  }\n  scenegraph.updateNextFrame();\n}\nexport function selectEnd(scenegraph: Scenegraph) {\n  scenegraph.moveSelectingRangeComponentsToSelectedRangeComponents();\n}\n"]}

package/cjs/state/spark-line/index.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.updateChartHover = exports.clearChartHover = void 0;
 
-const vrender_1 = require("@visactor/vrender"), TABLE_EVENT_TYPE_1 = require("../../core/TABLE_EVENT_TYPE");
+const vrender_1 = require("./../../vrender"), TABLE_EVENT_TYPE_1 = require("../../core/TABLE_EVENT_TYPE");
 
 function clearChartHover(col, row, table) {
     const sparkline = table.scenegraph.getCell(col, row).getChildByName("sparkline"), highlightLine = null == sparkline ? void 0 : sparkline.getChildByName("highlight-line"), highlightSymbol = null == sparkline ? void 0 : sparkline.getChildByName("highlight-symbol");
@@ -34,18 +34,22 @@ function updateChartHover(col, row, x, y, table) {
         }, defined)) {
             const highlightLine = sparkline.getChildByName("highlight-line");
             if (highlightLine) highlightLine.setAttributes({
-                x: pointX,
+                points: [ {
+                    x: pointX,
+                    y: max
+                }, {
+                    x: pointX,
+                    y: min
+                } ],
                 visible: !0,
                 pickable: !0
             }); else {
                 const highlightLine = (0, vrender_1.createLine)({
-                    x: pointX,
-                    y: 0,
                     points: [ {
-                        x: 0,
+                        x: pointX,
                         y: max
                     }, {
-                        x: 0,
+                        x: pointX,
                         y: min
                     } ],
                     lineWidth: null === (_a = line.hover) || void 0 === _a ? void 0 : _a.strokeWidth,

package/cjs/state/spark-line/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/state/spark-line/index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["import { createLine, createSymbol } from '@visactor/vrender';\nimport { TABLE_EVENT_TYPE } from '../../core/TABLE_EVENT_TYPE';\nimport type { MousePointerSparklineEvent } from '../../ts-types';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\n\nexport function clearChartHover(col: number, row: number, table: BaseTableAPI) {\n  const cellGroup = table.scenegraph.getCell(col, row);\n  const sparkline = cellGroup.getChildByName('sparkline');\n  const highlightLine = sparkline?.getChildByName('highlight-line');\n  const highlightSymbol = sparkline?.getChildByName('highlight-symbol');\n  if (highlightLine) {\n    highlightLine.setAttributes({\n      visible: false,\n      pickable: false\n    });\n  }\n  if (highlightSymbol) {\n    highlightSymbol.setAttributes({\n      visible: false,\n      pickable: false\n    });\n  }\n\n  table.scenegraph.updateNextFrame();\n}\n\nexport function updateChartHover(col: number, row: number, x: number, y: number, table: BaseTableAPI): boolean {\n  const cellGroup = table.scenegraph.getCell(col, row);\n  const sparkline = cellGroup.getChildByName('sparkline');\n  const line = sparkline?.getChildByName('sparkline-line');\n  const symbol = sparkline?.getChildByName('sparkline-symbol-group');\n  if (!line) {\n    return false;\n  }\n  const bandwidth = (line as any).bandwidth;\n  const min = (line as any).min;\n  const max = (line as any).max;\n  const points = line.attribute.points;\n  x = x - sparkline.globalAABBBounds.x1;\n  y = y - sparkline.globalAABBBounds.y1;\n\n  let chartPoint;\n  for (let i = 0; i < points.length; i++) {\n    const { x: pointX, y: pointY, defined, rawData } = points[i];\n\n    if (Math.abs(x - pointX) < bandwidth / 2) {\n      chartPoint = {\n        point: points[i],\n        points,\n        pointsBandWidth: bandwidth,\n        pointData: rawData\n      };\n      if (defined) {\n        // 添加highlight line\n        const highlightLine = sparkline.getChildByName('highlight-line');\n        if (highlightLine) {\n          highlightLine.setAttributes({\n            x: pointX,\n            visible: true,\n            pickable: true\n          });\n        } else {\n          const highlightLine = createLine({\n            x: pointX,\n            y: 0,\n            points: [\n              { x: 0, y: max },\n              { x: 0, y: min }\n            ],\n            lineWidth: line.hover?.strokeWidth,\n            stroke: line.hover?.stroke\n          });\n          highlightLine.name = 'highlight-line';\n          sparkline.addChild(highlightLine);\n        }\n\n        // 添加highlight symbol\n        const highlightSymbol = sparkline.getChildByName('highlight-symbol');\n        if (highlightSymbol) {\n          highlightSymbol.setAttributes({\n            x: pointX,\n            y: pointY,\n            visible: true,\n            pickable: true\n          });\n        } else {\n          const highlightSymbol = createSymbol({\n            x: pointX,\n            y: pointY,\n            stroke: symbol.hover.stroke,\n            lineWidth: symbol.hover.strokeWidth,\n            fill: symbol.hover.fill,\n            size: symbol.hover.size * 2, // 之前配置的是圆半径\n            symbolType: 'circle'\n          });\n          highlightSymbol.name = 'highlight-symbol';\n          sparkline.addChild(highlightSymbol);\n        }\n        break;\n      }\n    }\n  }\n  table.scenegraph.updateNextFrame();\n\n  if (chartPoint) {\n    const eventInfo: Omit<MousePointerSparklineEvent, 'target'> = {\n      col,\n      row,\n      field: table.getHeaderField(col, row),\n      value: table.getCellValue(col, row),\n      dataValue: table.getCellOriginValue(col, row),\n      cellHeaderPaths: table.internalProps.layoutMap.getCellHeaderPaths(col, row),\n      title: table.getBodyColumnDefine(col, row).title,\n      cellRange: table.getCellRelativeRect(col, row),\n      sparkline: {\n        pointData: chartPoint.pointData\n      },\n      scaleRatio: table.canvas.getBoundingClientRect().width / table.canvas.offsetWidth\n    };\n    table.fireListeners(TABLE_EVENT_TYPE.MOUSEOVER_CHART_SYMBOL, eventInfo as MousePointerSparklineEvent);\n  }\n  return true;\n}\n"]}
+{"version":3,"sources":["../src/state/spark-line/index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["import { createLine, createSymbol } from './../../vrender';\nimport { TABLE_EVENT_TYPE } from '../../core/TABLE_EVENT_TYPE';\nimport type { MousePointerSparklineEvent } from '../../ts-types';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\n\nexport function clearChartHover(col: number, row: number, table: BaseTableAPI) {\n  const cellGroup = table.scenegraph.getCell(col, row);\n  const sparkline = cellGroup.getChildByName('sparkline');\n  const highlightLine = sparkline?.getChildByName('highlight-line');\n  const highlightSymbol = sparkline?.getChildByName('highlight-symbol');\n  if (highlightLine) {\n    highlightLine.setAttributes({\n      visible: false,\n      pickable: false\n    });\n  }\n  if (highlightSymbol) {\n    highlightSymbol.setAttributes({\n      visible: false,\n      pickable: false\n    });\n  }\n\n  table.scenegraph.updateNextFrame();\n}\n\nexport function updateChartHover(col: number, row: number, x: number, y: number, table: BaseTableAPI): boolean {\n  const cellGroup = table.scenegraph.getCell(col, row);\n  const sparkline = cellGroup.getChildByName('sparkline');\n  const line = sparkline?.getChildByName('sparkline-line');\n  const symbol = sparkline?.getChildByName('sparkline-symbol-group');\n  if (!line) {\n    return false;\n  }\n  const bandwidth = (line as any).bandwidth;\n  const min = (line as any).min;\n  const max = (line as any).max;\n  const points = line.attribute.points;\n  x = x - sparkline.globalAABBBounds.x1;\n  y = y - sparkline.globalAABBBounds.y1;\n\n  let chartPoint;\n  for (let i = 0; i < points.length; i++) {\n    const { x: pointX, y: pointY, defined, rawData } = points[i];\n\n    if (Math.abs(x - pointX) < bandwidth / 2) {\n      chartPoint = {\n        point: points[i],\n        points,\n        pointsBandWidth: bandwidth,\n        pointData: rawData\n      };\n      if (defined) {\n        // 添加highlight line\n        const highlightLine = sparkline.getChildByName('highlight-line');\n        if (highlightLine) {\n          highlightLine.setAttributes({\n            // x: pointX,\n            points: [\n              { x: pointX, y: max },\n              { x: pointX, y: min }\n            ],\n            visible: true,\n            pickable: true\n          });\n        } else {\n          const highlightLine = createLine({\n            // x: 0,\n            // y: 0,\n            points: [\n              { x: pointX, y: max },\n              { x: pointX, y: min }\n            ],\n            lineWidth: line.hover?.strokeWidth,\n            stroke: line.hover?.stroke\n          });\n          highlightLine.name = 'highlight-line';\n          sparkline.addChild(highlightLine);\n        }\n\n        // 添加highlight symbol\n        const highlightSymbol = sparkline.getChildByName('highlight-symbol');\n        if (highlightSymbol) {\n          highlightSymbol.setAttributes({\n            x: pointX,\n            y: pointY,\n            visible: true,\n            pickable: true\n          });\n        } else {\n          const highlightSymbol = createSymbol({\n            x: pointX,\n            y: pointY,\n            stroke: symbol.hover.stroke,\n            lineWidth: symbol.hover.strokeWidth,\n            fill: symbol.hover.fill,\n            size: symbol.hover.size * 2, // 之前配置的是圆半径\n            symbolType: 'circle'\n          });\n          highlightSymbol.name = 'highlight-symbol';\n          sparkline.addChild(highlightSymbol);\n        }\n        break;\n      }\n    }\n  }\n  table.scenegraph.updateNextFrame();\n\n  if (chartPoint) {\n    const eventInfo: Omit<MousePointerSparklineEvent, 'target'> = {\n      col,\n      row,\n      field: table.getHeaderField(col, row),\n      value: table.getCellValue(col, row),\n      dataValue: table.getCellOriginValue(col, row),\n      cellHeaderPaths: table.internalProps.layoutMap.getCellHeaderPaths(col, row),\n      title: table.getBodyColumnDefine(col, row).title,\n      cellRange: table.getCellRelativeRect(col, row),\n      sparkline: {\n        pointData: chartPoint.pointData\n      },\n      scaleRatio: table.canvas.getBoundingClientRect().width / table.canvas.offsetWidth\n    };\n    table.fireListeners(TABLE_EVENT_TYPE.MOUSEOVER_CHART_SYMBOL, eventInfo as MousePointerSparklineEvent);\n  }\n  return true;\n}\n"]}

package/cjs/state/state.d.ts

@@ -3,7 +3,7 @@ import type { Icon } from '../scenegraph/graphic/icon';
 import type { CellAddress, CellPosition, CellRange, DropDownMenuHighlightInfo, MenuListItem, SortOrder, SortState } from '../ts-types';
 import { HighlightScope, InteractionState } from '../ts-types';
 import { Bounds } from '@visactor/vutils';
-import type { FederatedEvent } from '@visactor/vrender';
+import type { FederatedEvent } from './../vrender';
 import type { BaseTableAPI } from '../ts-types/base-table';
 export declare class StateManager {
     table: BaseTableAPI;

package/cjs/state/state.js

@@ -134,12 +134,11 @@ class StateManager {
         });
     }
     setSelectState() {
-        var _a, _b;
-        const {headerSelectMode: headerSelectMode, disableSelect: disableSelect, disableHeaderSelect: disableHeaderSelect} = null !== (_b = null === (_a = this.table.options) || void 0 === _a ? void 0 : _a.select) && void 0 !== _b ? _b : {
+        const {headerSelectMode: headerSelectMode, disableSelect: disableSelect, disableHeaderSelect: disableHeaderSelect} = Object.assign({}, {
             headerSelectMode: "inline",
             disableSelect: !1,
             disableHeaderSelect: !1
-        };
+        }, this.table.options.select);
         this.select.highlightScope = disableSelect ? ts_types_1.HighlightScope.none : ts_types_1.HighlightScope.single, 
         this.select.singleStyle = !disableSelect, this.select.disableHeader = disableHeaderSelect, 
         this.select.headerSelectMode = headerSelectMode;
@@ -151,7 +150,8 @@ class StateManager {
         })), seled;
     }
     setSortState(sortState) {
-        this.sort.field = sortState.field, this.sort.fieldKey = sortState.fieldKey, this.sort.order = sortState.order;
+        this.sort.field = null == sortState ? void 0 : sortState.field, this.sort.fieldKey = null == sortState ? void 0 : sortState.fieldKey, 
+        this.sort.order = null == sortState ? void 0 : sortState.order;
     }
     setFrozenState() {
         this.frozen.col = this.table.frozenColCount - 1;
@@ -293,11 +293,10 @@ class StateManager {
     setScrollTop(top) {
         var _a, _b;
         const totalHeight = this.table.getAllRowsHeight();
-        top = Math.max(0, Math.min(top, totalHeight - this.table.scenegraph.height)), top = Math.ceil(top), 
+        top = Math.max(0, Math.min(top, totalHeight - this.table.scenegraph.height)), (top = Math.ceil(top)) !== this.scroll.verticalBarPos && this.table.stateManager.updateHoverPos(-1, -1), 
         this.scroll.verticalBarPos = top, this.table.scenegraph.setY(-top);
         const yRatio = top / (totalHeight - this.table.scenegraph.height);
-        this.table.scenegraph.component.updateVerticalScrollBarPos(yRatio), this.table.stateManager.updateHoverPos(-1, -1), 
-        this.table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.SCROLL, {
+        this.table.scenegraph.component.updateVerticalScrollBarPos(yRatio), this.table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.SCROLL, {
             scrollTop: this.scroll.verticalBarPos,
             scrollLeft: this.scroll.horizontalBarPos,
             scrollHeight: null === (_a = this.table.theme.scrollStyle) || void 0 === _a ? void 0 : _a.width,
@@ -312,11 +311,10 @@ class StateManager {
         var _a, _b;
         const totalWidth = this.table.getAllColsWidth();
         this.table.getFrozenColsWidth();
-        left = Math.max(0, Math.min(left, totalWidth - this.table.scenegraph.width)), left = Math.ceil(left), 
+        left = Math.max(0, Math.min(left, totalWidth - this.table.scenegraph.width)), (left = Math.ceil(left)) !== this.scroll.horizontalBarPos && this.table.stateManager.updateHoverPos(-1, -1), 
         this.scroll.horizontalBarPos = left, this.table.scenegraph.setX(-left);
         const xRatio = left / (totalWidth - this.table.scenegraph.width);
-        this.table.scenegraph.component.updateHorizontalScrollBarPos(xRatio), this.table.stateManager.updateHoverPos(-1, -1), 
-        this.table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.SCROLL, {
+        this.table.scenegraph.component.updateHorizontalScrollBarPos(xRatio), this.table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.SCROLL, {
             scrollTop: this.scroll.verticalBarPos,
             scrollLeft: this.scroll.horizontalBarPos,
             scrollHeight: null === (_a = this.table.theme.scrollStyle) || void 0 === _a ? void 0 : _a.width,
@@ -384,16 +382,14 @@ class StateManager {
             row: row,
             icon: icon
         }, this.table.scenegraph.setIconHoverStyle(this.residentHoverIcon.icon, this.residentHoverIcon.col, this.residentHoverIcon.row, cellGroup), 
-        icon.oldVisibleTime = icon.attribute.visibleTime, icon.setAttribute("visibleTime", "always"), 
-        icon.setAttribute("opacity", 1));
+        this.table.scenegraph.residentHoverIcon(col, row));
     }
     hideMenu() {
-        this.table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.DROPDOWN_MENU_CLEAR, null), 
+        this.menu.isShow && (this.table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.DROPDOWN_MENU_CLEAR, null), 
         this.table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.HIDE_MENU, null), this.menu.isShow = !1, 
         this.table.scenegraph.component.menu.detach(), this.residentHoverIcon && (this.table.scenegraph.setIconNormalStyle(this.residentHoverIcon.icon, this.residentHoverIcon.col, this.residentHoverIcon.row), 
-        this.residentHoverIcon.icon.setAttribute("visibleTime", this.residentHoverIcon.icon.oldVisibleTime), 
-        this.residentHoverIcon.icon.setAttribute("opacity", "always" === this.residentHoverIcon.icon.attribute.visibleTime ? 1 : 0), 
-        this.residentHoverIcon = null);
+        this.table.scenegraph.resetResidentHoverIcon(this.residentHoverIcon.col, this.residentHoverIcon.row), 
+        this.residentHoverIcon = null));
     }
     setDropDownMenuHighlight(cells) {
         this.menu.dropDownMenuHighlight = cells;