From 88cea27d1ec036df2f4cc9ef5dcb76f9f42ff100 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: Thu, 13 Feb 2025 09:22:53 +0800
Subject: [PATCH] =?UTF-8?q?Demo=EF=BC=9A=E6=96=B0=E5=A2=9E=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E8=BF=9E=E7=BA=BF=E6=A0=B7=E5=BC=8F=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E7=BB=A7=E6=89=BF=E7=A5=96=E5=85=88=E7=9A=84?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=9A=84=E8=AE=BE=E7=BD=AE=E3=80=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=A1=B5=E9=9D=A2=E5=90=84=E5=A4=84=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=9D=A1=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/lang/en_us.js                         |  3 ++-
 web/src/lang/zh_cn.js                         |  1 +
 web/src/lang/zh_tw.js                         |  9 ++++---
 web/src/pages/Edit/components/BaseStyle.vue   |  2 +-
 .../pages/Edit/components/FormulaSidebar.vue  |  2 +-
 web/src/pages/Edit/components/Setting.vue     | 26 ++++++++++++++++---
 web/src/pages/Edit/components/Sidebar.vue     |  2 +-
 web/src/pages/Edit/components/Style.vue       |  2 +-
 8 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/web/src/lang/en_us.js b/web/src/lang/en_us.js
