dbgate-datalib 7.0.2 → 7.0.4
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/lib/GridDisplay.js +4 -2
- package/package.json +5 -5
package/lib/GridDisplay.js
CHANGED
|
@@ -315,7 +315,7 @@ class GridDisplay {
|
|
|
315
315
|
});
|
|
316
316
|
}
|
|
317
317
|
removeFilter(uniqueName) {
|
|
318
|
-
this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { filters: lodash_1.default.omit(cfg.filters, [uniqueName]), formFilterColumns: (cfg.formFilterColumns || []).filter(x => x != uniqueName), disabledFilterColumns:
|
|
318
|
+
this.setConfig(cfg => (Object.assign(Object.assign({}, cfg), { filters: lodash_1.default.omit(cfg.filters, [uniqueName]), formFilterColumns: (cfg.formFilterColumns || []).filter(x => x != uniqueName), disabledFilterColumns: cfg.disabledFilterColumns.filter(x => x != uniqueName) })));
|
|
319
319
|
this.reload();
|
|
320
320
|
}
|
|
321
321
|
setFilters(dct) {
|
|
@@ -359,7 +359,7 @@ class GridDisplay {
|
|
|
359
359
|
this.reload();
|
|
360
360
|
}
|
|
361
361
|
getGrouping(uniqueName) {
|
|
362
|
-
var _a, _b;
|
|
362
|
+
var _a, _b, _c, _d, _e;
|
|
363
363
|
if (this.isGrouped) {
|
|
364
364
|
if (this.config.grouping[uniqueName])
|
|
365
365
|
return this.config.grouping[uniqueName];
|
|
@@ -368,6 +368,8 @@ class GridDisplay {
|
|
|
368
368
|
return 'COUNT DISTINCT';
|
|
369
369
|
if (column === null || column === void 0 ? void 0 : column.autoIncrement)
|
|
370
370
|
return 'COUNT';
|
|
371
|
+
if ((_e = (_d = (_c = this.driver) === null || _c === void 0 ? void 0 : _c.dialect) === null || _d === void 0 ? void 0 : _d.disableGroupingForDataType) === null || _e === void 0 ? void 0 : _e.call(_d, column === null || column === void 0 ? void 0 : column.dataType))
|
|
372
|
+
return 'NULL';
|
|
371
373
|
return 'MAX';
|
|
372
374
|
}
|
|
373
375
|
return null;
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "7.0.
|
|
2
|
+
"version": "7.0.4",
|
|
3
3
|
"name": "dbgate-datalib",
|
|
4
4
|
"main": "lib/index.js",
|
|
5
5
|
"typings": "lib/index.d.ts",
|
|
@@ -19,14 +19,14 @@
|
|
|
19
19
|
],
|
|
20
20
|
"dependencies": {
|
|
21
21
|
"date-fns": "^4.1.0",
|
|
22
|
-
"dbgate-filterparser": "^7.0.
|
|
23
|
-
"dbgate-sqltree": "^7.0.
|
|
24
|
-
"dbgate-tools": "^7.0.
|
|
22
|
+
"dbgate-filterparser": "^7.0.4",
|
|
23
|
+
"dbgate-sqltree": "^7.0.4",
|
|
24
|
+
"dbgate-tools": "^7.0.4",
|
|
25
25
|
"uuid": "^3.4.0"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
28
|
"@types/node": "^13.7.0",
|
|
29
|
-
"dbgate-types": "^7.0.
|
|
29
|
+
"dbgate-types": "^7.0.4",
|
|
30
30
|
"jest": "^28.1.3",
|
|
31
31
|
"ts-jest": "^28.0.7",
|
|
32
32
|
"typescript": "^4.4.3"
|