fix：fix review

Author: lichunn

packages/canvas/DesignCanvas/src/api/types.ts

@@ -22,7 +22,6 @@ export interface NodeAIStatus {
 
 export interface NodeStatus {
   [key: string]: any
-  aiStatus?: NodeAIStatus // 现在包含了所有的AI状态，包括采纳状态
 }
 
 export interface PageState {
@@ -41,6 +40,7 @@ export interface PageState {
   isLock: boolean
   isBlock: boolean
   nodesStatus: Record<string, NodeStatus>
+  aiNodesStatus: Record<string, NodeAIStatus> // AI状态独立存储，避免与nodesStatus的可见性(false)冲突
   loading: boolean
 }
 

packages/canvas/DesignCanvas/src/api/useCanvas.ts

@@ -44,6 +44,7 @@ const defaultPageState: PageState = {
   isLock: false,
   isBlock: false,
   nodesStatus: {},
+  aiNodesStatus: {},
   loading: false
 }
 
@@ -85,13 +86,9 @@ const rootSchema = ref([
   }
 ])
 
-// 初始化单个节点的AI状态
+// 初始化单个节点的AI状态（使用独立的aiNodesStatus，避免与nodesStatus可见性冲突）
 const initializeNodeAIStatus = (node: object, initialStatus: Partial<NodeAIStatus> = {}) => {
-  if (!pageState.nodesStatus[node.id]) {
-    pageState.nodesStatus[node.id] = {}
-  }
-
-  pageState.nodesStatus[node.id].aiStatus = {
+  pageState.aiNodesStatus[node.id] = {
     state: 'hidden',
     originalNodeData: deepClone(node),
     aiModifiedNodeData: undefined,
@@ -108,7 +105,7 @@ const initializeAllNodesAIStatus = () => {
   const traverseNodes = (nodes: any[]) => {
     if (!nodes) return
     nodes.forEach((node) => {
-      if (node.id && !pageState.nodesStatus[node.id]?.aiStatus) {
+      if (node.id && !pageState.aiNodesStatus[node.id]) {
         initializeNodeAIStatus(node)
       }
       if (Array.isArray(node.children) && node.children.length) {
@@ -277,7 +274,7 @@ const updatePageSchema = (newPageSchema: any) => {
 
   // 为新增的节点初始化AI状态（已存在的不覆盖）
   nodesMap.value.forEach(({ node }) => {
-    if (node.id && !pageState.nodesStatus[node.id]?.aiStatus) {
+    if (node.id && !pageState.aiNodesStatus[node.id]) {
       initializeNodeAIStatus(node)
     }
   })
@@ -507,16 +504,18 @@ const operationTypeMap = {
     if (index > -1) {
       parent.children.splice(index, 1)
       nodesMap.value.delete(node.id)
+      delete pageState.aiNodesStatus[node.id]
     }
 
     let children = [...(node.children || [])]
 
-    // 递归清理 nodesMap
+    // 递归清理 nodesMap 和 aiNodesStatus
     while (children?.length) {
       const len = children.length
       children.forEach((item) => {
         const nodeItem = getNode(item.id)
         nodesMap.value.delete(item.id)
+        delete pageState.aiNodesStatus[item.id]
 
         if (Array.isArray(nodeItem?.children) && nodeItem?.children.length) {
           children.push(...nodeItem.children)
@@ -747,6 +746,49 @@ const updateSchema = (data: Partial<PageSchema>) => {
   publish({ topic: 'schemaChange', data: {} })
 }
 
+/**
+ * 恢复节点子树数据并重建nodesMap
+ * 用于AI回滚场景：恢复originalNodeData后需要同步清理/重建nodesMap
+ * @param nodeId 要恢复的节点ID
+ * @param restoredData 恢复后的节点数据（deepClone后的originalNodeData）
+ */
+const restoreNodeSubtree = (nodeId: string, restoredData: any) => {
+  // 1. 收集恢复前该节点子树中的所有ID（这些是需要从nodesMap中清理的）
+  const collectSubtreeIds = (node: any): string[] => {
+    const ids: string[] = []
+    if (node?.id) ids.push(node.id)
+    if (Array.isArray(node?.children)) {
+      node.children.forEach((child: any) => ids.push(...collectSubtreeIds(child)))
+    }
+    return ids
+  }
+
+  const currentNode = getNode(nodeId)
+  const oldIds = currentNode ? collectSubtreeIds(currentNode) : []
+  // 获取当前节点的parent信息（在清理前保存）
+  const parentEntry = nodesMap.value.get(nodeId)
+  const parentNode = parentEntry?.parent
+
+  // 2. 清理旧子树的nodesMap
+  oldIds.forEach((id) => nodesMap.value.delete(id))
+
+  // 3. 用恢复后的数据覆盖当前节点
+  if (currentNode) {
+    Object.keys(currentNode).forEach((key) => delete currentNode[key])
+    Object.assign(currentNode, restoredData)
+  }
+
+  // 4. 重建该节点自身的nodesMap条目
+  if (currentNode && parentNode) {
+    nodesMap.value.set(nodeId, { node: currentNode, parent: parentNode })
+  }
+
+  // 5. 重建子节点的nodesMap
+  if (Array.isArray(restoredData?.children) && restoredData.children.length && currentNode) {
+    generateNodesMap(restoredData.children, currentNode)
+  }
+}
+
 export default function () {
   return {
     pageState,
@@ -782,6 +824,7 @@ export default function () {
     getSchema,
     getNodePath,
     updateSchema,
-    updatePageSchema
+    updatePageSchema,
+    restoreNodeSubtree
   }
 }

packages/canvas/container/src/components/CanvasAction.vue

@@ -849,15 +849,11 @@ export default {
         return
       }
 
-      // 恢复画布节点schema为originalNodeData
+      // 恢复画布节点schema为originalNodeData，同步重建nodesMap
       if (currentAIStatus.originalNodeData) {
-        const node = getNode(nodeId)
-        if (node) {
-          // 先删除AI新增的属性，再用原始数据覆盖，确保回滚幂等
-          Object.keys(node).forEach((key) => delete node[key])
-          Object.assign(node, deepClone(currentAIStatus.originalNodeData))
-          useMessage().publish({ topic: 'schemaChange', data: { nodeId } })
-        }
+        const { restoreNodeSubtree } = useCanvas()
+        restoreNodeSubtree(nodeId, deepClone(currentAIStatus.originalNodeData))
+        useMessage().publish({ topic: 'schemaChange', data: { nodeId } })
       }
 
       // 设置aiModifiedNodeData为空

packages/canvas/container/src/composables/useAIChat.ts

@@ -33,28 +33,24 @@ const updateNodeAIStatus = (nodeId: string, aiStatus: Partial<NodeAIStatus>) =>
   const { pageState } = useCanvas()
   const { publish } = useMessage()
 
-  if (!pageState.nodesStatus[nodeId]) {
-    pageState.nodesStatus[nodeId] = {}
-  }
-
-  if (!pageState.nodesStatus[nodeId].aiStatus) {
-    pageState.nodesStatus[nodeId].aiStatus = {
+  if (!pageState.aiNodesStatus[nodeId]) {
+    pageState.aiNodesStatus[nodeId] = {
       state: 'hidden', // 默认隐藏
       aiContext: null,
       lastAIAction: '',
       aiHistory: []
     }
   }
 
-  Object.assign(pageState.nodesStatus[nodeId].aiStatus, aiStatus)
+  Object.assign(pageState.aiNodesStatus[nodeId], aiStatus)
 
   // 发布状态更新事件
-  publish({ topic: 'nodeAIStatusUpdate', data: { nodeId, aiStatus: pageState.nodesStatus[nodeId].aiStatus } })
+  publish({ topic: 'nodeAIStatusUpdate', data: { nodeId, aiStatus: pageState.aiNodesStatus[nodeId] } })
 }
 
 const getNodeAIStatus = (nodeId: string): NodeAIStatus | null => {
   const { pageState } = useCanvas()
-  return pageState.nodesStatus[nodeId]?.aiStatus || null
+  return pageState.aiNodesStatus[nodeId] || null
 }
 
 // 添加AI操作历史记录
@@ -130,17 +126,12 @@ const cancelNodeAIAction = (nodeId: string) => {
     return
   }
 
-  // 恢复画布节点schema为originalNodeData
+  // 恢复画布节点schema为originalNodeData，同步重建nodesMap
   if (currentStatus.originalNodeData && currentStatus.state === 'confirm') {
-    const { getNode } = useCanvas()
+    const { restoreNodeSubtree } = useCanvas()
     const { publish } = useMessage()
-    const node = getNode(nodeId)
-    if (node) {
-      // 先删除AI新增的属性，再用原始数据覆盖，确保回滚幂等
-      Object.keys(node).forEach((key) => delete node[key])
-      Object.assign(node, deepClone(currentStatus.originalNodeData))
-      publish({ topic: 'schemaChange', data: { nodeId } })
-    }
+    restoreNodeSubtree(nodeId, deepClone(currentStatus.originalNodeData))
+    publish({ topic: 'schemaChange', data: { nodeId } })
   }
 
   const newState = currentStatus.chatContent ? 'chat' : 'hidden'
@@ -200,17 +191,12 @@ const rejectNodeAIModification = (nodeId: string) => {
     return false
   }
 
-  // 恢复画布节点schema为originalNodeData
+  // 恢复画布节点schema为originalNodeData，同步重建nodesMap
   if (currentAIStatus.originalNodeData) {
-    const { getNode } = useCanvas()
+    const { restoreNodeSubtree } = useCanvas()
     const { publish } = useMessage()
-    const node = getNode(nodeId)
-    if (node) {
-      // 先删除AI新增的属性，再用原始数据覆盖，确保回滚幂等
-      Object.keys(node).forEach((key) => delete node[key])
-      Object.assign(node, deepClone(currentAIStatus.originalNodeData))
-      publish({ topic: 'schemaChange', data: { nodeId } })
-    }
+    restoreNodeSubtree(nodeId, deepClone(currentAIStatus.originalNodeData))
+    publish({ topic: 'schemaChange', data: { nodeId } })
   }
 
   const newState = currentAIStatus.chatContent ? 'chat' : 'hidden'
@@ -245,30 +231,6 @@ const hasNodePendingAIModification = (nodeId: string): boolean => {
   const aiStatus = getNodeAIStatus(nodeId)
   return aiStatus?.state === 'confirm'
 }
-
-/**
- * 获取所有有待处理AI修改的节点ID
- */
-const getAllNodesWithPendingAIModification = (): string[] => {
-  const { pageState } = useCanvas()
-  const pendingNodes: string[] = []
-
-  Object.entries(pageState.nodesStatus).forEach(([nodeId, status]) => {
-    if (status.aiStatus?.state === 'confirm') {
-      pendingNodes.push(nodeId)
-    }
-  })
-
-  return pendingNodes
-}
-
-/**
- * 检查页面是否有任何待处理的AI修改
- */
-const hasAnyPendingAIModification = (): boolean => {
-  return getAllNodesWithPendingAIModification().length > 0
-}
-
 // ==================== AI助手状态函数 ====================
 
 // 获取当前节点是否应该显示AI聊天界面
@@ -731,8 +693,6 @@ export default function () {
     rejectNodeAIModification,
     resetNodeAIAdoptionStatus,
     hasNodePendingAIModification,
-    getAllNodesWithPendingAIModification,
-    hasAnyPendingAIModification,
     findJsonPatchPath,
     applyAIPatches,
     // AI聊天请求构建

packages/toolbars/save/src/js/aiSaveValidation.ts

@@ -10,11 +10,12 @@ const { publish } = useMessage()
  * 获取所有有待处理AI修改的节点ID
  */
 const getAllNodesWithPendingAIModification = (): string[] => {
-  const { pageState } = useCanvas()
+  const { pageState, getNode } = useCanvas()
   const pendingNodes: string[] = []
 
-  Object.entries(pageState.nodesStatus).forEach(([nodeId, status]) => {
-    if (status.aiStatus?.state === 'confirm') {
+  Object.entries(pageState.aiNodesStatus).forEach(([nodeId, status]) => {
+    // 只统计仍存在于schema中的节点，已删除节点不再阻塞保存
+    if (status?.state === 'confirm' && getNode(nodeId)) {
       pendingNodes.push(nodeId)
     }
   })
@@ -44,7 +45,7 @@ const validateBeforeSave = () => {
   const pendingNodeIds = getAllNodesWithPendingAIModification()
   const pendingNodes = pendingNodeIds.map((nodeId) => {
     const { pageState } = useCanvas()
-    const aiStatus = pageState.nodesStatus[nodeId]?.aiStatus || null
+    const aiStatus = pageState.aiNodesStatus[nodeId] || null
     return {
       nodeId,
       aiStatus