Merge pull request #149 from hocgin/feature-scss

Feature scss
hocgin · Nov 3, 2023 · 3ff978d · 3ff978d
2 parents 590682a + 0cb6efa
commit 3ff978d
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 36 deletions.
diff --git a/package.json b/package.json
@@ -109,8 +109,8 @@
     "zeed-dom": "0.9.19"
   },
   "peerDependencies": {
-    "@hocgin/ahooks-kit": "^2.0.125",
-    "@hocgin/hkit": "^2.0.125",
+    "@hocgin/ahooks-kit": "^2.0.126",
+    "@hocgin/hkit": "^2.0.126",
     "antd": "^5.1.2",
     "react": "18.x",
     "react-dom": "18.x"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/Header/components/Header/index.tsx b/src/Header/components/Header/index.tsx
@@ -29,9 +29,7 @@ const HeaderMenu: React.FC<Props> = ({ menus, prefix, suffix, ...props }) => {
   let [isOpenMenu, setIsOpenMenu] = useState(responsive?.middle);
   let [user, setUser] = useState<any>(PromiseKit.CacheKit.getUser());
   let { run, loading } = useRequest(
-    async () => {
-      return await DoveService.getCurrentUser(false);
-    },
+    async () => await DoveService.getCurrentUser(false),
     {
       manual: true,
       onSuccess: (data) => {
@@ -91,7 +89,9 @@ const HeaderMenu: React.FC<Props> = ({ menus, prefix, suffix, ...props }) => {
               ) : (
                 <a
                   className={`${prefixCls}-login`}
-                  href={`/login?redirectUrl=${window?.location?.href}`}
+                  href={`/login?redirectUrl=${
+                    typeof window !== 'undefined' ? window?.location?.href : ''
+                  }`}
                 >
                   登陆
                 </a>