From 9afa1c42f81885e272afe270883414936223e850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=8C=AF=E8=8A=B3?= <zhaozhenfang@kylinos.cn>
Date: Wed, 26 Feb 2025 15:01:47 +0800
Subject: [PATCH] fix: fix known issues

---
 .../src/views/Home/components/Sidebar.vue     | 60 ++++++++++---------
 frontend/src/views/Plugin/plugin.ts           |  3 +-
 .../src/views/Role/components/RoleForm.vue    |  6 +-
 .../src/views/Role/components/authData.ts     |  5 +-
 4 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/frontend/src/views/Home/components/Sidebar.vue b/frontend/src/views/Home/components/Sidebar.vue
index 7b836733..b9bd0447 100644
--- a/frontend/src/views/Home/components/Sidebar.vue
+++ b/frontend/src/views/Home/components/Sidebar.vue
@@ -6,38 +6,40 @@
  * Date: Wed Jan 3 18:00:12 2024 +0800
 -->
 <template>
-  <div class="menu">
-    <el-menu :collapse="props.isCollapse" :router="true">
-      <template v-for="(menu, index) in routes" :key="index">
-        <!-- 带子菜单的项 -->
-        <el-sub-menu v-if="menu.subMenus && !menu.hidden" :index="menu.path">
-          <template #title>
-            <el-icon>
-              <component :is="menu.icon"></component>
-            </el-icon>
-            &nbsp;
-            <span>{{ menu.title }}</span>
-          </template>
+  <el-scrollbar style="height: 100%">
+    <div class="menu">
+      <el-menu :collapse="props.isCollapse" :router="true">
+        <template v-for="(menu, index) in routes" :key="index">
+          <!-- 带子菜单的项 -->
+          <el-sub-menu v-if="menu.subMenus && !menu.hidden" :index="menu.path">
+            <template #title>
+              <el-icon>
+                <component :is="menu.icon"></component>
+              </el-icon>
+              &nbsp;
+              <span>{{ menu.title }}</span>
+            </template>
+            <el-menu-item
+              v-for="(subMenu, subIndex) in menu.subMenus"
+              :index="subMenu.path"
+              :class="subMenu.title === activeTitle ? 'active' : 'inactive'"
+            >
+              {{ subMenu.title }}
+            </el-menu-item>
+          </el-sub-menu>
+          <!-- 不带子菜单的项 -->
           <el-menu-item
-            v-for="(subMenu, subIndex) in menu.subMenus"
-            :index="subMenu.path"
-            :class="subMenu.title === activeTitle ? 'active' : 'inactive'"
+            v-if="!menu.subMenus && !menu.hidden"
+            :index="menu.path"
+            :class="menu.title === activeTitle ? 'active' : 'inactive'"
           >
-            {{ subMenu.title }}
+            <el-icon> <component :is="menu.icon"></component> </el-icon>&nbsp;
+            <template #title>{{ menu.title }}</template>
           </el-menu-item>
-        </el-sub-menu>
-        <!-- 不带子菜单的项 -->
-        <el-menu-item
-          v-if="!menu.subMenus && !menu.hidden"
-          :index="menu.path"
-          :class="menu.title === activeTitle ? 'active' : 'inactive'"
-        >
-          <el-icon> <component :is="menu.icon"></component> </el-icon>&nbsp;
-          <template #title>{{ menu.title }}</template>
-        </el-menu-item>
-      </template>
-    </el-menu>
-  </div>
+        </template>
+      </el-menu>
+    </div>
+  </el-scrollbar>
 </template>
 
 <script setup lang="ts">
diff --git a/frontend/src/views/Plugin/plugin.ts b/frontend/src/views/Plugin/plugin.ts
index 6a1614a5..799c3c68 100644
--- a/frontend/src/views/Plugin/plugin.ts
+++ b/frontend/src/views/Plugin/plugin.ts
@@ -24,12 +24,13 @@ export function updatePlugins() {
     .then((res: any) => {
       if (res.code === RespCodeOK) {
         let iframes: any = [];
+        usePluginStore().extention = [];
         res.data.forEach((item: any, index: number) => {
           // 删除插件tagview、增删全局扩展点
           let pluginExt = item.extentions.filter((item: Extention) => item.type === "machine");
           if (item.enabled === 0) {
             clearTagview(item);
-            usePluginStore().delExtention(pluginExt);
+            // usePluginStore().delExtention(pluginExt);
           } else {
             usePluginStore().addExtention(pluginExt);
           }
diff --git a/frontend/src/views/Role/components/RoleForm.vue b/frontend/src/views/Role/components/RoleForm.vue
index bf5ec3c5..f59e10e9 100644
--- a/frontend/src/views/Role/components/RoleForm.vue
+++ b/frontend/src/views/Role/components/RoleForm.vue
@@ -11,7 +11,11 @@
       <el-table-column label="菜单权限" width="180">
         <template #default="scope">
           <el-checkbox-group v-model="checkedMenu" @change="handleCheckedMenuChange" v-if="scope.row.display">
-            <el-checkbox :label="scope.row.menuName" :disabled="!props.showEdit" :key="scope.row.menuName">
+            <el-checkbox
+              :label="scope.row.menuName"
+              :disabled="!props.showEdit || scope.row.disabled"
+              :key="scope.row.menuName"
+            >
               {{ scope.row.label }}</el-checkbox
             >
           </el-checkbox-group>
diff --git a/frontend/src/views/Role/components/authData.ts b/frontend/src/views/Role/components/authData.ts
index 1ea102ce..dd14e011 100644
--- a/frontend/src/views/Role/components/authData.ts
+++ b/frontend/src/views/Role/components/authData.ts
@@ -229,6 +229,7 @@ export let authData = [
     label: "监控告警",
     isMenu: true,
     display: true,
+    disabled: true,
     menuName: "monitor",
     operations: [
       {
@@ -244,6 +245,7 @@ export let authData = [
     label: "主机日志",
     isMenu: true,
     display: true,
+    disabled: true,
     menuName: "logs",
     operations: [
       {
@@ -259,7 +261,8 @@ export let authData = [
     label: "集群拓扑",
     isMenu: true,
     display: true,
-    menuName: "topo",
+    disabled: true,
+    menuName: "topology",
     operations: [
       {
         id: "31",
-- 
Gitee