@fe-free/core 6.0.19 → 6.0.21

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @fe-free/core
 
+## 6.0.21
+
+### Patch Changes
+
+- nextjs
+- Updated dependencies
+  - @fe-free/tool@6.0.21
+  - @fe-free/icons@6.0.21
+
+## 6.0.20
+
+### Patch Changes
+
+- @fe-free/icons@6.0.20
+- @fe-free/tool@6.0.20
+
 ## 6.0.19
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "6.0.19",
+  "version": "6.0.21",
   "description": "React 业务核心组件库：CRUD、ProForm 扩展、布局、路由、树、上传等（Antd + ProComponents）",
   "license": "ISC",
   "author": "",
@@ -43,8 +43,8 @@
     "i18next-icu": "^2.4.1",
     "react": "^19.2.0",
     "react-i18next": "^16.4.0",
-    "@fe-free/icons": "6.0.19",
-    "@fe-free/tool": "6.0.19"
+    "@fe-free/icons": "6.0.21",
+    "@fe-free/tool": "6.0.21"
   },
   "scripts": {
     "i18n-extract": "rm -rf ./src/locales/zh-CN && npx i18next-cli extract"

package/src/button/index.tsx

@@ -8,13 +8,13 @@ function LoadingButton(props: ButtonProps) {
   const [loading, setLoading] = useState(false);
 
   const handleClick = useCallback(
-    (event) => {
+    (event: React.MouseEvent<HTMLElement>) => {
       const result = onClick && onClick(event);
 
       if (result && typeof (result as Promise<void>).then === 'function') {
         setLoading(true);
 
-        Promise.resolve(result).finally(() => {
+        void Promise.resolve(result).finally(() => {
           setLoading(false);
         });
       }

package/src/global/error.ts

@@ -6,9 +6,9 @@ import { AxiosError } from 'axios';
 class RequestError extends Error {
   silent: boolean | undefined;
   status: string | undefined;
-  config: AxiosRequestConfig<any> | undefined;
+  config: AxiosRequestConfig | undefined;
   request: XMLHttpRequest | undefined;
-  response: AxiosResponse<any, any> | undefined;
+  response: AxiosResponse<any> | undefined;
 
   constructor(
     message: string,
@@ -73,6 +73,10 @@ function commonHandleError(event) {
 }
 
 function initErrorHandle(onError?: (event: ErrorEvent | PromiseRejectionEvent) => void | false) {
+  if (typeof window === 'undefined') {
+    return () => {};
+  }
+
   const handleError = (event) => {
     const result = onError?.(event);
     if (result === false) {

package/src/i18n.tsx

@@ -72,8 +72,10 @@ function initI18n(
 
   console.log('initI18n', lng, resources);
 
-  // @ts-ignore
-  window._i18nResources = resources;
+  if (typeof window !== 'undefined') {
+    // @ts-ignore
+    window._i18nResources = resources;
+  }
 
   void i18n
     .use(LanguageDetector)

package/src/route/index.tsx

@@ -1,28 +1,49 @@
 import type { NavigateFunction } from 'react-router-dom';
 import { generatePath } from 'react-router-dom';
 
-window.__routeTool_navigate = null;
-window.__routeTool_baseName = '';
+type RouteToolWindow = Window & {
+  __routeTool_navigate?: NavigateFunction | null;
+  __routeTool_baseName?: string;
+};
+
+function getBrowserWindow() {
+  return typeof window === 'undefined' ? null : (window as RouteToolWindow);
+}
+
+function getGlobalNavigate() {
+  return getBrowserWindow()?.__routeTool_navigate || null;
+}
+
+function getGlobalBaseName() {
+  return getBrowserWindow()?.__routeTool_baseName || '';
+}
 
 const routeTool = {
   _baseName: '' as string,
   _navigate: null as NavigateFunction | null,
   setNavigate: (navigate: NavigateFunction) => {
     routeTool._navigate = navigate;
-    window.__routeTool_navigate = navigate;
+    const currentWindow = getBrowserWindow();
+    if (currentWindow) {
+      currentWindow.__routeTool_navigate = navigate;
+    }
   },
   setBaseName: (baseName: string) => {
     routeTool._baseName = baseName;
-    window.__routeTool_baseName = baseName;
+    const currentWindow = getBrowserWindow();
+    if (currentWindow) {
+      currentWindow.__routeTool_baseName = baseName;
+    }
   },
   getNavigate: () => {
-    if (!routeTool._navigate && !window.__routeTool_navigate) {
+    const navigate = routeTool._navigate || getGlobalNavigate();
+    if (!navigate) {
       throw new Error('routeTool need set navigate first');
     }
-    return routeTool._navigate || window.__routeTool_navigate;
+    return navigate;
   },
   getBaseName: () => {
-    return routeTool._baseName || window.__routeTool_baseName;
+    return routeTool._baseName || getGlobalBaseName();
   },
   generateUrl: ({
     path,
@@ -37,7 +58,12 @@ const routeTool = {
     return `${routeTool.getBaseName()}${generatePath(path, params)}${searchParams ? `?${sp.toString()}` : ''}`;
   },
   setSearchParams: (sp: Record<string, any>) => {
-    const url = new URL(window.location.href);
+    const currentWindow = getBrowserWindow();
+    if (!currentWindow) {
+      return;
+    }
+
+    const url = new URL(currentWindow.location.href);
 
     const p = new URLSearchParams();
     Object.keys(sp).forEach((key) => {
@@ -54,7 +80,12 @@ const routeTool = {
     );
   },
   changeSearchParams: (sp: Record<string, any>) => {
-    const url = new URL(window.location.href);
+    const currentWindow = getBrowserWindow();
+    if (!currentWindow) {
+      return;
+    }
+
+    const url = new URL(currentWindow.location.href);
 
     Object.keys(sp).forEach((key) => {
       const value = sp[key];