修复初始化显示文档菜单显示高亮问题，修复重复点击报错问题

zyplayer-doc-ui/wiki-ui/src/components/layouts/GlobalLayout.vue

@@ -4,24 +4,26 @@
 			<el-aside v-show="leftCollapse" :style="{ width: rightAsideWidth + 'px' }">
 				<div style="padding: 10px;height: 100%;box-sizing: border-box;background: #fafafa;">
 					<div style="margin-bottom: 10px;">
-                        <el-select :value="choiceSpace" @change="spaceChangeEvents" filterable placeholder="选择空间" style="width: 100%;">
+						<el-select :value="choiceSpace" filterable placeholder="选择空间" style="width: 100%;"
+								   @change="spaceChangeEvents">
 							<el-option-group label="">
 								<el-option key="0" label="创建空间" value="0"></el-option>
 								<el-option key="-1" label="空间管理" value="-1"></el-option>
 							</el-option-group>
 							<el-option-group label="">
-                                <el-option v-for="item in spaceOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+								<el-option v-for="item in spaceOptions" :key="item.value" :label="item.label"
+										   :value="item.value"></el-option>
 							</el-option-group>
 						</el-select>
 					</div>
 					<div align="center">
-                        <el-button v-on:click="createWiki" icon="el-icon-plus" style="width: 100%;">创建文档</el-button>
+						<el-button icon="el-icon-plus" style="width: 100%;" v-on:click="createWiki">创建文档</el-button>
 					</div>
 					<el-autocomplete
-			                style="width: 100%;margin: 10px 0;" popper-class="search-autocomplete"
+							v-model="searchKeywords" :fetch-suggestions="doSearchByKeywords"
-			                v-model="searchKeywords"
-			                :fetch-suggestions="doSearchByKeywords"
 							placeholder="在当前空间搜索"
+							popper-class="search-autocomplete"
+							style="width: 100%;margin: 10px 0;"
 							@select="handleSearchKeywordsSelect"
 					>
 						<template slot-scope="{ item }">
@@ -34,56 +36,71 @@
 						</template>
 					</el-autocomplete>
 					<div style="overflow: auto; padding-bottom: 30px;">
-						<el-tree :props="defaultProps" :data="wikiPageList" @node-click="handleNodeClick"
+						<el-tree ref="wikiPageTree"
-								 @node-expand="handleNodeExpand" draggable @node-drop="handlePageDrop"
+								 :current-node-key="nowPageId"
-								 ref="wikiPageTree" :filter-node-method="filterPageNode" highlight-current
+								 :data="wikiPageList"
-								 :expand-on-click-node="false" :default-expanded-keys="wikiPageExpandedKeys"
+								 :default-expanded-keys="wikiPageExpandedKeys"
+								 :expand-on-click-node="false"
+								 :filter-node-method="filterPageNode"
+								 :props="defaultProps"
+								 draggable
+								 highlight-current
 								 node-key="id"
-								 style="background-color: #fafafa;">
+								 style="background-color: #fafafa;"
+								 @node-click="handleNodeClick"
+								 @node-expand="handleNodeExpand"
+								 @node-drop="handlePageDrop">
 						</el-tree>
 					</div>
 				</div>
 			</el-aside>
-			<RightResize v-model="rightAsideWidth" @change="rightAsideWidthChange" v-show="leftCollapse"></RightResize>
+			<RightResize v-show="leftCollapse" v-model="rightAsideWidth" @change="rightAsideWidthChange"></RightResize>
 			<el-container>
 				<el-header>
-                    <i class="el-icon-fold el-icon-s-fold" v-if="leftCollapse" @click="turnLeftCollapse"></i>
+					<i v-if="leftCollapse" class="el-icon-fold el-icon-s-fold" @click="turnLeftCollapse"></i>
-                    <i class="el-icon-fold el-icon-s-unfold" v-else @click="turnLeftCollapse"></i>
+					<i v-else class="el-icon-fold el-icon-s-unfold" @click="turnLeftCollapse"></i>
-					<span class="header-right-user-name">{{userSelfInfo.userName}}</span>
+					<span class="header-right-user-name">{{ userSelfInfo.userName }}</span>
-					<el-popover placement="bottom" width="600" trigger="click" v-model="userMessagePopVisible">
+					<el-popover v-model="userMessagePopVisible" placement="bottom" trigger="click" width="600">
-						<el-badge :is-dot="haveNotReadUserMessage" slot="reference" style="line-height: 20px;margin: 0 15px;">
+						<el-badge slot="reference" :is-dot="haveNotReadUserMessage"
-							<i class="el-icon-bell head-icon" @click="loadUserMessageIfPopVisible" style="margin-right: 0;"></i>
+								  style="line-height: 20px;margin: 0 15px;">
+							<i class="el-icon-bell head-icon" style="margin-right: 0;"
+							   @click="loadUserMessageIfPopVisible"></i>
 						</el-badge>
 						<div style="margin-bottom: 10px;">
 							<span style="font-size: 14px;font-weight: bold;">通知</span>
