@solar-taro/core 1.5.1 → 1.5.2
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 +4 -0
- package/package.json +1 -1
- package/services/router.d.ts +10 -0
- package/services/router.js +15 -2
- package/services/router.js.map +1 -1
package/CHANGELOG.md
CHANGED
package/package.json
CHANGED
package/services/router.d.ts
CHANGED
|
@@ -5,6 +5,9 @@ export declare class Router {
|
|
|
5
5
|
*/
|
|
6
6
|
get eventChannel(): EventChannel;
|
|
7
7
|
get params(): Partial<Record<string, string>>;
|
|
8
|
+
/**
|
|
9
|
+
* 当前页面路径，不包含 params
|
|
10
|
+
*/
|
|
8
11
|
get path(): string;
|
|
9
12
|
/**
|
|
10
13
|
* 重启某个页面
|
|
@@ -19,6 +22,7 @@ export declare class Router {
|
|
|
19
22
|
* @param params 页面参数
|
|
20
23
|
*/
|
|
21
24
|
relaunch(pkg: string, page: string, params?: Record<string | number, any>): Promise<TaroGeneral.CallbackResult>;
|
|
25
|
+
relaunchByUrl(url: string): Promise<TaroGeneral.CallbackResult>;
|
|
22
26
|
/**
|
|
23
27
|
* 重定向到某个页面
|
|
24
28
|
* @param page 页面名
|
|
@@ -32,6 +36,7 @@ export declare class Router {
|
|
|
32
36
|
* @param params 页面参数
|
|
33
37
|
*/
|
|
34
38
|
redirect(pkg: string, page: string, params?: Record<string | number, any>): Promise<TaroGeneral.CallbackResult>;
|
|
39
|
+
redirectByUrl(url: string): Promise<TaroGeneral.CallbackResult>;
|
|
35
40
|
/**
|
|
36
41
|
* 导航到某个页面
|
|
37
42
|
* @param page
|
|
@@ -55,6 +60,11 @@ export declare class Router {
|
|
|
55
60
|
}): Promise<TaroGeneral.CallbackResult & {
|
|
56
61
|
eventChannel: EventChannel;
|
|
57
62
|
}>;
|
|
63
|
+
navigateByUrl(url: string, events?: {
|
|
64
|
+
[event: string]: (...args: any) => void;
|
|
65
|
+
}): Promise<TaroGeneral.CallbackResult & {
|
|
66
|
+
eventChannel: EventChannel;
|
|
67
|
+
}>;
|
|
58
68
|
/**
|
|
59
69
|
* 返回到某一页面
|
|
60
70
|
* @param delta 返回几页
|
package/services/router.js
CHANGED
|
@@ -12,16 +12,26 @@ export class Router {
|
|
|
12
12
|
var _a, _b;
|
|
13
13
|
return (_b = (_a = getCurrentInstance().router) === null || _a === void 0 ? void 0 : _a.params) !== null && _b !== void 0 ? _b : {};
|
|
14
14
|
}
|
|
15
|
+
/**
|
|
16
|
+
* 当前页面路径，不包含 params
|
|
17
|
+
*/
|
|
15
18
|
get path() {
|
|
16
|
-
|
|
17
|
-
|
|
19
|
+
const path = getCurrentInstance().router.path;
|
|
20
|
+
// 确保以 / 开头：在 app launch 里获取到的 path 没有 /，在 page 里获取到的就有 /
|
|
21
|
+
return path.startsWith('/') ? path : `/${path}`;
|
|
18
22
|
}
|
|
19
23
|
relaunch(pkgOrPage, pageOrParams, params) {
|
|
20
24
|
return reLaunch({ url: this.buildUrl(pkgOrPage, pageOrParams, params) });
|
|
21
25
|
}
|
|
26
|
+
relaunchByUrl(url) {
|
|
27
|
+
return reLaunch({ url });
|
|
28
|
+
}
|
|
22
29
|
redirect(pkgOrPage, pageOrParams, params) {
|
|
23
30
|
return redirectTo({ url: this.buildUrl(pkgOrPage, pageOrParams, params) });
|
|
24
31
|
}
|
|
32
|
+
redirectByUrl(url) {
|
|
33
|
+
return redirectTo({ url });
|
|
34
|
+
}
|
|
25
35
|
navigate(pkgOrPage, pageOrParams, paramsOrEvents, events) {
|
|
26
36
|
// 分包页面
|
|
27
37
|
if (typeof pageOrParams === 'string') {
|
|
@@ -31,6 +41,9 @@ export class Router {
|
|
|
31
41
|
return navigateTo({ url: this.buildUrl(pkgOrPage, pageOrParams), events: paramsOrEvents });
|
|
32
42
|
}
|
|
33
43
|
}
|
|
44
|
+
navigateByUrl(url, events) {
|
|
45
|
+
return navigateTo({ url, events });
|
|
46
|
+
}
|
|
34
47
|
/**
|
|
35
48
|
* 返回到某一页面
|
|
36
49
|
* @param delta 返回几页
|
package/services/router.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../../packages/core/src/services/router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAgB,kBAAkB,EAAE,eAAe,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAEjI,MAAM,OAAO,MAAM;IACjB;;OAEG;IACH,IAAI,YAAY;;QACd,OAAO,MAAA,MAAA,kBAAkB,EAAE,CAAC,IAAI,0CAAE,qBAAqB,kDAAoB,CAAC;IAC9E,CAAC;IAED,IAAI,MAAM;;QACR,OAAO,MAAA,MAAA,kBAAkB,EAAE,CAAC,MAAM,0CAAE,MAAM,mCAAI,EAAE,CAAA;IAClD,CAAC;IAED,IAAI,IAAI
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../../packages/core/src/services/router.ts"],"names":[],"mappings":"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"}
|