Commit 370c8bbc authored by 孙灵跃 leon's avatar 孙灵跃 leon

Merge branch 'dev-sly' of ssh://gitlab.logwire.cn:13389/leon.sun/mindmap into dev-sly

parents 1814ef51 4d7b7dcf
......@@ -7,7 +7,9 @@
<link rel="icon" href="dist/logo.ico">
<title>思绪思维导图</title>
<script>
// 自定义静态资源的路径
window.externalPublicPath = '/mindmap/';
window.takeOverApp = true;
</script>
</head>
<body>
......@@ -47,32 +49,39 @@
const setTakeOverAppMethods = (data) => {
window.takeOverAppMethods = window.takeOverAppMethods || {}
window.takeOverAppMethods['getMindMapData'] = ()=>{
return data.mindMapData
return data.root ? data : data.mindMapData
}
if(!window.takeOverAppMethods['saveManualMindMapData']){
window.takeOverAppMethods['saveManualMindMapData'] = void 0
}
if(!window.takeOverAppMethods['manualCancel']){
window.takeOverAppMethods['manualCancel'] = ()=>void 0
}
window.takeOverAppMethods['saveMindMapData'] = ()=>{
}
window.takeOverAppMethods['saveMindMapData'] = ()=>{}
window.takeOverAppMethods['getLanguage'] = ()=>{
return data.lang || 'zh'
}
}
window.takeOverAppMethods['saveLanguage'] = ()=>{
window.onload = async () => {
console.log('takeOverApp')
window.takeOverApp = false;
const getJson = function (str) {
if (typeof str == 'string') {
try {
return JSON.parse(str);
} catch (e) {
return false;
}
window.takeOverAppMethods['getLocalConfig'] = ()=>{
return data.localConfig
}
window.takeOverAppMethods['saveLocalConfig'] = ()=>{
}
}
const key = '[[miniMap]]miniMapData';
const miniMapData = window.sessionStorage.getItem(key);
if(!getJson(miniMapData)) return;
const data = getJson(miniMapData) || await getDataFromBackend();
window.onload = async () => {
const key = "[mind]data";
const dataStr = window.sessionStorage.getItem(key);
const data = dataStr ? JSON.parse(dataStr) : await getDataFromBackend();
setTakeOverAppMethods(data)
window.initApp()
// 实例化页面
window.initApp();
}
</script> -->
</body>
......
......@@ -97,10 +97,9 @@ export const manualSaveConfig = config=>{
}
if(window.parent){
const data = JSON.stringify(config.data)
window.parent.postMessage('miniMap_save#*#' + data)
const str = JSON.stringify(config);
window.parent.postMessage('[mind]save#*#' + str)
}
} catch (error) {
console.log(error)
}
......@@ -113,7 +112,7 @@ export const manualCancel= ()=>{
}
if(window.parent){
window.parent.postMessage('miniMap_close')
window.parent.postMessage('[mind]close')
}
}
......
......@@ -2,6 +2,7 @@
<el-dialog
class="nodeExportDialog"
:title="$t('export.title')"
:append-to-body="true"
:visible.sync="dialogVisible"
width="700px"
v-loading.fullscreen.lock="loading"
......@@ -188,11 +189,10 @@ export default {
this.$bus.$emit('export', this.exportType, true, this.fileName)
}
this.$notify.info({
title: this.$t('export.notifyTitle'),
message: this.$t('export.notifyMessage')
})
// this.$notify.info({
// title: this.$t('export.notifyTitle'),
// message: this.$t('export.notifyMessage')
// })
this.cancel()
}
}
......
......@@ -2,6 +2,7 @@
<el-dialog
class="nodeImportDialog"
:title="$t('import.title')"
:append-to-body="true"
:visible.sync="dialogVisible"
width="300px"
>
......
......@@ -5,7 +5,7 @@
<div class="toolbarBlock">
<ToolbarNodeBtnList :list="horizontalList"></ToolbarNodeBtnList>
<!-- 更多 -->
<el-popover
<!-- <el-popover
v-model="popoverShow"
placement="bottom-end"
width="120"
......@@ -22,7 +22,7 @@
<span class="icon iconfont icongongshi"></span>
<span class="text">{{ $t('toolbar.more') }}</span>
</div>
</el-popover>
</el-popover> -->
</div>
<!-- 导出 -->
......@@ -54,8 +54,8 @@
<NodeIcon></NodeIcon>
<NodeNote></NodeNote>
<NodeTag></NodeTag>
<Export></Export>
<Import></Import>
<!-- <Export></Export>
<Import></Import> -->
</div>
</template>
......@@ -65,8 +65,8 @@ import NodeHyperlink from './NodeHyperlink'
import NodeIcon from './NodeIcon'
import NodeNote from './NodeNote'
import NodeTag from './NodeTag'
import Export from './Export'
import Import from './Import'
// import Export from './Export'
// import Import from './Import'
import { mapState } from 'vuex'
import { Notification } from 'element-ui'
import exampleData from 'simple-mind-map/example/exampleData'
......@@ -88,8 +88,8 @@ export default {
NodeIcon,
NodeNote,
NodeTag,
Export,
Import,
// Export,
// Import,
ToolbarNodeBtnList
},
data() {
......
......@@ -157,6 +157,14 @@
<span class="text">{{ $t('toolbar.formula') }}</span>
</div>
</div>
<div class="toolbarBtn" @click="$bus.$emit('showImport')">
<span class="icon iconfont icondaoru"></span>
<span class="text">{{ $t('toolbar.import') }}</span>
</div>
<div class="toolbarBtn" @click="$bus.$emit('showExport')">
<span class="icon iconfont iconexport"></span>
<span class="text">{{ $t('toolbar.export') }}</span>
</div>
<div class="toolbarBtn" @click="$bus.$emit('SAVE')">
<span class="icon mindIconfont mind-iconbaocun"></span>
......@@ -166,12 +174,15 @@
<span class="icon mindIconfont mind-iconguanbi1"></span>
<span class="text">{{ $t('toolbar.close') }}</span>
</div>
<Export></Export>
<Import></Import>
</div>
</template>
<script>
import { mapState, mapMutations } from 'vuex'
import Export from './Export'
import Import from './Import'
export default {
props: {
dir: {
......@@ -185,6 +196,10 @@ export default {
}
}
},
components:{
Export,
Import
},
data() {
return {
activeNodes: [],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment