diff --git a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue index 7e5cb6c784..a2f0aff85b 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue @@ -1185,7 +1185,9 @@ const userViewEnlargeOpen = (opt, item) => { } const initSnapshotTimer = () => { + console.log('check1==') snapshotTimer.value = setInterval(() => { + console.log('check2==') snapshotStore.snapshotCatchToStore() }, 1000) } diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts index c78c8e3492..bbacdce160 100644 --- a/core/core-frontend/src/utils/canvasUtils.ts +++ b/core/core-frontend/src/utils/canvasUtils.ts @@ -286,3 +286,29 @@ export function filterEmptyFolderTree(nodes) { } }) } + +export function findParentIdByChildIdRecursive(tree, targetChildId) { + function findParentId(node, targetChildId) { + if (node.type === 'folder' && node.children) { + for (const childNode of node.children) { + if (childNode.id === targetChildId) { + return node.id // 找到匹配的子节点,返回其父节点的 ID + } + const parentId = findParentId(childNode, targetChildId) + if (parentId !== null) { + return parentId // 在子节点中找到匹配的父节点 + } + } + } + return null // 没有找到匹配的子节点 + } + + for (const node of tree) { + const parentId = findParentId(node, targetChildId) + if (parentId !== null) { + return parentId // 在整个树中找到匹配的父节点 + } + } + + return null // 没有找到匹配的子节点 +} diff --git a/core/core-frontend/src/views/common/DeResourceGroupOpt.vue b/core/core-frontend/src/views/common/DeResourceGroupOpt.vue index 0fb5b8d31c..09cf1ba9ff 100644 --- a/core/core-frontend/src/views/common/DeResourceGroupOpt.vue +++ b/core/core-frontend/src/views/common/DeResourceGroupOpt.vue @@ -276,7 +276,9 @@ const saveResource = () => { ElMessage.success('保存成功') if (cmd.value === 'copy') { const baseUrl = - curCanvasType.value === 'dataV' ? '#/dvCanvas?dvId=' : '#/dashboard?resourceId=' + curCanvasType.value === 'dataV' + ? '#/dvCanvas?opt=copy&dvId=' + : '#/dashboard?opt=copy&resourceId=' window.open(baseUrl + data.data, '_blank') } }) diff --git a/core/core-frontend/src/views/common/DeResourceTree.vue b/core/core-frontend/src/views/common/DeResourceTree.vue index b0c1ca951d..7aefe562ce 100644 --- a/core/core-frontend/src/views/common/DeResourceTree.vue +++ b/core/core-frontend/src/views/common/DeResourceTree.vue @@ -1,6 +1,6 @@