From 4015c051df48bf2daf0cfd3892d517ef97efbc20 Mon Sep 17 00:00:00 2001
From: luckyasme <807254037@qq.com>
Date: Thu, 3 Jul 2025 17:58:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=9D=A2=E5=8C=85?=
 =?UTF-8?q?=E5=B1=91=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/.vitepress/src/components/doc/DocBreadCrumb.vue |  6 +++---
 app/.vitepress/src/components/doc/DocType.vue       |  6 +++---
 app/.vitepress/src/components/doc/DocTypeMobile.vue |  6 +++---
 app/.vitepress/src/components/doc/DocVersion.vue    |  4 ++--
 app/.vitepress/src/layouts/LayoutDoc.vue            |  2 +-
 app/.vitepress/src/stores/node.ts                   | 12 ++++++------
 app/.vitepress/src/views/docs/TheDocsNode.vue       |  2 +-
 app/.vitepress/src/views/search/TheSearchResult.vue |  6 +++---
 scripts/gen-toc.js                                  |  2 +-
 9 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/.vitepress/src/components/doc/DocBreadCrumb.vue b/app/.vitepress/src/components/doc/DocBreadCrumb.vue
index 75d56b66a..5669aec68 100644
--- a/app/.vitepress/src/components/doc/DocBreadCrumb.vue
+++ b/app/.vitepress/src/components/doc/DocBreadCrumb.vue
@@ -22,7 +22,7 @@ const showModuleItem = computed(() => {
 
 // -------------------- 当前节点标题 --------------------
 const currentTitle = computed(() => {
-  return viewStore.isOverview ? nodeStore.moduleNode?.label : nodeStore.pageNode?.label;
+  return viewStore.isOverview ? nodeStore.sceneNode?.label : nodeStore.pageNode?.label;
 });
 
 // -------------------- 跳转 --------------------
@@ -47,8 +47,8 @@ const goToPage = (href: string) => {
       <!-- 文档聚合页 -->
       <OBreadcrumbItem :href="`/${locale}/`" @click.prevent="goToPage(`/${locale}/`)">{{ t('home.docCenter') }}</OBreadcrumbItem>
       <!-- 模块 -->
-      <OBreadcrumbItem v-if="showModuleItem" :href="nodeStore.moduleNode?.href || ''" @click.prevent="goToPage(nodeStore.moduleNode?.href || '')">{{
-        nodeStore.moduleNode?.label
+      <OBreadcrumbItem v-if="showModuleItem" :href="nodeStore.sceneNode?.href || ''" @click.prevent="goToPage(nodeStore.sceneNode?.href || '')">{{
+        nodeStore.sceneNode?.label
       }}</OBreadcrumbItem>
       <!-- 当前节点 -->
       <OBreadcrumbItem>{{ searchStore.isSearching ? t('docs.searchResult') : currentTitle }}</OBreadcrumbItem>
diff --git a/app/.vitepress/src/components/doc/DocType.vue b/app/.vitepress/src/components/doc/DocType.vue
index 4f70d2334..f05f94584 100644
--- a/app/.vitepress/src/components/doc/DocType.vue
+++ b/app/.vitepress/src/components/doc/DocType.vue
@@ -53,7 +53,7 @@ watch(visible, (val) => {
 });
 
 const isActive = (href: string) => {
-  return nodeStore.moduleNode?.href === getVersionHref(href);
+  return nodeStore.sceneNode?.href === getVersionHref(href);
 };
 
 const getVersionHref = (href: string) => {
@@ -64,7 +64,7 @@ const getVersionHref = (href: string) => {
 
 const onClickItem = async (href: string) => {
   const newHref = route.path.includes('/docs/common/') || href.includes('/docs/common/') ? href : getVersionHref(href);
-  if (nodeStore.moduleNode?.href === newHref) {
+  if (nodeStore.sceneNode?.href === newHref) {
     return;
   }
   reportDocTypeClick();
@@ -98,7 +98,7 @@ const reportDocTypeClick = () => {
   <div>
     <ODropdown v-model:visible="visible" trigger="hover" option-position="bl">
       <div class="doc-type-wrap hover-icon-rotate">
-        <p class="doc-type">{{ nodeStore.moduleNode?.label }}</p>
+        <p class="doc-type">{{ nodeStore.sceneNode?.label }}</p>
         <OIcon class="icon"><IconChevronDown /></OIcon>
       </div>
       <template #dropdown>
diff --git a/app/.vitepress/src/components/doc/DocTypeMobile.vue b/app/.vitepress/src/components/doc/DocTypeMobile.vue
index 62352e620..c3218b239 100644
--- a/app/.vitepress/src/components/doc/DocTypeMobile.vue
+++ b/app/.vitepress/src/components/doc/DocTypeMobile.vue
@@ -57,12 +57,12 @@ const getVersionHref = (href: string) => {
 };
 
 const isActive = (href: string) => {
-  return nodeStore.moduleNode?.href === getVersionHref(href);
+  return nodeStore.sceneNode?.href === getVersionHref(href);
 };
 
 const onClickItem = async (href: string) => {
   const newHref = route.path.includes('/docs/common/') || href.includes('/docs/common/') ? href : getVersionHref(href);
-  if (nodeStore.moduleNode?.href === newHref) {
+  if (nodeStore.sceneNode?.href === newHref) {
     return;
   }
 
@@ -88,7 +88,7 @@ const onClickItem = async (href: string) => {
 
 <template>
   <div class="doc-type-mb" @click="showDlg = true">
-    <p class="text">{{ nodeStore.moduleNode?.label }}</p>
+    <p class="text">{{ nodeStore.sceneNode?.label }}</p>
     <OIcon class="icon"><IconChevronDown /></OIcon>
   </div>
 
diff --git a/app/.vitepress/src/components/doc/DocVersion.vue b/app/.vitepress/src/components/doc/DocVersion.vue
index bf6b7031b..5d9d889ba 100644
--- a/app/.vitepress/src/components/doc/DocVersion.vue
+++ b/app/.vitepress/src/components/doc/DocVersion.vue
@@ -26,11 +26,11 @@ const changeVersion = async (item: { value: string; href?: string }) => {
     return;
   }
 
-  if (!nodeStore.moduleNode) {
+  if (!nodeStore.sceneNode) {
     return;
   }
 
-  const arr = nodeStore.moduleNode.href!.split('/');
+  const arr = nodeStore.sceneNode.href!.split('/');
   arr[3] = item.value;
 
   if (await isPageExist(arr.join('/'))) {
diff --git a/app/.vitepress/src/layouts/LayoutDoc.vue b/app/.vitepress/src/layouts/LayoutDoc.vue
index b4b512806..a9e4c293d 100644
--- a/app/.vitepress/src/layouts/LayoutDoc.vue
+++ b/app/.vitepress/src/layouts/LayoutDoc.vue
@@ -182,7 +182,7 @@ const onChangeNodeIndex = (value: number) => {
 // -------------------- 文档模块menu --------------------
 const docsMenu = computed(() => {
   if (viewStore.isOverview) {
-    return nodeStore.moduleNode?.children || [];
+    return nodeStore.sceneNode?.children || [];
   }
 
   return nodeStore.manualNode ? [nodeStore.manualNode] : [];
diff --git a/app/.vitepress/src/stores/node.ts b/app/.vitepress/src/stores/node.ts
index 298773f94..f5aafb157 100644
--- a/app/.vitepress/src/stores/node.ts
+++ b/app/.vitepress/src/stores/node.ts
@@ -49,11 +49,11 @@ export const useNodeStore = defineStore('node', () => {
     return node;
   });
 
-  // 模块节点
-  const moduleNode = computed(() => {
-    const node = rootTree.root.children.find((item) => item.href && pathname.value.includes(item.href.replace('index.html', '')));
-    if (node && pathname.value.toLocaleLowerCase().includes('/tools/')) {
-      return node.children.find((item) => item.href && pathname.value.includes(item.href.replace('index.html', '')));
+  // 场景节点
+  const sceneNode = computed(() => {
+    let node: DocMenuNodeT | null = pageNode.value;
+    while (node && node.type !== 'scene-page') {
+      node = node.parent;
     }
 
     return node;
@@ -68,7 +68,7 @@ export const useNodeStore = defineStore('node', () => {
     currentNode, // 当前节点
     pageNode, // 页面节点
     manualNode, // 手册节点
-    moduleNode, // 模块节点
+    sceneNode, // 场景节点
     prevNodes, // 所有前驱节点
   };
 });
diff --git a/app/.vitepress/src/views/docs/TheDocsNode.vue b/app/.vitepress/src/views/docs/TheDocsNode.vue
index 714e9497c..58f82142c 100644
--- a/app/.vitepress/src/views/docs/TheDocsNode.vue
+++ b/app/.vitepress/src/views/docs/TheDocsNode.vue
@@ -23,7 +23,7 @@ const space = computed(() => {
 
 const nodeStore = useNodeStore();
 const manaulNodes = computed(() => {
-  return nodeStore.moduleNode ? nodeStore.moduleNode.children : [];
+  return nodeStore.sceneNode ? nodeStore.sceneNode.children : [];
 });
 
 // -------------------- 优化节点层级，和左侧菜单保持一致 --------------------
diff --git a/app/.vitepress/src/views/search/TheSearchResult.vue b/app/.vitepress/src/views/search/TheSearchResult.vue
index 2c4479e63..081beb78f 100644
--- a/app/.vitepress/src/views/search/TheSearchResult.vue
+++ b/app/.vitepress/src/views/search/TheSearchResult.vue
@@ -62,7 +62,7 @@ watch(
 const searchResult = async () => {
   try {
     searchStore.setIsLoading(true);
-    const url = (viewStore.isOverview ? nodeStore.moduleNode?.href : nodeStore.manualNode?.href) || route.path;
+    const url = (viewStore.isOverview ? nodeStore.sceneNode?.href : nodeStore.manualNode?.href) || route.path;
     const res = await getSearchDocs({
       keyword: searchStore.keyword,
       lang: locale.value,
@@ -157,8 +157,8 @@ const goToPage = (href: string) => {
                 </template>
                 <OBreadcrumbItem :href="`/${locale}/`" @click.prevent="goToPage(`/${locale}/`)">{{ t('common.docCenter') }}</OBreadcrumbItem>
                 <!-- 模块 -->
-                <OBreadcrumbItem :href="nodeStore.moduleNode!!.href" @click.prevent="goToPage(nodeStore.moduleNode!!.href as string)">{{
-                  nodeStore.moduleNode!!.label
+                <OBreadcrumbItem :href="nodeStore.sceneNode!!.href" @click.prevent="goToPage(nodeStore.sceneNode!.href as string)">{{
+                  nodeStore.sceneNode!.label
                 }}</OBreadcrumbItem>
                 <OBreadcrumbItem v-for="node in item.sourceData" :key="node.id">{{ node.label }}</OBreadcrumbItem>
               </OBreadcrumb>
diff --git a/scripts/gen-toc.js b/scripts/gen-toc.js
index 854329246..833895f0f 100644
--- a/scripts/gen-toc.js
+++ b/scripts/gen-toc.js
@@ -279,7 +279,7 @@ async function mergeSections(filePath, upstream) {
       const { data } = matter(indexContent);
       if (data.overview) {
         toc.href = parseHref(path.join(currenDirName, 'index.md'), toc.label || '');
-        toc.type = 'page';
+        toc.type = 'scene-page';
       }
     } else {
       toc.href = parseHref(currenDirName, toc.label || '');
-- 
Gitee


From ac55c0550508cbe43ef8cdaab112e53bfd18ac84 Mon Sep 17 00:00:00 2001
From: luckyasme <807254037@qq.com>
Date: Thu, 3 Jul 2025 18:57:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/merge.js | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/scripts/merge.js b/scripts/merge.js
index 9b5387bc0..8e0031591 100644
--- a/scripts/merge.js
+++ b/scripts/merge.js
@@ -115,14 +115,8 @@ function replaceCommonNginxRedirect(branchName) {
       i++;
     }
 
-    if (rewrites.length > 0) {
-      const nginxContent = fs.readFileSync(path.join(BUILD_DIR, 'deploy/nginx/nginx.conf'), 'utf8').replace('#[rewrite_template]', rewrites.join(''));
-      console.log(nginxContent);
-      fs.writeFileSync(path.join(BUILD_DIR, 'deploy/nginx/nginx.conf'), nginxContent, 'utf8');
-    } else {
-      fs.writeFileSync(path.join(BUILD_DIR, 'deploy/nginx/nginx.conf'), nginxContent.replace('#[rewrite_template]', ''), 'utf8');
-    }
-
+    const nginxContent = fs.readFileSync(path.join(BUILD_DIR, 'deploy/nginx/nginx.conf'), 'utf8').replace('#[rewrite_template]', rewrites.join(''));
+    fs.writeFileSync(path.join(BUILD_DIR, 'deploy/nginx/nginx.conf'), nginxContent, 'utf8');
     console.log(`替换nginx转发成功`);
   } catch (err) {
     console.log(`替换nginx转发内容失败，错误原因：${err?.message}`);
-- 
Gitee