|
|
|
@ -275,7 +275,7 @@ const parseConditionV2 = async (
|
|
|
|
|
return (_qb) => {}; |
|
|
|
|
} else if (column.uidt === UITypes.Lookup) { |
|
|
|
|
return await generateLookupCondition(column, filter, knex, aliasCount); |
|
|
|
|
} else if (column.uidt === UITypes.Rollup && !customWhereClause) { |
|
|
|
|
} else if ([UITypes.Rollup,UITypes.Links].includes(column.uidt ) && !customWhereClause) { |
|
|
|
|
const builder = ( |
|
|
|
|
await genRollupSelectv2({ |
|
|
|
|
knex, |
|
|
|
@ -416,6 +416,7 @@ const parseConditionV2 = async (
|
|
|
|
|
UITypes.Decimal, |
|
|
|
|
UITypes.Rating, |
|
|
|
|
UITypes.Rollup, |
|
|
|
|
UITypes.Links, |
|
|
|
|
].includes(column.uidt) |
|
|
|
|
) { |
|
|
|
|
qb = qb.where(field, val); |
|
|
|
@ -442,6 +443,7 @@ const parseConditionV2 = async (
|
|
|
|
|
UITypes.Number, |
|
|
|
|
UITypes.Decimal, |
|
|
|
|
UITypes.Rollup, |
|
|
|
|
UITypes.Links, |
|
|
|
|
].includes(column.uidt) |
|
|
|
|
) { |
|
|
|
|
qb = qb.where((nestedQb) => { |
|
|
|
|