From a0f88031c123f47e9317f9abe2f6a4de2cdaedaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A1=97=E8=A7=92=E5=B0=8F=E6=9E=97?= <1013335014@qq.com>
Date: Wed, 16 Oct 2024 18:42:38 +0800
Subject: [PATCH] =?UTF-8?q?Demo=EF=BC=9A=E5=8E=BB=E9=99=A4=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E6=A0=B7=E5=BC=8F=E7=9A=84=E8=A1=8C=E9=AB=98=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/config/index.js                 |  2 --
 web/src/config/zh.js                    |  3 ---
 web/src/lang/en_us.js                   |  1 -
 web/src/lang/zh_cn.js                   |  1 -
 web/src/lang/zh_tw.js                   |  1 -
 web/src/pages/Edit/components/Style.vue | 25 +------------------------
 6 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/web/src/config/index.js b/web/src/config/index.js
index bfc1c720..a01bbc18 100644
--- a/web/src/config/index.js
+++ b/web/src/config/index.js
@@ -1,6 +1,5 @@
 import {
   fontSizeList,
-  lineHeightList,
   colorList,
   borderWidthList,
   borderRadiusList,
@@ -155,7 +154,6 @@ const linearGradientDirList = {
 
 export {
   fontSizeList,
-  lineHeightList,
   borderWidthList,
   borderRadiusList,
   lineWidthList,
diff --git a/web/src/config/zh.js b/web/src/config/zh.js
index bfddedfc..f3976db3 100644
--- a/web/src/config/zh.js
+++ b/web/src/config/zh.js
@@ -57,9 +57,6 @@ export const fontFamilyList = [
 // 字号
 export const fontSizeList = [10, 12, 16, 18, 24, 32, 48]
 
-// 行高
-export const lineHeightList = [1, 1.5, 2, 2.5, 3]
-
 // 颜色
 export const colorList = [
   '#4D4D4D',
diff --git a/web/src/lang/en_us.js b/web/src/lang/en_us.js
index 9507236c..853f2286 100644
--- a/web/src/lang/en_us.js
+++ b/web/src/lang/en_us.js
@@ -216,7 +216,6 @@ export default {
     text: 'Text',
     fontFamily: 'Font family',
     fontSize: 'Font size',
-    lineHeight: 'Line height',
     color: 'color',
     addFontWeight: 'add font weight',
     italic: 'Italic',
diff --git a/web/src/lang/zh_cn.js b/web/src/lang/zh_cn.js
index df8984d0..720b399a 100644
--- a/web/src/lang/zh_cn.js
+++ b/web/src/lang/zh_cn.js
@@ -214,7 +214,6 @@ export default {
     text: '文字',
     fontFamily: '字体',
     fontSize: '字号',
-    lineHeight: '行高',
     color: '颜色',
     addFontWeight: '加粗',
     italic: '斜体',
diff --git a/web/src/lang/zh_tw.js b/web/src/lang/zh_tw.js
index b3fe0e35..9772d8ce 100644
--- a/web/src/lang/zh_tw.js
+++ b/web/src/lang/zh_tw.js
@@ -214,7 +214,6 @@ export default {
     text: '文字',
     fontFamily: '字型',
     fontSize: '字型大小',
-    lineHeight: '行高',
     color: '顏色',
     addFontWeight: '粗體',
     italic: '斜體',
diff --git a/web/src/pages/Edit/components/Style.vue b/web/src/pages/Edit/components/Style.vue
index 24950309..2edb830c 100644
--- a/web/src/pages/Edit/components/Style.vue
+++ b/web/src/pages/Edit/components/Style.vue
@@ -13,6 +13,7 @@
             <span class="name">{{ $t('style.fontFamily') }}</span>
             <el-select
               size="mini"
+              style="width: 100px"
               v-model="style.fontFamily"
               placeholder=""
               @change="update('fontFamily')"
@@ -27,8 +28,6 @@
               </el-option>
             </el-select>
           </div>
-        </div>
-        <div class="row">
           <div class="rowItem">
             <span class="name">{{ $t('style.fontSize') }}</span>
             <el-select
@@ -48,24 +47,6 @@
               </el-option>
             </el-select>
           </div>
-          <div class="rowItem">
-            <span class="name">{{ $t('style.lineHeight') }}</span>
-            <el-select
-              size="mini"
-              style="width: 80px"
-              v-model="style.lineHeight"
-              placeholder=""
-              @change="update('lineHeight')"
-            >
-              <el-option
-                v-for="item in lineHeightList"
-                :key="item"
-                :label="item"
-                :value="item"
-              >
-              </el-option>
-            </el-select>
-          </div>
         </div>
         <div class="row">
           <div class="btnGroup">
@@ -474,7 +455,6 @@ import {
   borderWidthList,
   borderDasharrayList,
   borderRadiusList,
-  lineHeightList,
   shapeList,
   shapeListMap,
   linearGradientDirList
@@ -497,7 +477,6 @@ export default {
       fontSizeList,
       borderWidthList,
       borderRadiusList,
-      lineHeightList,
       activeNodes: [],
       style: {
         shape: '',
@@ -506,7 +485,6 @@ export default {
         color: '',
         fontFamily: '',
         fontSize: '',
-        lineHeight: '',
         textDecoration: '',
         fontWeight: '',
         fontStyle: '',
@@ -593,7 +571,6 @@ export default {
         'color',
         'fontFamily',
         'fontSize',
-        'lineHeight',
         'textDecoration',
         'fontWeight',
         'fontStyle',