Merge branch 'fix/DEFECT-1956' into 'feat/account-role-manage'

fix: 修复规链复制节点保存失败

See merge request yunteng/thingskit-front!1318

@@ -128,7 +128,7 @@ export function useBasicDataTransform() {
           description,
           name,
         },
-        created: !id?.id,
+        created: !!id?.id,
       },
       {
         id: id?.id || buildUUID(),
@@ -152,6 +152,7 @@ export function useBasicDataTransform() {
       }
 
       const newNode = genNewNodeByData(node, nodeConfig);
+      newNode.data.isSaved = true;
 
       addNodes.push(newNode);
     }
@@ -217,9 +218,10 @@ export function useBasicDataTransform() {
       if (ignoreNodeKeys.includes(nodeData.config?.key as string)) continue;
 
       const data = nodeData.data;
+
       const resultNode = Object.assign(
         mergeData(data, nodeData, node),
-        nodeData.created
+        nodeData?.isSaved
           ? ({
               id: { id: node.id, entityType: RuleChainEntityType.RULE_NODE },
             } as BasicNodeBindData)

@@ -170,7 +170,7 @@ export function useContextMenuAction() {
     const { getAddNodesParams } = useAddNodes();
     const { x, y } = position;
 
-    const value = getAddNodesParams(position, data, { id });
+    const value = getAddNodesParams(position, { ...data, isSaved: false }, { id });
 
     setRuleNodeCache({
       nodes: [value],

@@ -50,8 +50,7 @@ export function useSaveAndRedo() {
 
     const { connections, nodes, firstNodeIndex } = combineData(
       flowActionType.getNodes,
-      flowActionType.getEdges,
-      true
+      flowActionType.getEdges
     );
 
     handleSaveRuleChain(connections, nodes, firstNodeIndex, flowActionType);

@@ -138,6 +138,7 @@ export interface NodeData<T = BasicNodeFormData> {
   config?: NodeItemConfigType;
   data?: T;
   created?: boolean;
+  isSaved?: boolean;
 }
 
 export interface EdgeData {