From c8bac12fd6e837cf8dfe19e1593ec20cd05c1ff3 Mon Sep 17 00:00:00 2001
From: AmyFoxFN <funan_amy@foxmail.com>
Date: Mon, 4 Dec 2017 12:18:05 +0800
Subject: [PATCH] fix scroll minHeight bug

---
 src/components/scroll/scroll.vue | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/components/scroll/scroll.vue b/src/components/scroll/scroll.vue
index d6743045..6a654716 100644
--- a/src/components/scroll/scroll.vue
+++ b/src/components/scroll/scroll.vue
@@ -1,11 +1,13 @@
 <template>
   <div ref="wrapper" class="cube-scroll-wrapper">
     <div class="cube-scroll-content">
-      <slot>
-        <ul ref="list" class="cube-scroll-list">
-          <li @click="clickItem(item)" class="cube-scroll-item border-bottom-1px" v-for="item in data">{{item}}</li>
-        </ul>
-      </slot>
+      <div ref="listWrapper">
+        <slot>
+          <ul class="cube-scroll-list">
+            <li @click="clickItem(item)" class="cube-scroll-item border-bottom-1px" v-for="item in data">{{item}}</li>
+          </ul>
+        </slot>
+      </div>
       <slot name="pullup" :pullUpLoad="pullUpLoad" :isPullUpLoad="isPullUpLoad">
         <div class="cube-pullup-wrapper" v-if="pullUpLoad">
           <div class="before-trigger" v-if="!isPullUpLoad">
@@ -97,6 +99,10 @@
       refreshDelay: {
         type: Number,
         default: 20
+      },
+      listRef: {
+        type: String,
+        default: 'list'
       }
     },
     data() {
@@ -143,8 +149,8 @@
         if (!this.$refs.wrapper) {
           return
         }
-        if (this.$refs.list && (this.pullDownRefresh || this.pullUpLoad)) {
-          this.$refs.list.style.minHeight = `${getRect(this.$refs.wrapper).height + 1}px`
+        if (this.$refs.listWrapper && (this.pullDownRefresh || this.pullUpLoad)) {
+          this.$refs.listWrapper.style.minHeight = `${getRect(this.$refs.wrapper).height + 1}px`
         }
 
         let options = Object.assign({}, DEFAULT_OPTIONS, {
-- 
GitLab