blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-24 18:36:51 +08:00
Code Issues Projects Releases Wiki Activity

fix(Tabbar): avoid redundant navigation error (#6474)

Browse Source 
* fix(Tabbar): avoid redundant navigation error

* chore: robust
This commit is contained in:
neverland 2020-06-06 20:20:42 +08:00 committed by GitHub
parent 92c3819a03
commit 97dc684f9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/utils/router.ts
View File

@ -11,6 +11,14 @@ export type RouteConfig = {
replace?: boolean; replace?: boolean;
}; };
function isRedundantNavigation(err: Error) {
return (
err.name === 'NavigationDuplicated' ||
// compatible with vue-router@3.3
(err.message && err.message.indexOf('redundant navigation') !== -1)
);
}
export function route(router: VueRouter, config: RouteConfig) { export function route(router: VueRouter, config: RouteConfig) {
const { to, url, replace } = config; const { to, url, replace } = config;
if (to && router) { if (to && router) {
@ -19,8 +27,7 @@ export function route(router: VueRouter, config: RouteConfig) {
/* istanbul ignore else */ /* istanbul ignore else */
if (promise && promise.catch) { if (promise && promise.catch) {
promise.catch((err) => { promise.catch((err) => {
/* istanbul ignore if */ if (err && !isRedundantNavigation(err)) {
if (err && err.name !== 'NavigationDuplicated') {
throw err; throw err;
} }
}); });

6
yarn.lock
View File

@ -11609,9 +11609,9 @@ vue-loader@^15.9.2:
vue-style-loader "^4.1.0" vue-style-loader "^4.1.0"
vue-router@^3.1.6: vue-router@^3.1.6:
version "3.1.6" version "3.3.2"
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.1.6.tgz#45f5a3a3843e31702c061dd829393554e4328f89" resolved "https://registry.npm.taobao.org/vue-router/download/vue-router-3.3.2.tgz?cache=0&sync_timestamp=1590759571191&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.3.2.tgz#0099de402edb2fe92f9711053ab5a2156f239cad"
integrity sha512-GYhn2ynaZlysZMkFE5oCHRUTqE8BWs/a9YbKpNLi0i7xD6KG1EzDqpHQmv1F5gXjr8kL5iIVS8EOtRaVUEXTqA== integrity sha1-AJneQC7bL+kvlxEFOrWiFW8jnK0=
vue-style-loader@^4.1.0: vue-style-loader@^4.1.0:
version "4.1.2" version "4.1.2"