@visactor/vtable 1.26.8 → 1.26.9-alpha.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (107) hide show
  1. package/cjs/body-helper/body-helper.js +1 -2
  2. package/cjs/components/index.js +2 -1
  3. package/cjs/components/menu/dom/logic/MenuElement.js +17 -17
  4. package/cjs/components/menu/dom/logic/MenuElement.js.map +1 -1
  5. package/cjs/components/menu/dom/logic/menu-icon.d.ts +1 -0
  6. package/cjs/components/menu/dom/logic/menu-icon.js +41 -0
  7. package/cjs/components/menu/dom/logic/menu-icon.js.map +1 -0
  8. package/cjs/core/BaseTable.js +2 -2
  9. package/cjs/core/BaseTable.js.map +1 -1
  10. package/cjs/core/tableHelper.js +1 -2
  11. package/cjs/data/DataSource.js +2 -1
  12. package/cjs/event/event.js +3 -3
  13. package/cjs/event/event.js.map +1 -1
  14. package/cjs/event/sparkline-event.js +2 -1
  15. package/cjs/header-helper/header-helper.js +1 -2
  16. package/cjs/layout/pivot-header-layout.js +2 -1
  17. package/cjs/layout/pivot-header-layout.js.map +1 -1
  18. package/cjs/plugins/custom-cell-style.d.ts +17 -2
  19. package/cjs/plugins/custom-cell-style.js +120 -30
  20. package/cjs/plugins/custom-cell-style.js.map +1 -1
  21. package/cjs/scenegraph/component/table-component.d.ts +2 -0
  22. package/cjs/scenegraph/component/table-component.js +22 -6
  23. package/cjs/scenegraph/component/table-component.js.map +1 -1
  24. package/cjs/scenegraph/group-creater/column-helper.js +1 -1
  25. package/cjs/scenegraph/group-creater/column-helper.js.map +1 -1
  26. package/cjs/scenegraph/layout/frozen.js +3 -0
  27. package/cjs/scenegraph/layout/frozen.js.map +1 -1
  28. package/cjs/scenegraph/scenegraph.d.ts +1 -0
  29. package/cjs/scenegraph/scenegraph.js +8 -1
  30. package/cjs/scenegraph/scenegraph.js.map +1 -1
  31. package/cjs/scenegraph/select/create-select-border.d.ts +1 -0
  32. package/cjs/scenegraph/select/create-select-border.js +8 -3
  33. package/cjs/scenegraph/select/create-select-border.js.map +1 -1
  34. package/cjs/scenegraph/select/delete-select-border.d.ts +2 -0
  35. package/cjs/scenegraph/select/delete-select-border.js +16 -5
  36. package/cjs/scenegraph/select/delete-select-border.js.map +1 -1
  37. package/cjs/scenegraph/select/move-select-border.js +2 -2
  38. package/cjs/scenegraph/select/move-select-border.js.map +1 -1
  39. package/cjs/state/select/auto-merge-ranges.d.ts +9 -0
  40. package/cjs/state/select/auto-merge-ranges.js +164 -0
  41. package/cjs/state/select/auto-merge-ranges.js.map +1 -0
  42. package/cjs/state/select/update-position.js +7 -3
  43. package/cjs/state/select/update-position.js.map +1 -1
  44. package/cjs/state/state.d.ts +3 -1
  45. package/cjs/state/state.js +18 -9
  46. package/cjs/state/state.js.map +1 -1
  47. package/cjs/themes/theme-define.js.map +1 -1
  48. package/cjs/ts-types/base-table.d.ts +1 -0
  49. package/cjs/ts-types/base-table.js.map +1 -1
  50. package/cjs/ts-types/menu.js.map +1 -1
  51. package/cjs/ts-types/theme.d.ts +1 -1
  52. package/cjs/ts-types/theme.js.map +1 -1
  53. package/dist/vtable.js +2410 -104
  54. package/dist/vtable.min.js +5 -1
  55. package/es/body-helper/body-helper.js +1 -2
  56. package/es/components/index.js +2 -1
  57. package/es/components/menu/dom/logic/MenuElement.js +16 -17
  58. package/es/components/menu/dom/logic/MenuElement.js.map +1 -1
  59. package/es/components/menu/dom/logic/menu-icon.d.ts +1 -0
  60. package/es/components/menu/dom/logic/menu-icon.js +29 -0
  61. package/es/components/menu/dom/logic/menu-icon.js.map +1 -0
  62. package/es/core/BaseTable.js +2 -2
  63. package/es/core/BaseTable.js.map +1 -1
  64. package/es/core/tableHelper.js +1 -2
  65. package/es/data/DataSource.js +2 -1
  66. package/es/event/event.js +4 -2
  67. package/es/event/event.js.map +1 -1
  68. package/es/event/sparkline-event.js +2 -1
  69. package/es/header-helper/header-helper.js +1 -2
  70. package/es/layout/pivot-header-layout.js +2 -1
  71. package/es/layout/pivot-header-layout.js.map +1 -1
  72. package/es/plugins/custom-cell-style.d.ts +17 -2
  73. package/es/plugins/custom-cell-style.js +120 -28
  74. package/es/plugins/custom-cell-style.js.map +1 -1
  75. package/es/scenegraph/component/table-component.d.ts +2 -0
  76. package/es/scenegraph/component/table-component.js +21 -6
  77. package/es/scenegraph/component/table-component.js.map +1 -1
  78. package/es/scenegraph/group-creater/column-helper.js +1 -1
  79. package/es/scenegraph/group-creater/column-helper.js.map +1 -1
  80. package/es/scenegraph/layout/frozen.js +3 -0
  81. package/es/scenegraph/layout/frozen.js.map +1 -1
  82. package/es/scenegraph/scenegraph.d.ts +1 -0
  83. package/es/scenegraph/scenegraph.js +9 -2
  84. package/es/scenegraph/scenegraph.js.map +1 -1
  85. package/es/scenegraph/select/create-select-border.d.ts +1 -0
  86. package/es/scenegraph/select/create-select-border.js +5 -1
  87. package/es/scenegraph/select/create-select-border.js.map +1 -1
  88. package/es/scenegraph/select/delete-select-border.d.ts +2 -0
  89. package/es/scenegraph/select/delete-select-border.js +9 -0
  90. package/es/scenegraph/select/delete-select-border.js.map +1 -1
  91. package/es/scenegraph/select/move-select-border.js +2 -2
  92. package/es/scenegraph/select/move-select-border.js.map +1 -1
  93. package/es/state/select/auto-merge-ranges.d.ts +9 -0
  94. package/es/state/select/auto-merge-ranges.js +155 -0
  95. package/es/state/select/auto-merge-ranges.js.map +1 -0
  96. package/es/state/select/update-position.js +7 -1
  97. package/es/state/select/update-position.js.map +1 -1
  98. package/es/state/state.d.ts +3 -1
  99. package/es/state/state.js +19 -8
  100. package/es/state/state.js.map +1 -1
  101. package/es/themes/theme-define.js.map +1 -1
  102. package/es/ts-types/base-table.d.ts +1 -0
  103. package/es/ts-types/base-table.js.map +1 -1
  104. package/es/ts-types/menu.js.map +1 -1
  105. package/es/ts-types/theme.d.ts +1 -1
  106. package/es/ts-types/theme.js.map +1 -1
  107. package/package.json +9 -4
@@ -1,5 +1,6 @@
1
1
  import type { CellSubLocation } from '../../ts-types';
2
2
  import type { Scenegraph } from '../scenegraph';
3
3
  import type { BaseTableAPI } from '../../ts-types/base-table';
4
+ export declare function getCellSelectBorderKey(startCol: number, startRow: number, endCol: number, endRow: number, selectId?: string): string;
4
5
  export declare function createCellSelectBorder(scene: Scenegraph, start_Col: number, start_Row: number, end_Col: number, end_Row: number, selectRangeType: CellSubLocation, selectId: string, strokes: boolean[]): void;
