Merge branch 'apache:master' into appIdUser

apache · Jul 9, 2024 · 7493531 · 7493531
2 parents 9dcc68d + e18f81c
commit 7493531
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/dashboard/src/main/webapp/src/pages/ApplicationPage.vue b/dashboard/src/main/webapp/src/pages/ApplicationPage.vue
@@ -43,8 +43,18 @@
       <el-table :data="pageData.appInfoData" height="250" style="width: 100%">
         <el-table-column prop="appId" label="AppId" min-width="180" />
         <el-table-column prop="userName" label="UserName" min-width="180" />
-        <el-table-column prop="registrationTime" label="Registration Time" min-width="180" :formatter="dateFormatter" />
-        <el-table-column prop="updateTime" label="Update Time" min-width="180" :formatter="dateFormatter" />
+        <el-table-column
+          prop="registrationTime"
+          label="Registration Time"
+          min-width="180"
+          :formatter="dateFormatter"
+        />
+        <el-table-column
+          prop="updateTime"
+          label="Update Time"
+          min-width="180"
+          :formatter="dateFormatter"
+        />
       </el-table>
     </div>
   </div>

diff --git a/dashboard/src/main/webapp/src/pages/ShuffleServerPage.vue b/dashboard/src/main/webapp/src/pages/ShuffleServerPage.vue
@@ -19,7 +19,7 @@
   <div>
     <el-row :gutter="20">
       <el-col :span="4">
-        <router-link to="/shuffleserverpage/activeNodeList">
+        <router-link class="router-link-active" to="/shuffleserverpage/activeNodeList">
           <el-card class="box-card" shadow="hover">
             <template #header>
               <div class="card-header">
@@ -31,7 +31,7 @@
         </router-link>
       </el-col>
       <el-col :span="4">
-        <router-link to="/shuffleserverpage/decommissioningNodeList">
+        <router-link class="router-link-active" to="/shuffleserverpage/decommissioningNodeList">
           <el-card class="box-card" shadow="hover">
             <template #header>
               <div class="card-header">
@@ -45,7 +45,7 @@
         </router-link>
       </el-col>
       <el-col :span="4">
-        <router-link to="/shuffleserverpage/decommissionedNodeList">
+        <router-link class="router-link-active" to="/shuffleserverpage/decommissionedNodeList">
           <el-card class="box-card" shadow="hover">
             <template #header>
               <div class="card-header">
@@ -59,7 +59,7 @@
         </router-link>
       </el-col>
       <el-col :span="4">
-        <router-link to="/shuffleserverpage/lostNodeList">
+        <router-link class="router-link-active" to="/shuffleserverpage/lostNodeList">
           <el-card class="box-card" shadow="hover">
             <template #header>
               <div class="card-header">
@@ -71,7 +71,7 @@
         </router-link>
       </el-col>
       <el-col :span="4">
-        <router-link to="/shuffleserverpage/unhealthyNodeList">
+        <router-link class="router-link-active" to="/shuffleserverpage/unhealthyNodeList">
           <el-card class="box-card" shadow="hover">
             <template #header>
               <div class="card-header">
@@ -83,7 +83,7 @@
         </router-link>
       </el-col>
       <el-col :span="4">
-        <router-link to="/shuffleserverpage/excludeNodeList">
+        <router-link class="router-link-active" to="/shuffleserverpage/excludeNodeList">
           <el-card class="box-card" shadow="hover">
             <template #header>
               <div class="card-header">
@@ -151,13 +151,17 @@ export default {
   font-size: larger;
 }
 
+/* Remove the underscore from the route label. */
+.router-link-active {
+  text-decoration: none;
+}
+
 .activenode {
   font-family: 'Lantinghei SC';
   font-style: normal;
   font-weight: bolder;
   font-size: 30px;
   color: green;
-  text-decoration: none;
 }
 
 .decommissioningnode {
@@ -166,7 +170,6 @@ export default {
   font-weight: bolder;
   font-size: 30px;
   color: #00c4ff;
-  text-decoration: none;
 }
 
 .decommissionednode {
@@ -175,7 +178,6 @@ export default {
   font-weight: bolder;
   font-size: 30px;
   color: blue;
-  text-decoration: none;
 }
 
 .lostnode {
@@ -184,7 +186,6 @@ export default {
   font-weight: bolder;
   font-size: 30px;
   color: red;
-  text-decoration: none;
 }
 
 .unhealthynode {
@@ -193,14 +194,12 @@ export default {
   font-weight: bolder;
   font-size: 30px;
   color: #ff8800;
-  text-decoration: none;
 }
 
 .excludesnode {
   font-family: 'Lantinghei SC';
   font-style: normal;
   font-weight: bolder;
   font-size: 30px;
-  text-decoration: none;
 }
 </style>