fix: 修复由于 box-sizing 不一致而导致 fixed 层高度偏差的问题

tm-fe · Jul 8, 2019 · a34fcea · a34fcea
1 parent 256bbc9
commit a34fcea
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 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}{

diff --git a/src/tableFoot.vue b/src/tableFoot.vue
@@ -1,7 +1,7 @@
 
 <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"
@@ -70,7 +70,7 @@ export default {
             if (!this.onlyFixed) {
                 this.owner.onRowHeightChange({
                     rowIndex: 'footer',
-                    height: this.$el.offsetHeight-1,
+                    height: this.$el.offsetHeight,
                 });
             }
         },

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,
                 })
             }
         }