From 4d21b84882faef64026eb8576800d9c71f0fdcf8 Mon Sep 17 00:00:00 2001
From: wanglin2 <1013335014@qq.com>
Date: Fri, 31 Mar 2023 14:32:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=B0=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 simple-mind-map/index.js                          | 2 +-
 simple-mind-map/src/utils/nodeExpandBtn.js        | 3 +++
 web/src/pages/Edit/components/RichTextToolbar.vue | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/simple-mind-map/index.js b/simple-mind-map/index.js
index e0257fcc..83fe8bb3 100644
--- a/simple-mind-map/index.js
+++ b/simple-mind-map/index.js
@@ -95,7 +95,7 @@ class MindMap {
     this.draw = this.svg.group()
 
     // 节点id
-    this.uid = 0
+    this.uid = 1
 
     // 初始化主题
     this.initTheme()
diff --git a/simple-mind-map/src/utils/nodeExpandBtn.js b/simple-mind-map/src/utils/nodeExpandBtn.js
index 3654fbdb..1eb79c9a 100644
--- a/simple-mind-map/src/utils/nodeExpandBtn.js
+++ b/simple-mind-map/src/utils/nodeExpandBtn.js
@@ -87,6 +87,9 @@ function renderExpandBtn() {
       )
       this.mindMap.emit('expand_btn_click', this)
     })
+    this._expandBtn.on('dblclick', e => {
+      e.stopPropagation()
+    })
     this.group.add(this._expandBtn)
   }
   this.updateExpandBtnNode()
diff --git a/web/src/pages/Edit/components/RichTextToolbar.vue b/web/src/pages/Edit/components/RichTextToolbar.vue
index e2741289..81fc8620 100644
--- a/web/src/pages/Edit/components/RichTextToolbar.vue
+++ b/web/src/pages/Edit/components/RichTextToolbar.vue
@@ -76,7 +76,7 @@
             {{ item }}px
           </div>
         </div>
-        <div class="btn" slot="reference" :style="{ color: formatInfo.color }">
+        <div class="btn" slot="reference">
           <span class="icon iconfont iconcase fontColor"></span>
         </div>
       </el-popover>
@@ -85,7 +85,7 @@
     <el-tooltip content="字体颜色" placement="top">
       <el-popover placement="bottom" trigger="hover">
         <Color :color="fontColor" @change="changeFontColor"></Color>
-        <div class="btn" slot="reference">
+        <div class="btn" slot="reference" :style="{ color: formatInfo.color }">
           <span class="icon iconfont iconzitiyanse"></span>
         </div>
       </el-popover>