From bb2b11edf29308cbcad20c9f76812eddf42d9973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Thu, 7 Apr 2022 09:57:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BD=8D=E7=BD=AE=E4=B8=8D=E5=AF=B9=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E7=9A=84=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Informations/Texts/TextCommon/config.ts     | 2 +-
 .../components/Informations/Texts/TextCommon/config.vue    | 7 +++++--
 src/views/chart/ContentEdit/index.vue                      | 2 +-
 src/views/preview/components/PreviewRenderList/index.vue   | 3 ++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/packages/components/Informations/Texts/TextCommon/config.ts b/src/packages/components/Informations/Texts/TextCommon/config.ts
index 18ea4181..e383d299 100644
--- a/src/packages/components/Informations/Texts/TextCommon/config.ts
+++ b/src/packages/components/Informations/Texts/TextCommon/config.ts
@@ -20,7 +20,7 @@ export const option = {
   padding: 5,
   // 字间距
   letterSpacing: 5,
-  borderRadius: 0,
+  borderRadius: 5,
   writingMode: 'horizontal-tb',
   backgroundColor: '#00000000',
 }
diff --git a/src/packages/components/Informations/Texts/TextCommon/config.vue b/src/packages/components/Informations/Texts/TextCommon/config.vue
index 2f2fe862..2b224131 100644
--- a/src/packages/components/Informations/Texts/TextCommon/config.vue
+++ b/src/packages/components/Informations/Texts/TextCommon/config.vue
@@ -1,10 +1,13 @@
 <template>
-  <CollapseItem name="样式" :expanded="true">
-   <SettingItemBox name="内容" :alone="true">
+  <CollapseItem name="信息" :expanded="true">
+    <SettingItemBox name="文字" :alone="true">
       <SettingItem>
         <n-input v-model:value="optionData.dataset" size="small"></n-input>
       </SettingItem>
     </SettingItemBox>
+  </CollapseItem>
+
+  <CollapseItem name="样式" :expanded="true">
     <SettingItemBox name="文字">
       <SettingItem name="字体大小">
         <n-input-number v-model:value="optionData.fontSize" size="small" placeholder="字体大小"></n-input-number>
diff --git a/src/views/chart/ContentEdit/index.vue b/src/views/chart/ContentEdit/index.vue
index 7c4b193a..0df0b617 100644
--- a/src/views/chart/ContentEdit/index.vue
+++ b/src/views/chart/ContentEdit/index.vue
@@ -96,11 +96,11 @@ onMounted(() => {
   @include goId('chart-edit-content') {
     border-radius: 10px;
     margin: 15px;
-    overflow: hidden;
     @extend .go-transition;
     @include fetch-theme('box-shadow');
     .edit-content-chart {
       position: absolute;
+      overflow: hidden;
     }
   }
 }
diff --git a/src/views/preview/components/PreviewRenderList/index.vue b/src/views/preview/components/PreviewRenderList/index.vue
index 8f1372f8..7a00e179 100644
--- a/src/views/preview/components/PreviewRenderList/index.vue
+++ b/src/views/preview/components/PreviewRenderList/index.vue
@@ -4,13 +4,14 @@
     :class="animationsClass(item.styles.animations)"
     v-for="(item, index) in localStorageInfo.componentList"
     :key="item.id"
-    :style="{ ...getComponentAttrStyle(item.attr, index), ...getSizeStyle(item.attr), ...getStyle(item.styles)}"
+    :style="{ ...getComponentAttrStyle(item.attr, index), ...getStyle(item.styles)}"
   >
     <component
       :is="item.chartConfig.chartKey"
       :chartConfig="item"
       :themeSetting="themeSetting"
       :themeColor="themeColor"
+      :style="{...getSizeStyle(item.attr)}"
     ></component>
   </div>
 </template>