mirror of
https://gitee.com/nocobase/nocobase.git
synced 2025-05-05 05:29:26 +08:00
fix: issue with time field as condition in linkage rules (#6738)
This commit is contained in:
parent
b979e8b71a
commit
3049f35490
@ -145,15 +145,7 @@ const processCondition = async (
|
|||||||
const processAdvancedCondition = async (condition, variables, localVariables, jsonLogic) => {
|
const processAdvancedCondition = async (condition, variables, localVariables, jsonLogic) => {
|
||||||
const operator = condition.op;
|
const operator = condition.op;
|
||||||
const rightValue = await parseVariableValue(condition.rightVar, variables, localVariables);
|
const rightValue = await parseVariableValue(condition.rightVar, variables, localVariables);
|
||||||
let leftValue = await parseVariableValue(condition.leftVar, variables, localVariables);
|
const leftValue = await parseVariableValue(condition.leftVar, variables, localVariables);
|
||||||
const leftCollectionField = await variables.getCollectionField(condition.leftVar, localVariables);
|
|
||||||
if (
|
|
||||||
leftValue &&
|
|
||||||
['datetime', 'date', 'datetimeNoTz', 'dateOnly', 'unixTimestamp'].includes(leftCollectionField.type)
|
|
||||||
) {
|
|
||||||
const format = getFormatFromDateStr(rightValue);
|
|
||||||
leftValue = dayjs.utc(leftValue).local().format(format);
|
|
||||||
}
|
|
||||||
if (operator) {
|
if (operator) {
|
||||||
return jsonLogic.apply({ [operator]: [leftValue, rightValue] });
|
return jsonLogic.apply({ [operator]: [leftValue, rightValue] });
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user