namirasoft-core 1.3.50 → 1.3.51
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/FilterItem.d.ts +15 -2
- package/dist/FilterItem.js +10 -7
- package/dist/FilterItem.js.map +1 -1
- package/package.json +1 -1
- package/src/FilterItem.ts +18 -8
package/dist/FilterItem.d.ts
CHANGED
|
@@ -1,12 +1,25 @@
|
|
|
1
1
|
import { FilterItemOperator } from "./FilterItemOperator";
|
|
2
2
|
export declare class FilterItem {
|
|
3
|
-
|
|
3
|
+
table: {
|
|
4
|
+
name: string;
|
|
5
|
+
text: string;
|
|
6
|
+
};
|
|
7
|
+
column: {
|
|
8
|
+
name: string;
|
|
9
|
+
text: string;
|
|
10
|
+
};
|
|
4
11
|
not: boolean;
|
|
5
12
|
operator: FilterItemOperator;
|
|
6
13
|
values: string[];
|
|
7
14
|
static stringify(filters: FilterItem[] | null): string;
|
|
8
15
|
static parse(item: string | null): FilterItem[];
|
|
9
|
-
constructor(
|
|
16
|
+
constructor(table: {
|
|
17
|
+
name: string;
|
|
18
|
+
text: string;
|
|
19
|
+
}, column: {
|
|
20
|
+
name: string;
|
|
21
|
+
text: string;
|
|
22
|
+
}, not: boolean, operator: FilterItemOperator, ...values: string[]);
|
|
10
23
|
getCommand(): string;
|
|
11
24
|
isAllColumns(): boolean;
|
|
12
25
|
toString(): string;
|
package/dist/FilterItem.js
CHANGED
|
@@ -15,10 +15,12 @@ class FilterItem {
|
|
|
15
15
|
for (let i = 0; i < items.length;) {
|
|
16
16
|
if (i + 3 >= items.length)
|
|
17
17
|
throw new Error("Invalid value for FilterItem: " + item);
|
|
18
|
-
let
|
|
19
|
-
let
|
|
20
|
-
let
|
|
21
|
-
let
|
|
18
|
+
let tableIndex = i;
|
|
19
|
+
let columnIndex = i + 1;
|
|
20
|
+
let notIndex = i + 2;
|
|
21
|
+
let operatorIndex = i + 3;
|
|
22
|
+
let valueIndex = i + 4;
|
|
23
|
+
let table = items[tableIndex];
|
|
22
24
|
let column = items[columnIndex];
|
|
23
25
|
let not = items[notIndex] != "0";
|
|
24
26
|
if (items[notIndex] != "0" && items[notIndex] != "1")
|
|
@@ -29,13 +31,14 @@ class FilterItem {
|
|
|
29
31
|
let value = items[valueIndex + j].replace(/\\;/gm, ";");
|
|
30
32
|
values.push(value);
|
|
31
33
|
}
|
|
32
|
-
ans.push(new FilterItem(column, not, operator, ...values));
|
|
34
|
+
ans.push(new FilterItem({ name: table, text: table }, { name: column, text: column }, not, operator, ...values));
|
|
33
35
|
i += 3 + operator.count;
|
|
34
36
|
}
|
|
35
37
|
}
|
|
36
38
|
return ans;
|
|
37
39
|
}
|
|
38
|
-
constructor(column, not, operator, ...values) {
|
|
40
|
+
constructor(table, column, not, operator, ...values) {
|
|
41
|
+
this.table = table;
|
|
39
42
|
this.column = column;
|
|
40
43
|
this.not = not;
|
|
41
44
|
this.operator = operator;
|
|
@@ -47,7 +50,7 @@ class FilterItem {
|
|
|
47
50
|
return [this.column, this.not ? "1" : "0", this.operator.name, ...this.values.map(x => x.replace(/;/gm, "\\;"))].join(";");
|
|
48
51
|
}
|
|
49
52
|
isAllColumns() {
|
|
50
|
-
return this.column === "*";
|
|
53
|
+
return this.column.name === "*";
|
|
51
54
|
}
|
|
52
55
|
toString() {
|
|
53
56
|
let ans = [];
|
package/dist/FilterItem.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterItem.js","sourceRoot":"","sources":["../src/FilterItem.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAE1D,MAAa,UAAU;
|
|
1
|
+
{"version":3,"file":"FilterItem.js","sourceRoot":"","sources":["../src/FilterItem.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/FilterItem.ts
CHANGED
|
@@ -2,7 +2,14 @@ import { FilterItemOperator } from "./FilterItemOperator";
|
|
|
2
2
|
|
|
3
3
|
export class FilterItem
|
|
4
4
|
{
|
|
5
|
-
public
|
|
5
|
+
public table: {
|
|
6
|
+
name: string;
|
|
7
|
+
text: string;
|
|
8
|
+
};
|
|
9
|
+
public column: {
|
|
10
|
+
name: string;
|
|
11
|
+
text: string;
|
|
12
|
+
};
|
|
6
13
|
public not: boolean;
|
|
7
14
|
public operator: FilterItemOperator;
|
|
8
15
|
public values: string[];
|
|
@@ -22,10 +29,12 @@ export class FilterItem
|
|
|
22
29
|
{
|
|
23
30
|
if (i + 3 >= items.length)
|
|
24
31
|
throw new Error("Invalid value for FilterItem: " + item);
|
|
25
|
-
let
|
|
26
|
-
let
|
|
27
|
-
let
|
|
28
|
-
let
|
|
32
|
+
let tableIndex = i;
|
|
33
|
+
let columnIndex = i + 1;
|
|
34
|
+
let notIndex = i + 2;
|
|
35
|
+
let operatorIndex = i + 3;
|
|
36
|
+
let valueIndex = i + 4;
|
|
37
|
+
let table = items[tableIndex];
|
|
29
38
|
let column = items[columnIndex];
|
|
30
39
|
let not = items[notIndex] != "0";
|
|
31
40
|
if (items[notIndex] != "0" && items[notIndex] != "1")
|
|
@@ -37,14 +46,15 @@ export class FilterItem
|
|
|
37
46
|
let value = items[valueIndex + j].replace(/\\;/gm, ";");
|
|
38
47
|
values.push(value);
|
|
39
48
|
}
|
|
40
|
-
ans.push(new FilterItem(column, not, operator, ...values));
|
|
49
|
+
ans.push(new FilterItem({ name: table, text: table }, { name: column, text: column }, not, operator, ...values));
|
|
41
50
|
i += 3 + operator.count;
|
|
42
51
|
}
|
|
43
52
|
}
|
|
44
53
|
return ans;
|
|
45
54
|
}
|
|
46
|
-
constructor(column: string, not: boolean, operator: FilterItemOperator, ...values: string[])
|
|
55
|
+
constructor(table: { name: string; text: string }, column: { name: string; text: string }, not: boolean, operator: FilterItemOperator, ...values: string[])
|
|
47
56
|
{
|
|
57
|
+
this.table = table;
|
|
48
58
|
this.column = column;
|
|
49
59
|
this.not = not;
|
|
50
60
|
this.operator = operator;
|
|
@@ -58,7 +68,7 @@ export class FilterItem
|
|
|
58
68
|
}
|
|
59
69
|
isAllColumns()
|
|
60
70
|
{
|
|
61
|
-
return this.column === "*";
|
|
71
|
+
return this.column.name === "*";
|
|
62
72
|
}
|
|
63
73
|
toString()
|
|
64
74
|
{
|