From 6bbdb68b1bf2723280cdbb5dec68274fc49caa82 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 29 Jan 2024 15:23:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8DTab=E7=BB=84=E4=BB=B6=E8=A1=A8=E5=A4=B4?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90=E6=96=B9=E5=BC=8F=E4=BC=9A=E5=8F=97=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E7=BB=84=E4=BB=B6=E5=BD=B1=E5=93=8D=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E9=A2=84=E8=A7=88=E5=92=8C=E7=BC=96=E8=BE=91=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=88=9D=E5=A7=8B=E7=9A=84=E5=AF=8C=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F=E5=B7=AE=E8=B7=9D=E5=A4=A7?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/components/canvas/components/TextAttr.vue | 2 +-
 core/frontend/src/components/widget/deWidget/DeTabs.vue     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/frontend/src/components/canvas/components/TextAttr.vue b/core/frontend/src/components/canvas/components/TextAttr.vue
index 10580991ca..e973cf68ad 100644
--- a/core/frontend/src/components/canvas/components/TextAttr.vue
+++ b/core/frontend/src/components/canvas/components/TextAttr.vue
@@ -466,7 +466,7 @@ export default {
       initFontSize: 12,
       initActiveFontSize: 18,
       miniFontSize: 12,
-      maxFontSize: 256,
+      maxFontSize: 48,
       textAlignOptions: [
         {
           icon: 'iconfont icon-juzuo',
diff --git a/core/frontend/src/components/widget/deWidget/DeTabs.vue b/core/frontend/src/components/widget/deWidget/DeTabs.vue
index 3d2d2f35ba..f4fa0121e2 100644
--- a/core/frontend/src/components/widget/deWidget/DeTabs.vue
+++ b/core/frontend/src/components/widget/deWidget/DeTabs.vue
@@ -74,7 +74,7 @@
         />
         <div
           v-if="item.content && item.content.type==='canvas' && (!isEdit || mobileLayoutStatus)"
-          style="width: 100%;height:100%"
+          style="width: 100%;height:100%;font-size: initial"
         >
           <Preview
             :ref="'canvasTabRef-'+item.name"
@@ -512,7 +512,7 @@ export default {
       this.$nextTick(() => {
         if (this.element.options.tabList.length > 1) {
           const containerDom = document.getElementById('tab-' + this.element.options.tabList[this.element.options.tabList.length - 1].name)
-          this.tabsAreaScroll = containerDom.parentNode.scrollWidth > containerDom.parentNode.parentNode.scrollWidth
+          this.tabsAreaScroll = containerDom.parentNode.scrollWidth >= containerDom.parentNode.parentNode.scrollWidth
         } else {
           this.tabsAreaScroll = false
         }

From 2a0d35f65aa6f92f09ba31cef1de0e999d808453 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 29 Jan 2024 16:49:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8DTab=E7=BB=84=E4=BB=B6=E5=86=85=E9=83=A8?=
 =?UTF-8?q?=E7=9F=A9=E5=BD=A2=E7=AD=89=E7=BB=84=E4=BB=B6=E6=82=AC=E6=B5=AE?=
 =?UTF-8?q?=E6=93=8D=E6=93=8D=E6=A1=86=E5=87=BA=E7=8E=B0=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=85=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/canvas/components/TextAttr.vue | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/core/frontend/src/components/canvas/components/TextAttr.vue b/core/frontend/src/components/canvas/components/TextAttr.vue
index e973cf68ad..3927cb7f25 100644
--- a/core/frontend/src/components/canvas/components/TextAttr.vue
+++ b/core/frontend/src/components/canvas/components/TextAttr.vue
@@ -81,7 +81,7 @@
       >
         <i
           style="float: left;margin-top: 3px;margin-left: 2px;"
-          class="iconfont icon-font_size"
+          class="iconfont iconfont-custom icon-font_size"
         />
       </el-tooltip>
 
@@ -105,7 +105,7 @@
       >
         <i
           style="float: left;margin-top: 3px;margin-left: 2px;"
-          class="iconfont icon-font"
+          class="iconfont iconfont-custom icon-font"
         />
       </el-tooltip>
 
@@ -129,7 +129,7 @@
       >
         <i
           style="float: left;margin-top: 3px;margin-left: 2px;"
-          class="icon iconfont icon-font-weight-bold"
+          class="icon iconfont iconfont-custom icon-font-weight-bold"
         />
       </el-tooltip>
 
@@ -154,7 +154,7 @@
       >
         <i
           style="float: left;margin-top: 3px;margin-left: 2px;"
-          class="icon iconfont icon-letter_spacing"
+          class="icon iconfont iconfont-custom icon-letter_spacing"
         />
       </el-tooltip>
 
@@ -178,7 +178,7 @@
       >
         <i
           style="float: left;margin-top: 3px;margin-left: 2px;"
-          class="icon iconfont icon-margin"
+          class="icon iconfont iconfont-custom icon-margin"
         />
       </el-tooltip>
 
@@ -202,7 +202,7 @@
       >
         <i
           style="float: left;margin-top: 3px;margin-left: 2px;"
-          class="icon iconfont icon-touming"
+          class="icon iconfont iconfont-custom icon-touming"
         />
       </el-tooltip>
 
@@ -227,7 +227,7 @@
       >
         <i
           style="float: left;margin-top: 3px;margin-left: 2px;"
-          class="icon iconfont icon-fangxing-"
+          class="icon iconfont iconfont-custom icon-fangxing-"
         />
       </el-tooltip>
 
@@ -253,7 +253,7 @@
         <div style="width: 16px;height: 18px">
           <el-tooltip :content="$t('panel.color')">
             <i
-              class="icon iconfont icon-zimua"
+              class="icon iconfont iconfont-custom icon-zimua"
               @click="goColor"
             />
           </el-tooltip>
@@ -275,7 +275,7 @@
         <div style="width: 16px;height: 18px">
           <el-tooltip :content="$t('panel.border_color')">
             <i
-              class="iconfont icon-huabi"
+              class="iconfont iconfont-custom icon-huabi"
               @click="goBoardColor"
             />
           </el-tooltip>
@@ -298,7 +298,7 @@
         <div style="width: 16px;height: 18px">
           <el-tooltip :content="$t('panel.background_color')">
             <i
-              class="iconfont icon-beijingse1"
+              class="iconfont iconfont-custom icon-beijingse1"
               @click="goBackgroundColor"
             />
           </el-tooltip>
@@ -469,31 +469,31 @@ export default {
       maxFontSize: 48,
       textAlignOptions: [
         {
-          icon: 'iconfont icon-juzuo',
+          icon: 'iconfont iconfont-custom icon-juzuo',
           tooltip: this.$t('panel.text_align_left'),
           label: 'left'
         },
         {
-          icon: 'iconfont icon-align-center',
+          icon: 'iconfont iconfont-custom icon-align-center',
           tooltip: this.$t('panel.text_align_center'),
           label: 'center'
         },
         {
-          icon: 'iconfont icon-juyou',
+          icon: 'iconfont iconfont-custom icon-juyou',
           tooltip: this.$t('panel.text_align_right'),
           label: 'right'
         }
       ],
       lineStyle: [{
-        icon: 'iconfont icon-solid_line',
+        icon: 'iconfont iconfont-custom icon-solid_line',
         value: 'solid',
         label: '实线'
       }, {
-        icon: 'iconfont icon-xuxian',
+        icon: 'iconfont iconfont-custom icon-xuxian',
         value: 'dashed',
         label: '虚线'
       }, {
-        icon: 'iconfont icon-dianxian',
+        icon: 'iconfont iconfont-custom icon-dianxian',
         value: 'dotted',
         label: '点线'
       }],
@@ -802,4 +802,9 @@ export default {
   -moz-appearance: textfield !important;
 }
 
+div {
+  line-height: 24px;
+  font-size: 16px;
+}
+
 </style>