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

nezha-fronted/src/assets/css/common.scss

@@ -45,6 +45,7 @@
   right: 0;
   left: unset !important;
   top: 30px;
+  z-index: 600;
 }
 .nz-icon-minus-medium {
   color: $--color-text-regular;

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

@@ -1,12 +1,13 @@
 .profile {
   display: flex;
-  height: calc(100% - 10px);
+  height: 100%;
   .profile-left {
-    margin: 10px 0 10px 10px;
+    //margin: 10px 0 10px 10px;
     background: $--background-color-empty;
     box-shadow: 0 1px 2px 0 rgba(0,0,0,0.06);
     border-radius: 2px;
-    height: calc(100% - 20px);
+    //height: calc(100% - 20px);
+    border-right: 1px solid $--explore-border-color-bottom;
     width: 360px;
     overflow: auto;
     position: relative;
@@ -224,7 +225,7 @@
   }
   .list-page.profile-right {
     width: calc(100% - 370px);
-    padding: 11px 10px 7px 10px;
+    padding: 0px 0px 7px 0px;
     pxbox-shadow: 0 1px 2px 0 rgba(0,0,0,0.06);
     border-radius: 2px;
     .nz-table2 {

nezha-fronted/src/assets/css/components/page/dashboard/panel.scss

@@ -123,6 +123,10 @@
     }
   }
 }
+.select-panel-title{
+  font-weight: bold;
+  font-size: 14px;
+}
 /* end-chart list*/
 .panel-loading {
   position: fixed;

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

@@ -191,6 +191,9 @@ export default {
         offset = moment.tz(offset).format('Z')
         offset = Number.parseInt(offset)
         const localOffset = new Date().getTimezoneOffset() * 60 * 1000 * -1 // 默认 一分钟显示时区偏移的结果
+        if (window.dataJson) {
+          offset = new Date().getTimezoneOffset()* -1/60
+        }
         const tData = new Date(value - localOffset + offset * 60 * 60 * 1000)
         let hour = tData.getHours()
         hour = hour > 9 ? hour : '0' + hour // 加0补充为两位数字

nezha-fronted/src/components/common/mixin/exportHtml.js

@@ -11,7 +11,7 @@ export default {
         format: 'html',
         panelId: this.showPanel.id,
         start: this.$stringTimeParseToUnix(bus.formateTimeToTime(this.searchTime[0])),
-        end: this.$stringTimeParseToUnix(bus.formateTimeToTime(this.searchTime[0]))
+        end: this.$stringTimeParseToUnix(bus.formateTimeToTime(this.searchTime[1]))
       }
       this.$get('/visual/panel/snapshot', params, 'blob').then(res => {
         const self = this

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

@@ -12,7 +12,7 @@
         <span class="select-refresh-time-label" v-if="interval !== -1">{{interLabel}}</span>
         <i class="nz-icon nz-icon-arrow-down" style="font-size: 12px;"></i>
         <transition name="el-zoom-in-top">
-          <ul v-show="dropdownShow" class="el-dropdown-menu el-popper el-dropdown-menu--mini nz-dropdown">
+          <ul v-show="dropdownShow" class="el-dropdown-menu el-popper el-dropdown-menu--mini nz-dropdown" v-clickoutside="dropdownHandler">
             <li v-for="i in $CONSTANTS.intervalList" :key="i.value + i.label" :style="{color:interval === i.value || interval.value === i.value ? theme.themeColor : ''}" class="el-dropdown-menu__item dropdown-content" @click="selectInterval(i)">
               {{$t(i.label)}}
             </li>

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

@@ -303,14 +303,12 @@ export default {
 }
 </script>
 <style scoped>
+.theme-light .select-panel-title{
+  color: #333;
+}
 .starred-tree>>>.el-tree__empty-block{
   display: none;
 }
-.select-panel-title{
-  font-weight: bold;
-  font-size: 14px;
-  color: #333;
-}
 .el-rate__icon{
   color: #C0C4CC !important;
   cursor: pointer;

nezha-fronted/src/entrance/exportHtml/App.vue

@@ -14,7 +14,7 @@
             <div style="display: flex;flex-direction: column">
 <!--              <i class="nz-icon nz-icon-arrow-down"/>-->
               <div style="font-size: 18px;font-weight: 600;color: #333;margin-bottom: 3px;text-align: right"> {{dataJson.panel.data.name}} </div>
-              <span>  {{timeFormate(dataJson.start * 1000)}} - {{timeFormate(dataJson.start * 1000)}} </span>
+              <span>  {{timeFormate(dataJson.start * 1000)}} - {{timeFormate(dataJson.end * 1000)}} </span>
             </div>
           </div>
           <div  id="dashboardScrollbar" class="box-content"  ref="dashboardScrollbar" style='overflow:hidden; overflow-y: auto;height: calc(100% - 60px)'>
@@ -47,6 +47,7 @@
 
 <script>
 import chartList from '@/components/chart/chartList.vue'
+import moment from 'moment-timezone'
 import { loadI18n } from '@/components/common/i18n'
 import i18nData from '@/entrance/exportHtml/i18nData'
 const dataJson = window.dataJson || {}
@@ -65,6 +66,8 @@ export default {
   created () {
     this.$i18n.locale = this.dataJson.language
     loadI18n(i18nData)
+    const localOffset = moment.tz.guess()// 默认 一分钟显示时区偏移的结果
+    localStorage.setItem('nz-sys-timezone', JSON.stringify(localOffset))
   },
   mounted () {
   },