namirasoft-core 1.3.58 → 1.3.60
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.js +2 -2
- package/dist/FilterItem.js.map +1 -1
- package/package.json +1 -1
- package/src/FilterItem.ts +2 -2
package/dist/FilterItem.js
CHANGED
|
@@ -8,7 +8,7 @@ const FilterItemOperator_1 = require("./FilterItemOperator");
|
|
|
8
8
|
class FilterItem {
|
|
9
9
|
static stringify(filters) {
|
|
10
10
|
if (filters)
|
|
11
|
-
return filters.map(x => x.getCommand()).join("
|
|
11
|
+
return filters.map(x => x.getCommand()).join("");
|
|
12
12
|
return "";
|
|
13
13
|
}
|
|
14
14
|
static parse(item) {
|
|
@@ -50,7 +50,7 @@ class FilterItem {
|
|
|
50
50
|
throw new Error(`Invalid count of values: ${this.values.length}. ${operator.count} is required.`);
|
|
51
51
|
}
|
|
52
52
|
getCommand() {
|
|
53
|
-
return [this.column, this.not ? "1" : "0", this.operator.name, ...this.values.map(x => x.replace(/;/gm, "\\;"))].join(";");
|
|
53
|
+
return [this.table.name, this.column.name, this.not ? "1" : "0", this.operator.name, ...this.values.map(x => x.replace(/;/gm, "\\;"))].join(";");
|
|
54
54
|
}
|
|
55
55
|
isAllColumns() {
|
|
56
56
|
return this.column.name === "*";
|
package/dist/FilterItem.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterItem.js","sourceRoot":"","sources":["../src/FilterItem.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAClD,mDAAgD;AAChD,qDAAkD;AAClD,6DAA0D;AAE1D,MAAa,UAAU;IAOZ,MAAM,CAAC,SAAS,CAAC,OAA4B;QAEhD,IAAI,OAAO;YACP,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,
|
|
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
|
@@ -13,7 +13,7 @@ export class FilterItem
|
|
|
13
13
|
public static stringify(filters: FilterItem[] | null): string
|
|
14
14
|
{
|
|
15
15
|
if (filters)
|
|
16
|
-
return filters.map(x => x.getCommand()).join("
|
|
16
|
+
return filters.map(x => x.getCommand()).join("");
|
|
17
17
|
return "";
|
|
18
18
|
}
|
|
19
19
|
public static parse(item: string | null): FilterItem[]
|
|
@@ -61,7 +61,7 @@ export class FilterItem
|
|
|
61
61
|
}
|
|
62
62
|
getCommand()
|
|
63
63
|
{
|
|
64
|
-
return [this.column, this.not ? "1" : "0", this.operator.name, ...this.values.map(x => x.replace(/;/gm, "\\;"))].join(";");
|
|
64
|
+
return [this.table.name, this.column.name, this.not ? "1" : "0", this.operator.name, ...this.values.map(x => x.replace(/;/gm, "\\;"))].join(";");
|
|
65
65
|
}
|
|
66
66
|
isAllColumns()
|
|
67
67
|
{
|