@syncfusion/ej2-pivotview 20.2.36 → 20.2.38
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/CHANGELOG.md +9 -0
- package/dist/ej2-pivotview.umd.min.js +2 -2
- package/dist/ej2-pivotview.umd.min.js.map +1 -1
- package/dist/es6/ej2-pivotview.es2015.js +84 -44
- package/dist/es6/ej2-pivotview.es2015.js.map +1 -1
- package/dist/es6/ej2-pivotview.es5.js +94 -52
- package/dist/es6/ej2-pivotview.es5.js.map +1 -1
- package/dist/global/ej2-pivotview.min.js +2 -2
- package/dist/global/ej2-pivotview.min.js.map +1 -1
- package/dist/global/index.d.ts +1 -1
- package/package.json +22 -22
- package/src/base/engine.js +4 -4
- package/src/base/olap/engine.js +2 -2
- package/src/common/base/constant.d.ts +8 -0
- package/src/common/base/constant.js +8 -0
- package/src/pivotfieldlist/base/field-list.js +6 -6
- package/src/pivotview/actions/virtualscroll.d.ts +1 -0
- package/src/pivotview/actions/virtualscroll.js +59 -30
- package/src/pivotview/base/pivotview.js +16 -9
- package/styles/pivotfieldlist/_fusionnew-definition.scss +1 -1
- package/styles/pivotfieldlist/_material3-definition.scss +2 -1
package/dist/global/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*!
|
|
2
2
|
* filename: index.d.ts
|
|
3
|
-
* version : 20.2.
|
|
3
|
+
* version : 20.2.38
|
|
4
4
|
* Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
|
|
5
5
|
* Use of this code is subject to the terms of our license.
|
|
6
6
|
* A copy of the current license can be obtained at any time by e-mailing
|
package/package.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"_from": "@syncfusion/ej2-pivotview@*",
|
|
3
|
-
"_id": "@syncfusion/ej2-pivotview@20.
|
|
3
|
+
"_id": "@syncfusion/ej2-pivotview@20.2.36",
|
|
4
4
|
"_inBundle": false,
|
|
5
|
-
"_integrity": "sha512-
|
|
5
|
+
"_integrity": "sha512-2BEouqxgWf5+Yq1I8/K6wUa5bxfXP08ITux4/969RDvKK/fBoJBcNlqkq+Up8xJZ2CJYG7JrVS6uKaawG3vsXw==",
|
|
6
6
|
"_location": "/@syncfusion/ej2-pivotview",
|
|
7
7
|
"_phantomChildren": {},
|
|
8
8
|
"_requested": {
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"/@syncfusion/ej2-react-pivotview",
|
|
24
24
|
"/@syncfusion/ej2-vue-pivotview"
|
|
25
25
|
],
|
|
26
|
-
"_resolved": "http://nexus.syncfusion.com/repository/ej2-
|
|
27
|
-
"_shasum": "
|
|
26
|
+
"_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-pivotview/-/ej2-pivotview-20.2.36.tgz",
|
|
27
|
+
"_shasum": "db2a5ab65f6d3132e5c7b0d0247b782d1440a392",
|
|
28
28
|
"_spec": "@syncfusion/ej2-pivotview@*",
|
|
29
29
|
"_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
|
|
30
30
|
"author": {
|
|
@@ -35,23 +35,23 @@
|
|
|
35
35
|
},
|
|
36
36
|
"bundleDependencies": false,
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@syncfusion/ej2-base": "~20.2.
|
|
39
|
-
"@syncfusion/ej2-buttons": "~20.2.
|
|
40
|
-
"@syncfusion/ej2-calendars": "~20.2.
|
|
41
|
-
"@syncfusion/ej2-charts": "~20.2.
|
|
42
|
-
"@syncfusion/ej2-compression": "~20.2.
|
|
43
|
-
"@syncfusion/ej2-data": "~20.2.
|
|
44
|
-
"@syncfusion/ej2-dropdowns": "~20.2.
|
|
45
|
-
"@syncfusion/ej2-excel-export": "~20.2.
|
|
46
|
-
"@syncfusion/ej2-file-utils": "~20.2.
|
|
47
|
-
"@syncfusion/ej2-grids": "~20.2.
|
|
48
|
-
"@syncfusion/ej2-inputs": "~20.2.
|
|
49
|
-
"@syncfusion/ej2-lists": "~20.2.
|
|
50
|
-
"@syncfusion/ej2-navigations": "~20.2.
|
|
51
|
-
"@syncfusion/ej2-pdf-export": "~20.2.
|
|
52
|
-
"@syncfusion/ej2-popups": "~20.2.
|
|
53
|
-
"@syncfusion/ej2-splitbuttons": "~20.2.
|
|
54
|
-
"@syncfusion/ej2-svg-base": "~20.2.
|
|
38
|
+
"@syncfusion/ej2-base": "~20.2.38",
|
|
39
|
+
"@syncfusion/ej2-buttons": "~20.2.38",
|
|
40
|
+
"@syncfusion/ej2-calendars": "~20.2.38",
|
|
41
|
+
"@syncfusion/ej2-charts": "~20.2.38",
|
|
42
|
+
"@syncfusion/ej2-compression": "~20.2.38",
|
|
43
|
+
"@syncfusion/ej2-data": "~20.2.38",
|
|
44
|
+
"@syncfusion/ej2-dropdowns": "~20.2.38",
|
|
45
|
+
"@syncfusion/ej2-excel-export": "~20.2.38",
|
|
46
|
+
"@syncfusion/ej2-file-utils": "~20.2.38",
|
|
47
|
+
"@syncfusion/ej2-grids": "~20.2.38",
|
|
48
|
+
"@syncfusion/ej2-inputs": "~20.2.38",
|
|
49
|
+
"@syncfusion/ej2-lists": "~20.2.38",
|
|
50
|
+
"@syncfusion/ej2-navigations": "~20.2.38",
|
|
51
|
+
"@syncfusion/ej2-pdf-export": "~20.2.38",
|
|
52
|
+
"@syncfusion/ej2-popups": "~20.2.38",
|
|
53
|
+
"@syncfusion/ej2-splitbuttons": "~20.2.38",
|
|
54
|
+
"@syncfusion/ej2-svg-base": "~20.2.38"
|
|
55
55
|
},
|
|
56
56
|
"deprecated": false,
|
|
57
57
|
"description": "The pivot grid, or pivot table, is used to visualize large sets of relational data in a cross-tabular format, similar to an Excel pivot table.",
|
|
@@ -78,6 +78,6 @@
|
|
|
78
78
|
"url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
|
|
79
79
|
},
|
|
80
80
|
"typings": "index.d.ts",
|
|
81
|
-
"version": "20.2.
|
|
81
|
+
"version": "20.2.38",
|
|
82
82
|
"sideEffects": false
|
|
83
83
|
}
|
package/src/base/engine.js
CHANGED
|
@@ -1706,7 +1706,7 @@ var PivotEngine = /** @class */ (function () {
|
|
|
1706
1706
|
row: rows[i],
|
|
1707
1707
|
column: columns,
|
|
1708
1708
|
value: value,
|
|
1709
|
-
cellSets: this.getCellSet(this.rawIndexObject),
|
|
1709
|
+
cellSets: this.getValueCellInfo ? this.getCellSet(this.rawIndexObject) : [],
|
|
1710
1710
|
rowCellType: (rows[i].hasChild && rows[i].isDrilled ? 'subTotal' : rows[i].type === 'grand sum' ? 'grandTotal' : 'value'),
|
|
1711
1711
|
columnCellType: (columns.hasChild && columns.isDrilled ? 'subTotal' : columns.type === 'grand sum' ? 'grandTotal' : 'value'),
|
|
1712
1712
|
aggregateType: aggregate,
|
|
@@ -2634,7 +2634,7 @@ var PivotEngine = /** @class */ (function () {
|
|
|
2634
2634
|
PivotUtil.applyHeadersSort(sortMembersOrder, sortOrder, type);
|
|
2635
2635
|
isHeaderSortByDefault = true;
|
|
2636
2636
|
}
|
|
2637
|
-
if (isHeaderSortByDefault) {
|
|
2637
|
+
if (isHeaderSortByDefault && this.getHeaderSortInfo) {
|
|
2638
2638
|
var copyOrder = [];
|
|
2639
2639
|
for (var m = 0, n = 0; m < sortMembersOrder.length; m++) {
|
|
2640
2640
|
var member = sortMembersOrder[m];
|
|
@@ -2770,7 +2770,7 @@ var PivotEngine = /** @class */ (function () {
|
|
|
2770
2770
|
row: header,
|
|
2771
2771
|
column: member,
|
|
2772
2772
|
value: value,
|
|
2773
|
-
cellSets: this.getCellSet(this.rawIndexObject),
|
|
2773
|
+
cellSets: this.getValueCellInfo ? this.getCellSet(this.rawIndexObject) : [],
|
|
2774
2774
|
rowCellType: (header.hasChild && header.isDrilled ? 'subTotal' : header.type === 'grand sum' ? 'grandTotal' : 'value'),
|
|
2775
2775
|
columnCellType: (member.hasChild && member.isDrilled ? 'subTotal' : member.type === 'grand sum' ? 'grandTotal' : 'value'),
|
|
2776
2776
|
aggregateType: mType,
|
|
@@ -4368,7 +4368,7 @@ var PivotEngine = /** @class */ (function () {
|
|
|
4368
4368
|
row: rows[rln],
|
|
4369
4369
|
column: columns[cln],
|
|
4370
4370
|
value: value,
|
|
4371
|
-
cellSets: this.getCellSet(this.rawIndexObject),
|
|
4371
|
+
cellSets: this.getValueCellInfo ? this.getCellSet(this.rawIndexObject) : [],
|
|
4372
4372
|
rowCellType: (rows[rln].hasChild && rows[rln].isDrilled ? 'subTotal' : rows[rln].type === 'grand sum' ? 'grandTotal' : 'value'),
|
|
4373
4373
|
columnCellType: (columns[cln].hasChild && columns[cln].isDrilled ? 'subTotal' : columns[cln].type === 'grand sum' ? 'grandTotal' : 'value'),
|
|
4374
4374
|
aggregateType: aggregate,
|
package/src/base/olap/engine.js
CHANGED
|
@@ -1732,7 +1732,7 @@ var OlapEngine = /** @class */ (function () {
|
|
|
1732
1732
|
}
|
|
1733
1733
|
isHeaderSortByDefault = true;
|
|
1734
1734
|
}
|
|
1735
|
-
if (isHeaderSortByDefault) {
|
|
1735
|
+
if (isHeaderSortByDefault && this.getHeaderSortInfo) {
|
|
1736
1736
|
var copyOrder = [];
|
|
1737
1737
|
for (var m = 0, n = 0; m < headers.length; m++) {
|
|
1738
1738
|
if (headers[m].actualText !== 'Grand Total') {
|
|
@@ -1773,7 +1773,7 @@ var OlapEngine = /** @class */ (function () {
|
|
|
1773
1773
|
}
|
|
1774
1774
|
isHeaderSortByDefault = true;
|
|
1775
1775
|
}
|
|
1776
|
-
if (isHeaderSortByDefault) {
|
|
1776
|
+
if (isHeaderSortByDefault && this.getHeaderSortInfo) {
|
|
1777
1777
|
var copyOrder = [];
|
|
1778
1778
|
for (var m = 0, n = 0; m < keys.length; m++) {
|
|
1779
1779
|
if (keys[m] !== 'Grand Total') {
|
|
@@ -144,6 +144,10 @@ export declare const uiUpdate: string;
|
|
|
144
144
|
/** @hidden */
|
|
145
145
|
export declare const scroll: string;
|
|
146
146
|
/** @hidden */
|
|
147
|
+
export declare const verticalScroll: string;
|
|
148
|
+
/** @hidden */
|
|
149
|
+
export declare const horizontalScroll: string;
|
|
150
|
+
/** @hidden */
|
|
147
151
|
export declare const contentReady: string;
|
|
148
152
|
/** @hidden */
|
|
149
153
|
export declare const dataReady: string;
|
|
@@ -343,3 +347,7 @@ export declare const windowResized: string;
|
|
|
343
347
|
export declare const recordUpdated: string;
|
|
344
348
|
/** @hidden */
|
|
345
349
|
export declare const drillThroughClosed: string;
|
|
350
|
+
/** @hidden */
|
|
351
|
+
export declare const verticalScrolled: string;
|
|
352
|
+
/** @hidden */
|
|
353
|
+
export declare const horizontalScrolled: string;
|
|
@@ -144,6 +144,10 @@ export var uiUpdate = 'ui-update';
|
|
|
144
144
|
/** @hidden */
|
|
145
145
|
export var scroll = 'scroll';
|
|
146
146
|
/** @hidden */
|
|
147
|
+
export var verticalScroll = 'vertical-scroll';
|
|
148
|
+
/** @hidden */
|
|
149
|
+
export var horizontalScroll = 'horizontal-scroll';
|
|
150
|
+
/** @hidden */
|
|
147
151
|
export var contentReady = 'content-ready';
|
|
148
152
|
/** @hidden */
|
|
149
153
|
export var dataReady = 'data-ready';
|
|
@@ -343,3 +347,7 @@ export var windowResized = 'Window resized';
|
|
|
343
347
|
export var recordUpdated = 'Records updated';
|
|
344
348
|
/** @hidden */
|
|
345
349
|
export var drillThroughClosed = 'Drill-through closed';
|
|
350
|
+
/** @hidden */
|
|
351
|
+
export var verticalScrolled = 'Vertically scrolled';
|
|
352
|
+
/** @hidden */
|
|
353
|
+
export var horizontalScrolled = 'Horizontally scrolled';
|
|
@@ -680,7 +680,7 @@ var PivotFieldList = /** @class */ (function (_super) {
|
|
|
680
680
|
customProperties.enableValueSorting = _this.staticPivotGridModule ?
|
|
681
681
|
_this.staticPivotGridModule.enableValueSorting : _this.enableValueSorting;
|
|
682
682
|
if (_this.dataSourceSettings.mode !== 'Server') {
|
|
683
|
-
_this.engineModule.renderEngine(_this.dataSourceSettings, customProperties, _this.getValueCellInfo.bind(_this), _this.getHeaderSortInfo.bind(_this));
|
|
683
|
+
_this.engineModule.renderEngine(_this.dataSourceSettings, customProperties, _this.aggregateCellInfo ? _this.getValueCellInfo.bind(_this) : undefined, _this.onHeadersSort ? _this.getHeaderSortInfo.bind(_this) : undefined);
|
|
684
684
|
}
|
|
685
685
|
_this.pivotFieldList = _this.engineModule.fieldList;
|
|
686
686
|
var eventArgs = {
|
|
@@ -696,7 +696,7 @@ var PivotFieldList = /** @class */ (function (_super) {
|
|
|
696
696
|
});
|
|
697
697
|
}
|
|
698
698
|
else if (_this.dataType === 'olap') {
|
|
699
|
-
_this.olapEngineModule.renderEngine(_this.dataSourceSettings, _this.frameCustomProperties(_this.olapEngineModule.fieldListData, _this.olapEngineModule.fieldList), _this.getHeaderSortInfo.bind(_this));
|
|
699
|
+
_this.olapEngineModule.renderEngine(_this.dataSourceSettings, _this.frameCustomProperties(_this.olapEngineModule.fieldListData, _this.olapEngineModule.fieldList), _this.onHeadersSort ? _this.getHeaderSortInfo.bind(_this) : undefined);
|
|
700
700
|
_this.pivotFieldList = _this.olapEngineModule.fieldList;
|
|
701
701
|
var eventArgs = {
|
|
702
702
|
pivotFieldList: _this.pivotFieldList,
|
|
@@ -774,10 +774,10 @@ var PivotFieldList = /** @class */ (function (_super) {
|
|
|
774
774
|
this.fieldListSpinnerElement = this.element.querySelector('.e-pivotfieldlist-container');
|
|
775
775
|
}
|
|
776
776
|
if (this.spinnerTemplate) {
|
|
777
|
-
createSpinner({ target: this.fieldListSpinnerElement, template: this.spinnerTemplate }, this.createElement);
|
|
777
|
+
createSpinner({ target: this.fieldListSpinnerElement, template: this.spinnerTemplate, cssClass: this.cssClass ? this.cssClass : undefined }, this.createElement);
|
|
778
778
|
}
|
|
779
779
|
else {
|
|
780
|
-
createSpinner({ target: this.fieldListSpinnerElement }, this.createElement);
|
|
780
|
+
createSpinner({ target: this.fieldListSpinnerElement, cssClass: this.cssClass ? this.cssClass : undefined }, this.createElement);
|
|
781
781
|
}
|
|
782
782
|
var args;
|
|
783
783
|
args = {
|
|
@@ -937,7 +937,7 @@ var PivotFieldList = /** @class */ (function (_super) {
|
|
|
937
937
|
pivot.lastFilterInfo = {};
|
|
938
938
|
}
|
|
939
939
|
else {
|
|
940
|
-
pivot.engineModule.renderEngine(pivot.dataSourceSettings, customProperties, pivot.getValueCellInfo.bind(pivot), pivot.getHeaderSortInfo.bind(pivot));
|
|
940
|
+
pivot.engineModule.renderEngine(pivot.dataSourceSettings, customProperties, pivot.aggregateCellInfo ? pivot.getValueCellInfo.bind(pivot) : undefined, pivot.onHeadersSort ? pivot.getHeaderSortInfo.bind(pivot) : undefined);
|
|
941
941
|
}
|
|
942
942
|
}
|
|
943
943
|
}
|
|
@@ -1035,7 +1035,7 @@ var PivotFieldList = /** @class */ (function (_super) {
|
|
|
1035
1035
|
}
|
|
1036
1036
|
}
|
|
1037
1037
|
else {
|
|
1038
|
-
pivot.olapEngineModule.renderEngine(pivot.dataSourceSettings, customProperties, pivot.getHeaderSortInfo.bind(pivot));
|
|
1038
|
+
pivot.olapEngineModule.renderEngine(pivot.dataSourceSettings, customProperties, pivot.onHeadersSort ? pivot.getHeaderSortInfo.bind(pivot) : undefined);
|
|
1039
1039
|
}
|
|
1040
1040
|
pivot.lastSortInfo = {};
|
|
1041
1041
|
pivot.lastAggregationInfo = {};
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { EventHandler, setStyleAttribute, Browser } from '@syncfusion/ej2-base';
|
|
2
2
|
import { contentReady } from '../../common/base/constant';
|
|
3
3
|
import * as cls from '../../common/base/css-constant';
|
|
4
|
+
import { PivotUtil } from '../../base/util';
|
|
5
|
+
import * as events from '../../common/base/constant';
|
|
4
6
|
/**
|
|
5
7
|
* `VirtualScroll` module is used to handle scrolling behavior.
|
|
6
8
|
*/
|
|
@@ -145,8 +147,12 @@ var VirtualScroll = /** @class */ (function () {
|
|
|
145
147
|
};
|
|
146
148
|
};
|
|
147
149
|
VirtualScroll.prototype.update = function (mHdr, mCont, top, left, e) {
|
|
150
|
+
var _this = this;
|
|
148
151
|
this.parent.isScrolling = true;
|
|
149
152
|
var engine = this.parent.dataType === 'pivot' ? this.parent.engineModule : this.parent.olapEngineModule;
|
|
153
|
+
var args = {
|
|
154
|
+
dataSourceSettings: PivotUtil.getClonedDataSourceSettings(this.parent.dataSourceSettings)
|
|
155
|
+
};
|
|
150
156
|
if (this.parent.pageSettings && engine.pageSettings) {
|
|
151
157
|
if (this.direction === 'vertical') {
|
|
152
158
|
var rowValues = this.parent.dataType === 'pivot' ?
|
|
@@ -158,25 +164,29 @@ var VirtualScroll = /** @class */ (function () {
|
|
|
158
164
|
// this.parent.hideWaitingPopup();
|
|
159
165
|
return;
|
|
160
166
|
}
|
|
167
|
+
this.parent.actionObj.actionName = events.verticalScroll;
|
|
168
|
+
this.parent.actionBeginMethod();
|
|
161
169
|
this.parent.showWaitingPopup();
|
|
162
170
|
this.parent.scrollPosObject.vertical = section;
|
|
163
171
|
engine.pageSettings.rowCurrentPage = section > 1 ? section : 1;
|
|
164
|
-
var
|
|
165
|
-
|
|
166
|
-
if (
|
|
167
|
-
|
|
172
|
+
var rowStartPos_1 = 0;
|
|
173
|
+
this.parent.trigger(events.enginePopulating, args, function (observedArgs) {
|
|
174
|
+
if (_this.parent.dataType === 'pivot') {
|
|
175
|
+
if (_this.parent.dataSourceSettings.mode === 'Server') {
|
|
176
|
+
_this.parent.getEngine('onScroll', null, null, null, null, null, null);
|
|
177
|
+
}
|
|
178
|
+
else {
|
|
179
|
+
_this.parent.engineModule.generateGridData(_this.parent.dataSourceSettings, true, _this.parent.engineModule.headerCollection);
|
|
180
|
+
rowStartPos_1 = _this.parent.engineModule.rowStartPos;
|
|
181
|
+
}
|
|
168
182
|
}
|
|
169
183
|
else {
|
|
170
|
-
|
|
171
|
-
|
|
184
|
+
_this.parent.olapEngineModule.scrollPage('scroll');
|
|
185
|
+
rowStartPos_1 = _this.parent.olapEngineModule.pageRowStartPos;
|
|
172
186
|
}
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
rowStartPos = this.parent.olapEngineModule.pageRowStartPos;
|
|
177
|
-
}
|
|
178
|
-
this.parent.pivotValues = engine.pivotValues;
|
|
179
|
-
var exactPage = Math.ceil(rowStartPos / (this.parent.pageSettings.rowSize * rowValues));
|
|
187
|
+
_this.enginePopulatedEventMethod(engine);
|
|
188
|
+
});
|
|
189
|
+
var exactPage = Math.ceil(rowStartPos_1 / (this.parent.pageSettings.rowSize * rowValues));
|
|
180
190
|
var pos = exactSize * exactPage -
|
|
181
191
|
(engine.rowFirstLvl * rowValues * this.parent.gridSettings.rowHeight);
|
|
182
192
|
this.parent.scrollPosObject.verticalSection = pos;
|
|
@@ -191,32 +201,51 @@ var VirtualScroll = /** @class */ (function () {
|
|
|
191
201
|
// this.parent.hideWaitingPopup();
|
|
192
202
|
return;
|
|
193
203
|
}
|
|
204
|
+
this.parent.actionObj.actionName = events.horizontalScroll;
|
|
205
|
+
this.parent.actionBeginMethod();
|
|
194
206
|
this.parent.showWaitingPopup();
|
|
195
|
-
var
|
|
196
|
-
|
|
207
|
+
var pivot_1 = this.parent;
|
|
208
|
+
pivot_1.scrollPosObject.horizontal = section;
|
|
197
209
|
engine.pageSettings.columnCurrentPage = section > 1 ? section : 1;
|
|
198
|
-
var
|
|
199
|
-
|
|
200
|
-
if (
|
|
201
|
-
|
|
210
|
+
var colStartPos_1 = 0;
|
|
211
|
+
this.parent.trigger(events.enginePopulating, args, function (observedArgs) {
|
|
212
|
+
if (pivot_1.dataType === 'pivot') {
|
|
213
|
+
if (_this.parent.dataSourceSettings.mode === 'Server') {
|
|
214
|
+
_this.parent.getEngine('onScroll', null, null, null, null, null, null);
|
|
215
|
+
}
|
|
216
|
+
else {
|
|
217
|
+
pivot_1.engineModule.generateGridData(pivot_1.dataSourceSettings, true, pivot_1.engineModule.headerCollection);
|
|
218
|
+
colStartPos_1 = pivot_1.engineModule.colStartPos;
|
|
219
|
+
}
|
|
202
220
|
}
|
|
203
221
|
else {
|
|
204
|
-
|
|
205
|
-
|
|
222
|
+
pivot_1.olapEngineModule.scrollPage('scroll');
|
|
223
|
+
colStartPos_1 = pivot_1.olapEngineModule.pageColStartPos;
|
|
206
224
|
}
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
colStartPos = pivot.olapEngineModule.pageColStartPos;
|
|
211
|
-
}
|
|
212
|
-
pivot.pivotValues = engine.pivotValues;
|
|
213
|
-
var exactPage = Math.ceil(colStartPos / (pivot.pageSettings.columnSize * colValues));
|
|
225
|
+
_this.enginePopulatedEventMethod(engine);
|
|
226
|
+
});
|
|
227
|
+
var exactPage = Math.ceil(colStartPos_1 / (pivot_1.pageSettings.columnSize * colValues));
|
|
214
228
|
var pos = exactSize * exactPage - (engine.colFirstLvl *
|
|
215
|
-
colValues *
|
|
216
|
-
|
|
229
|
+
colValues * pivot_1.gridSettings.columnWidth);
|
|
230
|
+
pivot_1.scrollPosObject.horizontalSection = pos;
|
|
231
|
+
}
|
|
232
|
+
this.parent.actionObj.actionName = this.parent.getActionCompleteName();
|
|
233
|
+
if (this.parent.actionObj.actionName) {
|
|
234
|
+
this.parent.actionCompleteMethod();
|
|
217
235
|
}
|
|
218
236
|
}
|
|
219
237
|
};
|
|
238
|
+
VirtualScroll.prototype.enginePopulatedEventMethod = function (engine, control) {
|
|
239
|
+
var _this = this;
|
|
240
|
+
var pivot = control ? control : this.parent;
|
|
241
|
+
var eventArgs = {
|
|
242
|
+
dataSourceSettings: pivot.dataSourceSettings,
|
|
243
|
+
pivotValues: pivot.pivotValues
|
|
244
|
+
};
|
|
245
|
+
pivot.trigger(events.enginePopulated, eventArgs, function (observedArgs) {
|
|
246
|
+
_this.parent.pivotValues = engine.pivotValues;
|
|
247
|
+
});
|
|
248
|
+
};
|
|
220
249
|
VirtualScroll.prototype.setPageXY = function () {
|
|
221
250
|
var _this = this;
|
|
222
251
|
return function (e) {
|
|
@@ -1217,10 +1217,10 @@ var PivotView = /** @class */ (function (_super) {
|
|
|
1217
1217
|
this.cellTemplateFn = this.templateParser(this.cellTemplate);
|
|
1218
1218
|
this.tooltipTemplateFn = this.templateParser(this.tooltipTemplate);
|
|
1219
1219
|
if (this.spinnerTemplate) {
|
|
1220
|
-
createSpinner({ target: this.element, template: this.spinnerTemplate }, this.createElement);
|
|
1220
|
+
createSpinner({ target: this.element, template: this.spinnerTemplate, cssClass: this.cssClass ? this.cssClass : undefined }, this.createElement);
|
|
1221
1221
|
}
|
|
1222
1222
|
else {
|
|
1223
|
-
createSpinner({ target: this.element }, this.createElement);
|
|
1223
|
+
createSpinner({ target: this.element, cssClass: this.cssClass ? this.cssClass : undefined }, this.createElement);
|
|
1224
1224
|
}
|
|
1225
1225
|
var loadArgs = {
|
|
1226
1226
|
dataSourceSettings: this.dataSourceSettings,
|
|
@@ -1890,7 +1890,7 @@ var PivotView = /** @class */ (function (_super) {
|
|
|
1890
1890
|
}
|
|
1891
1891
|
}
|
|
1892
1892
|
else {
|
|
1893
|
-
pivot.olapEngineModule.renderEngine(pivot.dataSourceSettings, customProperties, pivot.getHeaderSortInfo.bind(pivot));
|
|
1893
|
+
pivot.olapEngineModule.renderEngine(pivot.dataSourceSettings, customProperties, pivot.onHeadersSort ? pivot.getHeaderSortInfo.bind(pivot) : undefined);
|
|
1894
1894
|
}
|
|
1895
1895
|
pivot.allowServerDataBinding = false;
|
|
1896
1896
|
pivot.setProperties({ pivotValues: pivot.olapEngineModule.pivotValues }, true);
|
|
@@ -1931,7 +1931,7 @@ var PivotView = /** @class */ (function (_super) {
|
|
|
1931
1931
|
pivot.lastFilterInfo = {};
|
|
1932
1932
|
}
|
|
1933
1933
|
else {
|
|
1934
|
-
pivot.engineModule.renderEngine(pivot.dataSourceSettings, customProperties, pivot.getValueCellInfo.bind(pivot), pivot.getHeaderSortInfo.bind(pivot));
|
|
1934
|
+
pivot.engineModule.renderEngine(pivot.dataSourceSettings, customProperties, pivot.aggregateCellInfo ? pivot.getValueCellInfo.bind(pivot) : undefined, pivot.onHeadersSort ? pivot.getHeaderSortInfo.bind(pivot) : undefined);
|
|
1935
1935
|
pivot.allowServerDataBinding = false;
|
|
1936
1936
|
pivot.setProperties({ pivotValues: pivot.engineModule.pivotValues }, true);
|
|
1937
1937
|
/* eslint-disable-next-line @typescript-eslint/no-explicit-any */
|
|
@@ -2774,6 +2774,9 @@ var PivotView = /** @class */ (function (_super) {
|
|
|
2774
2774
|
this.lastCellClicked = e.target;
|
|
2775
2775
|
}
|
|
2776
2776
|
var target = e.target;
|
|
2777
|
+
if (closest(target, '.' + cls.PIVOT_BUTTON_CLASS)) {
|
|
2778
|
+
return;
|
|
2779
|
+
}
|
|
2777
2780
|
var ele = null;
|
|
2778
2781
|
var axis = (target.parentElement.classList.contains(cls.ROWSHEADER) || target.classList.contains(cls.ROWSHEADER)) ? 'row' : 'column';
|
|
2779
2782
|
ele = axis === 'column' ? closest(target, 'th') : closest(target, 'td');
|
|
@@ -3207,6 +3210,9 @@ var PivotView = /** @class */ (function (_super) {
|
|
|
3207
3210
|
_this_1.getSelectedCellsPos();
|
|
3208
3211
|
});
|
|
3209
3212
|
}
|
|
3213
|
+
else {
|
|
3214
|
+
this.clearSelection(null, e, null, null);
|
|
3215
|
+
}
|
|
3210
3216
|
};
|
|
3211
3217
|
PivotView.prototype.rowDeselect = function (ele, e, rowIndex, mode, observedArgs) {
|
|
3212
3218
|
if (!e.shiftKey && !e.ctrlKey && this.gridSettings.selectionSettings.mode !== 'Both' || this.gridSettings.selectionSettings.type === 'Single') {
|
|
@@ -3252,7 +3258,7 @@ var PivotView = /** @class */ (function (_super) {
|
|
|
3252
3258
|
PivotView.prototype.clearSelection = function (ele, e, colIndex, rowIndex) {
|
|
3253
3259
|
if ((!e.shiftKey && !e.ctrlKey) || this.gridSettings.selectionSettings.type === 'Single') {
|
|
3254
3260
|
if (this.gridSettings.selectionSettings.mode === 'Cell') {
|
|
3255
|
-
if (ele.classList.contains(cls.COLUMNSHEADER)) {
|
|
3261
|
+
if (ele && ele.classList.contains(cls.COLUMNSHEADER)) {
|
|
3256
3262
|
removeClass(this.element.querySelectorAll(('.' + cls.ROW_CELL_CLASS + '.') + cls.CELL_SELECTED_BGCOLOR), cls.CELL_SELECTED_BGCOLOR);
|
|
3257
3263
|
}
|
|
3258
3264
|
else {
|
|
@@ -3260,7 +3266,7 @@ var PivotView = /** @class */ (function (_super) {
|
|
|
3260
3266
|
}
|
|
3261
3267
|
}
|
|
3262
3268
|
else if (this.gridSettings.selectionSettings.mode === 'Both') {
|
|
3263
|
-
if (ele.classList.contains(cls.ROW_CELL_CLASS)) {
|
|
3269
|
+
if (ele && ele.classList.contains(cls.ROW_CELL_CLASS)) {
|
|
3264
3270
|
for (var _i = 0, _a = [].slice.call(this.element.querySelectorAll('.' + cls.SELECTED_BGCOLOR + ', .' + cls.CELL_SELECTED_BGCOLOR)); _i < _a.length; _i++) {
|
|
3265
3271
|
var ele_2 = _a[_i];
|
|
3266
3272
|
// if (Number((ele as HTMLElement).getAttribute('index')) !== rowIndex) {
|
|
@@ -3498,7 +3504,7 @@ var PivotView = /** @class */ (function (_super) {
|
|
|
3498
3504
|
_this_1.clonedReport = _this_1.clonedReport ? _this_1.clonedReport : dataSourceSettings;
|
|
3499
3505
|
}
|
|
3500
3506
|
if (_this_1.dataSourceSettings.mode !== 'Server') {
|
|
3501
|
-
_this_1.engineModule.renderEngine(_this_1.dataSourceSettings, customProperties, _this_1.getValueCellInfo.bind(_this_1), _this_1.getHeaderSortInfo.bind(_this_1));
|
|
3507
|
+
_this_1.engineModule.renderEngine(_this_1.dataSourceSettings, customProperties, _this_1.aggregateCellInfo ? _this_1.getValueCellInfo.bind(_this_1) : undefined, _this_1.onHeadersSort ? _this_1.getHeaderSortInfo.bind(_this_1) : undefined);
|
|
3502
3508
|
}
|
|
3503
3509
|
_this_1.allowServerDataBinding = false;
|
|
3504
3510
|
_this_1.setProperties({ pivotValues: _this_1.engineModule.pivotValues }, true);
|
|
@@ -3509,7 +3515,7 @@ var PivotView = /** @class */ (function (_super) {
|
|
|
3509
3515
|
else if (_this_1.dataSourceSettings.providerType === 'SSAS' && _this_1.dataType === 'olap') {
|
|
3510
3516
|
customProperties.savedFieldList = _this_1.olapEngineModule.fieldList;
|
|
3511
3517
|
customProperties.savedFieldListData = _this_1.olapEngineModule.fieldListData;
|
|
3512
|
-
_this_1.olapEngineModule.renderEngine(_this_1.dataSourceSettings, customProperties, _this_1.getHeaderSortInfo.bind(_this_1));
|
|
3518
|
+
_this_1.olapEngineModule.renderEngine(_this_1.dataSourceSettings, customProperties, _this_1.onHeadersSort ? _this_1.getHeaderSortInfo.bind(_this_1) : undefined);
|
|
3513
3519
|
_this_1.allowServerDataBinding = false;
|
|
3514
3520
|
_this_1.setProperties({ pivotValues: _this_1.olapEngineModule.pivotValues }, true);
|
|
3515
3521
|
delete _this_1.bulkChanges.pivotValues;
|
|
@@ -3990,7 +3996,8 @@ var PivotView = /** @class */ (function (_super) {
|
|
|
3990
3996
|
: this.actionObj.actionName == events.removeRecord ? events.recordRemoved : (this.actionObj.actionName == events.pngExport) ? events.pngExported : (this.actionObj.actionName == events.jpegExport) ? events.jpegExported
|
|
3991
3997
|
: (this.actionObj.actionName == events.svgExport) ? events.svgExported : (this.actionObj.actionName == events.pdfExport) ? events.pdfExported : (this.actionObj.actionName == events.csvExport) ? events.csvExported : (this.actionObj.actionName == events.excelExport) ? events.excelExported : this.actionObj.actionName == events.windowResize ? events.windowResized
|
|
3992
3998
|
: this.actionObj.actionName == events.saveCurrentReport ? events.reportSaved : (this.actionObj.actionName == events.addNewReport) ? events.newReportAdded : (this.actionObj.actionName == events.saveAsCurrentReport) ? events.reportReSaved
|
|
3993
|
-
: (this.actionObj.actionName == events.renameCurrentReport) ? events.reportRenamed : this.actionObj.actionName
|
|
3999
|
+
: (this.actionObj.actionName == events.renameCurrentReport) ? events.reportRenamed : (this.actionObj.actionName == events.renameCurrentReport) ? events.reportRenamed : (this.actionObj.actionName == events.horizontalScroll) ? events.horizontalScrolled
|
|
4000
|
+
: (this.actionObj.actionName == events.verticalScroll) ? events.verticalScrolled : this.actionObj.actionName;
|
|
3994
4001
|
return actionName;
|
|
3995
4002
|
};
|
|
3996
4003
|
/* eslint-disable-next-line */
|
|
@@ -71,7 +71,7 @@ $field-list-back-margin: 5px !default;
|
|
|
71
71
|
$field-list-sort-wrapper-padding-size: 10px !default;
|
|
72
72
|
$field-list-border: $content-bg-color-alt3 !default;
|
|
73
73
|
$field-list-calc-expand-icon-padding: 8px !default;
|
|
74
|
-
$field-list-search-padding-size: 10px $field-list-
|
|
74
|
+
$field-list-search-padding-size: 10px $field-list-title-padding-size !default;
|
|
75
75
|
$field-list-search-popup-table-height: 392px !default;
|
|
76
76
|
$field-list-search-popup-axis-content-height: 162px !default;
|
|
77
77
|
$field-list-search-popup-container-bigger-height: 575px !default;
|
|
@@ -71,7 +71,8 @@ $field-list-back-margin: 5px !default;
|
|
|
71
71
|
$field-list-sort-wrapper-padding-size: 10px !default;
|
|
72
72
|
$field-list-border: $content-bg-color-alt3 !default;
|
|
73
73
|
$field-list-calc-expand-icon-padding: 8px !default;
|
|
74
|
-
$field-list-search-padding-size: 10px $field-list-
|
|
74
|
+
$field-list-search-padding-size: 10px $field-list-title-padding-size !default;
|
|
75
|
+
$field-list-member-prompt-padding-size: 25px 12px !default;
|
|
75
76
|
$field-list-search-popup-table-height: 392px !default;
|
|
76
77
|
$field-list-search-popup-axis-content-height: 162px !default;
|
|
77
78
|
$field-list-search-popup-container-bigger-height: 565px !default;
|