From f939fc51646ee6a23e8bdc2c3554987d4c470bfc Mon Sep 17 00:00:00 2001 From: Sh1yu <41428433@qq.com> Date: Tue, 4 Jul 2023 16:38:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zyplayer-doc-ui/wiki-ui/src/views/page/show/PageAction.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/zyplayer-doc-ui/wiki-ui/src/views/page/show/PageAction.vue b/zyplayer-doc-ui/wiki-ui/src/views/page/show/PageAction.vue index 150d1a36..7505304d 100644 --- a/zyplayer-doc-ui/wiki-ui/src/views/page/show/PageAction.vue +++ b/zyplayer-doc-ui/wiki-ui/src/views/page/show/PageAction.vue @@ -71,6 +71,7 @@ import {useStorePageData} from "@/store/pageData"; let storePage = useStorePageData(); +let router = useRouter(); const editWiki = () => { // 锁定页面并进入编辑页面 let param = {pageId: storePage.pageInfo.id}; From edf024fe1c9feca5bb54a3c1c2d36cf78db4189a Mon Sep 17 00:00:00 2001 From: Sh1yu <41428433@qq.com> Date: Tue, 4 Jul 2023 16:46:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=88=E5=B9=B6=E9=97=AD=E6=BA=90?= =?UTF-8?q?=E7=89=88wiki=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=B0=E5=BB=BA=E6=96=87=E6=A1=A3=E7=9A=84?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/layouts/GlobalLayout.vue | 107 ++++++++++++++---- .../wiki-ui/src/views/page/Edit.vue | 37 ++---- 2 files changed, 90 insertions(+), 54 deletions(-) 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 08b1e307..90b9c5bd 100644 --- a/zyplayer-doc-ui/wiki-ui/src/components/layouts/GlobalLayout.vue +++ b/zyplayer-doc-ui/wiki-ui/src/components/layouts/GlobalLayout.vue @@ -24,15 +24,22 @@
- 空间目录 - - - + 空间目录 + + + @@ -55,24 +62,36 @@ @node-expand="handleNodeExpand" @node-drop="handlePageDrop"> @@ -212,6 +231,9 @@ let userMessagePopVisible = ref(false); let userMsgTotalCount = ref(0); let userMsgParam = ref({sysType: 2, pageNum: 1, pageSize: 20,}); let rightAsideWidth = ref(300); +let optionStatus = ref(false); +let optionPageId = ref(''); +let optionLock = ref(false); onMounted(() => { loadSpaceList() @@ -222,6 +244,32 @@ const loadPageList = (param) => { param = param || {} doGetPageList(param.parentId, param.node) } +const pageInfoLock = () => { + optionLock.value = true +} +const pageInfoUnlock = (keepLock) => { + console.log(optionLock.value) + if (optionLock.value === true){ + if (!keepLock){ + optionLock.value = false + } + return true + } + return false +} +const changeNodeOptionStatus = (param,type) => { + if (type > 0){ + optionPageId.value = param.id + optionStatus.value = true + } + if (type < 0 ){ + optionPageId.value = param.id + optionStatus.value = false + } + if (type === 0 && optionPageId.value === param.id && optionStatus.value){ + return true + } +} const turnLeftCollapse = () => { leftCollapse.value = !leftCollapse.value setTimeout(() => { @@ -237,8 +285,10 @@ const turnLeftCollapse = () => { nowPageId.value = 0 } if (choiceSpace.value > 0) { - pageApi.updatePage({spaceId: choiceSpace.value,parentId: nowPageId.value,editorType:editorType,name:'未命名',content:'',preview:''}) + pageApi.updatePage({spaceId: choiceSpace.value,parentId: nowPageId.value,editorType:editorType,name:'新建文档',content:'',preview:''}) .then((json) => { + doGetPageList(null) + ElMessage.success('创建成功') router.push({ path: '/page/edit', query: {parentId: nowPageId.value, pageId: json.data.id} @@ -281,12 +331,18 @@ const searchByKeywordsNewPage = () => { window.open(routeUrl.href, '_blank') } const handleNodeClick = (data) => { - // console.log('点击节点：', data, nowPageId.value) + //console.log('点击节点：', data, nowPageId.value) + if (pageInfoUnlock()){ + return + } nowPageId.value = data.id router.push({path: '/page/show', query: {pageId: data.id}}) handleNodeExpand(data) } const handleNodeExpand = (node) => { + if (pageInfoUnlock(true)){ + return + } if ( node.children && node.children.length > 0 && @@ -297,6 +353,9 @@ const handleNodeExpand = (node) => { } } const handlePageDrop = (draggingNode, dropNode, dropType, ev) => { + if (pageInfoUnlock(true)){ + return + } console.log('tree drop: ', draggingNode.data, dropNode.data, dropType) // 'prev'、'inner'、'next' // before、after、inner 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 a7a076c8..bfb99329 100644 --- a/zyplayer-doc-ui/wiki-ui/src/views/page/Edit.vue +++ b/zyplayer-doc-ui/wiki-ui/src/views/page/Edit.vue @@ -1,37 +1,19 @@