From 011b6d692737f316e966d2cbd8b87404a64d9a57 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 25 Nov 2021 12:50:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=B6=E9=92=9F=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E8=BE=B9=E6=A1=86=E5=B1=9E=E6=80=A7=E5=AF=BC=E8=87=B4=E8=83=8C?=
 =?UTF-8?q?=E6=99=AF=E4=B8=8B=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/components/TextAttr.vue   | 9 +++++----
 .../components/canvas/custom-component/component-list.js | 4 ++--
 frontend/src/components/canvas/utils/style.js            | 5 +++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue
index 67e040e3f5..1bca4d1795 100644
--- a/frontend/src/components/canvas/components/TextAttr.vue
+++ b/frontend/src/components/canvas/components/TextAttr.vue
@@ -78,12 +78,12 @@
         <el-input v-model="styleInfo.margin" type="number" size="mini" min="0" max="99" @change="styleChange" />
       </div>
 
-      <el-tooltip v-if="attrShow('time_margin')" :content="$t('panel.margin')">
+      <el-tooltip v-if="attrShow('padding')" :content="$t('panel.margin')">
         <i style="float: left;margin-top: 3px;margin-left: 2px;" class="icon iconfont icon-margin" />
       </el-tooltip>
 
-      <div v-if="attrShow('time_margin')" style="width: 70px;float: left;margin-top: 2px;margin-left: 2px;">
-        <el-input v-model="styleInfo.time_margin" type="number" size="mini" min="0" max="99" @change="styleChange" />
+      <div v-if="attrShow('padding')" style="width: 70px;float: left;margin-top: 2px;margin-left: 2px;">
+        <el-input v-model="styleInfo.padding" type="number" size="mini" min="0" max="99" @change="styleChange" />
       </div>
 
       <el-tooltip v-if="attrShow('opacity')" :content="$t('panel.opacity')">
@@ -268,7 +268,8 @@ export default {
         'color',
         'backgroundColor',
         'date-format',
-        'time_margin'
+        'time_margin',
+        'padding'
         /* 'margin' */
       ],
       // 文本组件显示的属性
diff --git a/frontend/src/components/canvas/custom-component/component-list.js b/frontend/src/components/canvas/custom-component/component-list.js
index 94d807f23b..b15f06e30b 100644
--- a/frontend/src/components/canvas/custom-component/component-list.js
+++ b/frontend/src/components/canvas/custom-component/component-list.js
@@ -307,8 +307,8 @@ const list = [
       borderStyle: 'solid',
       borderColor: '#000000',
       borderRadius: 0,
-      /* margin: 10, */
-      time_margin: 0
+      time_margin: 0,
+      padding: 10
     },
     formatInfo: {
       openMode: '0',
diff --git a/frontend/src/components/canvas/utils/style.js b/frontend/src/components/canvas/utils/style.js
index 92b7462833..0bc0e2145c 100644
--- a/frontend/src/components/canvas/utils/style.js
+++ b/frontend/src/components/canvas/utils/style.js
@@ -10,7 +10,8 @@ export function getStyle(style, filter = []) {
     'borderWidth',
     'letterSpacing',
     'borderRadius',
-    'margin'
+    'margin',
+    'padding'
   ]
 
   const result = {}
@@ -75,7 +76,7 @@ export function colorRgb(color, opacity) {
     }
     // 处理六位的颜色值
     var sColorChange = []
-    for (var i = 1; i < 7; i += 2) {
+    for (let i = 1; i < 7; i += 2) {
       sColorChange.push(parseInt('0x' + sColor.slice(i, i + 2)))
     }
     if (opacity || opacity === 0) {