From 918d7b40f2629ff4847b564e20e6d994da9ad6a7 Mon Sep 17 00:00:00 2001
From: jingna <1264204245@qq.com>
Date: Wed, 2 Jul 2025 10:15:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=88=AA=E4=B8=8D?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue | 7 ++++---
 .../application/SfcEditor/NavbarEditor/assocPage.vue       | 7 ++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue
index 9726ccf..6a105d8 100644
--- a/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue
+++ b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue
@@ -55,7 +55,7 @@ function menuclick(index: any) {
     }
   }
 }
-function childmenuclick(item: any) {
+function childmenuclick(item: any,index: any) {
   if (props.isExecuteEvent) {
     return
   }
@@ -63,6 +63,7 @@ function childmenuclick(item: any) {
   showmodule.value = false
   showUserInfo.value = false
   if (item.module_id && item.module_id !== '') {
+    checkindex.value = index
     currentrow.value = item
     currentMoudleId.value = item.module_id
     showmodule.value = true
@@ -162,12 +163,12 @@ function userdetails(){
         <div class="Navbar-menu-content">
           <TimeDisplay />
           <div class="Navbar-menu-item"
-            :class="{ 'Navbar-menu-items': checkindex == index && item.children.length == 0 }"
+            :class="{ 'Navbar-menu-items': checkindex == index }"
             v-for="(item, index) in navmenulist" :key="index" @click="menuclick(index)">
             <div v-if="!item.children || item.children.length == 0">{{ item.name }}</div>
             <el-popover v-else :show-arrow="false" class="tsmenu" placement="bottom" popper-class="tsmenu-popover">
               <div v-for="(items, indexs) in item.children" :key="indexs" class="Navbar-menu-item-child-item"
-                @click="() => childmenuclick(items)">
+                @click="() => childmenuclick(items,index)">
                 {{ items.name }}
               </div>
               <template #reference>
diff --git a/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/assocPage.vue b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/assocPage.vue
index a7c2948..b094311 100644
--- a/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/assocPage.vue
+++ b/core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/assocPage.vue
@@ -4,8 +4,6 @@ import DvPreview from '@/viewsnew/data-visualization/DvPreview.vue'
 import FormCreate from '@/viewsnew/common/FormCreate.vue'
 import { initCanvasData } from '@/utils/canvasUtils'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
-import { moduleList } from '@/api/application/module'
-import Navbar from '@/viewsnew/application/SfcEditor/NavbarEditor/assocPage.vue'
 const props = defineProps({
   moduleinfo: Object,
   applicationId: String
@@ -61,9 +59,9 @@ onMounted(() => {
   getInit()
 })
 watch(() => props.moduleinfo, (val) => {
-  getInit()
   isFormCreate.value = false
   dataInitState.value = false
+  getInit()
 })
 onBeforeMount(() => {
   dvMainStore.canvasDataInit()
@@ -105,7 +103,6 @@ function handleNodeClick(e) {
       :canvas-style-preview="state.canvasStylePreview" :canvas-view-info-preview="state.canvasViewInfoPreview"
       :dv-info="state.dvInfo" :cur-preview-gap="state.curPreviewGap" :download-status="downloadStatus"></dv-preview>
     <form-create v-if="isFormCreate" :moduleInfo="moduleInfo"></form-create>
-    <Navbar v-if="isNavbar"></Navbar>
-  </div>
+ </div>
 </template>
 <style lang="less" scoped></style>
\ No newline at end of file