From a6c49815e3cd2034110003ebd0a91a8792069f9b Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 30 Mar 2022 18:00:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=9B=86=E6=88=90=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=9A=84render=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/group/Group.vue    | 11 +++++++++--
 frontend/src/views/chart/view/ChartEdit.vue | 13 ++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index 532a71277a..0b1a562bd4 100644
--- a/frontend/src/views/chart/group/Group.vue
+++ b/frontend/src/views/chart/group/Group.vue
@@ -204,7 +204,7 @@
             <span style="float: right;">
               <el-select v-model="view.render" class="render-select" style="width: 70px" size="mini">
                 <el-option
-                  v-for="item in renderOptions"
+                  v-for="item in pluginRenderOptions"
                   :key="item.value"
                   :value="item.value"
                   :label="item.name"
@@ -429,6 +429,13 @@ export default {
     },
     panelInfo() {
       return this.$store.state.panel.panelInfo
+    },
+    pluginRenderOptions() {
+      const plugins = localStorage.getItem('plugin-views') && JSON.parse(localStorage.getItem('plugin-views')) || []
+      const pluginOptions = plugins.filter(plugin => !this.renderOptions.some(option => option.value === plugin.render)).map(plugin => {
+        return { name: plugin.render, value: plugin.render }
+      })
+      return [...this.renderOptions, ...pluginOptions]
     }
   },
   watch: {
@@ -783,7 +790,7 @@ export default {
       view.extBubble = JSON.stringify([])
       this.setChartDefaultOptions(view)
       const _this = this
-      post('/chart/view/newOne/' + this.panelInfo.id, view,true).then(response => {
+      post('/chart/view/newOne/' + this.panelInfo.id, view, true).then(response => {
         this.closeCreateChart()
         this.$store.dispatch('chart/setTableId', null)
         this.$store.dispatch('chart/setTableId', this.table.id)
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 2d8b81a76c..d340d4b660 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -175,7 +175,7 @@
                                 @change="changeChartType()"
                               >
                                 <el-option
-                                  v-for="item in renderOptions"
+                                  v-for="item in pluginRenderOptions"
                                   :key="item.value"
                                   :value="item.value"
                                   :label="item.name"
@@ -877,7 +877,7 @@
                       @onLegendChange="onLegendChange"
                     />
                   </el-collapse-item>
-                  <el-collapse-item v-if="chart.customStyle.background" name="background" :title="$t('chart.background')">
+                  <el-collapse-item v-if="chart.customStyle && chart.customStyle.background" name="background" :title="$t('chart.background')">
                     <background-color-selector
                       :param="param"
                       class="attr-selector"
@@ -1378,7 +1378,14 @@ export default {
     },
     ...mapState([
       'panelViewEditInfo'
-    ])
+    ]),
+    pluginRenderOptions() {
+      const plugins = localStorage.getItem('plugin-views') && JSON.parse(localStorage.getItem('plugin-views')) || []
+      const pluginOptions = plugins.filter(plugin => !this.renderOptions.some(option => option.value === plugin.render)).map(plugin => {
+        return { name: plugin.render, value: plugin.render }
+      })
+      return [...this.renderOptions, ...pluginOptions]
+    }
   },
   watch: {
     'param': function(val) {