From b32705cf9306a521948b1d56b14073a3ef0f939b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Wed, 29 Jan 2020 15:15:19 +0800 Subject: [PATCH] feat(List): offset can be string --- src/list/README.md | 2 +- src/list/README.zh-CN.md | 2 +- src/list/index.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/list/README.md b/src/list/README.md index 9c0d32d14..55407b119 100644 --- a/src/list/README.md +++ b/src/list/README.md @@ -147,7 +147,7 @@ export default { | v-model | Whether to show loading info,the `load` event will not be triggered when loading | *boolean* | `false` | | finished | Whether loading is finished,the `load` event will not be triggered when finished | *boolean* | `false` | | error | Whether loading is error,the `load` event will be triggered only when error text clicked, the `sync` modifier is needed | *boolean* | `false` | -| offset | The load event will be triggered when the distance between the scrollbar and the bottom is less than offset | *number* | `300` | +| offset | The load event will be triggered when the distance between the scrollbar and the bottom is less than offset | *number \| string* | `300` | | loading-text | Loading text | *string* | `Loading...` | | finished-text | Finished text | *string* | - | | error-text | Error loaded text | *string* | - | diff --git a/src/list/README.zh-CN.md b/src/list/README.zh-CN.md index ecf794985..c67985f2d 100644 --- a/src/list/README.zh-CN.md +++ b/src/list/README.zh-CN.md @@ -162,7 +162,7 @@ export default { | v-model | 是否处于加载状态,加载过程中不触发`load`事件 | *boolean* | `false` | | finished | 是否已加载完成,加载完成后不再触发`load`事件 | *boolean* | `false` | | error | 是否加载失败,加载失败后点击错误提示可以重新
触发`load`事件,必须使用`sync`修饰符 | *boolean* | `false` | -| offset | 滚动条与底部距离小于 offset 时触发`load`事件 | *number* | `300` | +| offset | 滚动条与底部距离小于 offset 时触发`load`事件 | *number \| string* | `300` | | loading-text | 加载过程中的提示文案 | *string* | `加载中...` | | finished-text | 加载完成后的提示文案 | *string* | - | | error-text | 加载失败后的提示文案 | *string* | - | diff --git a/src/list/index.js b/src/list/index.js index 22fcd669a..fa07e4164 100644 --- a/src/list/index.js +++ b/src/list/index.js @@ -38,7 +38,7 @@ export default createComponent({ default: true, }, offset: { - type: Number, + type: [Number, String], default: 300, }, direction: {