@webtypen/webframez-core 0.2.22 → 0.2.24
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,5 +1,4 @@
|
|
|
1
1
|
import { Request } from "../Router/Request";
|
|
2
|
-
export type DatatableAutoApplyType = "begin" | "end" | null;
|
|
3
2
|
export declare class Datatable {
|
|
4
3
|
collection: string | Function;
|
|
5
4
|
aggregation: {
|
|
@@ -19,8 +18,8 @@ export declare class Datatable {
|
|
|
19
18
|
perPage: number;
|
|
20
19
|
onRow?: Function;
|
|
21
20
|
onAttributes?: Function;
|
|
22
|
-
autoApplyFilter:
|
|
23
|
-
autoApplySearch:
|
|
21
|
+
autoApplyFilter: "begin" | "end" | null;
|
|
22
|
+
autoApplySearch: "begin" | "end" | null;
|
|
24
23
|
logAggregation: boolean;
|
|
25
24
|
defaultUnwind?: string | null;
|
|
26
25
|
getInit(req: Request): Promise<any>;
|
|
@@ -318,6 +318,9 @@ class Datatable {
|
|
|
318
318
|
: "==";
|
|
319
319
|
const filterEl = filterDef && filterDef[key] ? filterDef[key] : null;
|
|
320
320
|
const entryType = entry.type && entry.type.trim() !== "" ? entry.type : filterEl && filterEl.type ? filterEl.type : null;
|
|
321
|
+
if (filterEl && filterEl.ignore) {
|
|
322
|
+
continue;
|
|
323
|
+
}
|
|
321
324
|
switch (operator) {
|
|
322
325
|
case "empty":
|
|
323
326
|
value = null;
|
package/package.json
CHANGED
|
@@ -2,8 +2,6 @@ import { DBConnection } from "../Database/DBConnection";
|
|
|
2
2
|
import { NumericFunctions } from "../Functions/NumericFunctions";
|
|
3
3
|
import { Request } from "../Router/Request";
|
|
4
4
|
|
|
5
|
-
export type DatatableAutoApplyType = "begin" | "end" | null;
|
|
6
|
-
|
|
7
5
|
export class Datatable {
|
|
8
6
|
collection: string | Function = "";
|
|
9
7
|
aggregation: { [key: string]: any } | Function | null = null;
|
|
@@ -15,8 +13,8 @@ export class Datatable {
|
|
|
15
13
|
perPage: number = 25;
|
|
16
14
|
onRow?: Function;
|
|
17
15
|
onAttributes?: Function;
|
|
18
|
-
autoApplyFilter:
|
|
19
|
-
autoApplySearch:
|
|
16
|
+
autoApplyFilter: "begin" | "end" | null = "begin";
|
|
17
|
+
autoApplySearch: "begin" | "end" | null = null;
|
|
20
18
|
logAggregation = false;
|
|
21
19
|
defaultUnwind?: string | null = null;
|
|
22
20
|
|
|
@@ -330,6 +328,11 @@ export class Datatable {
|
|
|
330
328
|
: "==";
|
|
331
329
|
const filterEl = filterDef && filterDef[key] ? filterDef[key] : null;
|
|
332
330
|
const entryType = entry.type && entry.type.trim() !== "" ? entry.type : filterEl && filterEl.type ? filterEl.type : null;
|
|
331
|
+
|
|
332
|
+
if (filterEl && filterEl.ignore) {
|
|
333
|
+
continue;
|
|
334
|
+
}
|
|
335
|
+
|
|
333
336
|
switch (operator) {
|
|
334
337
|
case "empty":
|
|
335
338
|
value = null;
|