@visactor/vtable 1.8.0 → 1.8.1-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 (59) hide show
  1. package/cjs/components/index.js +1 -1
  2. package/cjs/core/BaseTable.js +1 -1
  3. package/cjs/core/BaseTable.js.map +1 -1
  4. package/cjs/core/TABLE_EVENT_TYPE.d.ts +2 -0
  5. package/cjs/core/TABLE_EVENT_TYPE.js +2 -0
  6. package/cjs/core/TABLE_EVENT_TYPE.js.map +1 -1
  7. package/cjs/core/style.js +2 -1
  8. package/cjs/dataset/dataset.js +0 -1
  9. package/cjs/event/listener/table-group.js +23 -13
  10. package/cjs/event/listener/table-group.js.map +1 -1
  11. package/cjs/event/scroll.js +1 -1
  12. package/cjs/event/scroll.js.map +1 -1
  13. package/cjs/index.d.ts +1 -1
  14. package/cjs/index.js +1 -1
  15. package/cjs/index.js.map +1 -1
  16. package/cjs/layout/layout-helper.js +1 -2
  17. package/cjs/layout/pivot-header-layout.js +1 -0
  18. package/cjs/scenegraph/scenegraph.js +1 -1
  19. package/cjs/state/cell-move/index.js +2 -1
  20. package/cjs/state/cell-move/index.js.map +1 -1
  21. package/cjs/state/state.d.ts +1 -0
  22. package/cjs/state/state.js +9 -3
  23. package/cjs/state/state.js.map +1 -1
  24. package/cjs/ts-types/base-table.d.ts +1 -0
  25. package/cjs/ts-types/base-table.js.map +1 -1
  26. package/cjs/ts-types/events.d.ts +11 -0
  27. package/cjs/ts-types/events.js.map +1 -1
  28. package/cjs/vrender.js.map +1 -1
  29. package/dist/vtable.js +29 -8
  30. package/dist/vtable.min.js +2 -2
  31. package/es/components/index.js +1 -1
  32. package/es/core/BaseTable.js +1 -1
  33. package/es/core/BaseTable.js.map +1 -1
  34. package/es/core/TABLE_EVENT_TYPE.d.ts +2 -0
  35. package/es/core/TABLE_EVENT_TYPE.js +2 -0
  36. package/es/core/TABLE_EVENT_TYPE.js.map +1 -1
  37. package/es/core/style.js +2 -1
  38. package/es/dataset/dataset.js +1 -2
  39. package/es/event/listener/table-group.js +23 -13
  40. package/es/event/listener/table-group.js.map +1 -1
  41. package/es/event/scroll.js +1 -1
  42. package/es/event/scroll.js.map +1 -1
  43. package/es/index.d.ts +1 -1
  44. package/es/index.js +1 -1
  45. package/es/index.js.map +1 -1
  46. package/es/layout/layout-helper.js +1 -2
  47. package/es/layout/pivot-header-layout.js +2 -1
  48. package/es/scenegraph/scenegraph.js +1 -1
  49. package/es/state/cell-move/index.js +2 -1
  50. package/es/state/cell-move/index.js.map +1 -1
  51. package/es/state/state.d.ts +1 -0
  52. package/es/state/state.js +9 -3
  53. package/es/state/state.js.map +1 -1
  54. package/es/ts-types/base-table.d.ts +1 -0
  55. package/es/ts-types/base-table.js.map +1 -1
  56. package/es/ts-types/events.d.ts +11 -0
  57. package/es/ts-types/events.js.map +1 -1
  58. package/es/vrender.js.map +1 -1
  59. package/package.json +3 -3
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/event/scroll.ts"],"names":[],"mappings":"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","file":"scroll.js","sourcesContent":["import type { StateManager } from '../state/state';\nimport { InteractionState } from '../ts-types';\nimport type { FederatedWheelEvent } from './../vrender';\n\n/**\n *\n * @param event\n * @param state\n * @param isWheelEvent 是否是由鼠标或者触摸板原生滚动事件触发进入?\n */\nexport function handleWhell(event: FederatedWheelEvent, state: StateManager, isWheelEvent: boolean = true) {\n let { deltaX, deltaY } = event;\n // 如果按住了shift 则进行横向滚动 纵向不滚动\n if (event.shiftKey && event.deltaY) {\n //mac电脑按住shift 鼠标滚动deltaX和deltaY是自动互换的,所以此逻辑只针对windows电脑有效及mac触摸板有效\n deltaX = deltaY;\n deltaY = 0;\n }\n const [optimizedDeltaX, optimizedDeltaY] = optimizeScrollXY(deltaX, deltaY, { horizontal: 1, vertical: 1 });\n if (optimizedDeltaX || optimizedDeltaY) {\n if (state.interactionState !== InteractionState.scrolling) {\n state.updateInteractionState(InteractionState.scrolling);\n }\n }\n\n if (optimizedDeltaX) {\n state.setScrollLeft(state.scroll.horizontalBarPos + optimizedDeltaX, event);\n state.showHorizontalScrollBar(true);\n }\n if (optimizedDeltaY) {\n state.setScrollTop(state.scroll.verticalBarPos + optimizedDeltaY, event);\n state.showVerticalScrollBar(true);\n }\n isWheelEvent && state.resetInteractionState();\n if (\n event.nativeEvent?.cancelable &&\n (state.table.internalProps.overscrollBehavior === 'none' ||\n (Math.abs(deltaY) >= Math.abs(deltaX) && deltaY !== 0 && isVerticalScrollable(deltaY, state)) ||\n (Math.abs(deltaY) <= Math.abs(deltaX) && deltaX !== 0 && isHorizontalScrollable(deltaX, state)))\n ) {\n event.nativeEvent.preventDefault();\n }\n}\n\ninterface ScrollSpeedRatio {\n horizontal?: number;\n vertical?: number;\n}\n\n/**\n * 优化滚动方向,对于小角度的滚动,固定为一个方向\n * @param x\n * @param y\n * @param ratio\n */\nfunction optimizeScrollXY(x: number, y: number, ratio: ScrollSpeedRatio): [number, number] {\n const ANGLE = 2; // 调参 根据斜率来调整xy方向的划分\n const angle = Math.abs(x / y);\n\n // 经过滚动优化之后的 x, y\n const deltaX = angle <= 1 / ANGLE ? 0 : x;\n const deltaY = angle > ANGLE ? 0 : y;\n\n return [Math.ceil(deltaX * (ratio.horizontal ?? 0)), Math.ceil(deltaY * (ratio.vertical ?? 0))];\n}\n\nexport function isVerticalScrollable(deltaY: number, state: StateManager) {\n const totalHeight = state.table.getAllRowsHeight() - state.table.scenegraph.height;\n if (totalHeight === 0) {\n return false;\n }\n return !isScrollToTop(deltaY, state) && !isScrollToBottom(deltaY, state);\n}\n\nexport function isHorizontalScrollable(deltaX: number, state: StateManager) {\n const totalWidth = state.table.getAllColsWidth() - state.table.scenegraph.width;\n if (totalWidth === 0) {\n return false;\n }\n return !isScrollToLeft(deltaX, state) && !isScrollToRight(deltaX, state);\n}\n\nfunction isScrollToTop(deltaY: number, state: StateManager) {\n const totalHeight = state.table.getAllRowsHeight() - state.table.scenegraph.height;\n return totalHeight !== 0 && deltaY <= 0 && state.scroll.verticalBarPos < 1;\n}\n\nfunction isScrollToBottom(deltaY: number, state: StateManager) {\n // 这里加入tolerance,避免出现无用滚动\n const sizeTolerance = state.table.options.customConfig?._disableColumnAndRowSizeRound ? 1 : 0;\n\n const totalHeight = state.table.getAllRowsHeight() - state.table.scenegraph.height;\n return totalHeight !== 0 && deltaY >= 0 && Math.abs(state.scroll.verticalBarPos - totalHeight) < 1 + sizeTolerance;\n}\n\nfunction isScrollToLeft(deltaX: number, state: StateManager) {\n const totalWidth = state.table.getAllColsWidth() - state.table.scenegraph.width;\n return totalWidth !== 0 && deltaX <= 0 && state.scroll.horizontalBarPos < 1;\n}\n\nfunction isScrollToRight(deltaX: number, state: StateManager) {\n // 这里加入tolerance,避免出现无用滚动\n const sizeTolerance = state.table.options.customConfig?._disableColumnAndRowSizeRound ? 1 : 0;\n\n const totalWidth = state.table.getAllColsWidth() - state.table.scenegraph.width;\n return totalWidth !== 0 && deltaX >= 0 && Math.abs(state.scroll.horizontalBarPos - totalWidth) < 1 + sizeTolerance;\n}\n\nexport class InertiaScroll {\n friction: number;\n lastTime: number;\n speedX: number;\n speedY: number;\n stateManager: StateManager;\n runingId: number;\n scrollHandle: (dx: number, dy: number) => void;\n constructor(stateManager: StateManager) {\n this.stateManager = stateManager;\n }\n setScrollHandle(scrollHandle: (dx: number, dy: number) => void) {\n this.scrollHandle = scrollHandle;\n }\n\n startInertia(speedX: number, speedY: number, friction: number) {\n this.lastTime = Date.now();\n this.speedX = speedX;\n this.speedY = speedY;\n this.friction = friction;\n if (!this.runingId) {\n this.runingId = requestAnimationFrame(this.inertia.bind(this));\n }\n }\n inertia() {\n const now = Date.now();\n const dffTime = now - this.lastTime;\n let stopped = true;\n const f = Math.pow(this.friction, dffTime / 16);\n const newSpeedX = f * this.speedX;\n const newSpeedY = f * this.speedY;\n let dx = 0;\n let dy = 0;\n if (Math.abs(newSpeedX) > 0.05) {\n stopped = false;\n dx = ((this.speedX + newSpeedX) / 2) * dffTime;\n }\n if (Math.abs(newSpeedY) > 0.05) {\n stopped = false;\n dy = ((this.speedY + newSpeedY) / 2) * dffTime;\n }\n this.scrollHandle?.(dx, dy);\n if (stopped) {\n this.runingId = null;\n return;\n }\n this.lastTime = now;\n this.speedX = newSpeedX;\n this.speedY = newSpeedY;\n\n this.runingId = requestAnimationFrame(this.inertia.bind(this));\n }\n endInertia() {\n cancelAnimationFrame(this.runingId);\n this.runingId = null;\n }\n isInertiaScrolling() {\n return !!this.runingId;\n }\n}\n"]}
1
+ {"version":3,"sources":["../src/event/scroll.ts"],"names":[],"mappings":"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","file":"scroll.js","sourcesContent":["import type { StateManager } from '../state/state';\nimport { InteractionState } from '../ts-types';\nimport type { FederatedWheelEvent } from './../vrender';\n\n/**\n *\n * @param event\n * @param state\n * @param isWheelEvent 是否是由鼠标或者触摸板原生滚动事件触发进入?\n */\nexport function handleWhell(event: FederatedWheelEvent, state: StateManager, isWheelEvent: boolean = true) {\n let { deltaX, deltaY } = event;\n // 如果按住了shift 则进行横向滚动 纵向不滚动\n if (event.shiftKey && event.deltaY) {\n //mac电脑按住shift 鼠标滚动deltaX和deltaY是自动互换的,所以此逻辑只针对windows电脑有效及mac触摸板有效\n deltaX = deltaY;\n deltaY = 0;\n }\n const [optimizedDeltaX, optimizedDeltaY] = optimizeScrollXY(deltaX, deltaY, { horizontal: 1, vertical: 1 });\n if (optimizedDeltaX || optimizedDeltaY) {\n if (state.interactionState !== InteractionState.scrolling) {\n state.updateInteractionState(InteractionState.scrolling);\n }\n }\n\n if (optimizedDeltaX) {\n state.setScrollLeft(state.scroll.horizontalBarPos + optimizedDeltaX, event);\n state.showHorizontalScrollBar(true);\n }\n if (optimizedDeltaY) {\n state.setScrollTop(state.scroll.verticalBarPos + optimizedDeltaY, event);\n state.showVerticalScrollBar(true);\n }\n isWheelEvent && state.resetInteractionState(state.interactionStateBeforeScroll);\n if (\n event.nativeEvent?.cancelable &&\n (state.table.internalProps.overscrollBehavior === 'none' ||\n (Math.abs(deltaY) >= Math.abs(deltaX) && deltaY !== 0 && isVerticalScrollable(deltaY, state)) ||\n (Math.abs(deltaY) <= Math.abs(deltaX) && deltaX !== 0 && isHorizontalScrollable(deltaX, state)))\n ) {\n event.nativeEvent.preventDefault();\n }\n}\n\ninterface ScrollSpeedRatio {\n horizontal?: number;\n vertical?: number;\n}\n\n/**\n * 优化滚动方向,对于小角度的滚动,固定为一个方向\n * @param x\n * @param y\n * @param ratio\n */\nfunction optimizeScrollXY(x: number, y: number, ratio: ScrollSpeedRatio): [number, number] {\n const ANGLE = 2; // 调参 根据斜率来调整xy方向的划分\n const angle = Math.abs(x / y);\n\n // 经过滚动优化之后的 x, y\n const deltaX = angle <= 1 / ANGLE ? 0 : x;\n const deltaY = angle > ANGLE ? 0 : y;\n\n return [Math.ceil(deltaX * (ratio.horizontal ?? 0)), Math.ceil(deltaY * (ratio.vertical ?? 0))];\n}\n\nexport function isVerticalScrollable(deltaY: number, state: StateManager) {\n const totalHeight = state.table.getAllRowsHeight() - state.table.scenegraph.height;\n if (totalHeight === 0) {\n return false;\n }\n return !isScrollToTop(deltaY, state) && !isScrollToBottom(deltaY, state);\n}\n\nexport function isHorizontalScrollable(deltaX: number, state: StateManager) {\n const totalWidth = state.table.getAllColsWidth() - state.table.scenegraph.width;\n if (totalWidth === 0) {\n return false;\n }\n return !isScrollToLeft(deltaX, state) && !isScrollToRight(deltaX, state);\n}\n\nfunction isScrollToTop(deltaY: number, state: StateManager) {\n const totalHeight = state.table.getAllRowsHeight() - state.table.scenegraph.height;\n return totalHeight !== 0 && deltaY <= 0 && state.scroll.verticalBarPos < 1;\n}\n\nfunction isScrollToBottom(deltaY: number, state: StateManager) {\n // 这里加入tolerance,避免出现无用滚动\n const sizeTolerance = state.table.options.customConfig?._disableColumnAndRowSizeRound ? 1 : 0;\n\n const totalHeight = state.table.getAllRowsHeight() - state.table.scenegraph.height;\n return totalHeight !== 0 && deltaY >= 0 && Math.abs(state.scroll.verticalBarPos - totalHeight) < 1 + sizeTolerance;\n}\n\nfunction isScrollToLeft(deltaX: number, state: StateManager) {\n const totalWidth = state.table.getAllColsWidth() - state.table.scenegraph.width;\n return totalWidth !== 0 && deltaX <= 0 && state.scroll.horizontalBarPos < 1;\n}\n\nfunction isScrollToRight(deltaX: number, state: StateManager) {\n // 这里加入tolerance,避免出现无用滚动\n const sizeTolerance = state.table.options.customConfig?._disableColumnAndRowSizeRound ? 1 : 0;\n\n const totalWidth = state.table.getAllColsWidth() - state.table.scenegraph.width;\n return totalWidth !== 0 && deltaX >= 0 && Math.abs(state.scroll.horizontalBarPos - totalWidth) < 1 + sizeTolerance;\n}\n\nexport class InertiaScroll {\n friction: number;\n lastTime: number;\n speedX: number;\n speedY: number;\n stateManager: StateManager;\n runingId: number;\n scrollHandle: (dx: number, dy: number) => void;\n constructor(stateManager: StateManager) {\n this.stateManager = stateManager;\n }\n setScrollHandle(scrollHandle: (dx: number, dy: number) => void) {\n this.scrollHandle = scrollHandle;\n }\n\n startInertia(speedX: number, speedY: number, friction: number) {\n this.lastTime = Date.now();\n this.speedX = speedX;\n this.speedY = speedY;\n this.friction = friction;\n if (!this.runingId) {\n this.runingId = requestAnimationFrame(this.inertia.bind(this));\n }\n }\n inertia() {\n const now = Date.now();\n const dffTime = now - this.lastTime;\n let stopped = true;\n const f = Math.pow(this.friction, dffTime / 16);\n const newSpeedX = f * this.speedX;\n const newSpeedY = f * this.speedY;\n let dx = 0;\n let dy = 0;\n if (Math.abs(newSpeedX) > 0.05) {\n stopped = false;\n dx = ((this.speedX + newSpeedX) / 2) * dffTime;\n }\n if (Math.abs(newSpeedY) > 0.05) {\n stopped = false;\n dy = ((this.speedY + newSpeedY) / 2) * dffTime;\n }\n this.scrollHandle?.(dx, dy);\n if (stopped) {\n this.runingId = null;\n return;\n }\n this.lastTime = now;\n this.speedX = newSpeedX;\n this.speedY = newSpeedY;\n\n this.runingId = requestAnimationFrame(this.inertia.bind(this));\n }\n endInertia() {\n cancelAnimationFrame(this.runingId);\n this.runingId = null;\n }\n isInertiaScrolling() {\n return !!this.runingId;\n }\n}\n"]}
package/cjs/index.d.ts CHANGED
@@ -19,7 +19,7 @@ import { restoreMeasureText, setCustomAlphabetCharSet } from './scenegraph/utils
19
19
  export { getDataCellPath } from './tools/get-data-path';
20
20
  export * from './render/jsx';
21
21
  export { getTargetCell } from './event/util';
22
- export declare const version = "1.8.0";
22
+ export declare const version = "1.8.1-alpha.1";
23
23
  export { TYPES, core, ListTable, ListTableSimple, ListTableConstructorOptions, PivotTable, PivotTableSimple, PivotTableConstructorOptions, PivotChartConstructorOptions, PivotChart, GanttConstructorOptions, IHeaderTreeDefine, IDimension, IIndicator, ITitleDefine, ICornerDefine, ColumnsDefine, ColumnDefine, LinkColumnDefine, ChartColumnDefine, ImageColumnDefine, SparklineColumnDefine, ProgressbarColumnDefine, TextColumnDefine, GroupColumnDefine, TextAlignType, TextBaselineType, themes, data, MousePointerCellEvent, getIcons, clearGlobal, register, DataStatistics, CustomLayout, updateCell, renderChart, graphicUtil, setCustomAlphabetCharSet, restoreMeasureText };
24
24
  declare function getIcons(): {
25
25
  [key: string]: TYPES.ColumnIconOption;
package/cjs/index.js CHANGED
@@ -169,7 +169,7 @@ Object.defineProperty(exports, "getTargetCell", {
169
169
  get: function() {
170
170
  return util_1.getTargetCell;
171
171
  }
172
- }), exports.version = "1.8.0", exports.getIcons = getIcons, exports.clearGlobal = clearGlobal,
172
+ }), exports.version = "1.8.1-alpha.1", exports.getIcons = getIcons, exports.clearGlobal = clearGlobal,
173
173
  TYPES.AggregationType, __exportStar(require("./components"), exports), __exportStar(require("./scenegraph/group-creater/cell-type"), exports);
