diff --git a/web/src/assets/icon-font/iconfont.css b/web/src/assets/icon-font/iconfont.css index dadf7589..ff910e7e 100644 --- a/web/src/assets/icon-font/iconfont.css +++ b/web/src/assets/icon-font/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 2479351 */ - src: url('iconfont.woff2?t=1719815803051') format('woff2'), - url('iconfont.woff?t=1719815803051') format('woff'), - url('iconfont.ttf?t=1719815803051') format('truetype'); + src: url('iconfont.woff2?t=1726022313538') format('woff2'), + url('iconfont.woff?t=1726022313538') format('woff'), + url('iconfont.ttf?t=1726022313538') format('truetype'); } .iconfont { @@ -13,6 +13,14 @@ -moz-osx-font-smoothing: grayscale; } +.iconfile-excel:before { + content: "\e7b7"; +} + +.iconfreemind:before { + content: "\e97d"; +} + .iconwaikuang:before { content: "\e640"; } diff --git a/web/src/assets/icon-font/iconfont.ttf b/web/src/assets/icon-font/iconfont.ttf index 9b4dcc24..be64d2e5 100644 Binary files a/web/src/assets/icon-font/iconfont.ttf and b/web/src/assets/icon-font/iconfont.ttf differ diff --git a/web/src/assets/icon-font/iconfont.woff b/web/src/assets/icon-font/iconfont.woff index ae10beee..c7c1342e 100644 Binary files a/web/src/assets/icon-font/iconfont.woff and b/web/src/assets/icon-font/iconfont.woff differ diff --git a/web/src/assets/icon-font/iconfont.woff2 b/web/src/assets/icon-font/iconfont.woff2 index a21e2a92..d711ab4d 100644 Binary files a/web/src/assets/icon-font/iconfont.woff2 and b/web/src/assets/icon-font/iconfont.woff2 differ diff --git a/web/src/config/en.js b/web/src/config/en.js index a98fdd32..d3e12f6b 100644 --- a/web/src/config/en.js +++ b/web/src/config/en.js @@ -499,8 +499,14 @@ export const downTypeList = [ { name: 'FreeMind', type: 'mm', - icon: 'iconTXT', + icon: 'iconfreemind', desc: 'FreeMind software format' + }, + { + name: 'Excel', + type: 'xlsx', + icon: 'iconfile-excel', + desc: 'Excel software format' } ] diff --git a/web/src/config/zh.js b/web/src/config/zh.js index bf91eda4..3f6bcfaa 100644 --- a/web/src/config/zh.js +++ b/web/src/config/zh.js @@ -593,8 +593,14 @@ export const downTypeList = [ { name: 'FreeMind', type: 'mm', - icon: 'iconTXT', + icon: 'iconfreemind', desc: 'FreeMind软件格式' + }, + { + name: 'Excel', + type: 'xlsx', + icon: 'iconfile-excel', + desc: 'Excel软件格式' } ] diff --git a/web/src/lang/en_us.js b/web/src/lang/en_us.js index 49083e99..930081a4 100644 --- a/web/src/lang/en_us.js +++ b/web/src/lang/en_us.js @@ -157,8 +157,9 @@ export default { import: { title: 'Import', selectFile: 'Select file', - supportFile: 'Support .smm、.json、.xmind、.xlsx、.md、 .mm file', - enableFileTip: 'Please select .smm、.json、.xmind、.xlsx、.md、 .mm file', + support: 'Support', + file: 'file', + pleaseSelect: 'Please select', maxFileNum: 'At most one file can be selected', notSelectTip: 'Please select the file to import', fileContentError: 'The file content is incorrect', diff --git a/web/src/lang/zh_cn.js b/web/src/lang/zh_cn.js index 858a24fa..dda55c7d 100644 --- a/web/src/lang/zh_cn.js +++ b/web/src/lang/zh_cn.js @@ -155,8 +155,9 @@ export default { import: { title: '导入', selectFile: '选取文件', - supportFile: '支持.smm、.json、.xmind、.xlsx、.md、 .mm文件', - enableFileTip: '请选择.smm、.json、.xmind、.xlsx、.md、 .mm文件', + support: '支持', + file: '文件', + pleaseSelect: '请选择', maxFileNum: '最多只能选择一个文件', notSelectTip: '请选择要导入的文件', fileContentError: '文件内容有误', diff --git a/web/src/pages/Edit/components/Edit.vue b/web/src/pages/Edit/components/Edit.vue index 3f754ca7..3f2f2244 100644 --- a/web/src/pages/Edit/components/Edit.vue +++ b/web/src/pages/Edit/components/Edit.vue @@ -80,7 +80,10 @@ import OuterFrame from 'simple-mind-map/src/plugins/OuterFrame.js' // 编号插件,该插件为付费插件,详情请查看开发文档 // import Numbers from 'simple-mind-map-plugin-numbers' // Freemind软件格式导入导出插件,该插件为付费插件,详情请查看开发文档 -import Freemind from 'simple-mind-map-plugin-freemind' +// import Freemind from 'simple-mind-map-plugin-freemind' +// Excel软件格式导入导出插件,该插件为付费插件,详情请查看开发文档 +// import Excel from 'simple-mind-map-plugin-excel' +// npm link simple-mind-map-plugin-excel simple-mind-map-plugin-freemind simple-mind-map-plugin-numbers simple-mind-map-plugin-notation simple-mind-map-plugin-handdrawnlikestyle simple-mind-map import OutlineSidebar from './OutlineSidebar' import Style from './Style' import BaseStyle from './BaseStyle' @@ -137,7 +140,6 @@ MindMap.usePlugin(MiniMap) .usePlugin(RainbowLines) .usePlugin(Demonstrate) .usePlugin(OuterFrame) - .usePlugin(Freemind) // .usePlugin(Cooperate) // 协同插件 // 注册自定义主题 @@ -566,6 +568,16 @@ export default { this.mindMap.addPlugin(Numbers) this.$store.commit('setSupportNumbers', true) } + if (typeof Freemind !== 'undefined') { + this.mindMap.addPlugin(Freemind) + this.$store.commit('setSupportFreemind', true) + Vue.prototype.Freemind = Freemind + } + if (typeof Excel !== 'undefined') { + this.mindMap.addPlugin(Excel) + this.$store.commit('setSupportExcel', true) + Vue.prototype.Excel = Excel + } this.mindMap.keyCommand.addShortcut('Control+s', () => { this.manualSave() }) diff --git a/web/src/pages/Edit/components/Export.vue b/web/src/pages/Edit/components/Export.vue index db769a7c..f7994256 100644 --- a/web/src/pages/Edit/components/Export.vue +++ b/web/src/pages/Edit/components/Export.vue @@ -126,11 +126,23 @@ export default { computed: { ...mapState({ openNodeRichText: state => state.localConfig.openNodeRichText, - isDark: state => state.localConfig.isDark + isDark: state => state.localConfig.isDark, + supportFreemind: state => state.supportFreemind, + supportExcel: state => state.supportExcel }), downTypeList() { - return downTypeList[this.$i18n.locale] || downTypeList.zh + const list = downTypeList[this.$i18n.locale] || downTypeList.zh + return list.filter(item => { + if (item.type === 'mm') { + return this.supportFreemind + } + if (item.type === 'xlsx') { + return this.supportExcel + } else { + return true + } + }) } }, created() { diff --git a/web/src/pages/Edit/components/Import.vue b/web/src/pages/Edit/components/Import.vue index fc8dc05e..de5dfe19 100644 --- a/web/src/pages/Edit/components/Import.vue +++ b/web/src/pages/Edit/components/Import.vue @@ -9,7 +9,7 @@ - {{ $t('import.supportFile') }} + {{ $t('import.support') }}{{ supportFileStr }}{{ $t('import.file') }} @@ -59,10 +59,8 @@