|
@@ -360,7 +360,7 @@
|
|
|
if (item?.colspanKey.length) {
|
|
if (item?.colspanKey.length) {
|
|
|
item.colspanKey.forEach((id) => {
|
|
item.colspanKey.forEach((id) => {
|
|
|
let { columnIndex } = this.getIndex(id);
|
|
let { columnIndex } = this.getIndex(id);
|
|
|
- console.log(columnIndex, 'columnIndex');
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
this.columns[columnIndex].forEach((cell, rowIndex) => {
|
|
this.columns[columnIndex].forEach((cell, rowIndex) => {
|
|
|
if (cell.colspanKey.length) {
|
|
if (cell.colspanKey.length) {
|
|
@@ -437,7 +437,7 @@
|
|
|
);
|
|
);
|
|
|
}
|
|
}
|
|
|
} else if (item[rowIndex].rowspan > 1) {
|
|
} else if (item[rowIndex].rowspan > 1) {
|
|
|
- //rowspan大于1,代表合并过单元格,需要吧值继承给下一行
|
|
|
|
|
|
|
+ //rowspan大于1,代表合并过单元格,需要把值继承给下一行
|
|
|
let data = item[rowIndex];
|
|
let data = item[rowIndex];
|
|
|
data.rowspan--;
|
|
data.rowspan--;
|
|
|
this.$set(this.columns[columnIndex], [rowIndex + 1], data);
|
|
this.$set(this.columns[columnIndex], [rowIndex + 1], data);
|
|
@@ -561,19 +561,7 @@
|
|
|
background-color: #fff;
|
|
background-color: #fff;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- .table-header {
|
|
|
|
|
- span {
|
|
|
|
|
- display: inline-block;
|
|
|
|
|
- height: 30px;
|
|
|
|
|
- border: 1px solid #ddd;
|
|
|
|
|
- width: 100px;
|
|
|
|
|
- background-color: #f2f2f2 !important;
|
|
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
- input {
|
|
|
|
|
- background-color: #f2f2f2 !important;
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
.table-body {
|
|
.table-body {
|
|
|
white-space: nowrap;
|
|
white-space: nowrap;
|
|
|
.column {
|
|
.column {
|
|
@@ -584,29 +572,14 @@
|
|
|
width: 100%;
|
|
width: 100%;
|
|
|
}
|
|
}
|
|
|
> div:nth-of-type(1) {
|
|
> div:nth-of-type(1) {
|
|
|
- background-color: #f2f2f2 !important;
|
|
|
|
|
|
|
+ // background-color: #f2f2f2 !important;
|
|
|
> input {
|
|
> input {
|
|
|
- background-color: #f2f2f2 !important;
|
|
|
|
|
|
|
+ // background-color: #f2f2f2 !important;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- // th,
|
|
|
|
|
- // td {
|
|
|
|
|
- // border: 1px solid #ddd;
|
|
|
|
|
- // padding: 2px;
|
|
|
|
|
- // text-align: center;
|
|
|
|
|
- // height: 30px;
|
|
|
|
|
- // }
|
|
|
|
|
- // th {
|
|
|
|
|
- // background-color: #f2f2f2;
|
|
|
|
|
- // > input {
|
|
|
|
|
- // background-color: #f2f2f2 !important;
|
|
|
|
|
- // }
|
|
|
|
|
- // }
|
|
|
|
|
- tr:nth-child(even) {
|
|
|
|
|
- background-color: #f9f9f9;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+
|
|
|
input:focus {
|
|
input:focus {
|
|
|
border-color: #66afe9; /* 改变边框颜色 */
|
|
border-color: #66afe9; /* 改变边框颜色 */
|
|
|
outline: none; /* 移除默认的轮廓线 */
|
|
outline: none; /* 移除默认的轮廓线 */
|