-							<el-link v-if="haveNotReadUserMessage" type="primary" icon="el-icon-check" style="float: right;" v-on:click="readAllUserMessage">本页标记已读</el-link>
+							<el-link v-if="haveNotReadUserMessage" icon="el-icon-check" style="float: right;"
+									 type="primary" v-on:click="readAllUserMessage">本页标记已读
+							</el-link>
 						</div>
 						<div class="header-user-message">
-							<el-table :data="userMessageList" border style="width: 100%; margin-bottom: 5px;" max-height="500" size="mini">
+							<el-table :data="userMessageList" border max-height="500"
-								<el-table-column prop="operatorUserName" label="操作人" width="100px"></el-table-column>
+									  size="mini" style="width: 100%; margin-bottom: 5px;">
-								<el-table-column prop="creationTime" label="操作时间" width="140px"></el-table-column>
+								<el-table-column label="操作人" prop="operatorUserName" width="100px"></el-table-column>
+								<el-table-column label="操作时间" prop="creationTime" width="140px"></el-table-column>
 								<el-table-column label="内容">
 									<template slot-scope="scope">
-										{{scope.row.msgContent}}
+										{{ scope.row.msgContent }}
-										<el-badge :is-dot="scope.row.msgStatus==0" slot="reference" style="line-height: 10px;padding-right: 5px;">
+										<el-badge slot="reference" :is-dot="scope.row.msgStatus==0"
-											<el-link type="primary" v-on:click="showUserMessage(scope.row)">查看></el-link>
+												  style="line-height: 10px;padding-right: 5px;">
+											<el-link type="primary" v-on:click="showUserMessage(scope.row)">查看>
+											</el-link>
 										</el-badge>
 									</template>
 								</el-table-column>
 							</el-table>
 							<div class="page-info-box">
 								<el-pagination
-									@current-change="handleCurrentChange"
-									:page-size="userMsgParam.pageSize"
 										:current-page="userMsgParam.pageNum"
-									layout="prev, pager, next, total"
+										:page-size="userMsgParam.pageSize"
 										:total="userMsgTotalCount"
+										layout="prev, pager, next, total"
+										@current-change="handleCurrentChange"
 								>
 								</el-pagination>
 							</div>
 						</div>
 					</el-popover>
-                    <el-dropdown @command="userSettingDropdown" trigger="click">
+					<el-dropdown trigger="click" @command="userSettingDropdown">
 						<i class="el-icon-setting head-icon"></i>
 						<el-dropdown-menu slot="dropdown">
 							<el-dropdown-item command="console">控制台</el-dropdown-item>
@@ -93,12 +110,12 @@
 					</el-dropdown>
 				</el-header>
 				<el-main style="padding: 0;border-left: 1px solid #dcdfe6;">
-					<router-view @loadPageList="loadPageList"
+					<router-view :spaceId="choiceSpace"
+								 :spaceInfo="getSpaceInfo(choiceSpace)"
 								 @changeExpandedKeys="changeWikiPageExpandedKeys"
-								 @switchSpace="switchSpacePage"
+								 @loadPageList="loadPageList"
 								 @loadSpace="loadSpaceList"
-								 :spaceId="choiceSpace"
+								 @switchSpace="switchSpacePage">
-								 :spaceInfo="getSpaceInfo(choiceSpace)">
 					</router-view>
 				</el-main>
 			</el-container>
@@ -127,7 +144,7 @@ export default {
 			},
 			// 空间搜索相关
 			spaceOptions: [],
-                spaceList:[],
+			spaceList: [],
 			choiceSpace: "",
 			nowSpaceShow: {},
 			nowPageId: '',
