Commit b9b383d0382447c694413dd130b14c47ce13bc23
Merge branch 'fix/rule-chain' into 'main_dev'
fix: 修复规则链事件面板不显示 See merge request yunteng/thingskit-front!1358
Showing
2 changed files
with
7 additions
and
3 deletions
| @@ -63,7 +63,7 @@ export function transformToRuleChain( | @@ -63,7 +63,7 @@ export function transformToRuleChain( | ||
| 63 | 63 | ||
| 64 | nodesRef = [...nodesRef, ...(outputNode as GraphNode[])]; | 64 | nodesRef = [...nodesRef, ...(outputNode as GraphNode[])]; | 
| 65 | 65 | ||
| 66 | - const { connections, nodes } = combineData(nodesRef, edgesRef, true); | 66 | + const { connections, nodes } = combineData(nodesRef, edgesRef); | 
| 67 | 67 | ||
| 68 | const { firstNode } = validateCanCreateRuleChain(nodesRef, edgesRef); | 68 | const { firstNode } = validateCanCreateRuleChain(nodesRef, edgesRef); | 
| 69 | 69 | ||
| @@ -223,7 +223,11 @@ export function useContextMenuAction() { | @@ -223,7 +223,11 @@ export function useContextMenuAction() { | ||
| 223 | } | 223 | } | 
| 224 | } | 224 | } | 
| 225 | 225 | ||
| 226 | - return getAddNodesParams({ x: newX, y: newY }, { ...data, created: false }, { id: newId }); | 226 | + return getAddNodesParams( | 
| 227 | + { x: newX, y: newY }, | ||
| 228 | + { ...data, created: false, isSaved: false }, | ||
| 229 | + { id: newId } | ||
| 230 | + ); | ||
| 227 | }); | 231 | }); | 
| 228 | 232 | ||
| 229 | flowActionType?.addNodes(newNode); | 233 | flowActionType?.addNodes(newNode); | 
| @@ -115,7 +115,7 @@ | @@ -115,7 +115,7 @@ | ||
| 115 | </Spin> | 115 | </Spin> | 
| 116 | </Tabs.TabPane> | 116 | </Tabs.TabPane> | 
| 117 | <Tabs.TabPane | 117 | <Tabs.TabPane | 
| 118 | - v-if="!nodeData?.created" | 118 | + v-if="nodeData?.created" | 
| 119 | :tab="TabsPanelNameEnum[TabsPanelEnum.EVENT]" | 119 | :tab="TabsPanelNameEnum[TabsPanelEnum.EVENT]" | 
| 120 | :key="TabsPanelEnum.EVENT" | 120 | :key="TabsPanelEnum.EVENT" | 
| 121 | > | 121 | > |