From a740d4b058198c5840dbfa2729e6c132851e6522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=8F=E5=A4=A7=E8=83=86?= <1101282782@qq.com> Date: Fri, 12 Dec 2025 13:51:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=B9=E6=B2=A1=E5=88=86?= =?UTF-8?q?=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/common/addMapSource.ts | 96 ++++++++++--------- .../views/components/propertyBox/Submerge.vue | 1 + 2 files changed, 50 insertions(+), 47 deletions(-) diff --git a/src/renderer/src/common/addMapSource.ts b/src/renderer/src/common/addMapSource.ts index c648528..f155818 100644 --- a/src/renderer/src/common/addMapSource.ts +++ b/src/renderer/src/common/addMapSource.ts @@ -11,54 +11,56 @@ export const addMapSource = async ({ type, id, sourceName = '未命名对象', o if (window.earth.entityMap.get(id)) { window.earth.entityMap.get(id).remove() } - let options: any = await initMapData(type, opt, cd) - let selectedNodes = window.treeObj.getSelectedNodes() - let node = selectedNodes && selectedNodes[selectedNodes.length - 1] - function getParentId(nd: any) { - if (nd.sourceType === 'directory') { - return nd.id - } else { - let parentNode = window.treeObj.getNodeByParam("id", nd.parentId, null); - if (parentNode) { - return getParentId(parentNode) - } - else { - return + setTimeout(async () => { + let options: any = await initMapData(type, opt, cd) + let selectedNodes = window.treeObj.getSelectedNodes() + let node = selectedNodes && selectedNodes[selectedNodes.length - 1] + function getParentId(nd: any) { + if (nd.sourceType === 'directory') { + return nd.id + } else { + let parentNode = window.treeObj.getNodeByParam("id", nd.parentId, null); + if (parentNode) { + return getParentId(parentNode) + } + else { + return + } } } - } - let parentId - if (node) { - parentId = getParentId(node) - } - delete options.host - if (options.attribute && options.attribute.rtmp) { - delete options.attribute.rtmp - } - switch (type) { - case 'rendezvous': - case 'attackArrow': - case 'pincerArrow': - delete options.label.ground - delete options.label.position - break; - case 'path': - delete options.label.text - break; - } - console.log('options', options) - let params: any = { - id: id, - sourceName: sourceName, - sourceType: type, - // isShow: 1, - parentId: parentId, - // "treeIndex": 0, - params: options - } - TreeApi.addOtherSource(params) - params.params = JSON.stringify(params.params) - params.isShow = true + let parentId + if (node) { + parentId = getParentId(node) + } + delete options.host + if (options.attribute && options.attribute.rtmp) { + delete options.attribute.rtmp + } + switch (type) { + case 'rendezvous': + case 'attackArrow': + case 'pincerArrow': + delete options.label.ground + delete options.label.position + break; + case 'path': + delete options.label.text + break; + } + console.log('options', options) + let params: any = { + id: id, + sourceName: sourceName, + sourceType: type, + // isShow: 1, + parentId: parentId, + // "treeIndex": 0, + params: options + } + TreeApi.addOtherSource(params) + params.params = JSON.stringify(params.params) + params.isShow = true - cusAddNodes(window.treeObj, params.parentId, [params]) + cusAddNodes(window.treeObj, params.parentId, [params]) + }, 10); } diff --git a/src/renderer/src/views/components/propertyBox/Submerge.vue b/src/renderer/src/views/components/propertyBox/Submerge.vue index bd8ae39..32dfa2b 100644 --- a/src/renderer/src/views/components/propertyBox/Submerge.vue +++ b/src/renderer/src/views/components/propertyBox/Submerge.vue @@ -231,6 +231,7 @@ var readOnly = ref(true) const changeWater = () => { submerge.restart() + isPausng.value = false } eventBus.on('submergeDialog', () => {