5
6
  export declare function getCornerRadius(selectRangeType: CellSubLocation, cornerRadius: undefined | number | [number, number, number, number], start_Col: number, start_Row: number, end_Col: number, end_Row: number, table: BaseTableAPI): number[];
@@ -1,5 +1,9 @@
1
1
  import { createRect } from "./../../vrender";
2
2
 
3
+ export function getCellSelectBorderKey(startCol, startRow, endCol, endRow, selectId = `${startCol}${startRow}${endCol}${endRow}`) {
4
+ return `${startCol}-${startRow}-${endCol}-${endRow}-${selectId}`;
5
+ }
6
+
3
7
  export function createCellSelectBorder(scene, start_Col, start_Row, end_Col, end_Row, selectRangeType, selectId, strokes) {
4
8
  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
5
9
  let isHasFillHandleRect = !!(null === (_a = scene.table.options.excelOptions) || void 0 === _a ? void 0 : _a.fillHandle);
@@ -31,7 +35,7 @@ export function createCellSelectBorder(scene, start_Col, start_Row, end_Col, end
31
35
  width: 6,
32
36
  height: 6,
33
37
  visible: !0
34
- })), scene.lastSelectId = selectId, scene.selectingRangeComponents.set(`${startCol}-${startRow}-${endCol}-${endRow}-${selectId}`, {
38
+ })), scene.lastSelectId = selectId, scene.selectingRangeComponents.set(getCellSelectBorderKey(startCol, startRow, endCol, endRow, selectId), {
35
39
  rect: rect,
36
40
  fillhandle: fillhandle,
37
41
  role: selectRangeType
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/scenegraph/select/create-select-border.ts"],"names":[],"mappings":"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","file":"create-select-border.js","sourcesContent":["import { createRect } from './../../vrender';\nimport type { CellSubLocation } from '../../ts-types';\nimport type { Scenegraph } from '../scenegraph';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\n\n/**\n * 选框(select border)的创建入口。\n *\n * 选框图元并不是直接挂在 tableGroup 下,而是挂在各区域对应的 overlayGroup(select-overlay)下:\n * - body / columnHeader / rowHeader / cornerHeader\n * - rightFrozen / rightTopCorner / rightBottomCorner\n * - bottomFrozen / leftBottomCorner\n *\n * 这样做的原因:\n * - overlay 会参与各区域的 clipRect 裁剪,避免选框越界绘制\n * - 当选择范围跨越多个区域(例如跨表头+body、跨左冻结+body、跨右冻结),需要拆成多段选框分别绘制\n */\nexport function createCellSelectBorder(\n scene: Scenegraph,\n start_Col: number,\n start_Row: number,\n end_Col: number,\n end_Row: number,\n selectRangeType: CellSubLocation,\n selectId: string, //整体区域${endRow}-${startCol}${startRow}${endCol}${endRow}作为其编号\n strokes: boolean[]\n // isHasFillHandleRect: boolean\n) {\n // fill handle(右下角小方块)只在“单一选区 + body 区域 + 允许显示”的场景生效:\n // - 多选区时避免出现多个 handle(交互语义不明确),并清理历史 handle\n // - 选区包含表头时禁止显示(表头不是可填充的目标)\n // - strokes 关闭底边/右边时(例如跨区域拆分后该边由其它段负责),也不应显示 handle\n let isHasFillHandleRect = !!scene.table.options.excelOptions?.fillHandle;\n if (scene.table.stateManager.select.ranges?.length > 1) {\n isHasFillHandleRect = false;\n scene.removeFillHandleFromSelectComponents();\n } else if (scene.table.stateManager.select.ranges?.length === 1) {\n const maxRow = Math.max(\n scene.table.stateManager.select.ranges[0].start.row,\n scene.table.stateManager.select.ranges[0].end.row\n );\n const maxCol = Math.max(\n scene.table.stateManager.select.ranges[0].start.col,\n scene.table.stateManager.select.ranges[0].end.col\n );\n if (scene.table.isHeader(maxCol, maxRow)) {\n isHasFillHandleRect = false;\n }\n }\n if (Array.isArray(strokes) && (strokes[1] === false || strokes[2] === false)) {\n isHasFillHandleRect = false;\n }\n const startCol = Math.min(start_Col, end_Col);\n const startRow = Math.min(start_Row, end_Row);\n const endCol = Math.max(start_Col, end_Col);\n const endRow = Math.max(start_Row, end_Row);\n // overlayGroup 在不同区域会有各自的坐标偏移(例如 columnHeader / body / rightFrozen),\n // 选框需要用 global bounds(全局 AABB)减去 tableGroup + overlayGroup 的偏移,换算为 overlay 的本地坐标。\n const overlayGroup = scene.getSelectOverlayGroup(selectRangeType);\n const offsetX = scene.tableGroup.attribute.x + (overlayGroup.attribute.x ?? 0);\n const offsetY = scene.tableGroup.attribute.y + (overlayGroup.attribute.y ?? 0);\n const firstCellBound = scene.highPerformanceGetCell(startCol, startRow).globalAABBBounds;\n const lastCellBound = scene.highPerformanceGetCell(endCol, endRow).globalAABBBounds;\n const theme = scene.table.theme;\n // 框选外边框\n const bodyClickBorderColor = theme.selectionStyle?.cellBorderColor;\n const bodyClickLineWidth = theme.selectionStyle?.cellBorderLineWidth;\n const rect = createRect({\n pickable: false,\n fill:\n theme.selectionStyle?.selectionFillMode === 'replace'\n ? false\n : (theme.selectionStyle?.cellBgColor as any) ?? 'rgba(0, 0, 255,0.1)',\n\n lineWidth: bodyClickLineWidth as number,\n // stroke: bodyClickBorderColor as string,\n stroke: strokes.map(stroke => {\n if (stroke) {\n return bodyClickBorderColor as string;\n }\n return false;\n }),\n x: firstCellBound.x1 - offsetX,\n y: firstCellBound.y1 - offsetY,\n width: 0,\n height: 0,\n visible: true,\n cornerRadius: getCornerRadius(\n selectRangeType,\n scene.table.theme.frameStyle?.cornerRadius,\n start_Col,\n start_Row,\n end_Col,\n end_Row,\n scene.table\n )\n });\n // 创建右下角小方块\n let fillhandle;\n if (isHasFillHandleRect) {\n // 6x6 的 handle,定位在选区右下角(右/下各内缩 3px),避免压住边框线\n fillhandle = createRect({\n pickable: false,\n fill: bodyClickBorderColor as string,\n // lineWidth: bodyClickLineWidth as number,\n stroke: bodyClickBorderColor as string, // 右下角小方块边框颜色\n x: lastCellBound.x2 - offsetX - 3,\n y: lastCellBound.y2 - offsetY - 3,\n width: 6,\n height: 6,\n\n visible: true\n });\n }\n scene.lastSelectId = selectId;\n // key 以“标准化后的 start/end + selectId”组成:同一选择范围在不同区域拆分后 key 不同,\n // 但 selectId 相同,可用于 shift 续选等场景的删除/替换。\n scene.selectingRangeComponents.set(`${startCol}-${startRow}-${endCol}-${endRow}-${selectId}`, {\n rect,\n fillhandle,\n role: selectRangeType\n });\n overlayGroup.addChild(rect);\n if (isHasFillHandleRect) {\n overlayGroup.addChild(fillhandle);\n }\n}\n\n// set corner radius in select rect which covers the corner of the table\nexport function getCornerRadius(\n selectRangeType: CellSubLocation,\n cornerRadius: undefined | number | [number, number, number, number],\n start_Col: number,\n start_Row: number,\n end_Col: number,\n end_Row: number,\n table: BaseTableAPI\n) {\n if (!cornerRadius) {\n return undefined;\n }\n const cornerRadiusArray = Array.isArray(cornerRadius)\n ? cornerRadius\n : [cornerRadius, cornerRadius, cornerRadius, cornerRadius]; // [left top, right top, right bottom, left bottom]\n\n const tableStartCol = 0;\n const tableStartRow = 0;\n const tableEndCol = table.colCount - 1;\n const tableEndRow = table.rowCount - 1;\n\n const result = [0, 0, 0, 0];\n let changed = false;\n\n if (start_Col === tableStartCol && start_Row === tableStartRow) {\n // select rect covers the left top corner of the table\n result[0] = cornerRadiusArray[0];\n changed = true;\n } else if (end_Col === tableEndCol && end_Row === tableEndRow) {\n // select rect covers the right bottom corner of the table\n result[2] = cornerRadiusArray[2];\n changed = true;\n } else if (start_Col === tableStartCol && end_Row === tableEndRow) {\n // select rect covers the left bottom corner of the table\n result[3] = cornerRadiusArray[3];\n changed = true;\n } else if (end_Col === tableEndCol && start_Row === tableStartRow) {\n // select rect covers the right top corner of the table\n result[1] = cornerRadiusArray[1];\n changed = true;\n }\n\n if (changed) {\n return result;\n }\n\n return undefined;\n}\n"]}
1
+ {"version":3,"sources":["../src/scenegraph/select/create-select-border.ts"],"names":[],"mappings":"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","file":"create-select-border.js","sourcesContent":["import { createRect } from './../../vrender';\nimport type { CellSubLocation } from '../../ts-types';\nimport type { Scenegraph } from '../scenegraph';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\n\n/** 统一选框段落键;普通 body 范围使用完整边界作为选择标识。 */\nexport function getCellSelectBorderKey(\n startCol: number,\n startRow: number,\n endCol: number,\n endRow: number,\n selectId = `${startCol}${startRow}${endCol}${endRow}`\n): string {\n return `${startCol}-${startRow}-${endCol}-${endRow}-${selectId}`;\n}\n\n/**\n * 选框(select border)的创建入口。\n *\n * 选框图元并不是直接挂在 tableGroup 下,而是挂在各区域对应的 overlayGroup(select-overlay)下:\n * - body / columnHeader / rowHeader / cornerHeader\n * - rightFrozen / rightTopCorner / rightBottomCorner\n * - bottomFrozen / leftBottomCorner\n *\n * 这样做的原因:\n * - overlay 会参与各区域的 clipRect 裁剪,避免选框越界绘制\n * - 当选择范围跨越多个区域(例如跨表头+body、跨左冻结+body、跨右冻结),需要拆成多段选框分别绘制\n */\nexport function createCellSelectBorder(\n scene: Scenegraph,\n start_Col: number,\n start_Row: number,\n end_Col: number,\n end_Row: number,\n selectRangeType: CellSubLocation,\n selectId: string, //整体区域${endRow}-${startCol}${startRow}${endCol}${endRow}作为其编号\n strokes: boolean[]\n // isHasFillHandleRect: boolean\n) {\n // fill handle(右下角小方块)只在“单一选区 + body 区域 + 允许显示”的场景生效:\n // - 多选区时避免出现多个 handle(交互语义不明确),并清理历史 handle\n // - 选区包含表头时禁止显示(表头不是可填充的目标)\n // - strokes 关闭底边/右边时(例如跨区域拆分后该边由其它段负责),也不应显示 handle\n let isHasFillHandleRect = !!scene.table.options.excelOptions?.fillHandle;\n if (scene.table.stateManager.select.ranges?.length > 1) {\n isHasFillHandleRect = false;\n scene.removeFillHandleFromSelectComponents();\n } else if (scene.table.stateManager.select.ranges?.length === 1) {\n const maxRow = Math.max(\n scene.table.stateManager.select.ranges[0].start.row,\n scene.table.stateManager.select.ranges[0].end.row\n );\n const maxCol = Math.max(\n scene.table.stateManager.select.ranges[0].start.col,\n scene.table.stateManager.select.ranges[0].end.col\n );\n if (scene.table.isHeader(maxCol, maxRow)) {\n isHasFillHandleRect = false;\n }\n }\n if (Array.isArray(strokes) && (strokes[1] === false || strokes[2] === false)) {\n isHasFillHandleRect = false;\n }\n const startCol = Math.min(start_Col, end_Col);\n const startRow = Math.min(start_Row, end_Row);\n const endCol = Math.max(start_Col, end_Col);\n const endRow = Math.max(start_Row, end_Row);\n // overlayGroup 在不同区域会有各自的坐标偏移(例如 columnHeader / body / rightFrozen),\n // 选框需要用 global bounds(全局 AABB)减去 tableGroup + overlayGroup 的偏移,换算为 overlay 的本地坐标。\n const overlayGroup = scene.getSelectOverlayGroup(selectRangeType);\n const offsetX = scene.tableGroup.attribute.x + (overlayGroup.attribute.x ?? 0);\n const offsetY = scene.tableGroup.attribute.y + (overlayGroup.attribute.y ?? 0);\n const firstCellBound = scene.highPerformanceGetCell(startCol, startRow).globalAABBBounds;\n const lastCellBound = scene.highPerformanceGetCell(endCol, endRow).globalAABBBounds;\n const theme = scene.table.theme;\n // 框选外边框\n const bodyClickBorderColor = theme.selectionStyle?.cellBorderColor;\n const bodyClickLineWidth = theme.selectionStyle?.cellBorderLineWidth;\n const rect = createRect({\n pickable: false,\n fill:\n theme.selectionStyle?.selectionFillMode === 'replace'\n ? false\n : (theme.selectionStyle?.cellBgColor as any) ?? 'rgba(0, 0, 255,0.1)',\n\n lineWidth: bodyClickLineWidth as number,\n // stroke: bodyClickBorderColor as string,\n stroke: strokes.map(stroke => {\n if (stroke) {\n return bodyClickBorderColor as string;\n }\n return false;\n }),\n x: firstCellBound.x1 - offsetX,\n y: firstCellBound.y1 - offsetY,\n width: 0,\n height: 0,\n visible: true,\n cornerRadius: getCornerRadius(\n selectRangeType,\n scene.table.theme.frameStyle?.cornerRadius,\n start_Col,\n start_Row,\n end_Col,\n end_Row,\n scene.table\n )\n });\n // 创建右下角小方块\n let fillhandle;\n if (isHasFillHandleRect) {\n // 6x6 的 handle,定位在选区右下角(右/下各内缩 3px),避免压住边框线\n fillhandle = createRect({\n pickable: false,\n fill: bodyClickBorderColor as string,\n // lineWidth: bodyClickLineWidth as number,\n stroke: bodyClickBorderColor as string, // 右下角小方块边框颜色\n x: lastCellBound.x2 - offsetX - 3,\n y: lastCellBound.y2 - offsetY - 3,\n width: 6,\n height: 6,\n\n visible: true\n });\n }\n scene.lastSelectId = selectId;\n // key 以“标准化后的 start/end + selectId”组成:同一选择范围在不同区域拆分后 key 不同,\n // 但 selectId 相同,可用于 shift 续选等场景的删除/替换。\n scene.selectingRangeComponents.set(getCellSelectBorderKey(startCol, startRow, endCol, endRow, selectId), {\n rect,\n fillhandle,\n role: selectRangeType\n });\n overlayGroup.addChild(rect);\n if (isHasFillHandleRect) {\n overlayGroup.addChild(fillhandle);\n }\n}\n\n// set corner radius in select rect which covers the corner of the table\nexport function getCornerRadius(\n selectRangeType: CellSubLocation,\n cornerRadius: undefined | number | [number, number, number, number],\n start_Col: number,\n start_Row: number,\n end_Col: number,\n end_Row: number,\n table: BaseTableAPI\n) {\n if (!cornerRadius) {\n return undefined;\n }\n const cornerRadiusArray = Array.isArray(cornerRadius)\n ? cornerRadius\n : [cornerRadius, cornerRadius, cornerRadius, cornerRadius]; // [left top, right top, right bottom, left bottom]\n\n const tableStartCol = 0;\n const tableStartRow = 0;\n const tableEndCol = table.colCount - 1;\n const tableEndRow = table.rowCount - 1;\n\n const result = [0, 0, 0, 0];\n let changed = false;\n\n if (start_Col === tableStartCol && start_Row === tableStartRow) {\n // select rect covers the left top corner of the table\n result[0] = cornerRadiusArray[0];\n changed = true;\n } else if (end_Col === tableEndCol && end_Row === tableEndRow) {\n // select rect covers the right bottom corner of the table\n result[2] = cornerRadiusArray[2];\n changed = true;\n } else if (start_Col === tableStartCol && end_Row === tableEndRow) {\n // select rect covers the left bottom corner of the table\n result[3] = cornerRadiusArray[3];\n changed = true;\n } else if (end_Col === tableEndCol && start_Row === tableStartRow) {\n // select rect covers the right top corner of the table\n result[1] = cornerRadiusArray[1];\n changed = true;\n }\n\n if (changed) {\n return result;\n }\n\n return undefined;\n}\n"]}
@@ -1,4 +1,6 @@
1
1
  import type { Scenegraph } from '../scenegraph';
2
+ import type { CellRange } from '../../ts-types';
3
+ export declare function deleteSelectedBodyRangeComponent(scene: Scenegraph, range: CellRange): void;
2
4
  export declare function deleteLastSelectedRangeComponents(scene: Scenegraph): void;
3
5
  export declare function deleteAllSelectBorder(scene: Scenegraph): void;
4
6
  export declare function deleteAllSelectingBorder(scene: Scenegraph): void;
@@ -1,3 +1,12 @@
1
+ import { getCellSelectBorderKey } from "./create-select-border";
2
+
3
+ export function deleteSelectedBodyRangeComponent(scene, range) {
4
+ var _a;
5
+ const key = getCellSelectBorderKey(Math.min(range.start.col, range.end.col), Math.min(range.start.row, range.end.row), Math.max(range.start.col, range.end.col), Math.max(range.start.row, range.end.row)), component = scene.selectedRangeComponents.get(key);
6
+ null == component || component.rect.delete(), null === (_a = null == component ? void 0 : component.fillhandle) || void 0 === _a || _a.delete(),
7
+ scene.selectedRangeComponents.delete(key);
8
+ }
9
+
1
10
  export function deleteLastSelectedRangeComponents(scene) {
2
11
  scene.selectedRangeComponents.forEach(((selectComp, key) => {
3
12
  var _a;
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/scenegraph/select/delete-select-border.ts"],"names":[],"mappings":"AAKA,MAAM,UAAU,iCAAiC,CAAC,KAAiB;IAGjE,KAAK,CAAC,uBAAuB,CAAC,OAAO,CACnC,CAAC,UAAsE,EAAE,GAAW,EAAE,EAAE;;QACtF,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,IAAI,YAAY,KAAK,KAAK,CAAC,YAAY,EAAE;YACvC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACzB,MAAA,UAAU,CAAC,UAAU,0CAAE,MAAM,EAAE,CAAC;YAChC,KAAK,CAAC,uBAAuB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SAC3C;IACH,CAAC,CACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAiB;IAErD,KAAK,CAAC,uBAAuB,CAAC,OAAO,CACnC,CAAC,UAAsE,EAAE,GAAW,EAAE,EAAE;;QACtF,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACzB,MAAA,UAAU,CAAC,UAAU,0CAAE,MAAM,EAAE,CAAC;IAClC,CAAC,CACF,CAAC;IACF,KAAK,CAAC,uBAAuB,GAAG,IAAI,GAAG,EAAE,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,KAAiB;IAExD,KAAK,CAAC,wBAAwB,CAAC,OAAO,CACpC,CAAC,UAAsE,EAAE,GAAW,EAAE,EAAE;;QACtF,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACzB,MAAA,UAAU,CAAC,UAAU,0CAAE,MAAM,EAAE,CAAC;IAClC,CAAC,CACF,CAAC;IACF,KAAK,CAAC,wBAAwB,GAAG,IAAI,GAAG,EAAE,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,oCAAoC,CAAC,KAAiB;IAEpE,KAAK,CAAC,uBAAuB,CAAC,OAAO,CACnC,CAAC,UAAsE,EAAE,GAAW,EAAE,EAAE;;QACtF,MAAA,UAAU,CAAC,UAAU,0CAAE,MAAM,EAAE,CAAC;QAChC,UAAU,CAAC,UAAU,GAAG,SAAS,CAAC;IACpC,CAAC,CACF,CAAC;AACJ,CAAC","file":"delete-select-border.js","sourcesContent":["import type { IRect } from './../../vrender';\nimport type { Scenegraph } from '../scenegraph';\nimport type { CellSubLocation } from '../../ts-types';\n\n/** 按住shift 则继续上次选中范围 需要将现有的删除掉 */\nexport function deleteLastSelectedRangeComponents(scene: Scenegraph) {\n // lastSelectId 用于标识“上一次选择动作”的选区段落(可能拆分为多段,selectId 相同)。\n // shift 续选时,需要移除上一次的选区图元,再将本次选区追加到 selectedRangeComponents。\n scene.selectedRangeComponents.forEach(\n (selectComp: { rect: IRect; fillhandle?: IRect; role: CellSubLocation }, key: string) => {\n const lastSelectId = key.split('-')[4];\n if (lastSelectId === scene.lastSelectId) {\n selectComp.rect.delete();\n selectComp.fillhandle?.delete();\n scene.selectedRangeComponents.delete(key);\n }\n }\n );\n}\n\nexport function deleteAllSelectBorder(scene: Scenegraph) {\n // 清理最终选中态选区(包含 fill handle)\n scene.selectedRangeComponents.forEach(\n (selectComp: { rect: IRect; fillhandle?: IRect; role: CellSubLocation }, key: string) => {\n selectComp.rect.delete();\n selectComp.fillhandle?.delete();\n }\n );\n scene.selectedRangeComponents = new Map();\n}\n\nexport function deleteAllSelectingBorder(scene: Scenegraph) {\n // 清理拖拽/框选过程中的临时选区\n scene.selectingRangeComponents.forEach(\n (selectComp: { rect: IRect; fillhandle?: IRect; role: CellSubLocation }, key: string) => {\n selectComp.rect.delete();\n selectComp.fillhandle?.delete();\n }\n );\n scene.selectingRangeComponents = new Map();\n}\n\nexport function removeFillHandleFromSelectComponents(scene: Scenegraph) {\n // 多选区时不展示 fill handle,需要从所有 selectedRangeComponents 中移除\n scene.selectedRangeComponents.forEach(\n (selectComp: { rect: IRect; fillhandle?: IRect; role: CellSubLocation }, key: string) => {\n selectComp.fillhandle?.delete();\n selectComp.fillhandle = undefined;\n }\n );\n}\n"]}
1
+ {"version":3,"sources":["../src/scenegraph/select/delete-select-border.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAGhE,MAAM,UAAU,gCAAgC,CAAC,KAAiB,EAAE,KAAgB;;IAClF,MAAM,GAAG,GAAG,sBAAsB,CAChC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EACxC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EACxC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EACxC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CACzC,CAAC;IACF,MAAM,SAAS,GAAG,KAAK,CAAC,uBAAuB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzD,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,CAAC,MAAM,EAAE,CAAC;IACzB,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,UAAU,0CAAE,MAAM,EAAE,CAAC;IAChC,KAAK,CAAC,uBAAuB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAC5C,CAAC;AAGD,MAAM,UAAU,iCAAiC,CAAC,KAAiB;IAGjE,KAAK,CAAC,uBAAuB,CAAC,OAAO,CACnC,CAAC,UAAsE,EAAE,GAAW,EAAE,EAAE;;QACtF,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,IAAI,YAAY,KAAK,KAAK,CAAC,YAAY,EAAE;YACvC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACzB,MAAA,UAAU,CAAC,UAAU,0CAAE,MAAM,EAAE,CAAC;YAChC,KAAK,CAAC,uBAAuB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SAC3C;IACH,CAAC,CACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAiB;IAErD,KAAK,CAAC,uBAAuB,CAAC,OAAO,CACnC,CAAC,UAAsE,EAAE,GAAW,EAAE,EAAE;;QACtF,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACzB,MAAA,UAAU,CAAC,UAAU,0CAAE,MAAM,EAAE,CAAC;IAClC,CAAC,CACF,CAAC;IACF,KAAK,CAAC,uBAAuB,GAAG,IAAI,GAAG,EAAE,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,KAAiB;IAExD,KAAK,CAAC,wBAAwB,CAAC,OAAO,CACpC,CAAC,UAAsE,EAAE,GAAW,EAAE,EAAE;;QACtF,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACzB,MAAA,UAAU,CAAC,UAAU,0CAAE,MAAM,EAAE,CAAC;IAClC,CAAC,CACF,CAAC;IACF,KAAK,CAAC,wBAAwB,GAAG,IAAI,GAAG,EAAE,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,oCAAoC,CAAC,KAAiB;IAEpE,KAAK,CAAC,uBAAuB,CAAC,OAAO,CACnC,CAAC,UAAsE,EAAE,GAAW,EAAE,EAAE;;QACtF,MAAA,UAAU,CAAC,UAAU,0CAAE,MAAM,EAAE,CAAC;QAChC,UAAU,CAAC,UAAU,GAAG,SAAS,CAAC;IACpC,CAAC,CACF,CAAC;AACJ,CAAC","file":"delete-select-border.js","sourcesContent":["import type { IRect } from './../../vrender';\nimport type { Scenegraph } from '../scenegraph';\nimport type { CellRange, CellSubLocation } from '../../ts-types';\nimport { getCellSelectBorderKey } from './create-select-border';\n\n/** 归并仅涉及普通 body 单段选框,按完整边界直接删除,不遍历或重建无关图元。 */\nexport function deleteSelectedBodyRangeComponent(scene: Scenegraph, range: CellRange): void {\n const key = getCellSelectBorderKey(\n Math.min(range.start.col, range.end.col),\n Math.min(range.start.row, range.end.row),\n Math.max(range.start.col, range.end.col),\n Math.max(range.start.row, range.end.row)\n );\n const component = scene.selectedRangeComponents.get(key);\n component?.rect.delete();\n component?.fillhandle?.delete();\n scene.selectedRangeComponents.delete(key);\n}\n\n/** 按住shift 则继续上次选中范围 需要将现有的删除掉 */\nexport function deleteLastSelectedRangeComponents(scene: Scenegraph) {\n // lastSelectId 用于标识“上一次选择动作”的选区段落(可能拆分为多段,selectId 相同)。\n // shift 续选时,需要移除上一次的选区图元,再将本次选区追加到 selectedRangeComponents。\n scene.selectedRangeComponents.forEach(\n (selectComp: { rect: IRect; fillhandle?: IRect; role: CellSubLocation }, key: string) => {\n const lastSelectId = key.split('-')[4];\n if (lastSelectId === scene.lastSelectId) {\n selectComp.rect.delete();\n selectComp.fillhandle?.delete();\n scene.selectedRangeComponents.delete(key);\n }\n }\n );\n}\n\nexport function deleteAllSelectBorder(scene: Scenegraph) {\n // 清理最终选中态选区(包含 fill handle)\n scene.selectedRangeComponents.forEach(\n (selectComp: { rect: IRect; fillhandle?: IRect; role: CellSubLocation }, key: string) => {\n selectComp.rect.delete();\n selectComp.fillhandle?.delete();\n }\n );\n scene.selectedRangeComponents = new Map();\n}\n\nexport function deleteAllSelectingBorder(scene: Scenegraph) {\n // 清理拖拽/框选过程中的临时选区\n scene.selectingRangeComponents.forEach(\n (selectComp: { rect: IRect; fillhandle?: IRect; role: CellSubLocation }, key: string) => {\n selectComp.rect.delete();\n selectComp.fillhandle?.delete();\n }\n );\n scene.selectingRangeComponents = new Map();\n}\n\nexport function removeFillHandleFromSelectComponents(scene: Scenegraph) {\n // 多选区时不展示 fill handle,需要从所有 selectedRangeComponents 中移除\n scene.selectedRangeComponents.forEach(\n (selectComp: { rect: IRect; fillhandle?: IRect; role: CellSubLocation }, key: string) => {\n selectComp.fillhandle?.delete();\n selectComp.fillhandle = undefined;\n }\n );\n}\n"]}
@@ -1,8 +1,8 @@
1
1
  export function moveSelectingRangeComponentsToSelectedRangeComponents(scene) {
2
2
  scene.selectingRangeComponents.forEach(((rangeComponent, key) => {
3
3
  var _a;
4
- scene.selectedRangeComponents.get(key) && (scene.selectingRangeComponents.get(key).rect.delete(),
5
- null === (_a = scene.selectingRangeComponents.get(key).fillhandle) || void 0 === _a || _a.delete()),
4
+ const previous = scene.selectedRangeComponents.get(key);
5
+ previous && (previous.rect.delete(), null === (_a = previous.fillhandle) || void 0 === _a || _a.delete()),
6
6
  scene.selectedRangeComponents.set(key, rangeComponent);
7
7
  })), scene.selectingRangeComponents = new Map, scene.updateNextFrame();
8
8
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/scenegraph/select/move-select-border.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,qDAAqD,CAAC,KAAiB;IAKrF,KAAK,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,GAAG,EAAE,EAAE;;QAC7D,IAAI,KAAK,CAAC,uBAAuB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAC1C,KAAK,CAAC,wBAAwB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACtD,MAAA,KAAK,CAAC,wBAAwB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,UAAU,0CAAE,MAAM,EAAE,CAAC;SAC9D;QACD,KAAK,CAAC,uBAAuB,CAAC,GAAG,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,wBAAwB,GAAG,IAAI,GAAG,EAAE,CAAC;IAC3C,KAAK,CAAC,eAAe,EAAE,CAAC;AAC1B,CAAC","file":"move-select-border.js","sourcesContent":["import type { Scenegraph } from '../scenegraph';\n\nexport function moveSelectingRangeComponentsToSelectedRangeComponents(scene: Scenegraph) {\n // selectingRangeComponents 是拖拽/框选过程中的临时选区;\n // 鼠标松开后需要将其“提交”为 selectedRangeComponents,用于后续 hover/滚动时持续更新位置。\n //\n // 若 selectedRangeComponents 已存在同 key 的段落(例如重复选择同一区域),先删除旧图元避免泄漏与重复绘制。\n scene.selectingRangeComponents.forEach((rangeComponent, key) => {\n if (scene.selectedRangeComponents.get(key)) {\n scene.selectingRangeComponents.get(key).rect.delete();\n scene.selectingRangeComponents.get(key).fillhandle?.delete();\n }\n scene.selectedRangeComponents.set(key, rangeComponent);\n });\n scene.selectingRangeComponents = new Map();\n scene.updateNextFrame();\n}\n"]}
1
+ {"version":3,"sources":["../src/scenegraph/select/move-select-border.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,qDAAqD,CAAC,KAAiB;IAKrF,KAAK,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,GAAG,EAAE,EAAE;;QAC7D,MAAM,QAAQ,GAAG,KAAK,CAAC,uBAAuB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACxD,IAAI,QAAQ,EAAE;YACZ,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACvB,MAAA,QAAQ,CAAC,UAAU,0CAAE,MAAM,EAAE,CAAC;SAC/B;QACD,KAAK,CAAC,uBAAuB,CAAC,GAAG,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,wBAAwB,GAAG,IAAI,GAAG,EAAE,CAAC;IAC3C,KAAK,CAAC,eAAe,EAAE,CAAC;AAC1B,CAAC","file":"move-select-border.js","sourcesContent":["import type { Scenegraph } from '../scenegraph';\n\nexport function moveSelectingRangeComponentsToSelectedRangeComponents(scene: Scenegraph) {\n // selectingRangeComponents 是拖拽/框选过程中的临时选区;\n // 鼠标松开后需要将其“提交”为 selectedRangeComponents,用于后续 hover/滚动时持续更新位置。\n //\n // 若 selectedRangeComponents 已存在同 key 的段落(例如重复选择同一区域),先删除旧图元避免泄漏与重复绘制。\n scene.selectingRangeComponents.forEach((rangeComponent, key) => {\n const previous = scene.selectedRangeComponents.get(key);\n if (previous) {\n previous.rect.delete();\n previous.fillhandle?.delete();\n }\n scene.selectedRangeComponents.set(key, rangeComponent);\n });\n scene.selectingRangeComponents = new Map();\n scene.updateNextFrame();\n}\n"]}
@@ -0,0 +1,9 @@
1
+ import type { CellRange } from '../../ts-types';
2
+ import type { BaseTableAPI } from '../../ts-types/base-table';
3
+ type SelectRange = CellRange & {
4
+ skipBodyMerge?: boolean;
5
+ };
6
+ export declare function markHeaderSelectRange(range: CellRange): void;
7
+ export declare function restoreMergedRangeAnchor(range: CellRange): void;
8
+ export declare function autoMergeCellRanges(ranges: SelectRange[], table: BaseTableAPI): SelectRange[];
9
+ export {};
@@ -0,0 +1,155 @@
1
+ const headerSelectRanges = new WeakSet, mergedRangeAnchors = new WeakMap;
2
+
3
+ export function markHeaderSelectRange(range) {
4
+ headerSelectRanges.add(range), mergedRangeAnchors.delete(range);
5
+ }
6
+
7
+ export function restoreMergedRangeAnchor(range) {
8
+ const anchor = mergedRangeAnchors.get(range);
9
+ anchor && (range.start = Object.assign({}, anchor), mergedRangeAnchors.delete(range));
10
+ }
11
+
12
+ export function autoMergeCellRanges(ranges, table) {
13
+ var _a, _b;
14
+ if (!(null === (_a = table.options.select) || void 0 === _a ? void 0 : _a.autoMergeRanges) || ranges.length < 2) return ranges;
15
+ const eligibleRanges = ranges.map(((range, index) => ({
16
+ index: index,
17
+ range: range,
18
+ normalizedRange: normalizeRange(range),
19
+ visited: !1
20
+ }))).filter((range => !headerSelectRanges.has(range.range) && isMainBodyRange(range.normalizedRange, table)));
21
+ if (eligibleRanges.length < 2) return ranges;
22
+ const tree = buildRangeTree(eligibleRanges), mergedComponents = new Map, removedIndexes = new Set;
23
+ for (let i = 0; i < eligibleRanges.length; i++) {
24
+ const componentSeed = eligibleRanges[i];
25
+ if (componentSeed.visited) continue;
26
+ const component = [];
27
+ collectConnectedRanges(tree, componentSeed.normalizedRange, component);
28
+ for (let cursor = 0; cursor < component.length; cursor++) collectConnectedRanges(tree, component[cursor].normalizedRange, component);
29
+ if (component.length < 2) continue;
30
+ const boundingRange = getBoundingRange(component), boundingArea = getRangeArea(boundingRange);
31
+ if (getUnionArea(component.map((item => item.normalizedRange))) !== boundingArea) continue;
32
+ const componentIndexes = component.map((item => item.index)).sort(((a, b) => a - b)), targetIndex = componentIndexes[componentIndexes.length - 1], mergedRange = Object.assign({
33
+ start: Object.assign({}, boundingRange.start),
34
+ end: Object.assign({}, boundingRange.end)
35
+ }, component.every((item => item.range.skipBodyMerge)) ? {
36
+ skipBodyMerge: !0
37
+ } : {}), lastRange = ranges[targetIndex];
38
+ mergedRangeAnchors.set(mergedRange, Object.assign({}, null !== (_b = mergedRangeAnchors.get(lastRange)) && void 0 !== _b ? _b : lastRange.start)),
39
+ mergedComponents.set(targetIndex, mergedRange), componentIndexes.filter((index => index !== targetIndex)).forEach((index => {
40
+ removedIndexes.add(index);
41
+ }));
42
+ }
43
+ return mergedComponents.size ? ranges.reduce(((result, range, index) => {
44
+ var _a;
45
+ return removedIndexes.has(index) || result.push(null !== (_a = mergedComponents.get(index)) && void 0 !== _a ? _a : range),
46
+ result;
47
+ }), []) : ranges;
48
+ }
49
+
50
+ function buildRangeTree(ranges, depth = 0) {
51
+ if (1 === ranges.length) return {
52
+ bounds: ranges[0].normalizedRange,
53
+ item: ranges[0],
54
+ empty: !1
55
+ };
56
+ const axis = depth % 2 ? "row" : "col";
57
+ ranges.sort(((left, right) => left.normalizedRange.start[axis] - right.normalizedRange.start[axis]));
58
+ const middle = Math.floor(ranges.length / 2), left = buildRangeTree(ranges.slice(0, middle), depth + 1), right = buildRangeTree(ranges.slice(middle), depth + 1);
59
+ return {
60
+ left: left,
61
+ right: right,
62
+ empty: !1,
63
+ bounds: {
64
+ start: {
65
+ col: Math.min(left.bounds.start.col, right.bounds.start.col),
66
+ row: Math.min(left.bounds.start.row, right.bounds.start.row)
67
+ },
68
+ end: {
69
+ col: Math.max(left.bounds.end.col, right.bounds.end.col),
70
+ row: Math.max(left.bounds.end.row, right.bounds.end.row)
71
+ }
72
+ }
73
+ };
74
+ }
75
+
76
+ function collectConnectedRanges(node, range, result) {
77
+ if (!node.empty && isConnectedRange(node.bounds, range)) {
78
+ if ("item" in node) return node.empty = !0, node.item.visited = !0, void result.push(node.item);
79
+ collectConnectedRanges(node.left, range, result), collectConnectedRanges(node.right, range, result),
80
+ node.empty = node.left.empty && node.right.empty;
81
+ }
82
+ }
83
+
84
+ function normalizeRange(range) {
85
+ return {
86
+ start: {
87
+ col: Math.min(range.start.col, range.end.col),
88
+ row: Math.min(range.start.row, range.end.row)
89
+ },
90
+ end: {
91
+ col: Math.max(range.start.col, range.end.col),
92
+ row: Math.max(range.start.row, range.end.row)
93
+ }
94
+ };
95
+ }
96
+
97
+ function isMainBodyRange(range, table) {
98
+ const startCol = Math.max(table.rowHeaderLevelCount + table.leftRowSeriesNumberCount, table.frozenColCount), startRow = Math.max(table.columnHeaderLevelCount, table.frozenRowCount), endCol = table.colCount - table.rightFrozenColCount - 1, endRow = table.rowCount - table.bottomFrozenRowCount - 1;
99
+ return !(startCol > endCol || startRow > endRow) && (range.start.col >= startCol && range.end.col <= endCol && range.start.row >= startRow && range.end.row <= endRow && "body" === table.getCellLocation(range.start.col, range.start.row) && "body" === table.getCellLocation(range.end.col, range.end.row));
100
+ }
101
+
102
+ function isConnectedRange(left, right) {
103
+ const rowOverlap = left.start.row <= right.end.row && right.start.row <= left.end.row, colOverlap = left.start.col <= right.end.col && right.start.col <= left.end.col;
104
+ if (rowOverlap && colOverlap) return !0;
105
+ return !(!rowOverlap || left.end.col + 1 !== right.start.col && right.end.col + 1 !== left.start.col) || colOverlap && (left.end.row + 1 === right.start.row || right.end.row + 1 === left.start.row);
106
+ }
107
+
108
+ function getBoundingRange(ranges) {
109
+ return ranges.reduce(((boundingRange, item) => ({
110
+ start: {
111
+ col: Math.min(boundingRange.start.col, item.normalizedRange.start.col),
112
+ row: Math.min(boundingRange.start.row, item.normalizedRange.start.row)
113
+ },
114
+ end: {
115
+ col: Math.max(boundingRange.end.col, item.normalizedRange.end.col),
116
+ row: Math.max(boundingRange.end.row, item.normalizedRange.end.row)
117
+ }
118
+ })), {
119
+ start: Object.assign({}, ranges[0].normalizedRange.start),
120
+ end: Object.assign({}, ranges[0].normalizedRange.end)
121
+ });
122
+ }
123
+
124
+ function getRangeArea(range) {
125
+ return (range.end.col - range.start.col + 1) * (range.end.row - range.start.row + 1);
126
+ }
127
+
128
+ function getUnionArea(ranges) {
129
+ const rows = Array.from(new Set(ranges.flatMap((range => [ range.start.row, range.end.row + 1 ])))).sort(((a, b) => a - b)), rowIndexes = new Map(rows.map(((row, index) => [ row, index ]))), events = ranges.flatMap((range => {
130
+ const start = rowIndexes.get(range.start.row), end = rowIndexes.get(range.end.row + 1);
131
+ return [ {
132
+ col: range.start.col,
133
+ start: start,
134
+ end: end,
135
+ delta: 1
136
+ }, {
137
+ col: range.end.col + 1,
138
+ start: start,
139
+ end: end,
140
+ delta: -1
141
+ } ];
142
+ })).sort(((a, b) => a.col - b.col)), covers = new Int32Array(4 * rows.length), lengths = new Float64Array(4 * rows.length);
143
+ function update(node, left, right, start, end, delta) {
144
+ if (start <= left && right <= end) covers[node] += delta; else {
145
+ const middle = Math.floor((left + right) / 2);
146
+ start < middle && update(2 * node, left, middle, start, end, delta), end > middle && update(2 * node + 1, middle, right, start, end, delta);
147
+ }
148
+ lengths[node] = covers[node] ? rows[right] - rows[left] : right - left == 1 ? 0 : lengths[2 * node] + lengths[2 * node + 1];
149
+ }
150
+ let area = 0, previous = events[0].col;
151
+ for (const event of events) area += (event.col - previous) * lengths[1], update(1, 0, rows.length - 1, event.start, event.end, event.delta),
152
+ previous = event.col;
153
+ return area;
154
+ }
155
+ //# sourceMappingURL=auto-merge-ranges.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../src/state/select/auto-merge-ranges.ts"],"names":[],"mappings":"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","file":"auto-merge-ranges.js","sourcesContent":["import type { CellRange } from '../../ts-types';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\n\ntype SelectRange = CellRange & { skipBodyMerge?: boolean };\n\nconst headerSelectRanges = new WeakSet<CellRange>();\nconst mergedRangeAnchors = new WeakMap<CellRange, CellRange['start']>();\n\n/** 保留表头和序号投影选区的来源,不向公开选区对象增加字段。 */\nexport function markHeaderSelectRange(range: CellRange): void {\n headerSelectRanges.add(range);\n mergedRangeAnchors.delete(range);\n}\n\n/** Shift 首次续选时恢复归并前的活动锚点,后续仍沿用标准 start/end 状态。 */\nexport function restoreMergedRangeAnchor(range: CellRange): void {\n const anchor = mergedRangeAnchors.get(range);\n if (anchor) {\n range.start = { ...anchor };\n mergedRangeAnchors.delete(range);\n }\n}\n\ntype IndexedRange = {\n index: number;\n range: SelectRange;\n normalizedRange: CellRange;\n visited: boolean;\n};\n\ntype RangeNode = { bounds: CellRange; empty: boolean } & (\n | { item: IndexedRange }\n | { left: RangeNode; right: RangeNode }\n);\n\n/**\n * 将普通 body 主区域内、连通且恰好铺满外接矩形的多选区合并成单个矩形选区。\n * 未归并项保留对象身份,场景图据此复用其选框。\n */\nexport function autoMergeCellRanges(ranges: SelectRange[], table: BaseTableAPI): SelectRange[] {\n if (!table.options.select?.autoMergeRanges || ranges.length < 2) {\n return ranges;\n }\n\n const indexedRanges = ranges.map((range, index) => ({\n index,\n range,\n normalizedRange: normalizeRange(range),\n visited: false\n }));\n const eligibleRanges = indexedRanges.filter(\n range => !headerSelectRanges.has(range.range) && isMainBodyRange(range.normalizedRange, table)\n );\n\n if (eligibleRanges.length < 2) {\n return ranges;\n }\n\n const tree = buildRangeTree(eligibleRanges);\n const mergedComponents = new Map<number, SelectRange>();\n const removedIndexes = new Set<number>();\n\n for (let i = 0; i < eligibleRanges.length; i++) {\n const componentSeed = eligibleRanges[i];\n if (componentSeed.visited) {\n continue;\n }\n\n const component: IndexedRange[] = [];\n collectConnectedRanges(tree, componentSeed.normalizedRange, component);\n for (let cursor = 0; cursor < component.length; cursor++) {\n collectConnectedRanges(tree, component[cursor].normalizedRange, component);\n }\n\n if (component.length < 2) {\n continue;\n }\n\n const boundingRange = getBoundingRange(component);\n const boundingArea = getRangeArea(boundingRange);\n const unionArea = getUnionArea(component.map(item => item.normalizedRange));\n if (unionArea !== boundingArea) {\n continue;\n }\n\n const componentIndexes = component.map(item => item.index).sort((a, b) => a - b);\n const targetIndex = componentIndexes[componentIndexes.length - 1];\n\n const mergedRange: SelectRange = {\n start: { ...boundingRange.start },\n end: { ...boundingRange.end },\n ...(component.every(item => item.range.skipBodyMerge) ? { skipBodyMerge: true } : {})\n };\n const lastRange = ranges[targetIndex];\n mergedRangeAnchors.set(mergedRange, { ...(mergedRangeAnchors.get(lastRange) ?? lastRange.start) });\n mergedComponents.set(targetIndex, mergedRange);\n componentIndexes\n .filter(index => index !== targetIndex)\n .forEach(index => {\n removedIndexes.add(index);\n });\n }\n\n if (!mergedComponents.size) {\n return ranges;\n }\n\n return ranges.reduce<SelectRange[]>((result, range, index) => {\n if (removedIndexes.has(index)) {\n return result;\n }\n result.push(mergedComponents.get(index) ?? range);\n return result;\n }, []);\n}\n\n/** 按两个坐标轴交替划分包围盒,只检索邻近选区。 */\nfunction buildRangeTree(ranges: IndexedRange[], depth = 0): RangeNode {\n if (ranges.length === 1) {\n return { bounds: ranges[0].normalizedRange, item: ranges[0], empty: false };\n }\n const axis = depth % 2 ? 'row' : 'col';\n ranges.sort((left, right) => left.normalizedRange.start[axis] - right.normalizedRange.start[axis]);\n const middle = Math.floor(ranges.length / 2);\n const left = buildRangeTree(ranges.slice(0, middle), depth + 1);\n const right = buildRangeTree(ranges.slice(middle), depth + 1);\n return {\n left,\n right,\n empty: false,\n bounds: {\n start: {\n col: Math.min(left.bounds.start.col, right.bounds.start.col),\n row: Math.min(left.bounds.start.row, right.bounds.start.row)\n },\n end: {\n col: Math.max(left.bounds.end.col, right.bounds.end.col),\n row: Math.max(left.bounds.end.row, right.bounds.end.row)\n }\n }\n };\n}\n\n/** 收集连通的未访问选区并从索引移除,避免对同一分量重复扫描。 */\nfunction collectConnectedRanges(node: RangeNode, range: CellRange, result: IndexedRange[]): void {\n if (node.empty || !isConnectedRange(node.bounds, range)) {\n return;\n }\n if ('item' in node) {\n node.empty = true;\n node.item.visited = true;\n result.push(node.item);\n return;\n }\n collectConnectedRanges(node.left, range, result);\n collectConnectedRanges(node.right, range, result);\n node.empty = node.left.empty && node.right.empty;\n}\n\nfunction normalizeRange(range: CellRange): CellRange {\n return {\n start: {\n col: Math.min(range.start.col, range.end.col),\n row: Math.min(range.start.row, range.end.row)\n },\n end: {\n col: Math.max(range.start.col, range.end.col),\n row: Math.max(range.start.row, range.end.row)\n }\n };\n}\n\nfunction isMainBodyRange(range: CellRange, table: BaseTableAPI): boolean {\n const startCol = Math.max(table.rowHeaderLevelCount + table.leftRowSeriesNumberCount, table.frozenColCount);\n const startRow = Math.max(table.columnHeaderLevelCount, table.frozenRowCount);\n const endCol = table.colCount - table.rightFrozenColCount - 1;\n const endRow = table.rowCount - table.bottomFrozenRowCount - 1;\n\n if (startCol > endCol || startRow > endRow) {\n return false;\n }\n\n return (\n range.start.col >= startCol &&\n range.end.col <= endCol &&\n range.start.row >= startRow &&\n range.end.row <= endRow &&\n table.getCellLocation(range.start.col, range.start.row) === 'body' &&\n table.getCellLocation(range.end.col, range.end.row) === 'body'\n );\n}\n\nfunction isConnectedRange(left: CellRange, right: CellRange): boolean {\n const rowOverlap = left.start.row <= right.end.row && right.start.row <= left.end.row;\n const colOverlap = left.start.col <= right.end.col && right.start.col <= left.end.col;\n if (rowOverlap && colOverlap) {\n return true;\n }\n\n const horizontalTouch = rowOverlap && (left.end.col + 1 === right.start.col || right.end.col + 1 === left.start.col);\n if (horizontalTouch) {\n return true;\n }\n\n return colOverlap && (left.end.row + 1 === right.start.row || right.end.row + 1 === left.start.row);\n}\n\nfunction getBoundingRange(ranges: IndexedRange[]): CellRange {\n return ranges.reduce<CellRange>(\n (boundingRange, item) => ({\n start: {\n col: Math.min(boundingRange.start.col, item.normalizedRange.start.col),\n row: Math.min(boundingRange.start.row, item.normalizedRange.start.row)\n },\n end: {\n col: Math.max(boundingRange.end.col, item.normalizedRange.end.col),\n row: Math.max(boundingRange.end.row, item.normalizedRange.end.row)\n }\n }),\n {\n start: { ...ranges[0].normalizedRange.start },\n end: { ...ranges[0].normalizedRange.end }\n }\n );\n}\n\nfunction getRangeArea(range: CellRange): number {\n return (range.end.col - range.start.col + 1) * (range.end.row - range.start.row + 1);\n}\n\n/** 扫描列边界并维护行覆盖长度,避免每个列带重新扫描全部选区。 */\nfunction getUnionArea(ranges: CellRange[]): number {\n const rows = Array.from(new Set(ranges.flatMap(range => [range.start.row, range.end.row + 1]))).sort((a, b) => a - b);\n const rowIndexes = new Map(rows.map((row, index) => [row, index]));\n const events = ranges\n .flatMap(range => {\n const start = rowIndexes.get(range.start.row)!;\n const end = rowIndexes.get(range.end.row + 1)!;\n return [\n { col: range.start.col, start, end, delta: 1 },\n { col: range.end.col + 1, start, end, delta: -1 }\n ];\n })\n .sort((a, b) => a.col - b.col);\n const covers = new Int32Array(rows.length * 4);\n const lengths = new Float64Array(rows.length * 4);\n\n // 每条事件仅更新覆盖到的行区间;有覆盖时直接使用整段长度。\n function update(node: number, left: number, right: number, start: number, end: number, delta: number): void {\n if (start <= left && right <= end) {\n covers[node] += delta;\n } else {\n const middle = Math.floor((left + right) / 2);\n if (start < middle) {\n update(node * 2, left, middle, start, end, delta);\n }\n if (end > middle) {\n update(node * 2 + 1, middle, right, start, end, delta);\n }\n }\n lengths[node] = covers[node]\n ? rows[right] - rows[left]\n : right - left === 1\n ? 0\n : lengths[node * 2] + lengths[node * 2 + 1];\n }\n let area = 0;\n let previous = events[0].col;\n for (const event of events) {\n area += (event.col - previous) * lengths[1];\n update(1, 0, rows.length - 1, event.start, event.end, event.delta);\n previous = event.col;\n }\n return area;\n}\n"]}
@@ -4,9 +4,12 @@ import { InteractionState } from "../../ts-types";
4
4
 
5
5
  import { isCellDisableSelect } from "./is-cell-select-highlight";
6
6
 
7
+ import { markHeaderSelectRange, restoreMergedRangeAnchor } from "./auto-merge-ranges";
8
+
7
9
  export function updateSelectPosition(state, col, row, enableShiftSelectMode, enableCtrlSelectMode, isSelectAll, makeSelectCellVisible = !0, skipBodyMerge = !1) {
8
10
  var _a, _b;
9
11
  const {table: table, interactionState: interactionState} = state, {scenegraph: scenegraph} = table, {cellPos: cellPos} = state.select;
12
+ let selectedRange;
10
13
  if (state.select.isSelectAll = isSelectAll, -1 !== col && -1 !== row && makeSelectCellVisible && table._makeVisibleCell(col, row),
11
14
  -1 !== col && -1 !== row && makeSelectCellVisible) if (interactionState === InteractionState.grabing && state.select.ranges.length > 0) {
12
15
  const currentRange = state.select.ranges[state.select.ranges.length - 1];
@@ -101,6 +104,7 @@ export function updateSelectPosition(state, col, row, enableShiftSelectMode, ena
101
104
  }
102
105
  currentRange && currentRange.start.row <= table.rowCount - 1 && currentRange.end.row <= table.rowCount - 1 && currentRange.start.col <= table.colCount - 1 && currentRange.end.col <= table.colCount - 1 && scenegraph.updateCellSelectBorder(currentRange, extendSelectRange);
103
106
  }
107
+ selectedRange = currentRange;
104
108
  }
105
109
  } else {
106
110
  const currentRange = state.select.ranges[state.select.ranges.length - 1];
@@ -150,7 +154,7 @@ export function updateSelectPosition(state, col, row, enableShiftSelectMode, ena
150
154
  col: endCol,
151
155
  row: endRow
152
156
  });
153
- } else currentRange.end = {
157
+ } else restoreMergedRangeAnchor(currentRange), currentRange.end = {
154
158
  col: col,
155
159
  row: row
156
160
  };
@@ -389,7 +393,9 @@ export function updateSelectPosition(state, col, row, enableShiftSelectMode, ena
389
393
  const currentRange = null === (_b = state.select.ranges) || void 0 === _b ? void 0 : _b[state.select.ranges.length - 1];
390
394
  currentRange && currentRange.start.row <= table.rowCount - 1 && currentRange.end.row <= table.rowCount - 1 && currentRange.start.col <= table.colCount - 1 && currentRange.end.col <= table.colCount - 1 && scenegraph.updateCellSelectBorder(currentRange, extendSelectRange);
391
395
  }
396
+ selectedRange = state.select.ranges[state.select.ranges.length - 1];
392
397
  } else cellPos.col = -1, cellPos.row = -1, state.select.ranges = [], scenegraph.deleteAllSelectBorder();
398
+ selectedRange && (table.isHeader(col, row) || table.isSeriesNumber(col, row)) && markHeaderSelectRange(selectedRange),
393
399
  scenegraph.updateNextFrame();
394
400
  }
395
401