diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeCanvas/index.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeCanvas/index.vue
index 8aed215cf7..a277f10153 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeCanvas/index.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeCanvas/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div
         class="sub-process"
-        :style="{ height: `${subProcessHeight}px` }"
+        :style="{ height: `${subprocessHeight}px` }"
         v-bkloading="{ isLoading: loading, opacity: 1, zIndex: 100 }">
         <TemplateCanvas
             ref="subProcessCanvas"
@@ -30,7 +30,7 @@
         <!--可拖拽-->
         <template v-if="!loading">
             <div class="resize-trigger" @mousedown.left="handleMousedown($event)"></div>
-            <i :class="['resize-proxy', 'top']" ref="resizeProxy"></i>
+            <i :class="['resize-proxy', 'top']" :style="{ top: `${subprocessHeight}px` }" ref="resizeProxy"></i>
             <div class="resize-mask" ref="resizeMask"></div>
         </template>
     </div>
@@ -62,12 +62,15 @@
             subprocessState: {
                 type: String,
                 value: ''
+            },
+            subprocessHeight: {
+                type: [Number, String],
+                default: 0
             }
         },
         data () {
             return {
                 subprocessLoading: false,
-                subProcessHeight: 160,
                 zoom: 0.75
             }
         },
@@ -183,9 +186,11 @@
             setCanvasZoomPosition () {
                 if (!this.canvasData.locations) return
                 // 设置默认高度
-                const subprocessDom = document.querySelector('.sub-process')
-                const { top } = subprocessDom.getBoundingClientRect()
-                this.subProcessHeight = window.innerHeight - top - 320
+                if (!this.subprocessHeight) {
+                    const subprocessDom = document.querySelector('.sub-process')
+                    const { top } = subprocessDom.getBoundingClientRect()
+                    this.$emit('updateSubprocessHeight', window.innerHeight - top - 320)
+                }
                 // 设置缩放比例
                 let jsFlowInstance = this.$refs.subProcessCanvas
                 jsFlowInstance = jsFlowInstance && jsFlowInstance.$refs.jsFlow
@@ -258,7 +263,7 @@
                 const resizeProxy = this.$refs.resizeProxy
                 resizeProxy.style.visibility = 'hidden'
                 resizeMask.style.display = 'none'
-                this.subProcessHeight = resizeProxy.style.top.slice(0, -2)
+                this.$emit('updateSubprocessHeight', resizeProxy.style.top.slice(0, -2))
                 document.removeEventListener('mousemove', this.handleMouseMove)
                 document.removeEventListener('mouseup', this.handleMouseUp)
             },
