@visactor/vtable 0.25.8-alpha.0 → 0.25.9

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 (81) hide show
  1. package/cjs/ListTable.js +2 -1
  2. package/cjs/ListTable.js.map +1 -1
  3. package/cjs/PivotTable.js +6 -3
  4. package/cjs/PivotTable.js.map +1 -1
  5. package/cjs/core/BaseTable.js +21 -14
  6. package/cjs/core/BaseTable.js.map +1 -1
  7. package/cjs/header-helper/header-helper.js +1 -1
  8. package/cjs/header-helper/header-helper.js.map +1 -1
  9. package/cjs/index.d.ts +1 -1
  10. package/cjs/index.js +1 -1
  11. package/cjs/index.js.map +1 -1
  12. package/cjs/layout/pivot-header-layout.d.ts +5 -1
  13. package/cjs/layout/pivot-header-layout.js +82 -57
  14. package/cjs/layout/pivot-header-layout.js.map +1 -1
  15. package/cjs/scenegraph/component/table-component.js +26 -22
  16. package/cjs/scenegraph/component/table-component.js.map +1 -1
  17. package/cjs/scenegraph/layout/frozen.js +1 -1
  18. package/cjs/scenegraph/layout/frozen.js.map +1 -1
  19. package/cjs/scenegraph/scenegraph.d.ts +4 -2
  20. package/cjs/scenegraph/scenegraph.js +3 -3
  21. package/cjs/scenegraph/scenegraph.js.map +1 -1
  22. package/cjs/scenegraph/select/update-select-border.d.ts +4 -1
  23. package/cjs/scenegraph/select/update-select-border.js +6 -1
  24. package/cjs/scenegraph/select/update-select-border.js.map +1 -1
  25. package/cjs/scenegraph/utils/break-string.js +1 -1
  26. package/cjs/scenegraph/utils/break-string.js.map +1 -1
  27. package/cjs/state/select/update-position.js +12 -8
  28. package/cjs/state/select/update-position.js.map +1 -1
  29. package/cjs/state/state.d.ts +3 -1
  30. package/cjs/state/state.js.map +1 -1
  31. package/cjs/themes/theme.js +3 -0
  32. package/cjs/themes/theme.js.map +1 -1
  33. package/cjs/tools/helper.js +2 -2
  34. package/cjs/tools/helper.js.map +1 -1
  35. package/cjs/ts-types/table-engine.d.ts +1 -0
  36. package/cjs/ts-types/table-engine.js.map +1 -1
  37. package/cjs/ts-types/theme.d.ts +1 -0
  38. package/cjs/ts-types/theme.js.map +1 -1
  39. package/cjs/vrender.js.map +1 -1
  40. package/dist/vtable.js +199 -77
  41. package/dist/vtable.min.js +2 -2
  42. package/es/ListTable.js +2 -1
  43. package/es/ListTable.js.map +1 -1
  44. package/es/PivotTable.js +6 -3
  45. package/es/PivotTable.js.map +1 -1
  46. package/es/core/BaseTable.js +21 -14
  47. package/es/core/BaseTable.js.map +1 -1
  48. package/es/header-helper/header-helper.js +1 -1
  49. package/es/header-helper/header-helper.js.map +1 -1
  50. package/es/index.d.ts +1 -1
  51. package/es/index.js +1 -1
  52. package/es/index.js.map +1 -1
  53. package/es/layout/pivot-header-layout.d.ts +5 -1
  54. package/es/layout/pivot-header-layout.js +83 -56
  55. package/es/layout/pivot-header-layout.js.map +1 -1
  56. package/es/scenegraph/component/table-component.js +27 -21
  57. package/es/scenegraph/component/table-component.js.map +1 -1
  58. package/es/scenegraph/layout/frozen.js +1 -1
  59. package/es/scenegraph/layout/frozen.js.map +1 -1
  60. package/es/scenegraph/scenegraph.d.ts +4 -2
  61. package/es/scenegraph/scenegraph.js +3 -3
  62. package/es/scenegraph/scenegraph.js.map +1 -1
  63. package/es/scenegraph/select/update-select-border.d.ts +4 -1
  64. package/es/scenegraph/select/update-select-border.js +6 -1
  65. package/es/scenegraph/select/update-select-border.js.map +1 -1
  66. package/es/scenegraph/utils/break-string.js +1 -1
  67. package/es/scenegraph/utils/break-string.js.map +1 -1
  68. package/es/state/select/update-position.js +12 -8
  69. package/es/state/select/update-position.js.map +1 -1
  70. package/es/state/state.d.ts +3 -1
  71. package/es/state/state.js.map +1 -1
  72. package/es/themes/theme.js +3 -0
  73. package/es/themes/theme.js.map +1 -1
  74. package/es/tools/helper.js +2 -2
  75. package/es/tools/helper.js.map +1 -1
  76. package/es/ts-types/table-engine.d.ts +1 -0
  77. package/es/ts-types/table-engine.js.map +1 -1
  78. package/es/ts-types/theme.d.ts +1 -0
  79. package/es/ts-types/theme.js.map +1 -1
  80. package/es/vrender.js.map +1 -1
  81. package/package.json +3 -3
