Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3

# Conflicts:
#	nezha-fronted/src/components/charts/chartDataFormat.js

nezha-fronted/src/assets/css/components/chart/chart.scss

@@ -430,6 +430,9 @@
   flex-wrap: wrap;
   padding: 5px;
   box-sizing: border-box;
+  flex-direction: row;
+  align-items: center;
+  align-content: center;
   .chart-stat-item{
     display: flex;
     justify-content: center;
@@ -441,6 +444,7 @@
     padding: 2px;
     overflow: hidden;
     color: $--color-text-regular;
+    flex-grow: 1
   }
 }
 .chart-gauge-box{

nezha-fronted/src/components/chart/chartDetail.vue

@@ -3,7 +3,7 @@
     <div class="basic-info">
       <div class="basic-info-title">
         <span style="cursor: pointer"><i @click="hideElement" :class="{'nz-icon nz-icon-caret-right': showBasicInfo,'nz-icon nz-icon-caret-bottom': !showBasicInfo}"></i></span>
-        <span>Basic info</span>
+        <span>{{$t('overall.basicInfo')}}</span>
       </div>
       <el-collapse-transition>
         <!--asset info-->
@@ -78,7 +78,7 @@
             </div>
           </div>
           <div class="basic-info-table-list">
-            <div class="basic-info-table-title">Endpoint</div>
+            <div class="basic-info-table-title">{{$t('asset.endpoint')}}</div>
             <div class="basic-info-table-value">
               <i class="nz-icon nz-icon-overview-endpoint monitorColor"></i>&nbsp;
               <span>{{chartDetail ? chartDetail.endpointNum : 0}}</span>

nezha-fronted/src/components/charts/chartDataFormat.js

@@ -4,8 +4,12 @@
 * type:自定义参数，用于区分是y轴调用还是tooltip调用,以设置不同精度  type =1 y轴调用 type=2 tooltip调用
 * */
 import bus from '../../libs/bus'
-
+import { formatScientificNotation } from '@/components/common/js/tools'
 function none (value, index) {
+  const scientificNotationValue = formatScientificNotation(num, dot)
+  if (!numberWithEConvent(scientificNotationValue)) {
+    return scientificNotationValue
+  }
   return keepDoubleNumber(value)
 }
 function short (value, index, type = 1, dot) {
@@ -18,14 +22,26 @@ function short (value, index, type = 1, dot) {
   }
 }
 function percent01 (value, index) {
+  const scientificNotationValue = formatScientificNotation(value, 2)
+  if (!numberWithEConvent(scientificNotationValue)) {
+    return `${scientificNotationValue} %`
+  }
   value = parseFloat((Number(value)).toFixed(2))
   return `${value} %`
 }
 function percent02 (value, index) {
-  value = parseFloat((Number(value) * 100).toFixed(2))
+  const scientificNotationValue = formatScientificNotation(value, 2)
+  if (!numberWithEConvent(scientificNotationValue)) {
+    return `${scientificNotationValue} %`
+  }
+  value = parseFloat((Number(value) * 100))
   return `${value} %`
 }
 function localFormat (value, index) {
+  const scientificNotationValue = formatScientificNotation(value, 2)
+  if (!numberWithEConvent(scientificNotationValue)) {
+    return `${scientificNotationValue} %`
+  }
   let num = (value || 0).toString()
   let result = ''
   while (num.length > 3) {
@@ -287,6 +303,32 @@ function days (value, index, type = 1, dot) {
     return timeCompute(value, 'day', 3)
   }
 }
+function numberWithEConvent (num) {
+  if (num) {
+    if ((('' + num).indexOf('E') !== -1) || (('' + num).indexOf('e') !== -1)) {
+      const regExp = /'^((\\d+.?\\d+)[Ee]{1}(\\d+))$', 'ig'/
+      let result = regExp.exec(num)
+      let resultValue = ''
+      let power
+      if (result != null) {
+        resultValue = result[2]
+        power = result[3]
+        result = regExp.exec(num)
+      }
+
+      if (resultValue) {
+        if (power) {
+          const powVer = Math.pow(10, power)
+          resultValue = resultValue * powVer
+          return resultValue
+        }
+      }
+    } else {
+      return num
+    }
+  }
+  return 0
+}
 /*
 * 一般数值格式化方法
 * num: 需要格式化的值
@@ -295,6 +337,10 @@ function days (value, index, type = 1, dot) {
 * dot：保留的小数位，
 * */
 function asciiCompute (num, ascii, units, dot = 2) {
+  const scientificNotationValue = formatScientificNotation(num, dot)
+  if (!numberWithEConvent(scientificNotationValue)) {
+    return scientificNotationValue
+  }
   if (!num && num !== 0 && num !== '0') {
     return ''
   }

nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue

@@ -18,7 +18,7 @@
                 </span>
                 </div>
                 <div class="detail-top-search" style="text-align: center" v-else>
-                  All
+                  {{$t('config.assetLabel.all')}}
                 </div>
                 <i class="nz-icon nz-icon-arrow-down search-value"/>
               </div>
@@ -50,7 +50,7 @@
                 </span>
                 </div>
                 <div class="detail-top-search" style="text-align: center" v-else>
-                  All
+                 {{$t('config.assetLabel.all')}}
                 </div>
                 <i class="nz-icon nz-icon-arrow-down search-value"/>
               </div>

nezha-fronted/src/components/common/detailView/view/detailViewRight.vue

@@ -160,32 +160,32 @@ export default {
           panel: [
             { prop: 'panelTab', name: this.$t('overall.detail'), active: true },
             { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false },
-            { prop: 'endpointTab', name: 'Endpoint', active: false },
+            { prop: 'endpointTab', name: this.$t('asset.endpoint'), active: false },
-            { prop: 'log', name: 'Log', active: false }
+            { prop: 'log', name: this.$t('overall.logs'), active: false }
           ],
           alertMessage: [
             { prop: 'panelTab', name: this.$t('overall.detail'), active: false },
             { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: true },
-            { prop: 'endpointTab', name: 'Endpoint', active: false },
+            { prop: 'endpointTab', name: this.$t('asset.endpoint'), active: false },
-            { prop: 'log', name: 'Log', active: false }
+            { prop: 'log', name: this.$t('overall.logs'), active: false }
           ],
           endpoint: [
             { prop: 'panelTab', name: this.$t('overall.detail'), active: false },
             { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false },
-            { prop: 'endpointTab', name: 'Endpoint', active: true },
+            { prop: 'endpointTab', name: this.$t('asset.endpoint'), active: true },
-            { prop: 'log', name: 'Log', active: false }
+            { prop: 'log', name: this.$t('overall.logs'), active: false }
           ],
           log: [
             { prop: 'panelTab', name: this.$t('overall.detail'), active: false },
             { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false },
-            { prop: 'endpointTab', name: 'Endpoint', active: false },
+            { prop: 'endpointTab', name: this.$t('asset.endpoint'), active: false },
-            { prop: 'log', name: 'Log', active: true }
+            { prop: 'log', name: this.$t('overall.logs'), active: true }
           ],
           alertMessageSub: [
             { prop: 'panelTab', name: this.$t('overall.detail'), active: false },
             { prop: 'alertMessageTab', name: this.$t('overall.alert'), active: false },
-            { prop: 'endpointTab', name: 'Endpoint', active: false },
+            { prop: 'endpointTab', name: this.$t('asset.endpoint'), active: false },
-            { prop: 'log', name: 'Log', active: false },
+            { prop: 'log', name: this.$t('overall.logs'), active: false },
             { prop: 'assetSubTab', name: this.$t('overall.assetSubTab'), active: true }
           ]
         },
@@ -200,8 +200,8 @@ export default {
           endpointTabTitle: [
             { prop: 'panelTab', name: this.$t('overall.detail') },
             { prop: 'endpointAlertMessage', name: this.$t('overall.alert') },
-            { prop: 'endpointQuery', name: 'Metrics' },
+            { prop: 'endpointQuery', name: this.$t('project.metrics.metrics')  },
-            { prop: 'log', name: 'Log' }
+            { prop: 'log', name: this.$t('overall.logs') }
           ]
         },
         chartTemp: {

nezha-fronted/src/components/common/globalSearch/globalSearch.vue

@@ -93,7 +93,7 @@
             {{$t('globalSearch.toEsc')}}
           </div>
           <div class="global-search-footer-right">
-            <div class="scope-box" v-for="item in scope" :class="item.isSelect ? 'is-select' : ''" :key="item.type" @click="scopeChange(item)" :title="item.type">
+            <div class="scope-box" v-for="item in scope" :class="item.isSelect ? 'is-select' : ''" :key="item.type" @click="scopeChange(item)" :title="item.title">
               <i class="nz-icon" :class="selectIcon(item)" />
               {{stat[item.type] || 0}}
             </div>

nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue

@@ -503,12 +503,12 @@ export default {
     searchItemPath (item) {
       let str = ''
       switch (item.type) {
-        case 'asset' : str += '<span>Asset</span> <span>/</span> <span>Asset</span>'; break
+        case 'asset' : str += `<span>${this.$t('overall.asset')}</span> <span>/</span> <span>${this.$t('overall.asset')}</span>`; break
-        case 'datacenter' : str += '<span>Setting</span> <span>/</span> <span>Data center</span>'; break
+        case 'datacenter' : str += `<span>${this.$t('config.config')}</span> <span>/</span> <span>${this.$t('overall.dc')}</span>`; break
-        case 'project' : str += '<span>Monitor</span> <span>/</span> <span>Project</span>'; break
+        case 'project' : str += `<span>${this.$t('config.system.monitor.monitor')}</span> <span>/</span> <span>${this.$t('dashboard.overview.project.project')}</span>`; break
-        case 'module' :str += '<span>Monitor</span> <span>/</span> <span>Module</span>'; break
+        case 'module' :str += `<span>${this.$t('config.system.monitor.monitor')}</span> <span>/</span> <span>${this.$t('overall.module')}</span>`; break
-        case 'endpoint' : str += '<span>Monitor</span> <span>/</span> <span>Endpoint</span>'; break
+        case 'endpoint' : str += `<span>${this.$t('config.system.monitor.monitor')}</span> <span>/</span> <span>${this.$t('asset.endpoint')}</span>`; break
-        case 'alertrule' : str += '<span>Alert</span> <span>/</span> <span>Alert rule</span>'; break
+        case 'alertrule' : str += `<span>${this.$t('overall.alert')}</span> <span>/</span> <span>${this.$t('dashboard.overview.alert.alertRule')}</span>`; break
       }
       return str
     },

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

@@ -19,7 +19,7 @@
             node-key="id"
             ref="assetTypeTree">
             <div :class="{'tree--node__disabled': data.disabled}" class="tree--node" slot-scope="{ node, data }">
-              <span>{{ node.label }}</span>
+              <span>{{ $t(node.label) }}</span>
             </div>
           </el-tree>
         </div>

nezha-fronted/src/components/common/rightBox/asset/assetBox.vue

@@ -35,8 +35,8 @@
             <el-select v-model="editAsset.stateId" class="right-box__select" :placeholder="$t('el.select.placeholder')" popper-class="right-box-select-top prevent-clickoutside" size="small" value-key="id">
               <el-option v-for="state in options.stateOptions" :key="state.id" :label="state.name" :value="state.id">
                 <div style="display: flex;justify-content: space-between;padding: 5px;">
-                  <div>{{state.name}}</div>
+                  <div>{{$t(state.name)}}</div>
-                  <div style="width: 450px;text-overflow: ellipsis;overflow: hidden;white-space: nowrap;color: #999999" :title="state.remark">{{state.remark}}</div>
+                  <div style="width: 450px;text-overflow: ellipsis;overflow: hidden;white-space: nowrap;color: #999999" :title="state.remark">{{$t(state.remark)}}</div>
                 </div>
               </el-option>
             </el-select>

nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue

@@ -185,8 +185,8 @@ export default {
       filterPanel: '',
       groupArr: [],
       varTypeArr: [
-        { name: 'Asset', id: 1 },
+        { name: this.$t('asset.asset'), id: 1 },
-        { name: 'Endpoint', id: 2 }
+        { name: this.$t('asset.endpoint'), id: 2 }
       ],
       panelName: '',
       rules: {

nezha-fronted/src/components/common/rightBox/chart/publicConfig.js

@@ -36,13 +36,13 @@ export default {
       statisticsList: this.$CONSTANTS.statisticsList,
       legendPositionList: [
         {
-          label: 'bottom',
+          label: this.$t('overall.bottom'),
           value: 'bottom'
         }, {
-          label: 'left',
+          label: this.$t('overall.left'),
           value: 'left'
         }, {
-          label: 'right',
+          label: this.$t('overall.right'),
           value: 'right'
         }
       ],
@@ -156,16 +156,16 @@ export default {
       ],
       textList: [
         {
-          label: 'All',
+          label: this.$t('config.assetLabel.all'),
           value: 'all'
         }, {
-          label: 'Value',
+          label: this.$t('overall.value'),
           value: 'value'
         }, {
-          label: 'Legend',
+          label: this.$t('dashboard.panel.chartForm.legend'),
           value: 'legend'
         }, {
-          label: 'None',
+          label: this.$t('config.assetLabel.all'),
           value: 'none'
         }
       ],

nezha-fronted/src/components/page/asset/asset.vue

@@ -422,7 +422,7 @@ export default {
           index: -1
         },
         assetLabel: {
-          label: 'More',
+          label: this.$t('overall.more'),
           key: 'fieldsDetail',
           type: 'dropdownCheckBox',
           children: [],

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

@@ -48,6 +48,7 @@ export default {
     return {
       url: 'sys/log',
       tableId: 'operationLogTable', // 需要分页的table的id，用于记录每页数量
+      orderBy: '-id',
       searchMsg: { // 给搜索框子组件传递的信息
         searchLabelList: [
           {

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

@@ -115,6 +115,7 @@ export default {
     return {
       url: 'terminal/session',
       tableId: 'terminalLogTable', // 需要分页的table的id，用于记录每页数量
+      orderBy: '-id',
       searchMsg: { // 给搜索框子组件传递的信息
         searchLabelList: [
           {