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

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

@@ -429,6 +429,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: [],
@@ -473,6 +476,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: [],

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-form-item class="form-item--half-width" v-if="isGroup(chartConfig.type)" :label='$t("dashboard.dashboard.chartForm.collapseState")' prop="param.collapse">
-          <el-switch
+          <el-select
             id="chart-box-collapse"
             v-model="chartConfig.param.collapse"
-            :active-value="true"
+            placeholder=""
-            :inactive-value="false"
+            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

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

@@ -604,6 +604,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: [],
@@ -648,6 +651,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: [],