Merge branch 'main' of http://121.37.111.42:3000/ThbTech/gis-bi into main

core/core-frontend/src/viewsnew/application/PreviewSystem.vue

@@ -17,6 +17,24 @@ onMounted(()=>{
         getmenuinfo()
     }
 })
+const processMenuTree = (menuNodes: any[], moduleData: any[]) => {
+    const typeMap = new Map(
+        moduleData.map(({ id, type }) => [id, type])
+    );
+
+    const traverseMenu = (nodes: any[]) => {
+        for (const node of nodes) {
+            if (node.module_id && typeMap.has(node.module_id)) {
+                node.module_type = typeMap.get(node.module_id);
+            }
+            if (node.children?.length) {
+                traverseMenu(node.children);
+            }
+        }
+    };
+    traverseMenu(menuNodes);
+    return menuNodes;
+};
 function getmenuinfo() {
     const params = {
         appId: applicationId.value,
@@ -29,6 +47,7 @@ function getmenuinfo() {
         moduleList(paramss).then(ress => {
             var arr = ress.data.data
             let list: any = {}
+            menuList.value = processMenuTree(menuList.value, arr)
             arr.forEach((item: any) => {
                 if (item.type == '02' && item.node_type == '02') {
                     list = item
@@ -44,8 +63,8 @@ function getmenuinfo() {
 </script>
 <template>
     <div class="system-box">
-        <Navbar v-if="isNavbar" :menuList="menuList" :projectName="projectName" 
+        <Navbar v-if="isNavbar" :menuList="menuList" :projectName="projectName" :isFixed="true"
-        :isFixed="true" :projectId="projectList.id" :applicationId="applicationId" :isExecuteEvent="false">
+            :projectId="projectList.id" :applicationId="applicationId" :isExecuteEvent="false">
         </Navbar>
     </div>
 </template>

core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/Navbar.vue

@@ -43,7 +43,13 @@ function menuclick(index: any) {
       return
     }
     currentMoudleId.value = navmenulist.value[index].module_id
+    if (navmenulist.value[index].module_id && navmenulist.value[index].module_id !== '') {
+      currentMoudleId.value = navmenulist.value[index].module_id
+      currentrow.value = navmenulist.value[index]
       showmodule.value = true
+      showermission.value = false
+      showUserInfo.value = false
+    }
   }
 }
 function childmenuclick(item: any) {
@@ -54,8 +60,8 @@ function childmenuclick(item: any) {
   showmodule.value = false
   showUserInfo.value = false
   if (item.module_id && item.module_id !== '') {
+    currentrow.value = item
     currentMoudleId.value = item.module_id
-    console.log('传递给 Assocmodule 的 props:',item)
     showmodule.value = true
   } else {
     showmodule.value = false
@@ -179,7 +185,7 @@ function userdetails(){
     <div v-if="!props.isExecuteEvent" class="system-box-content"
       :style="{ height: props.isFixed ? 'calc(100vh - 65px)' : 'calc(100vh - 125px)' }">
       <Assocmodule v-if="showmodule" :applicationId="props.applicationId"
-        :moduleinfo="{ module_id: currentMoudleId }" />
+        :moduleinfo="currentrow" />
       <PermissionSet v-if="showermission" />
       <UserInfoSet v-if="showUserInfo" :applicationId="props.applicationId" />
     </div>

core/core-frontend/src/viewsnew/application/SfcEditor/NavbarEditor/assocPage.vue

@@ -70,17 +70,11 @@ onBeforeMount(() => {
 })
 function getInit() {
   loading.value = true
-  let params = {appId:props.applicationId}
+  const params = {
-    moduleList(params).then(res => {
+    id: props.moduleinfo.module_id,
-      let list:any = {}
+    type: props.moduleinfo.module_type
-      const arr = res.data.data
-      arr.forEach((item:any) => {
-        if(item.id === props.moduleinfo.module_id){
-          list = item
   }
-      })
+  handleNodeClick(params)
-      handleNodeClick(list)
-    })
 }
 function handleNodeClick(e) {
   isFormCreate.value = false
@@ -107,22 +101,12 @@ function handleNodeClick(e){
 </script>
 <template>
   <div v-loading="loading" style="width: 100%;height: 100%;overflow: hidden;">
-        <dv-preview
+    <dv-preview ref="dvPreviewRef" class="dvPreviewRef" v-if="state.canvasStylePreview && dataInitState"
-            ref="dvPreviewRef"
+      :show-position="showPosition" :canvas-data-preview="state.canvasDataPreview"
-            class="dvPreviewRef"
+      :canvas-style-preview="state.canvasStylePreview" :canvas-view-info-preview="state.canvasViewInfoPreview"
-            v-if="state.canvasStylePreview && dataInitState"
+      :dv-info="state.dvInfo" :cur-preview-gap="state.curPreviewGap" :download-status="downloadStatus"></dv-preview>
-            :show-position="showPosition"
-            :canvas-data-preview="state.canvasDataPreview"
-            :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>
 </template>
-<style lang="less" scoped>
+<style lang="less" scoped></style>
-
-</style>