@easyquery/core 7.2.5-rc01 → 7.2.5-rc02
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.
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
|
|
2
2
|
/*
|
|
3
|
-
* EasyQuery.JS Core v7.2.5-
|
|
3
|
+
* EasyQuery.JS Core v7.2.5-rc02
|
|
4
4
|
* Copyright 2024 Korzh.com
|
|
5
5
|
* Licensed under MIT
|
|
6
6
|
*
|
|
7
|
-
* Build time: 1/
|
|
7
|
+
* Build time: 1/9/2024 11:22:26 AM
|
|
8
8
|
*/
|
|
9
9
|
|
|
10
10
|
'use strict';
|
|
@@ -2192,7 +2192,7 @@ class Query {
|
|
|
2192
2192
|
}
|
|
2193
2193
|
}
|
|
2194
2194
|
if (group.columns.length == 0) {
|
|
2195
|
-
aggrSettings.groups.
|
|
2195
|
+
aggrSettings.groups.splice(i, 1);
|
|
2196
2196
|
}
|
|
2197
2197
|
}
|
|
2198
2198
|
const aggregates = aggrSettings.getAggregates();
|
|
@@ -2203,6 +2203,11 @@ class Query {
|
|
|
2203
2203
|
hasChanged = true;
|
|
2204
2204
|
}
|
|
2205
2205
|
}
|
|
2206
|
+
// const isValidAggration = (aggrSettings.hasGroups() && (aggrSettings.hasAggregates() || aggrSettings.hasRecordCount()))
|
|
2207
|
+
// || (aggrSettings.hasAggregates && aggrSettings.hasGrandTotals());
|
|
2208
|
+
// if (!isValidAggration) {
|
|
2209
|
+
// this.enableAggregation = false;
|
|
2210
|
+
// }
|
|
2206
2211
|
return hasChanged;
|
|
2207
2212
|
}
|
|
2208
2213
|
createSubQuery() {
|
|
@@ -2553,6 +2558,9 @@ class Query {
|
|
|
2553
2558
|
}
|
|
2554
2559
|
}
|
|
2555
2560
|
}
|
|
2561
|
+
if (this._enableAggregation) {
|
|
2562
|
+
this.updateAggregationSettings();
|
|
2563
|
+
}
|
|
2556
2564
|
noErrors = true;
|
|
2557
2565
|
if (noErrors) {
|
|
2558
2566
|
if (options.changeStatus) {
|
|
@@ -3130,7 +3138,7 @@ class Query {
|
|
|
3130
3138
|
this.adjustColumnsSorting();
|
|
3131
3139
|
}
|
|
3132
3140
|
/**
|
|
3133
|
-
* Removes
|
|
3141
|
+
* Removes a column.
|
|
3134
3142
|
* @param column The column to be removed.
|
|
3135
3143
|
*/
|
|
3136
3144
|
removeColumn(column) {
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
|
|
2
2
|
/*
|
|
3
|
-
* EasyQuery.JS Core v7.2.5-
|
|
3
|
+
* EasyQuery.JS Core v7.2.5-rc02
|
|
4
4
|
* Copyright 2024 Korzh.com
|
|
5
5
|
* Licensed under MIT
|
|
6
6
|
*
|
|
7
|
-
* Build time: 1/
|
|
7
|
+
* Build time: 1/9/2024 11:22:26 AM
|
|
8
8
|
*/
|
|
9
9
|
|
|
10
10
|
import { i18n, DataType, utils, ValueEditor, MetaEntity, MetaEntityAttr, EditorTag, MetaData, EventEmitter, AggregationSettings, HttpClient, EasyDataTable } from '@easydata/core';
|
|
@@ -2191,7 +2191,7 @@ class Query {
|
|
|
2191
2191
|
}
|
|
2192
2192
|
}
|
|
2193
2193
|
if (group.columns.length == 0) {
|
|
2194
|
-
aggrSettings.groups.
|
|
2194
|
+
aggrSettings.groups.splice(i, 1);
|
|
2195
2195
|
}
|
|
2196
2196
|
}
|
|
2197
2197
|
const aggregates = aggrSettings.getAggregates();
|
|
@@ -2202,6 +2202,11 @@ class Query {
|
|
|
2202
2202
|
hasChanged = true;
|
|
2203
2203
|
}
|
|
2204
2204
|
}
|
|
2205
|
+
// const isValidAggration = (aggrSettings.hasGroups() && (aggrSettings.hasAggregates() || aggrSettings.hasRecordCount()))
|
|
2206
|
+
// || (aggrSettings.hasAggregates && aggrSettings.hasGrandTotals());
|
|
2207
|
+
// if (!isValidAggration) {
|
|
2208
|
+
// this.enableAggregation = false;
|
|
2209
|
+
// }
|
|
2205
2210
|
return hasChanged;
|
|
2206
2211
|
}
|
|
2207
2212
|
createSubQuery() {
|
|
@@ -2552,6 +2557,9 @@ class Query {
|
|
|
2552
2557
|
}
|
|
2553
2558
|
}
|
|
2554
2559
|
}
|
|
2560
|
+
if (this._enableAggregation) {
|
|
2561
|
+
this.updateAggregationSettings();
|
|
2562
|
+
}
|
|
2555
2563
|
noErrors = true;
|
|
2556
2564
|
if (noErrors) {
|
|
2557
2565
|
if (options.changeStatus) {
|
|
@@ -3129,7 +3137,7 @@ class Query {
|
|
|
3129
3137
|
this.adjustColumnsSorting();
|
|
3130
3138
|
}
|
|
3131
3139
|
/**
|
|
3132
|
-
* Removes
|
|
3140
|
+
* Removes a column.
|
|
3133
3141
|
* @param column The column to be removed.
|
|
3134
3142
|
*/
|
|
3135
3143
|
removeColumn(column) {
|
|
@@ -324,7 +324,7 @@ export declare class Query implements AggregationColumnStore {
|
|
|
324
324
|
*/
|
|
325
325
|
moveColumn(index1: number, index2: number): void;
|
|
326
326
|
/**
|
|
327
|
-
* Removes
|
|
327
|
+
* Removes a column.
|
|
328
328
|
* @param column The column to be removed.
|
|
329
329
|
*/
|
|
330
330
|
removeColumn(column: QueryColumn): void;
|