From 1a5cc7cc71570ba4a35024821608d5bf34d367a8 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 12 Aug 2021 17:19:26 +0800
Subject: [PATCH] =?UTF-8?q?refacotr:=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=81=94?=
 =?UTF-8?q?=E5=8A=A8=E4=B8=8B=E9=92=BB=E7=AD=89=EF=BC=8C=E6=97=A0=E9=9C=80?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=8A=A0=E8=BD=BD=E8=A7=86=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/custom-component/UserView.vue       | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index f10b816f10..c39624a67d 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -16,10 +16,10 @@
         {{ $t('chart.chart_error_tips') }}
       </div>
     </div>
-    <!-- <chart-component v-if="requestStatus==='success'&&chart.type && !chart.type.includes('table') && !chart.type.includes('text')" :ref="element.propValue.id" class="chart-class" :chart="chart" :track-menu="trackMenu" @onChartClick="chartClick" /> -->
-    <chart-component :ref="element.propValue.id" class="chart-class" :chart="chart" :track-menu="trackMenu" @onChartClick="chartClick" />
-    <table-normal v-if="requestStatus==='success'&&chart.type && chart.type.includes('table')" :ref="element.propValue.id" :chart="chart" class="table-class" />
-    <label-normal v-if="requestStatus==='success'&&chart.type && chart.type.includes('text')" :ref="element.propValue.id" :chart="chart" class="table-class" />
+    <chart-component v-if="httpRequest.status &&chart.type && !chart.type.includes('table') && !chart.type.includes('text')" :ref="element.propValue.id" class="chart-class" :chart="chart" :track-menu="trackMenu" @onChartClick="chartClick" />
+    <!--    <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" :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" />
     <div style="position: absolute;left: 20px;bottom:14px;">
       <drill-path :drill-filters="drillFilters" @onDrillJump="drillJump" />
     </div>
@@ -87,7 +87,11 @@ export default {
       drillClickDimensionList: [],
       drillFilters: [],
       drillFields: [],
-      places: []
+      places: [],
+      httpRequest: {
+        status: true,
+        msg: ''
+      }
     }
   },
   computed: {
@@ -226,12 +230,15 @@ export default {
             this.requestStatus = 'merging'
             this.mergeStyle()
             this.requestStatus = 'success'
+            this.httpRequest.status = true
           } else {
             this.requestStatus = 'error'
             this.message = response.message
           }
           return true
         }).catch(err => {
+          this.httpRequest.status = err.response.data.success
+          this.httpRequest.msg = err.response.data.message
           this.requestStatus = 'error'
           if (err && err.response && err.response.data) {
             this.message = err.response.data.message
@@ -267,7 +274,6 @@ export default {
       }
     },
 
-
     resetDrill() {
       const length = this.drillClickDimensionList.length
       this.drillClickDimensionList = []