From a2a62c89f1158099fc3019121f716e2ecaa801e6 Mon Sep 17 00:00:00 2001
From: pangxie1991 <chenyao1102@gmail.com>
Date: Fri, 10 Mar 2017 21:51:16 +0800
Subject: [PATCH] waterfall
---
docs/examples-docs/waterfall.md | 53 ++++++++++++++++-------------
packages/waterfall/src/directive.js | 1 +
2 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/docs/examples-docs/waterfall.md b/docs/examples-docs/waterfall.md
index 4bb5f9422..99c1dc3c8 100644
--- a/docs/examples-docs/waterfall.md
+++ b/docs/examples-docs/waterfall.md
@@ -2,28 +2,6 @@
### 基础用法
-:::demo 基础用法
-```html
-<div class="waterfall">
- <div
- v-waterfall-lower="loadMore"
- v-waterfall-upper="loadMoreUpper"
- waterfall-disabled="isWaterfallDisabled"
- waterfall-offset="400"
- >
- <div
- class="waterfall-item"
- v-for="item in list"
- style="text-align: center;"
- >
- {{ item }}
- </div>
- <div v-if="loading" style="text-align: center;">
- loading
- </div>
- </div>
-</div>
-
<script>
export default {
data() {
@@ -62,6 +40,35 @@ export default {
}
};
</script>
+
+<style>
+ .waterfall {
+ max-height: 300px;
+ overflow: scroll;
+ }
+</style>
+
+:::demo 基础用法
+```html
+<div class="waterfall">
+ <div
+ v-waterfall-lower="loadMore"
+ v-waterfall-upper="loadMoreUpper"
+ waterfall-disabled="isWaterfallDisabled"
+ waterfall-offset="400"
+ >
+ <div
+ class="waterfall-item"
+ v-for="item in list"
+ style="text-align: center;"
+ >
+ {{ item }}
+ </div>
+ <div v-if="loading" style="text-align: center;">
+ loading
+ </div>
+ </div>
+</div>
```
:::
@@ -69,6 +76,6 @@ export default {
| 参数 | 说明 | 类型 | 默认值 | 可选值 |
|-----------|-----------|-----------|-------------|-------------|
-| waterfall-disabled | 是否禁止瀑布流触发 | Boolean | false | |
+| waterfall-disabled | 在vue对象中表示是否禁止瀑布流触发的key值 | String | - | |
| waterfall-offset | 触发瀑布流加载的阈值 | Number | 300 | |
diff --git a/packages/waterfall/src/directive.js b/packages/waterfall/src/directive.js
index 48f342e63..0189fe7ad 100644
--- a/packages/waterfall/src/directive.js
+++ b/packages/waterfall/src/directive.js
@@ -14,6 +14,7 @@ function doBindEvent() {
if (disabledExpr) {
this.vm.$watch(disabledExpr, (value) => {
this.disabled = value;
+ this.scrollEventListener();
});
disabled = Boolean(this.vm[disabledExpr]);
}