diff --git a/package.json b/package.json index 27995245a..60bed3df4 100644 --- a/package.json +++ b/package.json @@ -116,12 +116,12 @@ "typescript": "^3.3.3", "uppercamelcase": "^3.0.0", "url-loader": "^1.1.2", - "vue": "2.6.6", + "vue": "2.6.7", "vue-jest": "4.0.0-beta.1", "vue-loader": "^15.6.2", "vue-router": "^3.0.2", - "vue-server-renderer": "^2.6.6", - "vue-template-compiler": "2.6.6", + "vue-server-renderer": "^2.6.7", + "vue-template-compiler": "2.6.7", "vue-template-es2015-compiler": "^1.8.2", "webpack": "^4.29.3", "webpack-cli": "^3.2.3", diff --git a/packages/tabs/index.js b/packages/tabs/index.js index 0b9aec2b1..b128cd342 100644 --- a/packages/tabs/index.js +++ b/packages/tabs/index.js @@ -150,17 +150,11 @@ export default sfc({ }, mounted() { - this.$nextTick(() => { - this.inited = true; - this.handlers(true); - }); + this.onShow(); }, activated() { - this.$nextTick(() => { - this.handlers(true); - this.scrollIntoView(true); - }); + this.onShow(); }, deactivated() { @@ -172,6 +166,14 @@ export default sfc({ }, methods: { + onShow() { + this.$nextTick(() => { + this.inited = true; + this.handlers(true); + this.scrollIntoView(true); + }); + }, + // whether to bind sticky listener handlers(bind) { const { events } = this; diff --git a/yarn.lock b/yarn.lock index 9e7873978..07cb6f854 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10327,10 +10327,10 @@ vue-router@^3.0.2: resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.2.tgz#dedc67afe6c4e2bc25682c8b1c2a8c0d7c7e56be" integrity sha512-opKtsxjp9eOcFWdp6xLQPLmRGgfM932Tl56U9chYTnoWqKxQ8M20N7AkdEbM5beUh6wICoFGYugAX9vQjyJLFg== -vue-server-renderer@^2.6.6: - version "2.6.6" - resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.6.6.tgz#a2b1174cf1914817147b34789cc1a6baa0672aa1" - integrity sha512-dJ4IrIilS3nhxpOrR12+IKGu9Meg8L0t/W/e/UNSXKyh9EkwDqFPK0nZTfGPudXzr9FMQfg2hK6p2RMydPRU2Q== +vue-server-renderer@^2.6.7: + version "2.6.7" + resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.6.7.tgz#ff40f69a439da8993a6e171b7d58575bfbeefb79" + integrity sha512-CVtGR+bE63y4kyIeOcCEF2UNKquSquFQAsTHZ5R1cGM4L4Z0BXgAUEcngTOy8kN+tubt3c1zpRvbrok/bHKeDg== dependencies: chalk "^1.1.3" hash-sum "^1.0.2" @@ -10349,10 +10349,10 @@ vue-style-loader@^4.1.0: hash-sum "^1.0.2" loader-utils "^1.0.2" -vue-template-compiler@2.6.6: - version "2.6.6" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.6.tgz#a807acbf3d51971d3721d75ecb1b927b517c1a02" - integrity sha512-OakxDGyrmMQViCjkakQFbDZlG0NibiOzpLauOfyCUVRQc9yPmTqpiz9nF0VeA+dFkXegetw0E5x65BFhhLXO0A== +vue-template-compiler@2.6.7: + version "2.6.7" + resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.7.tgz#7f6c14eacf3c912d28d33b029cde706d9756e00c" + integrity sha512-ZjxJLr6Lw2gj6aQGKwBWTxVNNd28/qggIdwvr5ushrUHUvqgbHD0xusOVP2yRxT4pX3wRIJ2LfxjgFT41dEtoQ== dependencies: de-indent "^1.0.2" he "^1.1.0" @@ -10367,10 +10367,10 @@ vue-template-es2015-compiler@^1.8.2: resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.8.2.tgz#dd73e80ba58bb65dd7a8aa2aeef6089cf6116f2a" integrity sha512-cliV19VHLJqFUYbz/XeWXe5CO6guzwd0yrrqqp0bmjlMP3ZZULY7fu8RTC4+3lmHwo6ESVDHFDsvjB15hcR5IA== -vue@2.6.6: - version "2.6.6" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.6.tgz#dde41e483c11c46a7bf523909f4f2f816ab60d25" - integrity sha512-Y2DdOZD8sxApS+iUlwv1v8U1qN41kq6Kw45lM6nVZKhygeWA49q7VCCXkjXqeDBXgurrKWkYQ9cJeEJwAq0b9Q== +vue@2.6.7: + version "2.6.7" + resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.7.tgz#254f188e7621d2d19ee28d0c0442c6d21b53ae2d" + integrity sha512-g7ADfQ82QU+j6F/bVDioVQf2ccIMYLuR4E8ev+RsDBlmwRkhGO3HhgF4PF9vpwjdPpxyb1zzLur2nQ2oIMAMEg== w3c-hr-time@^1.0.1: version "1.0.1"