From 353b5ca6adb4bc9191b5dcfdf150b0180d3dccdd Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 13 Sep 2021 17:58:58 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=E5=A2=9E=E5=8A=A0=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=E8=AE=BE=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=AA=E8=BE=93=E5=85=A5=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/canvas/components/TextAttr.vue    | 12 ++++++++++--
 .../canvas/custom-component/component-list.js        |  7 +++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue
index 72260705ad..516070e87e 100644
--- a/frontend/src/components/canvas/components/TextAttr.vue
+++ b/frontend/src/components/canvas/components/TextAttr.vue
@@ -49,6 +49,14 @@
         <el-input v-model="innerOpacity" type="number" size="mini" min="0" max="100" step="10" @change="styleChange" />
       </div>
 
+      <el-tooltip :content="$t('panel.borderRadius')">
+        <i style="float: left;margin-top: 3px;margin-left: 2px;" class="icon iconfont icon-fangxing-" />
+      </el-tooltip>
+
+      <div style="width: 70px;float: left;margin-top: 2px;margin-left: 2px;">
+        <el-input v-model="styleInfo.borderRadius" type="number" size="mini" min="0" max="100" step="1" @change="styleChange" />
+      </div>
+
       <div style="width: 20px;float: left;margin-top: 2px;margin-left: 10px;">
         <div style="width: 16px;height: 18px">
           <el-tooltip :content="$t('panel.color')">
@@ -173,7 +181,7 @@ export default {
         ps = x + 60
       }
       // 防止toolbar超出边界
-      const xGap = ps + 495 - this.canvasWidth
+      const xGap = ps + 565 - this.canvasWidth
       // console.log('canvasWidth:' + this.canvasWidth + ';xGap:' + xGap)
       if (xGap > 0) {
         return ps - xGap
@@ -205,7 +213,7 @@ export default {
   .el-card-main {
     height: 34px;
     z-index: 10;
-    width: 550px;
+    width: 620px;
     position: absolute;
 
   }
diff --git a/frontend/src/components/canvas/custom-component/component-list.js b/frontend/src/components/canvas/custom-component/component-list.js
index 0e1d8d6a0b..9a3ecfd7fc 100644
--- a/frontend/src/components/canvas/custom-component/component-list.js
+++ b/frontend/src/components/canvas/custom-component/component-list.js
@@ -57,8 +57,11 @@ const list = [
       fontWeight: 400,
       lineHeight: '',
       letterSpacing: 0,
-      textAlign: 'left',
-      color: '#000000'
+      textAlign: 'center',
+      color: '#000000',
+      verticalAlign: 'middle',
+      backgroundColor: '#ffffff',
+      borderRadius: 0
     }
   },
   {