From 45283f7084e2a0ee2a38fbe6d6a33e1f8b5b3fd7 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 30 Dec 2021 11:33:24 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E4=BF=AE=E6=94=B9=20=20group?=
 =?UTF-8?q?=E9=87=8D=E5=8F=A0=E4=B8=8B=E6=96=B9chart=20=E7=9A=84bug=20?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=20=E7=82=B9=E5=87=BB=E8=8F=9C=E5=8D=95panel?=
 =?UTF-8?q?=E6=9C=AA=E8=B7=B3=E7=AC=AC=E4=B8=80=E4=B8=AApanel=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/chart/chart/chartGroup.vue   | 17 ++++++++++-------
 .../components/chart/chart/chartHexagonD3.vue   |  2 --
 .../src/components/chart/chart/chartTable.vue   |  3 ---
 .../src/components/chart/chart/tools.js         |  5 ++++-
 .../src/components/chart/chartMixin.js          |  5 -----
 .../src/components/chart/panelChart.vue         |  4 ++--
 .../common/rightBox/chart/chartRightBox.vue     | 10 +++++-----
 nezha-fronted/src/components/layout/home.vue    |  7 ++++++-
 .../src/components/page/dashboard/panel.vue     |  2 +-
 9 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartGroup.vue b/nezha-fronted/src/components/chart/chart/chartGroup.vue
index 45ec4bf22..52cd914cb 100644
--- a/nezha-fronted/src/components/chart/chart/chartGroup.vue
+++ b/nezha-fronted/src/components/chart/chart/chartGroup.vue
@@ -1,6 +1,7 @@
 <template>
   <div style="width: 100%;height: 100%">
     <chartList
+      v-if="chartInfo.loaded"
       ref="chartList"
       name="group"
       :class="{'show-top':showTopBtn}"
