From 0c4fadb211b93fa7fe4b2c07d8f712f9020ffbb0 Mon Sep 17 00:00:00 2001
From: wanglin2 <1013335014@qq.com>
Date: Sun, 20 Apr 2025 10:13:05 +0800
Subject: [PATCH] =?UTF-8?q?Demo:1.=E4=BC=98=E5=8C=96=E4=BE=A7=E8=BE=B9?=
 =?UTF-8?q?=E6=A0=8F=E7=9A=84=E6=A0=B7=E5=BC=8F;2.=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E7=BB=93=E6=9E=84=E4=B8=BA=E5=B8=A6=E9=B1=BC?=
 =?UTF-8?q?=E5=A4=B4=E7=9A=84=E7=BB=93=E6=9E=84=E6=97=B6=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=BD=A2=E7=8A=B6=E5=88=97=E8=A1=A8=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E7=A9=BA=E9=A1=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/pages/Edit/components/BaseStyle.vue | 36 ++++++++++++---------
 web/src/pages/Edit/components/Style.vue     | 32 +++++++++++-------
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/web/src/pages/Edit/components/BaseStyle.vue b/web/src/pages/Edit/components/BaseStyle.vue
index 8db1a13d..4a28998a 100644
--- a/web/src/pages/Edit/components/BaseStyle.vue
+++ b/web/src/pages/Edit/components/BaseStyle.vue
@@ -126,7 +126,7 @@
         </el-tabs>
       </div>
       <!-- 连线 -->
-      <div class="title noTop">{{ $t('baseStyle.line') }}</div>
+      <div class="title">{{ $t('baseStyle.line') }}</div>
       <div class="row">
         <div class="rowItem">
           <span class="name">{{ $t('baseStyle.color') }}</span>
@@ -357,7 +357,7 @@
         </div>
       </div>
       <!-- 彩虹线条 -->
-      <div class="title noTop">{{ $t('baseStyle.rainbowLines') }}</div>
+      <div class="title">{{ $t('baseStyle.rainbowLines') }}</div>
       <div class="row">
         <div class="rowItem">
           <el-popover
@@ -401,7 +401,7 @@
         </div>
       </div>
       <!-- 概要连线 -->
-      <div class="title noTop">{{ $t('baseStyle.lineOfOutline') }}</div>
+      <div class="title">{{ $t('baseStyle.lineOfOutline') }}</div>
       <div class="row">
         <div class="rowItem">
           <span class="name">{{ $t('baseStyle.color') }}</span>
@@ -451,7 +451,7 @@
         </div>
       </div>
       <!-- 关联线 -->
-      <div class="title noTop">{{ $t('baseStyle.associativeLine') }}</div>
+      <div class="title">{{ $t('baseStyle.associativeLine') }}</div>
       <div class="row">
         <div class="rowItem">
           <span class="name">{{ $t('baseStyle.associativeLineColor') }}</span>
@@ -594,7 +594,7 @@
         </div>
       </div>
       <!-- 关联线文字 -->
-      <div class="title noTop">{{ $t('baseStyle.associativeLineText') }}</div>
+      <div class="title">{{ $t('baseStyle.associativeLineText') }}</div>
       <div class="row">
         <div class="rowItem">
           <span class="name">{{ $t('baseStyle.fontFamily') }}</span>
@@ -656,7 +656,7 @@
       </div>
       <!-- 节点边框风格 -->
       <template v-if="showNodeUseLineStyle">
-        <div class="title noTop">{{ $t('baseStyle.nodeBorderType') }}</div>
+        <div class="title">{{ $t('baseStyle.nodeBorderType') }}</div>
         <div class="row">
           <div class="rowItem">
             <el-checkbox
@@ -672,8 +672,8 @@
         </div>
       </template>
       <!-- 内边距 -->
-      <div class="title noTop">{{ $t('baseStyle.nodePadding') }}</div>
-      <div class="row">
+      <div class="title">{{ $t('baseStyle.nodePadding') }}</div>
+      <div class="row noBottom">
         <div class="rowItem">
           <span class="name">{{ $t('baseStyle.horizontal') }}</span>
           <el-slider
@@ -702,8 +702,8 @@
         </div>
       </div>
       <!-- 图片 -->
-      <div class="title noTop">{{ $t('baseStyle.image') }}</div>
-      <div class="row">
+      <div class="title">{{ $t('baseStyle.image') }}</div>
+      <div class="row noBottom">
         <div class="rowItem">
           <span class="name">{{ $t('baseStyle.maximumWidth') }}</span>
           <el-slider
