diff --git a/packages/pull-refresh/en-US.md b/packages/pull-refresh/en-US.md index dfb9d3237..70ffa3f14 100644 --- a/packages/pull-refresh/en-US.md +++ b/packages/pull-refresh/en-US.md @@ -49,6 +49,8 @@ export default { | loading-text | Text to show when loading | `String` | `Loading...` | | animation-duration | Animation duration | `Number` | `300` | | head-height | Height of head | `Number` | `50` | +| disabled | Whether to disable | `Boolean` | `false` | + ### Event diff --git a/packages/pull-refresh/index.vue b/packages/pull-refresh/index.vue index 076dea444..89f1e398a 100644 --- a/packages/pull-refresh/index.vue +++ b/packages/pull-refresh/index.vue @@ -39,6 +39,7 @@ export default create({ mixins: [Touch], props: { + disabled: Boolean, pullingText: String, loosingText: String, loadingText: String, @@ -70,6 +71,10 @@ export default create({ transition: `${this.duration}ms`, transform: `translate3d(0,${this.height}px, 0)` }; + }, + + untouchable() { + return this.status === 'loading' || this.disabled; } }, @@ -86,7 +91,7 @@ export default create({ methods: { onTouchStart(event) { - if (this.status === 'loading') { + if (this.untouchable) { return; } if (this.getCeiling()) { @@ -96,7 +101,7 @@ export default create({ }, onTouchMove(event) { - if (this.status === 'loading') { + if (this.untouchable) { return; } @@ -117,7 +122,7 @@ export default create({ }, onTouchEnd() { - if (this.status === 'loading') { + if (this.untouchable) { return; } diff --git a/packages/pull-refresh/zh-CN.md b/packages/pull-refresh/zh-CN.md index 93f808651..23f15a3a1 100644 --- a/packages/pull-refresh/zh-CN.md +++ b/packages/pull-refresh/zh-CN.md @@ -49,6 +49,7 @@ export default { | loading-text | 加载过程中顶部文案 | `String` | `加载中...` | | animation-duration | 动画时长 | `Number` | `300` | | head-height | 顶部内容高度 | `Number` | `50` | +| disabled | 是否禁用 | `Boolean` | `false` | ### Event