Merge pull request #915 from chat2db/dev

location
CodePhiliaX · Dec 5, 2023 · 6d4a0cb · 6d4a0cb
2 parents 497abbd + ed91f79
commit 6d4a0cb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/chat2db-client/src/pages/main/index.tsx b/chat2db-client/src/pages/main/index.tsx
@@ -25,6 +25,9 @@ import Connection from './connection';
 import Team from './team';
 import Setting from '@/blocks/Setting';
 
+// ----- utils -----
+import { generateUrl } from '@/utils/url';
+
 import styles from './index.less';
 import { useUpdateEffect } from '@/hooks';
 
@@ -68,7 +71,9 @@ function MainPage() {
   const [navConfig, setNavConfig] = useState<INavItem[]>(initNavConfig);
   const [userInfo, setUserInfo] = useState<ILoginUser>();
   const mainPageActiveTab = useMainStore((state) => state.mainPageActiveTab);
-  const [activeNavKey, setActiveNavKey] = useState<string>(window.location.pathname.split('/')[1] || mainPageActiveTab);
+  const [activeNavKey, setActiveNavKey] = useState<string>(
+    __ENV__ === 'desktop' ? mainPageActiveTab : window.location.pathname.split('/')[1] || mainPageActiveTab,
+  );
 
   useEffect(() => {
     handleInitPage();
@@ -88,7 +93,7 @@ function MainPage() {
       navConfig[activeIndex].isLoad = true;
       setNavConfig([...navConfig]);
       // 桌面端跳转这里应该要换TODO:
-      const href = window.location.origin + '/' + activeNavKey;
+      const href = generateUrl(activeNavKey);
       window.history.pushState({}, '', href);
     }
   }, [activeNavKey]);

diff --git a/chat2db-client/src/utils/url.ts b/chat2db-client/src/utils/url.ts
@@ -73,3 +73,16 @@ export function formatParams(obj: { [key: string]: any }) {
   });
   return params.toString();
 }
+
+/**
+ * 生成url
+ * @param key
+ * @returns
+ */
+
+export function generateUrl(key: string) { 
+  if (__ENV__ === 'desktop') {
+    return window.location.href + '/#/' + key;
+  }
+  return window.location.origin + '/' + key;
+}