右上角操作按钮优化

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

@@ -1,10 +1,10 @@
 <template>
 	<span class="user-message-popover">
-		<el-tooltip content="文档通知">
+		<a-tooltip title="文档通知">
-			<el-badge :value="notReadMessageNum" :max="99" :hidden="notReadMessageNum <= 0">
+			<a-badge :count="notReadMessageNum" :hidden="notReadMessageNum <= 0" :offset="[-6, 6]">
-				<el-button ref="remindButtonRef" class="hover-button" text><IconParkRemind size="18"/></el-button>
+				<a-button ref="remindButtonRef" class="hover-button hover-bg" size="large" :icon="h(BellOutlined)"></a-button>
-			</el-badge>
+			</a-badge>
-		</el-tooltip>
+		</a-tooltip>
 		<el-popover v-model:visible="userMessagePopVisible" placement="bottom" :width="700" trigger="click"
 		            popper-class="header-user-remind" ref="popoverRef"
 		            :virtual-ref="remindButtonRef" virtual-triggering>
@@ -48,10 +48,8 @@ import {
 	Plus as ElIconPlus,
 	Check as ElIconCheck,
 } from '@element-plus/icons-vue'
-import {
+import {BellOutlined, CheckOutlined} from '@ant-design/icons-vue';
-	Remind as IconParkRemind,
+import {onBeforeUnmount, toRefs, ref, reactive, onMounted, watch, h, defineProps, nextTick, defineEmits, defineExpose, computed} from 'vue';
-} from '@icon-park/vue-next'
-import {onBeforeUnmount, toRefs, ref, reactive, onMounted, watch, defineProps, nextTick, defineEmits, defineExpose, computed} from 'vue';
 import {onBeforeRouteUpdate, useRouter, useRoute} from "vue-router";
 import {ElMessageBox, ElMessage} from 'element-plus'
 import pageApi from "@/assets/api/page";

zyplayer-doc-ui/wiki-ui/src/views/page/aside/RightHeader.vue

@@ -17,16 +17,19 @@
 		<el-col :span="12" style="text-align: right;">
 			<div class="header-action-box">
 				<template v-if="storeDisplay.currentPage === 'view'">
-					<el-tooltip v-if="storePage.pageAuth.canEdit === 1" content="编辑文档">
+					<a-tooltip v-if="storePage.pageAuth.canEdit === 1" title="编辑文档">
-						<el-button class="hover-button" @click="editWiki" text><IconParkEdit size="18"/></el-button>
+						<a-button class="hover-button hover-bg" @click="editWiki" size="large" :icon="h(EditOutlined)"></a-button>
-					</el-tooltip>
+					</a-tooltip>
-					<el-tooltip content="文档沟通">
+					<a-tooltip v-else title="没有编辑权限">
-						<el-button class="hover-button" @click="showCommentWiki" text><IconParkCommunication size="18"/></el-button>
+						<span class="disabled-btn-box"><a-button class="hover-button" size="large" :icon="h(EditOutlined)" disabled></a-button></span>
-					</el-tooltip>
+					</a-tooltip>
+					<a-tooltip title="文档沟通">
+						<a-button class="hover-button hover-bg" @click="showCommentWiki" size="large" :icon="h(MessageOutlined)"></a-button>
+					</a-tooltip>
 					<UserMessagePopover/>
 					<a-dropdown trigger="click" placement="bottom" overlayClassName="header-action-more-dropdown">
-					<span style="line-height: 60px;display:inline-block;margin: 0 8px;">
+						<span style="display:inline-block;margin: 0 12px;">
-						<el-button :icon="ElIconMoreFilled" class="hover-button" text></el-button>
+							<a-button class="hover-button hover-bg" size="large" :icon="h(EllipsisOutlined)"></a-button>
 						</span>
 						<template #overlay>
 							<a-menu>
@@ -41,8 +44,8 @@
 					</a-dropdown>
 				</template>
 				<a-dropdown trigger="click" placement="bottom" overlayClassName="header-action-user-dropdown">
-					<span style="line-height: 60px;display:inline-block;">
+					<span style="display:inline-block;">
-						<el-button :icon="ElIconUserFilled" class="hover-button" text></el-button>
+						<a-button class="hover-button hover-bg" size="large" :icon="h(UserOutlined)"></a-button>
 					</span>
 					<template #overlay>
 						<a-menu>
@@ -77,12 +80,8 @@ import {
 	Setting as ElIconSetting,
 	UserFilled as ElIconUserFilled,
 } from '@element-plus/icons-vue'
-import {
+import {UserOutlined, EditOutlined, MessageOutlined, CheckOutlined, EllipsisOutlined} from '@ant-design/icons-vue';
-	Star as IconParkStar,
+import {toRefs, ref, reactive, onMounted, watch, defineEmits, h, computed} from 'vue';
-	Edit as IconParkEdit,
-	Communication as IconParkCommunication,
-} from '@icon-park/vue-next'
-import {toRefs, ref, reactive, onMounted, watch, defineEmits, computed} from 'vue';
 import {useRouter, useRoute} from "vue-router";
 import { ElMessageBox, ElMessage } from 'element-plus'
 import { useStoreDisplay } from '@/store/wikiDisplay.js'
@@ -256,6 +255,7 @@ const showConsole = () => {
 			font-size: 18px;
 			line-height: 60px;
 			padding-left: 10px;
+
 			.text {
 				display: inline-block;
 			}
@@ -298,22 +298,21 @@ const showConsole = () => {
 
 	.hover-button {
 		border: 0;
-	color: #888;
+		box-shadow: unset;
+		width: 54px !important;
 
 		.i-icon svg {
-	  vertical-align: middle;
+			vertical-align: inherit;
-	}
 		}
 
-  .hover-button:focus {
+		&:hover.hover-bg {
-	color: #888;
-	background: #fff;
-  }
-
-  .hover-button:hover {
-	color: #888;
 			background: #eaeaea;
 		}
+
+		& + .hover-button {
+			margin-left: 10px;
+		}
+	}
 }
 
 .header-action-user-dropdown {

zyplayer-doc-ui/wiki-ui/src/views/page/show/Navigation.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="navigation-box">
 		<div class="navigation-content-box">
-			<div>dasdas</div>
+			<div></div>
 			<div class="nav-heading" :style="{ width: navigationWidth }">
 				<div v-for="item in heading" :class="'heading-item heading-' + item.level" @click="headingItemClick(item)">
 					{{ item.text }}