Skip to content

Commit

Permalink
合并
Browse files Browse the repository at this point in the history
  • Loading branch information
@wanglin2
wanglin2 committed Jun 19, 2023
2 parents b9a0b16 + c8d2f28 commit d696e0f
Show file tree
Hide file tree
Showing 17 changed files with 86 additions and 35 deletions.
2 changes: 1 addition & 1 deletion index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!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.png"><title>一个简单的web思维导图实现</title><link href="dist/js/chunk-2d0a3179.d9ba171a.js" rel="prefetch"><link href="dist/js/chunk-2d0a514a.9b7a3240.js" rel="prefetch"><link href="dist/js/chunk-2d0aa579.5eb94d61.js" rel="prefetch"><link href="dist/js/chunk-2d0aa978.29ca76d1.js" rel="prefetch"><link href="dist/js/chunk-2d0ab10b.0e224dbf.js" rel="prefetch"><link href="dist/js/chunk-2d0abe0f.94c914d7.js" rel="prefetch"><link href="dist/js/chunk-2d0ac5dc.1d1bb02c.js" rel="prefetch"><link href="dist/js/chunk-2d0afe0d.bf066d25.js" rel="prefetch"><link href="dist/js/chunk-2d0b1c6f.f3c34e9c.js" rel="prefetch"><link href="dist/js/chunk-2d0b361e.f24689bd.js" rel="prefetch"><link href="dist/js/chunk-2d0b91e5.fadbdc10.js" rel="prefetch"><link href="dist/js/chunk-2d0b92c3.52bac6b0.js" rel="prefetch"><link href="dist/js/chunk-2d0b978a.f02411f2.js" rel="prefetch"><link href="dist/js/chunk-2d0b9b64.a3b7b0e2.js" rel="prefetch"><link href="dist/js/chunk-2d0ba309.02149e2b.js" rel="prefetch"><link href="dist/js/chunk-2d0bd54e.c6794f4b.js" rel="prefetch"><link href="dist/js/chunk-2d0be174.cfca2bec.js" rel="prefetch"><link href="dist/js/chunk-2d0c09f6.f3cf9ea8.js" rel="prefetch"><link href="dist/js/chunk-2d0c0a44.acfd4033.js" rel="prefetch"><link href="dist/js/chunk-2d0c14fc.4b3116f3.js" rel="prefetch"><link href="dist/js/chunk-2d0c191e.4994e978.js" rel="prefetch"><link href="dist/js/chunk-2d0c1a01.1b2967c3.js" rel="prefetch"><link href="dist/js/chunk-2d0c20be.de21aadc.js" rel="prefetch"><link href="dist/js/chunk-2d0c4a65.0cd59c76.js" rel="prefetch"><link href="dist/js/chunk-2d0c5538.8e8634f2.js" rel="prefetch"><link href="dist/js/chunk-2d0d5cb9.3547f556.js" rel="prefetch"><link href="dist/js/chunk-2d0d6590.07c7a6e4.js" rel="prefetch"><link href="dist/js/chunk-2d0d9fbc.08147ed6.js" rel="prefetch"><link href="dist/js/chunk-2d0da701.364ae0e3.js" rel="prefetch"><link href="dist/js/chunk-2d0dad5f.bc456c65.js" rel="prefetch"><link href="dist/js/chunk-2d0db0f2.bb3276f8.js" rel="prefetch"><link href="dist/js/chunk-2d0dd3b1.c0ec6c51.js" rel="prefetch"><link href="dist/js/chunk-2d0dddce.5a0d97af.js" rel="prefetch"><link href="dist/js/chunk-2d0ddf37.6fecab33.js" rel="prefetch"><link href="dist/js/chunk-2d0de01b.aea9cd3b.js" rel="prefetch"><link href="dist/js/chunk-2d0e2326.46e0dfe8.js" rel="prefetch"><link href="dist/js/chunk-2d0e4e1f.976b8d32.js" rel="prefetch"><link href="dist/js/chunk-2d0e5089.2caabcf3.js" rel="prefetch"><link href="dist/js/chunk-2d0e524c.e88a9cb2.js" rel="prefetch"><link href="dist/js/chunk-2d0e9726.128b8ec1.js" rel="prefetch"><link href="dist/js/chunk-2d0e9742.98466fae.js" rel="prefetch"><link href="dist/js/chunk-2d0e9802.911b1278.js" rel="prefetch"><link href="dist/js/chunk-2d0f026c.3e64edc0.js" rel="prefetch"><link href="dist/js/chunk-2d207d47.619f3d6b.js" rel="prefetch"><link href="dist/js/chunk-2d2082b9.04099460.js" rel="prefetch"><link href="dist/js/chunk-2d208ffa.f8323b23.js" rel="prefetch"><link href="dist/js/chunk-2d20ec02.917aff76.js" rel="prefetch"><link href="dist/js/chunk-2d20f68f.70af391b.js" rel="prefetch"><link href="dist/js/chunk-2d20ff53.18de3d7d.js" rel="prefetch"><link href="dist/js/chunk-2d210a7a.a6e9e73d.js" rel="prefetch"><link href="dist/js/chunk-2d216004.d4985acd.js" rel="prefetch"><link href="dist/js/chunk-2d216037.2ed6cede.js" rel="prefetch"><link href="dist/js/chunk-2d2160a3.2f3400cd.js" rel="prefetch"><link href="dist/js/chunk-2d216642.1dd23711.js" rel="prefetch"><link href="dist/js/chunk-2d217907.3bd419d4.js" rel="prefetch"><link href="dist/js/chunk-2d221c76.db20dd50.js" rel="prefetch"><link href="dist/js/chunk-2d2244e0.1c8f7321.js" rel="prefetch"><link href="dist/js/chunk-2d2254a4.fe83b386.js" rel="prefetch"><link href="dist/js/chunk-2d226d0a.b103d90b.js" rel="prefetch"><link href="dist/js/chunk-2d2299c3.4bfe3eb1.js" rel="prefetch"><link href="dist/js/chunk-2d22bd06.def375cf.js" rel="prefetch"><link href="dist/js/chunk-2d230098.adb9f950.js" rel="prefetch"><link href="dist/js/chunk-2d2308b0.6c83815b.js" rel="prefetch"><link href="dist/js/chunk-2d2375fa.86620513.js" rel="prefetch"><link href="dist/js/chunk-2d238428.9462b5a1.js" rel="prefetch"><link href="dist/js/chunk-3a2f3e67.13278516.js" rel="prefetch"><link href="dist/js/chunk-53cf9065.43d57024.js" rel="prefetch"><link href="dist/js/chunk-f19ee390.aec06c00.js" rel="prefetch"><link href="dist/js/chunk-f42d483e.67ff2fdd.js" rel="prefetch"><link href="dist/css/app.160a24e1.css" rel="preload" as="style"><link href="dist/css/chunk-vendors.c097b26d.css" rel="preload" as="style"><link href="dist/js/app.2903b72e.js" rel="preload" as="script"><link href="dist/js/chunk-vendors.d36f5bd6.js" rel="preload" as="script"><link href="dist/css/chunk-vendors.c097b26d.css" rel="stylesheet"><link href="dist/css/app.160a24e1.css" 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 src="dist/js/chunk-vendors.d36f5bd6.js"></script><script src="dist/js/app.2903b72e.js"></script></body></html>
<!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.png"><title>一个简单的web思维导图实现</title><link href="dist/js/chunk-2d0a3179.4ddb39ac.js" rel="prefetch"><link href="dist/js/chunk-2d0a514a.682ad517.js" rel="prefetch"><link href="dist/js/chunk-2d0aa579.19581ceb.js" rel="prefetch"><link href="dist/js/chunk-2d0aa978.51967b0f.js" rel="prefetch"><link href="dist/js/chunk-2d0ab10b.33401346.js" rel="prefetch"><link href="dist/js/chunk-2d0abe0f.cf8d9457.js" rel="prefetch"><link href="dist/js/chunk-2d0ac5dc.3ab0a108.js" rel="prefetch"><link href="dist/js/chunk-2d0afe0d.dee6ab5f.js" rel="prefetch"><link href="dist/js/chunk-2d0b1c6f.26f74561.js" rel="prefetch"><link href="dist/js/chunk-2d0b361e.ea789c54.js" rel="prefetch"><link href="dist/js/chunk-2d0b91e5.5dcd74d7.js" rel="prefetch"><link href="dist/js/chunk-2d0b92c3.97a5b525.js" rel="prefetch"><link href="dist/js/chunk-2d0b978a.12bb220c.js" rel="prefetch"><link href="dist/js/chunk-2d0b9b64.62b19638.js" rel="prefetch"><link href="dist/js/chunk-2d0ba309.20ff544c.js" rel="prefetch"><link href="dist/js/chunk-2d0bd54e.1aeb8759.js" rel="prefetch"><link href="dist/js/chunk-2d0be174.9d0f591e.js" rel="prefetch"><link href="dist/js/chunk-2d0c09f6.02a1d2f6.js" rel="prefetch"><link href="dist/js/chunk-2d0c0a44.476ea495.js" rel="prefetch"><link href="dist/js/chunk-2d0c14fc.ee2161f1.js" rel="prefetch"><link href="dist/js/chunk-2d0c191e.dbb71c9c.js" rel="prefetch"><link href="dist/js/chunk-2d0c1a01.ae59b26d.js" rel="prefetch"><link href="dist/js/chunk-2d0c20be.f6212c26.js" rel="prefetch"><link href="dist/js/chunk-2d0c4a65.105114f6.js" rel="prefetch"><link href="dist/js/chunk-2d0c5538.1720cbc7.js" rel="prefetch"><link href="dist/js/chunk-2d0d5cb9.20ea30fd.js" rel="prefetch"><link href="dist/js/chunk-2d0d6590.d25e5491.js" rel="prefetch"><link href="dist/js/chunk-2d0d9fbc.5e0c28bd.js" rel="prefetch"><link href="dist/js/chunk-2d0da701.e3c5460d.js" rel="prefetch"><link href="dist/js/chunk-2d0dad5f.2e8ff54c.js" rel="prefetch"><link href="dist/js/chunk-2d0db0f2.24ef70b3.js" rel="prefetch"><link href="dist/js/chunk-2d0dd3b1.b4e9d6fc.js" rel="prefetch"><link href="dist/js/chunk-2d0dddce.ebb895c6.js" rel="prefetch"><link href="dist/js/chunk-2d0ddf37.05bab94d.js" rel="prefetch"><link href="dist/js/chunk-2d0de01b.8d9034fc.js" rel="prefetch"><link href="dist/js/chunk-2d0e2326.58762c87.js" rel="prefetch"><link href="dist/js/chunk-2d0e4e1f.8b7eddab.js" rel="prefetch"><link href="dist/js/chunk-2d0e5089.6395df42.js" rel="prefetch"><link href="dist/js/chunk-2d0e524c.883e1a59.js" rel="prefetch"><link href="dist/js/chunk-2d0e9726.9ff681ec.js" rel="prefetch"><link href="dist/js/chunk-2d0e9742.235f1dec.js" rel="prefetch"><link href="dist/js/chunk-2d0e9802.0b5b0f37.js" rel="prefetch"><link href="dist/js/chunk-2d0f026c.94113d10.js" rel="prefetch"><link href="dist/js/chunk-2d207d47.72a9b479.js" rel="prefetch"><link href="dist/js/chunk-2d2082b9.1d8cc92a.js" rel="prefetch"><link href="dist/js/chunk-2d208ffa.7436447d.js" rel="prefetch"><link href="dist/js/chunk-2d20ec02.917aff76.js" rel="prefetch"><link href="dist/js/chunk-2d20f68f.bc455f39.js" rel="prefetch"><link href="dist/js/chunk-2d20ff53.33537f2a.js" rel="prefetch"><link href="dist/js/chunk-2d210a7a.badc23d9.js" rel="prefetch"><link href="dist/js/chunk-2d216004.a8e337e8.js" rel="prefetch"><link href="dist/js/chunk-2d216037.3fb042fb.js" rel="prefetch"><link href="dist/js/chunk-2d2160a3.a87d8dcc.js" rel="prefetch"><link href="dist/js/chunk-2d216642.7fdfbeb4.js" rel="prefetch"><link href="dist/js/chunk-2d217907.5d2e81e0.js" rel="prefetch"><link href="dist/js/chunk-2d221c76.ab535e62.js" rel="prefetch"><link href="dist/js/chunk-2d2244e0.24334c6e.js" rel="prefetch"><link href="dist/js/chunk-2d2254a4.c5f7c2ec.js" rel="prefetch"><link href="dist/js/chunk-2d226d0a.e24dba9e.js" rel="prefetch"><link href="dist/js/chunk-2d2299c3.e2f3dd8c.js" rel="prefetch"><link href="dist/js/chunk-2d22bd06.d9daced7.js" rel="prefetch"><link href="dist/js/chunk-2d230098.5c505cc8.js" rel="prefetch"><link href="dist/js/chunk-2d2308b0.0f0aa8b7.js" rel="prefetch"><link href="dist/js/chunk-2d2375fa.a09c5c59.js" rel="prefetch"><link href="dist/js/chunk-2d238428.0711835f.js" rel="prefetch"><link href="dist/js/chunk-362a33d8.7704f63a.js" rel="prefetch"><link href="dist/js/chunk-3a2f3e67.13278516.js" rel="prefetch"><link href="dist/js/chunk-7d9f40e8.80f28907.js" rel="prefetch"><link href="dist/js/chunk-f42d483e.4baee167.js" rel="prefetch"><link href="dist/css/app.2c45b900.css" rel="preload" as="style"><link href="dist/css/chunk-vendors.c097b26d.css" rel="preload" as="style"><link href="dist/js/app.f13c6c89.js" rel="preload" as="script"><link href="dist/js/chunk-vendors.d36f5bd6.js" rel="preload" as="script"><link href="dist/css/chunk-vendors.c097b26d.css" rel="stylesheet"><link href="dist/css/app.2c45b900.css" 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 src="dist/js/chunk-vendors.d36f5bd6.js"></script><script src="dist/js/app.f13c6c89.js"></script></body></html>
2 changes: 1 addition & 1 deletion simple-mind-map/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simple-mind-map",
"version": "0.6.0-fix.1",
"version": "0.6.1",
"description": "一个简单的web在线思维导图",
"authors": [
{
Expand Down
8 changes: 7 additions & 1 deletion simple-mind-map/src/core/event/Event.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,13 @@ class Event extends EventEmitter {
if ((e.wheelDeltaX || e.detail) > 0) dir = CONSTANTS.DIR.LEFT
if ((e.wheelDeltaX || e.detail) < 0) dir = CONSTANTS.DIR.RIGHT
}
this.emit('mousewheel', e, dir, this)
// 判断是否是触控板
let isTouchPad = false
// mac、windows
if (e.wheelDeltaY === e.deltaY * -3 || Math.abs(e.wheelDeltaY) <= 10) {
isTouchPad = true
}
this.emit('mousewheel', e, dir, this, isTouchPad)
}

// 鼠标右键菜单事件
Expand Down
14 changes: 9 additions & 5 deletions simple-mind-map/src/core/view/View.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class View {
this.firstDrag = true
})
// 放大缩小视图
this.mindMap.event.on('mousewheel', (e, dir) => {
this.mindMap.event.on('mousewheel', (e, dir, event, isTouchPad) => {
if (
this.mindMap.opt.customHandleMousewheel &&
typeof this.mindMap.opt.customHandleMousewheel === 'function'
Expand All @@ -82,22 +82,26 @@ class View {
break
}
} else {
let step = this.mindMap.opt.mousewheelMoveStep
if (isTouchPad) {
step = 5
}
switch (dir) {
// 上移
case CONSTANTS.DIR.DOWN:
this.translateY(-this.mindMap.opt.mousewheelMoveStep)
this.translateY(-step)
break
// 下移
case CONSTANTS.DIR.UP:
this.translateY(this.mindMap.opt.mousewheelMoveStep)
this.translateY(step)
break
// 右移
case CONSTANTS.DIR.LEFT:
this.translateX(-this.mindMap.opt.mousewheelMoveStep)
this.translateX(-step)
break
// 左移
case CONSTANTS.DIR.RIGHT:
this.translateX(this.mindMap.opt.mousewheelMoveStep)
this.translateX(step)
break
}
}
Expand Down
Binary file added web/src/assets/avatar/志斌.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion web/src/pages/Doc/en/changelog/index.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# Changelog

## 0.6.1

Fix: 1.Fixed the issue of high movement sensitivity when using the touchpad when changing mouse scrolling to moving the canvas behavior.

## 0.6.0-fix.1

1.Fixed the issue of destroying mind maps without setting a background style and reporting errors.
Fix: 1.Fixed the issue of destroying mind maps without setting a background style and reporting errors.

## 0.6.0

Expand Down
4 changes: 3 additions & 1 deletion web/src/pages/Doc/en/changelog/index.vue
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<template>
<div>
<h1>Changelog</h1>
<h2>0.6.1</h2>
<p>Fix: 1.Fixed the issue of high movement sensitivity when using the touchpad when changing mouse scrolling to moving the canvas behavior.</p>
<h2>0.6.0-fix.1</h2>
<p>1.Fixed the issue of destroying mind maps without setting a background style and reporting errors.</p>
<p>Fix: 1.Fixed the issue of destroying mind maps without setting a background style and reporting errors.</p>
<h2>0.6.0</h2>
<p>Breaking change: Adjusted the directory structure of the simple-mind-map source code, Main impact: 1. The introduction path of the plugin needs to be modified. The constant file path needs to be modified.</p>
<p>New: 1.Supports one click zoom to fit the canvas function. 2.Press and hold the Ctrl key to activate the multi selection function on demand through configuration. 3.Support setting to left click to select multiple nodes and right click to drag the canvas. 4. Support controlling whether nodes are allowed to be edited. 5.Add a method for destroying mind maps. 6.Added touch event support plugin.</p>
Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/Doc/en/constructor/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ Listen to an event. Event list:
| mousemove | el element mouse move event | e (event object), this (Event event class instance) |
| drag | If it is a drag event while holding down the left button | e (event object), this (Event event class instance) |
| mouseup | el element mouse up event | e (event object), this (Event event class instance) |
| mousewheel | Mouse scroll event | e (event object), dir (up or down scroll), this (Event event class instance) |
| mousewheel | Mouse scroll event | e (event object), dir (up or down scroll), this (Event event class instance) 、isTouchPad（v0.6.1+, Is it an event triggered by the touchpad） |
| contextmenu | svg canvas right mouse button menu event | e (event object) |
| node_click | Node click event | this (node instance), e (event object) |
| node_mousedown | Node mouse down event | this (node instance), e (event object) |
Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/Doc/en/constructor/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ poor performance and should be used sparingly.</p>
<tr>
<td>mousewheel</td>
<td>Mouse scroll event</td>
<td>e (event object), dir (up or down scroll), this (Event event class instance)</td>
<td>e (event object), dir (up or down scroll), this (Event event class instance) 、isTouchPad（v0.6.1+, Is it an event triggered by the touchpad）</td>
</tr>
<tr>
<td>contextmenu</td>
Expand Down
13 changes: 12 additions & 1 deletion web/src/pages/Doc/en/introduction/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,15 @@ Open source is not easy. If this project is helpful to you, you can invite the a
<img src="../../../../assets/img/alipay.jpg" style="width: 300px" />

<img src="../../../../assets/img/wechat.jpg" style="width: 300px" />
<img src="../../../../assets/img/wechat.jpg" style="width: 300px" />

<div style="display: flex;">
<div style="display: flex; flex-direction: column; align-items: center; width: fit-content; margin: 5px;">
<img src="../../../../assets/avatar/Think.jpg" style="width: 50px;height: 50px;object-fit: cover;border-radius: 50%;" />
<p>Think</p>
</div>
<div style="display: flex; flex-direction: column; align-items: center; width: fit-content; margin: 5px;">
<img src="../../../../assets/avatar/志斌.jpg" style="width: 50px;height: 50px;object-fit: cover;border-radius: 50%;" />
<p>志斌</p>
</div>
</div>
10 changes: 10 additions & 0 deletions web/src/pages/Doc/en/introduction/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,16 @@ full screen, support mini map</li>
</blockquote>
<img src="../../../../assets/img/alipay.jpg" style="width: 300px" />
<img src="../../../../assets/img/wechat.jpg" style="width: 300px" />
<div style="display: flex;">
<div style="display: flex; flex-direction: column; align-items: center; width: fit-content; margin: 5px;">
<img src="../../../../assets/avatar/Think.jpg" style="width: 50px;height: 50px;object-fit: cover;border-radius: 50%;" />
<p>Think</p>
</div>
<div style="display: flex; flex-direction: column; align-items: center; width: fit-content; margin: 5px;">
<img src="../../../../assets/avatar/志斌.jpg" style="width: 50px;height: 50px;object-fit: cover;border-radius: 50%;" />
<p>志斌</p>
</div>
</div>
</div>
</template>

Expand Down
6 changes: 5 additions & 1 deletion web/src/pages/Doc/zh/changelog/index.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# Changelog

## 0.6.1

修复：1.修复将鼠标滚动改为移动画布行为后，使用触控板操作时移动灵敏度过高的问题。

## 0.6.0-fix.1

1.修复没有设置过背景样式的情况下销毁思维导图报错的问题。
修复：1.修复没有设置过背景样式的情况下销毁思维导图报错的问题。

## 0.6.0

Expand Down
4 changes: 3 additions & 1 deletion web/src/pages/Doc/zh/changelog/index.vue
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<template>
<div>
<h1>Changelog</h1>
<h2>0.6.1</h2>
<p>修复：1.修复将鼠标滚动改为移动画布行为后，使用触控板操作时移动灵敏度过高的问题。</p>
<h2>0.6.0-fix.1</h2>
<p>1.修复没有设置过背景样式的情况下销毁思维导图报错的问题。</p>
<p>修复：1.修复没有设置过背景样式的情况下销毁思维导图报错的问题。</p>
<h2>0.6.0</h2>
<p>破坏性更新：调整了simple-mind-map源码的目录结构，主要影响：1.插件的引入路径需要修改。2.constant文件路径需要修改。</p>
<p>新增：1.支持一键缩放至适应画布功能。 2.按住Ctrl键多选功能可通过配置按需开启。 3.支持设置为左键多选节点，右键拖动画布。 4.支持控制节点是否允许编辑。 5.新增销毁思维导图的方法。 6.新增触摸事件支持插件。</p>
Expand Down
Loading

0 comments on commit d696e0f

Please sign in to comment.