From ade22509ecb4adeada3be21f284431fb6805e51e Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 27 May 2022 12:49:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20tabs=E9=80=89=E9=A1=B9=E5=8D=A1=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E9=80=89=E6=8B=A9=E8=A7=86=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/custom-component/UserView.vue | 4 ++--
 frontend/src/components/widget/DeWidget/DeTabs.vue           | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index 3cfe242ec6..e0643d2f80 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -308,10 +308,10 @@ export default {
       return this.outStyle.width * this.outStyle.height
     },
     resultMode() {
-      return this.canvasStyleData.panel.resultMode
+      return this.canvasStyleData.panel && this.canvasStyleData.panel.resultMode || null
     },
     resultCount() {
-      return this.canvasStyleData.panel.resultCount
+      return this.canvasStyleData.panel && this.canvasStyleData.panel.resultCount || null
     },
     innerPadding() {
       return this.element.commonBackground && this.element.commonBackground.innerPadding || 0
diff --git a/frontend/src/components/widget/DeWidget/DeTabs.vue b/frontend/src/components/widget/DeWidget/DeTabs.vue
index adb913984c..3aef14dd72 100644
--- a/frontend/src/components/widget/DeWidget/DeTabs.vue
+++ b/frontend/src/components/widget/DeWidget/DeTabs.vue
@@ -79,6 +79,7 @@
             :element="item.content"
             :filters="filterMap[item.content.propValue && item.content.propValue.viewId] || []"
             :out-style="outStyle"
+            :canvas-style-data="canvasStyleData"
           />
         </div>
 
@@ -233,7 +234,8 @@ export default {
     ...mapState([
       'componentData',
       'curComponent',
-      'mobileLayoutStatus'
+      'mobileLayoutStatus',
+      'canvasStyleData'
     ]),
     fontColor() {
       return this.element && this.element.style && this.element.style.headFontColor || 'none'