From 10e9fa3f221a1884eabc149b33cca1c2c9bacbc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A1=97=E8=A7=92=E5=B0=8F=E6=9E=97?= <1013335014@qq.com>
Date: Wed, 26 Feb 2025 08:50:25 +0800
Subject: [PATCH 01/11] update
---
web/src/utils/ai.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web/src/utils/ai.js b/web/src/utils/ai.js
index 2f3156ea..59c3311a 100644
--- a/web/src/utils/ai.js
+++ b/web/src/utils/ai.js
@@ -88,7 +88,7 @@ class Ai {
})
})
if (res.status && res.status !== 200) {
- return false
+ throw new Error('请求失败')
}
return res.body.getReader()
}
From 2001bdd3ff3c31a1ec676bd6a41db3f1b13ab37b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A1=97=E8=A7=92=E5=B0=8F=E6=9E=97?= <1013335014@qq.com>
Date: Mon, 3 Mar 2025 16:29:57 +0800
Subject: [PATCH 02/11] =?UTF-8?q?Fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=8B=96?=
=?UTF-8?q?=E5=8A=A8=E5=85=B3=E8=81=94=E7=BA=BF=E6=8E=A7=E5=88=B6=E7=82=B9?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8E=EF=BC=8C=E5=86=8D=E6=AC=A1=E6=BF=80?=
=?UTF-8?q?=E6=B4=BB=E5=85=B3=E8=81=94=E7=BA=BF=E6=8E=A7=E5=88=B6=E7=82=B9?=
=?UTF-8?q?=E4=BD=8D=E7=BD=AE=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=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/AssociativeLine.js | 2 ++
1 file changed, 2 insertions(+)
diff --git a/simple-mind-map/src/plugins/AssociativeLine.js b/simple-mind-map/src/plugins/AssociativeLine.js
index 669e8e9e..211d57c5 100644
--- a/simple-mind-map/src/plugins/AssociativeLine.js
+++ b/simple-mind-map/src/plugins/AssociativeLine.js
@@ -157,6 +157,7 @@ class AssociativeLine {
// 取消激活关联线
if (!this.isControlPointMousedown) {
this.clearActiveLine()
+ this.renderAllLines()
}
}
@@ -166,6 +167,7 @@ class AssociativeLine {
this.completeCreateLine(node)
} else {
this.clearActiveLine()
+ this.renderAllLines()
}
}
From 3cb035e365c6c0a0fede31dd19c1cb4ec048ee07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A1=97=E8=A7=92=E5=B0=8F=E6=9E=97?= <1013335014@qq.com>
Date: Mon, 3 Mar 2025 16:31:42 +0800
Subject: [PATCH 03/11] =?UTF-8?q?Demo=EF=BC=9A=E8=8A=82=E7=82=B9=E6=96=87?=
=?UTF-8?q?=E5=AD=97=E5=AD=97=E5=8F=B7=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?14=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web/src/config/zh.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web/src/config/zh.js b/web/src/config/zh.js
index 3813a5e4..e4ea04b8 100644
--- a/web/src/config/zh.js
+++ b/web/src/config/zh.js
@@ -55,7 +55,7 @@ export const fontFamilyList = [
]
// 字号
-export const fontSizeList = [10, 12, 16, 18, 24, 32, 48]
+export const fontSizeList = [10, 12, 14, 16, 18, 24, 32, 48]
// 颜色
export const colorList = [
From f1a97e4ced2c823d47fb981381d16414a9c32028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A1=97=E8=A7=92=E5=B0=8F=E6=9E=97?= <1013335014@qq.com>
Date: Mon, 3 Mar 2025 16:37:22 +0800
Subject: [PATCH 04/11] =?UTF-8?q?Fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E9=BB=98?=
=?UTF-8?q?=E8=AE=A4=E4=B8=BB=E9=A2=98=E9=85=8D=E7=BD=AE=E4=B8=AD=E5=85=B3?=
=?UTF-8?q?=E8=81=94=E7=BA=BF=E6=A0=B7=E5=BC=8F=E5=80=BC=E7=B1=BB=E5=9E=8B?=
=?UTF-8?q?=E4=B8=BA=E6=95=B0=E7=BB=84=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?=
=?UTF-8?q?=E5=BA=94=E4=B8=BA=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
simple-mind-map/src/plugins/AssociativeLine.js | 6 +++---
simple-mind-map/src/theme/default.js | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/simple-mind-map/src/plugins/AssociativeLine.js b/simple-mind-map/src/plugins/AssociativeLine.js
index 211d57c5..a17ffcc5 100644
--- a/simple-mind-map/src/plugins/AssociativeLine.js
+++ b/simple-mind-map/src/plugins/AssociativeLine.js
@@ -282,7 +282,7 @@ class AssociativeLine {
.stroke({
width: associativeLineWidth,
color: associativeLineColor,
- dasharray: associativeLineDasharray || [6, 4]
+ dasharray: associativeLineDasharray || '6,4'
})
.fill({ color: 'none' })
path.plot(pathStr)
@@ -350,7 +350,7 @@ class AssociativeLine {
.stroke({
width: associativeLineWidth,
color: associativeLineColor,
- dasharray: associativeLineDasharray || [6, 4]
+ dasharray: associativeLineDasharray || '6,4'
})
.fill({ color: 'none' })
clickPath
@@ -463,7 +463,7 @@ class AssociativeLine {
.stroke({
width: associativeLineWidth,
color: associativeLineColor,
- dasharray: associativeLineDasharray || [6, 4]
+ dasharray: associativeLineDasharray || '6,4'
})
.fill({ color: 'none' })
// 箭头
diff --git a/simple-mind-map/src/theme/default.js b/simple-mind-map/src/theme/default.js
index c2bf3caa..abd26456 100644
--- a/simple-mind-map/src/theme/default.js
+++ b/simple-mind-map/src/theme/default.js
@@ -48,7 +48,7 @@ export default {
// 关联线激活状态的颜色
associativeLineActiveColor: 'rgba(2, 167, 240, 1)',
// 关联线样式
- associativeLineDasharray: [6, 4],
+ associativeLineDasharray: '6,4',
// 关联线文字颜色
associativeLineTextColor: 'rgb(51, 51, 51)',
// 关联线文字大小
From b836ca87b27572435b5c596f6e690188e1f857f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A1=97=E8=A7=92=E5=B0=8F=E6=9E=97?= <1013335014@qq.com>
Date: Mon, 3 Mar 2025 16:38:39 +0800
Subject: [PATCH 05/11] =?UTF-8?q?Demo=EF=BC=9A=E7=BB=9F=E4=B8=80=E8=99=9A?=
=?UTF-8?q?=E7=BA=BF=E6=A0=B7=E5=BC=8F=E5=80=BC=E7=9A=84=E9=A3=8E=E6=A0=BC?=
=?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8=E7=9A=84=E7=A9=BA?=
=?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web/src/config/en.js | 8 ++++----
web/src/config/zh.js | 8 ++++----
web/src/config/zhtw.js | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/web/src/config/en.js b/web/src/config/en.js
index 1f3a3755..679bcd8f 100644
--- a/web/src/config/en.js
+++ b/web/src/config/en.js
@@ -74,19 +74,19 @@ export const borderDasharrayList = [
},
{
name: 'Dotted4',
- value: '5, 5, 1, 5'
+ value: '5,5,1,5'
},
{
name: 'Dotted5',
- value: '15, 10, 5, 10, 15'
+ value: '15,10,5,10,15'
},
{
name: 'Dotted6',
- value: '1, 5'
+ value: '1,5'
},
{
name: 'Dotted7',
- value: '6, 4'
+ value: '6,4'
}
]
diff --git a/web/src/config/zh.js b/web/src/config/zh.js
index e4ea04b8..2a41be00 100644
--- a/web/src/config/zh.js
+++ b/web/src/config/zh.js
@@ -121,19 +121,19 @@ export const borderDasharrayList = [
},
{
name: '虚线4',
- value: '5, 5, 1, 5'
+ value: '5,5,1,5'
},
{
name: '虚线5',
- value: '15, 10, 5, 10, 15'
+ value: '15,10,5,10,15'
},
{
name: '虚线6',
- value: '1, 5'
+ value: '1,5'
},
{
name: '虚线7',
- value: '6, 4'
+ value: '6,4'
}
]
diff --git a/web/src/config/zhtw.js b/web/src/config/zhtw.js
index 106441f7..3ffba8c0 100644
--- a/web/src/config/zhtw.js
+++ b/web/src/config/zhtw.js
@@ -74,19 +74,19 @@ export const borderDasharrayList = [
},
{
name: '虛線 4',
- value: '5, 5, 1, 5'
+ value: '5,5,1,5'
},
{
name: '虛線 5',
- value: '15, 10, 5, 10, 15'
+ value: '15,10,5,10,15'
},
{
name: '虛線 6',
- value: '1, 5'
+ value: '1,5'
},
{
name: '虛線 7',
- value: '6, 4'
+ value: '6,4'
}
]
From 2a8959fb3b2e33cafdd31e6b9fc9921083f1a16b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A1=97=E8=A7=92=E5=B0=8F=E6=9E=97?= <1013335014@qq.com>
Date: Mon, 3 Mar 2025 16:39:50 +0800
Subject: [PATCH 06/11] =?UTF-8?q?Demo=EF=BC=9A=E5=8F=AA=E8=AF=BB=E6=A8=A1?=
=?UTF-8?q?=E5=BC=8F=E4=B8=8D=E9=9A=90=E8=97=8FAI=E4=BE=A7=E8=BE=B9?=
=?UTF-8?q?=E6=A0=8F=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web/src/pages/Edit/components/SidebarTrigger.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web/src/pages/Edit/components/SidebarTrigger.vue b/web/src/pages/Edit/components/SidebarTrigger.vue
index a721d11b..735e0daf 100644
--- a/web/src/pages/Edit/components/SidebarTrigger.vue
+++ b/web/src/pages/Edit/components/SidebarTrigger.vue
@@ -52,7 +52,7 @@ export default {
let list = sidebarTriggerList[this.$i18n.locale] || sidebarTriggerList.zh
if (this.isReadonly) {
list = list.filter(item => {
- return ['outline', 'shortcutKey'].includes(item.value)
+ return ['outline', 'shortcutKey', 'ai'].includes(item.value)
})
}
if (!this.enableAi) {
From c7cd19f956315beb627e421ccad219979c0d1d20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A1=97=E8=A7=92=E5=B0=8F=E6=9E=97?= <1013335014@qq.com>
Date: Mon, 3 Mar 2025 16:58:50 +0800
Subject: [PATCH 07/11] =?UTF-8?q?Demo=EF=BC=9A=E4=BC=98=E5=8C=96=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81=EF=BC=8C=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84?=
=?UTF-8?q?=E6=B3=A8=E9=87=8A=E3=80=81=E5=8E=BB=E9=99=A4=E7=BB=84=E4=BB=B6?=
=?UTF-8?q?name=E3=80=81=E5=BC=95=E5=85=A5vue=E7=BB=84=E4=BB=B6=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0=E5=90=8E=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
simple-mind-map/example/exampleData.js | 6 +-
web/src/App.vue | 3 +-
web/src/api/index.js | 32 ++------
web/src/components/ImgUpload/index.vue | 31 ++------
web/src/pages/Edit/Index.vue | 11 +--
web/src/pages/Edit/components/AiChat.vue | 2 +-
.../Edit/components/AssociativeLineStyle.vue | 18 +----
web/src/pages/Edit/components/BaseStyle.vue | 15 ++--
web/src/pages/Edit/components/Color.vue | 19 +----
web/src/pages/Edit/components/Contextmenu.vue | 7 +-
web/src/pages/Edit/components/Count.vue | 20 +----
web/src/pages/Edit/components/Edit.vue | 21 +++--
web/src/pages/Edit/components/Export.vue | 17 +---
.../pages/Edit/components/FormulaSidebar.vue | 3 +-
web/src/pages/Edit/components/Fullscreen.vue | 7 +-
web/src/pages/Edit/components/Import.vue | 7 +-
web/src/pages/Edit/components/MouseAction.vue | 7 +-
.../Edit/components/NavigatorToolbar.vue | 11 +--
.../Edit/components/NodeAnnotationBtn.vue | 2 +-
.../pages/Edit/components/NodeHyperlink.vue | 17 +---
web/src/pages/Edit/components/NodeIcon.vue | 12 +--
.../pages/Edit/components/NodeIconSidebar.vue | 3 +-
.../pages/Edit/components/NodeIconToolbar.vue | 4 -
web/src/pages/Edit/components/NodeImage.vue | 9 +--
.../components/NodeImgPlacementToolbar.vue | 4 -
web/src/pages/Edit/components/NodeNote.vue | 6 +-
.../Edit/components/NodeNoteContentShow.vue | 7 +-
.../pages/Edit/components/NodeOuterFrame.vue | 2 +-
web/src/pages/Edit/components/NodeTag.vue | 27 +------
.../pages/Edit/components/NodeTagStyle.vue | 2 +-
web/src/pages/Edit/components/Outline.vue | 1 -
web/src/pages/Edit/components/OutlineEdit.vue | 1 -
.../pages/Edit/components/OutlineSidebar.vue | 3 +-
.../pages/Edit/components/RichTextToolbar.vue | 3 +-
web/src/pages/Edit/components/Scale.vue | 7 +-
web/src/pages/Edit/components/Search.vue | 1 -
web/src/pages/Edit/components/Setting.vue | 4 +-
web/src/pages/Edit/components/ShortcutKey.vue | 9 +--
web/src/pages/Edit/components/Sidebar.vue | 7 +-
.../pages/Edit/components/SidebarTrigger.vue | 7 +-
.../pages/Edit/components/SourceCodeEdit.vue | 2 -
web/src/pages/Edit/components/Structure.vue | 14 +---
web/src/pages/Edit/components/Style.vue | 77 ++++---------------
web/src/pages/Edit/components/Theme.vue | 9 +--
web/src/pages/Edit/components/Toolbar.vue | 21 ++---
web/src/utils/index.js | 19 +----
46 files changed, 97 insertions(+), 420 deletions(-)
diff --git a/simple-mind-map/example/exampleData.js b/simple-mind-map/example/exampleData.js
index 76d94ea1..bfa934b9 100644
--- a/simple-mind-map/example/exampleData.js
+++ b/simple-mind-map/example/exampleData.js
@@ -17,11 +17,7 @@ const createFullData = () => {
};
}
-/**
- * @Author: 王林
- * @Date: 2021-04-15 22:23:24
- * @Desc: 节点较多示例数据
- */
+// 节点较多示例数据
const data1 = {
"root": {
"data": {
diff --git a/web/src/App.vue b/web/src/App.vue
index 77019da9..1bf56daf 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -6,8 +6,7 @@
diff --git a/web/src/api/index.js b/web/src/api/index.js
index f783553b..f438aea7 100644
--- a/web/src/api/index.js
+++ b/web/src/api/index.js
@@ -9,11 +9,7 @@ const SIMPLE_MIND_MAP_LOCAL_CONFIG = 'SIMPLE_MIND_MAP_LOCAL_CONFIG'
let mindMapData = null
-/**
- * @Author: 王林
- * @Date: 2021-08-01 10:10:49
- * @Desc: 获取缓存的思维导图数据
- */
+// 获取缓存的思维导图数据
export const getData = () => {
if (window.takeOverApp) {
mindMapData = window.takeOverAppMethods.getMindMapData()
@@ -34,11 +30,7 @@ export const getData = () => {
}
}
-/**
- * @Author: 王林
- * @Date: 2021-08-01 10:14:28
- * @Desc: 存储思维导图数据
- */
+// 存储思维导图数据
export const storeData = data => {
try {
let originData = null
@@ -64,11 +56,7 @@ export const storeData = data => {
}
}
-/**
- * @Author: 王林
- * @Date: 2021-08-01 10:24:56
- * @Desc: 存储思维导图配置数据
- */
+// 存储思维导图配置数据
export const storeConfig = config => {
try {
let originData = null
@@ -97,12 +85,7 @@ export const storeConfig = config => {
}
}
-/**
- * javascript comment
- * @Author: 王林
- * @Date: 2022-11-05 14:36:50
- * @Desc: 存储语言
- */
+// 存储语言
export const storeLang = lang => {
if (window.takeOverApp) {
window.takeOverAppMethods.saveLanguage(lang)
@@ -111,12 +94,7 @@ export const storeLang = lang => {
localStorage.setItem(SIMPLE_MIND_MAP_LANG, lang)
}
-/**
- * javascript comment
- * @Author: 王林
- * @Date: 2022-11-05 14:37:36
- * @Desc: 获取存储的语言
- */
+// 获取存储的语言
export const getLang = () => {
if (window.takeOverApp) {
return window.takeOverAppMethods.getLanguage() || 'zh'
diff --git a/web/src/components/ImgUpload/index.vue b/web/src/components/ImgUpload/index.vue
index ea1a5122..dad7e718 100644
--- a/web/src/components/ImgUpload/index.vue
+++ b/web/src/components/ImgUpload/index.vue
@@ -30,7 +30,6 @@