@easyquery/enterprise 7.2.3-rc02 → 7.2.3
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/dist/browser/eq.enterprise.js +250 -242
- package/dist/browser/eq.enterprise.js.map +1 -1
- package/dist/browser/eq.enterprise.min.js +3 -3
- package/dist/browser/eq.enterprise.min.js.map +1 -1
- package/dist/bundles/easyquery.enterprise.js +70 -63
- package/dist/bundles/easyquery.enterprise.js.map +1 -1
- package/dist/bundles/easyquery.enterprise.min.js +1 -1
- package/dist/bundles/easyquery.enterprise.min.js.map +1 -1
- package/dist/lib/data/data_table_aggr_calculator.d.ts +1 -0
- package/dist/lib/data/data_table_aggr_calculator.js +16 -18
- package/dist/lib/data/data_table_aggr_calculator.js.map +1 -1
- package/package.json +3 -3
|
@@ -36,6 +36,7 @@ export declare class DataTableAggregatesCalculator implements AggregatesCalculat
|
|
|
36
36
|
and then reset the data row for that level
|
|
37
37
|
*/
|
|
38
38
|
protected flushLevelTotals(levelIndex: number): void;
|
|
39
|
+
protected applyAggrFunc(funcId: string, columnTotals: ColumnAggregates, levelTotals: RowAggregates): Number;
|
|
39
40
|
/** Updates the totals by values in the current DataRow
|
|
40
41
|
* and according to the specified aggregate
|
|
41
42
|
*/
|
|
@@ -111,24 +111,7 @@ var DataTableAggregatesCalculator = /** @class */ (function () {
|
|
|
111
111
|
for (var _i = 0, _a = this.aggregates; _i < _a.length; _i++) {
|
|
112
112
|
var aggr = _a[_i];
|
|
113
113
|
var columnTotals = levelTotals.columns[aggr.colId];
|
|
114
|
-
|
|
115
|
-
case "SUM":
|
|
116
|
-
groupTotals[aggr.colId] = columnTotals.sum;
|
|
117
|
-
break;
|
|
118
|
-
case "AVG":
|
|
119
|
-
groupTotals[aggr.colId] = columnTotals.sum / levelTotals.count;
|
|
120
|
-
break;
|
|
121
|
-
case "COUNT":
|
|
122
|
-
case "CNTDST":
|
|
123
|
-
groupTotals[aggr.colId] = levelTotals.count;
|
|
124
|
-
break;
|
|
125
|
-
case "MIN":
|
|
126
|
-
groupTotals[aggr.colId] = columnTotals.min;
|
|
127
|
-
break;
|
|
128
|
-
case "MAX":
|
|
129
|
-
groupTotals[aggr.colId] = columnTotals.max;
|
|
130
|
-
break;
|
|
131
|
-
}
|
|
114
|
+
groupTotals[aggr.colId] = this.applyAggrFunc(aggr.funcId, columnTotals, levelTotals);
|
|
132
115
|
}
|
|
133
116
|
if (this.aggrSettings.hasRecordCount()) {
|
|
134
117
|
groupTotals[this.aggrSettings.COUNT_FIELD_NAME] = levelTotals.count;
|
|
@@ -136,6 +119,21 @@ var DataTableAggregatesCalculator = /** @class */ (function () {
|
|
|
136
119
|
this.aggrContainer.updateAggregateData(levelIndex, groupKey, groupTotals);
|
|
137
120
|
this.resetLevelTotals(levelTotals);
|
|
138
121
|
};
|
|
122
|
+
DataTableAggregatesCalculator.prototype.applyAggrFunc = function (funcId, columnTotals, levelTotals) {
|
|
123
|
+
switch (funcId) {
|
|
124
|
+
case "SUM":
|
|
125
|
+
return columnTotals.sum;
|
|
126
|
+
case "AVG":
|
|
127
|
+
return columnTotals.sum / levelTotals.count;
|
|
128
|
+
case "COUNT":
|
|
129
|
+
case "CNTDST":
|
|
130
|
+
return levelTotals.count;
|
|
131
|
+
case "MIN":
|
|
132
|
+
return columnTotals.min;
|
|
133
|
+
case "MAX":
|
|
134
|
+
return columnTotals.max;
|
|
135
|
+
}
|
|
136
|
+
};
|
|
139
137
|
/** Updates the totals by values in the current DataRow
|
|
140
138
|
* and according to the specified aggregate
|
|
141
139
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data_table_aggr_calculator.js","sourceRoot":"","sources":["../../../src/data/data_table_aggr_calculator.ts"],"names":[],"mappings":"AAOA,OAAO,EAEI,qBAAqB,EAC/B,MAAM,iBAAiB,CAAC;AAmBzB;
|
|
1
|
+
{"version":3,"file":"data_table_aggr_calculator.js","sourceRoot":"","sources":["../../../src/data/data_table_aggr_calculator.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@easyquery/enterprise",
|
|
3
|
-
"version": "7.2.3
|
|
3
|
+
"version": "7.2.3",
|
|
4
4
|
"description": "EasyQuery.JS Enterprise",
|
|
5
5
|
"types": "./dist/lib/public_api.d.ts",
|
|
6
6
|
"main": "./dist/bundles/easyquery.enterprise.js",
|
|
@@ -29,8 +29,8 @@
|
|
|
29
29
|
"bugs": "https://korzh.com/support",
|
|
30
30
|
"license": "SEE LICENSE IN LICENSE.txt",
|
|
31
31
|
"peerDependencies": {
|
|
32
|
-
"@easyquery/core": "^7.2.3
|
|
33
|
-
"@easydata/core": "^1.4.
|
|
32
|
+
"@easyquery/core": "^7.2.3",
|
|
33
|
+
"@easydata/core": "^1.4.13"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
36
|
"@types/jasmine": "^3.3.9",
|