From 71365c4ba748218afbb810cb3dbce9339059c5eb Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 10 Nov 2021 11:18:10 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=E5=A2=9E=E5=8A=A0=E7=9F=A9=E5=BD=A2?=
 =?UTF-8?q?=EF=BC=8C=E6=97=B6=E9=97=B4=E7=BB=84=E4=BB=B6=E7=9A=84=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E8=AE=BE=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/components/TextAttr.vue       | 3 ++-
 .../src/components/canvas/custom-component/component-list.js | 5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue
index 1946ad107d..27817dcbe7 100644
--- a/frontend/src/components/canvas/components/TextAttr.vue
+++ b/frontend/src/components/canvas/components/TextAttr.vue
@@ -253,7 +253,8 @@ export default {
         'borderWidth',
         'borderRadius',
         'opacity',
-        'borderColor'
+        'borderColor',
+        'backgroundColor'
       ],
       // 时间组件显示的属性
       'de-show-date': [
diff --git a/frontend/src/components/canvas/custom-component/component-list.js b/frontend/src/components/canvas/custom-component/component-list.js
index 042b93abc3..fc972229e1 100644
--- a/frontend/src/components/canvas/custom-component/component-list.js
+++ b/frontend/src/components/canvas/custom-component/component-list.js
@@ -268,7 +268,6 @@ const list = [
       width: 250,
       height: 100,
       fontSize: 22,
-
       fontWeight: 400,
       lineHeight: '',
       letterSpacing: 0,
@@ -276,13 +275,11 @@ const list = [
       color: '#000000',
       verticalAlign: 'middle',
       backgroundColor: '#ffffff',
-
       borderStyle: 'solid',
-      borderWidth: 1,
       borderColor: '#000000',
       borderRadius: 0,
       /* margin: 10, */
-      time_margin: 10
+      time_margin: 0
     },
     formatInfo: {
       openMode: '0',