@fe-free/core 2.8.9 → 2.8.11

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @fe-free/core
 
+## 2.8.11
+
+### Patch Changes
+
+- feat: react
+  - @fe-free/tool@2.8.11
+
+## 2.8.10
+
+### Patch Changes
+
+- fix: update
+  - @fe-free/tool@2.8.10
+
 ## 2.8.9
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "2.8.9",
+  "version": "2.8.11",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
@@ -42,13 +42,13 @@
     "safe-stable-stringify": "^2.5.0",
     "vanilla-jsoneditor": "^0.23.1",
     "zustand": "^4.5.4",
-    "@fe-free/tool": "2.8.9"
+    "@fe-free/tool": "2.8.11"
   },
   "peerDependencies": {
     "@ant-design/pro-components": "2.8.9",
     "antd": "^5.27.1",
     "dayjs": "~1.11.10",
-    "react": "^18.2.0"
+    "react": "^19.2.0"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/button/index.tsx

@@ -9,11 +9,15 @@ function LoadingButton(props: ButtonProps) {
 
   const handleClick = useCallback(
     (event) => {
-      setLoading(true);
+      const result = onClick && onClick(event);
 
-      Promise.resolve(onClick && onClick(event)).finally(() => {
-        setLoading(false);
-      });
+      if (result && typeof (result as Promise<void>).then === 'function') {
+        setLoading(true);
+
+        Promise.resolve(result).finally(() => {
+          setLoading(false);
+        });
+      }
     },
     [onClick],
   );

package/src/core_app/index.tsx

@@ -7,6 +7,13 @@ import { BrowserRouter as Router, useNavigate } from 'react-router-dom';
 import { routeTool } from '../route';
 import { customValueTypeMap } from '../value_type_map';
 
+function getPathname(src?: string) {
+  if (!src) {
+    return null;
+  }
+  return src.startsWith('/') ? src : new URL(src).pathname;
+}
+
 function CheckUpdate({ basename }: { basename: string }) {
   const { modal } = App.useApp();
 
@@ -24,7 +31,7 @@ function CheckUpdate({ basename }: { basename: string }) {
       const doc = parser.parseFromString(html, 'text/html');
       const nextMainScript = doc.querySelector('[data-name="mainScript"]');
       const src = nextMainScript?.getAttribute('src');
-      return src ? new URL(src).pathname : null;
+      return getPathname(src || undefined);
     }
 
     let ing = false;
@@ -50,7 +57,7 @@ function CheckUpdate({ basename }: { basename: string }) {
     }
 
     const src = mainScript.getAttribute('src');
-    const pathname = src ? new URL(src).pathname : null;
+    const pathname = getPathname(src || undefined);
 
     const checkUpdateInterval = parseInt(
       localStorage.getItem('__free-checkUpdateInterval') || '60000',

package/src/route/index.tsx

@@ -68,9 +68,14 @@ const routeTool = {
   }) => {
     const sp = new URLSearchParams(searchParams);
 
-    routeTool.getNavigate()(
-      `${generatePath(path, params)}${searchParams ? `?${sp.toString()}` : ''}`,
-    );
+    try {
+      routeTool.getNavigate()(
+        `${generatePath(path, params)}${searchParams ? `?${sp.toString()}` : ''}`,
+      );
+    } catch (e) {
+      console.log('routeTool.navigateTo generatePath error', path, params);
+      console.log(e);
+    }
   },
 };