Merge branch 'v0.0.11'

tm-fe · Jul 9, 2019 · b091042 · b091042
2 parents 132c311 + 4be8f26
commit b091042
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/src/css/main.less b/src/css/main.less
@@ -5,12 +5,17 @@
     background-color: #fff;
     border-bottom: 1px solid #dddee1;
     position: relative;
+
     &-wrap{
         position: relative;
         border: 1px solid #dddee1;
         // border-bottom: none;
         display: flex;
         align-content: stretch;
+
+        & *{
+            box-sizing: border-box;
+        }
     }
     &-big{
         .@{fb}{
@@ -312,7 +317,7 @@
 }
 .has-scroll-bar{
     .@{fb}-fixed-right-wrap{
-        right: 16px;
+        right: 15px;
     }
 }
 .checkbox-component{

diff --git a/src/table.vue b/src/table.vue
@@ -330,7 +330,7 @@ export default {
                 newItem._isDisabled = !!newItem._disabled;
                 newItem._expanded = !!newItem._expanded;
                 newItem._disableExpand = !!newItem._disableExpand;
-                this.rowHeight[index] = 0;
+                this.$set(this.rowHeight, index, 0);
                 return newItem;
             });
             return list;

diff --git a/src/tableFoot.vue b/src/tableFoot.vue
@@ -1,14 +1,14 @@
 
 <template>
-    <div class="flex-table-foot">
-        <div class="flex-table-row" :style="{ height: height }">
+    <div class="flex-table-foot" :style="{ height: height }">
+        <div class="flex-table-row">
             <div 
                 class="flex-table-col" 
                 v-for="(item, index) in columns"
                 :key="index"
                 :style="setCellStyle(item)"
             >
-                <template v-if="sum[item.key] && !isHidden(item)">
+                <template v-if="shouldRender(item)">
                     <Expand
                         v-if="item.render"
                         :row="sum"
@@ -70,12 +70,15 @@ export default {
             if (!this.onlyFixed) {
                 this.owner.onRowHeightChange({
                     rowIndex: 'footer',
-                    height: this.$el.offsetHeight-1,
+                    height: this.$el.offsetHeight,
                 });
             }
         },
         isHidden(item) {
             return this.onlyFixed && (item.fixed !== this.onlyFixed);
+        },
+        shouldRender(item) {
+            return this.sum[item.key] !== undefined && !this.isHidden(item)
         }
     }
 }

diff --git a/src/tableHead.vue b/src/tableHead.vue
@@ -1,6 +1,6 @@
 <template>
-    <div class="flex-table-head">
-        <div class="flex-table-row" :style="{ height: height }">
+    <div class="flex-table-head" :style="{ height: height }">
+        <div class="flex-table-row">
             <div
                 class="flex-table-col"
                 v-for="(item, index) in headRow"
@@ -129,7 +129,7 @@ export default {
             if (!this.onlyFixed) {
                 this.owner.onRowHeightChange({
                     rowIndex: 'header',
-                    height: this.$el.offsetHeight-1,
+                    height: this.$el.offsetHeight,
                 });
             }
         },

diff --git a/src/tableTr.vue b/src/tableTr.vue
@@ -69,7 +69,7 @@ export default {
             if (!this.onlyFixed) {
                 this.owner.onRowHeightChange({
                     rowIndex: this.rowIndex,
-                    height: this.$el.offsetHeight-1,
+                    height: this.$el.offsetHeight,
                 })
             }
         }