diff --git a/zyplayer-doc-ui/wiki-ui-2/src/common/api/common.js b/zyplayer-doc-ui/wiki-ui-2/src/assets/api/common.js similarity index 100% rename from zyplayer-doc-ui/wiki-ui-2/src/common/api/common.js rename to zyplayer-doc-ui/wiki-ui-2/src/assets/api/common.js diff --git a/zyplayer-doc-ui/wiki-ui-2/src/common/api/page.js b/zyplayer-doc-ui/wiki-ui-2/src/assets/api/page.js similarity index 100% rename from zyplayer-doc-ui/wiki-ui-2/src/common/api/page.js rename to zyplayer-doc-ui/wiki-ui-2/src/assets/api/page.js diff --git a/zyplayer-doc-ui/wiki-ui-2/src/common/api/request.js b/zyplayer-doc-ui/wiki-ui-2/src/assets/api/request.js similarity index 77% rename from zyplayer-doc-ui/wiki-ui-2/src/common/api/request.js rename to zyplayer-doc-ui/wiki-ui-2/src/assets/api/request.js index 2e57f8f9..8ba0ed63 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/common/api/request.js +++ b/zyplayer-doc-ui/wiki-ui-2/src/assets/api/request.js @@ -12,30 +12,32 @@ const noValidate = { '/zyplayer-doc-db/executor/execute': true, } -service.interceptors.request.use( - (config) => { +service.interceptors.request.use((config) => { config.needValidateResult = true // 增加不需要验证结果的标记 if (noValidate[config.url]) { config.needValidateResult = false } return config - }, - (error) => { + }, (error) => { console.log(error) return Promise.reject(error) } ) - +let lastToastLoginTime = new Date().getTime(); service.interceptors.response.use( (response) => { if (!!response.message) { ElMessage.error('请求错误：' + response.message) } else { - if (!response.config.needValidateResult || response.data.errCode == 200) { + if (!response.config.needValidateResult || response.data.errCode === 200) { return response.data - } else if (response.data.errCode == 400) { - ElMessage.error('请先登录') + } else if (response.data.errCode === 400) { + // 两秒钟只提示一次 + if (new Date().getTime() - lastToastLoginTime > 2000) { + ElMessage.warning('请先登录'); + lastToastLoginTime = new Date().getTime(); + } let href = encodeURIComponent(window.location.href) window.location = import.meta.env.VITE_APP_BASE_API + '#/user/login?redirect=' + href } else if (response.data.errCode !== 200) { @@ -43,8 +45,7 @@ service.interceptors.response.use( } } return Promise.reject('请求错误') - }, - (error) => { + }, (error) => { console.log('err' + error) ElMessage.info('请求错误：' + error.message) return Promise.reject(error) diff --git a/zyplayer-doc-ui/wiki-ui-2/src/common/api/system.js b/zyplayer-doc-ui/wiki-ui-2/src/assets/api/system.js similarity index 100% rename from zyplayer-doc-ui/wiki-ui-2/src/common/api/system.js rename to zyplayer-doc-ui/wiki-ui-2/src/assets/api/system.js diff --git a/zyplayer-doc-ui/wiki-ui-2/src/common/api/user.js b/zyplayer-doc-ui/wiki-ui-2/src/assets/api/user.js similarity index 100% rename from zyplayer-doc-ui/wiki-ui-2/src/common/api/user.js rename to zyplayer-doc-ui/wiki-ui-2/src/assets/api/user.js diff --git a/zyplayer-doc-ui/wiki-ui-2/src/common/lib/HtmlUtil.js b/zyplayer-doc-ui/wiki-ui-2/src/assets/lib/HtmlUtil.js similarity index 100% rename from zyplayer-doc-ui/wiki-ui-2/src/common/lib/HtmlUtil.js rename to zyplayer-doc-ui/wiki-ui-2/src/assets/lib/HtmlUtil.js diff --git a/zyplayer-doc-ui/wiki-ui-2/src/common/lib/UnitUtil.js b/zyplayer-doc-ui/wiki-ui-2/src/assets/lib/UnitUtil.js similarity index 100% rename from zyplayer-doc-ui/wiki-ui-2/src/common/lib/UnitUtil.js rename to zyplayer-doc-ui/wiki-ui-2/src/assets/lib/UnitUtil.js diff --git a/zyplayer-doc-ui/wiki-ui-2/src/common/lib/wangEditor.css b/zyplayer-doc-ui/wiki-ui-2/src/assets/lib/wangEditor.css similarity index 100% rename from zyplayer-doc-ui/wiki-ui-2/src/common/lib/wangEditor.css rename to zyplayer-doc-ui/wiki-ui-2/src/assets/lib/wangEditor.css diff --git a/zyplayer-doc-ui/wiki-ui-2/src/assets/logo.png b/zyplayer-doc-ui/wiki-ui-2/src/assets/logo.png deleted file mode 100644 index f3d2503f..00000000 Binary files a/zyplayer-doc-ui/wiki-ui-2/src/assets/logo.png and /dev/null differ diff --git a/zyplayer-doc-ui/wiki-ui-2/src/components/layouts/GlobalLayout.vue b/zyplayer-doc-ui/wiki-ui-2/src/components/layouts/GlobalLayout.vue index 62584f4c..b866e68f 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/components/layouts/GlobalLayout.vue +++ b/zyplayer-doc-ui/wiki-ui-2/src/components/layouts/GlobalLayout.vue @@ -146,12 +146,13 @@ import { 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 userApi from '../../common/api/user' -import pageApi from '../../common/api/page' +import userApi from '../../assets/api/user' +import pageApi from '../../assets/api/page' import CreateSpace from '../space/CreateSpace' import RightResize from './RightResize.vue' import AboutDialog from '../../views/common/AboutDialog' import {useStoreDisplay} from '@/store/wikiDisplay.js' +import {useStoreUserData} from "@/store/userData"; let route = useRoute(); let router = useRouter(); @@ -406,9 +407,11 @@ const userSignOut = () => { location.reload() }) } +let storeUser = useStoreUserData(); const getSelfUserInfo = () => { userApi.getSelfUserInfo().then((json) => { - userSelfInfo.value = json.data + userSelfInfo.value = json.data; + storeUser.userInfo = json.data; }) } const getSpaceInfo = (spaceId) => { diff --git a/zyplayer-doc-ui/wiki-ui-2/src/components/layouts/ShareLayout.vue b/zyplayer-doc-ui/wiki-ui-2/src/components/layouts/ShareLayout.vue index c401269c..fa494b29 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/components/layouts/ShareLayout.vue +++ b/zyplayer-doc-ui/wiki-ui-2/src/components/layouts/ShareLayout.vue @@ -49,7 +49,7 @@ import { Document as ElIconDocument, Search as ElIconSearch, } from '@element-plus/icons-vue' -import pageApi from '../../common/api/page' +import pageApi from '../../assets/api/page' import RightResize from './RightResize.vue' let leftCollapse = ref(true); diff --git a/zyplayer-doc-ui/wiki-ui-2/src/components/layouts/ShareMobileLayout.vue b/zyplayer-doc-ui/wiki-ui-2/src/components/layouts/ShareMobileLayout.vue index cde94b41..b87676fe 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/components/layouts/ShareMobileLayout.vue +++ b/zyplayer-doc-ui/wiki-ui-2/src/components/layouts/ShareMobileLayout.vue @@ -17,7 +17,7 @@ import {onBeforeUnmount, ref, 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 '../../common/api/page' +import pageApi from '../../assets/api/page' import PageTree from './PageTree' import 'vant/es/icon/style/index'; import 'vant/es/popup/style/index'; diff --git a/zyplayer-doc-ui/wiki-ui-2/src/components/space/CreateSpace.vue b/zyplayer-doc-ui/wiki-ui-2/src/components/space/CreateSpace.vue index 01acceb5..8191e7e0 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/components/space/CreateSpace.vue +++ b/zyplayer-doc-ui/wiki-ui-2/src/components/space/CreateSpace.vue @@ -42,7 +42,7 @@ import {onBeforeUnmount, ref, 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 '../../common/api/page' +import pageApi from '../../assets/api/page' let editSpaceId = ref(''); let newSpaceFormRules = ref({ diff --git a/zyplayer-doc-ui/wiki-ui-2/src/store/pageData.js b/zyplayer-doc-ui/wiki-ui-2/src/store/pageData.js index bf31021b..56f73239 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/store/pageData.js +++ b/zyplayer-doc-ui/wiki-ui-2/src/store/pageData.js @@ -3,8 +3,8 @@ import {defineStore} from 'pinia' export const useStorePageData = defineStore('pageData', { state: () => { return { - pageLoadStatus: 0, + pageInfo: {}, } }, -}) +}); diff --git a/zyplayer-doc-ui/wiki-ui-2/src/views/common/AboutDialog.vue b/zyplayer-doc-ui/wiki-ui-2/src/views/common/AboutDialog.vue index b8663a9d..6381daa9 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/views/common/AboutDialog.vue +++ b/zyplayer-doc-ui/wiki-ui-2/src/views/common/AboutDialog.vue @@ -69,7 +69,7 @@ import {onBeforeUnmount, ref, onMounted, watch, defineProps, nextTick, defineEmits, defineExpose, computed} from 'vue'; import {onBeforeRouteUpdate, useRouter, useRoute} from "vue-router"; import {ElMessageBox, ElMessage} from 'element-plus' -import systemApi from '../../common/api/system' +import systemApi from '../../assets/api/system' onMounted(() => { checkSystemUpgrade() diff --git a/zyplayer-doc-ui/wiki-ui-2/src/views/home/Home.vue b/zyplayer-doc-ui/wiki-ui-2/src/views/home/Home.vue index 08abd11c..924e0f3f 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/views/home/Home.vue +++ b/zyplayer-doc-ui/wiki-ui-2/src/views/home/Home.vue @@ -32,14 +32,19 @@ import {onBeforeUnmount, ref, onMounted, watch, defineProps, nextTick, defineEmi import {onBeforeRouteUpdate, useRouter, useRoute} from "vue-router"; import {ElMessageBox, ElMessage} from 'element-plus' import {View as ElIconView} from '@element-plus/icons-vue' -import pageApi from '../../common/api/page' - +import pageApi from '../../assets/api/page' let totalCount = ref(0); let searchParam = ref({spaceId: '', newsType: 1, pageNum: 1, pageSize: 20,}); let spacePageNews = ref([]); // 列表类型 -let newsTypesArr = ref([{key: 1, val: '最近更新'}, {key: 2, val: '最新创建'}, {key: 3, val: '查看最多'}, {key: 4, val: '点赞最多'}, {key: 5, val: '查看+点赞最多'},]); +let newsTypesArr = ref([ + {key: 1, val: '最近更新'}, + {key: 2, val: '最新创建'}, + {key: 3, val: '查看最多'}, + {key: 4, val: '点赞最多'}, + {key: 5, val: '查看+点赞最多'}, +]); let newsTypesMap = ref({}); onBeforeRouteUpdate((to) => { diff --git a/zyplayer-doc-ui/wiki-ui-2/src/views/page/Edit.vue b/zyplayer-doc-ui/wiki-ui-2/src/views/page/Edit.vue index 1f8f4848..e261b230 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/views/page/Edit.vue +++ b/zyplayer-doc-ui/wiki-ui-2/src/views/page/Edit.vue @@ -60,7 +60,7 @@ import { Check as ElIconCheck, Back as ElIconBack, } from '@element-plus/icons-vue' -import pageApi from '../../common/api/page' +import pageApi from '../../assets/api/page' import {mavonEditor} from 'mavon-editor' import 'mavon-editor/dist/markdown/github-markdown.min.css' import 'mavon-editor/dist/css/index.css' diff --git a/zyplayer-doc-ui/wiki-ui-2/src/views/page/Search.vue b/zyplayer-doc-ui/wiki-ui-2/src/views/page/Search.vue index 4e039def..1da9a3d0 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/views/page/Search.vue +++ b/zyplayer-doc-ui/wiki-ui-2/src/views/page/Search.vue @@ -47,7 +47,7 @@ import {onBeforeUnmount, ref, onMounted, watch, defineProps, nextTick, defineEmi import {onBeforeRouteUpdate, useRouter, useRoute} from "vue-router"; import {ElMessageBox, ElMessage} from 'element-plus' import {View as ElIconView, Search as ElIconSearch} from '@element-plus/icons-vue' -import pageApi from '../../common/api/page' +import pageApi from '../../assets/api/page' let route = useRoute(); let router = useRouter(); diff --git a/zyplayer-doc-ui/wiki-ui-2/src/views/page/Show.vue b/zyplayer-doc-ui/wiki-ui-2/src/views/page/Show.vue index d8f2bba0..78517264 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/views/page/Show.vue +++ b/zyplayer-doc-ui/wiki-ui-2/src/views/page/Show.vue @@ -3,37 +3,29 @@ - +
{{ wikiPage.name }}
-
- {{ wikiPage.updateUserName }}　于　{{wikiPage.updateTime}}　修改 - {{ wikiPage.createUserName }}　于　{{wikiPage.createTime}}　创建 -
+ + + {{ wikiPage.updateUserName }}　于　{{wikiPage.updateTime}}　修改 + {{ wikiPage.createUserName }}　于　{{wikiPage.createTime}}　创建 + + 评论 - + 上传附件 - 编辑 - + 编辑 + 更多 @@ -49,25 +41,27 @@ -
-
+ +
- + - + - - + + + + @@ -97,7 +91,7 @@
- + @@ -108,43 +102,9 @@ -
-
- 暂无评论 -
- - - -
- {{ comment.createUserName.substr(0, 1) }} -
-
- {{ comment.createUserName }} - -

确定要除删此评论吗？

-
- 取消 - 确定 -
- - -
- 
{{ comment.content }}
- - - -
-
- - 发送 -
+ -
暂无修改历史记录 @@ -248,14 +208,16 @@ import {toRefs, ref, reactive, onMounted, watch, defineProps, defineEmits, defin import {onBeforeRouteUpdate, useRoute, useRouter} from "vue-router"; import { ElMessageBox, ElMessage, ElNotification } from 'element-plus'; import QRCode from 'qrcode' -import unitUtil from '../../common/lib/UnitUtil.js' -import htmlUtil from '../../common/lib/HtmlUtil.js' -import pageApi from '../../common/api/page' -import userApi from '../../common/api/user' +import unitUtil from '../../assets/lib/UnitUtil.js' +import htmlUtil from '../../assets/lib/HtmlUtil.js' +import pageApi from '../../assets/api/page' +import userApi from '../../assets/api/user' import Navigation from './components/Navigation.vue' +import Comment from './show/Comment.vue' import {mavonEditor} from 'mavon-editor' import 'mavon-editor/dist/markdown/github-markdown.min.css' import 'mavon-editor/dist/css/index.css' +import {useStorePageData} from "@/store/pageData"; let page = { colorArr: ['#67C23A', '#409EFF', '#E6A23C', '#F56C6C', '#909399', '#303133'], @@ -276,10 +238,6 @@ let parentPath = ref({}); // 手机扫码 let qrCodeUrl = ref(''); let mobileScanDialogVisible = ref(false); -// 评论相关 -let commentTextInput = ref(''); -let commentList = ref([]); -let recommentInfo = ref({}); let uploadFileUrl = ref(import.meta.env.VITE_APP_BASE_API + '/zyplayer-doc-wiki/page/file/upload'); // 页面权限 let pageAuthDialogVisible = ref(false); @@ -308,6 +266,8 @@ let downloadFormParam = ref({url: 'zyplayer-doc-wiki/page/download', param: {},} let route = useRoute(); let router = useRouter(); +let storePage = useStorePageData(); + const props = defineProps({ spaceInfo: Object, }); @@ -489,7 +449,6 @@ const closeActionTab = () => { const showCommentWiki = () => { actionTabVisible.value = true actionTabActiveName.value = 'comment' - scrollActionTabComment() computeNavigationWidth() } const showPageHistory = () => { @@ -611,9 +570,9 @@ const loadPageDetail = (pageId) => { setTimeout(() => { previewPageImage() createNavigationHeading() - }, 500) + }, 500); + storePage.pageInfo = wikiPageRes; }) - loadCommentList(pageId) getPageHistory(pageId, 1) } let wikiTitleRef = ref(); @@ -659,33 +618,6 @@ const initImageViewerMask = () => { } }) } -const loadCommentList = (pageId) => { - cancelCommentUser() - pageApi.pageCommentList({pageId: pageId}).then((json) => { - let commentList = json.data || [] - for (let i = 0; i < commentList.length; i++) { - commentList[i].color = getUserHeadBgColor( - commentList[i].createUserId - ) - let subCommentList = commentList[i].commentList || [] - for (let j = 0; j < subCommentList.length; j++) { - let subItem = subCommentList[j] - subItem.color = getUserHeadBgColor.value(subItem.createUserId) - } - commentList[i].commentList = subCommentList - commentList[i].visible = false - } - commentList.value = commentList - scrollActionTabComment() - }) -} -let actionTabCommentRef = ref(); -const scrollActionTabComment = () => { - setTimeout(() => { - let actionTabComment = actionTabCommentRef.value - actionTabComment.scrollTop = actionTabComment.scrollHeight - }, 0) -} const zanPage = (yn) => { let param = {yn: yn, pageId: wikiPage.value.id} pageApi.updatePageZan(param).then(() => { @@ -701,45 +633,6 @@ const showZanPageUser = () => { zanUserList.value = json.data }) } -const recommentUser = (id, index) => { - recommentInfo.value = { - id: id, - index: index, - placeholder: '回复' + (index + 1) + '楼', - } -} -const canDeleteComment = (row) => { - return ( - selfUserId.value == row.createUserId || - wikiPage.value.createUserId == selfUserId.value - ) -} -const deleteComment = (id) => { - pageApi.deletePageComment({id: id}).then(() => { - // ElMessage.success("删除成功！"); - loadCommentList(parentPath.value.pageId) - }) -} -const cancelCommentUser = () => { - recommentInfo.value = {} -} -const submitPageComment = () => { - if (commentTextInput.value.length <= 0) { - ElMessage.error('请输入评论内容') - return - } - let param = { - pageId: wikiPage.value.id, - content: commentTextInput.value, - parentId: recommentInfo.value.id, - } - pageApi.updatePageComment(param).then((json) => { - let data = json.data - data.color = getUserHeadBgColor(data.createUserId) - commentTextInput.value = '' - loadCommentList(parentPath.value.pageId) - }) -} const uploadFileError = (err) => { ElMessage.error('上传失败，' + err) } @@ -787,7 +680,7 @@ const initQueryParam = (to) => { diff --git a/zyplayer-doc-ui/wiki-ui-2/src/views/page/show/PageHistory.vue b/zyplayer-doc-ui/wiki-ui-2/src/views/page/show/PageHistory.vue new file mode 100644 index 00000000..26982db5 --- /dev/null +++ b/zyplayer-doc-ui/wiki-ui-2/src/views/page/show/PageHistory.vue @@ -0,0 +1,49 @@ + + + + + diff --git a/zyplayer-doc-ui/wiki-ui-2/src/views/space/Manage.vue b/zyplayer-doc-ui/wiki-ui-2/src/views/space/Manage.vue index 7d12b035..8b52c0ac 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/views/space/Manage.vue +++ b/zyplayer-doc-ui/wiki-ui-2/src/views/space/Manage.vue @@ -96,8 +96,8 @@ import { Refresh as ElIconRefresh, Plus as ElIconPlus, } from '@element-plus/icons-vue' -import pageApi from '../../common/api/page' -import userApi from '../../common/api/user' +import pageApi from '../../assets/api/page' +import userApi from '../../assets/api/user' import CreateSpace from '../../components/space/CreateSpace' let spaceListLoading = ref(false); @@ -105,16 +105,12 @@ let spaceOptions = ref([]); let spaceList = ref([]); let choiceSpace = ref(''); let nowSpaceShow = ref({}); -let newSpaceDialogVisible = ref(false); -let manageSpaceDialogVisible = ref(false); let newSpaceForm = ref({id: '', name: '', spaceExplain: '', treeLazyLoad: 0, openDoc: 0, uuid: '', type: 1,}); -let newSpaceFormRules = ref({name: [{required: true, message: '请输入空间名', trigger: 'blur'}, {min: 2, max: 25, message: '长度在 2 到 25 个字符', trigger: 'blur',},],}); let userSelfInfo = ref({}); // 空间授权 let editSpaceId = ref(''); let spaceAuthDialogVisible = ref(false); let spaceAuthNewGroupId = ref(''); -let spaceAuthGroupLoading = ref(false); let searchGroupList = ref([]); let searchGroupMap = ref({}); let spaceAuthGroupList = ref([]); @@ -125,7 +121,7 @@ let route = useRoute(); let router = useRouter(); let emit = defineEmits('loadSpace'); -onMounted(()=>{ +onMounted(() => { loadSpaceList() getSelfUserInfo() getSpaceSettingList() diff --git a/zyplayer-doc-ui/wiki-ui-2/src/views/user/MyInfo.vue b/zyplayer-doc-ui/wiki-ui-2/src/views/user/MyInfo.vue index 7531fec5..d6455047 100644 --- a/zyplayer-doc-ui/wiki-ui-2/src/views/user/MyInfo.vue +++ b/zyplayer-doc-ui/wiki-ui-2/src/views/user/MyInfo.vue @@ -22,7 +22,7 @@ import {onBeforeUnmount, ref, onMounted, watch, defineProps, nextTick, defineEmits, defineExpose, computed} from 'vue'; import {onBeforeRouteUpdate, useRouter, useRoute} from "vue-router"; import {ElMessageBox, ElMessage} from 'element-plus' -import userApi from '../../common/api/user' +import userApi from '../../assets/api/user' let userInfo = ref({}); onMounted(() => {