fix(Loading): add prop minHeight

heyui · Jul 16, 2018 · 7228d0e · 7228d0e
1 parent a718570
commit 7228d0e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/doc/components/component/data/view/loading.vue b/doc/components/component/data/view/loading.vue
@@ -26,6 +26,13 @@
         <td>-</td>
         <td>-</td>
       </tr>
+      <tr>
+        <td>minHeight</td>
+        <td>最小高度</td>
+        <td>Number</td>
+        <td>-</td>
+        <td>-</td>
+      </tr>
       <tr>
         <td>loading</td>
         <td>loading状态</td>

diff --git a/doc/components/demos/dataview/loading1.vue b/doc/components/demos/dataview/loading1.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
-    <p v-height="40"><h-switch v-model="loading">切换状态</h-switch></p>
+    <p v-height="40"><h-switch v-model="loading">change loading</h-switch></p>
     <div>
       <div style="padding:100px 0;" v-bg-color:gray4  class="text-center">
-        内容
+        content
       </div>
-      <Loading text="测试" :loading="loading"></Loading>
+      <Loading text="Loading" :loading="loading"></Loading>
     </div>
   </div>
 </template>

diff --git a/doc/components_en/component/data/view/loading.vue b/doc/components_en/component/data/view/loading.vue
@@ -26,6 +26,13 @@
         <td>-</td>
         <td>-</td>
       </tr>
+      <tr>
+        <td>minHeight</td>
+        <td>minHeight of loading</td>
+        <td>Number</td>
+        <td>-</td>
+        <td>-</td>
+      </tr>
       <tr>
         <td>loading</td>
         <td>Loading status</td>

diff --git a/src/components/loading/loading.vue b/src/components/loading/loading.vue
@@ -17,7 +17,8 @@ export default {
       type: Boolean,
       default: false
     },
-    text: String
+    text: String,
+    minHeight: Number
   },
   data() {
     return {
@@ -40,7 +41,7 @@ export default {
             parent.style.position = 'relative';
             this.isSetStyle = true;
           }
-          parent.style.minHeight = '50px';
+          parent.style.minHeight = this.minHeight ? `${this.minHeight}px` : '50px';
         });
       } else if (this.isSetStyle) {
         this.$nextTick(() => {