Merge branch 'v1.1' of github.com:dataease/dataease into v1.1

frontend/src/views/chart/components/component-style/LegendSelector.vue

@@ -101,6 +101,16 @@ export default {
   watch: {
     'chart': {
       handler: function() {
+        this.initData()
+      }
+    }
+  },
+  mounted() {
+    this.init()
+    this.initData()
+  },
+  methods: {
+    initData() {
       const chart = JSON.parse(JSON.stringify(this.chart))
       if (chart.customStyle) {
         let customStyle = null
@@ -113,13 +123,7 @@ export default {
           this.legendForm = customStyle.legend
         }
       }
-      }
-    }
-  },
-  mounted() {
-    this.init()
     },
-  methods: {
     init() {
       const arr = []
       for (let i = 10; i <= 60; i = i + 2) {

frontend/src/views/chart/components/component-style/SplitSelector.vue

@@ -81,6 +81,16 @@ export default {
   watch: {
     'chart': {
       handler: function() {
+        this.initData()
+      }
+    }
+  },
+  mounted() {
+    this.init()
+    this.initData()
+  },
+  methods: {
+    initData() {
       const chart = JSON.parse(JSON.stringify(this.chart))
       if (chart.customStyle) {
         let customStyle = null
@@ -95,13 +105,7 @@ export default {
           this.splitForm = JSON.parse(JSON.stringify(DEFAULT_SPLIT))
         }
       }
-      }
-    }
-  },
-  mounted() {
-    this.init()
     },
-  methods: {
     init() {
       const arr = []
       for (let i = 6; i <= 40; i = i + 2) {

frontend/src/views/chart/components/component-style/TitleSelector.vue

@@ -91,6 +91,16 @@ export default {
   watch: {
     'chart': {
       handler: function() {
+        this.initData()
+      }
+    }
+  },
+  mounted() {
+    this.init()
+    this.initData()
+  },
+  methods: {
+    initData() {
       const chart = JSON.parse(JSON.stringify(this.chart))
       if (chart.customStyle) {
         let customStyle = null
@@ -104,13 +114,7 @@ export default {
         }
         this.titleForm.title = this.chart.title
       }
-      }
-    }
-  },
-  mounted() {
-    this.init()
     },
-  methods: {
     init() {
       const arr = []
       for (let i = 10; i <= 60; i = i + 2) {

frontend/src/views/chart/components/component-style/XAxisSelector.vue

@@ -112,6 +112,16 @@ export default {
   watch: {
     'chart': {
       handler: function() {
+        this.initData()
+      }
+    }
+  },
+  mounted() {
+    this.init()
+    this.initData()
+  },
+  methods: {
+    initData() {
       const chart = JSON.parse(JSON.stringify(this.chart))
       if (chart.customStyle) {
         let customStyle = null
@@ -130,13 +140,7 @@ export default {
           }
         }
       }
-      }
-    }
-  },
-  mounted() {
-    this.init()
     },
-  methods: {
     init() {
       const arr = []
       for (let i = 6; i <= 40; i = i + 2) {

frontend/src/views/chart/components/component-style/YAxisSelector.vue

@@ -112,6 +112,16 @@ export default {
   watch: {
     'chart': {
       handler: function() {
+        this.initData()
+      }
+    }
+  },
+  mounted() {
+    this.init()
+    this.initData()
+  },
+  methods: {
+    initData() {
       const chart = JSON.parse(JSON.stringify(this.chart))
       if (chart.customStyle) {
         let customStyle = null
@@ -130,13 +140,7 @@ export default {
           }
         }
       }
-      }
-    }
-  },
-  mounted() {
-    this.init()
     },
-  methods: {
     init() {
       const arr = []
       for (let i = 6; i <= 40; i = i + 2) {

frontend/src/views/chart/components/shape-attr/LabelSelector.vue

@@ -12,7 +12,7 @@
             <!--            <el-form-item :label="$t('chart.show')" class="form-item">-->
             <!--              <el-checkbox v-model="labelForm.show" @change="changeLabelAttr">{{ $t('chart.show') }}</el-checkbox>-->
             <!--            </el-form-item>-->
-            <el-form-item :label="$t('chart.pie_label_line_show')" class="form-item">
+            <el-form-item v-show="chart.type && !chart.type.includes('pie')" :label="$t('chart.pie_label_line_show')" class="form-item">
               <el-checkbox v-model="labelForm.labelLine.show" @change="changeLabelAttr">{{ $t('chart.pie_label_line_show') }}</el-checkbox>
             </el-form-item>
             <el-form-item :label="$t('chart.text_fontsize')" class="form-item">
@@ -116,6 +116,16 @@ export default {
   watch: {
     'chart': {
       handler: function() {
+        this.initData()
+      }
+    }
+  },
+  mounted() {
+    this.init()
+    this.initData()
+  },
+  methods: {
+    initData() {
       const chart = JSON.parse(JSON.stringify(this.chart))
       if (chart.customAttr) {
         let customAttr = null
@@ -131,13 +141,7 @@ export default {
           }
         }
       }
-      }
-    }
-  },
-  mounted() {
-    this.init()
     },
-  methods: {
     init() {
       const arr = []
       for (let i = 10; i <= 20; i = i + 2) {

frontend/src/views/chart/components/shape-attr/SizeSelector.vue

@@ -183,6 +183,16 @@ export default {
   watch: {
     'chart': {
       handler: function() {
+        this.initData()
+      }
+    }
+  },
+  mounted() {
+    this.init()
+    this.initData()
+  },
+  methods: {
+    initData() {
       const chart = JSON.parse(JSON.stringify(this.chart))
       if (chart.customAttr) {
         let customAttr = null
@@ -195,13 +205,7 @@ export default {
           this.sizeForm = customAttr.size
         }
       }
-      }
-    }
-  },
-  mounted() {
-    this.init()
     },
-  methods: {
     init() {
       const arr = []
       for (let i = 10; i <= 60; i = i + 2) {

frontend/src/views/chart/components/shape-attr/TooltipSelector.vue

@@ -95,6 +95,16 @@ export default {
   watch: {
     'chart': {
       handler: function() {
+        this.initData()
+      }
+    }
+  },
+  mounted() {
+    this.init()
+    this.initData()
+  },
+  methods: {
+    initData() {
       const chart = JSON.parse(JSON.stringify(this.chart))
       if (chart.customAttr) {
         let customAttr = null
@@ -107,13 +117,7 @@ export default {
           this.tooltipForm = customAttr.tooltip
         }
       }
-      }
-    }
-  },
-  mounted() {
-    this.init()
     },
-  methods: {
     init() {
       const arr = []
       for (let i = 10; i <= 20; i = i + 2) {

frontend/src/views/chart/view/ChartEdit.vue

@@ -1128,10 +1128,12 @@ export default {
     },
 
     changeChart() {
+      if (this.view.tableId !== this.changeTable.id) {
         this.view.tableId = this.changeTable.id
         this.view.xaxis = []
         this.view.yaxis = []
         this.view.customFilter = []
+      }
       this.save(true, 'chart', false)
     },