合并

wanglin2 · Nov 23, 2023 · e3b9df9 · e3b9df9
2 parents 96bb356 + 3b47d11
commit e3b9df9
Show file tree

Hide file tree

Showing 77 changed files with 30,017 additions and 659 deletions.
diff --git a/README.md b/README.md
@@ -210,4 +210,20 @@ const mindMap = new MindMap({
         <img src="./web/src/assets/avatar/天清如愿.jpg" style="width: 50px;height: 50px;" />
         <span>天清如愿</span>
     </span>
+    <span>
+        <img src="./web/src/assets/avatar/敬明朗.jpg" style="width: 50px;height: 50px;" />
+        <span>敬明朗</span>
+    </span>
+    <span>
+        <img src="./web/src/assets/avatar/default.png" style="width: 50px;height: 50px;" />
+        <span>飞箭</span>
+    </span>
+    <span>
+        <img src="./web/src/assets/avatar/戚永峰.png" style="width: 50px;height: 50px;" />
+        <span>戚永峰</span>
+    </span>
+    <span>
+        <img src="./web/src/assets/avatar/moom.jpg" style="width: 50px;height: 50px;" />
+        <span>moom</span>
+    </span>
 </p>
diff --git a/index.html b/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><link rel="icon" href="dist/logo.ico"><title>思绪思维导图</title><script>// 自定义静态资源的路径
       window.externalPublicPath = './dist/'
       // 接管应用
-      window.takeOverApp = false</script><link href="dist/css/chunk-vendors.css?8082e15354ee539c1308" rel="stylesheet"><link href="dist/css/app.css?8082e15354ee539c1308" rel="stylesheet"></head><body><noscript><strong>We're sorry but thoughts doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script>const getDataFromBackend = () => {
+      window.takeOverApp = false</script><link href="dist/css/chunk-vendors.css?6450bdeb4871438bb6e4" rel="stylesheet"><link href="dist/css/app.css?6450bdeb4871438bb6e4" rel="stylesheet"></head><body><noscript><strong>We're sorry but thoughts doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script>const getDataFromBackend = () => {
         return new Promise((resolve, reject) => {
           setTimeout(() => {
             resolve({
@@ -66,4 +66,4 @@
         // 可以通过window.$bus.$on()来监听应用的一些事件
         // 实例化页面
         window.initApp()
-      }</script><script src="dist/js/chunk-vendors.js?8082e15354ee539c1308"></script><script src="dist/js/app.js?8082e15354ee539c1308"></script></body></html>
+      }</script><script src="dist/js/chunk-vendors.js?6450bdeb4871438bb6e4"></script><script src="dist/js/app.js?6450bdeb4871438bb6e4"></script></body></html>
diff --git a/simple-mind-map/index.js b/simple-mind-map/index.js
@@ -486,6 +486,7 @@ class MindMap {
 
   // 销毁
   destroy() {
+    this.emit('beforeDestroy')
     // 移除插件
     ;[...MindMap.pluginList].forEach(plugin => {
       if (this[plugin.instanceName].beforePluginDestroy) {

diff --git a/simple-mind-map/package-lock.json b/simple-mind-map/package-lock.json
diff --git a/simple-mind-map/package.json b/simple-mind-map/package.json
@@ -1,6 +1,6 @@
 {
   "name": "simple-mind-map",
-  "version": "0.8.0-fix.1",
+  "version": "0.9.0",
   "description": "一个简单的web在线思维导图",
   "authors": [
     {

diff --git a/simple-mind-map/src/constants/defaultOptions.js b/simple-mind-map/src/constants/defaultOptions.js
@@ -160,6 +160,9 @@ export const defaultOpt = {
   customHandleClipboardText: null,
   // 禁止鼠标滚轮缩放，你仍旧可以使用api进行缩放
   disableMouseWheelZoom: false,
+  // 禁止双指缩放，你仍旧可以使用api进行缩放
+  // 需要注册TouchEvent插件后生效
+  disableTouchZoom: false,
   // 错误处理函数
   errorHandler: (code, error) => {
     console.error(code, error)
@@ -219,5 +222,12 @@ export const defaultOpt = {
   // 可以传递一个函数，返回promise，resolve代表根据换行分割，reject代表忽略换行
   handleIsSplitByWrapOnPasteCreateNewNode: null,
   // 多少时间内只允许添加一次历史记录，避免添加没有必要的中间状态，单位：ms
-  addHistoryTime: 100
+  addHistoryTime: 100,
+  // 是否禁止拖动画布
+  isDisableDrag: false,
+  // 鼠标移入概要高亮所属节点时的高亮框样式
+  highlightNodeBoxStyle: {
+    stroke: 'rgb(94, 200, 248)',
+    fill: 'transparent'
+  }
 }
diff --git a/simple-mind-map/src/core/command/KeyCommand.js b/simple-mind-map/src/core/command/KeyCommand.js
@@ -38,6 +38,7 @@ export default class KeyCommand {
 
   //  绑定事件
   bindEvent() {
+    this.onKeydown = this.onKeydown.bind(this)
     // 只有当鼠标在画布内才响应快捷键
     this.mindMap.on('svg_mouseenter', () => {
       this.isInSvg = true
@@ -55,25 +56,36 @@ export default class KeyCommand {
       }
       this.isInSvg = false
     })
-    window.addEventListener('keydown', e => {
-      if (
-        this.isPause ||
-        (this.mindMap.opt.enableShortcutOnlyWhenMouseInSvg && !this.isInSvg)
-      ) {
-        return
-      }
-      Object.keys(this.shortcutMap).forEach(key => {
-        if (this.checkKey(e, key)) {
-          // 粘贴事件不组织，因为要监听paste事件
-          if (!this.checkKey(e, 'Control+v')) {
-            e.stopPropagation()
-            e.preventDefault()
-          }
-          this.shortcutMap[key].forEach(fn => {
-            fn()
-          })
+    window.addEventListener('keydown', this.onKeydown)
+    this.mindMap.on('beforeDestroy', () => {
+      this.unBindEvent()
+    })
+  }
+
+  // 解绑事件
+  unBindEvent() {
+    window.removeEventListener('keydown', this.onKeydown)
+  }
+
+  // 按键事件
+  onKeydown(e) {
+    if (
+      this.isPause ||
+      (this.mindMap.opt.enableShortcutOnlyWhenMouseInSvg && !this.isInSvg)
+    ) {
+      return
+    }
+    Object.keys(this.shortcutMap).forEach(key => {
+      if (this.checkKey(e, key)) {
+        // 粘贴事件不组织，因为要监听paste事件
+        if (!this.checkKey(e, 'Control+v')) {
+          e.stopPropagation()
+          e.preventDefault()
         }
-      })
+        this.shortcutMap[key].forEach(fn => {
+          fn()
+        })
+      }
     })
   }