From f4cb7e8533a3440533b25f9e8d6385292d55fe53 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 28 Sep 2022 10:48:17 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=B1=8F=E8=94=BDecharts=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E8=81=94=E5=8A=A8=E5=92=8C=E8=B7=B3=E8=BD=AC=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/canvas/components/Editor/SettingMenu.vue   | 8 ++++++--
 .../src/components/canvas/custom-component/UserView.vue   | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/SettingMenu.vue b/frontend/src/components/canvas/components/Editor/SettingMenu.vue
index c951e7fbc5..2ad28034c0 100644
--- a/frontend/src/components/canvas/components/Editor/SettingMenu.vue
+++ b/frontend/src/components/canvas/components/Editor/SettingMenu.vue
@@ -83,10 +83,14 @@ export default {
   },
   computed: {
     linkJumpSetShow() {
-      return this.curComponent.type === 'view' && !this.jumpExcludeViewType.includes(this.curComponent.propValue.innerType)
+      return this.curComponent.type === 'view'
+        && !this.jumpExcludeViewType.includes(this.curComponent.propValue.innerType)
+        && !(this.curComponent.propValue.innerType.includes('table') && this.curComponent.propValue.render === 'echarts')
     },
     linkageSettingShow() {
-      return this.curComponent.type === 'view' && !this.linkageExcludeViewType.includes(this.curComponent.propValue.innerType)
+      return this.curComponent.type === 'view'
+        && !this.linkageExcludeViewType.includes(this.curComponent.propValue.innerType)
+        && !(this.curComponent.propValue.innerType.includes('table') && this.curComponent.propValue.render === 'echarts')
     },
     panelInfo() {
       return this.$store.state.panel.panelInfo
diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index f43c538304..4a857b0360 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -680,6 +680,7 @@ export default {
         }
       }
       Vue.set(this.element.propValue, 'innerType', chartDetails.type)
+      Vue.set(this.element.propValue, 'render', chartDetails.render)
       if (chartDetails.type === 'richTextView') {
         this.$nextTick(() => {
           bus.$emit('initCurFields-' + this.element.id)