package/dist/vtable.js CHANGED
@@ -23234,8 +23234,12 @@
23234
23234
  function cellInRanges(ranges, col, row) {
23235
23235
  for (let i = 0; i < ranges.length; i++) {
23236
23236
  const range = ranges[i];
23237
- if ((range.start.col <= col && col <= range.end.col && range.start.row <= row && row <= range.end.row) ||
23238
- (range.end.col <= col && col <= range.start.col && range.end.row <= row && row <= range.start.row)) {
23237
+ const startCol = Math.min(range.start.col, range.end.col);
23238
+ const endCol = Math.max(range.start.col, range.end.col);
23239
+ const startRow = Math.min(range.start.row, range.end.row);
23240
+ const endRow = Math.max(range.start.row, range.end.row);
23241
+ if ((startCol <= col && col <= endCol && startRow <= row && row <= endRow) ||
23242
+ (endCol <= col && col <= startCol && endRow <= row && row <= startRow)) {
23239
23243
  return true;
23240
23244
  }
23241
23245
  }
@@ -24693,6 +24697,9 @@
24693
24697
  get scrollSliderColor() {
24694
24698
  return scroll.scrollSliderColor ?? '#C0C0C0';
24695
24699
  },
24700
+ get scrollSliderCornerRadius() {
24701
+ return scroll.scrollSliderCornerRadius;
24702
+ },
24696
24703
  get scrollRailColor() {
24697
24704
  return scroll.scrollRailColor;
24698
24705
  },
@@ -38118,7 +38125,7 @@
38118
38125
  else {
38119
38126
  text = convertInternal(textStr).replace(/\r?\n/g, '\n').replace(/\r/g, '\n').split('\n') || [];
38120
38127
  }
38121
- while (text.length && !text[text.length - 1]) {
38128
+ while (text.length && text.length > 1 && !text[text.length - 1]) {
38122
38129
  text.pop();
38123
38130
  }
38124
38131
  return text;
@@ -42738,7 +42745,20 @@
42738
42745
  const theme = this.table.theme;
42739
42746
  const scrollRailColor = theme.scrollStyle?.scrollRailColor;
42740
42747
  const scrollSliderColor = theme.scrollStyle?.scrollSliderColor;
42748
+ const scrollSliderCornerRadius = theme.scrollStyle?.scrollSliderCornerRadius;
42741
42749
  const width = theme.scrollStyle?.width;
42750
+ let sliderStyle;
42751
+ if (isValid$3(scrollSliderCornerRadius)) {
42752
+ sliderStyle = {
42753
+ cornerRadius: scrollSliderCornerRadius,
42754
+ fill: scrollSliderColor
42755
+ };
42756
+ }
42757
+ else {
42758
+ sliderStyle = {
42759
+ fill: scrollSliderColor
42760
+ };
42761
+ }
42742
42762
  this.hScrollBar = new ScrollBar({
42743
42763
  direction: 'horizontal',
42744
42764
  x: -this.table.tableNoFrameWidth * 2,
@@ -42749,9 +42769,7 @@
42749
42769
  railStyle: {
42750
42770
  fill: scrollRailColor
42751
42771
  },
42752
- sliderStyle: {
42753
- fill: scrollSliderColor
42754
- },
42772
+ sliderStyle,
42755
42773
  range: [0, 0.1],
42756
42774
  visible: false
42757
42775
  });
@@ -42767,9 +42785,7 @@
42767
42785
  railStyle: {
42768
42786
  fill: scrollRailColor
42769
42787
  },
42770
- sliderStyle: {
42771
- fill: scrollSliderColor
42772
- },
42788
+ sliderStyle,
42773
42789
  range: [0, 0.1],
42774
42790
  visible: false
42775
42791
  });
@@ -43078,24 +43094,33 @@
43078
43094
  const theme = this.table.theme;
43079
43095
  const scrollRailColor = theme.scrollStyle?.scrollRailColor;
43080
43096
  const scrollSliderColor = theme.scrollStyle?.scrollSliderColor;
43097
+ const scrollSliderCornerRadius = theme.scrollStyle?.scrollSliderCornerRadius;
43081
43098
  const width = theme.scrollStyle?.width;
43099
+ let sliderStyle;
43100
+ if (isValid$3(scrollSliderCornerRadius)) {
43101
+ sliderStyle = {
43102
+ cornerRadius: scrollSliderCornerRadius,
43103
+ fill: scrollSliderColor
43104
+ };
43105
+ }
43106
+ else {
43107
+ sliderStyle = {
43108
+ fill: scrollSliderColor
43109
+ };
43110
+ }
43082
43111
  this.hScrollBar.setAttributes({
43083
43112
  height: width,
43084
43113
  railStyle: {
43085
43114
  fill: scrollRailColor
43086
43115
  },
43087
- sliderStyle: {
43088
- fill: scrollSliderColor
43089
- }
43116
+ sliderStyle
43090
43117
  });
43091
43118
  this.vScrollBar.setAttributes({
43092
43119
  width,
43093
43120
  railStyle: {
43094
43121
  fill: scrollRailColor
43095
43122
  },
43096
- sliderStyle: {
43097
- fill: scrollSliderColor
43098
- }
43123
+ sliderStyle
43099
43124
  });
43100
43125
  const columnResizeColor = theme.columnResize?.lineColor;
43101
43126
  const columnResizeWidth = theme.columnResize?.lineWidth;
@@ -47141,7 +47166,12 @@
47141
47166
  });
47142
47167
  }
47143
47168
  }
