diff --git a/app/.vitepress/src/components/doc/DocBreadCrumb.vue b/app/.vitepress/src/components/doc/DocBreadCrumb.vue index 75d56b66ae16d08a2f0ac967aaddba1a1257f5ff..5669aec68eda20b130f79445275b4e1f4af73540 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) => { {{ t('home.docCenter') }} - {{ - nodeStore.moduleNode?.label + {{ + nodeStore.sceneNode?.label }} {{ searchStore.isSearching ? t('docs.searchResult') : currentTitle }} diff --git a/app/.vitepress/src/components/doc/DocType.vue b/app/.vitepress/src/components/doc/DocType.vue index 4f70d233407809b6a37b23dbd2158cd5620366a2..f05f9458433674e2414f61bad7a7aaca764e8f01 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 = () => { - {{ nodeStore.moduleNode?.label }} + {{ nodeStore.sceneNode?.label }} diff --git a/app/.vitepress/src/components/doc/DocTypeMobile.vue b/app/.vitepress/src/components/doc/DocTypeMobile.vue index 62352e62078309f2052f7bc30949fea7890f37f1..c3218b239336c30adef733294307c54074b6b75c 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) => { - {{ nodeStore.moduleNode?.label }} + {{ nodeStore.sceneNode?.label }} diff --git a/app/.vitepress/src/components/doc/DocVersion.vue b/app/.vitepress/src/components/doc/DocVersion.vue index bf6b7031beca14eec4cf15f8bf276d86db34b6f9..5d9d889ba4f3cda8f21b6a046bb49b061fd53f3c 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 b4b512806d63fcd3a31a520ca06ad6de030ea8b1..a9e4c293d8f36337eeda6d172553dd55e47fad8b 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 298773f944e33cbc30cf24eade3cb4a75ad48d84..f5aafb1570419f8c92b46c22822bcc56f957446d 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 714e9497c7bcb4c2e69a9a11d05fe9de648b7d9e..58f82142c3a035205f1e68b20dab46081016a7cd 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 2c4479e63d222040ed0df772b6462f9a8d1748a9..081beb78fca30ec015aba45b586a09ffd6f31ee8 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) => { {{ t('common.docCenter') }} - {{ - nodeStore.moduleNode!!.label + {{ + nodeStore.sceneNode!.label }} {{ node.label }} diff --git a/scripts/gen-toc.js b/scripts/gen-toc.js index 85432924660df376738b032a34b5b0d669be96d6..833895f0f29604f562a7885a3d32a84104a52c4d 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 || ''); diff --git a/scripts/merge.js b/scripts/merge.js index 9b5387bc0e3887b912227a629e29dd471f3354ef..8e00315911d76752a8adb5ef87f887067eff016b 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}`);
{{ nodeStore.moduleNode?.label }}
{{ nodeStore.sceneNode?.label }}