@visactor/vtable 0.25.7 → 0.25.8

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 (83) 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.d.ts +4 -1
  6. package/cjs/core/BaseTable.js +46 -21
  7. package/cjs/core/BaseTable.js.map +1 -1
  8. package/cjs/core/FouseInput.js +2 -1
  9. package/cjs/core/row-series-number-helper.js +1 -2
  10. package/cjs/event/drill.js +2 -1
  11. package/cjs/event/media-click.js +1 -2
  12. package/cjs/header-helper/header-helper.js +1 -1
  13. package/cjs/header-helper/header-helper.js.map +1 -1
  14. package/cjs/index.d.ts +1 -1
  15. package/cjs/index.js +1 -1
  16. package/cjs/index.js.map +1 -1
  17. package/cjs/layout/pivot-header-layout.d.ts +5 -1
  18. package/cjs/layout/pivot-header-layout.js +82 -57
  19. package/cjs/layout/pivot-header-layout.js.map +1 -1
  20. package/cjs/layout/tree-helper.js +1 -0
  21. package/cjs/plugins/themes.js +1 -2
  22. package/cjs/scenegraph/component/table-component.js +26 -22
  23. package/cjs/scenegraph/component/table-component.js.map +1 -1
  24. package/cjs/scenegraph/group-creater/cell-type/image-cell.js +24 -18
  25. package/cjs/scenegraph/group-creater/cell-type/image-cell.js.map +1 -1
  26. package/cjs/scenegraph/group-creater/cell-type/video-cell.js +18 -16
  27. package/cjs/scenegraph/group-creater/cell-type/video-cell.js.map +1 -1
  28. package/cjs/state/state.js +1 -1
  29. package/cjs/themes/component.js +1 -1
  30. package/cjs/themes/theme.js +3 -0
  31. package/cjs/themes/theme.js.map +1 -1
  32. package/cjs/tools/helper.js +2 -2
  33. package/cjs/tools/helper.js.map +1 -1
  34. package/cjs/ts-types/base-table.d.ts +7 -0
  35. package/cjs/ts-types/base-table.js.map +1 -1
  36. package/cjs/ts-types/table-engine.d.ts +1 -0
  37. package/cjs/ts-types/table-engine.js.map +1 -1
  38. package/cjs/ts-types/theme.d.ts +1 -0
  39. package/cjs/ts-types/theme.js.map +1 -1
  40. package/cjs/vrender.js.map +1 -1
  41. package/dist/vtable.js +208 -67
  42. package/dist/vtable.min.js +2 -2
  43. package/es/ListTable.js +2 -1
  44. package/es/ListTable.js.map +1 -1
  45. package/es/PivotTable.js +6 -3
  46. package/es/PivotTable.js.map +1 -1
  47. package/es/core/BaseTable.d.ts +4 -1
  48. package/es/core/BaseTable.js +47 -21
  49. package/es/core/BaseTable.js.map +1 -1
  50. package/es/core/FouseInput.js +2 -1
  51. package/es/core/row-series-number-helper.js +1 -2
  52. package/es/event/drill.js +2 -1
  53. package/es/event/media-click.js +1 -2
  54. package/es/header-helper/header-helper.js +1 -1
  55. package/es/header-helper/header-helper.js.map +1 -1
  56. package/es/index.d.ts +1 -1
  57. package/es/index.js +1 -1
  58. package/es/index.js.map +1 -1
  59. package/es/layout/pivot-header-layout.d.ts +5 -1
  60. package/es/layout/pivot-header-layout.js +83 -56
  61. package/es/layout/pivot-header-layout.js.map +1 -1
  62. package/es/layout/tree-helper.js +2 -1
  63. package/es/plugins/themes.js +1 -2
  64. package/es/scenegraph/component/table-component.js +27 -21
  65. package/es/scenegraph/component/table-component.js.map +1 -1
  66. package/es/scenegraph/group-creater/cell-type/image-cell.js +21 -17
  67. package/es/scenegraph/group-creater/cell-type/image-cell.js.map +1 -1
  68. package/es/scenegraph/group-creater/cell-type/video-cell.js +18 -15
  69. package/es/scenegraph/group-creater/cell-type/video-cell.js.map +1 -1
  70. package/es/state/state.js +1 -1
  71. package/es/themes/component.js +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/base-table.d.ts +7 -0
  77. package/es/ts-types/base-table.js.map +1 -1
  78. package/es/ts-types/table-engine.d.ts +1 -0
  79. package/es/ts-types/table-engine.js.map +1 -1
  80. package/es/ts-types/theme.d.ts +1 -0
  81. package/es/ts-types/theme.js.map +1 -1
  82. package/es/vrender.js.map +1 -1
  83. 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
  },
