condition

Author: xlorne

frontend/packages/flow-pc/flow-pc-design/src/components/script/components/condition/components/condition-relation/group.tsx

@@ -1,6 +1,6 @@
 import {Dropdown, Tag} from "antd";
 import React from "react";
-import {ConditionRelationProps, LogicalRelation} from "@/components/script/components/condition/typings";
+import {ConditionRelationProps} from "@/components/script/components/condition/typings";
 import {
     useDropdownMenus
 } from "@/components/script/components/condition/components/condition-relation/hooks/use-dropdown-menus";
@@ -9,17 +9,6 @@ import {RelationRender} from "@/components/script/components/condition/component
 export const RelationGroup: React.FC<ConditionRelationProps> = (props) => {
     const items = useDropdownMenus(props);
 
-    const relations = React.useMemo(() => {
-        const list: LogicalRelation[] = [];
-        if (props.current.children) {
-            list.push(...props.current.children);
-        }
-        list.push({
-            type: 'action'
-        })
-        return list;
-    }, [props.current.children]);
-
     return (
         <>
             <Dropdown
@@ -30,7 +19,7 @@ export const RelationGroup: React.FC<ConditionRelationProps> = (props) => {
                     }}
                 >（</Tag>
             </Dropdown>
-            {RelationRender.getInstance().renderList(relations)}
+            {RelationRender.getInstance().renderList(props.current.children || [])}
             <Dropdown
                 menu={{items}}>
                 <Tag

frontend/packages/flow-pc/flow-pc-design/src/components/script/components/condition/components/condition-relation/hooks/menu-relation.tsx

@@ -45,10 +45,23 @@ export class MenuRelation {
                     this.menuList.push(this.createCondition());
                 }
             }
-            return;
         }
 
-        this.menuList.push(this.createRemove());
+        if(currentType==='and' || currentType==='or') {
+            this.menuList.push(this.createGroup());
+            if (this.groups.length > 0) {
+                this.menuList.push(this.createCondition());
+            }
+        }
+
+        if(currentType==='group' || currentType==='condition') {
+            this.menuList.push(this.createAnd());
+            this.menuList.push(this.createOr());
+        }
+
+        if(this.current.id) {
+            this.menuList.push(this.createRemove());
+        }
     }
 
 
@@ -127,7 +140,12 @@ export class MenuRelation {
                     type: 'group',
                     id: IdUtils.generateId(),
                     label: '括号',
-                    children: []
+                    children: [
+                        {
+                            id: IdUtils.generateId(),
+                            type: 'action'
+                        }
+                    ]
                 });
             }
         }

frontend/packages/flow-pc/flow-pc-design/src/components/script/components/condition/presenters/relation-presenter.ts

@@ -15,7 +15,7 @@ export class ConditionRelationPresenter {
         this.presenter.updateState(prevState => {
             return {
                 ...prevState,
-                relations: [...this.removeRelations(id,prevState.relations)]
+                relations: [...this.removeRelations(id, prevState.relations)]
             }
         })
     }
@@ -70,10 +70,13 @@ export class ConditionRelationPresenter {
             if (relation.children) {
                 current = {
                     ...relation,
-                    children:this.appendRelations(sourceId, relation.children, target)
+                    children: this.appendRelations(sourceId, relation.children, target)
                 }
             }
-            list.push(current);
+            if (current.type !== 'action') {
+                list.push(current);
+            }
+
             if (relation.id === sourceId) {
                 list.push(target);
             }