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

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

@@ -194,7 +194,7 @@ export default {
     },
     // 参数 isRefresh 标识是否是刷新操作
     getChartData (isRefresh, params) { // 获取chart的数据前的准备 主要用于处理时间参数
-      if (!this.variablesInit) { // 变量未加载完成 不请求数据
+      if (!this.variablesInit || !this.timerInit) { // 变量未加载完成 不请求数据
         return
       }
       this.chartData = window.dataJson ? this.chartData : []

nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue

@@ -618,6 +618,10 @@ export default {
         this.$set(this.searchTime, 2, val + 'd')
       }
       this.$refs.pickTime.$refs.timePicker.searchTime = this.searchTime
+      this.$store.dispatch('dispatchPanelTime', {
+        time: this.searchTime,
+        nowTimeType: this.nowTimeType
+      })
     },
     getVarType (from) {
       if (from === this.fromRoute.asset) {
@@ -878,13 +882,15 @@ export default {
       })
     },
     setTimePickerRange () {
+      this.$nextTick(() => {
         if (!this.timePickerLocked || !this.timePickerRange.nowTimeType) {
           this.setDefaultTimeRange()
         }
         const nowTimeType = this.nowTimeType = this.timePickerRange.nowTimeType
         this.searchTime = this.timePickerRange.time
-      this.$refs.pickTime.$refs.timePicker.setTimeRange(this.nowTimeType, this.searchTime)
+        this.$refs.pickTime && this.$refs.pickTime.$refs.timePicker.setTimeRange(this.nowTimeType, this.searchTime)
         this.setSearchTime(nowTimeType.type, nowTimeType.value, nowTimeType)
+      })
     },
     // 设置默认刷新
     setDefaultRefresh () {

nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue

@@ -137,13 +137,15 @@ export default {
       this.queryLogData()
     },
     setTimePickerRange () {
+      this.$nextTick(() => {
         if (!this.timePickerLocked || !this.timePickerRange.nowTimeType) {
           return
         }
         const nowTimeType = this.nowTimeType = this.timePickerRange.nowTimeType
         this.filterTime = this.timePickerRange.time
-      this.$refs.pickTime.$refs.timePicker.setTimeRange(this.nowTimeType, this.filterTime)
+        this.$refs.pickTime && this.$refs.pickTime.$refs.timePicker.setTimeRange(this.nowTimeType, this.filterTime)
         this.setSearchTime(nowTimeType.type, nowTimeType.value, nowTimeType)
+      })
     },
     setSearchTime (type, val) { // 设置searchTime
       if (type === 'minute') {

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

@@ -28,7 +28,7 @@
       <div class="calendar-popover-text">
         <i class="nz-icon"
            v-if="showLocked"
-           @click.stop="changeLocked"
+           @click.stop="changeLocked()"
            :title="timePickerLocked ? $t('timepicker.unlockTime') : $t('timepicker.lockTime')"
            :class="timePickerLocked ? 'nz-icon-push-pin-line colorfa901c' : 'nz-icon-push-pin-line'"
            style="margin-right: 5px;cursor: pointer"

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

@@ -103,6 +103,7 @@
               <chart-list
                 ref="chartList"
                 :variablesInit="variablesInit"
+                :timerInit="true"
                 name="dashboard"
                 :dashboardId="showPanel.id"
                 :class="{'show-top':showTopBtn, 'is-dashboard': true}"
@@ -1171,14 +1172,17 @@ export default {
       })
     },
     setTimePickerRange () {
+      this.$nextTick(() => {
+        console.log(13123213,this.timePickerLocked, this.timePickerRange.nowTimeType)
         if (this.$route.query.searchTime) return
         if (!this.timePickerLocked || !this.timePickerRange.nowTimeType) {
           this.setDefaultTimeRange()
         }
         const nowTimeType = this.nowTimeType = this.timePickerRange.nowTimeType
         this.searchTime = this.timePickerRange.time
-      this.$refs.pickTime.$refs.timePicker.setTimeRange(this.nowTimeType, this.searchTime)
+        this.$refs.pickTime && this.$refs.pickTime.$refs.timePicker.setTimeRange(this.nowTimeType, this.searchTime)
         this.setSearchTime(nowTimeType.type, nowTimeType.value, nowTimeType)
+      })
     },
     // 设置默认刷新
     setDefaultRefresh () {
@@ -1203,10 +1207,12 @@ export default {
       mode: { target: this, propertyName: 'mode', type: 'string' }
     }
     this.initQueryFromPath(searchKeys)
+    if (this.$route.query.searchTime) {
       this.$store.dispatch('dispatchTimePickerRange', {
         time: this.searchTime,
         nowTimeType: this.nowTimeType
       })
+    }
     this.showPanel.id = this.dashboardId
     this.filter.dashboardId = this.dashboardId
     // 设置查看模式

nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue

@@ -3657,14 +3657,16 @@ export default {
       dom.querySelector(id).scrollIntoView(true)
     },
     setTimePickerRange () {
+      this.$nextTick(() => {
         console.log(this.timePickerLocked, !this.timePickerRange.nowTimeType)
         if (!this.timePickerLocked || !this.timePickerRange.nowTimeType) {
           return
         }
         const nowTimeType = this.nowTimeType = this.timePickerRange.nowTimeType
         this.filterTime = this.timePickerRange.time
-      this.$refs.pickTime.$refs.timePicker.setTimeRange(this.nowTimeType, this.filterTime)
+        this.$refs.pickTime && this.$refs.pickTime.$refs.timePicker.setTimeRange(this.nowTimeType, this.filterTime)
         this.setSearchTime(nowTimeType.type, nowTimeType.value, nowTimeType)
+      })
     },
     selectMetricsLogs (val, icon, label) {
       if (val) {

nezha-fronted/src/store/timePicker.js

@@ -25,6 +25,7 @@ const timePicker = {
       store.commit('setTimePickerLocked', flag)
     },
     dispatchTimePickerRange (store, range) {
+      console.log('dispatchTimePickerRange', range)
       store.commit('setTimePickerRange', range)
     }
   }