@nmxjs/app 1.0.67 → 1.0.68
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/CrudService.js +12 -9
- package/dist/CrudService.js.map +1 -1
- package/package.json +2 -2
- package/types.d.ts +1 -1
package/dist/CrudService.js
CHANGED
|
@@ -87,28 +87,31 @@ class CrudService {
|
|
|
87
87
|
const findOptions = Object.assign(Object.assign({}, options), { order: options.order || {}, where: options.where || {}, take: limit, skip: Math.round((page - 1) * limit) });
|
|
88
88
|
let where = filters.reduce((res, v) => {
|
|
89
89
|
const field = (0, utils_1.camelToSnakeCase)(v.field);
|
|
90
|
+
const value = JSON.parse(v.value);
|
|
90
91
|
if (v.operator === types_1.FilterOperatorEnum.EQ) {
|
|
91
|
-
res[field] =
|
|
92
|
+
res[field] = value;
|
|
92
93
|
}
|
|
93
94
|
else if (v.operator === types_1.FilterOperatorEnum.IN) {
|
|
94
|
-
res[field] = (0, typeorm_1.In)(
|
|
95
|
+
res[field] = (0, typeorm_1.In)(value);
|
|
95
96
|
}
|
|
96
97
|
else if (v.operator === types_1.FilterOperatorEnum.LESS) {
|
|
97
|
-
res[field] = (0, typeorm_1.LessThan)(
|
|
98
|
+
res[field] = (0, typeorm_1.LessThan)(value);
|
|
98
99
|
}
|
|
99
100
|
else if (v.operator === types_1.FilterOperatorEnum.LESS_OR_EQ) {
|
|
100
|
-
res[field] = (0, typeorm_1.LessThanOrEqual)(
|
|
101
|
+
res[field] = (0, typeorm_1.LessThanOrEqual)(value);
|
|
101
102
|
}
|
|
102
103
|
else if (v.operator === types_1.FilterOperatorEnum.MORE) {
|
|
103
|
-
res[field] = (0, typeorm_1.MoreThan)(
|
|
104
|
+
res[field] = (0, typeorm_1.MoreThan)(value);
|
|
104
105
|
}
|
|
105
106
|
else if (v.operator === types_1.FilterOperatorEnum.MORE_OR_EQ) {
|
|
106
|
-
res[field] = (0, typeorm_1.MoreThanOrEqual)(
|
|
107
|
+
res[field] = (0, typeorm_1.MoreThanOrEqual)(value);
|
|
107
108
|
}
|
|
108
|
-
else if (v.operator === types_1.FilterOperatorEnum.
|
|
109
|
-
res[field] = (0, typeorm_1.
|
|
109
|
+
else if (v.operator === types_1.FilterOperatorEnum.SEARCH) {
|
|
110
|
+
res[field] = (0, typeorm_1.Raw)(alias => `LOWER(${alias})${v.not ? 'NOT' : ''} LIKE :value`, {
|
|
111
|
+
value: `${value}%`.toLowerCase(),
|
|
112
|
+
});
|
|
110
113
|
}
|
|
111
|
-
if (v.not) {
|
|
114
|
+
if (v.not && v.operator !== types_1.FilterOperatorEnum.SEARCH) {
|
|
112
115
|
res[field] = (0, typeorm_1.Not)(res[v.field]);
|
|
113
116
|
}
|
|
114
117
|
return res;
|
package/dist/CrudService.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CrudService.js","sourceRoot":"","sources":["../src/CrudService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,wCAAgE;AAChE,wCAAmE;AACnE,
|
|
1
|
+
{"version":3,"file":"CrudService.js","sourceRoot":"","sources":["../src/CrudService.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nmxjs/app",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.68",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -50,6 +50,6 @@
|
|
|
50
50
|
"@nmxjs/api": "^1.1.16",
|
|
51
51
|
"@nmxjs/config": "^1.0.8",
|
|
52
52
|
"@nmxjs/events": "^1.0.9",
|
|
53
|
-
"@nmxjs/types": "^1.0.
|
|
53
|
+
"@nmxjs/types": "^1.0.15"
|
|
54
54
|
}
|
|
55
55
|
}
|