diff --git a/src/swipe-cell/test/index.spec.js b/src/swipe-cell/test/index.spec.js
index f1af38b43..91100ec43 100644
--- a/src/swipe-cell/test/index.spec.js
+++ b/src/swipe-cell/test/index.spec.js
@@ -59,7 +59,7 @@ it('on-close prop', () => {
wrapper.trigger('click');
expect(position).toEqual(undefined);
- wrapper.setData({ offset: 100 });
+ wrapper.vm.open('left');
wrapper.trigger('click');
expect(position).toEqual('cell');
diff --git a/src/swipe/README.md b/src/swipe/README.md
index 0e1391465..1b67035aa 100644
--- a/src/swipe/README.md
+++ b/src/swipe/README.md
@@ -156,11 +156,12 @@ export default {
### Swipe Methods
-Use ref to get swipe instance and call instance methods
+Use [ref](https://vuejs.org/v2/api/#ref) to get Swipe instance and call instance methods
| Name | Description | Attribute | Return value |
|------|------|------|------|
| swipeTo | Swipe to target index | index: target index, options: Options | void |
+| resize | Resize Swipe when container element resized | - | void |
### swipeTo Options
diff --git a/src/swipe/README.zh-CN.md b/src/swipe/README.zh-CN.md
index 8398fe427..541414496 100644
--- a/src/swipe/README.zh-CN.md
+++ b/src/swipe/README.zh-CN.md
@@ -162,11 +162,12 @@ export default {
### Swipe 方法
-通过 ref 可以获取到 swipe 实例并调用实例方法
+通过 [ref](https://cn.vuejs.org/v2/api/#ref) 可以获取到 Swipe 实例并调用实例方法
| 方法名 | 说明 | 参数 | 返回值 |
|------|------|------|------|
-| swipeTo | 滚动到目标位置 | index: 目标位置的索引, options: 选项 | void |
+| swipeTo | 滚动到目标位置 | index: number, options: Options | void |
+| resize | 外层元素大小变化后,可以调用此方法来触发重绘 | - | void |
### swipeTo Options 格式
diff --git a/src/swipe/index.js b/src/swipe/index.js
index 5d076f5a6..788f04b1e 100644
--- a/src/swipe/index.js
+++ b/src/swipe/index.js
@@ -11,7 +11,7 @@ export default createComponent({
mixins: [
TouchMixin,
BindEventMixin(function(bind, isBind) {
- bind(window, 'resize', this.onResize, true);
+ bind(window, 'resize', this.resize, true);
if (isBind) {
this.initialize();
@@ -154,7 +154,8 @@ export default createComponent({
this.autoPlay();
},
- onResize() {
+ // @exposed-api
+ resize() {
this.initialize(this.activeIndicator);
},
@@ -252,6 +253,7 @@ export default createComponent({
}
},
+ // @exposed-api
swipeTo(index, options = {}) {
this.swiping = true;
this.resetTouchStatus();
diff --git a/src/swipe/test/index.spec.js b/src/swipe/test/index.spec.js
index 68b2d28cb..d973aa99e 100644
--- a/src/swipe/test/index.spec.js
+++ b/src/swipe/test/index.spec.js
@@ -1,19 +1,19 @@
+import Vue from 'vue';
import Swipe from '..';
import SwipeItem from '../../swipe-item';
import { mount, triggerDrag, later } from '../../../test';
+Vue.use(Swipe);
+Vue.use(SwipeItem);
+
const Component = {
template: `
-
- 1
- 2
- 3
-
+
+ 1
+ 2
+ 3
+
`,
- components: {
- Swipe,
- SwipeItem
- },
props: {
vertical: Boolean,
loop: {
diff --git a/src/tab/README.md b/src/tab/README.md
index d03191d8d..477c9078c 100644
--- a/src/tab/README.md
+++ b/src/tab/README.md
@@ -206,6 +206,23 @@ In swipeable mode, you can switch tabs with swipe gestrue in the content
| to | Target route of the link, same as to of vue-router | *string \| object* | - | 2.2.1 |
| replace | If true, the navigation will not leave a history record | *boolean* | `false` | 2.2.1 |
+### Tabs Events
+
+| Event | Description | Arguments |
+|------|------|------|
+| click | Triggered when click tab | name:name of current tab,title: tab title |
+| change | Triggered when active tab changed | name:name of current tab,title: tab title |
+| disabled | Triggered when click disabled tab | name:name of current tab, title: tab title |
+| scroll | Triggered when tab scroll in sticky mode | object: { scrollTop, isFixed } |
+
+### Tabs Methods
+
+Use [ref](https://vuejs.org/v2/api/#ref) to get Tabs instance and call instance methods
+
+| Name | Description | Attribute | Return value |
+|------|------|------|------|
+| resize | Resize Tabs when container element resized | - | void |
+
### Tabs Slots
| Name | Description |
@@ -219,12 +236,3 @@ In swipeable mode, you can switch tabs with swipe gestrue in the content
|------|------|
| default | Content of tab |
| title | Custom tab title |
-
-### Tabs Events
-
-| Event | Description | Arguments |
-|------|------|------|
-| click | Triggered when click tab | name:name of current tab,title: tab title |
-| change | Triggered when active tab changed | name:name of current tab,title: tab title |
-| disabled | Triggered when click disabled tab | name:name of current tab, title: tab title |
-| scroll | Triggered when tab scroll in sticky mode | object: { scrollTop, isFixed } |
diff --git a/src/tab/README.zh-CN.md b/src/tab/README.zh-CN.md
index 93e81a8c6..24b1970c2 100644
--- a/src/tab/README.zh-CN.md
+++ b/src/tab/README.zh-CN.md
@@ -210,6 +210,23 @@ export default {
| to | 点击后跳转的目标路由对象,同 vue-router 的 [to 属性](https://router.vuejs.org/zh/api/#to) | *string \| object* | - | 2.2.1 |
| replace | 是否在跳转时替换当前页面历史 | *boolean* | `false` | 2.2.1 |
+### Tabs Events
+
+| 事件名 | 说明 | 回调参数 |
+|------|------|------|
+| click | 点击标签时触发 | name:标签标识符,title:标题 |
+| change | 当前激活的标签改变时触发 | name:标签标识符,title:标题 |
+| disabled | 点击被禁用的标签时触发 | name:标签标识符,title:标题 |
+| scroll | 滚动时触发,仅在 sticky 模式下生效 | { scrollTop: 距离顶部位置, isFixed: 是否吸顶 } |
+
+### Tabs 方法
+
+通过 [ref](https://cn.vuejs.org/v2/api/#ref) 可以获取到 Tabs 实例并调用实例方法
+
+| 方法名 | 说明 | 参数 | 返回值 |
+|------|------|------|------|
+| resize | 外层元素大小变化后,可以调用此方法来触发重绘 | - | void |
+
### Tabs Slots
| 名称 | 说明 |
@@ -223,12 +240,3 @@ export default {
|------|------|
| default | 标签页内容 |
| title | 自定义标题,不支持动态渲染 |
-
-### Tabs Events
-
-| 事件名 | 说明 | 回调参数 |
-|------|------|------|
-| click | 点击标签时触发 | name:标签标识符,title:标题 |
-| change | 当前激活的标签改变时触发 | name:标签标识符,title:标题 |
-| disabled | 点击被禁用的标签时触发 | name:标签标识符,title:标题 |
-| scroll | 滚动时触发,仅在 sticky 模式下生效 | { scrollTop: 距离顶部位置, isFixed: 是否吸顶 } |
diff --git a/src/tabbar/index.less b/src/tabbar/index.less
index 92c3fc86b..7340ecf94 100644
--- a/src/tabbar/index.less
+++ b/src/tabbar/index.less
@@ -2,6 +2,7 @@
.van-tabbar {
display: flex;
+ box-sizing: content-box;
width: 100%;
height: @tabbar-height;
background-color: @tabbar-background-color;
diff --git a/src/tabs/index.js b/src/tabs/index.js
index 346743173..058c6b470 100644
--- a/src/tabs/index.js
+++ b/src/tabs/index.js
@@ -16,7 +16,7 @@ export default createComponent({
mixins: [
ParentMixin('vanTabs'),
BindEventMixin(function(bind) {
- bind(window, 'resize', this.setLine, true);
+ bind(window, 'resize', this.resize, true);
})
],
@@ -139,6 +139,11 @@ export default createComponent({
},
methods: {
+ // @exposed-api
+ resize() {
+ this.setLine();
+ },
+
onShow() {
this.$nextTick(() => {
this.inited = true;
diff --git a/src/uploader/README.md b/src/uploader/README.md
index b83697dd7..e36cab2c7 100644
--- a/src/uploader/README.md
+++ b/src/uploader/README.md
@@ -161,7 +161,7 @@ export default {
### Methods
-Use ref to get Uploader instance and call instance methods
+Use [ref](https://vuejs.org/v2/api/#ref) to get Uploader instance and call instance methods
| Name | Description | Attribute | Return value |
|------|------|------|------|
diff --git a/src/uploader/README.zh-CN.md b/src/uploader/README.zh-CN.md
index d5fc95d80..142a2831a 100644
--- a/src/uploader/README.zh-CN.md
+++ b/src/uploader/README.zh-CN.md
@@ -181,7 +181,7 @@ before-read、after-read、before-delete 执行时会传递以下回调参数:
### 方法
-通过 ref 可以获取到 Uploader 实例并调用实例方法
+通过 [ref](https://cn.vuejs.org/v2/api/#ref) 可以获取到 Uploader 实例并调用实例方法
| 方法名 | 说明 | 参数 | 返回值 |
|------|------|------|------|
diff --git a/yarn.lock b/yarn.lock
index 79b652e06..c9d2f5d1d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1543,16 +1543,16 @@
integrity sha512-96tbJotfofrKpOrUGWKkiGLJsCFc0OX5pikWLW5yarD+EMhi0zCrQSDb95xGrp/HETAFm+nSTQu2e1zGsWN/7A==
"@vant/markdown-loader@^2.2.0":
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/@vant/markdown-loader/-/markdown-loader-2.2.0.tgz#f685d7f9fb7582919230329c9263cf0c4798281b"
- integrity sha512-8fetkXUHVbZpc8tDZcKC4k5zIR1AK8EaS9mJNuAcmKoKGMhqfdo7aYRYb9FttDlxGcFCLEfail8u9qRWd/KNFA==
+ version "2.3.0"
+ resolved "https://registry.npm.taobao.org/@vant/markdown-loader/download/@vant/markdown-loader-2.3.0.tgz#ea8ab4d8d41609839b40b817bc3a598cf13f9920"
+ integrity sha1-6oq02NQWCYObQLgXvDpZjPE/mSA=
dependencies:
front-matter "^3.0.2"
- highlight.js "^9.15.6"
+ highlight.js "^9.16.2"
loader-utils "^1.2.3"
- markdown-it "^8.4.2"
- markdown-it-anchor "^5.2.4"
- transliteration "^2.1.4"
+ markdown-it "^10.0.0"
+ markdown-it-anchor "^5.2.5"
+ transliteration "^2.1.7"
"@vant/markdown-vetur@^1.0.0":
version "1.0.0"
@@ -4082,11 +4082,16 @@ enhanced-resolve@4.1.0, enhanced-resolve@^4.1.0:
memory-fs "^0.4.0"
tapable "^1.0.0"
-entities@^1.1.1, entities@~1.1.1:
+entities@^1.1.1:
version "1.1.2"
resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
+entities@~2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4"
+ integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==
+
errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
version "0.1.7"
resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
@@ -5359,10 +5364,10 @@ he@1.2.x, he@^1.1.0:
resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
-highlight.js@^9.15.6:
- version "9.15.6"
- resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.6.tgz#72d4d8d779ec066af9a17cb14360c3def0aa57c4"
- integrity sha512-zozTAWM1D6sozHo8kqhfYgsac+B+q0PmsjXeyDrYIHHcBN0zTVT66+s2GW1GZv7DbyaROdLXKdabwS/WqPyIdQ==
+highlight.js@^9.16.2:
+ version "9.16.2"
+ resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.16.2.tgz#68368d039ffe1c6211bcc07e483daf95de3e403e"
+ integrity sha512-feMUrVLZvjy0oC7FVJQcSQRqbBq9kwqnYE4+Kj9ZjbHh3g+BisiPgF49NyQbVLNdrL/qqZr3Ca9yOKwgn2i/tw==
hmac-drbg@^1.0.0:
version "1.0.1"
@@ -7205,18 +7210,18 @@ markdown-escapes@^1.0.0:
resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.3.tgz#6155e10416efaafab665d466ce598216375195f5"
integrity sha512-XUi5HJhhV5R74k8/0H2oCbCiYf/u4cO/rX8tnGkRvrqhsr5BRNU6Mg0yt/8UIx1iIS8220BNJsDb7XnILhLepw==
-markdown-it-anchor@^5.2.4:
- version "5.2.4"
- resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-5.2.4.tgz#d39306fe4c199705b4479d3036842cf34dcba24f"
- integrity sha512-n8zCGjxA3T+Mx1pG8HEgbJbkB8JFUuRkeTZQuIM8iPY6oQ8sWOPRZJDFC9a/pNg2QkHEjjGkhBEl/RSyzaDZ3A==
+markdown-it-anchor@^5.2.5:
+ version "5.2.5"
+ resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-5.2.5.tgz#dbf13cfcdbffd16a510984f1263e1d479a47d27a"
+ integrity sha512-xLIjLQmtym3QpoY9llBgApknl7pxAcN3WDRc2d3rwpl+/YvDZHPmKscGs+L6E05xf2KrCXPBvosWt7MZukwSpQ==
-markdown-it@^8.4.2:
- version "8.4.2"
- resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"
- integrity sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==
+markdown-it@^10.0.0:
+ version "10.0.0"
+ resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz#abfc64f141b1722d663402044e43927f1f50a8dc"
+ integrity sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg==
dependencies:
argparse "^1.0.7"
- entities "~1.1.1"
+ entities "~2.0.0"
linkify-it "^2.0.0"
mdurl "^1.0.1"
uc.micro "^1.0.5"
@@ -10675,12 +10680,12 @@ tr46@^1.0.1:
dependencies:
punycode "^2.1.0"
-transliteration@^2.1.4:
- version "2.1.4"
- resolved "https://registry.yarnpkg.com/transliteration/-/transliteration-2.1.4.tgz#6046a137ff72e7e4344566fb7cbb90253f984964"
- integrity sha512-vkm7FYLkL3c+mjTqu4lCcqH1Mvi4Av2dYquZPz3eg6TAmhJttPlVviLuQA23Rbc6jNU9qjBDXZAlDflvY7FDSQ==
+transliteration@^2.1.7:
+ version "2.1.7"
+ resolved "https://registry.yarnpkg.com/transliteration/-/transliteration-2.1.7.tgz#43fbd2e259777516a667a76e1d11aa9f85264413"
+ integrity sha512-o3678GPmKKGqOBB+trAKzhBUjHddU18He2V8AKB1XuegaGJekO0xmfkkvbc9LCBat62nb7IH8z5/OJY+mNugkg==
dependencies:
- yargs "^13.2.4"
+ yargs "^14.0.0"
traverse-chain@~0.1.0:
version "0.1.0"
@@ -11623,7 +11628,7 @@ yargs-parser@10.x, yargs-parser@^10.0.0:
dependencies:
camelcase "^4.1.0"
-yargs-parser@15.0.0:
+yargs-parser@15.0.0, yargs-parser@^15.0.0:
version "15.0.0"
resolved "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-15.0.0.tgz?cache=0&sync_timestamp=1572648776744&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs-parser%2Fdownload%2Fyargs-parser-15.0.0.tgz#cdd7a97490ec836195f59f3f4dbe5ea9e8f75f08"
integrity sha1-zdepdJDsg2GV9Z8/Tb5eqej3Xwg=
@@ -11665,7 +11670,7 @@ yargs@12.0.5:
y18n "^3.2.1 || ^4.0.0"
yargs-parser "^11.1.1"
-yargs@13.2.4, yargs@^13.2.4:
+yargs@13.2.4:
version "13.2.4"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==
@@ -11697,3 +11702,20 @@ yargs@^13.3.0:
which-module "^2.0.0"
y18n "^4.0.0"
yargs-parser "^13.1.1"
+
+yargs@^14.0.0:
+ version "14.2.2"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.2.tgz#2769564379009ff8597cdd38fba09da9b493c4b5"
+ integrity sha512-/4ld+4VV5RnrynMhPZJ/ZpOCGSCeghMykZ3BhdFBDa9Wy/RH6uEGNWDJog+aUlq+9OM1CFTgtYRW5Is1Po9NOA==
+ dependencies:
+ cliui "^5.0.0"
+ decamelize "^1.2.0"
+ find-up "^3.0.0"
+ get-caller-file "^2.0.1"
+ require-directory "^2.1.1"
+ require-main-filename "^2.0.0"
+ set-blocking "^2.0.0"
+ string-width "^3.0.0"
+ which-module "^2.0.0"
+ y18n "^4.0.0"
+ yargs-parser "^15.0.0"