rez_core 7.1.85 → 7.1.86
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/module/entity/data/filter/service/helpers/flatjson.helper.js +24 -10
- package/dist/module/entity/data/filter/service/helpers/flatjson.helper.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/entity/data/filter/service/helpers/flatjson.helper.ts +26 -12
|
@@ -200,16 +200,30 @@ function buildFlatJsonSelectCondition(jsonColumn, attr, op, val, key) {
|
|
|
200
200
|
switch (op) {
|
|
201
201
|
case 'equal':
|
|
202
202
|
case 'contains':
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
203
|
+
if (arr.length > 1) {
|
|
204
|
+
return {
|
|
205
|
+
query: `(
|
|
206
|
+
e.${jsonColumn}->>'${attr}' IN (:...${key}_str_arr)
|
|
207
|
+
OR (e.${jsonColumn}->'${attr}')::jsonb ?| :${key}_jsonb_arr
|
|
208
|
+
)`,
|
|
209
|
+
params: {
|
|
210
|
+
[`${key}_str_arr`]: arr,
|
|
211
|
+
[`${key}_jsonb_arr`]: arr
|
|
212
|
+
},
|
|
213
|
+
};
|
|
214
|
+
}
|
|
215
|
+
else {
|
|
216
|
+
return {
|
|
217
|
+
query: `(
|
|
218
|
+
e.${jsonColumn}->>'${attr}' = :${key}_str
|
|
219
|
+
OR (e.${jsonColumn}->'${attr}')::jsonb @> :${key}_arr::jsonb
|
|
220
|
+
)`,
|
|
221
|
+
params: {
|
|
222
|
+
[`${key}_str`]: arr[0],
|
|
223
|
+
[`${key}_arr`]: JSON.stringify([arr[0]])
|
|
224
|
+
},
|
|
225
|
+
};
|
|
226
|
+
}
|
|
213
227
|
case 'not_equal':
|
|
214
228
|
case 'not_contains':
|
|
215
229
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flatjson.helper.js","sourceRoot":"","sources":["../../../../../../../src/module/entity/data/filter/service/helpers/flatjson.helper.ts"],"names":[],"mappings":";;AAiBA,sDASC;AAMD,wDAwCC;AAKD,gEAoCC;AAKD,oEAqDC;AAMD,gEAmEC;AAMD,
|
|
1
|
+
{"version":3,"file":"flatjson.helper.js","sourceRoot":"","sources":["../../../../../../../src/module/entity/data/filter/service/helpers/flatjson.helper.ts"],"names":[],"mappings":"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"}
|