|
@@ -724,7 +724,7 @@ export default {
|
|
|
//合并单元格
|
|
//合并单元格
|
|
|
mergeMethod({row, column, rowIndex, columnIndex}) {
|
|
mergeMethod({row, column, rowIndex, columnIndex}) {
|
|
|
// console.log(row)
|
|
// console.log(row)
|
|
|
- if ([3, 6, 7, 8, 9, 10, 11, 12, 13, 14].includes(columnIndex)) {
|
|
|
|
|
|
|
+ if ([1,3, 6, 7, 8, 9, 10, 11, 12, 13, 14].includes(columnIndex)) {
|
|
|
const _row = this.setTable(this.dsdtList).merge[rowIndex];
|
|
const _row = this.setTable(this.dsdtList).merge[rowIndex];
|
|
|
const _col = _row > 0 ? 1 : 0;
|
|
const _col = _row > 0 ? 1 : 0;
|
|
|
return {
|
|
return {
|
