Skip to content

Commit

Permalink
Merge branch 'feature' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@wanglin2
wanglin2 committed Jul 30, 2023
2 parents f8c2a62 + b814bd3 commit 4d4f1b9
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 18 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.ico"><title>思绪思维导图</title><link href="dist/js/chunk-0ed6efa1.0c1a2525.js" rel="prefetch"><link href="dist/js/chunk-2978b256.a272842c.js" rel="prefetch"><link href="dist/js/chunk-2aa535ae.c9a90e66.js" rel="prefetch"><link href="dist/js/chunk-2d0a3179.4ddb39ac.js" rel="prefetch"><link href="dist/js/chunk-2d0a3fbe.70a1066e.js" rel="prefetch"><link href="dist/js/chunk-2d0a4659.f2939453.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.a1945b72.js" rel="prefetch"><link href="dist/js/chunk-2d0ab10b.cbcad1e5.js" rel="prefetch"><link href="dist/js/chunk-2d0ab546.56b75ded.js" rel="prefetch"><link href="dist/js/chunk-2d0abe0f.32993085.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-2d0b6d39.8ad9ed6c.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.1f12b3b9.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.7a75ae24.js" rel="prefetch"><link href="dist/js/chunk-2d0c0a44.882bbccb.js" rel="prefetch"><link href="dist/js/chunk-2d0c14fc.ee2161f1.js" rel="prefetch"><link href="dist/js/chunk-2d0c191e.b4fdc28b.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-2d0c226c.5a3f429c.js" rel="prefetch"><link href="dist/js/chunk-2d0c4a65.105114f6.js" rel="prefetch"><link href="dist/js/chunk-2d0c5538.aca89204.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.90254193.js" rel="prefetch"><link href="dist/js/chunk-2d0da701.62aa7ee5.js" rel="prefetch"><link href="dist/js/chunk-2d0dad5f.6e97ad38.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.c54b3bbd.js" rel="prefetch"><link href="dist/js/chunk-2d0ddf37.ce416624.js" rel="prefetch"><link href="dist/js/chunk-2d0de01b.8d9034fc.js" rel="prefetch"><link href="dist/js/chunk-2d0de1ec.d71f07a3.js" rel="prefetch"><link href="dist/js/chunk-2d0e2326.2f4d9019.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.721e6638.js" rel="prefetch"><link href="dist/js/chunk-2d0e9802.0b5b0f37.js" rel="prefetch"><link href="dist/js/chunk-2d0f026c.f19f3e0e.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.36c92797.js" rel="prefetch"><link href="dist/js/chunk-2d20ec02.917aff76.js" rel="prefetch"><link href="dist/js/chunk-2d20f137.880078de.js" rel="prefetch"><link href="dist/js/chunk-2d20f68f.628e2e99.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.6226ac47.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.f0ed0010.js" rel="prefetch"><link href="dist/js/chunk-2d217907.c963c0ef.js" rel="prefetch"><link href="dist/js/chunk-2d21b2b8.239ea73f.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-2d2253c4.4c04319b.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.00cf3b69.js" rel="prefetch"><link href="dist/js/chunk-2d230098.700733bb.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-f42d483e.4baee167.js" rel="prefetch"><link href="dist/css/app.f46e7904.css" rel="preload" as="style"><link href="dist/css/chunk-vendors.9240735a.css" rel="preload" as="style"><link href="dist/js/app.8460b91e.js" rel="preload" as="script"><link href="dist/js/chunk-vendors.cd7dd0cf.js" rel="preload" as="script"><link href="dist/css/chunk-vendors.9240735a.css" rel="stylesheet"><link href="dist/css/app.f46e7904.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.cd7dd0cf.js"></script><script src="dist/js/app.8460b91e.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.ico"><title>思绪思维导图</title><link href="dist/js/chunk-0ed6efa1.0c1a2525.js" rel="prefetch"><link href="dist/js/chunk-2978b256.a272842c.js" rel="prefetch"><link href="dist/js/chunk-2aa535ae.c9a90e66.js" rel="prefetch"><link href="dist/js/chunk-2d0a3179.4ddb39ac.js" rel="prefetch"><link href="dist/js/chunk-2d0a3fbe.70a1066e.js" rel="prefetch"><link href="dist/js/chunk-2d0a4659.f2939453.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.a1945b72.js" rel="prefetch"><link href="dist/js/chunk-2d0ab10b.cbcad1e5.js" rel="prefetch"><link href="dist/js/chunk-2d0ab546.56b75ded.js" rel="prefetch"><link href="dist/js/chunk-2d0abe0f.32993085.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-2d0b6d39.8ad9ed6c.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.1f12b3b9.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.7a75ae24.js" rel="prefetch"><link href="dist/js/chunk-2d0c0a44.882bbccb.js" rel="prefetch"><link href="dist/js/chunk-2d0c14fc.ee2161f1.js" rel="prefetch"><link href="dist/js/chunk-2d0c191e.b4fdc28b.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-2d0c226c.5a3f429c.js" rel="prefetch"><link href="dist/js/chunk-2d0c4a65.105114f6.js" rel="prefetch"><link href="dist/js/chunk-2d0c5538.aca89204.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.90254193.js" rel="prefetch"><link href="dist/js/chunk-2d0da701.62aa7ee5.js" rel="prefetch"><link href="dist/js/chunk-2d0dad5f.6e97ad38.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.c54b3bbd.js" rel="prefetch"><link href="dist/js/chunk-2d0ddf37.ce416624.js" rel="prefetch"><link href="dist/js/chunk-2d0de01b.8d9034fc.js" rel="prefetch"><link href="dist/js/chunk-2d0de1ec.d71f07a3.js" rel="prefetch"><link href="dist/js/chunk-2d0e2326.2f4d9019.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.721e6638.js" rel="prefetch"><link href="dist/js/chunk-2d0e9802.0b5b0f37.js" rel="prefetch"><link href="dist/js/chunk-2d0f026c.ffd3c7d8.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.45111f20.js" rel="prefetch"><link href="dist/js/chunk-2d20ec02.917aff76.js" rel="prefetch"><link href="dist/js/chunk-2d20f137.880078de.js" rel="prefetch"><link href="dist/js/chunk-2d20f68f.628e2e99.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.6226ac47.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.f0ed0010.js" rel="prefetch"><link href="dist/js/chunk-2d217907.c963c0ef.js" rel="prefetch"><link href="dist/js/chunk-2d21b2b8.239ea73f.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-2d2253c4.4c04319b.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.00cf3b69.js" rel="prefetch"><link href="dist/js/chunk-2d230098.700733bb.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-f42d483e.4baee167.js" rel="prefetch"><link href="dist/css/app.f46e7904.css" rel="preload" as="style"><link href="dist/css/chunk-vendors.9240735a.css" rel="preload" as="style"><link href="dist/js/app.3e637d39.js" rel="preload" as="script"><link href="dist/js/chunk-vendors.cd7dd0cf.js" rel="preload" as="script"><link href="dist/css/chunk-vendors.9240735a.css" rel="stylesheet"><link href="dist/css/app.f46e7904.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.cd7dd0cf.js"></script><script src="dist/js/app.3e637d39.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.11",
"version": "0.6.11-fix.1",
"description": "一个简单的web在线思维导图",
"authors": [
{
Expand Down
16 changes: 2 additions & 14 deletions simple-mind-map/src/plugins/MiniMap.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { isWhite, isTransparent } from '../utils/index'
import { isWhite, isTransparent, getVisibleColorFromTheme } from '../utils/index'

// 小地图插件
class MiniMap {
Expand Down Expand Up @@ -84,7 +84,7 @@ class MiniMap {
let shape = svg.findOne('.smm-node-shape')
let fill = shape.attr('fill')
if (isWhite(fill) || isTransparent(fill)) {
shape.attr('fill', this.getDefaultFill())
shape.attr('fill', getVisibleColorFromTheme(this.mindMap.themeConfig))
}
svg.clear()
svg.add(shape)
Expand All @@ -98,18 +98,6 @@ class MiniMap {
}
}

// 计算默认的填充颜色
getDefaultFill() {
let { lineColor, root, second, node } = this.mindMap.themeConfig
let list = [lineColor, root.fillColor, root.color, second.fillColor, second.color, node.fillColor, node.color, root.borderColor, second.borderColor, node.borderColor]
for(let i = 0; i < list.length; i++) {
let color = list[i]
if (!isTransparent(color) && !isWhite(color)) {
return color
}
}
}

// 小地图鼠标按下事件
onMousedown(e) {
this.isMousedown = true
Expand Down
5 changes: 3 additions & 2 deletions simple-mind-map/src/plugins/RichText.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Quill from 'quill'
import 'quill/dist/quill.snow.css'
import html2canvas from 'html2canvas'
import { walk, getTextFromHtml } from '../utils'
import { walk, getTextFromHtml, isWhite, getVisibleColorFromTheme } from '../utils'
import { CONSTANTS } from '../constants/constant'

let extended = false
Expand Down Expand Up @@ -176,11 +176,12 @@ class RichText {
}
// 使用节点的填充色，否则如果节点颜色是白色的话编辑时看不见
let bgColor = node.style.merge('fillColor')
let color = node.style.merge('color')
this.textEditNode.style.marginLeft = `-${paddingX * scaleX}px`
this.textEditNode.style.marginTop = `-${paddingY * scaleY}px`
this.textEditNode.style.zIndex = this.mindMap.opt.nodeTextEditZIndex
this.textEditNode.style.backgroundColor =
bgColor === 'transparent' ? '#fff' : bgColor
bgColor === 'transparent' ? isWhite(color) ? getVisibleColorFromTheme(this.mindMap.themeConfig) : '#fff' : bgColor
this.textEditNode.style.minWidth = originWidth + paddingX * 2 + 'px'
this.textEditNode.style.minHeight = originHeight + 'px'
this.textEditNode.style.left = rect.left + 'px'
Expand Down
12 changes: 12 additions & 0 deletions simple-mind-map/src/utils/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -527,4 +527,16 @@ export const isWhite = (color) => {
export const isTransparent = (color) => {
color = String(color).replaceAll(/\s+/g, '')
return ['', 'transparent'].includes(color) || /rgba\(\d+,\d+,\d+,0\)/.test(color)
}

// 从当前主题里获取一个非透明非白色的颜色
export const getVisibleColorFromTheme = (themeConfig) => {
let { lineColor, root, second, node } = themeConfig
let list = [lineColor, root.fillColor, root.color, second.fillColor, second.color, node.fillColor, node.color, root.borderColor, second.borderColor, node.borderColor]
for(let i = 0; i < list.length; i++) {
let color = list[i]
if (!isTransparent(color) && !isWhite(color)) {
return color
}
}
}
4 changes: 4 additions & 0 deletions web/src/pages/Doc/en/changelog/index.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 0.6.11-fix.1

Fix: 1.Fixed the issue of invisible editing when node text is white.

## 0.6.11

New: 1.Optimize the mini map, remove node content within the mini map, and optimize performance.
Expand Down
2 changes: 2 additions & 0 deletions web/src/pages/Doc/en/changelog/index.vue
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<template>
<div>
<h1>Changelog</h1>
<h2>0.6.11-fix.1</h2>
<p>Fix: 1.Fixed the issue of invisible editing when node text is white.</p>
<h2>0.6.11</h2>
<p>New: 1.Optimize the mini map, remove node content within the mini map, and optimize performance.</p>
<p>Demo: 1.Add a new topic and add tab differentiation to the topic list. 2.Node image upload supports inputting network image addresses. 3.Node image upload supports inputting network images.</p>
Expand Down
4 changes: 4 additions & 0 deletions web/src/pages/Doc/zh/changelog/index.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 0.6.11-fix.1

修复：1.修复节点文字为白色时编辑的时候看不见的问题。

## 0.6.11

新增：1.优化小地图,去除小地图内的节点内容,优化性能。
Expand Down
2 changes: 2 additions & 0 deletions web/src/pages/Doc/zh/changelog/index.vue
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<template>
<div>
<h1>Changelog</h1>
<h2>0.6.11-fix.1</h2>
<p>修复：1.修复节点文字为白色时编辑的时候看不见的问题。</p>
<h2>0.6.11</h2>
<p>新增：1.优化小地图,去除小地图内的节点内容,优化性能。</p>
<p>Demo：1.新增主题、主题列表新增tab区分。 2.节点图片上传支持输入网络图片地址。 3.节点图片上传支持输入网络图片。</p>
Expand Down

0 comments on commit 4d4f1b9

Please sign in to comment.