From c6ea6635555f368beaf036fade53ad0199322ae3 Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Mon, 7 Aug 2023 15:27:14 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-3041=20fix=EF=BC=9Adashboard=20group=20?=
 =?UTF-8?q?=E6=8A=98=E5=8F=A0=E5=B1=95=E5=BC=80=E7=8A=B6=E6=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/tabs/dashboardTab.vue       |  6 ++++++
 .../common/rightBox/chart/otherChartConfig.vue   | 16 ++++++++++------
 .../src/components/page/dashboard/dashboard.vue  |  6 ++++++
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue
index 9a420ff89..fc19cbb3a 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue
@@ -443,6 +443,9 @@ export default {
         if (!this.chart.groupId || this.chart.groupId == -1) {
           this.chart.groupId = ''
         }
+        if (this.chart.type === 'group' && !this.chart.param.collapse == undefined) {
+          this.chart.param.collapse = false
+        }
         if ((this.chart.type === 'line' || this.chart.type === 'area' || this.chart.type === 'point') && !this.chart.param.rightYAxis) {
           this.chart.param.rightYAxis = {
             elementNames: [],
@@ -474,6 +477,9 @@ export default {
             if (!this.chart.groupId || this.chart.groupId == -1) {
               this.chart.groupId = ''
             }
+            if (this.chart.type === 'group' && !this.chart.param.collapse == undefined) {
+              this.chart.param.collapse = false
+            }
             if ((this.chart.type === 'line' || this.chart.type === 'area' || this.chart.type === 'point') && !this.chart.param.rightYAxis) {
               this.chart.param.rightYAxis = {
                 elementNames: [],
diff --git a/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
index 0f60c3a84..a3b3e5e1c 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
@@ -40,14 +40,18 @@
           </el-select>
         </el-form-item>
         <!--Default collapse-->
-        <el-form-item class="form-item--half-width" v-if="isGroup(chartConfig.type)" :label='$t("dashboard.dashboard.chartForm.collapse")' prop="param.collapse">
-          <el-switch
+        <el-form-item class="form-item--half-width" v-if="isGroup(chartConfig.type)" :label='$t("dashboard.dashboard.chartForm.collapseState")' prop="param.collapse">
+          <el-select
             id="chart-box-collapse"
             v-model="chartConfig.param.collapse"
-            :active-value="true"
-            :inactive-value="false"
+            placeholder=""
+            popper-class="right-box-select-top prevent-clickoutside"
+            size="small"
             @change="change"
-            size="small"/>
+          >
+            <el-option :label="$t('overall.expand')" :value="false"></el-option>
+            <el-option :label="$t('overall.collapse')"  :value="true"></el-option>
+          </el-select>
         </el-form-item>
       </div>
       <div class="form-items--half-width-group" v-if="!isGroup(chartConfig.type)">
@@ -417,7 +421,7 @@ export default {
           this.chartConfig.span = 12
           this.chartConfig.param = {
             link: this.chartConfig.param.link,
-            collapse: true,
+            collapse: false,
             enable: {
               visibility: false,
               repeat: false
diff --git a/nezha-fronted/src/components/page/dashboard/dashboard.vue b/nezha-fronted/src/components/page/dashboard/dashboard.vue
index 264c4ab98..aecf36364 100644
--- a/nezha-fronted/src/components/page/dashboard/dashboard.vue
+++ b/nezha-fronted/src/components/page/dashboard/dashboard.vue
@@ -614,6 +614,9 @@ export default {
         if (!this.chart.groupId || this.chart.groupId == -1) {
           this.chart.groupId = ''
         }
+        if (this.chart.type === 'group' && !this.chart.param.collapse == undefined) {
+          this.chart.param.collapse = false
+        }
         if ((this.chart.type === 'line' || this.chart.type === 'area' || this.chart.type === 'point') && !this.chart.param.rightYAxis) {
           this.chart.param.rightYAxis = {
             elementNames: [],
@@ -645,6 +648,9 @@ export default {
             if (!this.chart.groupId || this.chart.groupId == -1) {
               this.chart.groupId = ''
             }
+            if (this.chart.type === 'group' && !this.chart.param.collapse == undefined) {
+              this.chart.param.collapse = false
+            }
             if ((this.chart.type === 'line' || this.chart.type === 'area' || this.chart.type === 'point') && !this.chart.param.rightYAxis) {
               this.chart.param.rightYAxis = {
                 elementNames: [],