diff --git a/zyplayer-doc-ui/wiki-ui/src/components/layouts/GlobalLayout.vue b/zyplayer-doc-ui/wiki-ui/src/components/layouts/GlobalLayout.vue
deleted file mode 100644
index e7d8f3ea..00000000
--- a/zyplayer-doc-ui/wiki-ui/src/components/layouts/GlobalLayout.vue
+++ /dev/null
@@ -1,186 +0,0 @@
-<template>
-	<div class="global-layout-vue">
-		<el-container>
-			<el-aside v-show="storeDisplay.showMenu" :style="{ width: storeDisplay.rightAsideWidth + 'px' }">
-				<LeftSideBar ref="leftSideBarRef"/>
-			</el-aside>
-			<RightResize v-show="storeDisplay.showMenu" v-model:value="storeDisplay.rightAsideWidth" @change="rightAsideWidthChange"></RightResize>
-			<el-container>
-				<el-header v-if="storeDisplay.showHeader">
-					<RightHeader ref="rightHeaderRef"/>
-				</el-header>
-				<el-main style="padding: 0;">
-					<router-view/>
-				</el-main>
-			</el-container>
-		</el-container>
-	</div>
-</template>
-
-<script setup>
-	import {useStoreDisplay} from '@/store/wikiDisplay.js'
-	import LeftSideBar from './LeftSidebar.vue'
-	import RightHeader from './RightHeader.vue'
-	import RightResize from './RightResize.vue'
-	let storeDisplay = useStoreDisplay();
-	const rightAsideWidthChange = (width) =>{
-		storeDisplay.rightAsideWidth = width
-		storeDisplay.commentShow =width
-	}
-
-</script>
-
-<style>
-	html,
-	body {
-		margin: 0;
-		padding: 0;
-		height: 100%;
-	}
-
-	.global-layout-vue {
-		height: 100%;
-	}
-
-	.hidTree {
-		display: none;
-	}
-
-	#app,
-	.el-container,
-	.el-menu {
-		height: 100%;
-	}
-
-	.el-header {
-		background-color: #fff !important;
-	}
-
-	.header-right-user-name {
-		color: #000000;
-		vertical-align: middle;
-	}
-
-	.el-header {
-		color: #333;
-		height: 60px !important;
-		border-bottom: 0.5px solid #eaeaea;
-	}
-
-	.head-icon {
-		margin-right: 15px;
-		margin-top: 15px;
-		font-size: 16px;
-		cursor: pointer;
-		color: #000000;
-		vertical-align: middle;
-	}
-
-	.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 {
-		font-weight: bold;
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-
-	.search-option-item .content {
-		font-size: 12px;
-		color: #888;
-	}
-
-	.search-autocomplete {
-		width: 600px !important;
-	}
-</style>
-
-<style lang="scss">
-.space-folder-box {
-  margin-left: 10px;
-  margin-bottom: 10px;
-  position: relative;
-}
-
-.wiki-page-tree-box {
-  overflow-y: auto;
-  overflow-x: hidden;
-  padding-bottom: 30px;
-
-  .el-tree-node__content {
-	height: 35px;
-	position: relative;
-
-	.page-tree-node {
-	  width: 100%;
-
-	  .label {
-		.el-icon {
-		  vertical-align: middle;
-		}
-
-		.text {
-		  margin-left: 5px;
-		  vertical-align: middle;
-
-		  max-width: calc(100% - 40px);
-		  display: inline-block;
-		  overflow: hidden;
-		  text-overflow: ellipsis;
-		  white-space: nowrap;
-		}
-	  }
-
-	  .rename-input {
-		width: 90%;
-	  }
-
-	  .page-action-box {
-		position: absolute;
-		right: 0;
-		top: 0;
-		height: 35px;
-		line-height: 35px;
-		background: #fff;
-		border-radius: 4px;
-		display: none;
-
-		.page-action-dropdown-btn {
-		  padding: 0 8px;
-		  height: 35px;
-		  margin-top: -1px;
-		}
-
-		.el-button + .el-button {
-		  margin-left: 0;
-		}
-	  }
-
-	  .page-action-box.renaming {
-		display: none !important;
-	  }
-	}
-
-	&:hover .page-action-box {
-	  display: block;
-	}
-  }
-}
-</style>
diff --git a/zyplayer-doc-ui/wiki-ui/src/components/layouts/LeftSidebar.vue b/zyplayer-doc-ui/wiki-ui/src/components/layouts/LeftSidebar.vue
index fdb1ba65..1afdc9b9 100644
--- a/zyplayer-doc-ui/wiki-ui/src/components/layouts/LeftSidebar.vue
+++ b/zyplayer-doc-ui/wiki-ui/src/components/layouts/LeftSidebar.vue
@@ -166,7 +166,6 @@ const openTemplateCreate = (exsit) => {
 
 const createWikiByTemplate = () => {
 	templateManageRef.value.showTemplateManage()
-
 }
 
 const filterShareStatus = (data) => {
diff --git a/zyplayer-doc-ui/wiki-ui/src/components/layouts/ShareLayout.vue b/zyplayer-doc-ui/wiki-ui/src/components/layouts/ShareLayout.vue
index ebd2ec9f..cac152fa 100644
--- a/zyplayer-doc-ui/wiki-ui/src/components/layouts/ShareLayout.vue
+++ b/zyplayer-doc-ui/wiki-ui/src/components/layouts/ShareLayout.vue
@@ -61,7 +61,7 @@ import {ElMessageBox, ElMessage} from 'element-plus'
 import {FolderClose, FolderOpen, Word as IconParkWord,} from '@icon-park/vue-next'
 import {Search as ElIconSearch,} from '@element-plus/icons-vue'
 import pageApi from '../../assets/api/page'
-import RightResize from './RightResize.vue'
+import RightResize from '../../views/page/aside/RightResize.vue'
 import IconDocument from "@/components/base/IconDocument.vue";
 
 let leftCollapse = ref(true);
diff --git a/zyplayer-doc-ui/wiki-ui/src/routes.js b/zyplayer-doc-ui/wiki-ui/src/routes.js
index 988d76b1..615f6789 100644
--- a/zyplayer-doc-ui/wiki-ui/src/routes.js
+++ b/zyplayer-doc-ui/wiki-ui/src/routes.js
@@ -1,4 +1,4 @@
-import GlobalLayout from './components/layouts/GlobalLayout.vue'
+import PageLayout from './views/page/PageLayout.vue'
 import ShareLayout from './components/layouts/ShareLayout.vue'
 import ShareMobileLayout from './components/layouts/ShareMobileLayout.vue'
 
@@ -23,7 +23,7 @@ let routes = [
 	{
 		path: '/',
 		name: '文档管理',
-		component: GlobalLayout,
+		component: PageLayout,
 		children: [
 			{path: '/home', name: 'WIKI文档管理', component: Home},
 			{path: '/user/myInfo', name: 'WIKI-我的信息', component: MyInfo},
diff --git a/zyplayer-doc-ui/wiki-ui/src/store/pageData.js b/zyplayer-doc-ui/wiki-ui/src/store/pageData.js
index fa4c4e92..e15c0df0 100644
--- a/zyplayer-doc-ui/wiki-ui/src/store/pageData.js
+++ b/zyplayer-doc-ui/wiki-ui/src/store/pageData.js
@@ -10,6 +10,9 @@ export const useStorePageData = defineStore('pageData', {
 			optionPageId: 0,
 			wikiPageList: [],
 			pageIsUnLock: false,
+			//---------------事件触发---------------
+			// 页面列表改变事件
+			eventPageListUpdate: false,
 		}
 	},
 });
diff --git a/zyplayer-doc-ui/wiki-ui/src/views/page/PageLayout.vue b/zyplayer-doc-ui/wiki-ui/src/views/page/PageLayout.vue
new file mode 100644
index 00000000..9b78ad62
--- /dev/null
+++ b/zyplayer-doc-ui/wiki-ui/src/views/page/PageLayout.vue
@@ -0,0 +1,188 @@
+<template>
+	<div class="global-layout-vue">
+		<el-container>
+			<el-aside v-show="storeDisplay.showMenu" :style="leftAsideStyle">
+				<LeftAside/>
+			</el-aside>
+			<RightResize v-show="storeDisplay.showMenu" v-model:value="storeDisplay.rightAsideWidth" @change="rightAsideWidthChange"></RightResize>
+			<el-container>
+				<el-header v-if="storeDisplay.showHeader">
+					<RightHeader ref="rightHeaderRef"/>
+				</el-header>
+				<el-main style="padding: 0;">
+					<router-view/>
+				</el-main>
+			</el-container>
+		</el-container>
+	</div>
+</template>
+
+<script setup>
+import {toRefs, ref, reactive, onMounted, onBeforeUnmount, defineProps, watch, defineEmits, computed, defineExpose} from 'vue';
+import {useStoreDisplay} from '@/store/wikiDisplay.js'
+import LeftAside from './aside/LeftAside.vue'
+import RightHeader from './aside/RightHeader.vue'
+import RightResize from './aside/RightResize.vue'
+
+let storeDisplay = useStoreDisplay();
+const rightAsideWidthChange = (width) => {
+	storeDisplay.rightAsideWidth = width;
+	storeDisplay.commentShow = width;
+}
+let leftAsideStyle = computed(() => {
+	return {width: storeDisplay.rightAsideWidth + 'px'};
+});
+</script>
+
+<style>
+html,
+body {
+	margin: 0;
+	padding: 0;
+	height: 100%;
+}
+
+.global-layout-vue {
+	height: 100%;
+}
+
+.hidTree {
+	display: none;
+}
+
+#app, .el-container, .el-menu {
+	height: 100%;
+}
+
+.el-header {
+	background-color: #fff !important;
+}
+
+.header-right-user-name {
+	color: #000000;
+	vertical-align: middle;
+}
+
+.el-header {
+	color: #333;
+	height: 60px !important;
+	border-bottom: 0.5px solid #eaeaea;
+}
+
+.head-icon {
+	margin-right: 15px;
+	margin-top: 15px;
+	font-size: 16px;
+	cursor: pointer;
+	color: #000000;
+	vertical-align: middle;
+}
+
+.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 {
+	font-weight: bold;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.search-option-item .content {
+	font-size: 12px;
+	color: #888;
+}
+
+.search-autocomplete {
+	width: 600px !important;
+}
+</style>
+
+<style lang="scss">
+.space-folder-box {
+	margin-left: 10px;
+	margin-bottom: 10px;
+	position: relative;
+}
+
+.wiki-page-tree-box {
+	overflow-y: auto;
+	overflow-x: hidden;
+	padding-bottom: 30px;
+
+	.el-tree-node__content {
+		height: 35px;
+		position: relative;
+
+		.page-tree-node {
+			width: 100%;
+
+			.label {
+				.el-icon {
+					vertical-align: middle;
+				}
+
+				.text {
+					margin-left: 5px;
+					vertical-align: middle;
+
+					max-width: calc(100% - 40px);
+					display: inline-block;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+				}
+			}
+
+			.rename-input {
+				width: 90%;
+			}
+
+			.page-action-box {
+				position: absolute;
+				right: 0;
+				top: 0;
+				height: 35px;
+				line-height: 35px;
+				background: #fff;
+				border-radius: 4px;
+				display: none;
+
+				.page-action-dropdown-btn {
+					padding: 0 8px;
+					height: 35px;
+					margin-top: -1px;
+				}
+
+				.el-button + .el-button {
+					margin-left: 0;
+				}
+			}
+
+			.page-action-box.renaming {
+				display: none !important;
+			}
+		}
+
+		&:hover .page-action-box {
+			display: block;
+		}
+	}
+}
+</style>
diff --git a/zyplayer-doc-ui/wiki-ui/src/views/page/aside/AddMenu.vue b/zyplayer-doc-ui/wiki-ui/src/views/page/aside/AddMenu.vue
new file mode 100644
index 00000000..0ede1657
--- /dev/null
+++ b/zyplayer-doc-ui/wiki-ui/src/views/page/aside/AddMenu.vue
@@ -0,0 +1,135 @@
+<template>
+	<a-dropdown :trigger="['click']">
+		<el-button :icon="ElIconPlus" text class="add-menu-dropdown-btn"></el-button>
+		<template #overlay>
+			<a-menu>
+				<a-menu-item key="1" @click="createWiki(1)">
+					<IconParkWord fill="#498ba7"/> 创建富文本
+				</a-menu-item>
+				<a-menu-item key="2" @click="createWiki(2)">
+					<IconDocument fill="#558ff2"/> 创建Markdown
+				</a-menu-item>
+				<a-menu-item key="0" @click="createWiki(0)">
+					<FolderOpen fill="#ffd149"/> 创建文件夹
+				</a-menu-item>
+				<a-menu-item key="4" @click="createWikiByTemplate()">
+					<IconParkPageTemplate/> 从模板创建
+				</a-menu-item>
+				<a-menu-item key="3">
+					<el-tooltip content="支持MD，ZIP格式（图片和MD文件请放到同级目录并配置同级相对路径）" placement="right-start" :show-after="300">
+						<a-upload v-model:file-list="fileList" name="file" :multiple="false" :customRequest="doAUpload" class="import-upload">
+							<IconParkAfferent/> 导入
+						</a-upload>
+					</el-tooltip>
+				</a-menu-item>
+			</a-menu>
+		</template>
+	</a-dropdown>
+</template>
+
+<script setup>
+import {Plus as ElIconPlus,} from '@element-plus/icons-vue'
+import {
+	FolderOpen,
+	Word as IconParkWord,
+	Afferent as IconParkAfferent,
+	PageTemplate as IconParkPageTemplate,
+} from '@icon-park/vue-next'
+import {ref, defineProps, defineEmits} from 'vue';
+import {useRouter} from "vue-router";
+import {ElMessage} from 'element-plus'
+import pageApi from '@/assets/api/page'
+import axios from "axios";
+import IconDocument from '@/components/base/IconDocument.vue'
+import {useStorePageData} from "@/store/pageData";
+
+let router = useRouter();
+let storePage = useStorePageData();
+
+let uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + '/zyplayer-doc-wiki/page/file/import/upload');
+let fileList = ref([]);
+let emit = defineEmits(['createWikiByTemplate']);
+let props = defineProps({
+	choiceSpace: Number,
+	choosePageId: Number,
+	nowPageId: Number,
+	pageId: Number
+});
+const doAUpload = (data) => {
+	let formData = new FormData();
+	formData.append('files', data.file);
+	formData.append('pageId', props.choosePageId);
+	if (props.choosePageId === 0) {
+		formData.append('id', props.choiceSpace);
+	}
+	axios({
+		url: uploadFileUrl.value,
+		method: 'post',
+		data: formData,
+		headers: {'Content-Type': 'multipart/form-data'},
+		timeout: 10000,
+		withCredentials: true,
+	}).then((res) => {
+		fileList.value = [];
+		if (res.data.errCode === 200) {
+			ElMessage.success('导入成功');
+		}
+		if (res.data.errCode === 300) {
+			ElMessage.warning(res.data.errMsg);
+			ElMessage.warning('文件太多可能超时，如果是超时，请稍等后刷新查看列表~');
+		}
+		storePage.eventPageListUpdate = !storePage.eventPageListUpdate;
+	}).catch((e) => {
+		fileList.value = [];
+		ElMessage.error('导入失败：' + e.message);
+	});
+}
+const createWikiByTemplate = () => {
+	// TODO
+}
+const createWiki = (editorType) => {
+	if (props.choiceSpace > 0) {
+		let name = "新建文档";
+		if (editorType === 0) {
+			name = "新建文件夹";
+		}
+		pageApi.updatePage({
+			spaceId: props.choiceSpace,
+			parentId: props.pageId,
+			editorType: editorType,
+			name: name,
+			content: '',
+			preview: ''
+		}).then((json) => {
+			storePage.eventPageListUpdate = !storePage.eventPageListUpdate;
+			ElMessage.success('创建成功')
+			if (editorType !== 0) {
+				router.push({
+					path: '/page/edit',
+					query: {parentId: props.nowPageId.value, pageId: json.data.id}
+				})
+			}
+		})
+	} else {
+		ElMessage.warning('请先选择或创建空间')
+	}
+}
+</script>
+
+<style lang="scss">
+.add-menu-dropdown-btn {
+  padding: 0 8px;
+  height: 35px;
+  margin-top: -1px;
+}
+
+.import-upload {
+  .ant-upload-select {
+	display: block;
+
+	.ant-upload {
+	  display: block;
+	}
+  }
+}
+</style>
diff --git a/zyplayer-doc-ui/wiki-ui/src/views/page/aside/LeftAside.vue b/zyplayer-doc-ui/wiki-ui/src/views/page/aside/LeftAside.vue
new file mode 100644
index 00000000..0a9ce870
--- /dev/null
+++ b/zyplayer-doc-ui/wiki-ui/src/views/page/aside/LeftAside.vue
@@ -0,0 +1,324 @@
+<template>
+	<div style="padding: 10px;height: 100%;box-sizing: border-box;background: #fafafa;">
+		<div style="margin-bottom: 5px">
+			<el-select :model-value="storeSpace.chooseSpaceId" @change="spaceChangeEvents" filterable
+			           placeholder="选择空间" style="width: 100%">
+				<el-option-group label="" v-if="!props.readOnly">
+					<el-option :key="-1" label="空间管理" :value="-1"></el-option>
+				</el-option-group>
+				<el-option-group label=""></el-option-group>
+				<el-option v-for="item in storeSpace.spaceOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+			</el-select>
+		</div>
+		<el-autocomplete v-model="searchKeywords" v-if="!props.readOnly" :fetch-suggestions="doSearchByKeywords"
+		                 @select="handleSearchKeywordsSelect" popper-class="search-autocomplete"
+		                 placeholder="在当前空间搜索" style="width: 100%; margin: 10px 0">
+			<template v-slot="{ item }">
+				<div class="search-option-item">
+					<div class="title">
+						<span v-html="item.pageTitle || '-'"></span>
+					</div>
+					<span class="content" v-html="item.previewContent || '-'"></span>
+				</div>
+			</template>
+		</el-autocomplete>
+		<div class="space-folder-box" v-if="!props.readOnly">
+			<el-row justify="space-between">
+				<el-col :span="12">
+					<el-tooltip style="margin: 4px" effect="dark" :content="descriptorForTree" placement="top">
+						<span style="color:#888;font-size: 12px;cursor: pointer;line-height: 32px;" @click="changeDropWownStatus">空间目录</span>
+					</el-tooltip>
+				</el-col>
+				<el-col :span="12" style="text-align: right;">
+					<AddMenu/>
+				</el-col>
+			</el-row>
+		</div>
+		<div class="wiki-page-tree-box">
+			<el-tree ref="wikiPageTreeRef" :current-node-key="props.nowPageId" :data="storePage.wikiPageList"
+			         :default-expanded-keys="wikiPageExpandedKeys" :expand-on-click-node="true" :class="explanClass"
+			         :filter-node-method="filterPageNode" :props="defaultProps" :draggable="!props.readOnly"
+			         @node-click="handleNodeClick" @node-drop="handlePageDrop" node-key="id" highlight-current
+			         style="background-color: #fafafa">
+				<template v-slot="{ node, data }">
+					<div class="page-tree-node" @mouseover="changeNodeOptionStatus(data) ">
+						<div class="node-content">
+							<!--图标-->
+							<span class="left-icon">
+								<template v-if="data.editorType === 0">
+									<FolderOpen v-if="node.expanded" class="el-icon"/>
+									<FolderClose v-else class="el-icon"/>
+								</template>
+								<template v-else-if="data.editorType === 1"><IconParkWord class="el-icon"/></template>
+								<template v-else-if="data.editorType === 2"><IconDocument class="el-icon"/></template>
+							</span>
+							<!--标题-->
+							<el-tooltip v-if="data.shareStatus > 0" :content="data.tags" placement="top-start" :show-after="500">
+								<a-tag color="warning" style="margin-inline-end: 4px;padding-inline: 4px;"> {{data.shareStatus === 1 ? '公共模板' : '个人模板'}}</a-tag>
+							</el-tooltip>
+							<a-input v-if="data.renaming" v-model:value="data.name" @blur="doRename(node,data)" @click.stop
+							         class="rename-input" placeholder="请输入文档名称"/>
+							<span v-else style="vertical-align: middle;margin-right: 5px">
+								<el-tooltip :content="node.label" placement="top-start" :show-after="700">{{ node.label }}</el-tooltip>
+							</span>
+							<!--操作-->
+							<div class="page-action-box" :class="data.renaming?'renaming':''" @click.stop>
+								<AddMenu :choiceSpace="storeSpace.chooseSpaceId" :choosePageId="storePage.optionPageId"
+								         :nowPageId="storePage.choosePageId" :dataId="data.id"
+								         @createWikiByTemplate="createWikiByTemplate"
+								         @choosePageIdFunc="choosePageIdFunc"/>
+								<a-dropdown :trigger="['click']" @click="choosePageIdFunc(data.id)">
+									<el-button :icon="MoreFilled" text class="page-action-dropdown-btn"></el-button>
+									<template #overlay>
+										<a-menu>
+											<a-menu-item @click="rename(node,data)">
+												<IconParkEditTwo class="el-icon"/> 重命名
+											</a-menu-item>
+											<a-sub-menu title="移动文档">
+												<template #icon>
+													<IconParkIntersection/>
+												</template>
+												<a-menu-item @click="openMoveMenu(false)">
+													<IconParkCopy/> 复制文档
+												</a-menu-item>
+												<a-menu-item @click="openMoveMenu(true)">
+													<IconParkCuttingOne/> 迁移文档
+												</a-menu-item>
+											</a-sub-menu>
+											<a-menu-item v-if="data.editorType !== 0" @click="openTemplateCreate(data.shareStatus !== undefined)">
+												<IconParkPageTemplate/> 设为模板
+											</a-menu-item>
+											<a-menu-item @click="deleteWikiPage(data)">
+												<IconParkDelete class="el-icon"/> 删除
+											</a-menu-item>
+										</a-menu>
+									</template>
+								</a-dropdown>
+							</div>
+						</div>
+					</div>
+				</template>
+			</el-tree>
+		</div>
+	</div>
+</template>
+
+<script setup>
+import {
+	FolderClose,
+	FolderOpen,
+	Word as IconParkWord,
+	Copy as IconParkCopy,
+	CuttingOne as IconParkCuttingOne,
+	Intersection as IconParkIntersection,
+	Delete as IconParkDelete,
+	EditTwo as IconParkEditTwo,
+	PageTemplate as IconParkPageTemplate,
+} from '@icon-park/vue-next'
+import {MoreFilled} from '@element-plus/icons-vue'
+import {ref, defineProps, defineEmits, defineExpose, onMounted, watch} from 'vue';
+import {useRouter, useRoute} from "vue-router";
+import pageApi from '@/assets/api/page'
+import {useStoreDisplay} from "@/store/wikiDisplay";
+import {useStorePageData} from "@/store/pageData";
+import AddMenu from "./AddMenu.vue";
+import IconDocument from "@/components/base/IconDocument.vue";
+import {ElMessageBox, ElMessage} from 'element-plus'
+import {useStoreSpaceData} from "@/store/spaceData";
+
+let route = useRoute();
+let router = useRouter();
+let storePage = useStorePageData();
+let storeDisplay = useStoreDisplay();
+let storeSpace = useStoreSpaceData();
+
+let emit = defineEmits(['spaceChangeEvents', 'setNowPageId']);
+let searchKeywords = ref('');
+let descriptorForTree = ref("点击收起目录");
+let explan = ref(false);
+let explanClass = ref("el-tree");
+let wikiPageExpandedKeys = ref([]);
+let defaultProps = ref({children: 'children', label: 'name',});
+let wikiPage = ref({});
+let wikiPageTreeRef = ref();
+let props = defineProps({
+	wikiPageList: Array,
+	spaceOptions: Array,
+	nowPageId: Number,
+	choiceSpace: Number,
+	readOnly: Boolean
+});
+onMounted(() => {
+	loadSpaceList();
+});
+watch(() => storePage.eventPageListUpdate, () => {
+	loadSpaceList();
+});
+let nowSpaceShow = ref({});
+const loadSpaceList = (spaceId) => {
+	pageApi.spaceList({}).then((json) => {
+		storeSpace.spaceList = json.data || [];
+		let spaceOptionsNew = [];
+		storeSpace.spaceList.forEach((item) => spaceOptionsNew.push({label: item.name, value: item.id}));
+		storeSpace.spaceOptions = spaceOptionsNew;
+		if (storeSpace.spaceList.length > 0) {
+			let nowSpaceId = spaceId;
+			let nowSpaceShowTemp = storeSpace.spaceList.find((item) => item.id === spaceId);
+			if (!nowSpaceShowTemp) {
+				nowSpaceShowTemp = storeSpace.spaceList[0];
+				nowSpaceId = nowSpaceShowTemp.id;
+			}
+			nowSpaceShow.value = nowSpaceShowTemp;
+			storeSpace.spaceInfo = nowSpaceShowTemp;
+			storeSpace.chooseSpaceId = nowSpaceId;
+			storePage.choosePageId = 0;
+			doGetPageList();
+			// TODO 在首页时跳转
+			try {
+				if (route.path === '/home') {
+					router.push({path: '/home', query: {spaceId: nowSpaceId}});
+				}
+			} catch (e) {
+				console.log(e);
+			}
+		}
+	})
+}
+let optionPageId = ref('');
+const changeNodeOptionStatus = (param) => {
+	optionPageId.value = param.id;
+}
+const assisSetCurrentKey = () => {
+	emit('setNowPageId', route.query.pageId, props.readOnly)
+	if (props.nowPageId) {
+		wikiPageTreeRef.value.setCurrentKey(nowPageId.value)
+	}
+}
+
+const changeWikiPageExpandedKeys = (pageId) => {
+	// 展开没有触发子节点的加载，如果去加载子节点有还找不到当前的node，暂不展开
+	// wikiPageExpandedKeys.value= [pageId];
+}
+const createWikiByTemplate = () => {
+	// TODO
+	// templateManageRef.value.showTemplateManage()
+}
+const choosePageIdFunc = (id) => {
+	storePage.optionPageId = id;
+}
+const rename = (node, data) => {
+	data.renaming = true;
+}
+const openMoveMenu = (onlyMove) => {
+	// TODO
+	// onlyMoveMode.value = onlyMove
+	// visibleMoveMenu.value = true
+	// moveToPageId.value = storePage.choosePageId
+	// moveToSpaceId.value = storeSpace.chooseSpaceId
+	// moveToWikiPageList.value = storePage.wikiPageList
+}
+const openTemplateCreate = (exsit) => {
+	// TODO
+	// templateManageRef.value.showTemplateCreate(exsit)
+}
+const deleteWikiPage = (data) => {
+	let msg = '确定要删除此页面及其所有子页面吗？'
+	ElMessageBox.confirm(msg, '提示', {
+		confirmButtonText: '确定',
+		cancelButtonText: '取消',
+		type: 'warning',
+	}).then(() => {
+		let param = {pageId: data.id};
+		pageApi.pageDelete(param).then(() => {
+			ElMessage.success('已删除');
+			doGetPageList();
+		});
+	}).catch(() => {
+	});
+}
+const spaceChangeEvents = (data) => {
+	emit('spaceChangeEvents', data, props.readOnly)
+}
+const doRename = (node, data) => {
+	pageApi.renamePage({"id": data.id, "name": data.name})
+		.then((json) => {
+			doGetPageList();
+			ElMessage.success('重命名成功');
+			data.renaming = false;
+		});
+}
+const doGetPageList = () => {
+	let param = {spaceId: storeSpace.chooseSpaceId}
+	pageApi.pageList(param).then((json) => {
+		storePage.wikiPageList = json.data || []
+	})
+}
+const doSearchByKeywords = (queryString, callback) => {
+	if (!queryString || !queryString.trim()) {
+		callback([])
+		return
+	}
+	pageApi
+		.pageNews({spaceId: props.choiceSpace, keywords: queryString})
+		.then((json) => {
+			let spacePageNews = json.data || []
+			callback(spacePageNews)
+		})
+}
+const handleSearchKeywordsSelect = (item) => {
+	searchKeywords.value = ''
+	router.push({path: '/page/show', query: {pageId: item.pageId}})
+}
+
+const changeDropWownStatus = () => {
+	if (explan.value) {
+		explanClass.value = "el-tree"
+		descriptorForTree.value = "点击收起目录"
+		explan.value = false
+	} else {
+		explanClass.value = "hidTree"
+		descriptorForTree.value = "点击展开目录"
+		explan.value = true
+	}
+}
+
+const filterPageNode = (value, data) => {
+	if (!value || !data.name) return true;
+	// issues:I2CG72 忽略大小写
+	let name = data.name.toLowerCase();
+	return name.indexOf(value.toLowerCase()) !== -1;
+}
+const searchByKeywords = () => {
+	wikiPageTreeRef.value.filter(searchKeywords.value)
+}
+const handleNodeClick = (data) => {
+	//console.log('点击节点：', data, props.nowPageId)
+	storeDisplay.showHeader = true
+	emit('setNowPageId', data.id, props.readOnly)
+	if (props.readOnly) {
+		return
+	}
+	if (data.editorType !== 0) {
+		router.push({path: '/page/show', query: {pageId: data.id}})
+	}
+}
+const handlePageDrop = (draggingNode, dropNode, dropType, ev) => {
+	console.log('tree drop: ', draggingNode.data, dropNode.data, dropType)
+	// 'prev'、'inner'、'next'
+	// before、after、inner
+	var param = {id: draggingNode.data.id, parentId: dropNode.data.parentId}
+	if (dropType == 'inner') {
+		param.parentId = dropNode.data.id
+	} else if (dropType == 'before') {
+		param.beforeSeq = dropNode.data.seqNo
+	} else if (dropType == 'after') {
+		param.afterSeq = dropNode.data.seqNo
+	}
+	pageApi.pageChangeParent(param).then((res) => {
+		doGetPageList();
+	});
+}
+defineExpose({searchByKeywords})
+</script>
+
+
diff --git a/zyplayer-doc-ui/wiki-ui/src/components/layouts/RightHeader.vue b/zyplayer-doc-ui/wiki-ui/src/views/page/aside/RightHeader.vue
similarity index 99%
rename from zyplayer-doc-ui/wiki-ui/src/components/layouts/RightHeader.vue
rename to zyplayer-doc-ui/wiki-ui/src/views/page/aside/RightHeader.vue
index c16ecd2d..b0973d2c 100644
--- a/zyplayer-doc-ui/wiki-ui/src/components/layouts/RightHeader.vue
+++ b/zyplayer-doc-ui/wiki-ui/src/views/page/aside/RightHeader.vue
@@ -94,7 +94,7 @@ import userApi from "@/assets/api/user";
 import PageAuthDialog from '@/views/page/show/PageAuthDialog.vue'
 import MobileQrScanDialog from '@/views/page/show/MobileQrScanDialog.vue'
 import AboutDialog from "@/views/common/AboutDialog.vue"
-import UserMessagePopover from "./UserMessagePopover.vue"
+import UserMessagePopover from "../../../components/layouts/UserMessagePopover.vue"
 import {fixRequestUrl} from "@/assets/api/hostUtils";
 
 let router = useRouter();
diff --git a/zyplayer-doc-ui/wiki-ui/src/components/layouts/RightResize.vue b/zyplayer-doc-ui/wiki-ui/src/views/page/aside/RightResize.vue
similarity index 98%
rename from zyplayer-doc-ui/wiki-ui/src/components/layouts/RightResize.vue
rename to zyplayer-doc-ui/wiki-ui/src/views/page/aside/RightResize.vue
index 0e04d058..b6fe5ba6 100644
--- a/zyplayer-doc-ui/wiki-ui/src/components/layouts/RightResize.vue
+++ b/zyplayer-doc-ui/wiki-ui/src/views/page/aside/RightResize.vue
@@ -43,7 +43,7 @@ const dragChangeRightAsideWidth = () => {
 
 <style scoped lang="scss">
 .right-resize {
-  width: 5px;
+  width: 3px;
   height: 100%;
   cursor: w-resize;
   background: #fafafa;