From 297c969054cbac15c2222b3b143b4b4c8772d515 Mon Sep 17 00:00:00 2001 From: luckyasme <807254037@qq.com> Date: Tue, 22 Apr 2025 17:30:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=B1=95=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/doc/DocBreadCrumb.vue | 2 +- .../src/components/doc/DocPagination.vue | 8 +++- app/.vitepress/src/layouts/LayoutDoc.vue | 39 +++++++++---------- .../src/views/docs/TheDocsArticle.vue | 4 +- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/app/.vitepress/src/components/doc/DocBreadCrumb.vue b/app/.vitepress/src/components/doc/DocBreadCrumb.vue index 8440c5765..24ca140bf 100644 --- a/app/.vitepress/src/components/doc/DocBreadCrumb.vue +++ b/app/.vitepress/src/components/doc/DocBreadCrumb.vue @@ -29,7 +29,7 @@ const currentTitle = computed(() => { const router = useRouter(); const goToPage = (href: string) => { if (href === `/${locale.value}/`) { - window.location.href = href; + window.location.href = href; // 分支容器没有/zh和/en相关资源，需要重载触发转发 } else { router.go(href); } diff --git a/app/.vitepress/src/components/doc/DocPagination.vue b/app/.vitepress/src/components/doc/DocPagination.vue index e62ca1501..2d5a48fd8 100644 --- a/app/.vitepress/src/components/doc/DocPagination.vue +++ b/app/.vitepress/src/components/doc/DocPagination.vue @@ -6,6 +6,10 @@ import type { DocMenuNodeT } from '@/utils/tree'; import { useLocale } from '@/composables/useLocale'; import { useNodeStore } from '@/stores/node'; +const emits = defineEmits<{ + (evt: 'page-change', type: 'prev' | 'next'): void; +}>(); + const nodeStore = useNodeStore(); const getPageNodes = (node: DocMenuNodeT) => { @@ -45,7 +49,7 @@ const config = computed(() => {
- + @@ -54,7 +58,7 @@ const config = computed(() => {
- + {{ t('docs.next') }} {{ config.nextLabel }} diff --git a/app/.vitepress/src/layouts/LayoutDoc.vue b/app/.vitepress/src/layouts/LayoutDoc.vue index f4f6f3b95..c1df43629 100644 --- a/app/.vitepress/src/layouts/LayoutDoc.vue +++ b/app/.vitepress/src/layouts/LayoutDoc.vue @@ -49,35 +49,29 @@ watch( } ); -watch( - () => nodeStore.pageNode, - () => { - setTimeout(() => { - if (nodeStore.pageNode) { - if (nodeStore.currentNode && nodeStore.currentNode === nodeStore.pageNode) { - menuExpandedKeys.value = [...nodeStore.prevNodes, nodeStore.pageNode].map((item) => item.id); - } else { - menuExpandedKeys.value = nodeStore.prevNodes.map((item) => item.id); - } - } - }); +const updateExpandedKeys = () => { + if (nodeStore.pageNode) { + const set = new Set([...menuExpandedKeys.value, ...nodeStore.prevNodes.map((item) => item.id)]); + if (nodeStore.currentNode && nodeStore.currentNode === nodeStore.pageNode) { + set.add(nodeStore.pageNode.id); + } + + menuExpandedKeys.value = Array.from(set); } -); +}; onMounted(() => { if (nodeStore.currentNode) { menuVal.value = nodeStore.currentNode.id; } - if (nodeStore.pageNode) { - if (nodeStore.currentNode && nodeStore.currentNode === nodeStore.pageNode) { - menuExpandedKeys.value = [...nodeStore.prevNodes, nodeStore.pageNode].map((item) => item.id); - } else { - menuExpandedKeys.value = nodeStore.prevNodes.map((item) => item.id); - } - } + updateExpandedKeys(); }); +const onPageChange = () => { + setTimeout(updateExpandedKeys, 300); +}; + // 点击菜单跳转文档 const onClickMenuItem = (item: DocMenuNodeT, newOpener?: boolean) => { const href = getNodeHrefSafely(item); @@ -149,6 +143,9 @@ watch(hash, () => { const onChangeAnchor = (value: string) => { menuVal.value = value; + if (nodeStore.pageNode && !menuExpandedKeys.value.includes(nodeStore.pageNode.id)) { + updateExpandedKeys(); + } }; const onChangeNodeIndex = (value: number) => { @@ -263,7 +260,7 @@ onUnmounted(() => { - +
diff --git a/app/.vitepress/src/views/docs/TheDocsArticle.vue b/app/.vitepress/src/views/docs/TheDocsArticle.vue index 57d286268..a8f939027 100644 --- a/app/.vitepress/src/views/docs/TheDocsArticle.vue +++ b/app/.vitepress/src/views/docs/TheDocsArticle.vue @@ -12,6 +12,7 @@ import { useNodeStore } from '@/stores/node'; const emits = defineEmits<{ (evt: 'scroll-into-title'): void; (evt: 'change-anchor', value: string): void; + (evt: 'page-change', type: 'prev' | 'next'): void; }>(); const viewStore = useViewStore(); @@ -123,7 +124,6 @@ const onClickContent = (evt: PointerEvent) => { emits('scroll-into-title'); } }; - -- Gitee From f6a8477265e55bdefe0e4dc0c785787679f5edcf Mon Sep 17 00:00:00 2001 From: luckyasme <807254037@qq.com> Date: Tue, 22 Apr 2025 19:08:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96pr=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E9=93=BE=E6=8E=A5=E3=80=81=E4=BC=98=E5=8C=96=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E8=BE=93=E5=85=A5=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/.vitepress/src/components/doc/DocBugDialog.vue | 2 +- app/.vitepress/src/components/doc/DocSearch.vue | 11 ++++++++--- app/.vitepress/src/components/header/HeaderSearch.vue | 9 +++++++-- app/.vitepress/src/views/home/TheHome.vue | 8 ++++++-- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/app/.vitepress/src/components/doc/DocBugDialog.vue b/app/.vitepress/src/components/doc/DocBugDialog.vue index 2214bc71c..49b7635d0 100644 --- a/app/.vitepress/src/components/doc/DocBugDialog.vue +++ b/app/.vitepress/src/components/doc/DocBugDialog.vue @@ -196,7 +196,7 @@ const submitBug = (results: FieldResultT[]) => { window.open(`https://gitee.com/openeuler/docs/issues/new?issue%5Bassignee_id%5D=0&issue%5Bmilestone_id%5D=0&title=文档捉虫&description=${body}`); } else { window.open( - `https://gitee.com/-/ide/project/openeuler/docs/edit/stable2-${searchStore.version}/-/docs/${locale.value}/docs/${path}?search=${first}&title=文档捉虫-openEuler ${searchStore.version}-${title}&description=${formData.description}&message=${formData.description}&label_names=文档捉虫` + `https://gitee.com/-/ide/project/openeuler/docs/edit/${searchStore.version}/-/docs/${locale.value}/docs/${path}?search=${first}&title=文档捉虫-openEuler ${searchStore.version}-${title}&description=${formData.description}&message=${formData.description}&label_names=文档捉虫` ); } } diff --git a/app/.vitepress/src/components/doc/DocSearch.vue b/app/.vitepress/src/components/doc/DocSearch.vue index 7ac238922..bc287aae6 100644 --- a/app/.vitepress/src/components/doc/DocSearch.vue +++ b/app/.vitepress/src/components/doc/DocSearch.vue @@ -26,16 +26,21 @@ const searchValue = ref(''); // -------------------- 回车搜索文档 -------------------- const enterSearchDoc = () => { + const input = searchValue.value.trim(); + if (!input) { + return; + } + if (lastRecommendCanceler) { lastRecommendCanceler('cancel'); } showSearchWord.value = false; - if (lastSearchValue.value !== searchValue.value) { + if (lastSearchValue.value !== input) { searchStore.setIsSearching(true); - searchStore.setKeyword(searchValue.value); + searchStore.setKeyword(input); searchStore.setIsLoading(true); searchStore.setCurrentPage(1); - lastSearchValue.value = searchValue.value; + lastSearchValue.value = input; } if (size.width < 1200) { emit('switchVisible'); diff --git a/app/.vitepress/src/components/header/HeaderSearch.vue b/app/.vitepress/src/components/header/HeaderSearch.vue index 5266e9c41..d90d02b24 100644 --- a/app/.vitepress/src/components/header/HeaderSearch.vue +++ b/app/.vitepress/src/components/header/HeaderSearch.vue @@ -36,9 +36,14 @@ const isDark = computed(() => (appearanceStore.theme === 'dark' ? true : false)) // 搜索事件 function handleSearchEvent() { + const input = searchInput.value.trim(); + if (!input) { + return; + } + isShowDrawer.value = false; - handleSearch(searchInput.value); - window.open(`${import.meta.env.VITE_MAIN_DOMAIN_URL}/${lang.value}/other/search/?search=${encodeURIComponent(searchInput.value)}`, '_blank'); + handleSearch(input); + window.open(`${import.meta.env.VITE_MAIN_DOMAIN_URL}/${lang.value}/other/search/?search=${encodeURIComponent(input)}`, '_blank'); } // 点击热搜标签 const onTopSearchItemClick = (val: string) => { diff --git a/app/.vitepress/src/views/home/TheHome.vue b/app/.vitepress/src/views/home/TheHome.vue index 97d3b3ab0..44f56c87c 100644 --- a/app/.vitepress/src/views/home/TheHome.vue +++ b/app/.vitepress/src/views/home/TheHome.vue @@ -37,12 +37,16 @@ const gap = computed(() => { // -------------------- 搜索 -------------------- const searchValue = ref(''); -const enterSearchDoc = (val?: string) => { +const enterSearchDoc = (val: string) => { + if (!val.trim()) { + return; + } + if (lastRecommendCanceler) { lastRecommendCanceler('cancel'); } - const url = `${import.meta.env.VITE_MAIN_DOMAIN_URL}/${locale.value}/other/search/?search=${val}&type=docs&version=${searchStore.version}`; + const url = `${import.meta.env.VITE_MAIN_DOMAIN_URL}/${locale.value}/other/search/?search=${val.trim()}&type=docs&version=${searchStore.version}`; window.open(url, '_blank'); showSearchWord.value = false; }; -- Gitee