174
174
 
175
175
  var TABLE_EVENT_TYPE_1 = require("./core/TABLE_EVENT_TYPE");
package/cjs/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uCAA4D;AAyG1D,4FAzGO,qBAAW,OAyGP;AAxGb,IAAA,4BAAkB,GAAE,CAAC;AAErB,kDAAoC;AA6DlC,sBAAK;AA5DP,6CAA+B;AA6D7B,oBAAI;AA5DN,6CAA+B;AAuF7B,oBAAI;AAtFN,+CAAiC;AACjC,qDAAuC;AA0FrC,4BAAQ;AAzFV,iDAAmC;AAmFjC,wBAAM;AAlFR,yEAA2D;AA4FzD,wCAAc;AArEhB,mDAA4D;AAkC1D,0FAlCuB,4BAAS,OAkCvB;AAjCX,yDAAqD;AAkCnD,gGAlCO,kCAAe,OAkCP;AAhCjB,qDAA+D;AAkC7D,2FAlCwB,8BAAU,OAkCxB;AAjCZ,2DAAuD;AAkCrD,iGAlCO,oCAAgB,OAkCP;AAjClB,6CAA0C;AAoCxC,2FApCO,uBAAU,OAoCP;AAlCZ,8DAAgD;AA+D9C,oCAAY;AA7Dd,wEAAoE;AA8DlE,2FA9DO,wBAAU,OA8DP;AA7DZ,gGAAqF;AA8DnF,4FA9DO,iCAAW,OA8DP;AA7Db,kEAA+F;AAgE7F,mGAhEO,iCAAkB,OAgEP;AADlB,yGA/D2B,uCAAwB,OA+D3B;AA1D1B,uDAAwD;AAA/C,gHAAA,eAAe,OAAA;AACxB,+CAA6B;AAC7B,qCAA6C;AAApC,qGAAA,aAAa,OAAA;AAKT,QAAA,OAAO,GAAG,OAAO,CAAC;AAyD/B,SAAS,QAAQ;IAGf,OAAO,KAAK,CAAC,GAAG,EAAE,CAAC;AACrB,CAAC;AAtBC,4BAAQ;AAwBV,SAAS,WAAW;IAClB,QAAQ,CAAC,QAAQ,EAAE,CAAC;AAGtB,CAAC;AA3BC,kCAAW;AA4Bb,KAAK,CAAC,eAAe,CAAC;AAEtB,+CAA6B;AAC7B,uEAAqD;AAErD,4DAA2D;AAAlD,oHAAA,gBAAgB,OAAA;AACzB,wFAA+G;AAAtG,gIAAA,sBAAsB,OAAA;AAAE,gIAAA,sBAAsB,OAAA","file":"index.js","sourcesContent":["/* eslint-disable sort-imports */\nimport { graphicUtil, registerForVrender } from './vrender';\nregisterForVrender();\n\nimport * as TYPES from './ts-types';\nimport * as core from './core';\nimport * as data from './data';\nimport * as icons from './icons';\nimport * as register from './register';\nimport * as themes from './themes';\nimport * as DataStatistics from './dataset/DataStatistics';\nimport type {\n ColumnDefine,\n ColumnsDefine,\n LinkColumnDefine,\n ChartColumnDefine,\n ImageColumnDefine,\n SparklineColumnDefine,\n ProgressbarColumnDefine,\n TextColumnDefine,\n GroupColumnDefine,\n ListTableConstructorOptions,\n PivotTableConstructorOptions,\n PivotChartConstructorOptions,\n GanttConstructorOptions,\n IHeaderTreeDefine,\n IDimension,\n IIndicator,\n ITitleDefine,\n ICornerDefine,\n TextAlignType,\n TextBaselineType\n} from './ts-types';\nimport { ListTableAll as ListTable } from './ListTable-all';\nimport { ListTableSimple } from './ListTable-simple';\n// import { PivotTable } from './PivotTable';\nimport { PivotTableAll as PivotTable } from './PivotTable-all';\nimport { PivotTableSimple } from './PivotTable-simple';\nimport { PivotChart } from './PivotChart';\nimport type { MousePointerCellEvent } from './ts-types/events';\nimport * as CustomLayout from './render/layout';\n\nimport { updateCell } from './scenegraph/group-creater/cell-helper';\nimport { renderChart } from './scenegraph/graphic/contributions/chart-render-helper';\nimport { restoreMeasureText, setCustomAlphabetCharSet } from './scenegraph/utils/text-measure';\n\n// import { container, loadCanvasPicker } from '@src/vrender';\n// loadCanvasPicker(container);\n\nexport { getDataCellPath } from './tools/get-data-path';\nexport * from './render/jsx';\nexport { getTargetCell } from './event/util';\n\n// export * as VRender from './vrender';\n// import * as VRender from './vrender';\n\nexport const version = \"1.8.0\";\n/**\n * @namespace VTable\n */\nexport {\n /**\n * Types\n * @namespace VTable.TYPES\n */\n TYPES,\n core,\n ListTable,\n ListTableSimple,\n ListTableConstructorOptions,\n PivotTable,\n PivotTableSimple,\n PivotTableConstructorOptions,\n PivotChartConstructorOptions,\n PivotChart,\n GanttConstructorOptions,\n IHeaderTreeDefine,\n IDimension,\n IIndicator,\n ITitleDefine,\n ICornerDefine,\n ColumnsDefine,\n ColumnDefine,\n LinkColumnDefine,\n ChartColumnDefine,\n ImageColumnDefine,\n SparklineColumnDefine,\n ProgressbarColumnDefine,\n TextColumnDefine,\n GroupColumnDefine,\n TextAlignType,\n TextBaselineType,\n themes,\n data,\n MousePointerCellEvent,\n getIcons,\n clearGlobal,\n //plugin registers\n register,\n /**\n * 暂不推荐使用\n */\n DataStatistics,\n CustomLayout,\n updateCell,\n renderChart,\n graphicUtil,\n setCustomAlphabetCharSet,\n restoreMeasureText\n // VRender // should use import {xxx} from '@visactor/vtable/es/vrender'\n};\n\n/** @private */\nfunction getIcons(): {\n [key: string]: TYPES.ColumnIconOption;\n} {\n return icons.get();\n}\n/** 清理内部的全局变量 如注册的icon theme等 以及共享的header column类实例 */\nfunction clearGlobal() {\n register.clearAll();\n // headers.type.clearGlobal();\n // columns.type.clearGlobal();\n}\nTYPES.AggregationType;\n\nexport * from './components';\nexport * from './scenegraph/group-creater/cell-type';\n\nexport { TABLE_EVENT_TYPE } from './core/TABLE_EVENT_TYPE';\nexport { PIVOT_CHART_EVENT_TYPE, PIVOT_TABLE_EVENT_TYPE } from './ts-types/pivot-table/PIVOT_TABLE_EVENT_TYPE';\n"]}
1
+ {"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uCAA4D;AAyG1D,4FAzGO,qBAAW,OAyGP;AAxGb,IAAA,4BAAkB,GAAE,CAAC;AAErB,kDAAoC;AA6DlC,sBAAK;AA5DP,6CAA+B;AA6D7B,oBAAI;AA5DN,6CAA+B;AAuF7B,oBAAI;AAtFN,+CAAiC;AACjC,qDAAuC;AA0FrC,4BAAQ;AAzFV,iDAAmC;AAmFjC,wBAAM;AAlFR,yEAA2D;AA4FzD,wCAAc;AArEhB,mDAA4D;AAkC1D,0FAlCuB,4BAAS,OAkCvB;AAjCX,yDAAqD;AAkCnD,gGAlCO,kCAAe,OAkCP;AAhCjB,qDAA+D;AAkC7D,2FAlCwB,8BAAU,OAkCxB;AAjCZ,2DAAuD;AAkCrD,iGAlCO,oCAAgB,OAkCP;AAjClB,6CAA0C;AAoCxC,2FApCO,uBAAU,OAoCP;AAlCZ,8DAAgD;AA+D9C,oCAAY;AA7Dd,wEAAoE;AA8DlE,2FA9DO,wBAAU,OA8DP;AA7DZ,gGAAqF;AA8DnF,4FA9DO,iCAAW,OA8DP;AA7Db,kEAA+F;AAgE7F,mGAhEO,iCAAkB,OAgEP;AADlB,yGA/D2B,uCAAwB,OA+D3B;AA1D1B,uDAAwD;AAA/C,gHAAA,eAAe,OAAA;AACxB,+CAA6B;AAC7B,qCAA6C;AAApC,qGAAA,aAAa,OAAA;AAKT,QAAA,OAAO,GAAG,eAAe,CAAC;AAyDvC,SAAS,QAAQ;IAGf,OAAO,KAAK,CAAC,GAAG,EAAE,CAAC;AACrB,CAAC;AAtBC,4BAAQ;AAwBV,SAAS,WAAW;IAClB,QAAQ,CAAC,QAAQ,EAAE,CAAC;AAGtB,CAAC;AA3BC,kCAAW;AA4Bb,KAAK,CAAC,eAAe,CAAC;AAEtB,+CAA6B;AAC7B,uEAAqD;AAErD,4DAA2D;AAAlD,oHAAA,gBAAgB,OAAA;AACzB,wFAA+G;AAAtG,gIAAA,sBAAsB,OAAA;AAAE,gIAAA,sBAAsB,OAAA","file":"index.js","sourcesContent":["/* eslint-disable sort-imports */\nimport { graphicUtil, registerForVrender } from './vrender';\nregisterForVrender();\n\nimport * as TYPES from './ts-types';\nimport * as core from './core';\nimport * as data from './data';\nimport * as icons from './icons';\nimport * as register from './register';\nimport * as themes from './themes';\nimport * as DataStatistics from './dataset/DataStatistics';\nimport type {\n ColumnDefine,\n ColumnsDefine,\n LinkColumnDefine,\n ChartColumnDefine,\n ImageColumnDefine,\n SparklineColumnDefine,\n ProgressbarColumnDefine,\n TextColumnDefine,\n GroupColumnDefine,\n ListTableConstructorOptions,\n PivotTableConstructorOptions,\n PivotChartConstructorOptions,\n GanttConstructorOptions,\n IHeaderTreeDefine,\n IDimension,\n IIndicator,\n ITitleDefine,\n ICornerDefine,\n TextAlignType,\n TextBaselineType\n} from './ts-types';\nimport { ListTableAll as ListTable } from './ListTable-all';\nimport { ListTableSimple } from './ListTable-simple';\n// import { PivotTable } from './PivotTable';\nimport { PivotTableAll as PivotTable } from './PivotTable-all';\nimport { PivotTableSimple } from './PivotTable-simple';\nimport { PivotChart } from './PivotChart';\nimport type { MousePointerCellEvent } from './ts-types/events';\nimport * as CustomLayout from './render/layout';\n\nimport { updateCell } from './scenegraph/group-creater/cell-helper';\nimport { renderChart } from './scenegraph/graphic/contributions/chart-render-helper';\nimport { restoreMeasureText, setCustomAlphabetCharSet } from './scenegraph/utils/text-measure';\n\n// import { container, loadCanvasPicker } from '@src/vrender';\n// loadCanvasPicker(container);\n\nexport { getDataCellPath } from './tools/get-data-path';\nexport * from './render/jsx';\nexport { getTargetCell } from './event/util';\n\n// export * as VRender from './vrender';\n// import * as VRender from './vrender';\n\nexport const version = \"1.8.1-alpha.1\";\n/**\n * @namespace VTable\n */\nexport {\n /**\n * Types\n * @namespace VTable.TYPES\n */\n TYPES,\n core,\n ListTable,\n ListTableSimple,\n ListTableConstructorOptions,\n PivotTable,\n PivotTableSimple,\n PivotTableConstructorOptions,\n PivotChartConstructorOptions,\n PivotChart,\n GanttConstructorOptions,\n IHeaderTreeDefine,\n IDimension,\n IIndicator,\n ITitleDefine,\n ICornerDefine,\n ColumnsDefine,\n ColumnDefine,\n LinkColumnDefine,\n ChartColumnDefine,\n ImageColumnDefine,\n SparklineColumnDefine,\n ProgressbarColumnDefine,\n TextColumnDefine,\n GroupColumnDefine,\n TextAlignType,\n TextBaselineType,\n themes,\n data,\n MousePointerCellEvent,\n getIcons,\n clearGlobal,\n //plugin registers\n register,\n /**\n * 暂不推荐使用\n */\n DataStatistics,\n CustomLayout,\n updateCell,\n renderChart,\n graphicUtil,\n setCustomAlphabetCharSet,\n restoreMeasureText\n // VRender // should use import {xxx} from '@visactor/vtable/es/vrender'\n};\n\n/** @private */\nfunction getIcons(): {\n [key: string]: TYPES.ColumnIconOption;\n} {\n return icons.get();\n}\n/** 清理内部的全局变量 如注册的icon theme等 以及共享的header column类实例 */\nfunction clearGlobal() {\n register.clearAll();\n // headers.type.clearGlobal();\n // columns.type.clearGlobal();\n}\nTYPES.AggregationType;\n\nexport * from './components';\nexport * from './scenegraph/group-creater/cell-type';\n\nexport { TABLE_EVENT_TYPE } from './core/TABLE_EVENT_TYPE';\nexport { PIVOT_CHART_EVENT_TYPE, PIVOT_TABLE_EVENT_TYPE } from './ts-types/pivot-table/PIVOT_TABLE_EVENT_TYPE';\n"]}
@@ -140,5 +140,4 @@ function supplementIndicatorNodesForCustomTree(customTree, indicators) {
140
140
  exports.checkHasAggregation = checkHasAggregation, exports.checkHasAggregationOnTop = checkHasAggregationOnTop,
141
141
  exports.checkHasAggregationOnBottom = checkHasAggregationOnBottom, exports.checkHasTreeDefine = checkHasTreeDefine,
142
142
  exports.hasAutoImageColumn = hasAutoImageColumn, exports.parseColKeyRowKeyForPivotTable = parseColKeyRowKeyForPivotTable,
143
- exports.supplementIndicatorNodesForCustomTree = supplementIndicatorNodesForCustomTree;
144
- //# sourceMappingURL=layout-helper.js.map
143
+ exports.supplementIndicatorNodesForCustomTree = supplementIndicatorNodesForCustomTree;
@@ -1694,4 +1694,5 @@ function bandSpace(count, paddingInner, paddingOuter) {
1694
1694
  count ? space > 0 ? space : 1 : 0;
1695
1695
  }
1696
1696
 
1697
+ //# sourceMappingURL=pivot-header-layout.js.map
1697
1698
  exports.PivotHeaderLayoutMap = PivotHeaderLayoutMap;
@@ -815,4 +815,4 @@ class Scenegraph {
815
815
  }
816
816
 
817
817
  exports.Scenegraph = Scenegraph;
818
- //# sourceMappingURL=scenegraph.js.map
818
+ //# sourceMappingURL=scenegraph.js.map
@@ -47,8 +47,9 @@ function updateMoveCol(col, row, x, y, state) {
47
47
  }
48
48
 
49
49
  function endMoveCol(state) {
50
+ var _a;
50
51
  let moveColResult = !1;
51
- if ("canMoveHeaderPosition" in state.table.internalProps.layoutMap && state.columnMove.moving && state.columnMove.colSource >= 0 && state.columnMove.rowSource >= 0 && state.columnMove.colTarget >= 0 && state.columnMove.rowTarget >= 0) {
52
+ if ("canMoveHeaderPosition" in state.table.internalProps.layoutMap && state.columnMove.moving && state.columnMove.colSource >= 0 && state.columnMove.rowSource >= 0 && state.columnMove.colTarget >= 0 && state.columnMove.rowTarget >= 0 && !0 !== (null === (_a = state.table.options.customConfig) || void 0 === _a ? void 0 : _a.notUpdateInColumnRowMove)) {
52
53
  const oldSourceMergeInfo = state.table.getCellRange(state.columnMove.colSource, state.columnMove.rowSource), oldTargetMergeInfo = state.table.getCellRange(state.columnMove.colTarget, state.columnMove.rowTarget), moveContext = state.table._moveHeaderPosition({
53
54
  col: state.columnMove.colSource,
54
55
  row: state.columnMove.rowSource
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/state/cell-move/index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["import type { ListTable } from '../../ListTable';\nimport type { SimpleHeaderLayoutMap } from '../../layout';\nimport type { PivotHeaderLayoutMap } from '../../layout/pivot-header-layout';\nimport { getCellMergeInfo } from '../../scenegraph/utils/get-cell-merge';\nimport type { CellRange } from '../../ts-types';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport type { StateManager } from '../state';\nimport { adjustMoveHeaderTarget } from './adjust-header';\n\nexport function startMoveCol(col: number, row: number, x: number, y: number, state: StateManager) {\n if (!('canMoveHeaderPosition' in state.table.internalProps.layoutMap)) {\n return;\n }\n state.columnMove.moving = true;\n state.columnMove.colSource = col;\n state.columnMove.rowSource = row;\n state.columnMove.x = x - state.table.tableX;\n state.columnMove.y = y - state.table.tableY;\n\n const cellLocation = state.table.getCellLocation(col, row);\n const delta =\n cellLocation === 'columnHeader'\n ? state.columnMove.x\n : cellLocation === 'rowHeader' ||\n (state.table.internalProps.layoutMap as SimpleHeaderLayoutMap).isSeriesNumberInBody(col, row)\n ? state.columnMove.y\n : 0;\n\n state.table.scenegraph.component.showMoveCol(col, row, delta);\n\n // 调整列顺序期间清空选中清空\n const isHasSelected = !!state.select.ranges?.length;\n state.table.stateManager.updateSelectPos(-1, -1);\n state.table.stateManager.endSelectCells(true, isHasSelected);\n state.table.scenegraph.updateNextFrame();\n}\n\nexport function updateMoveCol(col: number, row: number, x: number, y: number, state: StateManager) {\n if (!('canMoveHeaderPosition' in state.table.internalProps.layoutMap)) {\n return;\n }\n\n const targetCell = adjustMoveHeaderTarget(\n { col: state.columnMove.colSource, row: state.columnMove.rowSource },\n { col, row },\n state.table\n );\n\n const canMove = state.table.internalProps.layoutMap.canMoveHeaderPosition(\n { col: state.columnMove.colSource, row: state.columnMove.rowSource },\n { col: targetCell.col, row: targetCell.row }\n );\n if (!canMove) {\n state.updateCursor('not-allowed');\n state.columnMove.colTarget = state.columnMove.colSource;\n state.columnMove.rowTarget = state.columnMove.rowSource;\n } else {\n state.columnMove.x = x - state.table.tableX;\n state.columnMove.y = y - state.table.tableY;\n state.columnMove.colTarget = targetCell.col;\n state.columnMove.rowTarget = targetCell.row;\n state.updateCursor('grabbing');\n let lineX;\n let backX;\n let lineY;\n let backY;\n const cellLocation = state.table.getCellLocation(state.columnMove.colSource, state.columnMove.rowSource);\n if (cellLocation === 'columnHeader') {\n backX = state.columnMove.x;\n if (state.table.isLeftFrozenColumn(col)) {\n lineX =\n state.columnMove.colTarget >= state.columnMove.colSource\n ? state.table.getColsWidth(0, state.columnMove.colTarget)\n : state.table.getColsWidth(0, state.columnMove.colTarget - 1);\n } else if (state.table.isRightFrozenColumn(col)) {\n lineX = state.table.tableNoFrameWidth - state.table.getColsWidth(targetCell.col + 1, state.table.colCount - 1);\n } else {\n lineX =\n (state.columnMove.colTarget >= state.columnMove.colSource\n ? state.table.getColsWidth(0, state.columnMove.colTarget)\n : state.table.getColsWidth(0, state.columnMove.colTarget - 1)) -\n state.table.stateManager.scroll.horizontalBarPos;\n }\n } else if (\n cellLocation === 'rowHeader' ||\n (state.table.internalProps.layoutMap as SimpleHeaderLayoutMap).isSeriesNumberInBody(col, row)\n ) {\n backY = state.columnMove.y;\n if (state.table.isFrozenRow(row)) {\n lineY =\n state.columnMove.rowTarget >= state.columnMove.rowSource\n ? state.table.getRowsHeight(0, state.columnMove.rowTarget)\n : state.table.getRowsHeight(0, state.columnMove.rowTarget - 1);\n } else if (state.table.isBottomFrozenRow(row)) {\n lineY =\n state.table.tableNoFrameHeight - state.table.getRowsHeight(targetCell.row + 1, state.table.rowCount - 1);\n } else {\n lineY =\n (state.columnMove.rowTarget >= state.columnMove.rowSource\n ? state.table.getRowsHeight(0, state.columnMove.rowTarget)\n : state.table.getRowsHeight(0, state.columnMove.rowTarget - 1)) -\n state.table.stateManager.scroll.verticalBarPos;\n }\n }\n\n state.table.scenegraph.component.updateMoveCol(backX, lineX, backY, lineY);\n state.table.scenegraph.updateNextFrame();\n }\n}\n\nexport function endMoveCol(state: StateManager): boolean {\n let moveColResult = false;\n if (\n 'canMoveHeaderPosition' in state.table.internalProps.layoutMap &&\n state.columnMove.moving &&\n state.columnMove.colSource >= 0 &&\n state.columnMove.rowSource >= 0 &&\n state.columnMove.colTarget >= 0 &&\n state.columnMove.rowTarget >= 0\n ) {\n //getCellMergeInfo 一定要在moveHeaderPosition之前调用 否则就不是修改前的range了\n const oldSourceMergeInfo = state.table.getCellRange(state.columnMove.colSource, state.columnMove.rowSource);\n const oldTargetMergeInfo = state.table.getCellRange(state.columnMove.colTarget, state.columnMove.rowTarget);\n // 调整列顺序\n const moveContext = state.table._moveHeaderPosition(\n { col: state.columnMove.colSource, row: state.columnMove.rowSource },\n { col: state.columnMove.colTarget, row: state.columnMove.rowTarget }\n );\n\n // 更新状态\n if (moveContext && moveContext.targetIndex !== moveContext.sourceIndex) {\n state.table.internalProps.useOneRowHeightFillAll = false;\n state.table.internalProps.layoutMap.clearCellRangeMap();\n const sourceMergeInfo = state.table.getCellRange(state.columnMove.colSource, state.columnMove.rowSource);\n const targetMergeInfo = state.table.getCellRange(state.columnMove.colTarget, state.columnMove.rowTarget);\n\n const colMin = Math.min(\n sourceMergeInfo.start.col,\n targetMergeInfo.start.col,\n oldSourceMergeInfo.start.col,\n oldTargetMergeInfo.start.col\n );\n const colMax = Math.max(\n sourceMergeInfo.end.col,\n targetMergeInfo.end.col,\n oldSourceMergeInfo.end.col,\n oldTargetMergeInfo.end.col\n );\n const rowMin = Math.min(\n sourceMergeInfo.start.row,\n targetMergeInfo.start.row,\n oldSourceMergeInfo.start.row,\n oldTargetMergeInfo.start.row\n );\n let rowMax = Math.max(\n sourceMergeInfo.end.row,\n targetMergeInfo.end.row,\n oldSourceMergeInfo.end.row,\n oldTargetMergeInfo.end.row\n );\n if (\n moveContext.moveType === 'row' &&\n (state.table.internalProps.layoutMap as PivotHeaderLayoutMap).rowHierarchyType === 'tree'\n ) {\n if (moveContext.targetIndex > moveContext.sourceIndex) {\n rowMax = rowMax + moveContext.targetSize - 1;\n } else {\n rowMax = rowMax + moveContext.sourceSize - 1;\n }\n }\n if (\n !(state.table as ListTable).transpose &&\n (state.table.internalProps.layoutMap as SimpleHeaderLayoutMap).isSeriesNumberInBody(\n state.columnMove.colSource,\n state.columnMove.rowSource\n )\n ) {\n state.table.changeRecordOrder(moveContext.sourceIndex, moveContext.targetIndex);\n state.changeCheckboxAndRadioOrder(moveContext.sourceIndex, moveContext.targetIndex);\n }\n // clear columns width and rows height cache\n if (moveContext.moveType === 'column') {\n clearWidthsAndHeightsCache(colMin, colMax, 0, -1, state.table);\n } else {\n clearWidthsAndHeightsCache(0, -1, rowMin, rowMax, state.table);\n }\n\n // clear cell style cache\n state.table.clearCellStyleCache();\n if (\n state.table.internalProps.layoutMap.isSeriesNumberInBody(state.columnMove.colSource, state.columnMove.rowSource)\n ) {\n // 如果是拖拽序号换位置 考虑到非拖拽单元格合并而是其他地方有合并被拆开或者独立单元格拖拽后变为合并的情况 这里直接刷新这个场景树的节点 才能覆盖所有情况\n state.table.scenegraph.updateHeaderPosition(\n state.table.scenegraph.proxy.colStart,\n state.table.scenegraph.proxy.colEnd,\n state.table.scenegraph.proxy.rowStart,\n state.table.scenegraph.proxy.rowEnd,\n moveContext.moveType\n );\n } else if (moveContext.moveType === 'column') {\n state.table.scenegraph.updateHeaderPosition(colMin, colMax, 0, -1, moveContext.moveType);\n } else {\n state.table.scenegraph.updateHeaderPosition(0, -1, rowMin, rowMax, moveContext.moveType);\n }\n //调整冻结列数量\n if (state.table.internalProps.frozenColDragHeaderMode === 'adjustFrozenCount' && state.table.isListTable()) {\n if (\n state.table.isLeftFrozenColumn(state.columnMove.colTarget) &&\n !state.table.isLeftFrozenColumn(state.columnMove.colSource)\n ) {\n state.table.frozenColCount +=\n (sourceMergeInfo as CellRange).end.col - (sourceMergeInfo as CellRange).start.col + 1;\n } else if (\n state.table.isLeftFrozenColumn(state.columnMove.colSource) &&\n !state.table.isLeftFrozenColumn(state.columnMove.colTarget)\n ) {\n state.table.frozenColCount -=\n (sourceMergeInfo as CellRange).end.col - (sourceMergeInfo as CellRange).start.col + 1;\n }\n if (\n state.table.isRightFrozenColumn(state.columnMove.colTarget) &&\n !state.table.isRightFrozenColumn(state.columnMove.colSource)\n ) {\n state.table.rightFrozenColCount +=\n (sourceMergeInfo as CellRange).end.col - (sourceMergeInfo as CellRange).start.col + 1;\n } else if (\n state.table.isRightFrozenColumn(state.columnMove.colSource) &&\n !state.table.isRightFrozenColumn(state.columnMove.colTarget)\n ) {\n state.table.rightFrozenColCount -=\n (sourceMergeInfo as CellRange).end.col - (sourceMergeInfo as CellRange).start.col + 1;\n }\n }\n moveColResult = true;\n } else {\n state.updateCursor();\n //触发事件 CHANGE_HEADER_POSITION 还需要用到这些值 所以延迟清理\n state.columnMove.moving = false;\n delete state.columnMove.colSource;\n delete state.columnMove.rowSource;\n delete state.columnMove.colTarget;\n delete state.columnMove.rowTarget;\n state.table.scenegraph.component.hideMoveCol();\n state.table.scenegraph.updateNextFrame();\n return false;\n }\n }\n setTimeout(() => {\n //触发事件 CHANGE_HEADER_POSITION 还需要用到这些值 所以延迟清理\n state.columnMove.moving = false;\n delete state.columnMove.colSource;\n delete state.columnMove.rowSource;\n delete state.columnMove.colTarget;\n delete state.columnMove.rowTarget;\n }, 0);\n state.table.scenegraph.component.hideMoveCol();\n // update frozen shadowline component\n if (\n state.columnResize.col < state.table.frozenColCount &&\n !state.table.isPivotTable() &&\n !(state.table as ListTable).transpose\n ) {\n state.table.scenegraph.component.setFrozenColumnShadow(\n state.table.frozenColCount - 1,\n state.columnResize.isRightFrozen\n );\n state.table.scenegraph.component.setRightFrozenColumnShadow(state.table.colCount - state.table.rightFrozenColCount);\n } else if (\n state.columnResize.col >= state.table.colCount - state.table.rightFrozenColCount &&\n !state.table.isPivotTable() &&\n !(state.table as ListTable).transpose\n ) {\n state.table.scenegraph.component.setRightFrozenColumnShadow(state.table.colCount - state.table.rightFrozenColCount);\n } else if (state.table.options.frozenColCount) {\n state.table.scenegraph.component.setFrozenColumnShadow(state.table.frozenColCount - 1);\n } else if (state.table.options.rightFrozenColCount) {\n state.table.scenegraph.component.setRightFrozenColumnShadow(state.table.colCount - state.table.rightFrozenColCount);\n }\n state.table.scenegraph.updateNextFrame();\n return moveColResult;\n}\n\nfunction clearWidthsAndHeightsCache(\n colMin: number,\n colMax: number,\n rowMin: number,\n rowMax: number,\n table: BaseTableAPI\n) {\n for (let col = colMin; col <= colMax; col++) {\n table._clearColRangeWidthsMap(col);\n }\n for (let row = rowMin; row <= rowMax; row++) {\n table._clearRowRangeHeightsMap(row);\n }\n}\n"]}
1
+ {"version":3,"sources":["../src/state/cell-move/index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["import type { ListTable } from '../../ListTable';\nimport type { SimpleHeaderLayoutMap } from '../../layout';\nimport type { PivotHeaderLayoutMap } from '../../layout/pivot-header-layout';\nimport { getCellMergeInfo } from '../../scenegraph/utils/get-cell-merge';\nimport type { CellRange } from '../../ts-types';\nimport type { BaseTableAPI } from '../../ts-types/base-table';\nimport type { StateManager } from '../state';\nimport { adjustMoveHeaderTarget } from './adjust-header';\n\nexport function startMoveCol(col: number, row: number, x: number, y: number, state: StateManager) {\n if (!('canMoveHeaderPosition' in state.table.internalProps.layoutMap)) {\n return;\n }\n state.columnMove.moving = true;\n state.columnMove.colSource = col;\n state.columnMove.rowSource = row;\n state.columnMove.x = x - state.table.tableX;\n state.columnMove.y = y - state.table.tableY;\n\n const cellLocation = state.table.getCellLocation(col, row);\n const delta =\n cellLocation === 'columnHeader'\n ? state.columnMove.x\n : cellLocation === 'rowHeader' ||\n (state.table.internalProps.layoutMap as SimpleHeaderLayoutMap).isSeriesNumberInBody(col, row)\n ? state.columnMove.y\n : 0;\n\n state.table.scenegraph.component.showMoveCol(col, row, delta);\n\n // 调整列顺序期间清空选中清空\n const isHasSelected = !!state.select.ranges?.length;\n state.table.stateManager.updateSelectPos(-1, -1);\n state.table.stateManager.endSelectCells(true, isHasSelected);\n state.table.scenegraph.updateNextFrame();\n}\n\nexport function updateMoveCol(col: number, row: number, x: number, y: number, state: StateManager) {\n if (!('canMoveHeaderPosition' in state.table.internalProps.layoutMap)) {\n return;\n }\n\n const targetCell = adjustMoveHeaderTarget(\n { col: state.columnMove.colSource, row: state.columnMove.rowSource },\n { col, row },\n state.table\n );\n\n const canMove = state.table.internalProps.layoutMap.canMoveHeaderPosition(\n { col: state.columnMove.colSource, row: state.columnMove.rowSource },\n { col: targetCell.col, row: targetCell.row }\n );\n if (!canMove) {\n state.updateCursor('not-allowed');\n state.columnMove.colTarget = state.columnMove.colSource;\n state.columnMove.rowTarget = state.columnMove.rowSource;\n } else {\n state.columnMove.x = x - state.table.tableX;\n state.columnMove.y = y - state.table.tableY;\n state.columnMove.colTarget = targetCell.col;\n state.columnMove.rowTarget = targetCell.row;\n state.updateCursor('grabbing');\n let lineX;\n let backX;\n let lineY;\n let backY;\n const cellLocation = state.table.getCellLocation(state.columnMove.colSource, state.columnMove.rowSource);\n if (cellLocation === 'columnHeader') {\n backX = state.columnMove.x;\n if (state.table.isLeftFrozenColumn(col)) {\n lineX =\n state.columnMove.colTarget >= state.columnMove.colSource\n ? state.table.getColsWidth(0, state.columnMove.colTarget)\n : state.table.getColsWidth(0, state.columnMove.colTarget - 1);\n } else if (state.table.isRightFrozenColumn(col)) {\n lineX = state.table.tableNoFrameWidth - state.table.getColsWidth(targetCell.col + 1, state.table.colCount - 1);\n } else {\n lineX =\n (state.columnMove.colTarget >= state.columnMove.colSource\n ? state.table.getColsWidth(0, state.columnMove.colTarget)\n : state.table.getColsWidth(0, state.columnMove.colTarget - 1)) -\n state.table.stateManager.scroll.horizontalBarPos;\n }\n } else if (\n cellLocation === 'rowHeader' ||\n (state.table.internalProps.layoutMap as SimpleHeaderLayoutMap).isSeriesNumberInBody(col, row)\n ) {\n backY = state.columnMove.y;\n if (state.table.isFrozenRow(row)) {\n lineY =\n state.columnMove.rowTarget >= state.columnMove.rowSource\n ? state.table.getRowsHeight(0, state.columnMove.rowTarget)\n : state.table.getRowsHeight(0, state.columnMove.rowTarget - 1);\n } else if (state.table.isBottomFrozenRow(row)) {\n lineY =\n state.table.tableNoFrameHeight - state.table.getRowsHeight(targetCell.row + 1, state.table.rowCount - 1);\n } else {\n lineY =\n (state.columnMove.rowTarget >= state.columnMove.rowSource\n ? state.table.getRowsHeight(0, state.columnMove.rowTarget)\n : state.table.getRowsHeight(0, state.columnMove.rowTarget - 1)) -\n state.table.stateManager.scroll.verticalBarPos;\n }\n }\n\n state.table.scenegraph.component.updateMoveCol(backX, lineX, backY, lineY);\n state.table.scenegraph.updateNextFrame();\n }\n}\n\nexport function endMoveCol(state: StateManager): boolean {\n let moveColResult = false;\n if (\n 'canMoveHeaderPosition' in state.table.internalProps.layoutMap &&\n state.columnMove.moving &&\n state.columnMove.colSource >= 0 &&\n state.columnMove.rowSource >= 0 &&\n state.columnMove.colTarget >= 0 &&\n state.columnMove.rowTarget >= 0 &&\n state.table.options.customConfig?.notUpdateInColumnRowMove !== true\n ) {\n //getCellMergeInfo 一定要在moveHeaderPosition之前调用 否则就不是修改前的range了\n const oldSourceMergeInfo = state.table.getCellRange(state.columnMove.colSource, state.columnMove.rowSource);\n const oldTargetMergeInfo = state.table.getCellRange(state.columnMove.colTarget, state.columnMove.rowTarget);\n // 调整列顺序\n const moveContext = state.table._moveHeaderPosition(\n { col: state.columnMove.colSource, row: state.columnMove.rowSource },\n { col: state.columnMove.colTarget, row: state.columnMove.rowTarget }\n );\n\n // 更新状态\n if (moveContext && moveContext.targetIndex !== moveContext.sourceIndex) {\n state.table.internalProps.useOneRowHeightFillAll = false;\n state.table.internalProps.layoutMap.clearCellRangeMap();\n const sourceMergeInfo = state.table.getCellRange(state.columnMove.colSource, state.columnMove.rowSource);\n const targetMergeInfo = state.table.getCellRange(state.columnMove.colTarget, state.columnMove.rowTarget);\n\n const colMin = Math.min(\n sourceMergeInfo.start.col,\n targetMergeInfo.start.col,\n oldSourceMergeInfo.start.col,\n oldTargetMergeInfo.start.col\n );\n const colMax = Math.max(\n sourceMergeInfo.end.col,\n targetMergeInfo.end.col,\n oldSourceMergeInfo.end.col,\n oldTargetMergeInfo.end.col\n );\n const rowMin = Math.min(\n sourceMergeInfo.start.row,\n targetMergeInfo.start.row,\n oldSourceMergeInfo.start.row,\n oldTargetMergeInfo.start.row\n );\n let rowMax = Math.max(\n sourceMergeInfo.end.row,\n targetMergeInfo.end.row,\n oldSourceMergeInfo.end.row,\n oldTargetMergeInfo.end.row\n );\n if (\n moveContext.moveType === 'row' &&\n (state.table.internalProps.layoutMap as PivotHeaderLayoutMap).rowHierarchyType === 'tree'\n ) {\n if (moveContext.targetIndex > moveContext.sourceIndex) {\n rowMax = rowMax + moveContext.targetSize - 1;\n } else {\n rowMax = rowMax + moveContext.sourceSize - 1;\n }\n }\n if (\n !(state.table as ListTable).transpose &&\n (state.table.internalProps.layoutMap as SimpleHeaderLayoutMap).isSeriesNumberInBody(\n state.columnMove.colSource,\n state.columnMove.rowSource\n )\n ) {\n state.table.changeRecordOrder(moveContext.sourceIndex, moveContext.targetIndex);\n state.changeCheckboxAndRadioOrder(moveContext.sourceIndex, moveContext.targetIndex);\n }\n // clear columns width and rows height cache\n if (moveContext.moveType === 'column') {\n clearWidthsAndHeightsCache(colMin, colMax, 0, -1, state.table);\n } else {\n clearWidthsAndHeightsCache(0, -1, rowMin, rowMax, state.table);\n }\n\n // clear cell style cache\n state.table.clearCellStyleCache();\n if (\n state.table.internalProps.layoutMap.isSeriesNumberInBody(state.columnMove.colSource, state.columnMove.rowSource)\n ) {\n // 如果是拖拽序号换位置 考虑到非拖拽单元格合并而是其他地方有合并被拆开或者独立单元格拖拽后变为合并的情况 这里直接刷新这个场景树的节点 才能覆盖所有情况\n state.table.scenegraph.updateHeaderPosition(\n state.table.scenegraph.proxy.colStart,\n state.table.scenegraph.proxy.colEnd,\n state.table.scenegraph.proxy.rowStart,\n state.table.scenegraph.proxy.rowEnd,\n moveContext.moveType\n );\n } else if (moveContext.moveType === 'column') {\n state.table.scenegraph.updateHeaderPosition(colMin, colMax, 0, -1, moveContext.moveType);\n } else {\n state.table.scenegraph.updateHeaderPosition(0, -1, rowMin, rowMax, moveContext.moveType);\n }\n //调整冻结列数量\n if (state.table.internalProps.frozenColDragHeaderMode === 'adjustFrozenCount' && state.table.isListTable()) {\n if (\n state.table.isLeftFrozenColumn(state.columnMove.colTarget) &&\n !state.table.isLeftFrozenColumn(state.columnMove.colSource)\n ) {\n state.table.frozenColCount +=\n (sourceMergeInfo as CellRange).end.col - (sourceMergeInfo as CellRange).start.col + 1;\n } else if (\n state.table.isLeftFrozenColumn(state.columnMove.colSource) &&\n !state.table.isLeftFrozenColumn(state.columnMove.colTarget)\n ) {\n state.table.frozenColCount -=\n (sourceMergeInfo as CellRange).end.col - (sourceMergeInfo as CellRange).start.col + 1;\n }\n if (\n state.table.isRightFrozenColumn(state.columnMove.colTarget) &&\n !state.table.isRightFrozenColumn(state.columnMove.colSource)\n ) {\n state.table.rightFrozenColCount +=\n (sourceMergeInfo as CellRange).end.col - (sourceMergeInfo as CellRange).start.col + 1;\n } else if (\n state.table.isRightFrozenColumn(state.columnMove.colSource) &&\n !state.table.isRightFrozenColumn(state.columnMove.colTarget)\n ) {\n state.table.rightFrozenColCount -=\n (sourceMergeInfo as CellRange).end.col - (sourceMergeInfo as CellRange).start.col + 1;\n }\n }\n moveColResult = true;\n } else {\n state.updateCursor();\n //触发事件 CHANGE_HEADER_POSITION 还需要用到这些值 所以延迟清理\n state.columnMove.moving = false;\n delete state.columnMove.colSource;\n delete state.columnMove.rowSource;\n delete state.columnMove.colTarget;\n delete state.columnMove.rowTarget;\n state.table.scenegraph.component.hideMoveCol();\n state.table.scenegraph.updateNextFrame();\n return false;\n }\n }\n setTimeout(() => {\n //触发事件 CHANGE_HEADER_POSITION 还需要用到这些值 所以延迟清理\n state.columnMove.moving = false;\n delete state.columnMove.colSource;\n delete state.columnMove.rowSource;\n delete state.columnMove.colTarget;\n delete state.columnMove.rowTarget;\n }, 0);\n state.table.scenegraph.component.hideMoveCol();\n // update frozen shadowline component\n if (\n state.columnResize.col < state.table.frozenColCount &&\n !state.table.isPivotTable() &&\n !(state.table as ListTable).transpose\n ) {\n state.table.scenegraph.component.setFrozenColumnShadow(\n state.table.frozenColCount - 1,\n state.columnResize.isRightFrozen\n );\n state.table.scenegraph.component.setRightFrozenColumnShadow(state.table.colCount - state.table.rightFrozenColCount);\n } else if (\n state.columnResize.col >= state.table.colCount - state.table.rightFrozenColCount &&\n !state.table.isPivotTable() &&\n !(state.table as ListTable).transpose\n ) {\n state.table.scenegraph.component.setRightFrozenColumnShadow(state.table.colCount - state.table.rightFrozenColCount);\n } else if (state.table.options.frozenColCount) {\n state.table.scenegraph.component.setFrozenColumnShadow(state.table.frozenColCount - 1);\n } else if (state.table.options.rightFrozenColCount) {\n state.table.scenegraph.component.setRightFrozenColumnShadow(state.table.colCount - state.table.rightFrozenColCount);\n }\n state.table.scenegraph.updateNextFrame();\n return moveColResult;\n}\n\nfunction clearWidthsAndHeightsCache(\n colMin: number,\n colMax: number,\n rowMin: number,\n rowMax: number,\n table: BaseTableAPI\n) {\n for (let col = colMin; col <= colMax; col++) {\n table._clearColRangeWidthsMap(col);\n }\n for (let row = rowMin; row <= rowMax; row++) {\n table._clearRowRangeHeightsMap(row);\n }\n}\n"]}
@@ -8,6 +8,7 @@ import type { BaseTableAPI } from '../ts-types/base-table';
8
8
  export declare class StateManager {
9
9
  table: BaseTableAPI;
10
10
  interactionState: InteractionState;
11
+ interactionStateBeforeScroll?: InteractionState;
11
12
  select: {
12
13
  ranges: (CellRange & {
13
14
  skipBodyMerge?: boolean;
@@ -10,8 +10,8 @@ class StateManager {
10
10
  constructor(table) {
11
11
  this.fastScrolling = !1, this.checkedState = [], this.headerCheckedState = {}, this._checkboxCellTypeFields = [],
12
12
  this._headerCheckFuncs = {}, this.radioState = {}, this.resetInteractionState = (0,
13
- debounce_1.debounce)((() => {
14
- this.updateInteractionState(ts_types_1.InteractionState.default);
13
+ debounce_1.debounce)((state => {
14
+ this.updateInteractionState(null != state ? state : ts_types_1.InteractionState.default);
15
15
  }), 100), this.table = table, this.initState(), this.updateVerticalScrollBar = this.updateVerticalScrollBar.bind(this),
16
16
  this.updateHorizontalScrollBar = this.updateHorizontalScrollBar.bind(this);
17
17
  }
@@ -192,6 +192,7 @@ class StateManager {
192
192
  }
193
193
  updateInteractionState(mode) {
194
194
  if (this.interactionState === mode) return;
195
+ mode === ts_types_1.InteractionState.scrolling && (this.interactionStateBeforeScroll = this.interactionState);
195
196
  const oldState = this.interactionState;
196
197
  this.interactionState = mode, oldState === ts_types_1.InteractionState.scrolling && ts_types_1.InteractionState.default;
197
198
  }
@@ -320,7 +321,12 @@ class StateManager {
320
321
  this.fillHandle.beforeFillMinCol = void 0, this.fillHandle.beforeFillMinRow = void 0;
321
322
  }
322
323
  startMoveCol(col, row, x, y) {
323
- (0, cell_move_1.startMoveCol)(col, row, x, y, this);
324
+ (0, cell_move_1.startMoveCol)(col, row, x, y, this), this.table.fireListeners(TABLE_EVENT_TYPE_1.TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION_START, {
325
+ col: col,
326
+ row: row,
327
+ x: x,
328
+ y: y
329
+ });
324
330
  }
325
331
  updateMoveCol(col, row, x, y) {
326
332
  (0, cell_move_1.updateMoveCol)(col, row, x, y, this);