Merge branch 'master' of http://118.178.224.202:3000/ewide/ewide_core

Web/src/assets/style/lib/list.less

@@ -25,4 +25,7 @@
       }
     }
   }
+  >.ant-pagination {
+    margin: @padding-md 0;
+  }
 }

Web/src/assets/style/lib/table.less

@@ -125,6 +125,10 @@
       }
     }
   }
+
+  .ant-table-pagination {
+    float: none;
+  }
 }
 
 .yo-table-actions {

Web/src/components/yoList/index.js

@@ -99,12 +99,21 @@ export default {
                         </a-button-group>
                     </div>
                 </div>
-                <a-list {...{ props, on, scopedSlots: { ...this.$scopedSlots } }}>
-                    {Object.keys(this.$slots).map((name) => (
-                        <template slot={name}>{this.$slots[name]}</template>
-                    ))}
-                </a-list>
-                <a-pagination size="small" {... { props: this.pagination }} onChange={this.onListChange} onShowSizeChange={this.onListChange} />
+                <div class="yo-list">
+                    <a-list {...{ props, on, scopedSlots: { ...this.$scopedSlots } }}>
+                        {Object.keys(this.$slots).map((name) => (
+                            <template slot={name}>{this.$slots[name]}</template>
+                        ))}
+                    </a-list>
+                    {
+                        !!this.data && !!this.data.length && <a-pagination
+                            size="small"
+                            {... { props: this.pagination }}
+                            onChange={this.onListChange}
+                            onShowSizeChange={this.onListChange}
+                        />
+                    }
+                </div>
             </section>
         )
     },