47144
- function updateCellSelectBorder(scene, newStartCol, newStartRow, newEndCol, newEndRow, ifExtendSelectRange = true) {
47169
+ function updateCellSelectBorder(scene, selectRange, ifExtendSelectRange = true) {
47170
+ const newStartCol = selectRange.start.col;
47171
+ const newStartRow = selectRange.start.row;
47172
+ const newEndCol = selectRange.end.col;
47173
+ const newEndRow = selectRange.end.row;
47174
+ const skipBodyMerge = selectRange.skipBodyMerge;
47145
47175
  let startCol = Math.max(Math.min(newEndCol, newStartCol), 0);
47146
47176
  let startRow = Math.max(Math.min(newEndRow, newStartRow), 0);
47147
47177
  let endCol = Math.min(Math.max(newEndCol, newStartCol), scene.table.colCount - 1);
@@ -47151,6 +47181,9 @@
47151
47181
  for (let col = startCol; col <= endCol; col++) {
47152
47182
  if (col === startCol) {
47153
47183
  for (let row = startRow; row <= endRow; row++) {
47184
+ if (!scene.table.isHeader(col, row) && skipBodyMerge) {
47185
+ continue;
47186
+ }
47154
47187
  const mergeInfo = getCellMergeInfo(scene.table, col, row);
47155
47188
  if (mergeInfo && mergeInfo.start.col < startCol) {
47156
47189
  startCol = mergeInfo.start.col;
@@ -47161,6 +47194,9 @@
47161
47194
  }
47162
47195
  if (!isExtend && col === endCol) {
47163
47196
  for (let row = startRow; row <= endRow; row++) {
47197
+ if (!scene.table.isHeader(col, row) && skipBodyMerge) {
47198
+ continue;
47199
+ }
47164
47200
  const mergeInfo = getCellMergeInfo(scene.table, col, row);
47165
47201
  if (mergeInfo && Math.min(mergeInfo.end.col, scene.table.colCount - 1) > endCol) {
47166
47202
  endCol = mergeInfo.end.col;
@@ -47177,6 +47213,9 @@
47177
47213
  for (let row = startRow; row <= endRow; row++) {
47178
47214
  if (row === startRow) {
47179
47215
  for (let col = startCol; col <= endCol; col++) {
47216
+ if (!scene.table.isHeader(col, row) && skipBodyMerge) {
47217
+ continue;
47218
+ }
47180
47219
  const mergeInfo = getCellMergeInfo(scene.table, col, row);
47181
47220
  if (mergeInfo && mergeInfo.start.row < startRow) {
47182
47221
  startRow = mergeInfo.start.row;
@@ -47187,6 +47226,9 @@
47187
47226
  }
47188
47227
  if (!isExtend && row === endRow) {
47189
47228
  for (let col = startCol; col <= endCol; col++) {
47229
+ if (!scene.table.isHeader(col, row) && skipBodyMerge) {
47230
+ continue;
47231
+ }
47190
47232
  const mergeInfo = getCellMergeInfo(scene.table, col, row);
47191
47233
  if (mergeInfo && Math.min(mergeInfo.end.row, scene.table.rowCount - 1) > endRow) {
47192
47234
  endRow = mergeInfo.end.row;
@@ -47957,7 +47999,7 @@
47957
47999
  }
47958
48000
  scene.deleteAllSelectBorder();
47959
48001
  scene.table.stateManager.select.ranges.forEach(range => {
47960
- scene.updateCellSelectBorder(range.start.col, range.start.row, range.end.col, range.end.row);
48002
+ scene.updateCellSelectBorder(range);
47961
48003
  });
47962
48004
  scene.frozenColCount = scene.table.frozenColCount;
47963
48005
  scene.frozenRowCount = scene.colHeaderGroup.firstChild?.childrenCount ?? 0;
@@ -49469,8 +49511,8 @@
49469
49511
  deleteAllSelectBorder() {
49470
49512
  deleteAllSelectBorder(this);
49471
49513
  }
49472
- updateCellSelectBorder(newStartCol, newStartRow, newEndCol, newEndRow, extendSelectRange = true) {
49473
- updateCellSelectBorder(this, newStartCol, newStartRow, newEndCol, newEndRow, extendSelectRange);
49514
+ updateCellSelectBorder(selectRange, extendSelectRange = true) {
49515
+ updateCellSelectBorder(this, selectRange, extendSelectRange);
49474
49516
  }
49475
49517
  removeFillHandleFromSelectComponents() {
49476
49518
  removeFillHandleFromSelectComponents(this);
@@ -49478,7 +49520,7 @@
49478
49520
  recreateAllSelectRangeComponents() {
49479
49521
  deleteAllSelectBorder(this);
49480
49522
  this.table.stateManager.select.ranges.forEach((cellRange) => {
49481
- updateCellSelectBorder(this, cellRange.start.col, cellRange.start.row, cellRange.end.col, cellRange.end.row);
49523
+ updateCellSelectBorder(this, cellRange);
49482
49524
  });
49483
49525
  moveSelectingRangeComponentsToSelectedRangeComponents(this);
49484
49526
  }
@@ -50660,7 +50702,7 @@
50660
50702
  end: { col: table.colCount - 1, row: table.rowCount - 1 }
50661
50703
  });
50662
50704
  const currentRange = state.select.ranges[state.select.ranges.length - 1];
50663
- scenegraph.updateCellSelectBorder(currentRange.start.col, currentRange.start.row, currentRange.end.col, currentRange.end.row, false);
50705
+ scenegraph.updateCellSelectBorder(currentRange, false);
50664
50706
  }
50665
50707
  else if (cellPos.col !== -1 && cellPos.row !== -1 && (col === -1 || row === -1)) {
50666
50708
  cellPos.col = -1;
@@ -50693,7 +50735,7 @@
50693
50735
  currentRange.end = { col, row };
50694
50736
  }
50695
50737
  scenegraph.deleteLastSelectedRangeComponents();
50696
- scenegraph.updateCellSelectBorder(currentRange.start.col, currentRange.start.row, currentRange.end.col, currentRange.end.row);
50738
+ scenegraph.updateCellSelectBorder(currentRange);
50697
50739
  }
50698
50740
  else {
50699
50741
  let extendSelectRange = true;
@@ -50705,28 +50747,32 @@
50705
50747
  const cellRange = table.getCellRange(col, row);
50706
50748
  state.select.ranges.push({
50707
50749
  start: { col: cellRange.start.col, row },
50708
- end: { col: cellRange.end.col, row: table.rowCount - 1 }
50750
+ end: { col: cellRange.end.col, row: table.rowCount - 1 },
50751
+ skipBodyMerge: true
50709
50752
  });
50710
50753
  }
50711
50754
  else if (state.select.headerSelectMode !== 'cell' && table.isRowHeader(col, row)) {
50712
50755
  const cellRange = table.getCellRange(col, row);
50713
50756
  state.select.ranges.push({
50714
50757
  start: { col, row: cellRange.start.row },
50715
- end: { col: table.colCount - 1, row: cellRange.end.row }
50758
+ end: { col: table.colCount - 1, row: cellRange.end.row },
50759
+ skipBodyMerge: true
50716
50760
  });
50717
50761
  }
50718
50762
  else if (table.internalProps.layoutMap.isSeriesNumberInHeader(col, row)) {
50719
50763
  extendSelectRange = false;
50720
50764
  state.select.ranges.push({
50721
50765
  start: { col: 0, row: 0 },
50722
- end: { col: table.colCount - 1, row: table.rowCount - 1 }
50766
+ end: { col: table.colCount - 1, row: table.rowCount - 1 },
50767
+ skipBodyMerge: true
50723
50768
  });
50724
50769
  }
50725
50770
  else if (table.internalProps.layoutMap.isSeriesNumberInBody(col, row)) {
50726
50771
  extendSelectRange = false;
50727
50772
  state.select.ranges.push({
50728
50773
  start: { col, row: row },
50729
- end: { col: table.colCount - 1, row: row }
50774
+ end: { col: table.colCount - 1, row: row },
50775
+ skipBodyMerge: true
50730
50776
  });
50731
50777
  }
50732
50778
  else if (col >= 0 && row >= 0) {
@@ -50739,8 +50785,7 @@
50739
50785
  cellPos.col = col;
50740
50786
  cellPos.row = row;
50741
50787
  const currentRange = state.select.ranges?.[state.select.ranges.length - 1];
50742
- currentRange &&
50743
- scenegraph.updateCellSelectBorder(currentRange.start.col, currentRange.start.row, currentRange.end.col, currentRange.end.row, extendSelectRange);
50788
+ currentRange && scenegraph.updateCellSelectBorder(currentRange, extendSelectRange);
50744
50789
  }
50745
50790
  }
50746
50791
  else if ((interactionState === InteractionState.grabing || table.eventManager.isDraging) &&
@@ -50835,7 +50880,7 @@
50835
50880
  };
50836
50881
  }
50837
50882
  }
50838
- scenegraph.updateCellSelectBorder(currentRange.start.col, currentRange.start.row, currentRange.end.col, currentRange.end.row, extendSelectRange);
50883
+ scenegraph.updateCellSelectBorder(currentRange, extendSelectRange);
50839
50884
  }
50840
50885
  }
50841
50886
  scenegraph.updateNextFrame();
@@ -56336,7 +56381,7 @@
56336
56381
  }
56337
56382
  setTableColumnsEditor() {
56338
56383
  const setEditor = (colDefines, setColumns) => {
56339
- colDefines.forEach((colDefine, index) => {
56384
+ colDefines?.forEach((colDefine, index) => {
56340
56385
  if (colDefine.editor) {
56341
56386
  setColumns[index].editor = colDefine.editor;
56342
56387
  }
@@ -58382,7 +58427,7 @@
58382
58427
  return TABLE_EVENT_TYPE;
58383
58428
  }
58384
58429
  options;
58385
- version = "0.25.8-alpha.0";
58430
+ version = "0.25.9";
58386
58431
  pagination;
58387
58432
  id = `VTable${Date.now()}`;
58388
58433
  headerStyleCache;
@@ -58805,8 +58850,21 @@
58805
58850
  let heightP = 0;
58806
58851
  if (Env.mode === 'browser') {
58807
58852
  const element = this.getElement();
58808
- const width1 = element.parentElement?.offsetWidth ?? 1 - 1;
58809
- const height1 = element.parentElement?.offsetHeight ?? 1 - 1;
58853
+ let widthWithoutPadding = 0;
58854
+ let heightWithoutPadding = 0;
58855
+ if (element.parentElement) {
58856
+ const computedStyle = element.parentElement.style || window.getComputedStyle(element.parentElement);
58857
+ widthWithoutPadding =
58858
+ element.parentElement.offsetWidth -
58859
+ parseInt(computedStyle.paddingLeft || '0px', 10) -
58860
+ parseInt(computedStyle.paddingRight || '0px', 10);
58861
+ heightWithoutPadding =
58862
+ element.parentElement.offsetHeight -
58863
+ parseInt(computedStyle.paddingTop || '0px', 10) -
58864
+ parseInt(computedStyle.paddingBottom || '0px', 20);
58865
+ }
58866
+ const width1 = widthWithoutPadding ?? 1 - 1;
58867
+ const height1 = heightWithoutPadding ?? 1 - 1;
58810
58868
  element.style.width = (width1 && `${width1 - padding.left - padding.right}px`) || '0px';
58811
58869
  element.style.height = (height1 && `${height1 - padding.top - padding.bottom}px`) || '0px';
58812
58870
  const { canvas } = this.internalProps;
@@ -63831,9 +63889,13 @@
63831
63889
  if (ifCan) {
63832
63890
  if (!this.transpose) {
63833
63891
  const cellDefine = this.internalProps.layoutMap.getBody(col, this.columnHeaderLevelCount);
63892
+ const isSeriesNumber = this.internalProps.layoutMap.isSeriesNumber(col, row);
63834
63893
  if (cellDefine?.disableColumnResize) {
63835
63894
  return false;
63836
63895
  }
63896
+ else if (isSeriesNumber && this.internalProps.rowSeriesNumber.disableColumnResize === true) {
63897
+ return false;
63898
+ }
63837
63899
  }
63838
63900
  }
63839
63901
  return ifCan;
@@ -64922,6 +64984,10 @@
64922
64984
  cornerHeaderObjs;
64923
64985
  columnHeaderObjs = [];
64924
64986
  rowHeaderObjs = [];
64987
+ _cornerHeaderCellFullPathIds = [];
64988
+ _columnHeaderCellFullPathIds = [];
64989
+ _rowHeaderCellFullPathIds = [];
64990
+ _rowHeaderCellFullPathIds_FULL = [];
64925
64991
  _cornerHeaderCellIds = [];
64926
64992
  _columnHeaderCellIds = [];
64927
64993
  _rowHeaderCellIds = [];
@@ -65073,7 +65139,7 @@
65073
65139
  });
65074
65140
  }
65075
65141
  this.resetColumnHeaderLevelCount();
65076
- this._rowHeaderCellIds_FULL = transpose(this._rowHeaderCellIds_FULL);
65142
+ this._rowHeaderCellFullPathIds_FULL = transpose(this._rowHeaderCellFullPathIds_FULL);
65077
65143
  if (table.options.rowHierarchyType === 'tree' && this.extensionRows?.length >= 1) {
65078
65144
  this.generateExtensionRowTree();
65079
65145
  this.extensionRows.forEach(extensionRow => {
@@ -65127,6 +65193,7 @@
65127
65193
  else {
65128
65194
  this._indicatorShowType = 'none';
65129
65195
  }
65196
+ this.generateCellIdsConsiderHideHeader();
65130
65197
  this.setPagination(table.options.pagination);
65131
65198
  if (this._table.isPivotChart()) {
65132
65199
  this._chartItemSpanSize = 0;
@@ -65165,7 +65232,6 @@
65165
65232
  }
65166
65233
  this.handleRowSeriesNumber(table.internalProps.rowSeriesNumber);
65167
65234
  this.setColumnWidths();
65168
- this.clearCellIds();
65169
65235
  }
65170
65236
  handleRowSeriesNumber(rowSeriesNumber) {
65171
65237
  if (rowSeriesNumber) {
@@ -65212,13 +65278,13 @@
65212
65278
  }
65213
65279
  _generateColHeaderIds() {
65214
65280
  if (this.columnDimensionTree.tree.children?.length >= 1) {
65215
- this._addHeaders(this._columnHeaderCellIds, 0, this.columnDimensionTree.tree.children, [], this.columnHeaderObjs);
65281
+ this._addHeaders(this._columnHeaderCellFullPathIds, 0, this.columnDimensionTree.tree.children, [], this.columnHeaderObjs);
65216
65282
  }
65217
65283
  if (this.columnHeaderTitle) {
65218
65284
  this.sharedVar.seqId = Math.max(this.sharedVar.seqId, this._headerObjects.length);
65219
65285
  const id = ++this.sharedVar.seqId;
65220
65286
  const firstRowIds = Array(this.colCount - this.rowHeaderLevelCount).fill(id);
65221
- this._columnHeaderCellIds.unshift(firstRowIds);
65287
+ this._columnHeaderCellFullPathIds.unshift(firstRowIds);
65222
65288
  const cell = {
65223
65289
  id,
65224
65290
  title: typeof this.columnHeaderTitle.title === 'string'
@@ -65245,17 +65311,17 @@
65245
65311
  _generateRowHeaderIds() {
65246
65312
  if (this.rowDimensionTree.tree.children?.length >= 1) {
65247
65313
  if (this.rowHierarchyType === 'tree') {
65248
- this._addHeadersForTreeMode(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, true, this.rowsDefine, this.rowHeaderObjs);
65314
+ this._addHeadersForTreeMode(this._rowHeaderCellFullPathIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, true, this.rowsDefine, this.rowHeaderObjs);
65249
65315
  }
65250
65316
  else {
65251
- this._addHeaders(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowHeaderObjs);
65317
+ this._addHeaders(this._rowHeaderCellFullPathIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowHeaderObjs);
65252
65318
  }
65253
65319
  }
65254
65320
  if (this.rowHeaderTitle) {
65255
65321
  this.sharedVar.seqId = Math.max(this.sharedVar.seqId, this._headerObjects.length);
65256
65322
  const id = ++this.sharedVar.seqId;
65257
- const firstColIds = Array(this._rowHeaderCellIds_FULL[0]?.length ?? this.rowDimensionTree.tree.size).fill(id);
65258
- this._rowHeaderCellIds_FULL.unshift(firstColIds);
65323
+ const firstColIds = Array(this._rowHeaderCellFullPathIds_FULL[0]?.length ?? this.rowDimensionTree.tree.size).fill(id);
65324
+ this._rowHeaderCellFullPathIds_FULL.unshift(firstColIds);
65259
65325
  const cell = {
65260
65326
  id,
65261
65327
  title: typeof this.rowHeaderTitle.title === 'string'
@@ -65357,19 +65423,19 @@
65357
65423
  results[id] = cell;
65358
65424
  this._headerObjects[id] = cell;
65359
65425
  if (this.cornerSetting.titleOnDimension === 'column') {
65360
- if (!this._cornerHeaderCellIds[key]) {
65361
- this._cornerHeaderCellIds[key] = [];
65426
+ if (!this._cornerHeaderCellFullPathIds[key]) {
65427
+ this._cornerHeaderCellFullPathIds[key] = [];
65362
65428
  }
65363
65429
  for (let r = 0; r < this.rowHeaderLevelCount; r++) {
65364
- this._cornerHeaderCellIds[key][r] = id;
65430
+ this._cornerHeaderCellFullPathIds[key][r] = id;
65365
65431
  }
65366
65432
  }
65367
65433
  else if (this.cornerSetting.titleOnDimension === 'row') {
65368
65434
  for (let r = 0; r < this.columnHeaderLevelCount; r++) {
65369
- if (!this._cornerHeaderCellIds[r]) {
65370
- this._cornerHeaderCellIds[r] = [];
65435
+ if (!this._cornerHeaderCellFullPathIds[r]) {
65436
+ this._cornerHeaderCellFullPathIds[r] = [];
65371
65437
  }
65372
- this._cornerHeaderCellIds[r][key] = id;
65438
+ this._cornerHeaderCellFullPathIds[r][key] = id;
65373
65439
  }
65374
65440
  }
65375
65441
  });
@@ -65394,10 +65460,10 @@
65394
65460
  this._headerObjects[id] = cell;
65395
65461
  for (let r = 0; r < this.columnHeaderLevelCount; r++) {
65396
65462
  for (let j = 0; j < this.rowHeaderLevelCount; j++) {
65397
- if (!this._cornerHeaderCellIds[r]) {
65398
- this._cornerHeaderCellIds[r] = [];
65463
+ if (!this._cornerHeaderCellFullPathIds[r]) {
65464
+ this._cornerHeaderCellFullPathIds[r] = [];
65399
65465
  }
65400
- this._cornerHeaderCellIds[r][j] = id;
65466
+ this._cornerHeaderCellFullPathIds[r][j] = id;
65401
65467
  }
65402
65468
  }
65403
65469
  }
@@ -65405,8 +65471,8 @@
65405
65471
  }
65406
65472
  generateExtensionRowTree() {
65407
65473
  this.extensionRows.forEach((extensionRow, indexP) => {
65408
- const old_rowHeaderCellIds = this._rowHeaderCellIds_FULL;
65409
- this._rowHeaderCellIds_FULL = [];
65474
+ const old_rowHeaderCellIds = this._rowHeaderCellFullPathIds_FULL;
65475
+ this._rowHeaderCellFullPathIds_FULL = [];
65410
65476
  old_rowHeaderCellIds.forEach((row_ids, index) => {
65411
65477
  const key = row_ids[row_ids.length - 1];
65412
65478
  this.colIndex = 0;
@@ -65432,7 +65498,7 @@
65432
65498
  const extensionRowTreeHeaderIds = [];
65433
65499
  this._addHeadersForTreeMode(extensionRowTreeHeaderIds, 0, rowExtensionDimensionTree.tree.children, [], rowExtensionDimensionTree.totalLevel, true, extensionRow.rows, this.rowHeaderObjs);
65434
65500
  for (let i = 0; i < extensionRowTreeHeaderIds[0].length; i++) {
65435
- this._rowHeaderCellIds_FULL.push(row_ids.concat(extensionRowTreeHeaderIds[0][i]));
65501
+ this._rowHeaderCellFullPathIds_FULL.push(row_ids.concat(extensionRowTreeHeaderIds[0][i]));
65436
65502
  }
65437
65503
  });
65438
65504
  });
@@ -66133,7 +66199,7 @@
66133
66199
  }
66134
66200
  if (col >= 0 && recordRow >= 0) {
66135
66201
  if (this.rowHierarchyType === 'tree') {
66136
- const row_pathIds = this._rowHeaderCellIds[recordRow];
66202
+ const row_pathIds = this._rowHeaderCellFullPathIds[recordRow];
66137
66203
  let findTree = this.rowDimensionTree;
66138
66204
  let level = 0;
66139
66205
  while (findTree) {
@@ -66253,7 +66319,7 @@
66253
66319
  return this.isColumnIndicatorHeader(col, row) || this.isRowIndicatorHeader(col, row);
66254
66320
  }
66255
66321
  toggleHierarchyState(col, row) {
66256
- const oldRowHeaderCellIds = this._rowHeaderCellIds_FULL.slice(0);
66322
+ const oldRowHeaderCellIds = this._rowHeaderCellFullPathIds_FULL.slice(0);
66257
66323
  const oldRowHeaderCellPositons = oldRowHeaderCellIds.map((id, row) => {
66258
66324
  return { col, row: row + this.columnHeaderLevelCount };
66259
66325
  });
@@ -66261,15 +66327,15 @@
66261
66327
  hd.define.hierarchyState =
66262
66328
  hd.define.hierarchyState === HierarchyState.collapse ? HierarchyState.expand : HierarchyState.collapse;
66263
66329
  this.rowDimensionTree.reset(this.rowDimensionTree.tree.children, true);
66264
- this._rowHeaderCellIds_FULL = [];
66330
+ this._rowHeaderCellFullPathIds_FULL = [];
66265
66331
  this.rowDimensionKeys = this.rowDimensionTree.dimensionKeys.valueArr();
66266
66332
  this.fullRowDimensionKeys = [];
66267
66333
  this.fullRowDimensionKeys = this.fullRowDimensionKeys.concat(this.rowDimensionKeys);
66268
- this._addHeadersForTreeMode(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, true, this.rowsDefine, this.rowHeaderObjs);
66334
+ this._addHeadersForTreeMode(this._rowHeaderCellFullPathIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, true, this.rowsDefine, this.rowHeaderObjs);
66269
66335
  if (this.rowHeaderTitle) {
66270
66336
  const id = ++this.sharedVar.seqId;
66271
66337
  const firstColIds = Array(this.rowCount - this.columnHeaderLevelCount).fill(id);
66272
- this._rowHeaderCellIds_FULL.unshift(firstColIds);
66338
+ this._rowHeaderCellFullPathIds_FULL.unshift(firstColIds);
66273
66339
  const cell = {
66274
66340
  id,
66275
66341
  title: typeof this.rowHeaderTitle.title === 'string'
@@ -66294,7 +66360,7 @@
66294
66360
  this.rowHeaderObjs.push(cell);
66295
66361
  this._headerObjects[id] = cell;
66296
66362
  }
66297
- this._rowHeaderCellIds_FULL = transpose(this._rowHeaderCellIds_FULL);
66363
+ this._rowHeaderCellFullPathIds_FULL = transpose(this._rowHeaderCellFullPathIds_FULL);
66298
66364
  if (this.rowHierarchyType === 'tree' && this.extensionRows?.length >= 1) {
66299
66365
  this.generateExtensionRowTree();
66300
66366
  }
@@ -66305,8 +66371,9 @@
66305
66371
  }, {});
66306
66372
  this._CellHeaderPathMap = new Map();
66307
66373
  this._largeCellRangeCache.length = 0;
66308
- const diffCell = diffCellAddress(col, row, oldRowHeaderCellIds.map(oldCellId => oldCellId[col - this.leftRowSeriesNumberColumnCount]), this._rowHeaderCellIds_FULL.map(newCellId => newCellId[col - this.leftRowSeriesNumberColumnCount]), oldRowHeaderCellPositons, this);
66309
- this._rowHeaderCellIds = this._rowHeaderCellIds_FULL.slice();
66374
+ const diffCell = diffCellAddress(col, row, oldRowHeaderCellIds.map(oldCellId => oldCellId[col - this.leftRowSeriesNumberColumnCount]), this._rowHeaderCellFullPathIds_FULL.map(newCellId => newCellId[col - this.leftRowSeriesNumberColumnCount]), oldRowHeaderCellPositons, this);
66375
+ this.generateCellIdsConsiderHideHeader();
66376
+ this.setPagination(this.pagination);
66310
66377
  return diffCell;
66311
66378
  }
66312
66379
  isHeaderForColWidth(col, row) {
@@ -66529,10 +66596,10 @@
66529
66596
  if (targetIndex === sourceCellRange.start.col) {
66530
66597
  return null;
66531
66598
  }
66532
- for (let row = 0; row < this._columnHeaderCellIds.length; row++) {
66533
- const sourceIds = this._columnHeaderCellIds[row].splice(sourceCellRange.start.col - this.rowHeaderLevelCount - this.leftRowSeriesNumberColumnCount, sourceSize);
66599
+ for (let row = 0; row < this._columnHeaderCellFullPathIds.length; row++) {
66600
+ const sourceIds = this._columnHeaderCellFullPathIds[row].splice(sourceCellRange.start.col - this.rowHeaderLevelCount - this.leftRowSeriesNumberColumnCount, sourceSize);
66534
66601
  sourceIds.unshift(targetIndex - this.rowHeaderLevelCount - this.leftRowSeriesNumberColumnCount, 0);
66535
- Array.prototype.splice.apply(this._columnHeaderCellIds[row], sourceIds);
66602
+ Array.prototype.splice.apply(this._columnHeaderCellFullPathIds[row], sourceIds);
66536
66603
  }
66537
66604
  const sourceColumns = this._columnWidths.splice(sourceCellRange.start.col - this.leftRowSeriesNumberColumnCount, sourceSize);
66538
66605
  sourceColumns.unshift((targetIndex - this.leftRowSeriesNumberColumnCount), 0);
@@ -66569,9 +66636,15 @@
66569
66636
  const sourceIds = this._rowHeaderCellIds.splice(sourceCellRange.start.row - this.columnHeaderLevelCount, sourceSize);
66570
66637
  sourceIds.unshift((targetIndex - this.currentPageStartIndex), 0);
66571
66638
  Array.prototype.splice.apply(this._rowHeaderCellIds, sourceIds);
66639
+ const sourceIds0 = this._rowHeaderCellFullPathIds.splice(sourceCellRange.start.row - this.columnHeaderLevelCount, sourceSize);
66640
+ sourceIds0.unshift((targetIndex - this.currentPageStartIndex), 0);
66641
+ Array.prototype.splice.apply(this._rowHeaderCellFullPathIds, sourceIds0);
66572
66642
  const sourceIds_FULL = this._rowHeaderCellIds_FULL.splice(sourceCellRange.start.row - this.columnHeaderLevelCount + this.currentPageStartIndex, sourceSize);
66573
66643
  sourceIds_FULL.unshift(targetIndex, 0);
66574
66644
  Array.prototype.splice.apply(this._rowHeaderCellIds_FULL, sourceIds_FULL);
66645
+ const sourceIds_FULL0 = this._rowHeaderCellFullPathIds_FULL.splice(sourceCellRange.start.row - this.columnHeaderLevelCount + this.currentPageStartIndex, sourceSize);
66646
+ sourceIds_FULL0.unshift(targetIndex, 0);
66647
+ Array.prototype.splice.apply(this._rowHeaderCellFullPathIds_FULL, sourceIds_FULL0);
66575
66648
  this.rowDimensionTree.movePosition(sourceRowHeaderPaths.length - 1, sourceCellRange.start.row - this.columnHeaderLevelCount, targetIndex + (target.row > source.row ? sourceRowHeaderNode.size - 1 : 0));
66576
66649
  this.rowDimensionTree.reset(this.rowDimensionTree.tree.children, true);
66577
66650
  this._CellHeaderPathMap = new Map();
@@ -66847,11 +66920,13 @@
66847
66920
  this.currentPageStartIndex = perPageCount * (currentPage || 0);
66848
66921
  this.currentPageEndIndex = this.currentPageStartIndex + perPageCount;
66849
66922
  this._rowHeaderCellIds = this._rowHeaderCellIds_FULL?.slice(this.currentPageStartIndex, this.currentPageEndIndex);
66923
+ this._rowHeaderCellFullPathIds = this._rowHeaderCellFullPathIds_FULL?.slice(this.currentPageStartIndex, this.currentPageEndIndex);
66850
66924
  }
66851
66925
  else {
66852
66926
  this.currentPageStartIndex = 0;
66853
66927
  this.currentPageEndIndex = this._rowHeaderCellIds_FULL.length;
66854
66928
  this._rowHeaderCellIds = this._rowHeaderCellIds_FULL?.slice(this.currentPageStartIndex, this.currentPageEndIndex);
66929
+ this._rowHeaderCellFullPathIds = this._rowHeaderCellFullPathIds_FULL?.slice(this.currentPageStartIndex, this.currentPageEndIndex);
66855
66930
  }
66856
66931
  this.pagination && (this.pagination.totalCount = this._rowHeaderCellIds_FULL?.length);
66857
66932
  }
@@ -67216,7 +67291,7 @@
67216
67291
  return totalCount;
67217
67292
  }
67218
67293
  resetHeaderTree() {
67219
- this._rowHeaderCellIds_FULL = [];
67294
+ this._rowHeaderCellFullPathIds_FULL = [];
67220
67295
  this._columnHeaderCellIds = [];
67221
67296
  const dataset = this.dataset;
67222
67297
  this.rowTree = dataset.rowHeaderTree;
@@ -67227,13 +67302,13 @@
67227
67302
  this.colIndex = 0;
67228
67303
  this._generateRowHeaderIds();
67229
67304
  this.resetColumnHeaderLevelCount();
67230
- this._rowHeaderCellIds_FULL = transpose(this._rowHeaderCellIds_FULL);
67305
+ this._rowHeaderCellFullPathIds_FULL = transpose(this._rowHeaderCellFullPathIds_FULL);
67231
67306
  this._headerObjectMap = this._headerObjects.reduce((o, e) => {
67232
67307
  o[e.id] = e;
67233
67308
  return o;
67234
67309
  }, {});
67310
+ this.generateCellIdsConsiderHideHeader();
67235
67311
  this.setPagination(this.pagination);
67236
- this.clearCellIds();
67237
67312
  }
67238
67313
  isSeriesNumberInHeader(col, row) {
67239
67314
  if (this.leftRowSeriesNumberColumnCount > 0 && col >= 0 && row >= 0 && col < this.leftRowSeriesNumberColumnCount) {
@@ -67317,31 +67392,74 @@
67317
67392
  const id = this.getCellId(col, row);
67318
67393
  this._headerObjectMap[id].title = value;
67319
67394
  }
67320
- clearCellIds() {
67395
+ generateCellIdsConsiderHideHeader() {
67396
+ this._columnHeaderCellIds = this._columnHeaderCellFullPathIds.slice();
67321
67397
  if (!this.showColumnHeader) {
67322
67398
  if (this.indicatorsAsCol && !this.hideIndicatorName) {
67323
67399
  const indicatorIndex = this.colDimensionKeys.indexOf(IndicatorDimensionKeyPlaceholder);
67324
- this._columnHeaderCellIds = this._columnHeaderCellIds.splice(indicatorIndex, 1);
67400
+ const indicatorIds = this._columnHeaderCellIds.splice(indicatorIndex, 1);
67401
+ this._columnHeaderCellIds.splice(0, this._columnHeaderCellIds.length);
67402
+ this._columnHeaderCellIds.push(indicatorIds[0]);
67325
67403
  }
67326
67404
  else {
67327
67405
  this._columnHeaderCellIds.splice(0, this._columnHeaderCellIds.length);
67328
67406
  }
67329
67407
  }
67408
+ this._rowHeaderCellIds_FULL = this._rowHeaderCellFullPathIds_FULL.slice();
67330
67409
  if (!this.showRowHeader) {
67331
67410
  if (!this.indicatorsAsCol && !this.hideIndicatorName) {
67332
67411
  const indicatorIndex = this.rowDimensionKeys.indexOf(IndicatorDimensionKeyPlaceholder);
67333
- this._rowHeaderCellIds_FULL.forEach((cellIds) => {
67334
- const indicator = cellIds.splice(indicatorIndex, 1);
67335
- cellIds.splice(0, cellIds.length);
67336
- cellIds.push(indicator[0]);
67412
+ this._rowHeaderCellIds_FULL.forEach((cellIds, index) => {
67413
+ const _cellIds = cellIds.slice();
67414
+ const indicator = _cellIds.splice(indicatorIndex, 1);
67415
+ _cellIds.splice(0, _cellIds.length);
67416
+ _cellIds.push(indicator[0]);
67417
+ this._rowHeaderCellIds_FULL[index] = _cellIds;
67337
67418
  });
67338
67419
  }
67339
67420
  else {
67340
- this._rowHeaderCellIds_FULL.forEach((cellIds) => {
67341
- cellIds.splice(0, cellIds.length);
67421
+ this._rowHeaderCellIds_FULL.forEach((cellIds, index) => {
67422
+ const _cellIds = cellIds.slice();
67423
+ _cellIds.splice(0, _cellIds.length);
67424
+ this._rowHeaderCellIds_FULL[index] = _cellIds;
67342
67425
  });
67343
67426
  }
67344
67427
  }
67428
+ this._rowHeaderCellIds = this._rowHeaderCellIds_FULL.slice();
67429
+ this._cornerHeaderCellIds = this._cornerHeaderCellFullPathIds.slice();
67430
+ if (this.rowHeaderLevelCount === 0 || this.columnHeaderLevelCount === 0) {
67431
+ this._cornerHeaderCellIds = [];
67432
+ }
67433
+ else if (this.cornerSetting.titleOnDimension === 'row' && !this.showRowHeader) {
67434
+ if (!this.indicatorsAsCol && !this.hideIndicatorName) {
67435
+ const indicatorIndex = this.rowDimensionKeys.indexOf(IndicatorDimensionKeyPlaceholder);
67436
+ this._cornerHeaderCellIds.forEach((cellIds, index) => {
67437
+ const _cellIds = cellIds.slice();
67438
+ const indicator = _cellIds.splice(indicatorIndex, 1);
67439
+ _cellIds.splice(0, _cellIds.length);
67440
+ _cellIds.push(indicator[0]);
67441
+ this._cornerHeaderCellIds[index] = _cellIds;
67442
+ });
67443
+ }
67444
+ else {
67445
+ this._cornerHeaderCellIds.forEach((cellIds, index) => {
67446
+ const _cellIds = cellIds.slice();
67447
+ _cellIds.splice(0, _cellIds.length);
67448
+ this._cornerHeaderCellIds[index] = _cellIds;
67449
+ });
67450
+ }
67451
+ }
67452
+ else if (this.cornerSetting.titleOnDimension === 'column' && !this.showColumnHeader) {
67453
+ if (this.indicatorsAsCol && !this.hideIndicatorName) {
67454
+ const indicatorIndex = this.colDimensionKeys.indexOf(IndicatorDimensionKeyPlaceholder);
67455
+ const indicatorIds = this._cornerHeaderCellIds.splice(indicatorIndex, 1);
67456
+ this._cornerHeaderCellIds.splice(0, this._cornerHeaderCellIds.length);
67457
+ this._cornerHeaderCellIds.push(indicatorIds[0]);
67458
+ }
67459
+ else {
67460
+ this._cornerHeaderCellIds.splice(0, this._cornerHeaderCellIds.length);
67461
+ }
67462
+ }
67345
67463
  }
67346
67464
  }
67347
67465
  function scaleWholeRangeSize(count, bandwidth, paddingInner, paddingOuter) {
@@ -68835,7 +68953,11 @@
68835
68953
  _canResizeColumn(col, row) {
68836
68954
  const ifCan = super._canResizeColumn(col, row);
68837
68955
  if (ifCan) {
68838
- if (!this.internalProps.layoutMap.indicatorsAsCol) {
68956
+ const isSeriesNumber = this.internalProps.layoutMap.isSeriesNumber(col, row);
68957
+ if (isSeriesNumber && this.internalProps.rowSeriesNumber.disableColumnResize === true) {
68958
+ return false;
68959
+ }
68960
+ else if (!this.internalProps.layoutMap.indicatorsAsCol) {
68839
68961
  const cellDefine = this.internalProps.layoutMap.getBody(col, this.columnHeaderLevelCount);
68840
68962
  if (cellDefine?.disableColumnResize) {
68841
68963
  return false;
@@ -71129,7 +71251,7 @@
71129
71251
  }
71130
71252
 
71131
71253
  registerForVrender();
71132
- const version = "0.25.8-alpha.0";
71254
+ const version = "0.25.9";
71133
71255
  function getIcons() {
71134
71256
  return get$2();
71135
71257
  }