index 95c7c6bd..709477cc 100644
--- a/web/src/lang/en_us.js
+++ b/web/src/lang/en_us.js
@@ -84,7 +84,8 @@ export default {
     changeRichTextTip3: 'Do you want to switch to non rich text mode?',
     enableDragImport: 'Is it allowed to directly drag and drop files to the page for import',
     imgTextMargin: 'Node image and text margin',
-    textContentMargin: 'Node contents margin'
+    textContentMargin: 'Node contents margin',
+    enableInheritAncestorLineStyle: 'Node connection style inherits the style of ancestor nodes',
   },
   color: {
     moreColor: 'More color'
diff --git a/web/src/lang/zh_cn.js b/web/src/lang/zh_cn.js
index b8e17232..b508b0cf 100644
--- a/web/src/lang/zh_cn.js
+++ b/web/src/lang/zh_cn.js
@@ -75,6 +75,7 @@ export default {
     tagPositionBottom: '文本下面',
     alwaysShowExpandBtn: '是否一直显示展开收起按钮',
     enableAutoEnterTextEditWhenKeydown: '键盘输入时自动进入文本编辑',
+    enableInheritAncestorLineStyle: '节点连线样式继承祖先节点的样式',
     confirm: '确定',
     cancel: '取消',
     changeRichTextTip:
diff --git a/web/src/lang/zh_tw.js b/web/src/lang/zh_tw.js
index 99a578b3..645d684e 100644
--- a/web/src/lang/zh_tw.js
+++ b/web/src/lang/zh_tw.js
@@ -42,9 +42,7 @@ export default {
     notUseRainbowLines: '不使用彩虹線條',
     outerFramePadding: '外框內距',
     tagPositionRight: '文本右側',
-    tagPositionBottom: '文本下面',
-    alwaysShowExpandBtn: '是否壹直顯示展開收起按鈕',
-    enableAutoEnterTextEditWhenKeydown: '鍵盤輸入時自動進入文本編輯'
+    tagPositionBottom: '文本下面'
   },
   setting: {
     title: '設置',
@@ -84,7 +82,10 @@ export default {
     changeRichTextTip3: '是否切換爲非富文本模式？',
     enableDragImport: '是否允許直接拖拽文件到頁面進行導入',
     imgTextMargin: '節點圖片和文本間隔',
-    textContentMargin: '節點各種內容間隔'
+    textContentMargin: '節點各種內容間隔',
+    enableAutoEnterTextEditWhenKeydown: '鍵盤輸入時自動進入文本編輯',
+    enableInheritAncestorLineStyle: '節點連線樣式繼承祖先節點的樣式',
+    alwaysShowExpandBtn: '是否壹直顯示展開收起按鈕'
   },
   color: {
     moreColor: '更多顏色'
diff --git a/web/src/pages/Edit/components/BaseStyle.vue b/web/src/pages/Edit/components/BaseStyle.vue
index 5871f5f8..59a107fc 100644
--- a/web/src/pages/Edit/components/BaseStyle.vue
+++ b/web/src/pages/Edit/components/BaseStyle.vue
@@ -1,6 +1,6 @@
 <template>
   <Sidebar ref="sidebar" :title="$t('baseStyle.title')">
-    <div class="sidebarContent" :class="{ isDark: isDark }" v-if="data">
+    <div class="sidebarContent customScrollbar" :class="{ isDark: isDark }" v-if="data">
       <!-- 背景 -->
       <div class="title noTop">{{ $t('baseStyle.background') }}</div>
       <div class="row">
diff --git a/web/src/pages/Edit/components/FormulaSidebar.vue b/web/src/pages/Edit/components/FormulaSidebar.vue
index bf8217b5..9f100253 100644
--- a/web/src/pages/Edit/components/FormulaSidebar.vue
+++ b/web/src/pages/Edit/components/FormulaSidebar.vue
@@ -18,7 +18,7 @@
         >
       </div>
       <div class="title">{{ $t('formulaSidebar.common') }}</div>
-      <div class="formulaList">
+      <div class="formulaList customScrollbar">
         <div class="formulaItem" v-for="(item, index) in list" :key="index">
           <div class="overview" v-html="item.overview"></div>
           <div class="text" @click="formulaText = item.text">
diff --git a/web/src/pages/Edit/components/Setting.vue b/web/src/pages/Edit/components/Setting.vue
index 42ac2465..4ea85510 100644
--- a/web/src/pages/Edit/components/Setting.vue
+++ b/web/src/pages/Edit/components/Setting.vue
@@ -1,6 +1,6 @@
 <template>
   <Sidebar ref="sidebar" :title="$t('setting.title')">
-    <div class="sidebarContent" :class="{ isDark: isDark }" v-if="data">
+    <div class="sidebarContent customScrollbar" :class="{ isDark: isDark }" v-if="data">
       <!-- 水印 -->
       <div class="row">
         <!-- 是否显示水印 -->
@@ -230,6 +230,18 @@
           >
         </div>
       </div>
+      <!-- 节点连线样式是否允许继承祖先的连线样式 -->
+      <div class="row">
+        <div class="rowItem">
+          <el-checkbox
+            v-model="config.enableInheritAncestorLineStyle"
+            @change="
+              updateOtherConfig('enableInheritAncestorLineStyle', $event)
+            "
+            >{{ $t('setting.enableInheritAncestorLineStyle') }}</el-checkbox
+          >
+        </div>
+      </div>
       <!-- 是否开启手绘风格 -->
       <div class="row" v-if="supportHandDrawnLikeStyle">
         <div class="rowItem">
@@ -387,7 +399,8 @@ export default {
         alwaysShowExpandBtn: false,
         enableAutoEnterTextEditWhenKeydown: true,
         imgTextMargin: 0,
-        textContentMargin: 0
+        textContentMargin: 0,
+        enableInheritAncestorLineStyle: false
       },
       watermarkConfig: {
         show: false,
@@ -479,7 +492,14 @@ export default {
       storeConfig({
         config: this.data.config
       })
-      if (['alwaysShowExpandBtn', 'imgTextMargin', 'textContentMargin'].includes(key)) {
+      if (
+        [
+          'alwaysShowExpandBtn',
+          'imgTextMargin',
+          'textContentMargin',
+          'enableInheritAncestorLineStyle'
+        ].includes(key)
+      ) {
         this.mindMap.reRender()
       }
     },
diff --git a/web/src/pages/Edit/components/Sidebar.vue b/web/src/pages/Edit/components/Sidebar.vue
index c8938a45..c774927e 100644
--- a/web/src/pages/Edit/components/Sidebar.vue
+++ b/web/src/pages/Edit/components/Sidebar.vue
@@ -9,7 +9,7 @@
     <div class="sidebarHeader" v-if="title">
       {{ title }}
     </div>
-    <div class="sidebarContent" ref="sidebarContent">
+    <div class="sidebarContent customScrollbar" ref="sidebarContent">
       <slot></slot>
     </div>
   </div>
diff --git a/web/src/pages/Edit/components/Style.vue b/web/src/pages/Edit/components/Style.vue
index b300fd33..5cb86b8c 100644
--- a/web/src/pages/Edit/components/Style.vue
+++ b/web/src/pages/Edit/components/Style.vue
@@ -5,7 +5,7 @@
       :class="{ isDark: isDark }"
       v-if="activeNodes.length > 0"
     >
-      <div class="sidebarContent">
+      <div class="sidebarContent customScrollbar">
         <!-- 文字 -->
         <div class="title noTop">{{ $t('style.text') }}</div>
         <div class="row">