From fcb5d1cec6f4185273ad0c5f877d7d5ac869ac04 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 16 Nov 2021 15:06:02 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E6=97=B6=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E7=9A=84=E5=8A=A8=E7=94=BB=E6=95=88=E6=9E=9C=EF=BC=9B?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=88=9D=E5=A7=8B=E5=8C=96=E6=97=B6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BAloading=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/custom-component/UserView.vue      | 21 ++++++-------------
 .../views/chart/components/ChartComponent.vue |  8 +++++++
 .../chart/components/ChartComponentG2.vue     |  9 ++++++++
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index 554ab6ec1e..23963af9ee 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    v-loading="canvasStyleData.refreshViewLoading&&requestStatus==='waiting'"
+    v-loading="loadingFlag"
     :class="[
       {
         ['active']: active
@@ -16,8 +16,8 @@
         {{ $t('chart.chart_error_tips') }}
       </div>
     </div>
-    <chart-component v-if="httpRequest.status &&chart.type && !chart.type.includes('table') && !chart.type.includes('text') && renderComponent() === 'echarts'" :ref="element.propValue.id" class="chart-class" :chart="chart" :track-menu="trackMenu" @onChartClick="chartClick" @onJumpClick="jumpClick" />
-    <chart-component-g2 v-if="httpRequest.status &&chart.type && !chart.type.includes('table') && !chart.type.includes('text') && renderComponent() === 'antv'" :ref="element.propValue.id" class="chart-class" :chart="chart" :track-menu="trackMenu" @onChartClick="chartClick" @onJumpClick="jumpClick" />
+    <chart-component v-if="httpRequest.status &&chart.type && !chart.type.includes('table') && !chart.type.includes('text') && renderComponent() === 'echarts'" :ref="element.propValue.id" class="chart-class" :chart="chart" :track-menu="trackMenu" :search-count="searchCount" @onChartClick="chartClick" @onJumpClick="jumpClick" />
+    <chart-component-g2 v-if="httpRequest.status &&chart.type && !chart.type.includes('table') && !chart.type.includes('text') && renderComponent() === 'antv'" :ref="element.propValue.id" class="chart-class" :chart="chart" :track-menu="trackMenu" :search-count="searchCount" @onChartClick="chartClick" @onJumpClick="jumpClick" />
     <!--    <chart-component :ref="element.propValue.id" class="chart-class" :chart="chart" :track-menu="trackMenu" @onChartClick="chartClick" />-->
     <table-normal v-if="httpRequest.status &&chart.type && chart.type.includes('table')" :ref="element.propValue.id" :show-summary="chart.type === 'table-normal'" :chart="chart" class="table-class" />
     <label-normal v-if="httpRequest.status && chart.type && chart.type.includes('text')" :ref="element.propValue.id" :chart="chart" class="table-class" />
@@ -54,11 +54,6 @@ export default {
       type: Object,
       default: null
     },
-    // filters: {
-    //   type: Array,
-    //   required: false,
-    //   default: null
-    // },
     outStyle: {
       type: Object,
       required: false,
@@ -100,6 +95,9 @@ export default {
     }
   },
   computed: {
+    loadingFlag() {
+      return (this.canvasStyleData.refreshViewLoading || this.searchCount === 0) && this.requestStatus === 'waiting'
+    },
     panelInfo() {
       return this.$store.state.panel.panelInfo
     },
@@ -167,9 +165,6 @@ export default {
       handler(newVal, oldVal) {
         // isChange(newVal, oldVal) && this.getData(this.element.propValue.viewId)
         if (isChange(newVal, oldVal)) {
-        //   if (this.chart.type === 'map') {
-        //     this.doMapLink(newVal)
-        //   }
           this.getData(this.element.propValue.viewId)
         }
       },
@@ -202,10 +197,6 @@ export default {
     // 监听外部的样式变化 （非实时性要求）
     outStyle: {
       handler(newVal, oldVla) {
-        //
-        // if (this.$refs[this.element.propValue.id]) {
-        //   this.$refs[this.element.propValue.id].chartResize()
-        // }
       },
       deep: true
     },
diff --git a/frontend/src/views/chart/components/ChartComponent.vue b/frontend/src/views/chart/components/ChartComponent.vue
index 7ba985a040..b1a9a38852 100644
--- a/frontend/src/views/chart/components/ChartComponent.vue
+++ b/frontend/src/views/chart/components/ChartComponent.vue
@@ -55,6 +55,11 @@ export default {
       default: function() {
         return ['drill']
       }
+    },
+    searchCount: {
+      type: Number,
+      required: false,
+      default: 0
     }
   },
   data() {
@@ -156,6 +161,9 @@ export default {
         chart_option = baseMixOption(JSON.parse(JSON.stringify(BASE_MIX)), chart)
       }
       // console.log(JSON.stringify(chart_option))
+      if (this.myChart && this.searchCount > 0) {
+        chart_option.animation = false
+      }
 
       if (chart.type === 'map') {
         const customAttr = JSON.parse(chart.customAttr)
diff --git a/frontend/src/views/chart/components/ChartComponentG2.vue b/frontend/src/views/chart/components/ChartComponentG2.vue
index 6e9eef6d43..c07345996c 100644
--- a/frontend/src/views/chart/components/ChartComponentG2.vue
+++ b/frontend/src/views/chart/components/ChartComponentG2.vue
@@ -46,6 +46,11 @@ export default {
       default: function() {
         return ['drill']
       }
+    },
+    searchCount: {
+      type: Number,
+      required: false,
+      default: 0
     }
   },
   data() {
@@ -171,6 +176,10 @@ export default {
         }
       }
 
+      if (this.myChart && this.searchCount > 0) {
+        this.myChart.options.animation = false
+      }
+
       if (this.antVRenderStatus) {
         this.myChart.render()
       }