@@ -136,7 +153,7 @@ export default {
 			// 搜索的输入内容
 			searchKeywords: "",
 			// 页面展示相关
-                wikiPageList:[],
+			wikiPageList: [],
 			wikiPage: {},
 			wikiPageExpandedKeys: [],
 			userSelfInfo: {},
@@ -157,8 +174,8 @@ export default {
 		"create-space": CreateSpace,
 		'about-dialog': aboutDialog
 	},
-        computed: {
+	computed: {},
-        },
+
 	mounted: function () {
 		this.loadSpaceList();
 		this.loadUserMessageList();
@@ -212,13 +229,13 @@ export default {
 			window.open(routeUrl.href, '_blank');
 		},
 		handleNodeClick(data) {
-                console.log("点击节点：", data);
+			console.log("点击节点：", data, this.nowPageId);
 			this.nowPageId = data.id;
 			this.$router.push({path: '/page/show', query: {pageId: data.id}});
 			this.handleNodeExpand(data);
 		},
 		handleNodeExpand(node) {
-                if (node.children.length > 0 && node.children[0].needLoad) {
+			if (node.children && node.children.length > 0 && node.children[0].needLoad) {
 				console.log("加载节点：", node);
 				this.doGetPageList(node.id, node);
 			}
@@ -335,6 +352,14 @@ export default {
 			let param = {spaceId: this.choiceSpace};
 			pageApi.pageList(param).then(json => {
 				this.wikiPageList = json.data || [];
+				// 设置默认选中效果
+				this.$nextTick(() => {
+					this.nowPageId = this.$route.query.pageId
+					if (this.nowPageId) {
+						console.log("moern?")
+						this.$refs['wikiPageTree'].setCurrentKey(this.nowPageId)
+					}
+				})
 			});
 		},
 		userSettingDropdown(command) {
@@ -357,7 +382,7 @@ export default {
 			});
 		},
 		getSelfUserInfo() {
-				userApi.getSelfUserInfo().then(json=>{
+			userApi.getSelfUserInfo().then(json => {
 				this.userSelfInfo = json.data;
 			});
 		},
@@ -381,48 +406,93 @@ export default {
 			this.$store.commit('global/setRightAsideWidth', width);
 		},
 	}
-    }
+}
 </script>
 
 <style>
-    html, body {
+html, body {
 	margin: 0;
 	padding: 0;
 	height: 100%;
-    }
+}
-	.global-layout-vue{height: 100%;}
 
-    #app, .el-container, .el-menu {
+.global-layout-vue {
 	height: 100%;
-    }
+}
-	.el-header {
+
+#app, .el-container, .el-menu {
+	height: 100%;
+}
+
+.el-header {
 	background-color: #1D4E89 !important;
-	}
+}
-	.header-right-user-name{color: #fff;padding-right: 5px;}
+
-    .el-header {color: #333; line-height: 40px; text-align: right;height: 40px !important;}
+.header-right-user-name {
-    .el-icon-fold{float: left;font-size: 25px;color: #aaa;margin-top: 8px;cursor: pointer;}
+	color: #fff;
-    .el-icon-fold:hover{color: #eee;}
+	padding-right: 5px;
-	.head-icon{margin-right: 15px; font-size: 16px;cursor: pointer;color: #fff;}
+}
-	.header-user-message .page-info-box{text-align: right;margin-top: 10px;}
+
-	.upgrade-info{max-height: 150px;overflow-y: auto;word-break: break-all; white-space: pre-wrap; line-height: 26px;}
+.el-header {
-	.search-option-item {
+	color: #333;
+	line-height: 40px;
+	text-align: right;
+	height: 40px !important;
+}
+
+.el-icon-fold {
+	float: left;
+	font-size: 25px;
+	color: #aaa;
+	margin-top: 8px;
+	cursor: pointer;
+}
+
+.el-icon-fold:hover {
+	color: #eee;
+}
+
+.head-icon {
+	margin-right: 15px;
+	font-size: 16px;
+	cursor: pointer;
+	color: #fff;
+}
+
+.header-user-message .page-info-box {
+	text-align: right;
+	margin-top: 10px;
+}
+
+.upgrade-info {
+	max-height: 150px;
+	overflow-y: auto;
+	word-break: break-all;
+	white-space: pre-wrap;
+	line-height: 26px;
+}
+
+.search-option-item {
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
-	}
+}
-	.search-option-item .title {
+
+.search-option-item .title {
 	font-weight: bold;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
-	}
+}
-	.search-option-item .content {
+
+.search-option-item .content {
 	font-size: 12px;
 	color: #888;
-	}
+}
-	.search-autocomplete {
+
+.search-autocomplete {
 	width: 600px !important;
-	}
+}
 </style>
 
 

zyplayer-doc-ui/wiki-ui/src/main.js

@@ -8,6 +8,9 @@ import routes from './routes'
 import store from './store/index'
 import axios from 'axios'
 import VueAxios from 'vue-axios'
+// 注册一个全局自定义指令
+import hljs from 'highlight.js'
+import 'highlight.js/styles/googlecode.css'
 
 Vue.use(ElementUI);
 Vue.use(VueRouter);
@@ -15,6 +18,11 @@ Vue.use(VueAxios, axios);
 
 // 公用方法
 Vue.prototype.$store = store;
+// 路由重复点击报错处理
+const originalPush = VueRouter.prototype.push
+VueRouter.prototype.push = function push(location) {
+	return originalPush.call(this, location).catch(err => err)
+}
 
 const router = new VueRouter({routes});
 // 路由跳转时判断处理
@@ -25,6 +33,8 @@ router.beforeEach((to, from, next) => {
 	next();
 });
 
+
+
 let vue = new Vue({
 	el: '#app',
 	router,
@@ -33,10 +43,6 @@ let vue = new Vue({
 	}
 });
 
-// 注册一个全局自定义指令
-import hljs from 'highlight.js'
-import 'highlight.js/styles/googlecode.css'
-
 Vue.directive('highlight', function (el) {
 	let blocks = el.querySelectorAll('pre code');
 	blocks.forEach((block) => {