Merge pull request #2333 from dataease/pr@dev@fix_tabs

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

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'