Merge branch 'fix/DEFECT-1956' into 'main_dev'

fix: 修复规则链复制节点无法保存

See merge request yunteng/thingskit-front!1314

@@ -206,7 +206,7 @@ export function useBasicDataTransform() {
     return connections;
     return connections;
   }
   }
 
 
-  function getNodes(nodesRef: Ref<GraphNode[]> | GraphNode[], removeId: boolean) {
+  function getNodes(nodesRef: Ref<GraphNode[]> | GraphNode[]) {
     const nodes: BasicNodeBindData[] = [];
     const nodes: BasicNodeBindData[] = [];
 
 
     let offsetX = 0;
     let offsetX = 0;
@@ -217,10 +217,9 @@ export function useBasicDataTransform() {
       if (ignoreNodeKeys.includes(nodeData.config?.key as string)) continue;
       if (ignoreNodeKeys.includes(nodeData.config?.key as string)) continue;
 
 
       const data = nodeData.data;
       const data = nodeData.data;
-
       const resultNode = Object.assign(
       const resultNode = Object.assign(
         mergeData(data, nodeData, node),
         mergeData(data, nodeData, node),
-        !nodeData.created || !removeId
+        nodeData.created
           ? ({
           ? ({
               id: { id: node.id, entityType: RuleChainEntityType.RULE_NODE },
               id: { id: node.id, entityType: RuleChainEntityType.RULE_NODE },
             } as BasicNodeBindData)
             } as BasicNodeBindData)
@@ -264,8 +263,7 @@ export function useBasicDataTransform() {
 
 
   function combineData(
   function combineData(
     nodesRef: Ref<GraphNode[]> | GraphNode[] = [],
     nodesRef: Ref<GraphNode[]> | GraphNode[] = [],
-    edgesRef: Ref<GraphEdge[]> | GraphEdge[] = [],
-    removeId = false
+    edgesRef: Ref<GraphEdge[]> | GraphEdge[] = []
   ) {
   ) {
     const extraIgnoreNodeRef = unref(nodesRef).filter(
     const extraIgnoreNodeRef = unref(nodesRef).filter(
       (item) => !ignoreNodeKeys.includes((item.data as NodeData).config?.key as string)
       (item) => !ignoreNodeKeys.includes((item.data as NodeData).config?.key as string)
@@ -273,7 +271,7 @@ export function useBasicDataTransform() {
 
 
     const connections = getConnections(extraIgnoreNodeRef, edgesRef);
     const connections = getConnections(extraIgnoreNodeRef, edgesRef);
 
 
-    const nodes = getNodes(extraIgnoreNodeRef, removeId);
+    const nodes = getNodes(extraIgnoreNodeRef);
 
 
     const firstNodeIndex = getFirsetNodeIndex(extraIgnoreNodeRef, edgesRef);
     const firstNodeIndex = getFirsetNodeIndex(extraIgnoreNodeRef, edgesRef);
 
 

@@ -120,7 +120,6 @@ export function useSaveAndRedo() {
         ? await getImportMetadata()
         ? await getImportMetadata()
         : await getRuleChainData(unref(getRuleChainId));
         : await getRuleChainData(unref(getRuleChainId));
       if (!data) return;
       if (!data) return;
-
       const elements = parseRuleChain(data);
       const elements = parseRuleChain(data);
 
 
       flowActionType.setElements(elements);
       flowActionType.setElements(elements);