diff --git a/docs/examples-docs/waterfall.md b/docs/examples-docs/waterfall.md index 268b02449..00c2e406b 100644 --- a/docs/examples-docs/waterfall.md +++ b/docs/examples-docs/waterfall.md @@ -15,7 +15,7 @@ Waterfall.install(Vue); #### 局部注册 -如果你只是想在某个组件中使用`Waterfall`,你可以在对应组件中注册`Waterfall`指令,这样只能在你注册的组件中使用`Waterfall`: +如果你只是想在某个组件中使用`Waterfall`,可以在对应组件中注册`Waterfall`指令,这样只能在你注册的组件中使用`Waterfall`: ```js import { Waterfall } from 'vant'; @@ -34,7 +34,7 @@ export default { export default { data() { return { - list: [1, 2, 3, 4, 5], + list: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], loading: false, finished: false }; @@ -54,7 +54,7 @@ export default { this.list.push(lastNumber); } this.loading = false; - }, 2000); + }, 200); } }, computed: { @@ -67,15 +67,16 @@ export default { #### 基础用法 - +使用 `v-waterfall-lower` 监听滚动到达底部,并执行相应函数。若是函数执行中需要异步加载数据,可以将 `waterfall-disabled` 指定的值置为 false,禁止 `v-waterfall-lower` 监听滚动事件 :::demo 基础用法 ```html

当即将滚动到元素底部时,会自动加载更多

-
-
-
- {{ item }} -
- -
-
+ ``` ::: diff --git a/package.json b/package.json index 92796c5d5..ff5139429 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vant", - "version": "0.9.7", + "version": "0.9.8", "description": "有赞vue wap组件库", "main": "lib/vant.js", "style": "lib/vant-css/index.css", @@ -41,7 +41,7 @@ "component" ], "author": "youzanfe", - "license": "ISC", + "license": "MIT", "dependencies": { "babel-runtime": "6.x", "vue-lazyload": "^1.1.3", diff --git a/packages/index.js b/packages/index.js index 8b96fd8b8..ef19eb9a9 100644 --- a/packages/index.js +++ b/packages/index.js @@ -53,7 +53,7 @@ import TreeSelect from './tree-select'; import Uploader from './uploader'; import Waterfall from './waterfall'; -const version = '0.9.7'; +const version = '0.9.8'; const components = [ Actionsheet, AddressList, diff --git a/packages/vant-css/package.json b/packages/vant-css/package.json index 412d38abf..4fa198512 100644 --- a/packages/vant-css/package.json +++ b/packages/vant-css/package.json @@ -1,6 +1,6 @@ { "name": "vant-css", - "version": "0.9.7", + "version": "0.9.8", "description": "vant css.", "main": "lib/index.css", "style": "lib/index.css", diff --git a/packages/waterfall/directive.js b/packages/waterfall/directive.js index 220479d40..f10b536ee 100644 --- a/packages/waterfall/directive.js +++ b/packages/waterfall/directive.js @@ -42,7 +42,7 @@ function handleScrollEvent() { // 判断是否到了底 let needLoadMoreToLower = false; if (element === scrollEventTarget) { - needLoadMoreToLower = scrollEventTarget.scollHeight - targetBottom < this.offset; + needLoadMoreToLower = scrollEventTarget.scrollHeight - targetBottom < this.offset; } else { const elementBottom = Utils.getElementTop(element) - Utils.getElementTop(scrollEventTarget) + Utils.getVisibleHeight(element); needLoadMoreToLower = elementBottom - Utils.getVisibleHeight(scrollEventTarget) < this.offset;