Merge pull request #937 from SuanmoSuanyangTechnology/feature/if_else_zy
Feature/if else zy
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
* @Author: ZhaoYing
|
* @Author: ZhaoYing
|
||||||
* @Date: 2026-02-09 18:24:53
|
* @Date: 2026-02-09 18:24:53
|
||||||
* @Last Modified by: ZhaoYing
|
* @Last Modified by: ZhaoYing
|
||||||
* @Last Modified time: 2026-04-17 19:58:13
|
* @Last Modified time: 2026-04-17 20:47:49
|
||||||
*/
|
*/
|
||||||
import { useEffect, useMemo, type FC } from 'react'
|
import { useEffect, useMemo, type FC } from 'react'
|
||||||
import clsx from 'clsx'
|
import clsx from 'clsx'
|
||||||
@@ -22,8 +22,8 @@ import { typeOptions } from '../ListOperator/FilterConditions'
|
|||||||
interface SubCondition {
|
interface SubCondition {
|
||||||
key: string;
|
key: string;
|
||||||
operator: string;
|
operator: string;
|
||||||
value: string | number;
|
value?: string | number;
|
||||||
var_type: string;
|
input_type?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface SubVariableCondition {
|
interface SubVariableCondition {
|
||||||
@@ -32,8 +32,8 @@ interface SubVariableCondition {
|
|||||||
}
|
}
|
||||||
|
|
||||||
interface Expression {
|
interface Expression {
|
||||||
left: string;
|
left?: string;
|
||||||
operator: string;
|
operator?: string;
|
||||||
right?: string | number;
|
right?: string | number;
|
||||||
input_type?: string;
|
input_type?: string;
|
||||||
sub_variable_condition?: SubVariableCondition;
|
sub_variable_condition?: SubVariableCondition;
|
||||||
@@ -303,7 +303,7 @@ const ArrayFileSubConditions: FC<ArrayFileSubConditionsProps> = ({ conditionFiel
|
|||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
<Button
|
<Button
|
||||||
onClick={() => { addSub({ key: undefined, operator: undefined, value: undefined, var_type: undefined }); }}
|
onClick={() => { addSub({ key: undefined, operator: undefined, value: undefined, input_type: undefined }); }}
|
||||||
className="rb:py-0! rb:px-1! rb:h-4.5! rb:rounded-sm! rb:text-[12px]!"
|
className="rb:py-0! rb:px-1! rb:h-4.5! rb:rounded-sm! rb:text-[12px]!"
|
||||||
size="small"
|
size="small"
|
||||||
>
|
>
|
||||||
|
|||||||
Reference in New Issue
Block a user