From dad55e386298696fcc3cf3fcc41ebd2e61cc8062 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 19 Jul 2022 11:24:25 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=98=88=E5=80=BC=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../senior/dialog/TableThresholdEdit.vue          |  1 -
 frontend/src/views/chart/view/ChartEdit.vue       | 15 +++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue b/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue
index 9f2bfa1a3e..853e14e663 100644
--- a/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue
+++ b/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue
@@ -360,7 +360,6 @@ span {
 .value-item {
   position: relative;
   display: inline-block;
-  width: 200px !important;
 }
 
 .select-item {
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index e885201071..d55a280f8a 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -207,7 +207,7 @@
                                 class="render-select"
                                 style="width: 100px"
                                 size="mini"
-                                @change="changeChartType()"
+                                @change="changeChartRender()"
                               >
                                 <el-option
                                   v-for="item in pluginRenderOptions"
@@ -1469,7 +1469,7 @@ export default {
         })
       })
     },
-    buildParam(getData, trigger, needRefreshGroup = false, switchType = false) {
+    buildParam(getData, trigger, needRefreshGroup = false, switchType = false, switchRender = false) {
       if (!this.view.resultCount ||
         this.view.resultCount === '' ||
         isNaN(Number(this.view.resultCount)) ||
@@ -1477,6 +1477,9 @@ export default {
         parseInt(this.view.resultCount) < 1) {
         this.view.resultCount = '1000'
       }
+      if (switchType) {
+        this.view.senior.threshold.tableThreshold = []
+      }
       if (switchType && (this.view.type === 'table-info' || this.chart.type === 'table-info') && this.view.xaxis.length > 0) {
         this.$message({
           showClose: true,
@@ -1663,9 +1666,9 @@ export default {
       delete view.data
       return view
     },
-    calcData(getData, trigger, needRefreshGroup = false, switchType = false) {
+    calcData(getData, trigger, needRefreshGroup = false, switchType = false, switchRender = false) {
       this.changeEditStatus(true)
-      const view = this.buildParam(true, 'chart', false, switchType)
+      const view = this.buildParam(true, 'chart', false, switchType, switchRender)
       if (!view) return
       viewEditSave(this.panelInfo.id, view).then(() => {
         // this.getData(this.param.id)
@@ -2490,6 +2493,10 @@ export default {
       this.hasEdit = status
       this.$store.commit('recordViewEdit', { viewId: this.param.id, hasEdit: status })
     },
+    changeChartRender() {
+      this.setChartDefaultOptions()
+      this.calcData(true, 'chart', true, false, true)
+    },
     changeChartType() {
       this.setChartDefaultOptions()
       this.calcData(true, 'chart', true, true)