update

黄书伟 · 黄书伟 · commit ff0d2c7b16d8 · 2018-01-23T20:44:23.000+08:00
diff --git a/examples/doc/updateLog.md b/examples/doc/updateLog.md
@@ -1,5 +1,7 @@
-2017-1-22 未发布
+2017-1-23 未发布
 1、Table 组件优化复杂表头行合并时，会添加空行
+2、Table 组件修复复杂表头非固定列没有 checkbox 的问题 #80
+3、Table 组件合并单元格功能当设置了rowspan=1 和 colspan=1 则按照合并单元格处理
 
 2017-1-16 已发布
 1、Table 组件修复 checkbox 点击左上角位置偏移的 bug #82
diff --git a/libs/v-table/src/body-cell-merge-mixin.js b/libs/v-table/src/body-cell-merge-mixin.js
@@ -87,7 +87,7 @@ exports.default = {
 
                                     var setting = this.cellMerge && this.cellMerge(rowIndex, rowData, field);
 
-                                    if (setting && (setting.colSpan && setting.colSpan > 1 || setting.rowSpan && setting.rowSpan > 1)) {
+                                    if (setting && (setting.colSpan && setting.colSpan > 0 || setting.rowSpan && setting.rowSpan > 0)) {
 
                                                 return true;
                                     }
diff --git a/libs/v-table/src/table.vue b/libs/v-table/src/table.vue
@@ -186,7 +186,15 @@
                                     <div :class="['v-table-title-cell',showVerticalBorder?'vertical-border':'',showHorizontalBorder?'horizontal-border':'']"
                                          :style="{'width':titleColumnWidth(col.fields)+'px','height':titleColumnHeight(col.rowspan)+'px','text-align':col.titleAlign}">
                                         <span class="table-title">
-                                            <span v-if="col.type === 'selection'"></span>
+                                          <span v-if="isSelectionCol(col.fields)">
+                                                 <v-checkbox
+                                                         @change="handleCheckAll"
+                                                         :indeterminate="indeterminate"
+                                                         v-model="isAllChecked"
+                                                         :show-slot="false"
+                                                         label="check-all"
+                                                 ></v-checkbox>
+                                            </span>
                                             <span v-else v-html="col.title"></span>
                                             <span @click.stop="sortControl(col.fields[0])"
                                                   class="v-table-sort-icon" v-if="enableSort(col.orderBy)">
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-easytable",
-  "version": "1.6.5",
+  "version": "1.6.6",
   "description": "vue table component",
   "main": "libs/index.js",
   "author": "https://github.com/huangshuwei",
diff --git a/umd/js/index.js b/umd/js/index.js

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ exports.default = {`
`87`	`87`
`88`	`88`	`var setting = this.cellMerge && this.cellMerge(rowIndex, rowData, field);`
`89`	`89`
`90`		`- if (setting && (setting.colSpan && setting.colSpan > 1 \|\| setting.rowSpan && setting.rowSpan > 1)) {`
	`90`	`+ if (setting && (setting.colSpan && setting.colSpan > 0 \|\| setting.rowSpan && setting.rowSpan > 0)) {`
`91`	`91`
`92`	`92`	`return true;`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vue-easytable",`
`3`		`- "version": "1.6.5",`
	`3`	`+ "version": "1.6.6",`
`4`	`4`	`"description": "vue table component",`
`5`	`5`	`"main": "libs/index.js",`
`6`	`6`	`"author": "https://github.com/huangshuwei",`