@@ -36677,7 +36684,10 @@
36677
36684
  function createImageCellGroup(columnGroup, xOrigin, yOrigin, col, row, width, height, keepAspectRatio, imageAutoSizing, padding, textAlign, textBaseline, table, cellTheme, isAsync) {
36678
36685
  const headerStyle = table._getCellStyle(col, row);
36679
36686
  const functionalPadding = getFunctionalProp('padding', headerStyle, col, row, table);
36680
- if (isValid$3(functionalPadding)) {
36687
+ if (table.options.customConfig?.imageMargin) {
36688
+ padding = getQuadProps(table.options.customConfig?.imageMargin);
36689
+ }
36690
+ else if (isValid$3(functionalPadding)) {
36681
36691
  padding = functionalPadding;
36682
36692
  }
36683
36693
  if (cellTheme?.text?.textAlign) {
@@ -36830,7 +36840,13 @@
36830
36840
  const headerStyle = table._getCellStyle(col, row);
36831
36841
  const textAlign = getProp('textAlign', headerStyle, col, row, table) ?? 'left';
36832
36842
  const textBaseline = getProp('textBaseline', headerStyle, col, row, table) ?? 'middle';
36833
- const padding = getQuadProps(getProp('padding', headerStyle, col, row, table)) ?? [0, 0, 0, 0];
36843
+ let padding;
36844
+ if (table.options.customConfig?.imageMargin) {
36845
+ padding = getQuadProps(table.options.customConfig?.imageMargin);
36846
+ }
36847
+ else {
36848
+ padding = getQuadProps(getProp('padding', headerStyle, col, row, table)) ?? [0, 0, 0, 0];
36849
+ }
36834
36850
  const { width: cellWidth, height: cellHeight, isMerge } = getCellRange(cellGroup, table);
36835
36851
  const colStart = cellGroup.mergeStartCol ?? cellGroup.col;
36836
36852
  const rowStart = cellGroup.mergeStartRow ?? cellGroup.row;
@@ -38731,7 +38747,10 @@
38731
38747
  function createVideoCellGroup(columnGroup, xOrigin, yOrigin, col, row, width, height, keepAspectRatio, imageAutoSizing, padding, textAlign, textBaseline, table, cellTheme, isAsync) {
38732
38748
  const headerStyle = table._getCellStyle(col, row);
38733
38749
  const functionalPadding = getFunctionalProp('padding', headerStyle, col, row, table);
38734
- if (isValid$3(functionalPadding)) {
38750
+ if (table.options.customConfig?.imageMargin) {
38751
+ padding = getQuadProps(table.options.customConfig?.imageMargin);
38752
+ }
38753
+ else if (isValid$3(functionalPadding)) {
38735
38754
  padding = functionalPadding;
38736
38755
  }
38737
38756
  if (cellTheme?.text?.textAlign) {
@@ -42726,7 +42745,20 @@
42726
42745
  const theme = this.table.theme;
42727
42746
  const scrollRailColor = theme.scrollStyle?.scrollRailColor;
42728
42747
  const scrollSliderColor = theme.scrollStyle?.scrollSliderColor;
42748
+ const scrollSliderCornerRadius = theme.scrollStyle?.scrollSliderCornerRadius;
42729
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
+ }
42730
42762
  this.hScrollBar = new ScrollBar({
42731
42763
  direction: 'horizontal',
42732
42764
  x: -this.table.tableNoFrameWidth * 2,
@@ -42737,9 +42769,7 @@
42737
42769
  railStyle: {
42738
42770
  fill: scrollRailColor
42739
42771
  },
42740
- sliderStyle: {
42741
- fill: scrollSliderColor
42742
- },
42772
+ sliderStyle,
42743
42773
  range: [0, 0.1],
42744
42774
  visible: false
42745
42775
  });
@@ -42755,9 +42785,7 @@
42755
42785
  railStyle: {
42756
42786
  fill: scrollRailColor
42757
42787
  },
42758
- sliderStyle: {
42759
- fill: scrollSliderColor
42760
- },
42788
+ sliderStyle,
42761
42789
  range: [0, 0.1],
42762
42790
  visible: false
42763
42791
  });
@@ -43066,24 +43094,33 @@
43066
43094
  const theme = this.table.theme;
43067
43095
  const scrollRailColor = theme.scrollStyle?.scrollRailColor;
43068
43096
  const scrollSliderColor = theme.scrollStyle?.scrollSliderColor;
43097
+ const scrollSliderCornerRadius = theme.scrollStyle?.scrollSliderCornerRadius;
43069
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
+ }
43070
43111
  this.hScrollBar.setAttributes({
43071
43112
  height: width,
43072
43113
  railStyle: {
43073
43114
  fill: scrollRailColor
43074
43115
  },
43075
- sliderStyle: {
43076
- fill: scrollSliderColor
43077
- }
43116
+ sliderStyle
43078
43117
  });
43079
43118
  this.vScrollBar.setAttributes({
43080
43119
  width,
43081
43120
  railStyle: {
43082
43121
  fill: scrollRailColor
43083
43122
  },
43084
- sliderStyle: {
43085
- fill: scrollSliderColor
43086
- }
43123
+ sliderStyle
43087
43124
  });
43088
43125
  const columnResizeColor = theme.columnResize?.lineColor;
43089
43126
  const columnResizeWidth = theme.columnResize?.lineWidth;
@@ -56324,7 +56361,7 @@
56324
56361
  }
56325
56362
  setTableColumnsEditor() {
56326
56363
  const setEditor = (colDefines, setColumns) => {
56327
- colDefines.forEach((colDefine, index) => {
56364
+ colDefines?.forEach((colDefine, index) => {
56328
56365
  if (colDefine.editor) {
56329
56366
  setColumns[index].editor = colDefine.editor;
56330
56367
  }
@@ -58370,7 +58407,7 @@
58370
58407
  return TABLE_EVENT_TYPE;
58371
58408
  }
58372
58409
  options;
58373
- version = "0.25.7";
58410
+ version = "0.25.8";
58374
58411
  pagination;
58375
58412
  id = `VTable${Date.now()}`;
58376
58413
  headerStyleCache;
@@ -58793,8 +58830,21 @@
58793
58830
  let heightP = 0;
58794
58831
  if (Env.mode === 'browser') {
58795
58832
  const element = this.getElement();
58796
- const width1 = element.parentElement?.offsetWidth ?? 1 - 1;
58797
- const height1 = element.parentElement?.offsetHeight ?? 1 - 1;
58833
+ let widthWithoutPadding = 0;
58834
+ let heightWithoutPadding = 0;
58835
+ if (element.parentElement) {
58836
+ const computedStyle = element.parentElement.style || window.getComputedStyle(element.parentElement);
58837
+ widthWithoutPadding =
58838
+ element.parentElement.offsetWidth -
58839
+ parseInt(computedStyle.paddingLeft || '0px', 10) -
58840
+ parseInt(computedStyle.paddingRight || '0px', 10);
58841
+ heightWithoutPadding =
58842
+ element.parentElement.offsetHeight -
58843
+ parseInt(computedStyle.paddingTop || '0px', 10) -
58844
+ parseInt(computedStyle.paddingBottom || '0px', 20);
58845
+ }
58846
+ const width1 = widthWithoutPadding ?? 1 - 1;
58847
+ const height1 = heightWithoutPadding ?? 1 - 1;
58798
58848
  element.style.width = (width1 && `${width1 - padding.left - padding.right}px`) || '0px';
58799
58849
  element.style.height = (height1 && `${height1 - padding.top - padding.bottom}px`) || '0px';
58800
58850
  const { canvas } = this.internalProps;
@@ -60895,7 +60945,7 @@
60895
60945
  const c = this.scenegraph.stage.toCanvas();
60896
60946
  return c.toDataURL();
60897
60947
  }
60898
- exportCellImg(col, row) {
60948
+ exportCellImg(col, row, options) {
60899
60949
  const isInView = this.cellIsInVisualView(col, row);
60900
60950
  const { scrollTop, scrollLeft } = this;
60901
60951
  if (!isInView) {
@@ -60909,16 +60959,43 @@
60909
60959
  this.stateManager.updateHoverPos(-1, -1);
60910
60960
  this.scenegraph.component.hideVerticalScrollBar();
60911
60961
  this.scenegraph.component.hideHorizontalScrollBar();
60962
+ this.scenegraph.tableGroup.border.setAttribute('visible', false);
60963
+ let oldFill;
60964
+ if (options?.disableBackground) {
60965
+ const cellGroup = this.scenegraph.getCell(col, row);
60966
+ oldFill = cellGroup.attribute.fill;
60967
+ cellGroup.setAttribute('fill', 'transparent');
60968
+ }
60969
+ let oldStroke;
60970
+ if (options?.disableBorder) {
60971
+ const cellGroup = this.scenegraph.getCell(col, row);
60972
+ oldStroke = cellGroup.attribute.stroke;
60973
+ cellGroup.setAttribute('stroke', false);
60974
+ }
60912
60975
  this.scenegraph.renderSceneGraph();
60913
- const c = this.scenegraph.stage.toCanvas(false, new AABBBounds().set(cellRect.left + this.tableX + 1, cellRect.top + this.tableY + 1, cellRect.right + this.tableX, cellRect.bottom + this.tableY));
60976
+ let sizeOffset = 0;
60977
+ if (this.theme.cellBorderClipDirection === 'bottom-right') {
60978
+ sizeOffset = 1;
60979
+ }
60980
+ const c = this.scenegraph.stage.toCanvas(false, new AABBBounds().set(cellRect.left + this.tableX + 1, cellRect.top + this.tableY + 1, cellRect.right + this.tableX - sizeOffset, cellRect.bottom + this.tableY - sizeOffset));
60914
60981
  if (!isInView) {
60915
60982
  this.setScrollTop(scrollTop);
60916
60983
  this.setScrollLeft(scrollLeft);
60917
60984
  }
60985
+ this.scenegraph.tableGroup.border.setAttribute('visible', true);
60986
+ if (oldFill) {
60987
+ const cellGroup = this.scenegraph.getCell(col, row);
60988
+ cellGroup.setAttribute('fill', oldFill);
60989
+ }
60990
+ if (oldStroke) {
60991
+ const cellGroup = this.scenegraph.getCell(col, row);
60992
+ cellGroup.setAttribute('stroke', oldStroke);
60993
+ }
60918
60994
  if (this.stateManager.select?.ranges?.length > 0) {
60919
60995
  restoreCellSelectBorder(this.scenegraph);
60920
60996
  }
60921
60997
  this.stateManager.updateHoverPos(hoverCol, hoverRow);
60998
+ this.scenegraph.updateNextFrame();
60922
60999
  return c.toDataURL();
60923
61000
  }
60924
61001
  exportCellRangeImg(cellRange) {
@@ -63792,9 +63869,13 @@
63792
63869
  if (ifCan) {
63793
63870
  if (!this.transpose) {
63794
63871
  const cellDefine = this.internalProps.layoutMap.getBody(col, this.columnHeaderLevelCount);
63872
+ const isSeriesNumber = this.internalProps.layoutMap.isSeriesNumber(col, row);
63795
63873
  if (cellDefine?.disableColumnResize) {
63796
63874
  return false;
63797
63875
  }
63876
+ else if (isSeriesNumber && this.internalProps.rowSeriesNumber.disableColumnResize === true) {
63877
+ return false;
63878
+ }
63798
63879
  }
63799
63880
  }
63800
63881
  return ifCan;
@@ -64883,6 +64964,10 @@
64883
64964
  cornerHeaderObjs;
64884
64965
  columnHeaderObjs = [];
64885
64966
  rowHeaderObjs = [];
64967
+ _cornerHeaderCellFullPathIds = [];
64968
+ _columnHeaderCellFullPathIds = [];
64969
+ _rowHeaderCellFullPathIds = [];
64970
+ _rowHeaderCellFullPathIds_FULL = [];
64886
64971
  _cornerHeaderCellIds = [];
64887
64972
  _columnHeaderCellIds = [];
64888
64973
  _rowHeaderCellIds = [];
@@ -65034,7 +65119,7 @@
65034
65119
  });
65035
65120
  }
65036
65121
  this.resetColumnHeaderLevelCount();
65037
- this._rowHeaderCellIds_FULL = transpose(this._rowHeaderCellIds_FULL);
65122
+ this._rowHeaderCellFullPathIds_FULL = transpose(this._rowHeaderCellFullPathIds_FULL);
65038
65123
  if (table.options.rowHierarchyType === 'tree' && this.extensionRows?.length >= 1) {
65039
65124
  this.generateExtensionRowTree();
65040
65125
  this.extensionRows.forEach(extensionRow => {
@@ -65088,6 +65173,7 @@
65088
65173
  else {
65089
65174
  this._indicatorShowType = 'none';
65090
65175
  }
65176
+ this.generateCellIdsConsiderHideHeader();
65091
65177
  this.setPagination(table.options.pagination);
65092
65178
  if (this._table.isPivotChart()) {
65093
65179
  this._chartItemSpanSize = 0;
@@ -65126,7 +65212,6 @@
65126
65212
  }
65127
65213
  this.handleRowSeriesNumber(table.internalProps.rowSeriesNumber);
65128
65214
  this.setColumnWidths();
65129
- this.clearCellIds();
65130
65215
  }
65131
65216
  handleRowSeriesNumber(rowSeriesNumber) {
65132
65217
  if (rowSeriesNumber) {
@@ -65173,13 +65258,13 @@
65173
65258
  }
65174
65259
  _generateColHeaderIds() {
65175
65260
  if (this.columnDimensionTree.tree.children?.length >= 1) {
65176
- this._addHeaders(this._columnHeaderCellIds, 0, this.columnDimensionTree.tree.children, [], this.columnHeaderObjs);
65261
+ this._addHeaders(this._columnHeaderCellFullPathIds, 0, this.columnDimensionTree.tree.children, [], this.columnHeaderObjs);
65177
65262
  }
65178
65263
  if (this.columnHeaderTitle) {
65179
65264
  this.sharedVar.seqId = Math.max(this.sharedVar.seqId, this._headerObjects.length);
65180
65265
  const id = ++this.sharedVar.seqId;
65181
65266
  const firstRowIds = Array(this.colCount - this.rowHeaderLevelCount).fill(id);
65182
- this._columnHeaderCellIds.unshift(firstRowIds);
65267
+ this._columnHeaderCellFullPathIds.unshift(firstRowIds);
65183
65268
  const cell = {
65184
65269
  id,
65185
65270
  title: typeof this.columnHeaderTitle.title === 'string'
@@ -65206,17 +65291,17 @@
65206
65291
  _generateRowHeaderIds() {
65207
65292
  if (this.rowDimensionTree.tree.children?.length >= 1) {
65208
65293
  if (this.rowHierarchyType === 'tree') {
65209
- this._addHeadersForTreeMode(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, true, this.rowsDefine, this.rowHeaderObjs);
65294
+ this._addHeadersForTreeMode(this._rowHeaderCellFullPathIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, true, this.rowsDefine, this.rowHeaderObjs);
65210
65295
  }
65211
65296
  else {
65212
- this._addHeaders(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowHeaderObjs);
65297
+ this._addHeaders(this._rowHeaderCellFullPathIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowHeaderObjs);
65213
65298
  }
65214
65299
  }
65215
65300
  if (this.rowHeaderTitle) {
65216
65301
  this.sharedVar.seqId = Math.max(this.sharedVar.seqId, this._headerObjects.length);
65217
65302
  const id = ++this.sharedVar.seqId;
65218
- const firstColIds = Array(this._rowHeaderCellIds_FULL[0]?.length ?? this.rowDimensionTree.tree.size).fill(id);
65219
- this._rowHeaderCellIds_FULL.unshift(firstColIds);
65303
+ const firstColIds = Array(this._rowHeaderCellFullPathIds_FULL[0]?.length ?? this.rowDimensionTree.tree.size).fill(id);
65304
+ this._rowHeaderCellFullPathIds_FULL.unshift(firstColIds);
65220
65305
  const cell = {
65221
65306
  id,
65222
65307
  title: typeof this.rowHeaderTitle.title === 'string'
@@ -65318,19 +65403,19 @@
65318
65403
  results[id] = cell;
65319
65404
  this._headerObjects[id] = cell;
65320
65405
  if (this.cornerSetting.titleOnDimension === 'column') {
65321
- if (!this._cornerHeaderCellIds[key]) {
65322
- this._cornerHeaderCellIds[key] = [];
65406
+ if (!this._cornerHeaderCellFullPathIds[key]) {
65407
+ this._cornerHeaderCellFullPathIds[key] = [];
65323
65408
  }
65324
65409
  for (let r = 0; r < this.rowHeaderLevelCount; r++) {
65325
- this._cornerHeaderCellIds[key][r] = id;
65410
+ this._cornerHeaderCellFullPathIds[key][r] = id;
65326
65411
  }
65327
65412
  }
65328
65413
  else if (this.cornerSetting.titleOnDimension === 'row') {
65329
65414
  for (let r = 0; r < this.columnHeaderLevelCount; r++) {
65330
- if (!this._cornerHeaderCellIds[r]) {
65331
- this._cornerHeaderCellIds[r] = [];
65415
+ if (!this._cornerHeaderCellFullPathIds[r]) {
65416
+ this._cornerHeaderCellFullPathIds[r] = [];
65332
65417
  }
65333
- this._cornerHeaderCellIds[r][key] = id;
65418
+ this._cornerHeaderCellFullPathIds[r][key] = id;
65334
65419
  }
65335
65420
  }
65336
65421
  });
@@ -65355,10 +65440,10 @@
65355
65440
  this._headerObjects[id] = cell;
65356
65441
  for (let r = 0; r < this.columnHeaderLevelCount; r++) {
65357
65442
  for (let j = 0; j < this.rowHeaderLevelCount; j++) {
65358
- if (!this._cornerHeaderCellIds[r]) {
65359
- this._cornerHeaderCellIds[r] = [];
65443
+ if (!this._cornerHeaderCellFullPathIds[r]) {
65444
+ this._cornerHeaderCellFullPathIds[r] = [];
65360
65445
  }
65361
- this._cornerHeaderCellIds[r][j] = id;
65446
+ this._cornerHeaderCellFullPathIds[r][j] = id;
65362
65447
  }
65363
65448
  }
65364
65449
  }
@@ -65366,8 +65451,8 @@
65366
65451
  }
65367
65452
  generateExtensionRowTree() {
65368
65453
  this.extensionRows.forEach((extensionRow, indexP) => {
65369
- const old_rowHeaderCellIds = this._rowHeaderCellIds_FULL;
65370
- this._rowHeaderCellIds_FULL = [];
65454
+ const old_rowHeaderCellIds = this._rowHeaderCellFullPathIds_FULL;
65455
+ this._rowHeaderCellFullPathIds_FULL = [];
65371
65456
  old_rowHeaderCellIds.forEach((row_ids, index) => {
65372
65457
  const key = row_ids[row_ids.length - 1];
65373
65458
  this.colIndex = 0;
@@ -65393,7 +65478,7 @@
65393
65478
  const extensionRowTreeHeaderIds = [];
65394
65479
  this._addHeadersForTreeMode(extensionRowTreeHeaderIds, 0, rowExtensionDimensionTree.tree.children, [], rowExtensionDimensionTree.totalLevel, true, extensionRow.rows, this.rowHeaderObjs);
65395
65480
  for (let i = 0; i < extensionRowTreeHeaderIds[0].length; i++) {
65396
- this._rowHeaderCellIds_FULL.push(row_ids.concat(extensionRowTreeHeaderIds[0][i]));
65481
+ this._rowHeaderCellFullPathIds_FULL.push(row_ids.concat(extensionRowTreeHeaderIds[0][i]));
65397
65482
  }
65398
65483
  });
65399
65484
  });
@@ -66094,7 +66179,7 @@
66094
66179
  }
66095
66180
  if (col >= 0 && recordRow >= 0) {
66096
66181
  if (this.rowHierarchyType === 'tree') {
66097
- const row_pathIds = this._rowHeaderCellIds[recordRow];
66182
+ const row_pathIds = this._rowHeaderCellFullPathIds[recordRow];
66098
66183
  let findTree = this.rowDimensionTree;
66099
66184
  let level = 0;
66100
66185
  while (findTree) {
@@ -66214,7 +66299,7 @@
66214
66299
  return this.isColumnIndicatorHeader(col, row) || this.isRowIndicatorHeader(col, row);
66215
66300
  }
66216
66301
  toggleHierarchyState(col, row) {
66217
- const oldRowHeaderCellIds = this._rowHeaderCellIds_FULL.slice(0);
66302
+ const oldRowHeaderCellIds = this._rowHeaderCellFullPathIds_FULL.slice(0);
66218
66303
  const oldRowHeaderCellPositons = oldRowHeaderCellIds.map((id, row) => {
66219
66304
  return { col, row: row + this.columnHeaderLevelCount };
66220
66305
  });
@@ -66222,15 +66307,15 @@
66222
66307
  hd.define.hierarchyState =
66223
66308
  hd.define.hierarchyState === HierarchyState.collapse ? HierarchyState.expand : HierarchyState.collapse;
66224
66309
  this.rowDimensionTree.reset(this.rowDimensionTree.tree.children, true);
66225
- this._rowHeaderCellIds_FULL = [];
66310
+ this._rowHeaderCellFullPathIds_FULL = [];
66226
66311
  this.rowDimensionKeys = this.rowDimensionTree.dimensionKeys.valueArr();
66227
66312
  this.fullRowDimensionKeys = [];
66228
66313
  this.fullRowDimensionKeys = this.fullRowDimensionKeys.concat(this.rowDimensionKeys);
66229
- this._addHeadersForTreeMode(this._rowHeaderCellIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, true, this.rowsDefine, this.rowHeaderObjs);
66314
+ this._addHeadersForTreeMode(this._rowHeaderCellFullPathIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, true, this.rowsDefine, this.rowHeaderObjs);
66230
66315
  if (this.rowHeaderTitle) {
66231
66316
  const id = ++this.sharedVar.seqId;
66232
66317
  const firstColIds = Array(this.rowCount - this.columnHeaderLevelCount).fill(id);
66233
- this._rowHeaderCellIds_FULL.unshift(firstColIds);
66318
+ this._rowHeaderCellFullPathIds_FULL.unshift(firstColIds);
66234
66319
  const cell = {
66235
66320
  id,
66236
66321
  title: typeof this.rowHeaderTitle.title === 'string'
@@ -66255,7 +66340,7 @@
66255
66340
  this.rowHeaderObjs.push(cell);
66256
66341
  this._headerObjects[id] = cell;
66257
66342
  }
66258
- this._rowHeaderCellIds_FULL = transpose(this._rowHeaderCellIds_FULL);
66343
+ this._rowHeaderCellFullPathIds_FULL = transpose(this._rowHeaderCellFullPathIds_FULL);
66259
66344
  if (this.rowHierarchyType === 'tree' && this.extensionRows?.length >= 1) {
66260
66345
  this.generateExtensionRowTree();
66261
66346
  }
@@ -66266,8 +66351,9 @@
66266
66351
  }, {});
66267
66352
  this._CellHeaderPathMap = new Map();
66268
66353
  this._largeCellRangeCache.length = 0;
66269
- const diffCell = diffCellAddress(col, row, oldRowHeaderCellIds.map(oldCellId => oldCellId[col - this.leftRowSeriesNumberColumnCount]), this._rowHeaderCellIds_FULL.map(newCellId => newCellId[col - this.leftRowSeriesNumberColumnCount]), oldRowHeaderCellPositons, this);
66270
- this._rowHeaderCellIds = this._rowHeaderCellIds_FULL.slice();
66354
+ const diffCell = diffCellAddress(col, row, oldRowHeaderCellIds.map(oldCellId => oldCellId[col - this.leftRowSeriesNumberColumnCount]), this._rowHeaderCellFullPathIds_FULL.map(newCellId => newCellId[col - this.leftRowSeriesNumberColumnCount]), oldRowHeaderCellPositons, this);
66355
+ this.generateCellIdsConsiderHideHeader();
66356
+ this.setPagination(this.pagination);
66271
66357
  return diffCell;
66272
66358
  }
66273
66359
  isHeaderForColWidth(col, row) {
@@ -66490,10 +66576,10 @@
66490
66576
  if (targetIndex === sourceCellRange.start.col) {
66491
66577
  return null;
66492
66578
  }
66493
- for (let row = 0; row < this._columnHeaderCellIds.length; row++) {
66494
- const sourceIds = this._columnHeaderCellIds[row].splice(sourceCellRange.start.col - this.rowHeaderLevelCount - this.leftRowSeriesNumberColumnCount, sourceSize);
66579
+ for (let row = 0; row < this._columnHeaderCellFullPathIds.length; row++) {
66580
+ const sourceIds = this._columnHeaderCellFullPathIds[row].splice(sourceCellRange.start.col - this.rowHeaderLevelCount - this.leftRowSeriesNumberColumnCount, sourceSize);
66495
66581
  sourceIds.unshift(targetIndex - this.rowHeaderLevelCount - this.leftRowSeriesNumberColumnCount, 0);
66496
- Array.prototype.splice.apply(this._columnHeaderCellIds[row], sourceIds);
66582
+ Array.prototype.splice.apply(this._columnHeaderCellFullPathIds[row], sourceIds);
66497
66583
  }
66498
66584
  const sourceColumns = this._columnWidths.splice(sourceCellRange.start.col - this.leftRowSeriesNumberColumnCount, sourceSize);
66499
66585
  sourceColumns.unshift((targetIndex - this.leftRowSeriesNumberColumnCount), 0);
@@ -66530,9 +66616,15 @@
66530
66616
  const sourceIds = this._rowHeaderCellIds.splice(sourceCellRange.start.row - this.columnHeaderLevelCount, sourceSize);
66531
66617
  sourceIds.unshift((targetIndex - this.currentPageStartIndex), 0);
66532
66618
  Array.prototype.splice.apply(this._rowHeaderCellIds, sourceIds);
66619
+ const sourceIds0 = this._rowHeaderCellFullPathIds.splice(sourceCellRange.start.row - this.columnHeaderLevelCount, sourceSize);
66620
+ sourceIds0.unshift((targetIndex - this.currentPageStartIndex), 0);
66621
+ Array.prototype.splice.apply(this._rowHeaderCellFullPathIds, sourceIds0);
66533
66622
  const sourceIds_FULL = this._rowHeaderCellIds_FULL.splice(sourceCellRange.start.row - this.columnHeaderLevelCount + this.currentPageStartIndex, sourceSize);
66534
66623
  sourceIds_FULL.unshift(targetIndex, 0);
66535
66624
  Array.prototype.splice.apply(this._rowHeaderCellIds_FULL, sourceIds_FULL);
66625
+ const sourceIds_FULL0 = this._rowHeaderCellFullPathIds_FULL.splice(sourceCellRange.start.row - this.columnHeaderLevelCount + this.currentPageStartIndex, sourceSize);
66626
+ sourceIds_FULL0.unshift(targetIndex, 0);
66627
+ Array.prototype.splice.apply(this._rowHeaderCellFullPathIds_FULL, sourceIds_FULL0);
66536
66628
  this.rowDimensionTree.movePosition(sourceRowHeaderPaths.length - 1, sourceCellRange.start.row - this.columnHeaderLevelCount, targetIndex + (target.row > source.row ? sourceRowHeaderNode.size - 1 : 0));
66537
66629
  this.rowDimensionTree.reset(this.rowDimensionTree.tree.children, true);
66538
66630
  this._CellHeaderPathMap = new Map();
@@ -66808,11 +66900,13 @@
66808
66900
  this.currentPageStartIndex = perPageCount * (currentPage || 0);
66809
66901
  this.currentPageEndIndex = this.currentPageStartIndex + perPageCount;
66810
66902
  this._rowHeaderCellIds = this._rowHeaderCellIds_FULL?.slice(this.currentPageStartIndex, this.currentPageEndIndex);
66903
+ this._rowHeaderCellFullPathIds = this._rowHeaderCellFullPathIds_FULL?.slice(this.currentPageStartIndex, this.currentPageEndIndex);
66811
66904
  }
66812
66905
  else {
66813
66906
  this.currentPageStartIndex = 0;
66814
66907
  this.currentPageEndIndex = this._rowHeaderCellIds_FULL.length;
66815
66908
  this._rowHeaderCellIds = this._rowHeaderCellIds_FULL?.slice(this.currentPageStartIndex, this.currentPageEndIndex);
66909
+ this._rowHeaderCellFullPathIds = this._rowHeaderCellFullPathIds_FULL?.slice(this.currentPageStartIndex, this.currentPageEndIndex);
66816
66910
  }
66817
66911
  this.pagination && (this.pagination.totalCount = this._rowHeaderCellIds_FULL?.length);
66818
66912
  }
@@ -67177,7 +67271,7 @@
67177
67271
  return totalCount;
67178
67272
  }
67179
67273
  resetHeaderTree() {
67180
- this._rowHeaderCellIds_FULL = [];
67274
+ this._rowHeaderCellFullPathIds_FULL = [];
67181
67275
  this._columnHeaderCellIds = [];
67182
67276
  const dataset = this.dataset;
67183
67277
  this.rowTree = dataset.rowHeaderTree;
@@ -67188,13 +67282,13 @@
67188
67282
  this.colIndex = 0;
67189
67283
  this._generateRowHeaderIds();
67190
67284
  this.resetColumnHeaderLevelCount();
67191
- this._rowHeaderCellIds_FULL = transpose(this._rowHeaderCellIds_FULL);
67285
+ this._rowHeaderCellFullPathIds_FULL = transpose(this._rowHeaderCellFullPathIds_FULL);
67192
67286
  this._headerObjectMap = this._headerObjects.reduce((o, e) => {
67193
67287
  o[e.id] = e;
67194
67288
  return o;
67195
67289
  }, {});
67290
+ this.generateCellIdsConsiderHideHeader();
67196
67291
  this.setPagination(this.pagination);
67197
- this.clearCellIds();
67198
67292
  }
67199
67293
  isSeriesNumberInHeader(col, row) {
67200
67294
  if (this.leftRowSeriesNumberColumnCount > 0 && col >= 0 && row >= 0 && col < this.leftRowSeriesNumberColumnCount) {
@@ -67278,31 +67372,74 @@
67278
67372
  const id = this.getCellId(col, row);
67279
67373
  this._headerObjectMap[id].title = value;
67280
67374
  }
67281
- clearCellIds() {
67375
+ generateCellIdsConsiderHideHeader() {
67376
+ this._columnHeaderCellIds = this._columnHeaderCellFullPathIds.slice();
67282
67377
  if (!this.showColumnHeader) {
67283
67378
  if (this.indicatorsAsCol && !this.hideIndicatorName) {
67284
67379
  const indicatorIndex = this.colDimensionKeys.indexOf(IndicatorDimensionKeyPlaceholder);
67285
- this._columnHeaderCellIds = this._columnHeaderCellIds.splice(indicatorIndex, 1);
67380
+ const indicatorIds = this._columnHeaderCellIds.splice(indicatorIndex, 1);
67381
+ this._columnHeaderCellIds.splice(0, this._columnHeaderCellIds.length);
67382
+ this._columnHeaderCellIds.push(indicatorIds[0]);
67286
67383
  }
67287
67384
  else {
67288
67385
  this._columnHeaderCellIds.splice(0, this._columnHeaderCellIds.length);
67289
67386
  }
67290
67387
  }
67388
+ this._rowHeaderCellIds_FULL = this._rowHeaderCellFullPathIds_FULL.slice();
67291
67389
  if (!this.showRowHeader) {
67292
67390
  if (!this.indicatorsAsCol && !this.hideIndicatorName) {
67293
67391
  const indicatorIndex = this.rowDimensionKeys.indexOf(IndicatorDimensionKeyPlaceholder);
67294
- this._rowHeaderCellIds_FULL.forEach((cellIds) => {
67295
- const indicator = cellIds.splice(indicatorIndex, 1);
67296
- cellIds.splice(0, cellIds.length);
67297
- cellIds.push(indicator[0]);
67392
+ this._rowHeaderCellIds_FULL.forEach((cellIds, index) => {
67393
+ const _cellIds = cellIds.slice();
67394
+ const indicator = _cellIds.splice(indicatorIndex, 1);
67395
+ _cellIds.splice(0, _cellIds.length);
67396
+ _cellIds.push(indicator[0]);
67397
+ this._rowHeaderCellIds_FULL[index] = _cellIds;
67398
+ });
67399
+ }
67400
+ else {
67401
+ this._rowHeaderCellIds_FULL.forEach((cellIds, index) => {
67402
+ const _cellIds = cellIds.slice();
67403
+ _cellIds.splice(0, _cellIds.length);
67404
+ this._rowHeaderCellIds_FULL[index] = _cellIds;
67405
+ });
67406
+ }
67407
+ }
67408
+ this._rowHeaderCellIds = this._rowHeaderCellIds_FULL.slice();
67409
+ this._cornerHeaderCellIds = this._cornerHeaderCellFullPathIds.slice();
67410
+ if (this.rowHeaderLevelCount === 0 || this.columnHeaderLevelCount === 0) {
67411
+ this._cornerHeaderCellIds = [];
67412
+ }
67413
+ else if (this.cornerSetting.titleOnDimension === 'row' && !this.showRowHeader) {
67414
+ if (!this.indicatorsAsCol && !this.hideIndicatorName) {
67415
+ const indicatorIndex = this.rowDimensionKeys.indexOf(IndicatorDimensionKeyPlaceholder);
67416
+ this._cornerHeaderCellIds.forEach((cellIds, index) => {
67417
+ const _cellIds = cellIds.slice();
67418
+ const indicator = _cellIds.splice(indicatorIndex, 1);
67419
+ _cellIds.splice(0, _cellIds.length);
67420
+ _cellIds.push(indicator[0]);
67421
+ this._cornerHeaderCellIds[index] = _cellIds;
67298
67422
  });
67299
67423
  }
67300
67424
  else {
67301
- this._rowHeaderCellIds_FULL.forEach((cellIds) => {
67302
- cellIds.splice(0, cellIds.length);
67425
+ this._cornerHeaderCellIds.forEach((cellIds, index) => {
67426
+ const _cellIds = cellIds.slice();
67427
+ _cellIds.splice(0, _cellIds.length);
67428
+ this._cornerHeaderCellIds[index] = _cellIds;
67303
67429
  });
67304
67430
  }
67305
67431
  }
67432
+ else if (this.cornerSetting.titleOnDimension === 'column' && !this.showColumnHeader) {
67433
+ if (this.indicatorsAsCol && !this.hideIndicatorName) {
67434
+ const indicatorIndex = this.colDimensionKeys.indexOf(IndicatorDimensionKeyPlaceholder);
67435
+ const indicatorIds = this._cornerHeaderCellIds.splice(indicatorIndex, 1);
67436
+ this._cornerHeaderCellIds.splice(0, this._cornerHeaderCellIds.length);
67437
+ this._cornerHeaderCellIds.push(indicatorIds[0]);
67438
+ }
67439
+ else {
67440
+ this._cornerHeaderCellIds.splice(0, this._cornerHeaderCellIds.length);
67441
+ }
67442
+ }
67306
67443
  }
67307
67444
  }
67308
67445
  function scaleWholeRangeSize(count, bandwidth, paddingInner, paddingOuter) {
@@ -68796,7 +68933,11 @@
68796
68933
  _canResizeColumn(col, row) {
68797
68934
  const ifCan = super._canResizeColumn(col, row);
68798
68935
  if (ifCan) {
68799
- if (!this.internalProps.layoutMap.indicatorsAsCol) {
68936
+ const isSeriesNumber = this.internalProps.layoutMap.isSeriesNumber(col, row);
68937
+ if (isSeriesNumber && this.internalProps.rowSeriesNumber.disableColumnResize === true) {
68938
+ return false;
68939
+ }
68940
+ else if (!this.internalProps.layoutMap.indicatorsAsCol) {
68800
68941
  const cellDefine = this.internalProps.layoutMap.getBody(col, this.columnHeaderLevelCount);
68801
68942
  if (cellDefine?.disableColumnResize) {
68802
68943
  return false;
@@ -71090,7 +71231,7 @@
71090
71231
  }
71091
71232
 
71092
71233
  registerForVrender();
71093
- const version = "0.25.7";
71234
+ const version = "0.25.8";
71094
71235
  function getIcons() {
71095
71236
  return get$2();
71096
71237
  }