fix(frontend): 历史任务详情失败节点跳转日志问题修复 #8117

TencentBlueKing · Nov 22, 2024 · 53bed8b · 53bed8b
1 parent d6d3474
commit 53bed8b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/dbm-ui/frontend/src/views/db-manage/mysql/partition-manage/components/ExecuteLog.vue b/dbm-ui/frontend/src/views/db-manage/mysql/partition-manage/components/ExecuteLog.vue
@@ -132,7 +132,6 @@
     ];
     fetchData();
   };
-  console.log('asdasdasdasd')
 </script>
 <style lang="less">
   .partition-execute-log {

diff --git a/...ce-manage/spec/components/spec-form-item/spec-device-or-cpu-mem/components/SpecDevice.vue b/...ce-manage/spec/components/spec-form-item/spec-device-or-cpu-mem/components/SpecDevice.vue
@@ -117,13 +117,6 @@
 
   const deviceClassList = ref<DeviceClassListItem[]>([]);
   const scrollLoading = ref(false);
-
-  const searchParams = {
-    offset: 0,
-    limit: 12,
-    device_type: '',
-  };
-
   const deviceListMap = ref<
     Record<
       string,
@@ -134,6 +127,12 @@
     >
   >({});
 
+  const searchParams = {
+    offset: 0,
+    limit: 12,
+    device_type: '',
+  };
+
   const selectedCpuMem = {
     cpu: {
       min: Number.MAX_SAFE_INTEGER,

diff --git a/dbm-ui/frontend/src/views/task-history/components/PreviewNodeTree.vue b/dbm-ui/frontend/src/views/task-history/components/PreviewNodeTree.vue
@@ -71,9 +71,11 @@
 
   import { getTaskflowDetails } from '@services/source/taskflow';
 
+  type NodeType = ServiceReturnType<typeof getTaskflowDetails>['activities'][string];
+
   interface Props {
     nodesCount: number;
-    nodesTreeData: ServiceReturnType<typeof getTaskflowDetails>['activities'][string][];
+    nodesTreeData: Array<NodeType & { failedChildren?: NodeType[] }>;
     statusKeypath: string;
     titleKeypath: string;
     tooltips: string;
@@ -83,7 +85,7 @@
   }
 
   interface Emits {
-    (e: 'node-click', value: Props['nodesTreeData'][number], refValue: typeof treeRef): void;
+    (e: 'node-click', value: Props['nodesTreeData'][number], refValue: typeof treeRef, isShowLog: boolean): void;
     (e: 'after-show', value: typeof treeRef): void;
   }
 
@@ -112,7 +114,8 @@
   };
 
   const handleNodeClick = (node: Props['nodesTreeData'][number]) => {
-    emits('node-click', node, treeRef);
+    const iShowLog = !node.failedChildren;
+    emits('node-click', node, treeRef, iShowLog);
   };
 
   const handleNodePanelSwich = () => {

diff --git a/dbm-ui/frontend/src/views/task-history/pages/Details.vue b/dbm-ui/frontend/src/views/task-history/pages/Details.vue
@@ -129,7 +129,7 @@
                 title-keypath="人工确认节点（n）"
                 :tooltips="t('人工确认节点列表')"
                 @after-show="(treeRef: Ref) => handleToolNodeTreeAfterShow(treeRef, false)"
-                @node-click="(node: TaskflowList[number], treeRef: Ref) => handleTreeNodeClick(node, treeRef, false)" />
+                @node-click="handleTreeNodeClick" />
               <PreviewNodeTree
                 v-if="flowState.details.flow_info?.status === 'FAILED'"
                 ref="failedToolPreviewNodeTreeRef"
@@ -140,7 +140,7 @@
                 title-keypath="失败节点（n）"
                 :tooltips="t('失败节点列表')"
                 @after-show="(treeRef: Ref) => handleToolNodeTreeAfterShow(treeRef)"
-                @node-click="(node: TaskflowList[number], treeRef: Ref) => handleTreeNodeClick(node, treeRef)" />
+                @node-click="handleTreeNodeClick" />
               <i
                 v-bk-tooltips="t('放大')"
                 class="flow-tools-icon db-icon-plus-circle"
@@ -276,7 +276,7 @@
               title-keypath="失败节点（n）"
               :tooltips="t('失败节点列表')"
               @after-show="(treeRef: Ref) => handleNodeTreeAfterShow(treeRef)"
-              @node-click="(node: TaskflowList[number], treeRef: Ref) => handleTreeNodeClick(node, treeRef)" />
+              @node-click="handleTreeNodeClick" />
             <PreviewNodeTree
               v-else-if="todoNodesCount > 0"
               ref="failedTopPreviewNodeTreeRef"
@@ -288,7 +288,7 @@
               title-keypath="人工确认节点（n）"
               :tooltips="t('人工确认节点列表')"
               @after-show="(treeRef: Ref) => handleNodeTreeAfterShow(treeRef, false)"
-              @node-click="(node: TaskflowList[number], treeRef: Ref) => handleTreeNodeClick(node, treeRef, false)" />
+              @node-click="handleTreeNodeClick" />
             <BkTag
               v-else
               :theme="getStatusTheme(true)">