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

一个小笔误

This commit is contained in:
Xu Chang 2023-08-09 19:14:00 +08:00
parent 8bc0f3af4e
commit 5358ba9ce0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/store/filter.js
View File

@ -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) {

6
src/store/filter.ts
View File

@ -121,7 +121,7 @@ function addFilterSegment<ED extends EntityDict & BaseEntityDict, T extends keyo
for (const attr in oneToManyFilters) {
const filters2 = oneToManyFilters[attr].map(ele => 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<ED extends EntityDict & BaseEntityDict, T extends ke
* @param attr
* @param justTry
*/
const tryMergeAttribute = (f1: NonNullable<ED[T]['Selection']['filter']>, f2: NonNullable<ED[T]['Selection']['filter']>, attr: string, justTry?: boolean) => {
const tryMergeAttributeValue = (f1: NonNullable<ED[T]['Selection']['filter']>, f2: NonNullable<ED[T]['Selection']['filter']>, 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<ED extends EntityDict & BaseEntityDict, T extends ke
// 原生属性
const rel = 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) {