Merge branch 'dev-3.8' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8

nezha-fronted/src/assets/css/components/page/config/mibBrowser.scss

@@ -219,7 +219,15 @@
     font-weight: bold;
     color: $--color-primary;
   }
-
+  .document-copy-text {
+    display: inline-block;
+    max-width: 100%;
+  }
+  .el-table__row:hover{
+    .document-copy-text {
+      max-width: calc(100% - 20px);
+    }
+  }
   .pagination-bottom {
     display: none;
   }
@@ -247,4 +255,4 @@
     right: 65px !important;
     height: 40px !important;
   }
-}
+}

nezha-fronted/src/assets/css/components/page/tool/trace.scss

@@ -154,14 +154,6 @@
       }
     }
     .data-wrap{
-      &>span{
-        display: block;
-        font-size: 14px;
-        color: $--color-text-regular;
-        letter-spacing: 0;
-        font-weight: 400;
-        margin: 30px 0 11px 0;
-      }
       height: 100%;
       overflow: hidden;
       &>span{

nezha-fronted/src/components/common/popBox/selectDashboard.vue

@@ -16,7 +16,7 @@
         <div class="pop-item-wider">
           <div class="dashboard-select-header">
             <el-input v-model="filterPanel" :placeholder="$t('overall.search')" clearable size="small"></el-input>
-            <button v-has="'main_add'" :title="$t('overall.createChart')" class="top-tool-btn margin-l-10" type="button" @click="addPlaylist" v-if="currentTab==='playlist'">
+            <button v-has="'main_add'" :title="$t('dashboard.createPlaylist')" class="top-tool-btn margin-l-10" type="button" @click="addPlaylist" v-if="currentTab==='playlist'">
               <i class="nz-icon-create-square nz-icon"></i>
             </button>
           </div>

nezha-fronted/src/components/layout/header.vue

@@ -182,7 +182,7 @@ export default {
       this.$get('logout').then(() => {
         sessionStorage.setItem('nz-is-logout', '1')
         this.logoutSuccess()
-        document.location.href = '/'
+        // document.location.href = '/'
       })
     },
     showPinDialog () {

nezha-fronted/src/components/page/config/mibBrowser.vue

@@ -146,14 +146,14 @@
               <pl-table-column v-slot="{row}" label="Name/OID">
                 <copy :copyData='row.name ? row.name : row.oid' :showInfo='true'>
                   <template slot="copy-text">
-                     <div class="too-long-split" @click="searchParam.oid = row.oid">{{row.name ? row.name : row.oid}}</div>
+                     <div class="too-long-split text-ellipsis" @click="searchParam.oid = row.oid" :title="row.name ? row.name : row.oid">{{row.name ? row.name : row.oid}}</div>
                   </template>
                 </copy>
               </pl-table-column>
               <pl-table-column v-slot="{row}" label="Value">
                 <copy :copyData='row.value' :showInfo='row.value'>
                   <template slot="copy-text">
-                     <div @click="searchParam.oid = row.oid">{{row.value}}</div>
+                     <div @click="searchParam.oid = row.oid" :title="row.value" class="text-ellipsis">{{row.value}}</div>
                   </template>
                 </copy>
               </pl-table-column>

nezha-fronted/src/entrance/app/main.js

@@ -61,14 +61,14 @@ import hljs from 'highlight.js'
 VMdPreview.use(githubTheme, {
   Hljs: hljs
 })
-// Pace.options = {
-//   minTime: 0.1,
-//   ghostTime: 0.1,
-//   restartOnRequestAfter: 0.1
-// }
+Pace.options = {
+  minTime: 100,
+  ghostTime: 100,
+  restartOnRequestAfter: 100
+}
 window.Meta2d = Meta2d
 Vue.use(VMdPreview)
-Vue.use(Pace)
+// Vue.use(Pace)
 
 Vue.use(VueIntro)
 Vue.use(htmlToPdf)

nezha-fronted/src/store/user.js

@@ -191,6 +191,7 @@ const user = {
       localStorage.removeItem('nz-token')
       localStorage.removeItem('nz-user-id')
       store.commit('closeTerminal')
+      window.location.reload()
     }
   }
 }