From 39261866312ca0fcf0bea8aa4ca34dc7f3d3c748 Mon Sep 17 00:00:00 2001
From: luckyasme <807254037@qq.com>
Date: Fri, 14 Mar 2025 16:07:13 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?gitee?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/GiteeViewSource.vue        | 49 +++++++++++++++++++
 docs/.vitepress/src/layouts/LayoutDoc.vue     | 43 ----------------
 2 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/docs/.vitepress/src/components/GiteeViewSource.vue b/docs/.vitepress/src/components/GiteeViewSource.vue
index cd85af7..e40403b 100644
--- a/docs/.vitepress/src/components/GiteeViewSource.vue
+++ b/docs/.vitepress/src/components/GiteeViewSource.vue
@@ -3,8 +3,10 @@ import { onMounted, ref, watch } from 'vue';
 import { isClient, OIcon } from '@opensig/opendesign';
 
 import IconOutLink from '~icons/app/icon-outlink.svg';
+
 import { getGiteeUrl } from '@/utils/common';
 import { useMenuStore } from '@/stores/menu';
+import { useScreen } from '@/composables/useScreen';
 
 const menuStore = useMenuStore();
 const giteeUrl = ref('');
@@ -21,6 +23,53 @@ watch(
 onMounted(() => {
   giteeUrl.value = getGiteeUrl();
 });
+
+// -------------------- 移动端插入gitee --------------------
+const { isPhone } = useScreen();
+
+const insertGiteeBtn = () => {
+  if (isPhone.value) {
+    const link = document.querySelector<HTMLElement>('.markdown-body .gitee') as HTMLAnchorElement;
+    if (link) {
+      link.href = getGiteeUrl();
+      return;
+    }
+
+    const titleDom = document.querySelector<HTMLElement>('.markdown-body h1');
+    if (titleDom && titleDom.nextSibling) {
+      titleDom.style.margin = '0';
+      const container = document.createElement('div');
+      container.className = 'article-detail-container';
+      const a = document.createElement('a');
+      a.className = 'gitee';
+      a.href = getGiteeUrl();
+      a.target = '_blank';
+      a.textContent = '在Gitee上查看源文件';
+      const svgString = `
+        <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 32 32">
+          <path fill="currentColor" d="M14.123 3.2c0.442 0 0.8 0.358 0.8 0.8 0 0.398-0.29 0.728-0.67 0.79l-0.13 0.010h-8.523c-0.398 0-0.728 0.29-0.79 0.67l-0.010 0.13v20.8c0 0.398 0.29 0.728 0.67 0.79l0.13 0.010h20.8c0.398 0 0.728-0.29 0.79-0.67l0.010-0.13v-8.576c0-0.442 0.358-0.8 0.8-0.8 0.398 0 0.728 0.29 0.79 0.67l0.010 0.13v8.576c0 1.259-0.97 2.292-2.203 2.392l-0.197 0.008h-20.8c-1.259 0-2.292-0.97-2.392-2.203l-0.008-0.197v-20.8c0-1.259 0.97-2.292 2.203-2.392l0.197-0.008h8.523z"></path>
+          <path fill="currentColor" d="M26.755 4.194c0.314-0.311 0.82-0.309 1.131 0.005 0.276 0.279 0.305 0.71 0.088 1.021l-0.093 0.11-8.651 8.571c-0.314 0.311-0.82 0.309-1.131-0.005-0.276-0.279-0.305-0.71-0.088-1.021l0.093-0.11 8.651-8.571z"></path>
+          <path fill="currentColor" d="M26.667 3.2c1.113 0 2.027 0.852 2.125 1.939l0.009 0.194v6.667c0 0.442-0.358 0.8-0.8 0.8-0.398 0-0.728-0.29-0.79-0.67l-0.010-0.13v-6.667c0-0.258-0.183-0.473-0.426-0.522l-0.108-0.011h-6.667c-0.442 0-0.8-0.358-0.8-0.8 0-0.398 0.29-0.728 0.67-0.79l0.13-0.010h6.667z"> </path>
+        </svg>
+      `;
+      const parser = new DOMParser();
+      const svgDoc = parser.parseFromString(svgString, "image/svg+xml");
+      a.appendChild(svgDoc.documentElement);
+      container.appendChild(a);
+      titleDom.nextSibling.parentNode?.insertBefore(container, titleDom.nextSibling);
+    }
+  } else {
+    const link = document.querySelector<HTMLElement>('.markdown-body .gitee') as HTMLAnchorElement;
+    if (link) {
+      link.remove();
+    }
+  }
+};
+
+watch(isPhone, () => {
+  console.log('updated');
+  insertGiteeBtn();
+});
 </script>
 
 <template>
diff --git a/docs/.vitepress/src/layouts/LayoutDoc.vue b/docs/.vitepress/src/layouts/LayoutDoc.vue
index b78ba45..7629dea 100644
--- a/docs/.vitepress/src/layouts/LayoutDoc.vue
+++ b/docs/.vitepress/src/layouts/LayoutDoc.vue
@@ -30,7 +30,6 @@ import { getOffsetTop } from '@/utils/element';
 import { versions } from '@/config/version';
 import { scrollIntoView } from '@/utils/scroll-to';
 import { useDebounceFn } from '@vueuse/core';
-import { getGiteeUrl } from '@/utils/common';
 
 const { lePad, isPhone, gtPadV, size } = useScreen();
 const route = useRoute();
@@ -372,49 +371,7 @@ onUnmounted(() => {
   maskRef.value?.removeEventListener('click', handleOutClick);
 });
 
-// -------------------- gitee --------------------
-const insertGiteeBtn = () => {
-  if (isPhone.value) {
-    const link = document.querySelector<HTMLElement>('.markdown-body .gitee') as HTMLAnchorElement;
-    if (link) {
-      link.href = getGiteeUrl();
-      return;
-    }
 
-    const titleDom = document.querySelector<HTMLElement>('.markdown-body h1');
-    if (titleDom && titleDom.nextSibling) {
-      titleDom.style.margin = '0';
-      const container = document.createElement('div');
-      container.className = 'article-detail-container';
-      const a = document.createElement('a');
-      a.className = 'gitee';
-      a.href = getGiteeUrl();
-      a.target = '_blank';
-      a.textContent = '在Gitee上查看源文件';
-      const svgString = `
-        <svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 32 32">
-          <path fill="currentColor" d="M14.123 3.2c0.442 0 0.8 0.358 0.8 0.8 0 0.398-0.29 0.728-0.67 0.79l-0.13 0.010h-8.523c-0.398 0-0.728 0.29-0.79 0.67l-0.010 0.13v20.8c0 0.398 0.29 0.728 0.67 0.79l0.13 0.010h20.8c0.398 0 0.728-0.29 0.79-0.67l0.010-0.13v-8.576c0-0.442 0.358-0.8 0.8-0.8 0.398 0 0.728 0.29 0.79 0.67l0.010 0.13v8.576c0 1.259-0.97 2.292-2.203 2.392l-0.197 0.008h-20.8c-1.259 0-2.292-0.97-2.392-2.203l-0.008-0.197v-20.8c0-1.259 0.97-2.292 2.203-2.392l0.197-0.008h8.523z"></path>
-          <path fill="currentColor" d="M26.755 4.194c0.314-0.311 0.82-0.309 1.131 0.005 0.276 0.279 0.305 0.71 0.088 1.021l-0.093 0.11-8.651 8.571c-0.314 0.311-0.82 0.309-1.131-0.005-0.276-0.279-0.305-0.71-0.088-1.021l0.093-0.11 8.651-8.571z"></path>
-          <path fill="currentColor" d="M26.667 3.2c1.113 0 2.027 0.852 2.125 1.939l0.009 0.194v6.667c0 0.442-0.358 0.8-0.8 0.8-0.398 0-0.728-0.29-0.79-0.67l-0.010-0.13v-6.667c0-0.258-0.183-0.473-0.426-0.522l-0.108-0.011h-6.667c-0.442 0-0.8-0.358-0.8-0.8 0-0.398 0.29-0.728 0.67-0.79l0.13-0.010h6.667z"> </path>
-        </svg>
-      `;
-      const parser = new DOMParser();
-      const svgDoc = parser.parseFromString(svgString, "image/svg+xml");
-      a.appendChild(svgDoc.documentElement);
-      container.appendChild(a);
-      titleDom.nextSibling.parentNode?.insertBefore(container, titleDom.nextSibling);
-    }
-  } else {
-    const link = document.querySelector<HTMLElement>('.markdown-body .gitee') as HTMLAnchorElement;
-    if (link) {
-      link.remove();
-    }
-  }
-};
-
-onUpdated(() => {
-  insertGiteeBtn();
-});
 </script>
 
 <template>
-- 
Gitee


From ca4916d878e7c8c4677b6133bb49ca936b2a9c9a Mon Sep 17 00:00:00 2001
From: luckyasme <807254037@qq.com>
Date: Fri, 14 Mar 2025 16:48:18 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0dockerfile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                                    |  6 +--
 .../src/composables/useVisibleHeight.ts       | 51 -------------------
 2 files changed, 3 insertions(+), 54 deletions(-)
 delete mode 100644 docs/.vitepress/src/composables/useVisibleHeight.ts

diff --git a/Dockerfile b/Dockerfile
index 2e35efd..8d2e47e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18.14.1 as Builder
+FROM swr.cn-north-4.myhuaweicloud.com/opensourceway/node:latest as Builder
 
 RUN mkdir -p /home/openeuler/docs
 WORKDIR /home/openeuler/docs
@@ -8,9 +8,9 @@ RUN npm install pnpm -g
 RUN pnpm install
 RUN pnpm build
 
-FROM swr.cn-north-4.myhuaweicloud.com/opensourceway/openeuler/nginx:1.24.0-22.03-lts-sp1 as NginxBuilder
+FROM swr.cn-north-4.myhuaweicloud.com/opensourceway/openeuler/nginx:latest as NginxBuilder
 
-FROM openeuler/openeuler:22.03
+FROM swr.cn-north-4.myhuaweicloud.com/opensourceway/openeuler/base:latest
 
 ENV NGINX_CONFIG_FILE /etc/nginx/nginx.conf
 ENV NGINX_CONFIG_PATH /etc/nginx/
diff --git a/docs/.vitepress/src/composables/useVisibleHeight.ts b/docs/.vitepress/src/composables/useVisibleHeight.ts
deleted file mode 100644
index 0fa31e8..0000000
--- a/docs/.vitepress/src/composables/useVisibleHeight.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { isClient } from "@opensig/opendesign";
-import { onMounted, onUnmounted, readonly, ref } from "vue";
-
-export const useVisibleHeight = (parentSelector: string, childSelector: string) => {
-  const height = ref(0);
-  let observer: IntersectionObserver | null;
-
-  if (isClient) {
-    observer = new IntersectionObserver(
-      (entries) => {
-        entries.forEach((entry) => {
-          if (entry.isIntersecting) {
-            const parent = document.querySelector(parentSelector);
-            const child = document.querySelector<HTMLElement>(childSelector);
-            if (parent && child) {
-              const parentRect = parent.getBoundingClientRect();
-              const childRect = child.getBoundingClientRect();
-              const visibleTop = Math.max(0, childRect.top - parentRect.top);
-              const visibleBottom = Math.min(parentRect.bottom, childRect.bottom) - parentRect.top;
-              const visibleHeight = visibleBottom - visibleTop;
-              height.value = visibleHeight > 0 ? visibleHeight : 0;
-            }
-          } else {
-            height.value = 0;
-          }
-        });
-      },
-      {
-        threshold: Array.from({ length: 90 }, (_, i) => (i + 10) / 100),
-      }
-    );
-  }
-
-  onMounted(() => {
-    const footer = document.querySelector('.ly-footer');
-    if (footer) {
-      observer?.observe(footer);
-    }
-  });
-
-  onUnmounted(() => {
-    const footer = document.querySelector('.ly-footer');
-    if (footer) {
-      observer?.unobserve(footer);
-    }
-
-    observer = null;
-  });
-
-  return readonly(height);
-};
\ No newline at end of file
-- 
Gitee


From e04d91c4f6887d0d05a7a7085954e64a0356b159 Mon Sep 17 00:00:00 2001
From: luckyasme <807254037@qq.com>
Date: Fri, 14 Mar 2025 17:32:17 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/.vitepress/src/App.vue                     | 17 +++++------------
 .../src/components/GiteeViewSource.vue          |  7 ++++---
 docs/.vitepress/src/layouts/LayoutDoc.vue       |  9 ++++-----
 docs/.vitepress/src/stores/menu.ts              |  4 +---
 4 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/docs/.vitepress/src/App.vue b/docs/.vitepress/src/App.vue
index 4df67b7..94e7b82 100644
--- a/docs/.vitepress/src/App.vue
+++ b/docs/.vitepress/src/App.vue
@@ -1,41 +1,34 @@
 <script setup lang="ts">
-import { computed, ref } from 'vue';
+import { computed } from 'vue';
 import { useData, useRoute, useRouter } from 'vitepress';
 
 import { OScroller, OConfigProvider } from '@opensig/opendesign';
 import zhCN from '@opensig/opendesign/es/locale/lang/zh-cn';
 import enUS from '@opensig/opendesign/es/locale/lang/en-us';
 
-import TheHome from '@/views/home/TheHome.vue';
 import AppHeader from '@/components/header/AppHeader.vue';
-import AppFooter from '@/components/AppFooter.vue';
 import FloatingButton from '@/components/FloatingButton.vue';
 import FloatingButtonDocs from '@/components/FloatingButtonDocs.vue';
 import CookieNotice from '@/components/CookieNotice.vue';
-
 import LayoutDoc from '@/layouts/LayoutDoc.vue';
 
 import { scrollToTop } from '@/utils/common';
-
 import { useLocale } from '@/composables/useLocale';
-import { useMenuStore } from '@/stores/menu';
+
+const { frontmatter } = useData();
 
 // -------------------- 组件国际化 --------------------
 const { isZh, locale } = useLocale();
 
 // -------------------- 菜单 --------------------
-const menuStore = useMenuStore();
-
 const route = useRoute();
 const router = useRouter();
-const data = useData();
 
 // -------------------- 判断页面url --------------------
-const nodeVisible = computed(() => data.frontmatter.value.overview);
-
+const nodeVisible = computed(() => frontmatter.value.overview);
 
 // -------------------- 判断布局类型 --------------------
-const { frontmatter } = useData();
+
 const isCustomLayout = computed(() => {
   // 判断是否是首页
   const isHome = route.component?.name?.includes(`${locale.value}/index`);
diff --git a/docs/.vitepress/src/components/GiteeViewSource.vue b/docs/.vitepress/src/components/GiteeViewSource.vue
index e40403b..e2f6733 100644
--- a/docs/.vitepress/src/components/GiteeViewSource.vue
+++ b/docs/.vitepress/src/components/GiteeViewSource.vue
@@ -5,14 +5,15 @@ import { isClient, OIcon } from '@opensig/opendesign';
 import IconOutLink from '~icons/app/icon-outlink.svg';
 
 import { getGiteeUrl } from '@/utils/common';
-import { useMenuStore } from '@/stores/menu';
+
 import { useScreen } from '@/composables/useScreen';
+import { useRoute } from 'vitepress';
 
-const menuStore = useMenuStore();
 const giteeUrl = ref('');
+const route = useRoute();
 
 watch(
-  () => menuStore.url,
+  () => route.path,
   () => {
     if (isClient) {
       giteeUrl.value = getGiteeUrl();
diff --git a/docs/.vitepress/src/layouts/LayoutDoc.vue b/docs/.vitepress/src/layouts/LayoutDoc.vue
index 7629dea..d6d9ac7 100644
--- a/docs/.vitepress/src/layouts/LayoutDoc.vue
+++ b/docs/.vitepress/src/layouts/LayoutDoc.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { onMounted, onUnmounted, ref, computed, onUpdated, watch } from 'vue';
 import { storeToRefs } from 'pinia';
-import { Content, useRouter, useRoute } from 'vitepress';
+import { Content, useRouter, useRoute, useData } from 'vitepress';
 import { OIcon, ODropdown, ODropdownItem, OPopup, ODialog, ORadioGroup, ORadio, OToggle, OButton, ODivider, OScroller, useMessage } from '@opensig/opendesign';
 
 import AppFooter2 from '@/components/AppFooter2.vue';
@@ -31,6 +31,7 @@ import { versions } from '@/config/version';
 import { scrollIntoView } from '@/utils/scroll-to';
 import { useDebounceFn } from '@vueuse/core';
 
+const { hash } = useData();
 const { lePad, isPhone, gtPadV, size } = useScreen();
 const route = useRoute();
 const router = useRouter();
@@ -136,7 +137,7 @@ onMounted(() => {
   setTimeout(scrollIntoTitle, 300);
 });
 
-watch(() => menuStore.hash, () => {
+watch(hash, () => {
   setTimeout(scrollIntoTitle); // 延迟执行，避免切换了scroller位置没有变动导致移动移除
 });
 
@@ -370,8 +371,6 @@ onMounted(() => {
 onUnmounted(() => {
   maskRef.value?.removeEventListener('click', handleOutClick);
 });
-
-
 </script>
 
 <template>
@@ -566,7 +565,7 @@ onUnmounted(() => {
     align-items: center;
     color: var(--o-color-link1);
     text-decoration: none !important;
-    
+
     svg {
       color: var(--o-color-link1);
       width: 16px;
diff --git a/docs/.vitepress/src/stores/menu.ts b/docs/.vitepress/src/stores/menu.ts
index df277dd..f8c7bf2 100644
--- a/docs/.vitepress/src/stores/menu.ts
+++ b/docs/.vitepress/src/stores/menu.ts
@@ -7,7 +7,7 @@ import { useLocation } from '@/composables/useLocation';
 export const useMenuStore = defineStore('menu', () => {
   const rootTree = new DocMenuTree(MENU_CONFIG);
   const allNodes = rootTree.root.children;
-  const { url, hash } = useLocation();
+  const { url } = useLocation();
 
   // -------------------- 当前菜单节点 --------------------
   const currentNode = computed(() => {
@@ -71,8 +71,6 @@ export const useMenuStore = defineStore('menu', () => {
   });
 
   return {
-    url,
-    hash,
     menuValue, // 绑定菜单值
     menuExpanded, // 展开值
     rootTree, // 根节点
-- 
Gitee


From 3ed034b107aa9a5e2b35947d59a1c5b19eb887c2 Mon Sep 17 00:00:00 2001
From: luckyasme <807254037@qq.com>
Date: Fri, 14 Mar 2025 17:50:17 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../.vitepress/src/composables/useLocation.ts | 40 -------------------
 docs/.vitepress/src/stores/menu.ts            | 21 ++++++----
 2 files changed, 14 insertions(+), 47 deletions(-)
 delete mode 100644 docs/.vitepress/src/composables/useLocation.ts

diff --git a/docs/.vitepress/src/composables/useLocation.ts b/docs/.vitepress/src/composables/useLocation.ts
deleted file mode 100644
index 8d3e66a..0000000
--- a/docs/.vitepress/src/composables/useLocation.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { computed, onMounted, onUnmounted, readonly, ref } from 'vue';
-import { useRouter } from 'vitepress';
-import { isClient } from '@opensig/opendesign';
-
-export const useLocation = () => {
-  const router = useRouter();
-  const href = ref(isClient ? window.location.href : '');
-  const hash = ref(isClient ? window.location.hash : '');
-
-  const pathname = computed(() => router.route.path);
-  const url = computed(() => {
-    return isClient ? href.value.replace(window.location.origin, '') : '';
-  });
-
-  const hashchange = () => {
-    href.value = window.location.href || '';
-    hash.value = window.location.hash || '';
-  };
-
-  onMounted(() => {
-    window.addEventListener('hashchange', hashchange);
-  })
-
-  onUnmounted(() => {
-    window.removeEventListener('hashchange', hashchange);
-  })
-
-  
-  router.onAfterRouteChanged = () => {
-    hash.value = window.location.hash || '';
-    href.value = window.location.href || '';
-  };
-
-  return {
-    href: readonly(href),
-    hash: readonly(hash),
-    pathname,
-    url,
-  };
-}
diff --git a/docs/.vitepress/src/stores/menu.ts b/docs/.vitepress/src/stores/menu.ts
index f8c7bf2..66223d7 100644
--- a/docs/.vitepress/src/stores/menu.ts
+++ b/docs/.vitepress/src/stores/menu.ts
@@ -2,20 +2,27 @@ import { computed, onMounted, ref, watch } from 'vue';
 import { defineStore } from 'pinia';
 import { MENU_CONFIG } from '@/config/menu';
 import { DocMenuTree, type DocMenuNodeT } from '@/utils/tree';
-import { useLocation } from '@/composables/useLocation';
+import { useData } from 'vitepress';
 
 export const useMenuStore = defineStore('menu', () => {
   const rootTree = new DocMenuTree(MENU_CONFIG);
   const allNodes = rootTree.root.children;
-  const { url } = useLocation();
+  const { hash, page } = useData();
 
   // -------------------- 当前菜单节点 --------------------
   const currentNode = computed(() => {
-    const href = url.value.split('#')[0];
-    const node = rootTree.getNodeByHref(rootTree.root, decodeURIComponent(url.value));
-    const anchorNode = rootTree.getNodeByHref(rootTree.root, decodeURIComponent(href));
-    const indexNode = rootTree.getNodeByHref(rootTree.root, decodeURIComponent(href) + 'index.html');
-    return node || anchorNode || indexNode;
+    const href = `/${page.value.filePath.replace('.md', '.html')}`;
+    
+    // 是否为hash节点
+    if (hash.value) {
+      const hashHref = `/${page.value.filePath.replace('.md', '.html')}${decodeURIComponent(hash.value)}`;
+      const hashNode = rootTree.getNodeByHref(rootTree.root, hashHref);
+      if (hashNode) {
+        return hashNode;
+      }
+    }
+
+    return rootTree.getNodeByHref(rootTree.root, href);
   });
 
   // -------------------- 当前菜单节点的所有前驱节点 --------------------
-- 
Gitee