Merge branch 'fix/rule-chain-new-node-saved' into 'main_dev'

fix: 修复规则链新节点保存后无法显示事件面板

See merge request yunteng/thingskit-front!1043

@@ -128,7 +128,7 @@ export function useBasicDataTransform() {
           description,
           description,
           name,
           name,
         },
         },
-        created: !!id?.id,
+        created: !id?.id,
       },
       },
       {
       {
         id: id?.id || buildUUID(),
         id: id?.id || buildUUID(),
@@ -220,7 +220,7 @@ export function useBasicDataTransform() {
 
 
       const resultNode = Object.assign(
       const resultNode = Object.assign(
         mergeData(data, nodeData, node),
         mergeData(data, nodeData, node),
-        nodeData.created && !removeId
+        !nodeData.created || !removeId
           ? ({
           ? ({
               id: { id: node.id, entityType: RuleChainEntityType.RULE_NODE },
               id: { id: node.id, entityType: RuleChainEntityType.RULE_NODE },
             } as BasicNodeBindData)
             } as BasicNodeBindData)

@@ -36,7 +36,7 @@ export function useDragCreate(options: UseDragCreateOptionsType) {
       y: event.clientY - flowBounds.top - offsetY,
       y: event.clientY - flowBounds.top - offsetY,
     });
     });
 
 
-    const newNode = getAddNodesParams(position, { ...toRaw(unref(nodeData)), data });
+    const newNode = getAddNodesParams(position, { ...toRaw(unref(nodeData)), data, created: true });
     addNodes(newNode);
     addNodes(newNode);
 
 
     triggerChange();
     triggerChange();

@@ -50,10 +50,11 @@ export function useSaveAndRedo() {
 
 
     const { connections, nodes, firstNodeIndex } = combineData(
     const { connections, nodes, firstNodeIndex } = combineData(
       flowActionType.getNodes,
       flowActionType.getNodes,
-      flowActionType.getEdges
+      flowActionType.getEdges,
+      true
     );
     );
 
 
-    handleSaveRuleChain(connections, nodes, firstNodeIndex);
+    handleSaveRuleChain(connections, nodes, firstNodeIndex, flowActionType);
   };
   };
 
 
   const handleRedoChange = (flowActionType: VueFlowStore) => {
   const handleRedoChange = (flowActionType: VueFlowStore) => {
@@ -71,7 +72,8 @@ export function useSaveAndRedo() {
   async function handleSaveRuleChain(
   async function handleSaveRuleChain(
     connections: ConnectionItemType[],
     connections: ConnectionItemType[],
     nodes: BasicNodeBindData[],
     nodes: BasicNodeBindData[],
-    firstNodeIndex?: number
+    firstNodeIndex: number | undefined = undefined,
+    flowActionType: VueFlowStore
   ) {
   ) {
     try {
     try {
       loading.value = true;
       loading.value = true;
@@ -93,7 +95,8 @@ export function useSaveAndRedo() {
         },
         },
       });
       });
 
 
-      parseRuleChain(data);
+      const elements = parseRuleChain(data);
+      flowActionType.setElements(elements);
 
 
       resetChange();
       resetChange();
 
 

@@ -3,6 +3,7 @@
   import { Spin } from 'ant-design-vue';
   import { Spin } from 'ant-design-vue';
   import { NodeItemConfigType } from '../../../types/node';
   import { NodeItemConfigType } from '../../../types/node';
   import { fetchNodeExtraContent } from '../../../packages';
   import { fetchNodeExtraContent } from '../../../packages';
+  import { NodeProps } from '@vue-flow/core';
 
 
   const props = defineProps<{
   const props = defineProps<{
     config?: NodeItemConfigType;
     config?: NodeItemConfigType;

@@ -114,7 +114,7 @@
         </Spin>
         </Spin>
       </Tabs.TabPane>
       </Tabs.TabPane>
       <Tabs.TabPane
       <Tabs.TabPane
-        v-if="nodeData?.created"
+        v-if="!nodeData?.created"
         :tab="TabsPanelNameEnum[TabsPanelEnum.EVENT]"
         :tab="TabsPanelNameEnum[TabsPanelEnum.EVENT]"
         :key="TabsPanelEnum.EVENT"
         :key="TabsPanelEnum.EVENT"
       >
       >