@@ -50,13 +51,15 @@ export default {
 
     },
     initChart () {
-      this.dataList = this.dataList.map(item => {
-        return {
-          ...item,
-          // hide: item.name.indexOf(this.filter.searchName) === -1, // 搜索条件
-          loaded: true
-        }
-      })
+      setTimeout(() => {
+        this.dataList = this.dataList.map(item => {
+          return {
+            ...item,
+            // hide: item.name.indexOf(this.filter.searchName) === -1, // 搜索条件
+            loaded: true
+          }
+        })
+      }, 100)
     }
   },
   watch: {
diff --git a/nezha-fronted/src/components/chart/chart/chartHexagonD3.vue b/nezha-fronted/src/components/chart/chart/chartHexagonD3.vue
index a1380ef59..45664e3d2 100644
--- a/nezha-fronted/src/components/chart/chart/chartHexagonD3.vue
+++ b/nezha-fronted/src/components/chart/chart/chartHexagonD3.vue
@@ -179,14 +179,12 @@ export default {
       return svg.node()
     },
     hexagonOver (that, e) { // 移入六边形
-      // console.log(that, e)
       this.tooltip.title = that.alias
       this.tooltip.value = that.showValue
       this.tooltip.show = true
       this.setPosition(e)
     },
     hexagonMove (e) { // 六边形内移动
-      // console.log(e)
       if (this.tooltip.show) {
         this.setPosition(e)
       }
diff --git a/nezha-fronted/src/components/chart/chart/chartTable.vue b/nezha-fronted/src/components/chart/chart/chartTable.vue
index 114870520..73261cef2 100644
--- a/nezha-fronted/src/components/chart/chart/chartTable.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTable.vue
@@ -148,7 +148,6 @@ export default {
       let sourceData = null
       sourceData = this.oldTableData
       orderBy = this.orderBy
-      console.log(orderBy)
       if (!orderBy || !orderBy.order) { // 没有排序 恢复默认值
         source = Object.assign([], sourceData)
       } else { // 排序之后的顺序
@@ -244,7 +243,6 @@ export default {
     },
     tableDataSort (orderBy) {
       this.orderBy = { order: orderBy.order, prop: orderBy.prop }
-      console.log(orderBy, this.orderBy)
       this.tableData = this.filterShowData(this.tableData)
     },
     // 本地正序
@@ -266,7 +264,6 @@ export default {
       return function (obj1, obj2) {
         const val1 = obj1.display[prop + 'display'].replace(/\s*/g, '')
         const val2 = obj2.display[prop + 'display'].replace(/\s*/g, '')
-        console.log(val1, val2, val1 < val2, val2 > val1)
         if (val1 < val2) {
           return -1
         } else if (val1 > val2) {
diff --git a/nezha-fronted/src/components/chart/chart/tools.js b/nezha-fronted/src/components/chart/chart/tools.js
index 7ffeeca48..fe94b5efd 100644
--- a/nezha-fronted/src/components/chart/chart/tools.js
+++ b/nezha-fronted/src/components/chart/chart/tools.js
@@ -117,7 +117,7 @@ export function isClock (type) {
 export function getGroupHeight (arr) {
   if (arr.length) {
     let lastItem = []
-    let maxY = 0
+    let maxY = arr[0].y
     arr.forEach((children, index) => {
       if (maxY == children.y) {
         lastItem.push(children)
@@ -132,6 +132,9 @@ export function getGroupHeight (arr) {
         maxHeight = last.height
       }
     })
+    if (maxY < 0) {
+      maxY = 0
+    }
     return maxHeight + maxY
   } else {
     return 1
diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js
index 971c65d56..a29eec108 100644
--- a/nezha-fronted/src/components/chart/chartMixin.js
+++ b/nezha-fronted/src/components/chart/chartMixin.js
@@ -131,11 +131,7 @@ export default {
       if (colorIndex >= 20) {
         const colorRandom = randomcolor()
         this.colorList.push(colorRandom)
-        // console.log(this.colorList.length, this.chartOption.color.length)
-        // this.chartOption.color.push(colorRandom)
-        // console.log(this.colorList.length, this.chartOption.color.length)
       }
-      // console.log(name, alias, statistics)
       this.legends.push({ name, alias, statistics, color: this.colorList[colorIndex] })
       return {
         name,
@@ -264,7 +260,6 @@ export default {
     chartData: {
       deep: true,
       handler (n) {
-        console.log(this.isInit)
         if (!this.isInit) {
           this.colorList = this.colorList.slice(0, 20)
           this.chartOption.color = this.chartOption.color.slice(0, 20)
diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index ce17e71fb..9406967a8 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -375,8 +375,8 @@ export default {
         this.chartInfo.height = height + this.headerHPadding
         this.chartInfo.h = height + this.headerHPadding
       } else {
-        this.chartInfo.height = this.headerH + height
-        this.chartInfo.h = this.headerH + height
+        this.chartInfo.height = height
+        this.chartInfo.h = height
       }
     },
     showFullscreen (show) {
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
index 77869ea23..416ffe056 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -210,18 +210,18 @@ export default {
           delete params.param.min
           delete params.param.max
         }
-        if (!params.x && !params.y) {
-          params.x = this.chartLastPosition.x + params.span > 12 ? 0 : this.chartLastPosition.x
-          params.y = this.chartLastPosition.y + 12
-        }
         if (!params.x && !params.y && params.groupId) { // group 内的坐标需要单独计算
           params.x = 0
           params.y = 999
         }
-        if (this.from === 'endpointQuery') { // endpointQuery 新增 放在最后
+        if (!params.x && !params.y && this.from === 'endpointQuery') { // endpointQuery 新增 放在最后
           params.x = 0
           params.y = 999
         }
+        if (!params.x && !params.y) {
+          params.x = this.chartLastPosition.x + params.span > 12 ? 0 : this.chartLastPosition.x
+          params.y = this.chartLastPosition.y + 12
+        }
         delete params.panel
         if (params.type === 'table') {
           delete params.param.tags
diff --git a/nezha-fronted/src/components/layout/home.vue b/nezha-fronted/src/components/layout/home.vue
index 61524b7f5..50187f595 100644
--- a/nezha-fronted/src/components/layout/home.vue
+++ b/nezha-fronted/src/components/layout/home.vue
@@ -36,7 +36,12 @@ export default {
   methods: {
     refresh () {
       this.containerShow = false
-      this.$nextTick(() => { this.containerShow = true })
+      new Promise(resolve => {
+        this.$router.replace({ path: this.$route.path, query: {} })
+        resolve()
+      }).then(() => {
+        this.$nextTick(() => { this.containerShow = true })
+      })
     }
   },
   destroyed () {
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 090fe3350..fec84a467 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -821,11 +821,11 @@ export default {
       searchTime: { target: this, propertyName: 'searchTime', type: 'jsonParse' },
       nowTimeType: { target: this, propertyName: 'nowTimeType', type: 'jsonParse' }
     }
+    this.initQueryFromPath(searchKeys)
     setTimeout(() => {
       this.showPanel.id = this.panelId
       this.filter.panelId = this.panelId
     })
-    this.initQueryFromPath(searchKeys)
     if (this.nowTimeType.type) {
       this.setSearchTime(this.nowTimeType.type, this.nowTimeType.value, this.nowTimeType)
       this.filter.start_time = bus.timeFormate(this.searchTime[0], 'yyyy-MM-dd hh:mm:ss')