update

Author: 黄书伟

libs/v-table/src/frozen-columns-mixin.js

@@ -16,7 +16,8 @@ exports.default = {
             });
         },
         frozenTitleCols: function frozenTitleCols() {
-            var frozenTitleCols = [];
+            var frozenTitleCols = [],
+                self = this;
 
             if (this.internalTitleRows.length > 0) {
                 var frozenFields = this.frozenCols.map(function (x) {
@@ -34,15 +35,29 @@ exports.default = {
                             }
                         }
                     });
+
                     if (frozenTitleRows.length > 0) {
+
                         frozenTitleCols.push(frozenTitleRows);
+
+                        var minRowspan = self.getMinRowspan(frozenTitleRows);
+
+                        if (minRowspan && minRowspan > 0) {
+
+                            for (var i = 0; i < minRowspan; i++) {
+
+                                frozenTitleCols.push([]);
+                            }
+                        }
                     }
                 });
             }
+
             return frozenTitleCols;
         },
         noFrozenTitleCols: function noFrozenTitleCols() {
-            var noFrozenTitleCols = [];
+            var noFrozenTitleCols = [],
+                self = this;
 
             if (this.internalTitleRows.length > 0) {
                 var noFrozenFields = this.noFrozenCols.map(function (x) {
@@ -61,6 +76,16 @@ exports.default = {
 
                     if (noFrozenTitleRows.length > 0) {
                         noFrozenTitleCols.push(noFrozenTitleRows);
+
+                        var minRowspan = self.getMinRowspan(noFrozenTitleRows);
+
+                        if (minRowspan && minRowspan > 0) {
+
+                            for (var i = 0; i < minRowspan; i++) {
+
+                                noFrozenTitleCols.push([]);
+                            }
+                        }
                     }
                 });
             }

libs/v-table/src/table.vue

@@ -15,7 +15,7 @@
                                 <tr v-for="row in frozenTitleCols">
                                     <td v-for="col in row"
                                         :class="[col.titleCellClassName]"
-                                        :colspan="col.colspan" :rowspan="dealTitleRowspan(row,col.rowspan)"
+                                        :colspan="col.colspan" :rowspan="col.rowspan"
 
                                         @mousemove.stop="handleTitleMouseMove($event,col.fields)"
                                         @mousedown.stop="handleTitleMouseDown($event)"
@@ -177,7 +177,7 @@
                             <tr v-for="row in noFrozenTitleCols">
                                 <td v-for="col in row"
                                     :class="[col.titleCellClassName]"
-                                    :colspan="col.colspan" :rowspan="dealTitleRowspan(row,col.rowspan)"
+                                    :colspan="col.colspan" :rowspan="col.rowspan"
                                     @mousemove.stop="handleTitleMouseMove($event,col.fields)"
                                     @mousedown.stop="handleTitleMouseDown($event)"
                                     @mouseout.stop="handleTitleMouseOut()"
@@ -587,6 +587,7 @@
             bodyViewHeight(){
                 var result;
                 if (this.internalTitleRows.length > 0) {
+
                     result = this.internalHeight - this.titleRowHeight * (this.internalTitleRows.length + this.getTitleRowspanTotalCount);
                 } else {
                     result = this.internalHeight - this.titleRowHeight;

libs/v-table/src/title-cell-merge-mixin.js

@@ -63,29 +63,17 @@ exports.default = {
                 return [];
             }
         },
-        dealTitleRowspan: function dealTitleRowspan(row, rowspan) {
+        getMinRowspan: function getMinRowspan(row) {
 
-            var result = rowspan,
-                rowspanCountArr = void 0,
-                minVal = void 0;
+            var result = void 0;
 
-            rowspanCountArr = this.getTitleRowspanCountArr(row);
+            var rowspanCountArr = this.getTitleRowspanCountArr(row);
 
             if (Array.isArray(rowspanCountArr) && rowspanCountArr.length > 0) {
 
-                rowspan = parseInt(rowspan);
-
-                minVal = Math.min.apply(null, rowspanCountArr);
-
-                if (rowspan === minVal) {
-
-                    result = 1;
-                } else {
-
-                    result = rowspan - minVal + 1;
-                }
+                result = Math.min.apply(null, rowspanCountArr);
             }
-            return result;
+            return result - 1;
         }
     }