@@ -326,7 +331,7 @@
                 }
             }
             .state-icon {
-                display: none;
+                display: none !important;
             }
             .task-node {
                 &.actived {
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeExecuteInfo/components/TaskCondition.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeExecuteInfo/components/TaskCondition.vue
index 99958989b3..29bf873cd5 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeExecuteInfo/components/TaskCondition.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeExecuteInfo/components/TaskCondition.vue
@@ -101,10 +101,6 @@
         }
     }
     .condition-form {
-        height: calc(100vh - 60px);
-        .form-wrap {
-            height: calc(100% - 49px);
-        }
         .form-item {
             margin-bottom: 20px;
             .label {
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeExecuteInfo/index.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeExecuteInfo/index.vue
index 36c0353e72..81b6e9a523 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeExecuteInfo/index.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeExecuteInfo/index.vue
@@ -170,7 +170,7 @@
         data () {
             return {
                 randomKey: null,
-                isRecordLoading: true,
+                isRecordLoading: false,
                 curActiveTab: 'record',
                 loop: 1,
                 theExecuteTime: undefined,
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeTree/index.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeTree/index.vue
index 444825da43..0ddb6d4b1e 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeTree/index.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/components/NodeTree/index.vue
@@ -55,6 +55,10 @@
             loading: {
                 type: Boolean,
                 default: true
+            },
+            subprocessId: {
+                type: String,
+                default: ''
             }
         },
         data () {
@@ -69,7 +73,8 @@
                 nodeTargetMaps: {},
                 allCheckoutNodes: [],
                 subprocessLoading: false,
-                subNodesExpanded: [] // 节点树展开的独立子流程节点
+                subNodesExpanded: [], // 节点树展开的独立子流程节点
+                sourceCanvas: false // 是否通过子画布选中节点
             }
         },
         watch: {
@@ -187,6 +192,7 @@
                     name: this.$t('开始节点'),
                     nodeLevel: 1,
                     parentId,
+                    belongFlow: data.id,
                     subprocessStack,
                     expanded: false,
                     taskId,
@@ -197,6 +203,7 @@
                     name: this.$t('结束节点'),
                     nodeLevel: 1,
                     parentId,
+                    belongFlow: data.id,
                     subprocessStack,
                     expanded: false,
                     taskId,
@@ -239,8 +246,8 @@
                 if (this.nodeIds[flowId] && this.nodeIds[flowId].includes(id)) {
                     const isBack = this.judgeNodeBack(id, id, [])
                     if (isBack) { // 打回节点
-                        const lastNode = this.getMatchOrderedNode(ordered, lastId, false)
-                        const existNode = this.getMatchOrderedNode(ordered, id, false)
+                        const lastNode = this.getMatchOrderedNode(ordered, lastId, false, flowId)
+                        const existNode = this.getMatchOrderedNode(ordered, id, false, flowId)
                         lastNode.isCallback = true
                         lastNode.callbackInfo = {
                             ...existNode,
@@ -251,16 +258,16 @@
                         if (isConverge) { // 网关汇聚
                             return
                         } else { // 分支汇聚
-                            const existNode = this.getMatchOrderedNode(ordered, id, false)
+                            const existNode = this.getMatchOrderedNode(ordered, id, false, flowId)
                             const isSameLevel = existNode && existNode.nodeLevel === nodeLevel
                             if (isSameLevel) { // 同层次汇聚
-                                const gatewayOrdered = this.getMatchOrderedNode(ordered, gatewayId, false)
+                                const gatewayOrdered = this.getMatchOrderedNode(ordered, gatewayId, false, flowId)
                                 const convergeIndex = gatewayOrdered.children.findIndex(item => item.id === id)
                                 const branchIndex = gatewayOrdered.children.findIndex(item => item.id === branchId)
                                 const branchInfo = gatewayOrdered.children.splice(branchIndex, 1)
                                 gatewayOrdered.children.splice(convergeIndex, 0, branchInfo[0])
                             } else if (existNode) { // 跨层级汇聚
-                                const lastNode = this.getMatchOrderedNode(ordered, lastId, false)
+                                const lastNode = this.getMatchOrderedNode(ordered, lastId, false, flowId)
                                 parentOrdered.push({
                                     ...existNode,
                                     isLevelUp: lastNode.isLevelUp,
@@ -283,6 +290,7 @@
                         expanded: false,
                         nodeLevel: parentLevel ? parentLevel + nodeLevel : nodeLevel,
                         isLevelUp,
+                        belongFlow: flowId, // 当前节点属于哪个画布下
                         taskId
                     }
                     if (parentId) {
@@ -335,6 +343,7 @@
                                     value: evaluate,
                                     nodeLevel: treeItem.nodeLevel + 1,
                                     parentId,
+                                    belongFlow: flowId,
                                     conditionType: 'condition', // 条件、条件并行网关
                                     expanded: false,
                                     target: flows[key].target,
@@ -354,6 +363,7 @@
                                     value: evaluate,
                                     nodeLevel: treeItem.nodeLevel + 1,
                                     parentId,
+                                    belongFlow: flowId,
                                     conditionType: 'default',
                                     expanded: false,
                                     target: flows[flow_id].target,
@@ -378,6 +388,7 @@
                                     title: this.$t('并行'),
                                     nodeLevel: treeItem.nodeLevel + 1,
                                     parentId,
+                                    belongFlow: flowId,
                                     expanded: false,
                                     conditionType: 'parallel',
                                     target: flows[key].target,
@@ -439,8 +450,8 @@
                             let result
                             const convergeNode = Object.values(this.convergeInfo).find(item => item.convergeNode === id)
                             if (convergeNode) {
-                                result = this.getMatchOrderedNode(ordered, convergeNode.id, true)
-                                const gatewayInfo = this.getMatchOrderedNode(ordered, convergeNode.id, false)
+                                result = this.getMatchOrderedNode(ordered, convergeNode.id, true, flowId)
+                                const gatewayInfo = this.getMatchOrderedNode(ordered, convergeNode.id, false, flowId)
                                 const { gatewayId, nodeLevel } = result[0]
                                 treeItem.nodeLevel = nodeLevel
                                 treeItem.style = gatewayInfo.style
@@ -456,7 +467,7 @@
                                 nextNodeInfo.isLevelUp = treeItem.isLevelUp
                                 nextNodeInfo.style = treeItem.style
                             } else {
-                                result = this.getMatchOrderedNode(ordered, gatewayId, false)
+                                result = this.getMatchOrderedNode(ordered, gatewayId, false, flowId)
                                 if (result) {
                                     treeItem.nodeLevel = result.children[0].nodeLevel
                                     treeItem.style = result.children[0].style
@@ -487,6 +498,7 @@
                         conditions.forEach(item => {
                             item.style = `margin-left: ${item.parentId ? 16 : marginLeft + 33}px`
                             item.subprocessStack = treeItem.subprocessStack
+                            item.belongFlow = flowId
                             treeItem.children.push(item)
                             this.retrieveLines(
                                 flowId,
@@ -522,14 +534,14 @@
                     }
                 }
             },
-            getMatchOrderedNode (ordered, id, isParent) {
+            getMatchOrderedNode (ordered, id, isParent, flowId) {
                 let result
                 ordered.some(item => {
-                    if (item.id === id) {
+                    if (item.id === id && item.belongFlow === flowId) {
                         result = isParent ? ordered : item
                         return true
                     } else if (item.children?.length) {
-                        result = this.getMatchOrderedNode(item.children, id, isParent)
+                        result = this.getMatchOrderedNode(item.children, id, isParent, flowId)
                         return result && !!Object.keys(result).length
                     }
                     return false
@@ -882,7 +894,7 @@
                 }
             },
             // 获取节点树节点详情
-            getNodeInfo (data, rootId, nodeId) {
+            getNodeInfo (data, rootId, nodeId, eventSource) {
                 let nodes = data
                 if (rootId) {
                     rootId.split('-').forEach(id => {
@@ -896,11 +908,24 @@
                 }
                 let nodeInfo
                 nodes.some(item => {
+                    /**
+                     * 由子画布获取节点详情，可能出现多个节点id相同的问题
+                     * 例如：流程套娃、多个相同的子流程
+                     * 故额外判断节点所属的画布是否匹配
+                     */
                     if (item.id === nodeId) {
+                        if (eventSource === 'canvas') {
+                            this.sourceCanvas = true
+                            if (item.belongFlow === this.subprocessId) {
+                                nodeInfo = item
+                                return true
+                            }
+                            return false
+                        }
                         nodeInfo = item
                         return true
                     } else if (item.children?.length) {
-                        nodeInfo = this.getNodeInfo(item.children, '', nodeId)
+                        nodeInfo = this.getNodeInfo(item.children, '', nodeId, eventSource)
                         return !!nodeInfo
                     }
                 })
@@ -912,8 +937,19 @@
             },
             setDefaultActiveId (treeData = [], id) {
                 return treeData.some(item => {
+                    // 由子画布设置默认id时需要判断节点所属的画布是否匹配
                     if (item.id === id) {
-                        item.expanded = !!item.isSubProcess || !!item.conditionType || item.isGateway
+                        const isExpand = !!item.isSubProcess || !!item.conditionType || item.isGateway
+                        // sourceCanvas: 是否通过子画布设置默认id
+                        if (this.sourceCanvas) {
+                            this.sourceCanvas = false
+                            if (item.belongFlow === this.subprocessId) {
+                                item.expanded = isExpand
+                                return true
+                            }
+                            return false
+                        }
+                        item.expanded = isExpand
                         return true
                     } else if (item.children?.length) {
                         if (item.expanded) {
diff --git a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/index.vue b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/index.vue
index a689fd100d..8460f3c044 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/index.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/ExecuteInfo/index.vue
@@ -21,6 +21,7 @@
                 :execute-info="executeInfo"
                 :node-state-mapping="nodeStateMapping"
                 :node-detail-config="nodeDetailConfig"
+                :subprocess-id="subprocessPipeline && subprocessPipeline.id"
                 @updateSubprocessLoading="subprocessLoading = $event"
                 @updateParentPipelineData="updateParentPipelineData"
                 @updateSubprocessState="updateSubprocessState"
@@ -44,6 +45,8 @@
                         :node-state-mapping="nodeStateMapping"
                         :subprocess-state="subprocessState"
                         :subprocess-pipeline="subprocessPipeline"
+                        :subprocess-height="subprocessHeight"
+                        @updateSubprocessHeight="subprocessHeight = $event"
                         @onNodeClick="handleSubCanvasNodeClick">
                     </NodeCanvas>
                     <NodeExecuteInfo
@@ -156,6 +159,7 @@
             return {
                 canvasRandomKey: null,
                 executeInfoRandomKey: null,
+                subprocessHeight: 0,
                 loading: true,
                 executeInfo: {},
                 theExecuteTime: undefined,
@@ -415,7 +419,7 @@
                 if (nodeId === this.subprocessPipeline.id) {
                     parentId = rootNode ? `${rootNode}-${nodeId}` : nodeId
                 }
-                const nodeInfo = this.getNodeInfo(parentId, node)
+                const nodeInfo = this.getNodeInfo(parentId, node, 'canvas')
                 if (nodeInfo) {
                     nodeInfo && this.onSelectNode(nodeInfo)
                     const parentInstance = this.$parent.$parent
@@ -518,11 +522,11 @@
                 this.loadSubprocessState()
             },
             // 获取节点树节点详情
-            getNodeInfo (rootId, nodeId) {
+            getNodeInfo (rootId, nodeId, eventSource) {
                 let nodeInfo = null
                 const nodeTreeRef = this.$refs.nodeTree
                 if (nodeTreeRef) {
-                    nodeInfo = nodeTreeRef.getNodeInfo(nodeTreeRef.nodeData, rootId, nodeId)
+                    nodeInfo = nodeTreeRef.getNodeInfo(nodeTreeRef.nodeData, rootId, nodeId, eventSource)
                 }
                 return nodeInfo
             },
diff --git a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
index cb7c6e0a03..e48d1663ff 100644
--- a/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
+++ b/frontend/desktop/src/pages/task/TaskExecute/TaskOperation.vue
@@ -2246,10 +2246,8 @@
                             const { root_node, component_code, taskId } = this.nodeDetailConfig
                             // 重新拉取父流程状态
                             await this.loadTaskStatus()
-                            // 非独立子流程节点重新加载节点配置
-                            if (component_code !== 'subprocess_plugin') {
-                                await execInfoInstance.loadNodeInfo()
-                            }
+                            // 重新加载节点配置
+                            await execInfoInstance.loadNodeInfo()
                             // 重新拉取所有独立子流程状态
                             execInfoInstance.suspendLines = []
                             Object.values(execInfoInstance.subprocessTasks).forEach(item => {