@fe-free/core 2.8.2 → 2.8.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +7 -0
- package/package.json +2 -2
- package/src/route/index.tsx +12 -4
package/CHANGELOG.md
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fe-free/core",
|
|
3
|
-
"version": "2.8.
|
|
3
|
+
"version": "2.8.3",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "./src/index.ts",
|
|
6
6
|
"author": "",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"remark-gfm": "^4.0.1",
|
|
42
42
|
"vanilla-jsoneditor": "^0.23.1",
|
|
43
43
|
"zustand": "^4.5.4",
|
|
44
|
-
"@fe-free/tool": "2.8.
|
|
44
|
+
"@fe-free/tool": "2.8.3"
|
|
45
45
|
},
|
|
46
46
|
"peerDependencies": {
|
|
47
47
|
"@ant-design/pro-components": "2.8.9",
|
package/src/route/index.tsx
CHANGED
|
@@ -1,20 +1,28 @@
|
|
|
1
1
|
import type { NavigateFunction } from 'react-router-dom';
|
|
2
2
|
import { generatePath } from 'react-router-dom';
|
|
3
3
|
|
|
4
|
+
window.__routeTool_navigate = null;
|
|
5
|
+
window.__routeTool_baseName = '';
|
|
6
|
+
|
|
4
7
|
const routeTool = {
|
|
5
8
|
_baseName: '' as string,
|
|
6
9
|
_navigate: null as NavigateFunction | null,
|
|
7
10
|
setNavigate: (navigate: NavigateFunction) => {
|
|
8
11
|
routeTool._navigate = navigate;
|
|
12
|
+
window.__routeTool_navigate = navigate;
|
|
9
13
|
},
|
|
10
14
|
setBaseName: (baseName: string) => {
|
|
11
15
|
routeTool._baseName = baseName;
|
|
16
|
+
window.__routeTool_baseName = baseName;
|
|
12
17
|
},
|
|
13
18
|
getNavigate: () => {
|
|
14
|
-
if (!routeTool._navigate) {
|
|
19
|
+
if (!routeTool._navigate && !window.__routeTool_navigate) {
|
|
15
20
|
throw new Error('routeTool need set navigate first');
|
|
16
21
|
}
|
|
17
|
-
return routeTool._navigate;
|
|
22
|
+
return routeTool._navigate || window.__routeTool_navigate;
|
|
23
|
+
},
|
|
24
|
+
getBaseName: () => {
|
|
25
|
+
return routeTool._baseName || window.__routeTool_baseName;
|
|
18
26
|
},
|
|
19
27
|
setSearchParams: (sp: Record<string, any>) => {
|
|
20
28
|
const url = new URL(window.location.href);
|
|
@@ -30,7 +38,7 @@ const routeTool = {
|
|
|
30
38
|
url.search = p.toString();
|
|
31
39
|
|
|
32
40
|
routeTool.getNavigate()(
|
|
33
|
-
`${url.pathname.replace(routeTool.
|
|
41
|
+
`${url.pathname.replace(routeTool.getBaseName(), '')}${url.search}${url.hash}`,
|
|
34
42
|
);
|
|
35
43
|
},
|
|
36
44
|
changeSearchParams: (sp: Record<string, any>) => {
|
|
@@ -46,7 +54,7 @@ const routeTool = {
|
|
|
46
54
|
});
|
|
47
55
|
|
|
48
56
|
routeTool.getNavigate()(
|
|
49
|
-
`${url.pathname.replace(routeTool.
|
|
57
|
+
`${url.pathname.replace(routeTool.getBaseName(), '')}${url.search}${url.hash}`,
|
|
50
58
|
);
|
|
51
59
|
},
|
|
52
60
|
navigateTo: ({
|