@visactor/vtable 0.25.8-alpha.0 → 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.
- package/cjs/ListTable.js +2 -1
- package/cjs/ListTable.js.map +1 -1
- package/cjs/PivotTable.js +6 -3
- package/cjs/PivotTable.js.map +1 -1
- package/cjs/core/BaseTable.js +21 -14
- package/cjs/core/BaseTable.js.map +1 -1
- package/cjs/header-helper/header-helper.js +1 -1
- package/cjs/header-helper/header-helper.js.map +1 -1
- package/cjs/index.d.ts +1 -1
- package/cjs/index.js +1 -1
- package/cjs/index.js.map +1 -1
- package/cjs/layout/pivot-header-layout.d.ts +5 -1
- package/cjs/layout/pivot-header-layout.js +82 -57
- package/cjs/layout/pivot-header-layout.js.map +1 -1
- package/cjs/scenegraph/component/table-component.js +26 -22
- package/cjs/scenegraph/component/table-component.js.map +1 -1
- package/cjs/themes/theme.js +3 -0
- package/cjs/themes/theme.js.map +1 -1
- package/cjs/tools/helper.js +2 -2
- package/cjs/tools/helper.js.map +1 -1
- package/cjs/ts-types/table-engine.d.ts +1 -0
- package/cjs/ts-types/table-engine.js.map +1 -1
- package/cjs/ts-types/theme.d.ts +1 -0
- package/cjs/ts-types/theme.js.map +1 -1
- package/cjs/vrender.js.map +1 -1
- package/dist/vtable.js +164 -62
- package/dist/vtable.min.js +2 -2
- package/es/ListTable.js +2 -1
- package/es/ListTable.js.map +1 -1
- package/es/PivotTable.js +6 -3
- package/es/PivotTable.js.map +1 -1
- package/es/core/BaseTable.js +21 -14
- package/es/core/BaseTable.js.map +1 -1
- package/es/header-helper/header-helper.js +1 -1
- package/es/header-helper/header-helper.js.map +1 -1
- package/es/index.d.ts +1 -1
- package/es/index.js +1 -1
- package/es/index.js.map +1 -1
- package/es/layout/pivot-header-layout.d.ts +5 -1
- package/es/layout/pivot-header-layout.js +83 -56
- package/es/layout/pivot-header-layout.js.map +1 -1
- package/es/scenegraph/component/table-component.js +27 -21
- package/es/scenegraph/component/table-component.js.map +1 -1
- package/es/themes/theme.js +3 -0
- package/es/themes/theme.js.map +1 -1
- package/es/tools/helper.js +2 -2
- package/es/tools/helper.js.map +1 -1
- package/es/ts-types/table-engine.d.ts +1 -0
- package/es/ts-types/table-engine.js.map +1 -1
- package/es/ts-types/theme.d.ts +1 -0
- package/es/ts-types/theme.js.map +1 -1
- package/es/vrender.js.map +1 -1
- package/package.json +5 -5
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
|
-
|
|
23238
|
-
|
|
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
|
},
|
|
@@ -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;
|
|
@@ -56336,7 +56361,7 @@
|
|
|
56336
56361
|
}
|
|
56337
56362
|
setTableColumnsEditor() {
|
|
56338
56363
|
const setEditor = (colDefines, setColumns) => {
|
|
56339
|
-
colDefines
|
|
56364
|
+
colDefines?.forEach((colDefine, index) => {
|
|
56340
56365
|
if (colDefine.editor) {
|
|
56341
56366
|
setColumns[index].editor = colDefine.editor;
|
|
56342
56367
|
}
|
|
@@ -58382,7 +58407,7 @@
|
|
|
58382
58407
|
return TABLE_EVENT_TYPE;
|
|
58383
58408
|
}
|
|
58384
58409
|
options;
|
|
58385
|
-
version = "0.25.8
|
|
58410
|
+
version = "0.25.8";
|
|
58386
58411
|
pagination;
|
|
58387
58412
|
id = `VTable${Date.now()}`;
|
|
58388
58413
|
headerStyleCache;
|
|
@@ -58805,8 +58830,21 @@
|
|
|
58805
58830
|
let heightP = 0;
|
|
58806
58831
|
if (Env.mode === 'browser') {
|
|
58807
58832
|
const element = this.getElement();
|
|
58808
|
-
|
|
58809
|
-
|
|
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;
|
|
58810
58848
|
element.style.width = (width1 && `${width1 - padding.left - padding.right}px`) || '0px';
|
|
58811
58849
|
element.style.height = (height1 && `${height1 - padding.top - padding.bottom}px`) || '0px';
|
|
58812
58850
|
const { canvas } = this.internalProps;
|
|
@@ -63831,9 +63869,13 @@
|
|
|
63831
63869
|
if (ifCan) {
|
|
63832
63870
|
if (!this.transpose) {
|
|
63833
63871
|
const cellDefine = this.internalProps.layoutMap.getBody(col, this.columnHeaderLevelCount);
|
|
63872
|
+
const isSeriesNumber = this.internalProps.layoutMap.isSeriesNumber(col, row);
|
|
63834
63873
|
if (cellDefine?.disableColumnResize) {
|
|
63835
63874
|
return false;
|
|
63836
63875
|
}
|
|
63876
|
+
else if (isSeriesNumber && this.internalProps.rowSeriesNumber.disableColumnResize === true) {
|
|
63877
|
+
return false;
|
|
63878
|
+
}
|
|
63837
63879
|
}
|
|
63838
63880
|
}
|
|
63839
63881
|
return ifCan;
|
|
@@ -64922,6 +64964,10 @@
|
|
|
64922
64964
|
cornerHeaderObjs;
|
|
64923
64965
|
columnHeaderObjs = [];
|
|
64924
64966
|
rowHeaderObjs = [];
|
|
64967
|
+
_cornerHeaderCellFullPathIds = [];
|
|
64968
|
+
_columnHeaderCellFullPathIds = [];
|
|
64969
|
+
_rowHeaderCellFullPathIds = [];
|
|
64970
|
+
_rowHeaderCellFullPathIds_FULL = [];
|
|
64925
64971
|
_cornerHeaderCellIds = [];
|
|
64926
64972
|
_columnHeaderCellIds = [];
|
|
64927
64973
|
_rowHeaderCellIds = [];
|
|
@@ -65073,7 +65119,7 @@
|
|
|
65073
65119
|
});
|
|
65074
65120
|
}
|
|
65075
65121
|
this.resetColumnHeaderLevelCount();
|
|
65076
|
-
this.
|
|
65122
|
+
this._rowHeaderCellFullPathIds_FULL = transpose(this._rowHeaderCellFullPathIds_FULL);
|
|
65077
65123
|
if (table.options.rowHierarchyType === 'tree' && this.extensionRows?.length >= 1) {
|
|
65078
65124
|
this.generateExtensionRowTree();
|
|
65079
65125
|
this.extensionRows.forEach(extensionRow => {
|
|
@@ -65127,6 +65173,7 @@
|
|
|
65127
65173
|
else {
|
|
65128
65174
|
this._indicatorShowType = 'none';
|
|
65129
65175
|
}
|
|
65176
|
+
this.generateCellIdsConsiderHideHeader();
|
|
65130
65177
|
this.setPagination(table.options.pagination);
|
|
65131
65178
|
if (this._table.isPivotChart()) {
|
|
65132
65179
|
this._chartItemSpanSize = 0;
|
|
@@ -65165,7 +65212,6 @@
|
|
|
65165
65212
|
}
|
|
65166
65213
|
this.handleRowSeriesNumber(table.internalProps.rowSeriesNumber);
|
|
65167
65214
|
this.setColumnWidths();
|
|
65168
|
-
this.clearCellIds();
|
|
65169
65215
|
}
|
|
65170
65216
|
handleRowSeriesNumber(rowSeriesNumber) {
|
|
65171
65217
|
if (rowSeriesNumber) {
|
|
@@ -65212,13 +65258,13 @@
|
|
|
65212
65258
|
}
|
|
65213
65259
|
_generateColHeaderIds() {
|
|
65214
65260
|
if (this.columnDimensionTree.tree.children?.length >= 1) {
|
|
65215
|
-
this._addHeaders(this.
|
|
65261
|
+
this._addHeaders(this._columnHeaderCellFullPathIds, 0, this.columnDimensionTree.tree.children, [], this.columnHeaderObjs);
|
|
65216
65262
|
}
|
|
65217
65263
|
if (this.columnHeaderTitle) {
|
|
65218
65264
|
this.sharedVar.seqId = Math.max(this.sharedVar.seqId, this._headerObjects.length);
|
|
65219
65265
|
const id = ++this.sharedVar.seqId;
|
|
65220
65266
|
const firstRowIds = Array(this.colCount - this.rowHeaderLevelCount).fill(id);
|
|
65221
|
-
this.
|
|
65267
|
+
this._columnHeaderCellFullPathIds.unshift(firstRowIds);
|
|
65222
65268
|
const cell = {
|
|
65223
65269
|
id,
|
|
65224
65270
|
title: typeof this.columnHeaderTitle.title === 'string'
|
|
@@ -65245,17 +65291,17 @@
|
|
|
65245
65291
|
_generateRowHeaderIds() {
|
|
65246
65292
|
if (this.rowDimensionTree.tree.children?.length >= 1) {
|
|
65247
65293
|
if (this.rowHierarchyType === 'tree') {
|
|
65248
|
-
this._addHeadersForTreeMode(this.
|
|
65294
|
+
this._addHeadersForTreeMode(this._rowHeaderCellFullPathIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, true, this.rowsDefine, this.rowHeaderObjs);
|
|
65249
65295
|
}
|
|
65250
65296
|
else {
|
|
65251
|
-
this._addHeaders(this.
|
|
65297
|
+
this._addHeaders(this._rowHeaderCellFullPathIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowHeaderObjs);
|
|
65252
65298
|
}
|
|
65253
65299
|
}
|
|
65254
65300
|
if (this.rowHeaderTitle) {
|
|
65255
65301
|
this.sharedVar.seqId = Math.max(this.sharedVar.seqId, this._headerObjects.length);
|
|
65256
65302
|
const id = ++this.sharedVar.seqId;
|
|
65257
|
-
const firstColIds = Array(this.
|
|
65258
|
-
this.
|
|
65303
|
+
const firstColIds = Array(this._rowHeaderCellFullPathIds_FULL[0]?.length ?? this.rowDimensionTree.tree.size).fill(id);
|
|
65304
|
+
this._rowHeaderCellFullPathIds_FULL.unshift(firstColIds);
|
|
65259
65305
|
const cell = {
|
|
65260
65306
|
id,
|
|
65261
65307
|
title: typeof this.rowHeaderTitle.title === 'string'
|
|
@@ -65357,19 +65403,19 @@
|
|
|
65357
65403
|
results[id] = cell;
|
|
65358
65404
|
this._headerObjects[id] = cell;
|
|
65359
65405
|
if (this.cornerSetting.titleOnDimension === 'column') {
|
|
65360
|
-
if (!this.
|
|
65361
|
-
this.
|
|
65406
|
+
if (!this._cornerHeaderCellFullPathIds[key]) {
|
|
65407
|
+
this._cornerHeaderCellFullPathIds[key] = [];
|
|
65362
65408
|
}
|
|
65363
65409
|
for (let r = 0; r < this.rowHeaderLevelCount; r++) {
|
|
65364
|
-
this.
|
|
65410
|
+
this._cornerHeaderCellFullPathIds[key][r] = id;
|
|
65365
65411
|
}
|
|
65366
65412
|
}
|
|
65367
65413
|
else if (this.cornerSetting.titleOnDimension === 'row') {
|
|
65368
65414
|
for (let r = 0; r < this.columnHeaderLevelCount; r++) {
|
|
65369
|
-
if (!this.
|
|
65370
|
-
this.
|
|
65415
|
+
if (!this._cornerHeaderCellFullPathIds[r]) {
|
|
65416
|
+
this._cornerHeaderCellFullPathIds[r] = [];
|
|
65371
65417
|
}
|
|
65372
|
-
this.
|
|
65418
|
+
this._cornerHeaderCellFullPathIds[r][key] = id;
|
|
65373
65419
|
}
|
|
65374
65420
|
}
|
|
65375
65421
|
});
|
|
@@ -65394,10 +65440,10 @@
|
|
|
65394
65440
|
this._headerObjects[id] = cell;
|
|
65395
65441
|
for (let r = 0; r < this.columnHeaderLevelCount; r++) {
|
|
65396
65442
|
for (let j = 0; j < this.rowHeaderLevelCount; j++) {
|
|
65397
|
-
if (!this.
|
|
65398
|
-
this.
|
|
65443
|
+
if (!this._cornerHeaderCellFullPathIds[r]) {
|
|
65444
|
+
this._cornerHeaderCellFullPathIds[r] = [];
|
|
65399
65445
|
}
|
|
65400
|
-
this.
|
|
65446
|
+
this._cornerHeaderCellFullPathIds[r][j] = id;
|
|
65401
65447
|
}
|
|
65402
65448
|
}
|
|
65403
65449
|
}
|
|
@@ -65405,8 +65451,8 @@
|
|
|
65405
65451
|
}
|
|
65406
65452
|
generateExtensionRowTree() {
|
|
65407
65453
|
this.extensionRows.forEach((extensionRow, indexP) => {
|
|
65408
|
-
const old_rowHeaderCellIds = this.
|
|
65409
|
-
this.
|
|
65454
|
+
const old_rowHeaderCellIds = this._rowHeaderCellFullPathIds_FULL;
|
|
65455
|
+
this._rowHeaderCellFullPathIds_FULL = [];
|
|
65410
65456
|
old_rowHeaderCellIds.forEach((row_ids, index) => {
|
|
65411
65457
|
const key = row_ids[row_ids.length - 1];
|
|
65412
65458
|
this.colIndex = 0;
|
|
@@ -65432,7 +65478,7 @@
|
|
|
65432
65478
|
const extensionRowTreeHeaderIds = [];
|
|
65433
65479
|
this._addHeadersForTreeMode(extensionRowTreeHeaderIds, 0, rowExtensionDimensionTree.tree.children, [], rowExtensionDimensionTree.totalLevel, true, extensionRow.rows, this.rowHeaderObjs);
|
|
65434
65480
|
for (let i = 0; i < extensionRowTreeHeaderIds[0].length; i++) {
|
|
65435
|
-
this.
|
|
65481
|
+
this._rowHeaderCellFullPathIds_FULL.push(row_ids.concat(extensionRowTreeHeaderIds[0][i]));
|
|
65436
65482
|
}
|
|
65437
65483
|
});
|
|
65438
65484
|
});
|
|
@@ -66133,7 +66179,7 @@
|
|
|
66133
66179
|
}
|
|
66134
66180
|
if (col >= 0 && recordRow >= 0) {
|
|
66135
66181
|
if (this.rowHierarchyType === 'tree') {
|
|
66136
|
-
const row_pathIds = this.
|
|
66182
|
+
const row_pathIds = this._rowHeaderCellFullPathIds[recordRow];
|
|
66137
66183
|
let findTree = this.rowDimensionTree;
|
|
66138
66184
|
let level = 0;
|
|
66139
66185
|
while (findTree) {
|
|
@@ -66253,7 +66299,7 @@
|
|
|
66253
66299
|
return this.isColumnIndicatorHeader(col, row) || this.isRowIndicatorHeader(col, row);
|
|
66254
66300
|
}
|
|
66255
66301
|
toggleHierarchyState(col, row) {
|
|
66256
|
-
const oldRowHeaderCellIds = this.
|
|
66302
|
+
const oldRowHeaderCellIds = this._rowHeaderCellFullPathIds_FULL.slice(0);
|
|
66257
66303
|
const oldRowHeaderCellPositons = oldRowHeaderCellIds.map((id, row) => {
|
|
66258
66304
|
return { col, row: row + this.columnHeaderLevelCount };
|
|
66259
66305
|
});
|
|
@@ -66261,15 +66307,15 @@
|
|
|
66261
66307
|
hd.define.hierarchyState =
|
|
66262
66308
|
hd.define.hierarchyState === HierarchyState.collapse ? HierarchyState.expand : HierarchyState.collapse;
|
|
66263
66309
|
this.rowDimensionTree.reset(this.rowDimensionTree.tree.children, true);
|
|
66264
|
-
this.
|
|
66310
|
+
this._rowHeaderCellFullPathIds_FULL = [];
|
|
66265
66311
|
this.rowDimensionKeys = this.rowDimensionTree.dimensionKeys.valueArr();
|
|
66266
66312
|
this.fullRowDimensionKeys = [];
|
|
66267
66313
|
this.fullRowDimensionKeys = this.fullRowDimensionKeys.concat(this.rowDimensionKeys);
|
|
66268
|
-
this._addHeadersForTreeMode(this.
|
|
66314
|
+
this._addHeadersForTreeMode(this._rowHeaderCellFullPathIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, true, this.rowsDefine, this.rowHeaderObjs);
|
|
66269
66315
|
if (this.rowHeaderTitle) {
|
|
66270
66316
|
const id = ++this.sharedVar.seqId;
|
|
66271
66317
|
const firstColIds = Array(this.rowCount - this.columnHeaderLevelCount).fill(id);
|
|
66272
|
-
this.
|
|
66318
|
+
this._rowHeaderCellFullPathIds_FULL.unshift(firstColIds);
|
|
66273
66319
|
const cell = {
|
|
66274
66320
|
id,
|
|
66275
66321
|
title: typeof this.rowHeaderTitle.title === 'string'
|
|
@@ -66294,7 +66340,7 @@
|
|
|
66294
66340
|
this.rowHeaderObjs.push(cell);
|
|
66295
66341
|
this._headerObjects[id] = cell;
|
|
66296
66342
|
}
|
|
66297
|
-
this.
|
|
66343
|
+
this._rowHeaderCellFullPathIds_FULL = transpose(this._rowHeaderCellFullPathIds_FULL);
|
|
66298
66344
|
if (this.rowHierarchyType === 'tree' && this.extensionRows?.length >= 1) {
|
|
66299
66345
|
this.generateExtensionRowTree();
|
|
66300
66346
|
}
|
|
@@ -66305,8 +66351,9 @@
|
|
|
66305
66351
|
}, {});
|
|
66306
66352
|
this._CellHeaderPathMap = new Map();
|
|
66307
66353
|
this._largeCellRangeCache.length = 0;
|
|
66308
|
-
const diffCell = diffCellAddress(col, row, oldRowHeaderCellIds.map(oldCellId => oldCellId[col - this.leftRowSeriesNumberColumnCount]), this.
|
|
66309
|
-
this.
|
|
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);
|
|
66310
66357
|
return diffCell;
|
|
66311
66358
|
}
|
|
66312
66359
|
isHeaderForColWidth(col, row) {
|
|
@@ -66529,10 +66576,10 @@
|
|
|
66529
66576
|
if (targetIndex === sourceCellRange.start.col) {
|
|
66530
66577
|
return null;
|
|
66531
66578
|
}
|
|
66532
|
-
for (let row = 0; row < this.
|
|
66533
|
-
const sourceIds = this.
|
|
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);
|
|
66534
66581
|
sourceIds.unshift(targetIndex - this.rowHeaderLevelCount - this.leftRowSeriesNumberColumnCount, 0);
|
|
66535
|
-
Array.prototype.splice.apply(this.
|
|
66582
|
+
Array.prototype.splice.apply(this._columnHeaderCellFullPathIds[row], sourceIds);
|
|
66536
66583
|
}
|
|
66537
66584
|
const sourceColumns = this._columnWidths.splice(sourceCellRange.start.col - this.leftRowSeriesNumberColumnCount, sourceSize);
|
|
66538
66585
|
sourceColumns.unshift((targetIndex - this.leftRowSeriesNumberColumnCount), 0);
|
|
@@ -66569,9 +66616,15 @@
|
|
|
66569
66616
|
const sourceIds = this._rowHeaderCellIds.splice(sourceCellRange.start.row - this.columnHeaderLevelCount, sourceSize);
|
|
66570
66617
|
sourceIds.unshift((targetIndex - this.currentPageStartIndex), 0);
|
|
66571
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);
|
|
66572
66622
|
const sourceIds_FULL = this._rowHeaderCellIds_FULL.splice(sourceCellRange.start.row - this.columnHeaderLevelCount + this.currentPageStartIndex, sourceSize);
|
|
66573
66623
|
sourceIds_FULL.unshift(targetIndex, 0);
|
|
66574
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);
|
|
66575
66628
|
this.rowDimensionTree.movePosition(sourceRowHeaderPaths.length - 1, sourceCellRange.start.row - this.columnHeaderLevelCount, targetIndex + (target.row > source.row ? sourceRowHeaderNode.size - 1 : 0));
|
|
66576
66629
|
this.rowDimensionTree.reset(this.rowDimensionTree.tree.children, true);
|
|
66577
66630
|
this._CellHeaderPathMap = new Map();
|
|
@@ -66847,11 +66900,13 @@
|
|
|
66847
66900
|
this.currentPageStartIndex = perPageCount * (currentPage || 0);
|
|
66848
66901
|
this.currentPageEndIndex = this.currentPageStartIndex + perPageCount;
|
|
66849
66902
|
this._rowHeaderCellIds = this._rowHeaderCellIds_FULL?.slice(this.currentPageStartIndex, this.currentPageEndIndex);
|
|
66903
|
+
this._rowHeaderCellFullPathIds = this._rowHeaderCellFullPathIds_FULL?.slice(this.currentPageStartIndex, this.currentPageEndIndex);
|
|
66850
66904
|
}
|
|
66851
66905
|
else {
|
|
66852
66906
|
this.currentPageStartIndex = 0;
|
|
66853
66907
|
this.currentPageEndIndex = this._rowHeaderCellIds_FULL.length;
|
|
66854
66908
|
this._rowHeaderCellIds = this._rowHeaderCellIds_FULL?.slice(this.currentPageStartIndex, this.currentPageEndIndex);
|
|
66909
|
+
this._rowHeaderCellFullPathIds = this._rowHeaderCellFullPathIds_FULL?.slice(this.currentPageStartIndex, this.currentPageEndIndex);
|
|
66855
66910
|
}
|
|
66856
66911
|
this.pagination && (this.pagination.totalCount = this._rowHeaderCellIds_FULL?.length);
|
|
66857
66912
|
}
|
|
@@ -67216,7 +67271,7 @@
|
|
|
67216
67271
|
return totalCount;
|
|
67217
67272
|
}
|
|
67218
67273
|
resetHeaderTree() {
|
|
67219
|
-
this.
|
|
67274
|
+
this._rowHeaderCellFullPathIds_FULL = [];
|
|
67220
67275
|
this._columnHeaderCellIds = [];
|
|
67221
67276
|
const dataset = this.dataset;
|
|
67222
67277
|
this.rowTree = dataset.rowHeaderTree;
|
|
@@ -67227,13 +67282,13 @@
|
|
|
67227
67282
|
this.colIndex = 0;
|
|
67228
67283
|
this._generateRowHeaderIds();
|
|
67229
67284
|
this.resetColumnHeaderLevelCount();
|
|
67230
|
-
this.
|
|
67285
|
+
this._rowHeaderCellFullPathIds_FULL = transpose(this._rowHeaderCellFullPathIds_FULL);
|
|
67231
67286
|
this._headerObjectMap = this._headerObjects.reduce((o, e) => {
|
|
67232
67287
|
o[e.id] = e;
|
|
67233
67288
|
return o;
|
|
67234
67289
|
}, {});
|
|
67290
|
+
this.generateCellIdsConsiderHideHeader();
|
|
67235
67291
|
this.setPagination(this.pagination);
|
|
67236
|
-
this.clearCellIds();
|
|
67237
67292
|
}
|
|
67238
67293
|
isSeriesNumberInHeader(col, row) {
|
|
67239
67294
|
if (this.leftRowSeriesNumberColumnCount > 0 && col >= 0 && row >= 0 && col < this.leftRowSeriesNumberColumnCount) {
|
|
@@ -67317,31 +67372,74 @@
|
|
|
67317
67372
|
const id = this.getCellId(col, row);
|
|
67318
67373
|
this._headerObjectMap[id].title = value;
|
|
67319
67374
|
}
|
|
67320
|
-
|
|
67375
|
+
generateCellIdsConsiderHideHeader() {
|
|
67376
|
+
this._columnHeaderCellIds = this._columnHeaderCellFullPathIds.slice();
|
|
67321
67377
|
if (!this.showColumnHeader) {
|
|
67322
67378
|
if (this.indicatorsAsCol && !this.hideIndicatorName) {
|
|
67323
67379
|
const indicatorIndex = this.colDimensionKeys.indexOf(IndicatorDimensionKeyPlaceholder);
|
|
67324
|
-
|
|
67380
|
+
const indicatorIds = this._columnHeaderCellIds.splice(indicatorIndex, 1);
|
|
67381
|
+
this._columnHeaderCellIds.splice(0, this._columnHeaderCellIds.length);
|
|
67382
|
+
this._columnHeaderCellIds.push(indicatorIds[0]);
|
|
67325
67383
|
}
|
|
67326
67384
|
else {
|
|
67327
67385
|
this._columnHeaderCellIds.splice(0, this._columnHeaderCellIds.length);
|
|
67328
67386
|
}
|
|
67329
67387
|
}
|
|
67388
|
+
this._rowHeaderCellIds_FULL = this._rowHeaderCellFullPathIds_FULL.slice();
|
|
67330
67389
|
if (!this.showRowHeader) {
|
|
67331
67390
|
if (!this.indicatorsAsCol && !this.hideIndicatorName) {
|
|
67332
67391
|
const indicatorIndex = this.rowDimensionKeys.indexOf(IndicatorDimensionKeyPlaceholder);
|
|
67333
|
-
this._rowHeaderCellIds_FULL.forEach((cellIds) => {
|
|
67334
|
-
const
|
|
67335
|
-
|
|
67336
|
-
|
|
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;
|
|
67337
67398
|
});
|
|
67338
67399
|
}
|
|
67339
67400
|
else {
|
|
67340
|
-
this._rowHeaderCellIds_FULL.forEach((cellIds) => {
|
|
67341
|
-
cellIds.
|
|
67401
|
+
this._rowHeaderCellIds_FULL.forEach((cellIds, index) => {
|
|
67402
|
+
const _cellIds = cellIds.slice();
|
|
67403
|
+
_cellIds.splice(0, _cellIds.length);
|
|
67404
|
+
this._rowHeaderCellIds_FULL[index] = _cellIds;
|
|
67342
67405
|
});
|
|
67343
67406
|
}
|
|
67344
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;
|
|
67422
|
+
});
|
|
67423
|
+
}
|
|
67424
|
+
else {
|
|
67425
|
+
this._cornerHeaderCellIds.forEach((cellIds, index) => {
|
|
67426
|
+
const _cellIds = cellIds.slice();
|
|
67427
|
+
_cellIds.splice(0, _cellIds.length);
|
|
67428
|
+
this._cornerHeaderCellIds[index] = _cellIds;
|
|
67429
|
+
});
|
|
67430
|
+
}
|
|
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
|
+
}
|
|
67345
67443
|
}
|
|
67346
67444
|
}
|
|
67347
67445
|
function scaleWholeRangeSize(count, bandwidth, paddingInner, paddingOuter) {
|
|
@@ -68835,7 +68933,11 @@
|
|
|
68835
68933
|
_canResizeColumn(col, row) {
|
|
68836
68934
|
const ifCan = super._canResizeColumn(col, row);
|
|
68837
68935
|
if (ifCan) {
|
|
68838
|
-
|
|
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) {
|
|
68839
68941
|
const cellDefine = this.internalProps.layoutMap.getBody(col, this.columnHeaderLevelCount);
|
|
68840
68942
|
if (cellDefine?.disableColumnResize) {
|
|
68841
68943
|
return false;
|
|
@@ -71129,7 +71231,7 @@
|
|
|
71129
71231
|
}
|
|
71130
71232
|
|
|
71131
71233
|
registerForVrender();
|
|
71132
|
-
const version = "0.25.8
|
|
71234
|
+
const version = "0.25.8";
|
|
71133
71235
|
function getIcons() {
|
|
71134
71236
|
return get$2();
|
|
71135
71237
|
}
|