From 1beb03eaa675f6ab9e3da8b25e2a528479655c09 Mon Sep 17 00:00:00 2001 From: wanglin2 <1013335014@qq.com> Date: Wed, 27 Sep 2023 18:21:27 +0800 Subject: [PATCH 01/86] =?UTF-8?q?Feat=EF=BC=9A=E5=B0=9D=E8=AF=95=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=8D=8F=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simple-mind-map/bin/server.mjs | 152 ++++++++++ simple-mind-map/package-lock.json | 346 ++++++++++++++++++++++- simple-mind-map/package.json | 7 +- simple-mind-map/src/layouts/Base.js | 4 + simple-mind-map/src/plugins/Cooperate.js | 206 ++++++++++++++ web/src/pages/Edit/components/Edit.vue | 6 +- 6 files changed, 713 insertions(+), 8 deletions(-) create mode 100644 simple-mind-map/bin/server.mjs create mode 100644 simple-mind-map/src/plugins/Cooperate.js diff --git a/simple-mind-map/bin/server.mjs b/simple-mind-map/bin/server.mjs new file mode 100644 index 00000000..23efb3a7 --- /dev/null +++ b/simple-mind-map/bin/server.mjs @@ -0,0 +1,152 @@ +#!/usr/bin/env node + +import ws from 'ws' +import http from 'http' +import * as map from 'lib0/map' + +const wsReadyStateConnecting = 0 +const wsReadyStateOpen = 1 +const wsReadyStateClosing = 2 // eslint-disable-line +const wsReadyStateClosed = 3 // eslint-disable-line + +const pingTimeout = 30000 + +const port = process.env.PORT || 4444 +// @ts-ignore +const wss = new ws.Server({ noServer: true }) + +const server = http.createServer((request, response) => { + response.writeHead(200, { 'Content-Type': 'text/plain' }) + response.end('okay') +}) + +/** + * Map froms topic-name to set of subscribed clients. + * @type {Map>} + */ +const topics = new Map() + +/** + * @param {any} conn + * @param {object} message + */ +const send = (conn, message) => { + if ( + conn.readyState !== wsReadyStateConnecting && + conn.readyState !== wsReadyStateOpen + ) { + conn.close() + } + try { + conn.send(JSON.stringify(message)) + } catch (e) { + conn.close() + } +} + +/** + * Setup a new client + * @param {any} conn + */ +const onconnection = conn => { + /** + * @type {Set} + */ + const subscribedTopics = new Set() + let closed = false + // Check if connection is still alive + let pongReceived = true + const pingInterval = setInterval(() => { + if (!pongReceived) { + conn.close() + clearInterval(pingInterval) + } else { + pongReceived = false + try { + conn.ping() + } catch (e) { + conn.close() + } + } + }, pingTimeout) + conn.on('pong', () => { + pongReceived = true + }) + conn.on('close', () => { + subscribedTopics.forEach(topicName => { + const subs = topics.get(topicName) || new Set() + subs.delete(conn) + if (subs.size === 0) { + topics.delete(topicName) + } + }) + subscribedTopics.clear() + closed = true + }) + conn.on( + 'message', + /** @param {object} message */ message => { + if (typeof message === 'string') { + message = JSON.parse(message) + } + if (message && message.type && !closed) { + switch (message.type) { + case 'subscribe': + /** @type {Array} */ ;(message.topics || []).forEach( + topicName => { + if (typeof topicName === 'string') { + // add conn to topic + const topic = map.setIfUndefined( + topics, + topicName, + () => new Set() + ) + topic.add(conn) + // add topic to conn + subscribedTopics.add(topicName) + } + } + ) + break + case 'unsubscribe': + /** @type {Array} */ ;(message.topics || []).forEach( + topicName => { + const subs = topics.get(topicName) + if (subs) { + subs.delete(conn) + } + } + ) + break + case 'publish': + if (message.topic) { + const receivers = topics.get(message.topic) + if (receivers) { + message.clients = receivers.size + receivers.forEach(receiver => send(receiver, message)) + } + } + break + case 'ping': + send(conn, { type: 'pong' }) + } + } + } + ) +} +wss.on('connection', onconnection) + +server.on('upgrade', (request, socket, head) => { + // You may check auth of request here.. + /** + * @param {any} ws + */ + const handleAuth = ws => { + wss.emit('connection', ws, request) + } + wss.handleUpgrade(request, socket, head, handleAuth) +}) + +server.listen(port) + +console.log('Signaling server running on localhost:', port) diff --git a/simple-mind-map/package-lock.json b/simple-mind-map/package-lock.json index 5efac16e..f3e0ec0b 100644 --- a/simple-mind-map/package-lock.json +++ b/simple-mind-map/package-lock.json @@ -18,7 +18,9 @@ "quill": "^1.3.6", "tern": "^0.24.3", "uuid": "^9.0.0", - "xml-js": "^1.6.11" + "xml-js": "^1.6.11", + "y-webrtc": "^10.2.5", + "yjs": "^13.6.8" }, "devDependencies": { "eslint": "^8.25.0", @@ -290,6 +292,25 @@ "node": ">= 0.6.0" } }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -310,6 +331,29 @@ "node": ">= 0.4.0" } }, + "node_modules/buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, "node_modules/call-bind": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", @@ -574,6 +618,11 @@ "node": ">=0.6" } }, + "node_modules/err-code": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-3.0.1.tgz", + "integrity": "sha512-GiaH0KJUewYok+eeY05IIgjtAe4Yltygk9Wqp1V5yVWLdhf0hYZchRjNIT9bb0mSwRcIusT3cx7PJUf3zEIfUA==" + }, "node_modules/errno": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz", @@ -873,6 +922,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/get-browser-rtc": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/get-browser-rtc/-/get-browser-rtc-1.1.0.tgz", + "integrity": "sha512-MghbMJ61EJrRsDe7w1Bvqt3ZsBuqhce5nrn/XAwgwOXhcsz53/ltdxOse1h/8eKXj5slzxdsz56g5rzOFSGwfQ==" + }, "node_modules/get-intrinsic": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", @@ -1012,6 +1066,25 @@ "node": ">=8.0.0" } }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, "node_modules/ignore": { "version": "5.2.4", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", @@ -1150,6 +1223,15 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "dev": true }, + "node_modules/isomorphic.js": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/isomorphic.js/-/isomorphic.js-0.2.5.tgz", + "integrity": "sha512-PIeMbHqMt4DnUP3MA/Flc0HElYjMXArsw1qwJZcm9sqR8mq3l8NYizFMty0pWwE/tzIGH3EKK5+jes5mAr85yw==", + "funding": { + "type": "GitHub Sponsors ❤", + "url": "https://github.com/sponsors/dmonad" + } + }, "node_modules/js-sdsl": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz", @@ -1248,6 +1330,25 @@ "node": ">= 0.8.0" } }, + "node_modules/lib0": { + "version": "0.2.86", + "resolved": "https://registry.npmjs.org/lib0/-/lib0-0.2.86.tgz", + "integrity": "sha512-kxigQTM4Q7NwJkEgdqQvU21qiR37twcqqLmh+/SbiGbRLfPlLVbHyY9sWp7PwXh0Xus9ELDSjsUOwcrdt5yZ4w==", + "dependencies": { + "isomorphic.js": "^0.2.4" + }, + "bin": { + "0gentesthtml": "bin/gentesthtml.js", + "0serve": "bin/0serve.js" + }, + "engines": { + "node": ">=16" + }, + "funding": { + "type": "GitHub Sponsors ❤", + "url": "https://github.com/sponsors/dmonad" + } + }, "node_modules/lie": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", @@ -1960,7 +2061,6 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, "funding": [ { "type": "github", @@ -2016,6 +2116,14 @@ "performance-now": "^2.1.0" } }, + "node_modules/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, "node_modules/readable-stream": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", @@ -2176,6 +2284,47 @@ "node": ">=8" } }, + "node_modules/simple-peer": { + "version": "9.11.1", + "resolved": "https://registry.npmjs.org/simple-peer/-/simple-peer-9.11.1.tgz", + "integrity": "sha512-D1SaWpOW8afq1CZGWB8xTfrT3FekjQmPValrqncJMX7QFl8YwhrPTZvMCANLtgBwwdS+7zURyqxDDEmY558tTw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "buffer": "^6.0.3", + "debug": "^4.3.2", + "err-code": "^3.0.1", + "get-browser-rtc": "^1.1.0", + "queue-microtask": "^1.2.3", + "randombytes": "^2.1.0", + "readable-stream": "^3.6.0" + } + }, + "node_modules/simple-peer/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/stackblur-canvas": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-2.5.0.tgz", @@ -2410,6 +2559,27 @@ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, + "node_modules/ws": { + "version": "7.5.9", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", + "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", + "optional": true, + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/xml-js": { "version": "1.6.11", "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz", @@ -2421,6 +2591,65 @@ "xml-js": "bin/cli.js" } }, + "node_modules/y-protocols": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/y-protocols/-/y-protocols-1.0.6.tgz", + "integrity": "sha512-vHRF2L6iT3rwj1jub/K5tYcTT/mEYDUppgNPXwp8fmLpui9f7Yeq3OEtTLVF012j39QnV+KEQpNqoN7CWU7Y9Q==", + "license": "MIT", + "dependencies": { + "lib0": "^0.2.85" + }, + "engines": { + "node": ">=16.0.0", + "npm": ">=8.0.0" + }, + "funding": { + "type": "GitHub Sponsors ❤", + "url": "https://github.com/sponsors/dmonad" + }, + "peerDependencies": { + "yjs": "^13.0.0" + } + }, + "node_modules/y-webrtc": { + "version": "10.2.5", + "resolved": "https://registry.npmjs.org/y-webrtc/-/y-webrtc-10.2.5.tgz", + "integrity": "sha512-ZyBNvTI5L28sQ2PQI0T/JvyWgvuTq05L21vGkIlcvNLNSJqAaLCBJRe3FHEqXoaogqWmRcEAKGfII4ErNXMnNw==", + "dependencies": { + "lib0": "^0.2.42", + "simple-peer": "^9.11.0", + "y-protocols": "^1.0.5" + }, + "bin": { + "y-webrtc-signaling": "bin/server.js" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "type": "GitHub Sponsors ❤", + "url": "https://github.com/sponsors/dmonad" + }, + "optionalDependencies": { + "ws": "^7.2.0" + } + }, + "node_modules/yjs": { + "version": "13.6.8", + "resolved": "https://registry.npmjs.org/yjs/-/yjs-13.6.8.tgz", + "integrity": "sha512-ZPq0hpJQb6f59B++Ngg4cKexDJTvfOgeiv0sBc4sUm8CaBWH7OQC4kcCgrqbjJ/B2+6vO49exvTmYfdlPtcjbg==", + "dependencies": { + "lib0": "^0.2.74" + }, + "engines": { + "node": ">=16.0.0", + "npm": ">=8.0.0" + }, + "funding": { + "type": "GitHub Sponsors ❤", + "url": "https://github.com/sponsors/dmonad" + } + }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", @@ -2628,6 +2857,11 @@ "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==", "optional": true }, + "base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -2642,6 +2876,15 @@ "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz", "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==" }, + "buffer": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", + "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", + "requires": { + "base64-js": "^1.3.1", + "ieee754": "^1.2.1" + } + }, "call-bind": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", @@ -2834,6 +3077,11 @@ "tapable": "^0.2.3" } }, + "err-code": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-3.0.1.tgz", + "integrity": "sha512-GiaH0KJUewYok+eeY05IIgjtAe4Yltygk9Wqp1V5yVWLdhf0hYZchRjNIT9bb0mSwRcIusT3cx7PJUf3zEIfUA==" + }, "errno": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz", @@ -3066,6 +3314,11 @@ "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==" }, + "get-browser-rtc": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/get-browser-rtc/-/get-browser-rtc-1.1.0.tgz", + "integrity": "sha512-MghbMJ61EJrRsDe7w1Bvqt3ZsBuqhce5nrn/XAwgwOXhcsz53/ltdxOse1h/8eKXj5slzxdsz56g5rzOFSGwfQ==" + }, "get-intrinsic": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", @@ -3163,6 +3416,11 @@ "text-segmentation": "^1.0.3" } }, + "ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" + }, "ignore": { "version": "5.2.4", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", @@ -3262,6 +3520,11 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "dev": true }, + "isomorphic.js": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/isomorphic.js/-/isomorphic.js-0.2.5.tgz", + "integrity": "sha512-PIeMbHqMt4DnUP3MA/Flc0HElYjMXArsw1qwJZcm9sqR8mq3l8NYizFMty0pWwE/tzIGH3EKK5+jes5mAr85yw==" + }, "js-sdsl": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz", @@ -3338,6 +3601,14 @@ "type-check": "~0.4.0" } }, + "lib0": { + "version": "0.2.86", + "resolved": "https://registry.npmjs.org/lib0/-/lib0-0.2.86.tgz", + "integrity": "sha512-kxigQTM4Q7NwJkEgdqQvU21qiR37twcqqLmh+/SbiGbRLfPlLVbHyY9sWp7PwXh0Xus9ELDSjsUOwcrdt5yZ4w==", + "requires": { + "isomorphic.js": "^0.2.4" + } + }, "lie": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", @@ -3765,8 +4036,7 @@ "queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==" }, "quill": { "version": "1.3.6", @@ -3807,6 +4077,14 @@ "performance-now": "^2.1.0" } }, + "randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "requires": { + "safe-buffer": "^5.1.0" + } + }, "readable-stream": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", @@ -3916,6 +4194,32 @@ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true }, + "simple-peer": { + "version": "9.11.1", + "resolved": "https://registry.npmjs.org/simple-peer/-/simple-peer-9.11.1.tgz", + "integrity": "sha512-D1SaWpOW8afq1CZGWB8xTfrT3FekjQmPValrqncJMX7QFl8YwhrPTZvMCANLtgBwwdS+7zURyqxDDEmY558tTw==", + "requires": { + "buffer": "^6.0.3", + "debug": "^4.3.2", + "err-code": "^3.0.1", + "get-browser-rtc": "^1.1.0", + "queue-microtask": "^1.2.3", + "randombytes": "^2.1.0", + "readable-stream": "^3.6.0" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, "stackblur-canvas": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-2.5.0.tgz", @@ -4088,6 +4392,13 @@ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, + "ws": { + "version": "7.5.9", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", + "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", + "optional": true, + "requires": {} + }, "xml-js": { "version": "1.6.11", "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz", @@ -4096,6 +4407,33 @@ "sax": "^1.2.4" } }, + "y-protocols": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/y-protocols/-/y-protocols-1.0.6.tgz", + "integrity": "sha512-vHRF2L6iT3rwj1jub/K5tYcTT/mEYDUppgNPXwp8fmLpui9f7Yeq3OEtTLVF012j39QnV+KEQpNqoN7CWU7Y9Q==", + "requires": { + "lib0": "^0.2.85" + } + }, + "y-webrtc": { + "version": "10.2.5", + "resolved": "https://registry.npmjs.org/y-webrtc/-/y-webrtc-10.2.5.tgz", + "integrity": "sha512-ZyBNvTI5L28sQ2PQI0T/JvyWgvuTq05L21vGkIlcvNLNSJqAaLCBJRe3FHEqXoaogqWmRcEAKGfII4ErNXMnNw==", + "requires": { + "lib0": "^0.2.42", + "simple-peer": "^9.11.0", + "ws": "^7.2.0", + "y-protocols": "^1.0.5" + } + }, + "yjs": { + "version": "13.6.8", + "resolved": "https://registry.npmjs.org/yjs/-/yjs-13.6.8.tgz", + "integrity": "sha512-ZPq0hpJQb6f59B++Ngg4cKexDJTvfOgeiv0sBc4sUm8CaBWH7OQC4kcCgrqbjJ/B2+6vO49exvTmYfdlPtcjbg==", + "requires": { + "lib0": "^0.2.74" + } + }, "yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", diff --git a/simple-mind-map/package.json b/simple-mind-map/package.json index 506c5f20..2c88fefc 100644 --- a/simple-mind-map/package.json +++ b/simple-mind-map/package.json @@ -22,7 +22,8 @@ "scripts": { "lint": "eslint src/", "format": "prettier --write .", - "types": "npx -p typescript tsc index.js --declaration --allowJs --emitDeclarationOnly --outDir types --target es2017" + "types": "npx -p typescript tsc index.js --declaration --allowJs --emitDeclarationOnly --outDir types --target es2017", + "serve": "node ./bin/server.mjs" }, "module": "index.js", "main": "./dist/simpleMindMap.umd.min.js", @@ -37,7 +38,9 @@ "quill": "^1.3.6", "tern": "^0.24.3", "uuid": "^9.0.0", - "xml-js": "^1.6.11" + "xml-js": "^1.6.11", + "y-webrtc": "^10.2.5", + "yjs": "^13.6.8" }, "keywords": [ "javascript", diff --git a/simple-mind-map/src/layouts/Base.js b/simple-mind-map/src/layouts/Base.js index 6199059f..a446acfb 100644 --- a/simple-mind-map/src/layouts/Base.js +++ b/simple-mind-map/src/layouts/Base.js @@ -129,6 +129,10 @@ class Base { this.renderer.addActiveNode(newNode) } } + // 如果当前节点在激活节点列表里，那么添加上激活的状态 + if (this.mindMap.renderer.findActiveNodeIndex(newNode) !== -1) { + newNode.nodeData.data.isActive = true + } // 根节点 if (isRoot) { newNode.isRoot = true diff --git a/simple-mind-map/src/plugins/Cooperate.js b/simple-mind-map/src/plugins/Cooperate.js new file mode 100644 index 00000000..31fcf65f --- /dev/null +++ b/simple-mind-map/src/plugins/Cooperate.js @@ -0,0 +1,206 @@ +import * as Y from 'yjs' +import { WebrtcProvider } from 'y-webrtc' +import { isSameObject, simpleDeepClone } from '../utils/index' + +// 协同插件 +class Cooperate { + constructor(opt) { + this.opt = opt + this.mindMap = opt.mindMap + this.ydoc = new Y.Doc() + this.ymap = this.ydoc.getMap() + this.provider = new WebrtcProvider('demo-room', this.ydoc, { + signaling: ['ws://10.16.83.11:4444'] + }) + this.currentData = null + + // 处理数据 + if (this.mindMap.opt.data) { + this.currentData = this.transformTreeDataToObject(this.mindMap.opt.data) + Object.keys(this.currentData).forEach(uid => { + this.ymap.set(uid, this.currentData[uid]) + }) + } + + this.bindEvent() + } + + // 绑定事件 + bindEvent() { + // 监听数据同步 + this.onObserve = this.onObserve.bind(this) + this.ymap.observe(this.onObserve) + + // 监听思维导图改变 + this.onDataChange = this.onDataChange.bind(this) + this.mindMap.on('data_change', this.onDataChange) + } + + // 解绑事件 + unBindEvent() { + this.ymap.unobserve(this.onObserve) + this.mindMap.off('data_change', this.onDataChange) + this.ydoc.destroy() + } + + // 数据同步时的处理，更新当前思维导图 + onObserve(event) { + const data = event.target.toJSON() + if (isSameObject(data, this.currentData)) return + this.currentData = data + const res = this.transformObjectToTreeData(data) + if (!res) return + if (this.mindMap.richText) { + this.mindMap.renderer.renderTree = + this.mindMap.richText.handleSetData(res) + } else { + this.mindMap.renderer.renderTree = res + } + this.mindMap.render() + this.mindMap.command.addHistory() + } + + // 当前思维导图改变后的处理，触发同步 + onDataChange(data) { + const res = this.transformTreeDataToObject(data) + this.updateChanges(res) + } + + // 将树结构转平级对象 + /* + { + data: { + uid: 'xxx' + }, + children: [ + { + data: { + uid: 'xxx' + }, + children: [] + } + ] + } + 转为： + { + uid: { + children: [uid1, uid2], + data: {} + } + } + */ + transformTreeDataToObject(data) { + const res = {} + const walk = (root, parent) => { + const uid = root.data.uid + if (parent) { + parent.children.push(uid) + } + res[uid] = { + isRoot: !parent, + data: { + ...root.data + }, + children: [] + } + if (root.children && root.children.length > 0) { + root.children.forEach(item => { + walk(item, res[uid]) + }) + } + } + walk(data, null) + return res + } + + // 找到父节点的uid + findParentUid(data, targetUid) { + const uids = Object.keys(data) + let res = '' + uids.forEach(uid => { + const children = data[uid].children + const isParent = + children.findIndex(childUid => { + return childUid === targetUid + }) !== -1 + if (isParent) { + res = uid + } + }) + return res + } + + // 将平级对象转树结构 + transformObjectToTreeData(data) { + const uids = Object.keys(data) + if (uids.length <= 0) return null + const rootKey = uids.find(uid => { + return data[uid].isRoot + }) + if (!rootKey || !data[rootKey]) return null + // 根节点 + const res = { + data: simpleDeepClone(data[rootKey].data), + children: [] + } + const map = {} + map[rootKey] = res + uids.forEach(uid => { + const parentUid = this.findParentUid(data, uid) + const cur = data[uid] + const node = map[uid] || { + data: simpleDeepClone(cur.data), + children: [] + } + if (!map[uid]) { + map[uid] = node + } + if (parentUid) { + if (map[parentUid]) { + map[parentUid].children.push(node) + } else { + map[parentUid] = { + data: simpleDeepClone(data[parentUid].data), + children: [node] + } + } + } + }) + return res + } + + // 找出更新点 + updateChanges(data) { + const oldData = this.currentData + this.currentData = data + this.ydoc.transact(() => { + // 找出新增的或修改的 + Object.keys(data).forEach(uid => { + // 新增的或已经存在的，如果数据发生了改变 + if (!oldData[uid] || !isSameObject(oldData[uid], data[uid])) { + this.ymap.set(uid, data[uid]) + } + }) + // 找出删除的 + Object.keys(oldData).forEach(uid => { + if (!data[uid]) { + this.ymap.delete(uid) + } + }) + }) + } + + // 插件被移除前做的事情 + beforePluginRemove() { + this.unBindEvent() + } + + // 插件被卸载前做的事情 + beforePluginDestroy() { + this.unBindEvent() + } +} + +Cooperate.instanceName = 'cooperate' + +export default Cooperate diff --git a/web/src/pages/Edit/components/Edit.vue b/web/src/pages/Edit/components/Edit.vue index da5fb909..e0a1a609 100644 --- a/web/src/pages/Edit/components/Edit.vue +++ b/web/src/pages/Edit/components/Edit.vue @@ -45,6 +45,7 @@ import SearchPlugin from 'simple-mind-map/src/plugins/Search.js' import Painter from 'simple-mind-map/src/plugins/Painter.js' import ScrollbarPlugin from 'simple-mind-map/src/plugins/Scrollbar.js' import Formula from 'simple-mind-map/src/plugins/Formula.js' +import Cooperate from 'simple-mind-map/src/plugins/Cooperate.js' import OutlineSidebar from './OutlineSidebar' import Style from './Style' import BaseStyle from './BaseStyle' @@ -95,6 +96,7 @@ MindMap.usePlugin(MiniMap) .usePlugin(Painter) .usePlugin(ScrollbarPlugin) .usePlugin(Formula) + .usePlugin(Cooperate) // 注册自定义主题 customThemeList.forEach(item => { @@ -476,13 +478,13 @@ export default { // 测试动态插入节点 testDynamicCreateNodes() { - return + // return setTimeout(() => { // 动态给指定节点添加子节点 // this.mindMap.execCommand( // 'INSERT_CHILD_NODE', // false, - // this.mindMap.renderer.root, + // null, // { // text: '自定义内容' // }, From 7d2758a21cf3b7e6877a3cd8d2a71c6ff1fe46ae Mon Sep 17 00:00:00 2001 From: wanglin2 <1013335014@qq.com> Date: Thu, 28 Sep 2023 07:49:11 +0800 Subject: [PATCH 02/86] update --- web/package-lock.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/package-lock.json b/web/package-lock.json index 53a698b9..86dcc9be 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -18488,6 +18488,7 @@ "integrity": "sha512-VCNRiAt2P/bLo09rYt3DLe6xXUMlhJwrvU18Ddd/lYJgC7s8+wvhgYs+MTx4OiAXdu58drGwSBO9SPx7C6J82Q==", "dev": true, "requires": { + "@babel/core": "^7.11.0", "@babel/helper-compilation-targets": "^7.9.6", "@babel/helper-module-imports": "^7.8.3", "@babel/plugin-proposal-class-properties": "^7.8.3", @@ -18500,6 +18501,7 @@ "@vue/babel-plugin-jsx": "^1.0.3", "@vue/babel-preset-jsx": "^1.2.4", "babel-plugin-dynamic-import-node": "^2.3.3", + "core-js": "^3.6.5", "core-js-compat": "^3.6.5", "semver": "^6.1.0" } From 1550f032d94141d12c5522cb8ab7e79aa1fe4c78 Mon Sep 17 00:00:00 2001 From: wanglin2 <1013335014@qq.com> Date: Thu, 28 Sep 2023 15:32:41 +0800 Subject: [PATCH 03/86] =?UTF-8?q?=E5=8D=8F=E4=BD=9C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/constants/defaultOptions.js | 7 +- simple-mind-map/src/core/render/node/Node.js | 10 ++ .../src/core/render/node/nodeCooperate.js | 104 ++++++++++++++++++ simple-mind-map/src/plugins/Cooperate.js | 79 ++++++++++++- web/src/pages/Edit/components/Edit.vue | 10 ++ 5 files changed, 208 insertions(+), 2 deletions(-) create mode 100644 simple-mind-map/src/core/render/node/nodeCooperate.js diff --git a/simple-mind-map/src/constants/defaultOptions.js b/simple-mind-map/src/constants/defaultOptions.js index 6a4ad674..d7cc00fb 100644 --- a/simple-mind-map/src/constants/defaultOptions.js +++ b/simple-mind-map/src/constants/defaultOptions.js @@ -204,5 +204,10 @@ export const defaultOpt = { }, // 自定义标签的颜色 // {pass: 'green, unpass: 'red'} - tagsColorMap: {} + tagsColorMap: {}, + // 节点协作样式配置 + cooperateStyle: { + avatarSize: 22,// 头像大小 + fontSize: 12,// 如果是文字头像，那么文字的大小 + } } diff --git a/simple-mind-map/src/core/render/node/Node.js b/simple-mind-map/src/core/render/node/Node.js index d287755b..8dc840d1 100644 --- a/simple-mind-map/src/core/render/node/Node.js +++ b/simple-mind-map/src/core/render/node/Node.js @@ -6,6 +6,7 @@ import nodeExpandBtnMethods from './nodeExpandBtn' import nodeCommandWrapsMethods from './nodeCommandWraps' import nodeCreateContentsMethods from './nodeCreateContents' import nodeExpandBtnPlaceholderRectMethods from './nodeExpandBtnPlaceholderRect' +import nodeCooperateMethods from './nodeCooperate' import { CONSTANTS } from '../../../constants/constant' // 节点类 @@ -55,6 +56,8 @@ class Node { this.parent = opt.parent || null // 子节点 this.children = opt.children || [] + // 当前同时操作该节点的用户列表 + this.userList = [] // 节点内容的容器 this.group = null this.shapeNode = null // 节点形状节点 @@ -74,6 +77,7 @@ class Node { this._openExpandNode = null this._closeExpandNode = null this._fillExpandNode = null + this._userListGroup = null this._lines = [] this._generalizationLine = null this._generalizationNode = null @@ -121,6 +125,10 @@ class Node { Object.keys(nodeCreateContentsMethods).forEach(item => { this[item] = nodeCreateContentsMethods[item].bind(this) }) + // 协同相关 + Object.keys(nodeCooperateMethods).forEach((item) => { + this[item] = nodeCooperateMethods[item].bind(this) + }) // 初始化 this.getSize() } @@ -283,6 +291,7 @@ class Node { this.group.add(this.shapeNode) // 渲染一个隐藏的矩形区域，用来触发展开收起按钮的显示 this.renderExpandBtnPlaceholderRect() + this.createUserListNode() // 概要节点添加一个带所属节点id的类名 if (this.isGeneralization && this.generalizationBelongNode) { this.group.addClass('generalization_' + this.generalizationBelongNode.uid) @@ -527,6 +536,7 @@ class Node { } // 更新概要 this.renderGeneralization() + this.updateUserListNode() // 更新节点位置 let t = this.group.transform() // // 如果上次不在可视区内，且本次也不在，那么直接返回 diff --git a/simple-mind-map/src/core/render/node/nodeCooperate.js b/simple-mind-map/src/core/render/node/nodeCooperate.js new file mode 100644 index 00000000..970dfb2c --- /dev/null +++ b/simple-mind-map/src/core/render/node/nodeCooperate.js @@ -0,0 +1,104 @@ +import { Circle, G, Text, Image } from '@svgdotjs/svg.js' +import { generateColorByContent } from '../../../utils/index' + +// 协同相关功能 + +// 创建容器 +function createUserListNode() { + // 如果没有注册协作插件，那么需要创建 + if (!this.mindMap.cooperate) return + this._userListGroup = new G() + this.group.add(this._userListGroup) +} + +// 创建文本头像 +function createTextAvatar(item) { + const { avatarSize, fontSize } = this.mindMap.opt.cooperateStyle + const g = new G() + const str = item.isMore ? item.name : String(item.name)[0] + // 圆 + const circle = new Circle().size(avatarSize, avatarSize) + circle.fill({ + color: item.color || generateColorByContent(str) + }) + // 文本 + const text = new Text() + .text(str) + .fill({ + color: '#fff' + }) + .css({ + 'font-size': fontSize + }) + .dx(-fontSize / 2) + .dy((avatarSize - fontSize) / 2) + g.add(circle).add(text) + return g +} + +// 创建图片头像 +function createImageAvatar(item) { + const { avatarSize } = this.mindMap.opt.cooperateStyle + return new Image().load(item.avatar).size(avatarSize, avatarSize) +} + +// 更新渲染 +function updateUserListNode() { + if (!this._userListGroup) return + const { avatarSize } = this.mindMap.opt.cooperateStyle + this._userListGroup.clear() + // 根据当前节点长度计算最多能显示几个 + const length = this.userList.length + const maxShowCount = Math.floor(this.width / avatarSize) + const list = [] + if (length > maxShowCount) { + // 如果当前用户数量比最多能显示的多，最后需要显示一个提示信息 + list.push(...this.userList.slice(0, maxShowCount - 1), { + isMore: true, + name: '+' + (length - maxShowCount + 1) + }) + } else { + list.push(...this.userList) + } + list.forEach((item, index) => { + let node = null + if (item.avatar) { + node = this.createImageAvatar(item) + } else { + node = this.createTextAvatar(item) + } + node.x(index * avatarSize).cy(-avatarSize / 2) + this._userListGroup.add(node) + }) +} + +// 添加用户 +function addUser(userInfo) { + if ( + this.userList.find(item => { + return item.id == userInfo.id + }) + ) + return + this.userList.push(userInfo) + this.updateUserListNode() +} + +// 移除用户 +function removeUser(userInfo) { + const index = this.userList.findIndex(item => { + return item.id == userInfo.id + }) + if (index === -1) return + this.userList.splice(index, 1) + this.updateUserListNode() +} + +export default { + createUserListNode, + updateUserListNode, + createTextAvatar, + createImageAvatar, + addUser, + removeUser +} diff --git a/simple-mind-map/src/plugins/Cooperate.js b/simple-mind-map/src/plugins/Cooperate.js index 31fcf65f..877a4cdc 100644 --- a/simple-mind-map/src/plugins/Cooperate.js +++ b/simple-mind-map/src/plugins/Cooperate.js @@ -1,6 +1,6 @@ import * as Y from 'yjs' import { WebrtcProvider } from 'y-webrtc' -import { isSameObject, simpleDeepClone } from '../utils/index' +import { isSameObject, simpleDeepClone, getType, isUndef } from '../utils/index' // 协同插件 class Cooperate { @@ -12,7 +12,10 @@ class Cooperate { this.provider = new WebrtcProvider('demo-room', this.ydoc, { signaling: ['ws://10.16.83.11:4444'] }) + this.awareness = this.provider.awareness this.currentData = null + this.userInfo = null + this.currentAwarenessData = [] // 处理数据 if (this.mindMap.opt.data) { @@ -34,6 +37,14 @@ class Cooperate { // 监听思维导图改变 this.onDataChange = this.onDataChange.bind(this) this.mindMap.on('data_change', this.onDataChange) + + // 监听思维导图节点激活事件 + this.onNodeActive = this.onNodeActive.bind(this) + this.mindMap.on('node_active', this.onNodeActive) + + // 监听状态同步事件 + this.onAwareness = this.onAwareness.bind(this) + this.awareness.on('change', this.onAwareness) } // 解绑事件 @@ -66,6 +77,72 @@ class Cooperate { this.updateChanges(res) } + // 节点激活状态改变后触发状态显示同步 + onNodeActive(node, nodeList) { + if (this.userInfo) { + this.awareness.setLocalStateField(this.userInfo.name, { + userInfo: { + // 用户信息 + ...this.userInfo + }, + nodeIdList: nodeList.map(item => { + // 当前激活的节点id列表 + return item.uid + }) + }) + } + } + + // 设置用户信息 + /** + * { + * id: '', // 必传，用户唯一的id + * name: '', // 用户名称。name和avatar两个只传一个即可，如果都传了，会显示avatar + * avatar: '', // 用户头像 + * color: '' // 如果没有传头像，那么会以一个圆形来显示名称的第一个字，文字的颜色为白色，圆的颜色可以通过该字段设置 + * } + **/ + setUserInfo(userInfo) { + if ( + getType(userInfo) !== 'Object' || + isUndef(userInfo.id) || + (isUndef(userInfo.name) && isUndef(userInfo.avatar)) + ) + return + this.userInfo = userInfo || null + } + + // 监听状态同步事件 + onAwareness() { + const walk = (list, callback) => { + list.forEach(value => { + const userName = Object.keys(value)[0] + if (!userName) return + const data = value[userName] + const userInfo = data.userInfo + const nodeIdList = data.nodeIdList + nodeIdList.forEach(uid => { + const node = this.mindMap.renderer.findNodeByUid(uid) + if (node) { + callback(node, userInfo) + } + }) + }) + } + // 清除之前的状态 + walk(this.currentAwarenessData, (node, userInfo) => { + node.removeUser(userInfo) + }) + // 设置当前状态 + const data = Array.from(this.awareness.getStates().values()) + this.currentAwarenessData = data + walk(data, (node, userInfo) => { + // 不显示自己 + if (userInfo.id === this.userInfo.id) return + node.addUser(userInfo) + }) + } + // 将树结构转平级对象 /* { diff --git a/web/src/pages/Edit/components/Edit.vue b/web/src/pages/Edit/components/Edit.vue index e0a1a609..480b701c 100644 --- a/web/src/pages/Edit/components/Edit.vue +++ b/web/src/pages/Edit/components/Edit.vue @@ -389,6 +389,16 @@ export default { if (hasFileURL) { this.$bus.$emit('handle_file_url') } + if (this.$route.query.userName) { + this.mindMap.cooperate.setUserInfo({ + id: Math.random(), + name: this.$route.query.userName, + color: ['#409EFF', '#67C23A', '#E6A23C', '#F56C6C', '#909399'][ + Math.floor(Math.random() * 5) + ], + avatar: Math.random() > 0.5 ? 'https://img0.baidu.com/it/u=4270674549,2416627993&fm=253&app=138&size=w931&n=0&f=JPEG&fmt=auto?sec=1696006800&t=4d32871d14a7224a4591d0c3c7a97311' : '' + }) + } }, // url中是否存在要打开的文件 From ed82fe5a61fc4c7e42e30e3d338b44fe0c8b4c0c Mon Sep 17 00:00:00 2001 From: wanglin2 <1013335014@qq.com> Date: Wed, 4 Oct 2023 15:37:57 +0800 Subject: [PATCH 04/86] =?UTF-8?q?Feat:=E5=AF=B9setData=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E4=BC=A0=E5=85=A5=E7=9A=84=E6=95=B0=E6=8D=AE=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E6=B7=B1=E6=8B=B7=E8=B4=9D;=E6=9B=B4=E6=96=B0=E6=B8=B2?= =?UTF-8?q?=E6=9F=93=E6=A0=91=E6=95=B0=E6=8D=AE=E7=9A=84=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E7=A7=BB=E5=88=B0Render=E7=B1=BB=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simple-mind-map/index.js | 8 +++----- simple-mind-map/src/core/render/Render.js | 9 +++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/simple-mind-map/index.js b/simple-mind-map/index.js index 031571cc..6dc77fd2 100644 --- a/simple-mind-map/index.js +++ b/simple-mind-map/index.js @@ -258,15 +258,13 @@ class MindMap { // 动态设置思维导图数据，纯节点数据 setData(data) { + data = simpleDeepClone(data || {}) this.execCommand('CLEAR_ACTIVE_NODE') this.command.clearHistory() this.command.addHistory() - if (this.richText) { - this.renderer.renderTree = this.richText.handleSetData(data) - } else { - this.renderer.renderTree = data - } + this.renderer.setData(data) this.reRender(() => {}, CONSTANTS.SET_DATA) + this.emit('set_data', data) } // 动态设置思维导图数据，包括节点数据、布局、主题、视图 diff --git a/simple-mind-map/src/core/render/Render.js b/simple-mind-map/src/core/render/Render.js index 5f53134e..d0fa7ea6 100644 --- a/simple-mind-map/src/core/render/Render.js +++ b/simple-mind-map/src/core/render/Render.js @@ -97,6 +97,15 @@ class Render { )(this, this.mindMap.opt.layout) } + // 重新设置思维导图数据 + setData(data) { + if (this.mindMap.richText) { + this.renderTree = this.mindMap.richText.handleSetData(data) + } else { + this.renderTree = data + } + } + // 绑定事件 bindEvent() { // 点击事件 From ccef5fc581eac86a95445c65b862f39b4aa4f6d1 Mon Sep 17 00:00:00 2001 From: wanglin2 <1013335014@qq.com> Date: Wed, 4 Oct 2023 15:38:48 +0800 Subject: [PATCH 05/86] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=8F=E5=90=8C?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E5=90=8E=E7=AB=AF=E6=9C=8D=E5=8A=A1=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simple-mind-map/bin/{server.mjs => wsServer.mjs} | 0 simple-mind-map/package.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename simple-mind-map/bin/{server.mjs => wsServer.mjs} (100%) diff --git a/simple-mind-map/bin/server.mjs b/simple-mind-map/bin/wsServer.mjs similarity index 100% rename from simple-mind-map/bin/server.mjs rename to simple-mind-map/bin/wsServer.mjs diff --git a/simple-mind-map/package.json b/simple-mind-map/package.json index 2c88fefc..5a22c55f 100644 --- a/simple-mind-map/package.json +++ b/simple-mind-map/package.json @@ -23,7 +23,7 @@ "lint": "eslint src/", "format": "prettier --write .", "types": "npx -p typescript tsc index.js --declaration --allowJs --emitDeclarationOnly --outDir types --target es2017", - "serve": "node ./bin/server.mjs" + "wsServe": "node ./bin/server.mjs" }, "module": "index.js", "main": "./dist/simpleMindMap.umd.min.js", From b95b6af1b16ace76e7be17973a2b2bc63a1f5293 Mon Sep 17 00:00:00 2001 From: wanglin2 <1013335014@qq.com> Date: Wed, 4 Oct 2023 15:39:45 +0800 Subject: [PATCH 06/86] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=8F=E5=90=8C?= =?UTF-8?q?=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simple-mind-map/src/plugins/Cooperate.js | 153 ++++++++++++++--------- web/src/pages/Edit/components/Edit.vue | 32 +++-- 2 files changed, 117 insertions(+), 68 deletions(-) diff --git a/simple-mind-map/src/plugins/Cooperate.js b/simple-mind-map/src/plugins/Cooperate.js index 877a4cdc..d72377ab 100644 --- a/simple-mind-map/src/plugins/Cooperate.js +++ b/simple-mind-map/src/plugins/Cooperate.js @@ -7,33 +7,70 @@ class Cooperate { constructor(opt) { this.opt = opt this.mindMap = opt.mindMap + // yjs文档 this.ydoc = new Y.Doc() - this.ymap = this.ydoc.getMap() - this.provider = new WebrtcProvider('demo-room', this.ydoc, { - signaling: ['ws://10.16.83.11:4444'] - }) - this.awareness = this.provider.awareness - this.currentData = null - this.userInfo = null + // 共享数据 + this.ymap = null + // 连接提供者 + this.provider = null + // 感知数据 + this.awareness = null this.currentAwarenessData = [] - - // 处理数据 - if (this.mindMap.opt.data) { - this.currentData = this.transformTreeDataToObject(this.mindMap.opt.data) - Object.keys(this.currentData).forEach(uid => { - this.ymap.set(uid, this.currentData[uid]) - }) - } - + // 当前的平级对象类型的思维导图数据 + this.currentData = null + // 用户信息 + this.userInfo = null + // 绑定事件 this.bindEvent() + // 处理实例化时传入的思维导图数据 + if (this.mindMap.opt.data) { + this.initData(this.mindMap.opt.data) + } + } + + // 初始化数据 + initData(data) { + data = simpleDeepClone(data) + // 解绑原来的数据 + if (this.ymap) { + this.ymap.unobserve(this.onObserve) + } + // 创建共享数据 + this.ymap = this.ydoc.getMap() + // 思维导图树结构转平级对象结构 + this.currentData = this.transformTreeDataToObject(data) + // 将思维导图数据添加到共享数据中 + Object.keys(this.currentData).forEach(uid => { + this.ymap.set(uid, this.currentData[uid]) + }) + // 监听数据同步 + this.onObserve = this.onObserve.bind(this) + this.ymap.observe(this.onObserve) + } + + // 获取yjs doc实例 + getDoc() { + return this.ydoc + } + + // 设置连接提供者 + setProvider(provider, webrtcProviderConfig = {}) { + const { roomName, signalingList, ...otherConfig } = webrtcProviderConfig + this.provider = + provider || + new WebrtcProvider(roomName, this.ydoc, { + signaling: signalingList, + ...otherConfig + }) + this.awareness = this.provider.awareness + + // 监听状态同步事件 + this.onAwareness = this.onAwareness.bind(this) + this.awareness.on('change', this.onAwareness) } // 绑定事件 bindEvent() { - // 监听数据同步 - this.onObserve = this.onObserve.bind(this) - this.ymap.observe(this.onObserve) - // 监听思维导图改变 this.onDataChange = this.onDataChange.bind(this) this.mindMap.on('data_change', this.onDataChange) @@ -42,31 +79,33 @@ class Cooperate { this.onNodeActive = this.onNodeActive.bind(this) this.mindMap.on('node_active', this.onNodeActive) - // 监听状态同步事件 - this.onAwareness = this.onAwareness.bind(this) - this.awareness.on('change', this.onAwareness) + // 监听设置思维导图数据事件 + this.initData = this.initData.bind(this) + this.mindMap.on('set_data', this.initData) } // 解绑事件 unBindEvent() { - this.ymap.unobserve(this.onObserve) + if (this.ymap) { + this.ymap.unobserve(this.onObserve) + } this.mindMap.off('data_change', this.onDataChange) + this.mindMap.off('node_active', this.onNodeActive) + this.mindMap.off('set_data', this.initData) this.ydoc.destroy() } // 数据同步时的处理，更新当前思维导图 onObserve(event) { const data = event.target.toJSON() + // 如果数据没有改变直接返回 if (isSameObject(data, this.currentData)) return this.currentData = data + // 平级对象转树结构 const res = this.transformObjectToTreeData(data) if (!res) return - if (this.mindMap.richText) { - this.mindMap.renderer.renderTree = - this.mindMap.richText.handleSetData(res) - } else { - this.mindMap.renderer.renderTree = res - } + // 更新思维导图画布 + this.mindMap.renderer.setData(res) this.mindMap.render() this.mindMap.command.addHistory() } @@ -77,16 +116,37 @@ class Cooperate { this.updateChanges(res) } - // 节点激活状态改变后触发状态显示同步 + // 找出更新点 + updateChanges(data) { + const oldData = this.currentData + this.currentData = data + this.ydoc.transact(() => { + // 找出新增的或修改的 + Object.keys(data).forEach(uid => { + // 新增的或已经存在的，如果数据发生了改变 + if (!oldData[uid] || !isSameObject(oldData[uid], data[uid])) { + this.ymap.set(uid, data[uid]) + } + }) + // 找出删除的 + Object.keys(oldData).forEach(uid => { + if (!data[uid]) { + this.ymap.delete(uid) + } + }) + }) + } + + // 节点激活状态改变后触发感知数据同步 onNodeActive(node, nodeList) { if (this.userInfo) { this.awareness.setLocalStateField(this.userInfo.name, { + // 用户信息 userInfo: { - // 用户信息 ...this.userInfo }, + // 当前激活的节点id列表 nodeIdList: nodeList.map(item => { - // 当前激活的节点id列表 return item.uid }) }) @@ -112,7 +172,7 @@ class Cooperate { this.userInfo = userInfo || null } - // 监听状态同步事件 + // 监听感知数据同步事件 onAwareness() { const walk = (list, callback) => { list.forEach(value => { @@ -129,11 +189,11 @@ class Cooperate { }) }) } - // 清除之前的状态 + // 清除之前的数据 walk(this.currentAwarenessData, (node, userInfo) => { node.removeUser(userInfo) }) - // 设置当前状态 + // 设置当前数据 const data = Array.from(this.awareness.getStates().values()) this.currentAwarenessData = data walk(data, (node, userInfo) => { @@ -246,27 +306,6 @@ class Cooperate { return res } - // 找出更新点 - updateChanges(data) { - const oldData = this.currentData - this.currentData = data - this.ydoc.transact(() => { - // 找出新增的或修改的 - Object.keys(data).forEach(uid => { - // 新增的或已经存在的，如果数据发生了改变 - if (!oldData[uid] || !isSameObject(oldData[uid], data[uid])) { - this.ymap.set(uid, data[uid]) - } - }) - // 找出删除的 - Object.keys(oldData).forEach(uid => { - if (!data[uid]) { - this.ymap.delete(uid) - } - }) - }) - } - // 插件被移除前做的事情 beforePluginRemove() { this.unBindEvent() diff --git a/web/src/pages/Edit/components/Edit.vue b/web/src/pages/Edit/components/Edit.vue index 480b701c..5696a551 100644 --- a/web/src/pages/Edit/components/Edit.vue +++ b/web/src/pages/Edit/components/Edit.vue @@ -96,7 +96,7 @@ MindMap.usePlugin(MiniMap) .usePlugin(Painter) .usePlugin(ScrollbarPlugin) .usePlugin(Formula) - .usePlugin(Cooperate) + // .usePlugin(Cooperate)// 协同插件 // 注册自定义主题 customThemeList.forEach(item => { @@ -389,16 +389,8 @@ export default { if (hasFileURL) { this.$bus.$emit('handle_file_url') } - if (this.$route.query.userName) { - this.mindMap.cooperate.setUserInfo({ - id: Math.random(), - name: this.$route.query.userName, - color: ['#409EFF', '#67C23A', '#E6A23C', '#F56C6C', '#909399'][ - Math.floor(Math.random() * 5) - ], - avatar: Math.random() > 0.5 ? 'https://img0.baidu.com/it/u=4270674549,2416627993&fm=253&app=138&size=w931&n=0&f=JPEG&fmt=auto?sec=1696006800&t=4d32871d14a7224a4591d0c3c7a97311' : '' - }) - } + // 协同测试 + this.cooperateTest() }, // url中是否存在要打开的文件 @@ -591,6 +583,24 @@ export default { // 动态删除指定节点 // this.mindMap.execCommand('REMOVE_NODE', this.mindMap.renderer.root.children[0]) }, 5000) + }, + + // 协同测试 + cooperateTest() { + if (this.mindMap.cooperate && this.$route.query.userName) { + this.mindMap.cooperate.setProvider(null, { + roomName: 'demo-room', + signalingList: ['ws://192.168.3.125:4444'] + }) + this.mindMap.cooperate.setUserInfo({ + id: Math.random(), + name: this.$route.query.userName, + color: ['#409EFF', '#67C23A', '#E6A23C', '#F56C6C', '#909399'][ + Math.floor(Math.random() * 5) + ], + avatar: Math.random() > 0.5 ? 'https://img0.baidu.com/it/u=4270674549,2416627993&fm=253&app=138&size=w931&n=0&f=JPEG&fmt=auto?sec=1696006800&t=4d32871d14a7224a4591d0c3c7a97311' : '' + }) + } } } } From 545e46babcc1f34ffdf67e51744ad9114a769cd1 Mon Sep 17 00:00:00 2001 From: wanglin2 <1013335014@qq.com> Date: Wed, 4 Oct 2023 16:01:47 +0800 Subject: [PATCH 07/86] =?UTF-8?q?Feat:=E6=B2=A1=E6=9C=89=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E5=8D=8F=E5=90=8C=E6=8F=92=E4=BB=B6=E6=97=B6=E4=B8=8D=E7=BB=99?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=AE=9E=E4=BE=8B=E6=B7=BB=E5=8A=A0=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simple-mind-map/src/core/render/node/Node.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/simple-mind-map/src/core/render/node/Node.js b/simple-mind-map/src/core/render/node/Node.js index 8dc840d1..9df52019 100644 --- a/simple-mind-map/src/core/render/node/Node.js +++ b/simple-mind-map/src/core/render/node/Node.js @@ -126,9 +126,11 @@ class Node { this[item] = nodeCreateContentsMethods[item].bind(this) }) // 协同相关 - Object.keys(nodeCooperateMethods).forEach((item) => { - this[item] = nodeCooperateMethods[item].bind(this) - }) + if (this.mindMap.cooperate) { + Object.keys(nodeCooperateMethods).forEach((item) => { + this[item] = nodeCooperateMethods[item].bind(this) + }) + } // 初始化 this.getSize() } @@ -291,7 +293,8 @@ class Node { this.group.add(this.shapeNode) // 渲染一个隐藏的矩形区域，用来触发展开收起按钮的显示 this.renderExpandBtnPlaceholderRect() - this.createUserListNode() + // 创建协同头像节点 + if (this.createUserListNode) this.createUserListNode() // 概要节点添加一个带所属节点id的类名 if (this.isGeneralization && this.generalizationBelongNode) { this.group.addClass('generalization_' + this.generalizationBelongNode.uid) @@ -536,7 +539,8 @@ class Node { } // 更新概要 this.renderGeneralization() - this.updateUserListNode() + // 更新协同头像 + if (this.updateUserListNode) this.updateUserListNode() // 更新节点位置 let t = this.group.transform() // // 如果上次不在可视区内，且本次也不在，那么直接返回 From 99dc4431424046040c6b1cf692bc98d59db95de5 Mon Sep 17 00:00:00 2001 From: wanglin2 <1013335014@qq.com> Date: Thu, 5 Oct 2023 10:27:24 +0800 Subject: [PATCH 08/86] Doc: update --- README.md | 12 +++ simple-mind-map/package.json | 2 +- web/src/assets/avatar/有希.jpg | Bin 0 -> 81395 bytes web/src/assets/avatar/樊笼.jpg | Bin 0 -> 5282 bytes web/src/assets/avatar/达仁科技.jpg | Bin 0 -> 4997 bytes web/src/pages/Doc/catalogList.js | 1 + web/src/pages/Doc/en/changelog/index.md | 6 ++ web/src/pages/Doc/en/changelog/index.vue | 3 + web/src/pages/Doc/en/constructor/index.md | 2 + web/src/pages/Doc/en/constructor/index.vue | 12 +++ web/src/pages/Doc/en/cooperate/index.md | 114 ++++++++++++++++++++ web/src/pages/Doc/en/cooperate/index.vue | 103 ++++++++++++++++++ web/src/pages/Doc/en/introduction/index.md | 12 +++ web/src/pages/Doc/en/introduction/index.vue | 12 +++ web/src/pages/Doc/en/render/index.md | 6 ++ web/src/pages/Doc/en/render/index.vue | 5 + web/src/pages/Doc/en/utils/index.md | 8 ++ web/src/pages/Doc/en/utils/index.vue | 8 ++ web/src/pages/Doc/routerList.js | 2 + web/src/pages/Doc/zh/changelog/index.md | 6 ++ web/src/pages/Doc/zh/changelog/index.vue | 3 + web/src/pages/Doc/zh/constructor/index.md | 2 + web/src/pages/Doc/zh/constructor/index.vue | 11 ++ web/src/pages/Doc/zh/cooperate/index.md | 114 ++++++++++++++++++++ web/src/pages/Doc/zh/cooperate/index.vue | 103 ++++++++++++++++++ web/src/pages/Doc/zh/introduction/index.md | 12 +++ web/src/pages/Doc/zh/introduction/index.vue | 12 +++ web/src/pages/Doc/zh/render/index.md | 6 ++ web/src/pages/Doc/zh/render/index.vue | 5 + web/src/pages/Doc/zh/utils/index.md | 8 ++ web/src/pages/Doc/zh/utils/index.vue | 8 ++ 31 files changed, 597 insertions(+), 1 deletion(-) create mode 100644 web/src/assets/avatar/有希.jpg create mode 100644 web/src/assets/avatar/樊笼.jpg create mode 100644 web/src/assets/avatar/达仁科技.jpg create mode 100644 web/src/pages/Doc/en/cooperate/index.md create mode 100644 web/src/pages/Doc/en/cooperate/index.vue create mode 100644 web/src/pages/Doc/zh/cooperate/index.md create mode 100644 web/src/pages/Doc/zh/cooperate/index.vue diff --git a/README.md b/README.md index 6b76ad40..885b36af 100644 --- a/README.md +++ b/README.md @@ -189,4 +189,16 @@ const mindMap = new MindMap({ 沐风牧草 + + + 有希 + + + + 樊笼 + + + + 达仁科技 +

