Oak-Team
/
oak-domain
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 33 Wiki Activity

filter在合并时，对or的原先处理是不对的

This commit is contained in:
Xu Chang 2023-02-23 12:43:15 +08:00
parent 460c9e8946
commit ba302e7074
2 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/store/filter.js
View File

@ -13,7 +13,7 @@ function addFilterSegment() {
}
var filter = {};
filters.forEach(function (ele) {
var _a, _b, _c, _d;
var _a, _b, _c;
if (ele) {
for (var k in ele) {
if (k === '$and') {
@ -24,25 +24,17 @@ function addFilterSegment() {
filter.$and = ele[k];
}
}
else if (k === '$or') {
if (filter.$or) {
(_b = filter.$or).push.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(ele[k]), false));
}
else {
filter.$or = ele[k];
}
}
else if (filter.hasOwnProperty(k)) {
if (filter.$and) {
filter.$and.push((_c = {},
_c[k] = ele[k],
_c));
filter.$and.push((_b = {},
_b[k] = ele[k],
_b));
}
else {
filter.$and = [
(_d = {},
_d[k] = ele[k],
_d)
(_c = {},
_c[k] = ele[k],
_c)
];
}
}

8
src/store/filter.ts
View File

@ -19,14 +19,6 @@ export function addFilterSegment<ED extends EntityDict, T extends keyof ED>(...f
filter.$and = ele[k];
}
}
else if (k === '$or') {
if (filter.$or) {
filter.$or.push(...(ele[k] as any));
}
else {
filter.$or = ele[k];
}
}
else if (filter.hasOwnProperty(k)) {
if (filter.$and) {
filter.$and.push({