diff --git a/lib/store/filter.js b/lib/store/filter.js index e14406b..95d9ff0 100644 --- a/lib/store/filter.js +++ b/lib/store/filter.js @@ -112,7 +112,7 @@ function addFilterSegment(entity, schema) { var _loop_1 = function (attr) { var _a; var filters2 = oneToManyFilters[attr].map(function (ele) { return ele[1]; }); - var sqpOps = filters2.map(function (ele) { return ele['#sqp'] || '$in'; }); + var sqpOps = filters2.map(function (ele) { return ele['#sqp'] || 'in'; }); // 只有全部是同一个子查询算子才能实施合并 if ((0, lodash_1.uniq)(sqpOps).length > 1) { filters2.forEach(function (ele) { @@ -210,7 +210,7 @@ function unionFilterSegment(entity, schema) { * @param attr * @param justTry */ - var tryMergeAttribute = function (f1, f2, attr, justTry) { + var tryMergeAttributeValue = function (f1, f2, attr, justTry) { var _a, _b, _c, _d; var op1 = typeof f1[attr] === 'object' && Object.keys(f1[attr])[0]; var op2 = typeof f2[attr] === 'object' && Object.keys(f2[attr])[0]; @@ -438,7 +438,7 @@ function unionFilterSegment(entity, schema) { // 原生属性 var rel = (0, relation_1.judgeRelation)(schema, entity, pca1); if (rel === 1) { - return tryMergeAttribute(f1, f2, pca1, justTry); + return tryMergeAttributeValue(f1, f2, pca1, justTry); } else if (rel === 2) { if (justTry) { diff --git a/src/store/filter.ts b/src/store/filter.ts index 146780d..a0755b5 100644 --- a/src/store/filter.ts +++ b/src/store/filter.ts @@ -121,7 +121,7 @@ function addFilterSegment ele[1]); - const sqpOps = filters2.map(ele => ele['#sqp'] || '$in'); + const sqpOps = filters2.map(ele => ele['#sqp'] || 'in'); // 只有全部是同一个子查询算子才能实施合并 if (uniq(sqpOps).length > 1) { filters2.forEach( @@ -202,7 +202,7 @@ function unionFilterSegment, f2: NonNullable, attr: string, justTry?: boolean) => { + const tryMergeAttributeValue = (f1: NonNullable, f2: NonNullable, attr: string, justTry?: boolean) => { const op1 = typeof f1[attr] === 'object' && Object.keys(f1[attr])[0]; const op2 = typeof f2[attr] === 'object' && Object.keys(f2[attr])[0]; @@ -363,7 +363,7 @@ function unionFilterSegment