\ No newline at end of file diff --git a/simple-mind-map/package.json b/simple-mind-map/package.json index 5a22c55f..64ad8ad4 100644 --- a/simple-mind-map/package.json +++ b/simple-mind-map/package.json @@ -1,6 +1,6 @@ { "name": "simple-mind-map", - "version": "0.7.2", + "version": "0.7.3", "description": "一个简单的web在线思维导图", "authors": [ { diff --git a/web/src/assets/avatar/有希.jpg b/web/src/assets/avatar/有希.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b6e3c85c7353fa5d6f6ad7d5a2de7bcdbe984337 GIT binary patch literal 81395 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 literal 0 HcmV?d00001 diff --git a/web/src/assets/avatar/达仁科技.jpg b/web/src/assets/avatar/达仁科技.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b898f07e40ca60bc3675043275be09e87037ea9b GIT binary patch literal 4997 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 x2w2vxv-$gIimt@QUY_AG;wG1q>x9{RbFNt9k$c literal 0 HcmV?d00001 diff --git a/web/src/pages/Doc/catalogList.js b/web/src/pages/Doc/catalogList.js index a774b045..89167f03 100644 --- a/web/src/pages/Doc/catalogList.js +++ b/web/src/pages/Doc/catalogList.js @@ -36,6 +36,7 @@ let APIList = [ 'painter', 'scrollbar', 'formula', + 'cooperate', 'xmind', 'markdown', 'utils' diff --git a/web/src/pages/Doc/en/changelog/index.md b/web/src/pages/Doc/en/changelog/index.md index 3f9372ec..bd1d1aad 100644 --- a/web/src/pages/Doc/en/changelog/index.md +++ b/web/src/pages/Doc/en/changelog/index.md @@ -1,5 +1,11 @@ # Changelog +## 0.7.3 + +New: 1.Add a Cooperate editing plugin. + +Demo: 1.Fix the automatic closing of the sidebar caused by the formula sidebar component. + ## 0.7.2 Fix: diff --git a/web/src/pages/Doc/en/changelog/index.vue b/web/src/pages/Doc/en/changelog/index.vue index 92e3f520..7c0c1f0d 100644 --- a/web/src/pages/Doc/en/changelog/index.vue +++ b/web/src/pages/Doc/en/changelog/index.vue @@ -1,6 +1,9 @@ diff --git a/web/src/pages/Doc/en/render/index.md b/web/src/pages/Doc/en/render/index.md index a76e1504..cbb4bb67 100644 --- a/web/src/pages/Doc/en/render/index.md +++ b/web/src/pages/Doc/en/render/index.md @@ -15,6 +15,12 @@ Gets the root node of the node tree ## Methods +### setData(data) + +> v0.7.3+ + +Dynamically set mind map data. + ### clearActive() Clears the currently active node diff --git a/web/src/pages/Doc/en/render/index.vue b/web/src/pages/Doc/en/render/index.vue index 2819d97d..ba6463a5 100644 --- a/web/src/pages/Doc/en/render/index.vue +++ b/web/src/pages/Doc/en/render/index.vue @@ -9,6 +9,11 @@ accessed through mindMap.renderer.

root

Gets the root node of the node tree

Methods

+

setData(data)

+
+

v0.7.3+

+
+

Dynamically set mind map data.

clearActive()

Clears the currently active node

clearAllActive()

diff --git a/web/src/pages/Doc/en/utils/index.md b/web/src/pages/Doc/en/utils/index.md index bedb986e..794afe23 100644 --- a/web/src/pages/Doc/en/utils/index.md +++ b/web/src/pages/Doc/en/utils/index.md @@ -351,6 +351,14 @@ Escape the incoming string, currently escaping the following three characters: Generate colors based on incoming content, and the same content will generate the same color. +#### isSameObject(a, b) + +> v0.7.3+ + +- `a`、`b`: Object | Array, Two objects to compare + +Determine whether two objects are the same, only handling objects or arrays. + ## Simulate CSS background in Canvas Import: diff --git a/web/src/pages/Doc/en/utils/index.vue b/web/src/pages/Doc/en/utils/index.vue index 5dbfa3d4..758911be 100644 --- a/web/src/pages/Doc/en/utils/index.vue +++ b/web/src/pages/Doc/en/utils/index.vue @@ -277,6 +277,14 @@ and copying the data of the data object, example:

  • str：String.

    • Generate colors based on incoming content, and the same content will generate the same color.

    +

    isSameObject(a, b)

    +
    +

    v0.7.3+

    +
    +
      +
    • a、b: Object | Array, Two objects to compare
      • +
    +

    Determine whether two objects are the same, only handling objects or arrays.

    Simulate CSS background in Canvas

    Import:

    import drawBackgroundImageToCanvas from 'simple-mind-map/src/utils/simulateCSSBackgroundInCanvas'
diff --git a/web/src/pages/Doc/routerList.js b/web/src/pages/Doc/routerList.js
index b6a7803f..706eb1d5 100644
--- a/web/src/pages/Doc/routerList.js
+++ b/web/src/pages/Doc/routerList.js
@@ -57,6 +57,7 @@ export default [
       { path: 'painter', title: 'Painter插件' },
       { path: 'scrollbar', title: 'Scrollbar插件' },
       { path: 'formula', title: 'Formula插件' },
+      { path: 'cooperate', title: 'Cooperate插件' },
       { path: 'help1', title: '概要/关联线' },
       { path: 'help2', title: '客户端' },
       { path: 'help3', title: '打开预览在线文件' },
@@ -96,6 +97,7 @@ export default [
       { path: 'painter', title: 'Painter plugin' },
       { path: 'scrollbar', title: 'Scrollbar plugin' },
       { path: 'formula', title: 'Formula plugin' },
+      { path: 'cooperate', title: 'Cooperate plugin' },
       { path: 'client', title: 'Client' }
     ]
   }
diff --git a/web/src/pages/Doc/zh/changelog/index.md b/web/src/pages/Doc/zh/changelog/index.md
index 2a6d05fd..308343a3 100644
--- a/web/src/pages/Doc/zh/changelog/index.md
+++ b/web/src/pages/Doc/zh/changelog/index.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.7.3
+
+新增：1.新增协同编辑插件。
+
+Demo：1.修复公式侧边栏组件导致的侧边栏自动关闭问题。
+
 ## 0.7.2
 
 修复：
diff --git a/web/src/pages/Doc/zh/changelog/index.vue b/web/src/pages/Doc/zh/changelog/index.vue
index 36b5ce0c..8f39df82 100644
--- a/web/src/pages/Doc/zh/changelog/index.vue
+++ b/web/src/pages/Doc/zh/changelog/index.vue
@@ -1,6 +1,9 @@
 
diff --git a/web/src/pages/Doc/zh/render/index.md b/web/src/pages/Doc/zh/render/index.md
index ee32bdb6..b6162941 100644
--- a/web/src/pages/Doc/zh/render/index.md
+++ b/web/src/pages/Doc/zh/render/index.md
@@ -14,6 +14,12 @@
 
 ## 方法
 
+### setData(data)
+
+> v0.7.3+
+
+动态设置思维导图数据。
+
 ### clearActive()
 
 清除当前激活的节点
diff --git a/web/src/pages/Doc/zh/render/index.vue b/web/src/pages/Doc/zh/render/index.vue
index 27ee69ae..6c23b515 100644
--- a/web/src/pages/Doc/zh/render/index.vue
+++ b/web/src/pages/Doc/zh/render/index.vue
@@ -8,6 +8,11 @@
 
    root
    
 
    获取节点树的根节点
    
 
    方法
    
+
    setData(data)
    
+
    
+
    v0.7.3+
    
+
    
+
    动态设置思维导图数据。
    
 
    clearActive()
    
 
    清除当前激活的节点
    
 
    clearAllActive()
    
diff --git a/web/src/pages/Doc/zh/utils/index.md b/web/src/pages/Doc/zh/utils/index.md
index 4a1fa1cd..bf482f64 100644
--- a/web/src/pages/Doc/zh/utils/index.md
+++ b/web/src/pages/Doc/zh/utils/index.md
@@ -346,6 +346,14 @@ copyNodeTree({}, node)
 > -> >
 ```
 
+#### isSameObject(a, b)
+
+> v0.7.3+
+
+- `a`、`b`：Object | Array, 要进行对比的两个对象
+
+判断两个对象是否相同，只处理对象或数组。
+
 ## 在canvas中模拟css的背景属性
 
 引入：
diff --git a/web/src/pages/Doc/zh/utils/index.vue b/web/src/pages/Doc/zh/utils/index.vue
index 6d127db6..94f9d3cf 100644
--- a/web/src/pages/Doc/zh/utils/index.vue
+++ b/web/src/pages/Doc/zh/utils/index.vue
@@ -272,6 +272,14 @@
 < -> &lt;
 > -> &gt;
    +

    isSameObject(a, b)

    +
    +

    v0.7.3+

    +
    +
      +
    • a、b：Object | Array, 要进行对比的两个对象
      • +
    +

    判断两个对象是否相同，只处理对象或数组。

    在canvas中模拟css的背景属性

    引入：

    import drawBackgroundImageToCanvas from 'simple-mind-map/src/utils/simulateCSSBackgroundInCanvas'

From 288ceafa92926d6d5ae6da0a0d9657ae800d347c Mon Sep 17 00:00:00 2001
From: wanglin2 <1013335014@qq.com>
Date: Thu, 5 Oct 2023 13:40:01 +0800
Subject: [PATCH 09/86] =?UTF-8?q?Fix:=E4=BF=AE=E5=A4=8D=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E4=BF=A1=E4=BB=A4=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 simple-mind-map/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/simple-mind-map/package.json b/simple-mind-map/package.json
index 64ad8ad4..2d00def4 100644
--- a/simple-mind-map/package.json
+++ b/simple-mind-map/package.json
@@ -23,7 +23,7 @@
     "lint": "eslint src/",
     "format": "prettier --write .",
     "types": "npx -p typescript tsc index.js --declaration --allowJs --emitDeclarationOnly --outDir types --target es2017",
-    "wsServe": "node ./bin/server.mjs"
+    "wsServe": "node ./bin/wsServer.mjs"
   },
   "module": "index.js",
   "main": "./dist/simpleMindMap.umd.min.js",

From 0f2aed7e8aa1c6d791e9f82be81ab8b2fcc3466a Mon Sep 17 00:00:00 2001
From: wanglin2 <1013335014@qq.com>
Date: Thu, 5 Oct 2023 13:50:36 +0800
Subject: [PATCH 10/86] =?UTF-8?q?=E6=89=93=E5=8C=850.7.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 5afed5e2..3631a97a 100644
--- a/index.html
+++ b/index.html
@@ -1,7 +1,7 @@
 思绪思维导图
    
\ No newline at end of file
+      }
\ No newline at end of file

From 56d2e34fbd8cde5ae1832dba2bfb38595f33fbd2 Mon Sep 17 00:00:00 2001
From: wanglin2 <1013335014@qq.com>
Date: Fri, 6 Oct 2023 09:52:03 +0800
Subject: [PATCH 11/86] Doc: update

---
 README.md                                   |  5 +--
 web/src/pages/Doc/en/cooperate/index.md     | 12 ++++++-
 web/src/pages/Doc/en/cooperate/index.vue    |  8 ++++-
 web/src/pages/Doc/en/introduction/index.md  |  3 +-
 web/src/pages/Doc/en/introduction/index.vue | 33 +++++++++----------
 web/src/pages/Doc/zh/cooperate/index.md     | 12 ++++++-
 web/src/pages/Doc/zh/cooperate/index.vue    |  8 ++++-
 web/src/pages/Doc/zh/introduction/index.md  |  5 +--
 web/src/pages/Doc/zh/introduction/index.vue | 35 +++++++++++----------
 web/src/pages/Index/components/Block2.vue   |  6 ++--
 10 files changed, 82 insertions(+), 45 deletions(-)

diff --git a/README.md b/README.md
index 885b36af..b7120cad 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,7 @@ Github：[releases](https://github.com/wanglin2/mind-map/releases)。
 - [x] 支持导出为`json`、`png`、`svg`、`pdf`、`markdown`、`xmind`，支持从`json`、`xmind`、`markdown`导入
 - [x] 支持快捷键、前进后退、关联线、搜索替换、小地图、水印、滚动条
 - [x] 提供丰富的配置，满足各种场景各种使用习惯
+- [x] 支持协同编辑
 
 # 安装
 
@@ -93,11 +94,11 @@ const mindMap = new MindMap({
 
 # 请作者喝杯咖啡
 
-开源不易，如果本项目有帮助到你的话，可以考虑请作者喝杯咖啡哟~
+开源不易，如果本项目有帮助到你的话，可以考虑请作者喝杯咖啡~
 
 > 厚椰乳一盒 + 纯牛奶半盒 + 冰块 + 咖啡液 = 生椰拿铁 yyds
 
-> 推荐使用支付宝，微信获取不到头像。转账请备注【思维导图】。你的头像和名字将会出现在下面和[文档页面](https://wanglin2.github.io/mind-map/#/doc/zh/introduction/%E8%AF%B7%E4%BD%9C%E8%80%85%E5%96%9D%E6%9D%AF%E5%92%96%E5%95%A1)
+> 推荐使用支付宝，微信获取不到头像。转账请备注【思维导图】。
 
 
    
   
diff --git a/web/src/pages/Doc/en/cooperate/index.md b/web/src/pages/Doc/en/cooperate/index.md
index bf714bba..53fd7bae 100644
--- a/web/src/pages/Doc/en/cooperate/index.md
+++ b/web/src/pages/Doc/en/cooperate/index.md
@@ -30,12 +30,22 @@ npm i
 npm link simple-mind-map
 ```
 
-2. Modify `web/src/pages/Edit/components/Edit.vue` file, To register Cooperate plugin, uncomment the line:
+2. Modify `web/src/pages/Edit/components/Edit.vue` file
+
+To register Cooperate plugin, uncomment the line:
 
 ```js
 // .usePlugin(Cooperate)// Cooperate plugin
 ```
 
+Change the signaling server address to your local IP:
+
+```js
+// cooperateTest function
+
+signalingList: ['ws://【your ip】:4444']
+```
+
 3. To register a collaborative plugin, uncomment the line:
 
 ```bash
diff --git a/web/src/pages/Doc/en/cooperate/index.vue b/web/src/pages/Doc/en/cooperate/index.vue
index 912077e1..25b1c49a 100644
--- a/web/src/pages/Doc/en/cooperate/index.vue
+++ b/web/src/pages/Doc/en/cooperate/index.vue
@@ -25,10 +25,16 @@ npm i
 npm link simple-mind-map
      -
    1. Modify web/src/pages/Edit/components/Edit.vue file, To register Cooperate plugin, uncomment the line:
      2. +
    2. Modify web/src/pages/Edit/components/Edit.vue file
    +

    To register Cooperate plugin, uncomment the line:

    // .usePlugin(Cooperate)// Cooperate plugin
    +

    Change the signaling server address to your local IP:

    +
    // cooperateTest function
+
+signalingList: ['ws://【your ip】:4444']
+
    1. To register a collaborative plugin, uncomment the line:
    diff --git a/web/src/pages/Doc/en/introduction/index.md b/web/src/pages/Doc/en/introduction/index.md index 41fb306e..cc2c8a37 100644 --- a/web/src/pages/Doc/en/introduction/index.md +++ b/web/src/pages/Doc/en/introduction/index.md @@ -18,6 +18,7 @@ - [x] Supoorts to export as `json`、`png`、`svg`、`pdf`、`markdown`、`xmind`, support import from `json`、`xmind`、`markdown` - [x] Support shortcut keys, forward and backward, correlation lines, search and replacement, small maps, watermarks, and scrollbar - [x] Provide rich configurations to meet various scenarios and usage habits +- [x] Support collaborative editing ## Repository Catalog Introduction @@ -116,7 +117,7 @@ Unsupported: `IE` browser. Open source is not easy. If this project is helpful to you, you can invite the author to have a cup of coffee~ -> Please note the 【mind map】 for transfer. Your avatar and name will appear below. +> Please note the 【mind map】 for transfer. diff --git a/web/src/pages/Doc/en/introduction/index.vue b/web/src/pages/Doc/en/introduction/index.vue index 5e352b28..9368f1ad 100644 --- a/web/src/pages/Doc/en/introduction/index.vue +++ b/web/src/pages/Doc/en/introduction/index.vue @@ -8,16 +8,17 @@

    Features

      -
      • -
      • -
      • -
      • -
      • -
      • -
      • -
    • json、png、svg、pdf、markdown、xmind, support import from json、xmind、markdown
      • -
      • -
      • +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
    • json、png、svg、pdf、markdown、xmind, support import from json、xmind、markdown
      • +
      • +
      • +

    Repository Catalog Introduction

    1.simple-mind-map

    @@ -27,16 +28,16 @@ frameworks such as Vue and React, or without a framework.

    This is an online mind map built using the simple-mind-map library and based on Vue2.x and ElementUI. Features include:

      -
    • +
    • images, icons, hyperlinks, notes, tags, and summaries
      • -
    • +
    • outline, theme selection, and structure selection
      • -
    • +
    • storage by default, but it also supports creating, opening, and editing local files on the computer directly
      • -
    • +
    • and organizing layout
      • -
    • +
    • between edit and read-only modes, zooming in and out, and switching to full screen, support mini map
    @@ -77,7 +78,7 @@ full screen, support mini map

    Invite the author to a cup of coffee

    Open source is not easy. If this project is helpful to you, you can invite the author to have a cup of coffee~

    -

    Please note the 【mind map】 for transfer. Your avatar and name will appear below.

    +

    Please note the 【mind map】 for transfer.

    diff --git a/web/src/pages/Doc/zh/cooperate/index.md b/web/src/pages/Doc/zh/cooperate/index.md index ccee2949..86d123fd 100644 --- a/web/src/pages/Doc/zh/cooperate/index.md +++ b/web/src/pages/Doc/zh/cooperate/index.md @@ -30,12 +30,22 @@ npm i npm link simple-mind-map ``` -2. 修改`web/src/pages/Edit/components/Edit.vue`文件，注册协同插件，即取消该行注释： +2. 修改`web/src/pages/Edit/components/Edit.vue`文件 + +注册协同插件，即取消该行注释： ```js // .usePlugin(Cooperate)// 协同插件 ``` +将信令服务器地址改为你本机的ip： + +```js +// cooperateTest 函数 + +signalingList: ['ws://【你的ip】:4444'] +``` + 3. 启动demo项目的本地服务： ```bash diff --git a/web/src/pages/Doc/zh/cooperate/index.vue b/web/src/pages/Doc/zh/cooperate/index.vue index 1fdb8a5d..cc0e10c7 100644 --- a/web/src/pages/Doc/zh/cooperate/index.vue +++ b/web/src/pages/Doc/zh/cooperate/index.vue @@ -25,10 +25,16 @@ npm i npm link simple-mind-map
      -
    1. 修改web/src/pages/Edit/components/Edit.vue文件，注册协同插件，即取消该行注释：
      2. +
    2. 修改web/src/pages/Edit/components/Edit.vue文件
    +

    注册协同插件，即取消该行注释：

    // .usePlugin(Cooperate)// 协同插件
    +

    将信令服务器地址改为你本机的ip：

    +
    // cooperateTest 函数
+
+signalingList: ['ws://【你的ip】:4444']
+
    1. 启动demo项目的本地服务：
    diff --git a/web/src/pages/Doc/zh/introduction/index.md b/web/src/pages/Doc/zh/introduction/index.md index a41a7b48..940f5b30 100644 --- a/web/src/pages/Doc/zh/introduction/index.md +++ b/web/src/pages/Doc/zh/introduction/index.md @@ -18,6 +18,7 @@ - [x] 支持导出为`json`、`png`、`svg`、`pdf`、`markdown`、`xmind`，支持从`json`、`xmind`、`markdown`导入 - [x] 支持快捷键、前进后退、关联线、搜索替换、小地图、水印、滚动条 - [x] 提供丰富的配置，满足各种场景各种使用习惯 +- [x] 支持协同编辑 ## 仓库目录介绍 @@ -105,11 +106,11 @@ ## 请作者喝杯咖啡 -开源不易，如果本项目有帮助到你的话，可以考虑请作者喝杯咖啡哟~ +开源不易，如果本项目有帮助到你的话，可以考虑请作者喝杯咖啡~ > 厚椰乳一盒 + 纯牛奶半盒 + 冰块 + 咖啡液 = 生椰拿铁 yyds -> 推荐使用支付宝，微信获取不到头像。转账请备注【思维导图】。你的头像和名字将会出现在下面。 +> 推荐使用支付宝，微信获取不到头像。转账请备注【思维导图】。 diff --git a/web/src/pages/Doc/zh/introduction/index.vue b/web/src/pages/Doc/zh/introduction/index.vue index 3da5d7d6..d3da6224 100644 --- a/web/src/pages/Doc/zh/introduction/index.vue +++ b/web/src/pages/Doc/zh/introduction/index.vue @@ -8,16 +8,17 @@

    特性

      -
      • -
      • -
      • -
      • -
      • -
      • -
      • -
    • json、png、svg、pdf、markdown、xmind，支持从json、xmind、markdown导入
      • -
      • -
      • +
      • +
      • +
      • +
      • +
      • +
      • +
      • +
    • json、png、svg、pdf、markdown、xmind，支持从json、xmind、markdown导入
      • +
      • +
      • +

    仓库目录介绍

    1.simple-mind-map

    @@ -25,11 +26,11 @@

    2.web

    使用simple-mind-map库，基于vue2.x、ElementUI搭建的在线思维导图。特性：

      -
      • -
      • -
      • -
      • -
      • +
      • +
      • +
      • +
      • +

    提供文档页面服务。

    3.dist

    @@ -66,12 +67,12 @@

    License

    请作者喝杯咖啡

    -

    开源不易，如果本项目有帮助到你的话，可以考虑请作者喝杯咖啡哟~

    +

    开源不易，如果本项目有帮助到你的话，可以考虑请作者喝杯咖啡~

    厚椰乳一盒 + 纯牛奶半盒 + 冰块 + 咖啡液 = 生椰拿铁 yyds

    -

    推荐使用支付宝，微信获取不到头像。转账请备注【思维导图】。你的头像和名字将会出现在下面。

    +

    推荐使用支付宝，微信获取不到头像。转账请备注【思维导图】。

    diff --git a/web/src/pages/Index/components/Block2.vue b/web/src/pages/Index/components/Block2.vue index f56f89af..a79b13d4 100644 --- a/web/src/pages/Index/components/Block2.vue +++ b/web/src/pages/Index/components/Block2.vue @@ -42,15 +42,15 @@ export default { dataList: [ { icon: 'iconstar', - value: 'Github star数量800+' + value: 'Github star数量1000+' }, { icon: 'iconfork', - value: 'Github fork数量150+' + value: 'Github fork数量200+' }, { icon: 'iconxiazai', - value: 'npm总下载次数15000+' + value: 'npm总下载次数20000+' }, { icon: 'iconteamwork', From 89ebc9a1faef1fd3e8960ee9ce9f599ce409944d Mon Sep 17 00:00:00 2001 From: wanglin2 <1013335014@qq.com> Date: Fri, 6 Oct 2023 10:20:54 +0800 Subject: [PATCH 12/86] =?UTF-8?q?=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 3631a97a..b161857a 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@ 思绪思维导图
    \ No newline at end of file + } \ No newline at end of file From b959e9072311626c6c7ac5368575e88d82a67488 Mon Sep 17 00:00:00 2001 From: wanglin2 <1013335014@qq.com> Date: Fri, 6 Oct 2023 13:47:47 +0800 Subject: [PATCH 13/86] =?UTF-8?q?Fix:=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E5=A4=9A=E9=80=89=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=A1=86=E9=80=89=E5=8C=BA=E5=9F=9F=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=B6=88=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simple-mind-map/src/plugins/Select.js | 1 + 1 file changed, 1 insertion(+) diff --git a/simple-mind-map/src/plugins/Select.js b/simple-mind-map/src/plugins/Select.js index c26ebb58..d639202a 100644 --- a/simple-mind-map/src/plugins/Select.js +++ b/simple-mind-map/src/plugins/Select.js @@ -184,6 +184,7 @@ class Select { // 创建矩形 createRect(x, y) { + if (this.rect) this.rect.remove() this.rect = this.mindMap.svg .polygon() .stroke({ From 83a5ef8e2ebb2f08d78551f2399a27e07be5d9f3 Mon Sep 17 00:00:00 2001 From: wanglin2 <1013335014@qq.com> Date: Fri, 6 Oct 2023 14:08:45 +0800 Subject: [PATCH 14/86] =?UTF-8?q?Fix:=E4=BF=AE=E5=A4=8D=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=97=B6=E5=9C=A8=E8=8A=82=E7=82=B9=E4=B8=8A?= =?UTF-8?q?=E6=9D=BE=E5=BC=80=E9=BC=A0=E6=A0=87=E6=97=B6=E6=A1=86=E9=80=89?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E4=B8=8D=E4=BC=9A=E6=B6=88=E5=A4=B1=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simple-mind-map/src/plugins/Select.js | 39 +++++++++++++++------------ 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/simple-mind-map/src/plugins/Select.js b/simple-mind-map/src/plugins/Select.js index d639202a..bf5c0173 100644 --- a/simple-mind-map/src/plugins/Select.js +++ b/simple-mind-map/src/plugins/Select.js @@ -89,23 +89,28 @@ class Select { } ) }) - this.mindMap.on('mouseup', () => { - if (this.mindMap.opt.readonly) { - return - } - if (!this.isMousedown) { - return - } - this.checkTriggerNodeActiveEvent() - clearTimeout(this.autoMoveTimer) - this.isMousedown = false - this.cacheActiveList = [] - if (this.rect) this.rect.remove() - this.rect = null - setTimeout(() => { - this.isSelecting = false - }, 0) - }) + this.onMouseup = this.onMouseup.bind(this) + this.mindMap.on('mouseup', this.onMouseup) + this.mindMap.on('node_mouseup', this.onMouseup) + } + + // 结束框选 + onMouseup() { + if (this.mindMap.opt.readonly) { + return + } + if (!this.isMousedown) { + return + } + this.checkTriggerNodeActiveEvent() + clearTimeout(this.autoMoveTimer) + this.isMousedown = false + this.cacheActiveList = [] + if (this.rect) this.rect.remove() + this.rect = null + setTimeout(() => { + this.isSelecting = false + }, 0) } // 如果激活节点改变了，那么触发事件 From 2c6b8294f41035c8e4e936b0983ef78fd8e3c64e Mon Sep 17 00:00:00 2001 From: wanglin2 <1013335014@qq.com> Date: Sun, 8 Oct 2023 09:10:14 +0800 Subject: [PATCH 15/86] =?UTF-8?q?Fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=A4=9A?= =?UTF-8?q?=E6=AC=A1=E7=B2=98=E8=B4=B4=E8=8A=82=E7=82=B9=E6=97=B6=E7=94=B1?= =?UTF-8?q?=E4=BA=8E=E8=8A=82=E7=82=B9uid=E9=87=8D=E5=A4=8D=E9=80=A0?= =?UTF-8?q?=E6=88=90=E7=9A=84=E6=B8=B2=E6=9F=93=E5=BC=82=E5=B8=B8=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- simple-mind-map/package.json | 2 +- simple-mind-map/src/core/render/Render.js | 12 +++++++----- simple-mind-map/src/utils/index.js | 19 +++++++++++-------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/simple-mind-map/package.json b/simple-mind-map/package.json index 2d00def4..9f11febe 100644 --- a/simple-mind-map/package.json +++ b/simple-mind-map/package.json @@ -1,6 +1,6 @@ { "name": "simple-mind-map", - "version": "0.7.3", + "version": "0.7.3-fix.1", "description": "一个简单的web在线思维导图", "authors": [ { diff --git a/simple-mind-map/src/core/render/Render.js b/simple-mind-map/src/core/render/Render.js index d0fa7ea6..713c3066 100644 --- a/simple-mind-map/src/core/render/Render.js +++ b/simple-mind-map/src/core/render/Render.js @@ -512,7 +512,7 @@ class Render { uid: createUid(), ...(appointData || {}) }, - children: [...createUidForAppointNodes(appointChildren)] + children: [...createUidForAppointNodes(appointChildren, true)] } parent.nodeData.children.splice(index + 1, 0, newNodeData) }) @@ -558,7 +558,7 @@ class Render { const index = parent.nodeData.children.findIndex(item => { return item.data.uid === node.uid }) - const newNodeList = createUidForAppointNodes(simpleDeepClone(nodeList)) + const newNodeList = createUidForAppointNodes(simpleDeepClone(nodeList), true) parent.nodeData.children.splice( index + 1, 0, @@ -619,7 +619,7 @@ class Render { ...params, ...(appointData || {}) }, - children: [...createUidForAppointNodes(appointChildren)] + children: [...createUidForAppointNodes(appointChildren, true)] } node.nodeData.children.push(newNode) // 插入子节点时自动展开子节点 @@ -659,7 +659,7 @@ class Render { if (!node.nodeData.children) { node.nodeData.children = [] } - childList = createUidForAppointNodes(childList) + childList = createUidForAppointNodes(childList, true) node.nodeData.children.push(...childList) // 插入子节点时自动展开子节点 node.nodeData.data.expand = true @@ -1071,7 +1071,9 @@ class Render { this.activeNodeList.forEach(node => { node.nodeData.children.push( ...data.map(item => { - return simpleDeepClone(item) + const newData = simpleDeepClone(item) + createUidForAppointNodes([newData], true) + return newData }) ) }) diff --git a/simple-mind-map/src/utils/index.js b/simple-mind-map/src/utils/index.js index a882ffcd..7281dd93 100644 --- a/simple-mind-map/src/utils/index.js +++ b/simple-mind-map/src/utils/index.js @@ -167,11 +167,13 @@ export const copyNodeTree = ( tree, root, removeActiveState = false, - keepId = false + removeId = true ) => { tree.data = simpleDeepClone(root.nodeData ? root.nodeData.data : root.data) - // 重新创建节点uid，因为节点uid不能重复 - if (!keepId) { + // 移除节点uid + if (removeId) { + delete tree.data.uid + } else if (!tree.data.uid) {// 否则保留或生成 tree.data.uid = createUid() } if (removeActiveState) { @@ -180,7 +182,7 @@ export const copyNodeTree = ( tree.children = [] if (root.children && root.children.length > 0) { root.children.forEach((item, index) => { - tree.children[index] = copyNodeTree({}, item, removeActiveState, keepId) + tree.children[index] = copyNodeTree({}, item, removeActiveState, removeId) }) } else if ( root.nodeData && @@ -188,7 +190,7 @@ export const copyNodeTree = ( root.nodeData.children.length > 0 ) { root.nodeData.children.forEach((item, index) => { - tree.children[index] = copyNodeTree({}, item, removeActiveState, keepId) + tree.children[index] = copyNodeTree({}, item, removeActiveState, removeId) }) } return tree @@ -766,14 +768,15 @@ export const addDataToAppointNodes = (appointNodes, data = {}) => { return appointNodes } -// 给指定的节点列表树数据添加uid，如果不存在的话，会修改原数据 -export const createUidForAppointNodes = appointNodes => { +// 给指定的节点列表树数据添加uid，会修改原数据 +// createNewId默认为false，即如果节点不存在uid的话，会创建新的uid。如果传true，那么无论节点数据原来是否存在uid，都会创建新的uid +export const createUidForAppointNodes = (appointNodes, createNewId = false) => { const walk = list => { list.forEach(node => { if (!node.data) { node.data = {} } - if (isUndef(node.data.uid)) { + if (createNewId || isUndef(node.data.uid)) { node.data.uid = createUid() } if (node.children && node.children.length > 0) { From 253ded33bf236e59118d23358c2b5624bb4b8cbd Mon Sep 17 00:00:00 2001 From: wanglin2 <1013335014@qq.com> Date: Sun, 8 Oct 2023 09:32:07 +0800 Subject: [PATCH 16/86] =?UTF-8?q?Demo=EF=BC=9A=E8=B6=85=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E5=A2=9E=E5=8A=A0=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/Edit/components/NodeHyperlink.vue | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/web/src/pages/Edit/components/NodeHyperlink.vue b/web/src/pages/Edit/components/NodeHyperlink.vue index 0ce20506..0692b0e0 100644 --- a/web/src/pages/Edit/components/NodeHyperlink.vue +++ b/web/src/pages/Edit/components/NodeHyperlink.vue @@ -13,7 +13,14 @@ placeholder="http://xxxx.com/" @keyup.native.stop @keydown.native.stop - > + @blur="handleUrl()" + > + + + + + +
    {{ $t('nodeHyperlink.name') }} @@ -46,7 +53,8 @@ export default { dialogVisible: false, link: '', linkTitle: '', - activeNodes: [] + activeNodes: [], + protocol: 'https' } }, created() { @@ -63,6 +71,7 @@ export default { if (this.activeNodes.length > 0) { let firstNode = this.activeNodes[0] this.link = firstNode.getData('hyperlink') + this.handleUrl(true) this.linkTitle = firstNode.getData('hyperlinkTitle') } else { this.link = '' @@ -70,6 +79,20 @@ export default { } }, + removeProtocol(url) { + return url.replace(/^https?:\/\//, '') + }, + + handleUrl(setProtocolNoneIfNotExist) { + const res = this.link.match(/^(https?):\/\//) + if (res && res[1]) { + this.protocol = res[1] + } else if (setProtocolNoneIfNotExist) { + this.protocol = 'none' + } + this.link = this.removeProtocol(this.link) + }, + handleShowNodeLink() { this.activeNodes[0].mindMap.keyCommand.pause() this.$bus.$emit('startTextEdit') @@ -94,7 +117,10 @@ export default { */ confirm() { this.activeNodes.forEach(node => { - node.setHyperlink(this.link, this.linkTitle) + node.setHyperlink( + (this.protocol === 'none' ? '' : this.protocol + '://') + this.link, + this.linkTitle + ) this.cancel() }) } From 8dcc7c985dbd07f273b7dbe01728a5c551179e72 Mon Sep 17 00:00:00 2001 From: wanglin2 <1013335014@qq.com> Date: Sun, 8 Oct 2023 09:33:06 +0800 Subject: [PATCH 17/86] Doc: update --- web/src/pages/Doc/en/changelog/index.md | 14 ++++++++++++++ web/src/pages/Doc/en/changelog/index.vue | 11 +++++++++++ web/src/pages/Doc/en/utils/index.md | 8 ++++++-- web/src/pages/Doc/en/utils/index.vue | 16 +++++++++++++--- web/src/pages/Doc/zh/changelog/index.md | 14 ++++++++++++++ web/src/pages/Doc/zh/changelog/index.vue | 11 +++++++++++ web/src/pages/Doc/zh/course3/index.md | 2 +- web/src/pages/Doc/zh/course3/index.vue | 2 +- web/src/pages/Doc/zh/utils/index.md | 10 +++++++--- web/src/pages/Doc/zh/utils/index.vue | 18 ++++++++++++++---- 10 files changed, 92 insertions(+), 14 deletions(-) diff --git a/web/src/pages/Doc/en/changelog/index.md b/web/src/pages/Doc/en/changelog/index.md index bd1d1aad..ffda837d 100644 --- a/web/src/pages/Doc/en/changelog/index.md +++ b/web/src/pages/Doc/en/changelog/index.md @@ -1,5 +1,19 @@ # Changelog +## 0.7.3-fix.1 + +Fix: + +> 1.Fixed some issues where the box selection area did not disappear when multiple nodes were selected. +> +> 2.Fixed an issue where the box selection area does not disappear when releasing the mouse over multiple selected nodes. +> +> 3.Fixed rendering anomalies caused by duplicate node uids when pasting nodes multiple times. + +Demo： + +> 1.Add protocol selection function to the hyperlink input box. + ## 0.7.3 New: 1.Add a Cooperate editing plugin. diff --git a/web/src/pages/Doc/en/changelog/index.vue b/web/src/pages/Doc/en/changelog/index.vue index 7c0c1f0d..d705ff0d 100644 --- a/web/src/pages/Doc/en/changelog/index.vue +++ b/web/src/pages/Doc/en/changelog/index.vue @@ -1,6 +1,17 @@ diff --git a/web/src/pages/Doc/en/changelog/index.md b/web/src/pages/Doc/en/changelog/index.md index b59bfffa..7ddd64be 100644 --- a/web/src/pages/Doc/en/changelog/index.md +++ b/web/src/pages/Doc/en/changelog/index.md @@ -1,5 +1,51 @@ # Changelog +## 0.8.0 + +Breaking change: Greatly optimize some of the code and slightly improve performance, mainly by using the 'render' class to remove useless logic, adjust unreasonable implementations, and extract duplicate code; Modify function names, functions, etc. + +Fix: + +> Fix the issue of the arrow of the associated line disappearing when exporting images and SVGs. +> +> Fix the issue of abnormal operation returning to the root node after resizing the container. +> +> Fix that the shortcut key operations for inserting summary, moving up, down, and organizing layout with one click did not trigger data_ The issue with the change event. + +New: + +> Optimize the canvas DOM structure and render nodes, lines, and associated lines in layers. +> +> Optimize the watermark plugin. +> +> The setTheme, setThemeConfig, and setLayout functions add parameters that do not trigger re rendering. +> +> Add a command to insert a parent node. +> +> Add a command to only delete the current node. +> +> Automatically expand child nodes when inserting a summary. +> +> Clear the current active node when right-clicking on the canvas. +> +> The folded active nodes are synchronously deleted from the list of active nodes. +> +> Pasting text with line breaks supports controlling whether nodes are split by line breaks. + +Demo: + +> Modify the method and copy to return to the root node. +> +> Fix the issue of ineffective first switching when switching themes in overlay mode. +> +> The right-click menu adds the function of inserting parent nodes and deleting only the current node. +> +> The top toolbar supports automatic folding into more according to the window width. +> +> Support manual input of zoom factor. +> +> Improve the English translation of the interface. + ## 0.7.3-fix.2 Fix some issues with collaborative editing: diff --git a/web/src/pages/Doc/en/changelog/index.vue b/web/src/pages/Doc/en/changelog/index.vue index 3881f6f7..25ae5d07 100644 --- a/web/src/pages/Doc/en/changelog/index.vue +++ b/web/src/pages/Doc/en/changelog/index.vue @@ -1,6 +1,35 @@ diff --git a/web/src/pages/Doc/zh/changelog/index.md b/web/src/pages/Doc/zh/changelog/index.md index 34ec1bd6..69dec582 100644 --- a/web/src/pages/Doc/zh/changelog/index.md +++ b/web/src/pages/Doc/zh/changelog/index.md @@ -1,5 +1,51 @@ # Changelog +## 0.8.0 + +破坏性更新：大幅优化部分代码，小幅提升性能，主要是`render`类，删除无用逻辑、调整不合理的实现、提取重复代码；修改函数名称、函数功能等。 + +修复： + +> 修复导出图片和svg时关联线的箭头消失的问题。 +> +> 修复调整容器大小后回到根节点的操作异常的问题。 +> +> 修复插入概要、上移、下移、一键整理布局的快捷键操作没有触发data_change事件的问题。 + +新增： + +> 优化画布DOM结构，将节点、连线、关联线分层渲染。 +> +> 优化水印插件。 +> +> setTheme、setThemeConfig、setLayout函数增加不触发重新渲染的参数。 +> +> 新增插入父节点的命令。 +> +> 新增仅删除当前节点的命令。 +> +> 插入概要时自动展开子节点。 +> +> 鼠标右键单击画布时清除当前激活节点。 +> +> 被收起的激活节点同步从激活节点列表里删除。 +> +> 粘贴带换行的文本支持控制是否按换行分割节点。 + +Demo： + +> 修改回到根节点的方法及文案。 +> +> 修复覆盖方式切换主题时第一次切换不生效的问题。 +> +> 右键菜单新增插入父节点和仅删除当前节点的功能。 +> +> 顶部工具栏支持根据窗口宽度自动收起到更多中。 +> +> 支持手动输入缩放倍数。 +> +> 完善界面英文翻译。 + ## 0.7.3-fix.2 修复协同编辑的一些问题： diff --git a/web/src/pages/Doc/zh/changelog/index.vue b/web/src/pages/Doc/zh/changelog/index.vue index be6dafb9..d7a993de 100644 --- a/web/src/pages/Doc/zh/changelog/index.vue +++ b/web/src/pages/Doc/zh/changelog/index.vue @@ -1,6 +1,35 @@

    MIT