@@ -736,7 +736,7 @@
         </div>
       </div>
       <!-- 图标 -->
-      <div class="title noTop">{{ $t('baseStyle.icon') }}</div>
+      <div class="title">{{ $t('baseStyle.icon') }}</div>
       <div class="row">
         <div class="rowItem">
           <span class="name">{{ $t('baseStyle.size') }}</span>
@@ -754,8 +754,8 @@
         </div>
       </div>
       <!-- 二级节点外边距 -->
-      <div class="title noTop">{{ $t('baseStyle.nodeMargin') }}</div>
-      <div class="row column">
+      <div class="title">{{ $t('baseStyle.nodeMargin') }}</div>
+      <div class="row column noBottom">
         <el-tabs
           class="tab"
           v-model="marginActiveTab"
@@ -798,8 +798,8 @@
         </div>
       </div>
       <!-- 外框内边距 -->
-      <div class="title noTop">{{ $t('baseStyle.outerFramePadding') }}</div>
-      <div class="row">
+      <div class="title">{{ $t('baseStyle.outerFramePadding') }}</div>
+      <div class="row noBottom">
         <div class="rowItem">
           <span class="name">{{ $t('baseStyle.horizontal') }}</span>
           <el-slider
@@ -1167,7 +1167,7 @@ export default {
     font-weight: 500;
     color: rgba(26, 26, 26, 0.9);
     margin-bottom: 10px;
-    margin-top: 20px;
+    margin-top: 35px;
 
     &.noTop {
       margin-top: 0;
@@ -1179,6 +1179,10 @@ export default {
     justify-content: space-between;
     margin-bottom: 10px;
 
+    &.noBottom {
+      margin-bottom: 0;
+    }
+
     &.column {
       flex-direction: column;
     }
diff --git a/web/src/pages/Edit/components/Style.vue b/web/src/pages/Edit/components/Style.vue
index 3eddcf15..ae8680b2 100644
--- a/web/src/pages/Edit/components/Style.vue
+++ b/web/src/pages/Edit/components/Style.vue
@@ -481,8 +481,8 @@
           </div>
         </div>
         <!-- 节点内边距 -->
-        <div class="title noTop">{{ $t('style.nodePadding') }}</div>
-        <div class="row">
+        <div class="title">{{ $t('style.nodePadding') }}</div>
+        <div class="row noBottom">
           <div class="rowItem">
             <span class="name">{{ $t('style.horizontal') }}</span>
             <el-slider
@@ -503,7 +503,7 @@
           </div>
         </div>
         <!-- 节点图片布局 -->
-        <div class="title noTop">{{ $t('style.img') }}</div>
+        <div class="title">{{ $t('style.img') }}</div>
         <div class="row">
           <div class="rowItem">
             <span class="name">{{ $t('style.placement') }}</span>
@@ -528,7 +528,7 @@
           </div>
         </div>
         <!-- 节点标签布局 -->
-        <div class="title noTop">{{ $t('style.tag') }}</div>
+        <div class="title">{{ $t('style.tag') }}</div>
         <div class="row">
           <div class="rowItem">
             <span class="name">{{ $t('style.placement') }}</span>
@@ -635,13 +635,17 @@ export default {
     shapeList() {
       return [
         ...(shapeList[this.$i18n.locale] || shapeList.zh),
-        ...this.mindMap.extendShapeList.map(item => {
-          return {
-            width: '40px',
-            name: item.nameShow,
-            value: item.name
-          }
-        })
+        ...this.mindMap.extendShapeList
+          .filter(item => {
+            return !['fishHead'].includes(item.name)
+          })
+          .map(item => {
+            return {
+              width: '40px',
+              name: item.nameShow,
+              value: item.name
+            }
+          })
       ]
     },
     shapeListMap() {
@@ -854,7 +858,7 @@ export default {
     font-weight: 500;
     color: rgba(26, 26, 26, 0.9);
     margin-bottom: 10px;
-    margin-top: 20px;
+    margin-top: 35px;
 
     &.noTop {
       margin-top: 0;
@@ -866,6 +870,10 @@ export default {
     justify-content: space-between;
     margin-bottom: 10px;
 
+    &.noBottom {
+      margin-bottom: 0;
+    }
+
     .btnGroup {
       width: 100%;
       display: flex;