Skip to content

Commit 26cf68a

Browse files
author
huangshuwei
committed
新增表头分组 border 测试
1 parent 8dd4aee commit 26cf68a

File tree

2 files changed

+44
-29
lines changed

2 files changed

+44
-29
lines changed

‎tests/unit/specs/__snapshots__/ve-table-header-group.spec.js.snap‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,18 @@ exports[`veTable header group render 1`] = `
1111
<col style="width: 130px;">
1212
<col style="width: 140px;">
1313
<col style="width: 140px;">
14-
<col style="width: 150px;">
15-
<col style="width: 160px;">
1614
</colgroup>
1715
<thead class="ve-table-fixed-header ve-table-header">
1816
<tr class="ve-table-header-tr">
1917
<th rowspan="3" colspan="1" class="ve-table-header-th" style="text-align: center; top: 0px;">col1</th>
2018
<th rowspan="1" colspan="2" class="ve-table-header-th" style="text-align: center; top: 0px;">col2-col3</th>
21-
<th rowspan="1" colspan="3" class="ve-table-header-th" style="text-align: center; top: 0px;">col4-col5-col6</th>
22-
<th rowspan="3" colspan="1" class="ve-table-header-th" style="text-align: center; top: 0px;">col7</th>
23-
<th rowspan="3" colspan="1" class="ve-table-header-th ve-table-last-column" style="text-align: center; top: 0px;">col8</th>
19+
<th rowspan="1" colspan="3" class="ve-table-header-th ve-table-last-column" style="text-align: center; top: 0px;">col4-col5-col6</th>
2420
</tr>
2521
<tr class="ve-table-header-tr">
2622
<th rowspan="2" colspan="1" class="ve-table-header-th" style="text-align: center; top: 0px;">col2</th>
2723
<th rowspan="2" colspan="1" class="ve-table-header-th" style="text-align: center; top: 0px;">col3</th>
2824
<th rowspan="1" colspan="2" class="ve-table-header-th" style="text-align: center; top: 0px;">col4-col5</th>
29-
<th rowspan="2" colspan="1" class="ve-table-header-th" style="text-align: center; top: 0px;">col6</th>
25+
<th rowspan="2" colspan="1" class="ve-table-header-th ve-table-last-column" style="text-align: center; top: 0px;">col6</th>
3026
</tr>
3127
<tr class="ve-table-header-tr">
3228
<th rowspan="1" colspan="1" class="ve-table-header-th" style="text-align: center; top: 0px;">col4</th>
@@ -41,8 +37,6 @@ exports[`veTable header group render 1`] = `
4137
<td style="padding: 0px; border: 0px; height: 0px;"></td>
4238
<td style="padding: 0px; border: 0px; height: 0px;"></td>
4339
<td style="padding: 0px; border: 0px; height: 0px;"></td>
44-
<td style="padding: 0px; border: 0px; height: 0px;"></td>
45-
<td style="padding: 0px; border: 0px; height: 0px;"></td>
4640
</tr>
4741
<tr row-key="0" class="ve-table-body-tr">
4842
<td rowspan="1" colspan="1" class="ve-table-body-td" style="text-align: center;">1</td>
@@ -51,8 +45,6 @@ exports[`veTable header group render 1`] = `
5145
<td rowspan="1" colspan="1" class="ve-table-body-td" style="text-align: center;">4</td>
5246
<td rowspan="1" colspan="1" class="ve-table-body-td" style="text-align: center;">5</td>
5347
<td rowspan="1" colspan="1" class="ve-table-body-td" style="text-align: center;">6</td>
54-
<td rowspan="1" colspan="1" class="ve-table-body-td" style="text-align: center;">7</td>
55-
<td rowspan="1" colspan="1" class="ve-table-body-td" style="text-align: center;">8</td>
5648
</tr>
5749
<tr row-key="1" class="ve-table-body-tr">
5850
<td rowspan="1" colspan="1" class="ve-table-body-td" style="text-align: center;">1</td>
@@ -61,8 +53,6 @@ exports[`veTable header group render 1`] = `
6153
<td rowspan="1" colspan="1" class="ve-table-body-td" style="text-align: center;">4</td>
6254
<td rowspan="1" colspan="1" class="ve-table-body-td" style="text-align: center;">5</td>
6355
<td rowspan="1" colspan="1" class="ve-table-body-td" style="text-align: center;">6</td>
64-
<td rowspan="1" colspan="1" class="ve-table-body-td" style="text-align: center;">7</td>
65-
<td rowspan="1" colspan="1" class="ve-table-body-td" style="text-align: center;">8</td>
6656
</tr>
6757
</tbody>
6858
<tfoot class="ve-table-fixed-footer ve-table-footer"></tfoot>

