@tarojs/router 3.6.29 → 3.6.31-canary.0

package/dist/api.js

@@ -16,13 +16,14 @@ function processNavigateUrl(option) {
         const parts = routesAlias.getOrigin(history.location.pathname).split('/');
         parts.pop();
         pathPieces.pathname.split('/').forEach((item) => {
-            if (item === '.') {
+            if (item === '.')
                 return;
-            }
             item === '..' ? parts.pop() : parts.push(item);
         });
         pathPieces.pathname = parts.join('/');
     }
+    // 确保是 / 开头的路径
+    pathPieces.pathname = addLeadingSlash(pathPieces.pathname);
     // 处理自定义路由
     pathPieces.pathname = routesAlias.getAlias(addLeadingSlash(pathPieces.pathname));
     // 处理 basename
@@ -50,20 +51,10 @@ function navigate(option, method) {
             });
             try {
                 if ('url' in option) {
-                    if (!RouterConfig.isPage(addLeadingSlash(option.url))) {
-                        const res = { errMsg: `${method}:fail page ${option.url} is not found` };
-                        fail === null || fail === void 0 ? void 0 : fail(res);
-                        complete === null || complete === void 0 ? void 0 : complete(res);
-                        if (fail || complete) {
-                            return resolve(res);
-                        }
-                        else {
-                            return reject(res);
-                        }
-                    }
                     const pathPieces = processNavigateUrl(option);
                     const state = { timestamp: Date.now() };
                     if (method === 'navigateTo') {
+                        // Note: 由于 spa 会针对弱网情况下，短时间内多次跳转同一个页面跳转加了锁，后续如果有用户反馈返回无效，那可能是这个问题
                         history.push(pathPieces, state);
                     }
                     else if (method === 'redirectTo' || method === 'switchTab') {

package/dist/index.cjs.js

@@ -15,7 +15,8 @@ var UniversalRouter = require('universal-router');
 function loadAnimateStyle(ms = 300) {
     const css = `
 body {
-  overflow: hidden; // 防止 iOS 页面滚动
+  /* 防止 iOS 页面滚动 */
+  overflow: hidden;
 }
 .taro_router > .taro_page {
   position: absolute;
@@ -142,7 +143,7 @@ function loadNavigationBarStyle() {
     to {
       transform: rotate(360deg);
     }
-  }  
+  }
 
   .taro-navigation-bar-no-icon > .taro-navigation-bar-home {
     display: none;
@@ -535,13 +536,14 @@ function processNavigateUrl(option) {
         const parts = routesAlias.getOrigin(exports.history.location.pathname).split('/');
         parts.pop();
         pathPieces.pathname.split('/').forEach((item) => {
-            if (item === '.') {
+            if (item === '.')
                 return;
-            }
             item === '..' ? parts.pop() : parts.push(item);
         });
         pathPieces.pathname = parts.join('/');
     }
+    // 确保是 / 开头的路径
+    pathPieces.pathname = runtime.addLeadingSlash(pathPieces.pathname);
     // 处理自定义路由
     pathPieces.pathname = routesAlias.getAlias(runtime.addLeadingSlash(pathPieces.pathname));
     // 处理 basename
@@ -569,20 +571,10 @@ function navigate(option, method) {
             });
             try {
                 if ('url' in option) {
-                    if (!RouterConfig.isPage(runtime.addLeadingSlash(option.url))) {
-                        const res = { errMsg: `${method}:fail page ${option.url} is not found` };
-                        fail === null || fail === void 0 ? void 0 : fail(res);
-                        complete === null || complete === void 0 ? void 0 : complete(res);
-                        if (fail || complete) {
-                            return resolve(res);
-                        }
-                        else {
-                            return reject(res);
-                        }
-                    }
                     const pathPieces = processNavigateUrl(option);
                     const state = { timestamp: Date.now() };
                     if (method === 'navigateTo') {
+                        // Note: 由于 spa 会针对弱网情况下，短时间内多次跳转同一个页面跳转加了锁，后续如果有用户反馈返回无效，那可能是这个问题
                         exports.history.push(pathPieces, state);
                     }
                     else if (method === 'redirectTo' || method === 'switchTab') {
@@ -975,7 +967,7 @@ class NavigationBarHandler {
         this.setNavigationLoading();
     }
     setCacheValue() {
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         if (typeof this.cache[currentPage] !== 'object') {
             this.cache[currentPage] = {};
         }
@@ -1006,7 +998,7 @@ class NavigationBarHandler {
         var _a;
         if (!this.navigationBarElement)
             return;
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         let isShow;
         if (typeof show === 'boolean') {
             isShow = show;
@@ -1031,7 +1023,7 @@ class NavigationBarHandler {
         var _a, _b, _c;
         if (!this.navigationBarElement)
             return;
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         let color;
         if (typeof backgroundColor === 'string') {
             color = backgroundColor;
@@ -1055,7 +1047,7 @@ class NavigationBarHandler {
         var _a, _b, _c;
         if (!this.navigationBarElement)
             return;
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         let color;
         if (typeof fontColor === 'string') {
             color = fontColor;
@@ -1077,7 +1069,7 @@ class NavigationBarHandler {
     }
     setTitle(title) {
         var _a, _b, _c;
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         let proceedTitle;
         if (typeof title === 'string') {
             proceedTitle = title;
@@ -1192,14 +1184,14 @@ class PageHandler {
     }
     set pathname(p) { this.router.pathname = p; }
     get pathname() { return this.router.pathname; }
+    // Note: 把 pathname 转换为原始路径，主要是处理 customRoutes 和 basename
+    get originPathname() { return routesAlias.getOrigin(runtime.addLeadingSlash(runtime.stripBasename(this.pathname, this.basename))); }
     get basename() { return this.router.basename || ''; }
     get pageConfig() {
-        const routePath = runtime.addLeadingSlash(runtime.stripBasename(this.pathname, this.basename));
         const homePage = runtime.addLeadingSlash(this.homePage);
         return this.routes.find(r => {
-            var _a;
             const pagePath = runtime.addLeadingSlash(r.path);
-            return [pagePath, homePage].includes(routePath) || ((_a = routesAlias.getConfig(pagePath)) === null || _a === void 0 ? void 0 : _a.includes(routePath));
+            return [pagePath, homePage].includes(this.originPathname);
         });
     }
     isTabBar(pathname) {
@@ -1488,6 +1480,10 @@ function createRouter(history$1, app, config, framework) {
     }
     RouterConfig.config = config;
     const handler = new PageHandler(config, history$1);
+    // Note: 弱网情况下，快速切换 tab，会造成同个页面实例被多次挂在到页面上，原因是资源请求是异步的，短时间内发起多个请求，
+    // 会在资源加载完成后，同时走到挂载的逻辑，造成 pageStampId 更新不及时，两个 page 的Id 相同，后面很多操作是通过 getElementById 来进行的
+    // 所以需要加一个锁来应对这个情况
+    const pageLock = {};
     routesAlias.set(handler.router.customRoutes);
     const basename = handler.router.basename;
     const routes = handler.routes.map(route => {
@@ -1511,24 +1507,30 @@ function createRouter(history$1, app, config, framework) {
     app.onError && window.addEventListener('error', e => { var _a; return (_a = app.onError) === null || _a === void 0 ? void 0 : _a.call(app, e.message); });
     const render = ({ location, action }) => tslib.__awaiter(this, void 0, void 0, function* () {
         var _c, _d, _e, _f, _g, _h, _j, _k;
-        handler.pathname = decodeURI(location.pathname);
+        // Note: 由于下面有异步加载操作 先不要在这里去设置 handler.pathname
+        const currentPathname = decodeURI(location.pathname);
         if ((_c = window.__taroAppConfig) === null || _c === void 0 ? void 0 : _c.usingWindowScroll)
             window.scrollTo(0, 0);
         runtime.eventCenter.trigger('__taroRouterChange', {
             toLocation: {
-                path: handler.pathname
+                path: currentPathname
             }
         });
-        let element, params;
+        let element, context, params;
+        const routerPath = handler.router.forcePath || currentPathname;
+        pageLock[routerPath] = typeof pageLock[routerPath] === 'number' ? pageLock[routerPath] + 1 : 1;
+        const currentLock = pageLock[routerPath];
+        let postLock;
         try {
-            const result = yield router.resolve(handler.router.forcePath || handler.pathname);
-            [element, , params] = yield Promise.all(result);
+            const result = yield router.resolve(routerPath);
+            [element, context, params] = yield Promise.all(result);
+            postLock = pageLock[routerPath];
         }
         catch (error) {
             if (error.status === 404) {
                 const notFoundEvent = {
                     isEntryPage: stacks.length === 0,
-                    path: handler.pathname,
+                    path: currentPathname,
                     query: handler.getQuery(createStampId()),
                 };
                 (_d = app.onPageNotFound) === null || _d === void 0 ? void 0 : _d.call(app, notFoundEvent);
@@ -1542,9 +1544,12 @@ function createRouter(history$1, app, config, framework) {
                 throw error;
             }
         }
-        if (!element)
+        if (!element || currentLock !== postLock)
             return;
-        const pageConfig = handler.pageConfig;
+        // Note: 异步结束后，在设置 handler.pathname
+        // context.pathname 在 universal-router 被处理过了，是发起资源请求的时候传入的 pathname，即 await router.resolve(routerPath) 这个 routerPath
+        handler.pathname = context.pathname;
+        const { pathname, pageConfig } = handler;
         let enablePullDownRefresh = ((_e = config === null || config === void 0 ? void 0 : config.window) === null || _e === void 0 ? void 0 : _e.enablePullDownRefresh) || false;
         let navigationStyle = ((_f = config === null || config === void 0 ? void 0 : config.window) === null || _f === void 0 ? void 0 : _f.navigationStyle) || 'default';
         let navigationBarTextStyle = ((_g = config === null || config === void 0 ? void 0 : config.window) === null || _g === void 0 ? void 0 : _g.navigationBarTextStyle) || 'white';
@@ -1565,7 +1570,6 @@ function createRouter(history$1, app, config, framework) {
         }
         runtime.eventCenter.trigger('__taroSetNavigationStyle', navigationStyle, navigationBarTextStyle, navigationBarBackgroundColor);
         const currentPage = runtime.Current.page;
-        const pathname = handler.pathname;
         const methodName = (_j = stacks.method) !== null && _j !== void 0 ? _j : '';
         const cacheTabs = stacks.getTabs();
         let shouldLoad = false;
@@ -1581,7 +1585,7 @@ function createRouter(history$1, app, config, framework) {
             }
             shouldLoad = true;
         }
-        else if (currentPage && handler.isTabBar(handler.pathname)) {
+        else if (currentPage && handler.isTabBar(pathname)) {
             if (handler.isSamePage(currentPage))
                 return;
             if (handler.isTabBar(currentPage.path)) {
@@ -1599,8 +1603,8 @@ function createRouter(history$1, app, config, framework) {
                     handler.unload(currentPage, stacks.length, true);
                 }
             }
-            if (cacheTabs[handler.pathname]) {
-                stacks.popTab(handler.pathname);
+            if (cacheTabs[pathname]) {
+                stacks.popTab(pathname);
                 return handler.show(stacks.getItem(0), pageConfig, 0);
             }
             shouldLoad = true;

package/dist/index.esm.js

@@ -14,7 +14,8 @@ import UniversalRouter from 'universal-router';
 function loadAnimateStyle(ms = 300) {
     const css = `
 body {
-  overflow: hidden; // 防止 iOS 页面滚动
+  /* 防止 iOS 页面滚动 */
+  overflow: hidden;
 }
 .taro_router > .taro_page {
   position: absolute;
@@ -141,7 +142,7 @@ function loadNavigationBarStyle() {
     to {
       transform: rotate(360deg);
     }
-  }  
+  }
 
   .taro-navigation-bar-no-icon > .taro-navigation-bar-home {
     display: none;
@@ -534,13 +535,14 @@ function processNavigateUrl(option) {
         const parts = routesAlias.getOrigin(history.location.pathname).split('/');
         parts.pop();
         pathPieces.pathname.split('/').forEach((item) => {
-            if (item === '.') {
+            if (item === '.')
                 return;
-            }
             item === '..' ? parts.pop() : parts.push(item);
         });
         pathPieces.pathname = parts.join('/');
     }
+    // 确保是 / 开头的路径
+    pathPieces.pathname = addLeadingSlash(pathPieces.pathname);
     // 处理自定义路由
     pathPieces.pathname = routesAlias.getAlias(addLeadingSlash(pathPieces.pathname));
     // 处理 basename
@@ -568,20 +570,10 @@ function navigate(option, method) {
             });
             try {
                 if ('url' in option) {
-                    if (!RouterConfig.isPage(addLeadingSlash(option.url))) {
-                        const res = { errMsg: `${method}:fail page ${option.url} is not found` };
-                        fail === null || fail === void 0 ? void 0 : fail(res);
-                        complete === null || complete === void 0 ? void 0 : complete(res);
-                        if (fail || complete) {
-                            return resolve(res);
-                        }
-                        else {
-                            return reject(res);
-                        }
-                    }
                     const pathPieces = processNavigateUrl(option);
                     const state = { timestamp: Date.now() };
                     if (method === 'navigateTo') {
+                        // Note: 由于 spa 会针对弱网情况下，短时间内多次跳转同一个页面跳转加了锁，后续如果有用户反馈返回无效，那可能是这个问题
                         history.push(pathPieces, state);
                     }
                     else if (method === 'redirectTo' || method === 'switchTab') {
@@ -974,7 +966,7 @@ class NavigationBarHandler {
         this.setNavigationLoading();
     }
     setCacheValue() {
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         if (typeof this.cache[currentPage] !== 'object') {
             this.cache[currentPage] = {};
         }
@@ -1005,7 +997,7 @@ class NavigationBarHandler {
         var _a;
         if (!this.navigationBarElement)
             return;
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         let isShow;
         if (typeof show === 'boolean') {
             isShow = show;
@@ -1030,7 +1022,7 @@ class NavigationBarHandler {
         var _a, _b, _c;
         if (!this.navigationBarElement)
             return;
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         let color;
         if (typeof backgroundColor === 'string') {
             color = backgroundColor;
@@ -1054,7 +1046,7 @@ class NavigationBarHandler {
         var _a, _b, _c;
         if (!this.navigationBarElement)
             return;
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         let color;
         if (typeof fontColor === 'string') {
             color = fontColor;
@@ -1076,7 +1068,7 @@ class NavigationBarHandler {
     }
     setTitle(title) {
         var _a, _b, _c;
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         let proceedTitle;
         if (typeof title === 'string') {
             proceedTitle = title;
@@ -1191,14 +1183,14 @@ class PageHandler {
     }
     set pathname(p) { this.router.pathname = p; }
     get pathname() { return this.router.pathname; }
+    // Note: 把 pathname 转换为原始路径，主要是处理 customRoutes 和 basename
+    get originPathname() { return routesAlias.getOrigin(addLeadingSlash(stripBasename(this.pathname, this.basename))); }
     get basename() { return this.router.basename || ''; }
     get pageConfig() {
-        const routePath = addLeadingSlash(stripBasename(this.pathname, this.basename));
         const homePage = addLeadingSlash(this.homePage);
         return this.routes.find(r => {
-            var _a;
             const pagePath = addLeadingSlash(r.path);
-            return [pagePath, homePage].includes(routePath) || ((_a = routesAlias.getConfig(pagePath)) === null || _a === void 0 ? void 0 : _a.includes(routePath));
+            return [pagePath, homePage].includes(this.originPathname);
         });
     }
     isTabBar(pathname) {
@@ -1487,6 +1479,10 @@ function createRouter(history, app, config, framework) {
     }
     RouterConfig.config = config;
     const handler = new PageHandler(config, history);
+    // Note: 弱网情况下，快速切换 tab，会造成同个页面实例被多次挂在到页面上，原因是资源请求是异步的，短时间内发起多个请求，
+    // 会在资源加载完成后，同时走到挂载的逻辑，造成 pageStampId 更新不及时，两个 page 的Id 相同，后面很多操作是通过 getElementById 来进行的
+    // 所以需要加一个锁来应对这个情况
+    const pageLock = {};
     routesAlias.set(handler.router.customRoutes);
     const basename = handler.router.basename;
     const routes = handler.routes.map(route => {
@@ -1510,24 +1506,30 @@ function createRouter(history, app, config, framework) {
     app.onError && window.addEventListener('error', e => { var _a; return (_a = app.onError) === null || _a === void 0 ? void 0 : _a.call(app, e.message); });
     const render = ({ location, action }) => __awaiter(this, void 0, void 0, function* () {
         var _c, _d, _e, _f, _g, _h, _j, _k;
-        handler.pathname = decodeURI(location.pathname);
+        // Note: 由于下面有异步加载操作 先不要在这里去设置 handler.pathname
+        const currentPathname = decodeURI(location.pathname);
         if ((_c = window.__taroAppConfig) === null || _c === void 0 ? void 0 : _c.usingWindowScroll)
             window.scrollTo(0, 0);
         eventCenter.trigger('__taroRouterChange', {
             toLocation: {
-                path: handler.pathname
+                path: currentPathname
             }
         });
-        let element, params;
+        let element, context, params;
+        const routerPath = handler.router.forcePath || currentPathname;
+        pageLock[routerPath] = typeof pageLock[routerPath] === 'number' ? pageLock[routerPath] + 1 : 1;
+        const currentLock = pageLock[routerPath];
+        let postLock;
         try {
-            const result = yield router.resolve(handler.router.forcePath || handler.pathname);
-            [element, , params] = yield Promise.all(result);
+            const result = yield router.resolve(routerPath);
+            [element, context, params] = yield Promise.all(result);
+            postLock = pageLock[routerPath];
         }
         catch (error) {
             if (error.status === 404) {
                 const notFoundEvent = {
                     isEntryPage: stacks.length === 0,
-                    path: handler.pathname,
+                    path: currentPathname,
                     query: handler.getQuery(createStampId()),
                 };
                 (_d = app.onPageNotFound) === null || _d === void 0 ? void 0 : _d.call(app, notFoundEvent);
@@ -1541,9 +1543,12 @@ function createRouter(history, app, config, framework) {
                 throw error;
             }
         }
-        if (!element)
+        if (!element || currentLock !== postLock)
             return;
-        const pageConfig = handler.pageConfig;
+        // Note: 异步结束后，在设置 handler.pathname
+        // context.pathname 在 universal-router 被处理过了，是发起资源请求的时候传入的 pathname，即 await router.resolve(routerPath) 这个 routerPath
+        handler.pathname = context.pathname;
+        const { pathname, pageConfig } = handler;
         let enablePullDownRefresh = ((_e = config === null || config === void 0 ? void 0 : config.window) === null || _e === void 0 ? void 0 : _e.enablePullDownRefresh) || false;
         let navigationStyle = ((_f = config === null || config === void 0 ? void 0 : config.window) === null || _f === void 0 ? void 0 : _f.navigationStyle) || 'default';
         let navigationBarTextStyle = ((_g = config === null || config === void 0 ? void 0 : config.window) === null || _g === void 0 ? void 0 : _g.navigationBarTextStyle) || 'white';
@@ -1564,7 +1569,6 @@ function createRouter(history, app, config, framework) {
         }
         eventCenter.trigger('__taroSetNavigationStyle', navigationStyle, navigationBarTextStyle, navigationBarBackgroundColor);
         const currentPage = Current.page;
-        const pathname = handler.pathname;
         const methodName = (_j = stacks.method) !== null && _j !== void 0 ? _j : '';
         const cacheTabs = stacks.getTabs();
         let shouldLoad = false;
@@ -1580,7 +1584,7 @@ function createRouter(history, app, config, framework) {
             }
             shouldLoad = true;
         }
-        else if (currentPage && handler.isTabBar(handler.pathname)) {
+        else if (currentPage && handler.isTabBar(pathname)) {
             if (handler.isSamePage(currentPage))
                 return;
             if (handler.isTabBar(currentPage.path)) {
@@ -1598,8 +1602,8 @@ function createRouter(history, app, config, framework) {
                     handler.unload(currentPage, stacks.length, true);
                 }
             }
-            if (cacheTabs[handler.pathname]) {
-                stacks.popTab(handler.pathname);
+            if (cacheTabs[pathname]) {
+                stacks.popTab(pathname);
                 return handler.show(stacks.getItem(0), pageConfig, 0);
             }
             shouldLoad = true;

package/dist/router/navigation-bar.js

@@ -73,7 +73,7 @@ class NavigationBarHandler {
         this.setNavigationLoading();
     }
     setCacheValue() {
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         if (typeof this.cache[currentPage] !== 'object') {
             this.cache[currentPage] = {};
         }
@@ -104,7 +104,7 @@ class NavigationBarHandler {
         var _a;
         if (!this.navigationBarElement)
             return;
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         let isShow;
         if (typeof show === 'boolean') {
             isShow = show;
@@ -129,7 +129,7 @@ class NavigationBarHandler {
         var _a, _b, _c;
         if (!this.navigationBarElement)
             return;
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         let color;
         if (typeof backgroundColor === 'string') {
             color = backgroundColor;
@@ -153,7 +153,7 @@ class NavigationBarHandler {
         var _a, _b, _c;
         if (!this.navigationBarElement)
             return;
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         let color;
         if (typeof fontColor === 'string') {
             color = fontColor;
@@ -175,7 +175,7 @@ class NavigationBarHandler {
     }
     setTitle(title) {
         var _a, _b, _c;
-        const currentPage = this.pageContext.currentPage;
+        const currentPage = this.pageContext.originPathname;
         let proceedTitle;
         if (typeof title === 'string') {
             proceedTitle = title;

package/dist/router/page.d.ts

@@ -28,6 +28,7 @@ declare class PageHandler {
     get animationDuration(): number;
     set pathname(p: string);
     get pathname(): string;
+    get originPathname(): string;
     get basename(): string;
     get pageConfig(): Route | undefined;
     isTabBar(pathname: string): boolean;

package/dist/router/page.js

@@ -49,14 +49,14 @@ class PageHandler {
     }
     set pathname(p) { this.router.pathname = p; }
     get pathname() { return this.router.pathname; }
+    // Note: 把 pathname 转换为原始路径，主要是处理 customRoutes 和 basename
+    get originPathname() { return routesAlias.getOrigin(addLeadingSlash(stripBasename(this.pathname, this.basename))); }
     get basename() { return this.router.basename || ''; }
     get pageConfig() {
-        const routePath = addLeadingSlash(stripBasename(this.pathname, this.basename));
         const homePage = addLeadingSlash(this.homePage);
         return this.routes.find(r => {
-            var _a;
             const pagePath = addLeadingSlash(r.path);
-            return [pagePath, homePage].includes(routePath) || ((_a = routesAlias.getConfig(pagePath)) === null || _a === void 0 ? void 0 : _a.includes(routePath));
+            return [pagePath, homePage].includes(this.originPathname);
         });
     }
     isTabBar(pathname) {

package/dist/router/spa.js

@@ -17,6 +17,10 @@ function createRouter(history, app, config, framework) {
     }
     RouterConfig.config = config;
     const handler = new PageHandler(config, history);
+    // Note: 弱网情况下，快速切换 tab，会造成同个页面实例被多次挂在到页面上，原因是资源请求是异步的，短时间内发起多个请求，
+    // 会在资源加载完成后，同时走到挂载的逻辑，造成 pageStampId 更新不及时，两个 page 的Id 相同，后面很多操作是通过 getElementById 来进行的
+    // 所以需要加一个锁来应对这个情况
+    const pageLock = {};
     routesAlias.set(handler.router.customRoutes);
     const basename = handler.router.basename;
     const routes = handler.routes.map(route => {
@@ -40,24 +44,30 @@ function createRouter(history, app, config, framework) {
     app.onError && window.addEventListener('error', e => { var _a; return (_a = app.onError) === null || _a === void 0 ? void 0 : _a.call(app, e.message); });
     const render = ({ location, action }) => __awaiter(this, void 0, void 0, function* () {
         var _c, _d, _e, _f, _g, _h, _j, _k;
-        handler.pathname = decodeURI(location.pathname);
+        // Note: 由于下面有异步加载操作 先不要在这里去设置 handler.pathname
+        const currentPathname = decodeURI(location.pathname);
         if ((_c = window.__taroAppConfig) === null || _c === void 0 ? void 0 : _c.usingWindowScroll)
             window.scrollTo(0, 0);
         eventCenter.trigger('__taroRouterChange', {
             toLocation: {
-                path: handler.pathname
+                path: currentPathname
             }
         });
-        let element, params;
+        let element, context, params;
+        const routerPath = handler.router.forcePath || currentPathname;
+        pageLock[routerPath] = typeof pageLock[routerPath] === 'number' ? pageLock[routerPath] + 1 : 1;
+        const currentLock = pageLock[routerPath];
+        let postLock;
         try {
-            const result = yield router.resolve(handler.router.forcePath || handler.pathname);
-            [element, , params] = yield Promise.all(result);
+            const result = yield router.resolve(routerPath);
+            [element, context, params] = yield Promise.all(result);
+            postLock = pageLock[routerPath];
         }
         catch (error) {
             if (error.status === 404) {
                 const notFoundEvent = {
                     isEntryPage: stacks.length === 0,
-                    path: handler.pathname,
+                    path: currentPathname,
                     query: handler.getQuery(createStampId()),
                 };
                 (_d = app.onPageNotFound) === null || _d === void 0 ? void 0 : _d.call(app, notFoundEvent);
@@ -71,9 +81,12 @@ function createRouter(history, app, config, framework) {
                 throw error;
             }
         }
-        if (!element)
+        if (!element || currentLock !== postLock)
             return;
-        const pageConfig = handler.pageConfig;
+        // Note: 异步结束后，在设置 handler.pathname
+        // context.pathname 在 universal-router 被处理过了，是发起资源请求的时候传入的 pathname，即 await router.resolve(routerPath) 这个 routerPath
+        handler.pathname = context.pathname;
+        const { pathname, pageConfig } = handler;
         let enablePullDownRefresh = ((_e = config === null || config === void 0 ? void 0 : config.window) === null || _e === void 0 ? void 0 : _e.enablePullDownRefresh) || false;
         let navigationStyle = ((_f = config === null || config === void 0 ? void 0 : config.window) === null || _f === void 0 ? void 0 : _f.navigationStyle) || 'default';
         let navigationBarTextStyle = ((_g = config === null || config === void 0 ? void 0 : config.window) === null || _g === void 0 ? void 0 : _g.navigationBarTextStyle) || 'white';
@@ -94,7 +107,6 @@ function createRouter(history, app, config, framework) {
         }
         eventCenter.trigger('__taroSetNavigationStyle', navigationStyle, navigationBarTextStyle, navigationBarBackgroundColor);
         const currentPage = Current.page;
-        const pathname = handler.pathname;
         const methodName = (_j = stacks.method) !== null && _j !== void 0 ? _j : '';
         const cacheTabs = stacks.getTabs();
         let shouldLoad = false;
@@ -110,7 +122,7 @@ function createRouter(history, app, config, framework) {
             }
             shouldLoad = true;
         }
-        else if (currentPage && handler.isTabBar(handler.pathname)) {
+        else if (currentPage && handler.isTabBar(pathname)) {
             if (handler.isSamePage(currentPage))
                 return;
             if (handler.isTabBar(currentPage.path)) {
@@ -128,8 +140,8 @@ function createRouter(history, app, config, framework) {
                     handler.unload(currentPage, stacks.length, true);
                 }
             }
-            if (cacheTabs[handler.pathname]) {
-                stacks.popTab(handler.pathname);
+            if (cacheTabs[pathname]) {
+                stacks.popTab(pathname);
                 return handler.show(stacks.getItem(0), pageConfig, 0);
             }
             shouldLoad = true;

package/dist/style.js

@@ -4,7 +4,8 @@
 function loadAnimateStyle(ms = 300) {
     const css = `
 body {
-  overflow: hidden; // 防止 iOS 页面滚动
+  /* 防止 iOS 页面滚动 */
+  overflow: hidden;
 }
 .taro_router > .taro_page {
   position: absolute;
@@ -131,7 +132,7 @@ function loadNavigationBarStyle() {
     to {
       transform: rotate(360deg);
     }
-  }  
+  }
 
   .taro-navigation-bar-no-icon > .taro-navigation-bar-home {
     display: none;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/router",
-  "version": "3.6.29",
+  "version": "3.6.31-canary.0",
   "description": "Taro-router",
   "browser": "dist/index.js",
   "main:h5": "dist/index.esm.js",
@@ -44,14 +44,14 @@
     "rollup-plugin-ts": "^3.0.2",
     "ts-jest": "^29.0.5",
     "typescript": "^4.7.4",
-    "@tarojs/runtime": "3.6.29",
-    "@tarojs/taro": "3.6.29",
-    "@tarojs/shared": "3.6.29"
+    "@tarojs/runtime": "3.6.31-canary.0",
+    "@tarojs/taro": "3.6.31-canary.0",
+    "@tarojs/shared": "3.6.31-canary.0"
   },
   "peerDependencies": {
-    "@tarojs/runtime": "3.6.29",
-    "@tarojs/taro": "3.6.29",
-    "@tarojs/shared": "3.6.29"
+    "@tarojs/runtime": "3.6.31-canary.0",
+    "@tarojs/taro": "3.6.31-canary.0",
+    "@tarojs/shared": "3.6.31-canary.0"
   },
   "scripts": {
     "prebuild": "pnpm run clean",