diff --git a/zyplayer-doc-ui/wiki-ui/package-lock.json b/zyplayer-doc-ui/wiki-ui/package-lock.json index 021cffd9..372161cc 100644 --- a/zyplayer-doc-ui/wiki-ui/package-lock.json +++ b/zyplayer-doc-ui/wiki-ui/package-lock.json @@ -21,7 +21,7 @@ "highlight.js": "^11.7.0", "js-cookie": "^2.2.1", "mavon-editor": "^3.0.0-beta", - "pinia": "^2.1.4", + "pinia": "^2.1.6", "pouchdb": "^7.3.1", "qrcode": "^1.5.1", "qs": "^6.11.2", @@ -7355,9 +7355,9 @@ } }, "node_modules/pinia": { - "version": "2.1.4", - "resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.1.4.tgz", - "integrity": "sha512-vYlnDu+Y/FXxv1ABo1vhjC+IbqvzUdiUC3sfDRrRyY2CQSrqqaa+iiHmqtARFxJVqWQMCJfXx1PBvFs9aJVLXQ==", + "version": "2.1.6", + "resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.1.6.tgz", + "integrity": "sha512-bIU6QuE5qZviMmct5XwCesXelb5VavdOWKWaB17ggk++NUwQWWbP5YnsONTk3b752QkW9sACiR81rorpeOMSvQ==", "dependencies": { "@vue/devtools-api": "^6.5.0", "vue-demi": ">=0.14.5" @@ -14793,9 +14793,9 @@ "optional": true }, "pinia": { - "version": "2.1.4", - "resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.1.4.tgz", - "integrity": "sha512-vYlnDu+Y/FXxv1ABo1vhjC+IbqvzUdiUC3sfDRrRyY2CQSrqqaa+iiHmqtARFxJVqWQMCJfXx1PBvFs9aJVLXQ==", + "version": "2.1.6", + "resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.1.6.tgz", + "integrity": "sha512-bIU6QuE5qZviMmct5XwCesXelb5VavdOWKWaB17ggk++NUwQWWbP5YnsONTk3b752QkW9sACiR81rorpeOMSvQ==", "requires": { "@vue/devtools-api": "^6.5.0", "vue-demi": ">=0.14.5" diff --git a/zyplayer-doc-ui/wiki-ui/package.json b/zyplayer-doc-ui/wiki-ui/package.json index 142aeca7..d739a396 100644 --- a/zyplayer-doc-ui/wiki-ui/package.json +++ b/zyplayer-doc-ui/wiki-ui/package.json @@ -21,7 +21,7 @@ "highlight.js": "^11.7.0", "js-cookie": "^2.2.1", "mavon-editor": "^3.0.0-beta", - "pinia": "^2.1.4", + "pinia": "^2.1.6", "pouchdb": "^7.3.1", "qrcode": "^1.5.1", "qs": "^6.11.2", diff --git a/zyplayer-doc-ui/wiki-ui/src/assets/lib/HtmlUtil.js b/zyplayer-doc-ui/wiki-ui/src/assets/lib/HtmlUtil.js index 08ea680e..fde780cf 100644 --- a/zyplayer-doc-ui/wiki-ui/src/assets/lib/HtmlUtil.js +++ b/zyplayer-doc-ui/wiki-ui/src/assets/lib/HtmlUtil.js @@ -1,9 +1,11 @@ export default { createNavigationHeading() { let headArr = [] - let headNodeArr = document - .querySelector('.wiki-page-content') - .querySelectorAll('h1,h2,h3,h4,h5,h6') + let headNode = document.querySelector('.wiki-page-content') + if (null === headNode){ + return headArr + } + let headNodeArr = headNode.querySelectorAll('h1,h2,h3,h4,h5,h6') if (headNodeArr.length <= 0) { return [] } diff --git a/zyplayer-doc-ui/wiki-ui/src/components/layouts/GlobalLayout.vue b/zyplayer-doc-ui/wiki-ui/src/components/layouts/GlobalLayout.vue index d636652e..cdfc67a7 100644 --- a/zyplayer-doc-ui/wiki-ui/src/components/layouts/GlobalLayout.vue +++ b/zyplayer-doc-ui/wiki-ui/src/components/layouts/GlobalLayout.vue @@ -1,585 +1,33 @@ + + + diff --git a/zyplayer-doc-ui/wiki-ui/src/components/layouts/ShareMobileLayout.vue b/zyplayer-doc-ui/wiki-ui/src/components/layouts/ShareMobileLayout.vue index b87676fe..cb8121c6 100644 --- a/zyplayer-doc-ui/wiki-ui/src/components/layouts/ShareMobileLayout.vue +++ b/zyplayer-doc-ui/wiki-ui/src/components/layouts/ShareMobileLayout.vue @@ -18,7 +18,7 @@ import {onBeforeUnmount, ref, onMounted, watch, defineProps, nextTick, defineEmi import {onBeforeRouteUpdate, useRouter, useRoute} from "vue-router"; import {ElMessageBox, ElMessage} from 'element-plus' import pageApi from '../../assets/api/page' -import PageTree from './PageTree' +import PageTree from '../shareLayout/PageTree' import 'vant/es/icon/style/index'; import 'vant/es/popup/style/index'; import 'vant/es/cell/style/index'; diff --git a/zyplayer-doc-ui/wiki-ui/src/components/layouts/AddMenu.vue b/zyplayer-doc-ui/wiki-ui/src/components/leftSideBar/AddMenu.vue similarity index 100% rename from zyplayer-doc-ui/wiki-ui/src/components/layouts/AddMenu.vue rename to zyplayer-doc-ui/wiki-ui/src/components/leftSideBar/AddMenu.vue diff --git a/zyplayer-doc-ui/wiki-ui/src/components/leftSideBar/LeftSidebarCli.vue b/zyplayer-doc-ui/wiki-ui/src/components/leftSideBar/LeftSidebarCli.vue new file mode 100644 index 00000000..c9da13cb --- /dev/null +++ b/zyplayer-doc-ui/wiki-ui/src/components/leftSideBar/LeftSidebarCli.vue @@ -0,0 +1,191 @@ + + + + + diff --git a/zyplayer-doc-ui/wiki-ui/src/components/layouts/PageTree.vue b/zyplayer-doc-ui/wiki-ui/src/components/shareLayout/PageTree.vue similarity index 100% rename from zyplayer-doc-ui/wiki-ui/src/components/layouts/PageTree.vue rename to zyplayer-doc-ui/wiki-ui/src/components/shareLayout/PageTree.vue diff --git a/zyplayer-doc-ui/wiki-ui/src/store/pageData.js b/zyplayer-doc-ui/wiki-ui/src/store/pageData.js index 14727460..fa4c4e92 100644 --- a/zyplayer-doc-ui/wiki-ui/src/store/pageData.js +++ b/zyplayer-doc-ui/wiki-ui/src/store/pageData.js @@ -3,10 +3,13 @@ import {defineStore} from 'pinia' export const useStorePageData = defineStore('pageData', { state: () => { return { - spaceInfo: {}, pageInfo: {}, pageAuth: {}, fileList: [], + choosePageId: 0, + optionPageId: 0, + wikiPageList: [], + pageIsUnLock: false, } }, }); diff --git a/zyplayer-doc-ui/wiki-ui/src/store/spaceData.js b/zyplayer-doc-ui/wiki-ui/src/store/spaceData.js new file mode 100644 index 00000000..1c3146e8 --- /dev/null +++ b/zyplayer-doc-ui/wiki-ui/src/store/spaceData.js @@ -0,0 +1,12 @@ +import {defineStore} from 'pinia' + +export const useStoreSpaceData = defineStore('spaceData', { + state: () => { + return { + spaceInfo:{}, + chooseSpaceId:1, + spaceOptions: [], + spaceList:[] + } + }, +}); diff --git a/zyplayer-doc-ui/wiki-ui/src/store/wikiDisplay.js b/zyplayer-doc-ui/wiki-ui/src/store/wikiDisplay.js index 9f59754f..86bea709 100644 --- a/zyplayer-doc-ui/wiki-ui/src/store/wikiDisplay.js +++ b/zyplayer-doc-ui/wiki-ui/src/store/wikiDisplay.js @@ -8,6 +8,9 @@ export const useStoreDisplay = defineStore('wikiDisplay', { // 是否显示右边评论栏 commentShow: false, commentActiveTab: 'comment', + showMenu: true, + rightAsideWidth: 300, + showHeader:true } }, }) diff --git a/zyplayer-doc-ui/wiki-ui/src/views/home/Home.vue b/zyplayer-doc-ui/wiki-ui/src/views/home/Home.vue index 26d0e999..1c61f843 100644 --- a/zyplayer-doc-ui/wiki-ui/src/views/home/Home.vue +++ b/zyplayer-doc-ui/wiki-ui/src/views/home/Home.vue @@ -78,6 +78,7 @@ const initQueryParam = (to) => { newsType: 1, pageNum: 1, pageSize: 20, + dirId: to.query.dirId } if (!!searchParam.value.spaceId) { getSpacePageNews() diff --git a/zyplayer-doc-ui/wiki-ui/src/views/page/Edit.vue b/zyplayer-doc-ui/wiki-ui/src/views/page/Edit.vue index 6f9208a8..71075ce1 100644 --- a/zyplayer-doc-ui/wiki-ui/src/views/page/Edit.vue +++ b/zyplayer-doc-ui/wiki-ui/src/views/page/Edit.vue @@ -1,29 +1,30 @@