diff --git a/app/.vitepress/src/components/doc/DocBreadCrumb.vue b/app/.vitepress/src/components/doc/DocBreadCrumb.vue
index 8440c57654b261e4e3c98fc565d16ce864315e6f..24ca140bfe328af380c05c81c1a0727512bc891a 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/DocBugDialog.vue b/app/.vitepress/src/components/doc/DocBugDialog.vue
index 2214bc71cfb72b6327d5e6e8e2bc37cc7a66a8f4..49b7635d0957eee36a5aebd8e05a6ed1ebf0f89d 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/DocPagination.vue b/app/.vitepress/src/components/doc/DocPagination.vue
index e62ca1501f76d30123501ec7d04abb94bd43513a..2d5a48fd8ed83d2ea76518e64d9e46ed5fa3f675 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(() => {
     <ODivider />
     <div class="doc-footer-content">
       <div class="link-item">
-        <a :href="config.prevHref" v-if="config.prevHref && config.prevLabel">
+        <a :href="config.prevHref" v-if="config.prevHref && config.prevLabel" @click="emits('page-change', 'prev')">
           <OIcon>
             <OIconArrowLeft />
           </OIcon>
@@ -54,7 +58,7 @@ const config = computed(() => {
         </a>
       </div>
       <div class="link-item">
-        <a :href="config.nextHref" v-if="config.nextHref && config.nextLabel">
+        <a :href="config.nextHref" v-if="config.nextHref && config.nextLabel" @click="emits('page-change', 'next')">
           <span>{{ t('docs.next') }}</span>
           <span class="link-text">{{ config.nextLabel }}</span>
           <OIcon>
diff --git a/app/.vitepress/src/components/doc/DocSearch.vue b/app/.vitepress/src/components/doc/DocSearch.vue
index 7ac238922cd0fb2da265b3e82d199a88f47fe553..bc287aae6e8c6e56132c96605302658ef245d2ce 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 5266e9c41b01df52211fc0be853a2dc512a7abe1..d90d02b24fc69da080dde61b0164a5de750a3d4f 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/layouts/LayoutDoc.vue b/app/.vitepress/src/layouts/LayoutDoc.vue
index f4f6f3b95d1b08727086978a66bef393bdd917bd..c1df43629c32ce7f5b4e0f856e2d49d2649fef23 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(() => {
         <!-- 文档模块总览 -->
         <TheDocsNode v-if="!isSearching && viewStore.isOverview" @change-node-index="onChangeNodeIndex" />
         <!-- 文档内容 -->
-        <TheDocsArticle v-else-if="!isSearching && !viewStore.isOverview" @change-anchor="onChangeAnchor" />
+        <TheDocsArticle v-else-if="!isSearching && !viewStore.isOverview" @change-anchor="onChangeAnchor" @page-change="onPageChange" />
         <!-- 搜索结果 -->
         <TheSearchResult v-else :node="docsMenu" />
       </div>
diff --git a/app/.vitepress/src/views/docs/TheDocsArticle.vue b/app/.vitepress/src/views/docs/TheDocsArticle.vue
index 57d2862687a327bb57b02771e102909f84b60386..a8f939027032f4b4726bb5d4b36fc8f0473f3e27 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');
   }
 };
-
 </script>
 
 <template>
@@ -131,7 +131,7 @@ const onClickContent = (evt: PointerEvent) => {
     <Content class="markdown-body" @click="onClickContent" />
     <GiteeViewSource />
     <ClientOnly>
-      <DocPagination :node="nodeStore.manualNode ? [nodeStore.manualNode] : []" />
+      <DocPagination :node="nodeStore.manualNode ? [nodeStore.manualNode] : []" @page-change="(type) => emits('page-change', type)" />
     </ClientOnly>
   </div>
 </template>
diff --git a/app/.vitepress/src/views/home/TheHome.vue b/app/.vitepress/src/views/home/TheHome.vue
index 97d3b3ab04b3e12837eafcd275ebce7627d9850f..44f56c87cf922cbd8a5a58120ddce6206cbc9d57 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;
 };