‎tests/unit/specs/ve-table-header-group.spec.js‎

Lines changed: 42 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ describe("veTable header group", () => {
1111
col3: "3",
1212
col4: "4",
1313
col5: "5",
14-
col6: "6",
15-
col7: "7",
16-
col8: "8"
14+
col6: "6"
15+
/* col7: "7",
16+
col8: "8" */
1717
},
1818
{
1919
rowkey: 1,
@@ -22,9 +22,9 @@ describe("veTable header group", () => {
2222
col3: "3",
2323
col4: "4",
2424
col5: "5",
25-
col6: "6",
26-
col7: "7",
27-
col8: "8"
25+
col6: "6"
26+
/* col7: "7",
27+
col8: "8" */
2828
}
2929
];
3030

@@ -79,8 +79,8 @@ describe("veTable header group", () => {
7979
width: 140
8080
}
8181
]
82-
},
83-
{
82+
}
83+
/* {
8484
field: "col7",
8585
key: "g",
8686
title: "col7",
@@ -91,7 +91,7 @@ describe("veTable header group", () => {
9191
key: "h",
9292
title: "col8",
9393
width: 160
94-
}
94+
} */
9595
];
9696

9797
it("render", () => {
@@ -106,7 +106,38 @@ describe("veTable header group", () => {
106106
expect(wrapper.html()).toMatchSnapshot();
107107
});
108108

109-
it("test colspan and rowspan", () => {
109+
it("row last column", () => {
110+
const wrapper = mount(veTable, {
111+
propsData: {
112+
borderY: true,
113+
columns: TABLE_COLUMNS,
114+
tableData: TABLE_DATA,
115+
rowKeyFieldName: "rowkey"
116+
}
117+
});
118+
119+
const trEls = wrapper.findAll(".ve-table-header-tr");
120+
121+
// first row last column
122+
expect(
123+
trEls
124+
.at(0)
125+
.findAll(".ve-table-header-th")
126+
.at(2)
127+
.classes()
128+
).toContain("ve-table-last-column");
129+
130+
// second row last column
131+
expect(
132+
trEls
133+
.at(1)
134+
.findAll(".ve-table-header-th")
135+
.at(3)
136+
.classes()
137+
).toContain("ve-table-last-column");
138+
});
139+
140+
it("colspan and rowspan", () => {
110141
const wrapper = mount(veTable, {
111142
propsData: {
112143
columns: TABLE_COLUMNS,
@@ -120,7 +151,7 @@ describe("veTable header group", () => {
120151

121152
/* first tr ths */
122153
const firstTrThEls = trEls.at(0).findAll(".ve-table-header-th");
123-
expect(firstTrThEls.length).toBe(5);
154+
expect(firstTrThEls.length).toBe(3);
124155
expect(firstTrThEls.at(0).attributes("rowspan")).toBe("3");
125156
expect(firstTrThEls.at(0).attributes("colspan")).toBe("1");
126157

@@ -130,12 +161,6 @@ describe("veTable header group", () => {
130161
expect(firstTrThEls.at(2).attributes("rowspan")).toBe("1");
131162
expect(firstTrThEls.at(2).attributes("colspan")).toBe("3");
132163

133-
expect(firstTrThEls.at(3).attributes("rowspan")).toBe("3");
134-
expect(firstTrThEls.at(3).attributes("colspan")).toBe("1");
135-
136-
expect(firstTrThEls.at(4).attributes("rowspan")).toBe("3");
137-
expect(firstTrThEls.at(4).attributes("colspan")).toBe("1");
138-
139164
/* second tr ths */
140165
const secondTrThEls = trEls.at(1).findAll(".ve-table-header-th");
141166
expect(secondTrThEls.length).toBe(4);

0 commit comments

Comments
 (0)