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

judgeValueRelation方法中$ne添加return

This commit is contained in:
lxy 2024-07-18 18:43:59 +08:00
parent 96fcf6dd4d
commit 0ce78747b4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/store/filter.js
View File

@ -645,6 +645,7 @@ function judgeValueRelation(value1, value2, contained) {
else if (r) { else if (r) {
return false; return false;
} }
return;
} }
// 互斥 // 互斥
if (r) { if (r) {

9
src/store/filter.ts
View File

@ -18,9 +18,9 @@ export function translateCreateDataToFilter<ED extends EntityDict & BaseEntityDi
if (rel === 1) { if (rel === 1) {
// 只需要记住id和各种外键属性，不这样处理有些古怪的属性比如coordinate，其作为createdata和作为filter并不同构 // 只需要记住id和各种外键属性，不这样处理有些古怪的属性比如coordinate，其作为createdata和作为filter并不同构
if (![ if (![
'geometry', 'geometry',
'geography', 'geography',
'st_geometry', 'st_geometry',
'st_point', 'st_point',
'function', 'function',
'sequence', 'sequence',
@ -743,6 +743,7 @@ export function judgeValueRelation(value1: any, value2: any, contained: boolean)
else if (r) { else if (r) {
return false; return false;
} }
return;
} }
// 互斥 // 互斥
if (r) { if (r) {
@ -1855,7 +1856,7 @@ export function checkFilterContains<ED extends EntityDict & BaseEntityDict, T ex
filter?: ED[T]['Selection']['filter'], filter?: ED[T]['Selection']['filter'],
dataCompare?: true, dataCompare?: true,
warningOnDataCompare?: true): boolean | Promise<boolean> { warningOnDataCompare?: true): boolean | Promise<boolean> {
assert(filter); assert(filter);
const schema = context.getSchema(); const schema = context.getSchema();