You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2023/02/17 05:29:48 UTC

[skywalking-booster-ui] branch main updated: feat: optimize menus and add Windows monitoring menu (#236)

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-booster-ui.git


The following commit(s) were added to refs/heads/main by this push:
     new b247ed1  feat: optimize menus and add Windows monitoring menu (#236)
b247ed1 is described below

commit b247ed1c2487092cd7387d64cb6089d82e74cd57
Author: Fine0830 <fa...@gmail.com>
AuthorDate: Fri Feb 17 13:29:42 2023 +0800

    feat: optimize menus and add Windows monitoring menu (#236)
---
 src/layout/components/SideBar.vue |  7 ++++---
 src/locales/lang/en.ts            |  1 +
 src/locales/lang/es.ts            |  1 +
 src/locales/lang/zh.ts            |  1 +
 src/router/data/infrastructure.ts | 17 +++++++++++++++++
 src/styles/reset.scss             |  8 ++++++++
 6 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/layout/components/SideBar.vue b/src/layout/components/SideBar.vue
index f630503..c765c05 100644
--- a/src/layout/components/SideBar.vue
+++ b/src/layout/components/SideBar.vue
@@ -25,10 +25,11 @@ limitations under the License. -->
         :default-active="name"
         text-color="#efefef"
         :collapse="isCollapse"
+        :collapse-transition="false"
         :style="{ border: 'none' }"
       >
         <template v-for="(menu, index) in routes" :key="index">
-          <el-sub-menu :index="String(menu.name)" v-if="menu.meta.hasGroup">
+          <el-sub-menu :index="String(menu.name)" v-if="menu.meta.hasGroup" popper-class="sub-list">
             <template #title>
               <router-link class="items" :to="menu.path">
                 <el-icon class="menu-icons" :style="{ marginRight: '12px' }" @mouseover="setCollapse">
@@ -49,12 +50,12 @@ limitations under the License. -->
           </el-sub-menu>
           <el-menu-item :index="String(menu.name)" @click="changePage(menu)" v-else>
             <el-icon class="menu-icons" :style="{ marginRight: '12px' }" @mouseover="setCollapse">
-              <router-link class="items" :to="menu.children[0].path">
+              <router-link class="items menu-title" :to="menu.children[0].path">
                 <Icon size="lg" :iconName="menu.meta.icon" />
               </router-link>
             </el-icon>
             <template #title>
-              <router-link class="items" :to="menu.children[0].path">
+              <router-link class="items menu-title" :to="menu.children[0].path">
                 <span class="title">{{ t(menu.meta.title) }}</span>
               </router-link>
             </template>
diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts
index d6bc68e..256aebd 100644
--- a/src/locales/lang/en.ts
+++ b/src/locales/lang/en.ts
@@ -185,6 +185,7 @@ const msg = {
   setDuration: "Lock Query Duration",
   openFunction: "OpenFunction",
   period: "Period",
+  windows: "Windows",
   seconds: "Seconds",
   hourTip: "Select Hour",
   minuteTip: "Select Minute",
diff --git a/src/locales/lang/es.ts b/src/locales/lang/es.ts
index 0c18693..6814858 100644
--- a/src/locales/lang/es.ts
+++ b/src/locales/lang/es.ts
@@ -187,6 +187,7 @@ const msg = {
   when5xx: "Ejemplo de solicitud y respuesta http con seguimiento cuando el Código de respuesta está entre 500 y 599",
   taskTitle: "Reglas de recolección de peticiones y respuestas HTTP",
   period: "Period",
+  windows: "Windows",
   second: "s",
   yearSuffix: "Año",
   monthsHead: "Ene_Feb_Mar_Abr_May_Jun_Jul_Ago_Set_Oct_Nov_Dic",
diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts
index 8c79a7e..90f27eb 100644
--- a/src/locales/lang/zh.ts
+++ b/src/locales/lang/zh.ts
@@ -182,6 +182,7 @@ const msg = {
   setDuration: "锁定查询持续时间",
   openFunction: "OpenFunction",
   period: "周期",
+  windows: "Windows",
   seconds: "秒",
   hourTip: "选择小时",
   minuteTip: "选择分钟",
diff --git a/src/router/data/infrastructure.ts b/src/router/data/infrastructure.ts
index 79bf759..d2b5969 100644
--- a/src/router/data/infrastructure.ts
+++ b/src/router/data/infrastructure.ts
@@ -43,6 +43,23 @@ export default [
           layer: "OS_LINUX",
         },
       },
+      {
+        path: "/windows",
+        name: "Windows",
+        meta: {
+          title: "windows",
+          layer: "OS_WINDOWS",
+        },
+      },
+      {
+        path: "/windows/tab/:activeTabIndex",
+        name: "WindowsActiveTabIndex",
+        meta: {
+          title: "windows",
+          notShow: true,
+          layer: "OS_WINDOWS",
+        },
+      },
     ],
   },
 ];
diff --git a/src/styles/reset.scss b/src/styles/reset.scss
index 7d62b6a..785e7c5 100644
--- a/src/styles/reset.scss
+++ b/src/styles/reset.scss
@@ -204,3 +204,11 @@ div.vis-tooltip {
 .vis-item.vis-selected.Normal {
   color: #1a1a1a !important;
 }
+
+.el-menu--vertical.sub-list {
+  display: none;
+}
+
+div:has(> a.menu-title) {
+  display: none;
+}