Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

表格无数据时显示暂无数据，给与最小高度



See merge request !51

@@ -19,9 +19,9 @@
         </div>
       </div>
       <!--数据-->
-      <div class="bd"    v-loading="loading">
-          <ul class="infoList">
-            <li v-for="(item, index) in list" :key="index" :style="tableRowHeight()" >
+      <div class="bd" :style="minHeightStyle"    v-loading="loading">
+          <ul class="infoList" :style="infoBorderStyle">
+            <li v-if="list.length>0" v-for="(item, index) in list" :key="index" :style="tableRowHeight()" >
               <div
                 class="text-overflow"
                 v-for="(itemChild, idx) in header"
@@ -40,6 +40,7 @@
 
               </div>
             </li>
+            <li style="justify-content: center" v-if="list.length==0">暂无数据</li>
           </ul>
       </div>
     </superslide>
@@ -176,6 +177,12 @@ export default {
         background: this.optionsSetUp.tableBgColor
       };
     },
+    minHeightStyle(){
+      const allStyle = this.optionsPosition;
+      return{
+        'min-height':allStyle.height-80 + "px",
+      }
+    },
     //标题样式设置
     titleStyle(){
       const optionsSetUp = this.optionsSetUp;
@@ -217,10 +224,17 @@ export default {
       const bodyStyle = this.optionsSetUp;
       return{
         "border-right":bodyStyle.isLine? bodyStyle.borderWidth + "px "+"solid "+bodyStyle.borderColor:'none',
-        "border-bottom":bodyStyle.isLine? bodyStyle.borderWidth + "px "+"solid "+bodyStyle.borderColor:'none'
+        "border-bottom":bodyStyle.isLine? bodyStyle.borderWidth + "px "+"solid "+bodyStyle.borderColor:'none',
+        "border-left":this.list.length<5?bodyStyle.isLine? bodyStyle.borderWidth + "px "+"solid "+bodyStyle.borderColor:'none':'none'
 
       }
     },
+    infoBorderStyle(){
+      const bodyStyle = this.optionsSetUp;
+      return{
+        "border-bottom":this.list.length>0&&this.list.length<5?bodyStyle.isLine? bodyStyle.borderWidth + "px "+"solid "+bodyStyle.borderColor:'none':'none'
+      }
+    },
     tableStyle(){
       const tableStyleSetup=this.optionsSetUp;
       return{