Skip to content

Commit 1af0e6b

Browse files
author
黄书伟
committed
fixd bug
1 parent 4756599 commit 1af0e6b

File tree

4 files changed

+68
-52
lines changed

4 files changed

+68
-52
lines changed

‎libs/themes-base/v-table.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
/*font-size:16px;*/
133133
width:16px;
134134
height: 19px;
135-
margin-left: -8px;
135+
margin-left: -5px;
136136
overflow: hidden;
137137
cursor: pointer;
138138
}
@@ -150,11 +150,11 @@
150150
}
151151

152152
.v-table-sort-icon i:first-child {
153-
top: -4px;
153+
top: -5px;
154154
}
155155

156156
.v-table-sort-icon i:last-child {
157-
bottom: -0px;
157+
bottom: 1px;
158158
}
159159

160160
.v-table-header .cursorPointer{

‎libs/v-table/src/table.vue‎

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@
2020
@mouseout.stop="handleTitleMouseOut()">
2121
<div :class="['v-table-title-cell',showVerticalBorder?'vertical-border':'',showHorizontalBorder?'horizontal-border':'']"
2222
:style="{'width':titleColumnWidth(col.fields)+'px','height':titleColumnHeight(col.rowspan)+'px','text-align':col.titleAlign}">
23-
<span class="table-title" v-html="col.title"></span>
24-
<span @click.stop="sortControl(col.fields[0],col.orderBy)"
25-
class="v-table-sort-icon" v-if="enableSort(col.orderBy)">
26-
<i :class='["v-icon-up-dir",col.orderBy ==="asc" ? "checked":""]'></i>
27-
<i :class='["v-icon-down-dir",col.orderBy ==="desc" ? "checked":""]'></i>
23+
<span class="table-title">
24+
<span v-html="col.title"></span>
25+
<span @click.stop="sortControl(col.fields[0],col.orderBy)"
26+
class="v-table-sort-icon" v-if="enableSort(col.orderBy)">
27+
<i :class='["v-icon-up-dir",col.orderBy ==="asc" ? "checked":""]'></i>
28+
<i :class='["v-icon-down-dir",col.orderBy ==="desc" ? "checked":""]'></i>
29+
</span>
2830
</span>
2931
</div>
3032
</td>
@@ -40,12 +42,14 @@
4042
@mouseout.stop="handleTitleMouseOut()">
4143
<div :class="['v-table-title-cell',showVerticalBorder?'vertical-border':'',showHorizontalBorder?'horizontal-border':'']"
4244
:style="{'width':col.width+'px','height':titleRowHeight+'px','text-align':col.titleAlign}">
43-
<span class="table-title" v-html="col.title"></span>
44-
<span @click.stop="sortControl(col.field,col.orderBy)"
45-
class="v-table-sort-icon" v-if="enableSort(col.orderBy)">
46-
<i :class='["v-icon-up-dir",col.orderBy ==="asc" ? "checked":""]'></i>
47-
<i :class='["v-icon-down-dir",col.orderBy ==="desc" ? "checked":""]'></i>
48-
</span>
45+
<span class="table-title">
46+
<span v-html="col.title"></span>
47+
<span @click.stop="sortControl(col.field,col.orderBy)"
48+
class="v-table-sort-icon" v-if="enableSort(col.orderBy)">
49+
<i :class='["v-icon-up-dir",col.orderBy ==="asc" ? "checked":""]'></i>
50+
<i :class='["v-icon-down-dir",col.orderBy ==="desc" ? "checked":""]'></i>
51+
</span>
52+
</span>
4953
</div>
5054
</td>
5155
</tr>
@@ -95,7 +99,8 @@
9599
>
96100
<template
97101
v-if="typeof col.componentName ==='string' && col.componentName.length > 0">
98-
<component :rowData="item" :field="col.field ? col.field : ''" :index="rowIndex"
102+
<component :rowData="item" :field="col.field ? col.field : ''"
103+
:index="rowIndex"
99104
:is="col.componentName"></component>
100105
</template>
101106
<template v-else>
@@ -135,13 +140,14 @@
135140
@mouseout.stop="handleTitleMouseOut()">
136141
<div :class="['v-table-title-cell',showVerticalBorder?'vertical-border':'',showHorizontalBorder?'horizontal-border':'']"
137142
:style="{'width':titleColumnWidth(col.fields)+'px','height':titleColumnHeight(col.rowspan)+'px','text-align':col.titleAlign}">
138-
<span class="table-title" v-html="col.title"></span>
139-
<span @click.stop="sortControl(col.fields[0],col.orderBy)"
140-
class="v-table-sort-icon" v-if="enableSort(col.orderBy)">
141-
<i :class='["v-icon-up-dir",col.orderBy ==="asc" ? "checked":""]'></i>
142-
<i :class='["v-icon-down-dir",col.orderBy ==="desc" ? "checked":""]'></i>
143+
<span class="table-title">
144+
<span v-html="col.title"></span>
145+
<span @click.stop="sortControl(col.fields[0],col.orderBy)"
146+
class="v-table-sort-icon" v-if="enableSort(col.orderBy)">
147+
<i :class='["v-icon-up-dir",col.orderBy ==="asc" ? "checked":""]'></i>
148+
<i :class='["v-icon-down-dir",col.orderBy ==="desc" ? "checked":""]'></i>
149+
</span>
143150
</span>
144-
145151
</div>
146152
</td>
147153
</tr>
@@ -156,11 +162,13 @@
156162
@mouseout.stop="handleTitleMouseOut()">
157163
<div :class="['v-table-title-cell',showVerticalBorder?'vertical-border':'',showHorizontalBorder?'horizontal-border':'']"
158164
:style="{'width':col.width+'px','height':titleRowHeight+'px','text-align':col.titleAlign}">
159-
<span class="table-title" v-html="col.title"></span>
160-
<span @click.stop="sortControl(col.field,col.orderBy)" class="v-table-sort-icon"
161-
v-if="enableSort(col.orderBy)">
162-
<i :class='["v-icon-up-dir",col.orderBy ==="asc" ? "checked":""]'></i>
163-
<i :class='["v-icon-down-dir",col.orderBy ==="desc" ? "checked":""]'></i>
165+
<span class="table-title">
166+
<span v-html="col.title"></span>
167+
<span @click.stop="sortControl(col.field,col.orderBy)" class="v-table-sort-icon"
168+
v-if="enableSort(col.orderBy)">
169+
<i :class='["v-icon-up-dir",col.orderBy ==="asc" ? "checked":""]'></i>
170+
<i :class='["v-icon-down-dir",col.orderBy ==="desc" ? "checked":""]'></i>
171+
</span>
164172
</span>
165173
</div>
166174
</td>

‎packages/themes-base/v-table.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
/*font-size:16px;*/
133133
width:16px;
134134
height: 19px;
135-
margin-left: -8px;
135+
margin-left: -5px;
136136
overflow: hidden;
137137
cursor: pointer;
138138
}
@@ -150,11 +150,11 @@
150150
}
151151

152152
.v-table-sort-icon i:first-child {
153-
top: -4px;
153+
top: -5px;
154154
}
155155

156156
.v-table-sort-icon i:last-child {
157-
bottom: -0px;
157+
bottom: 1px;
158158
}
159159

160160
.v-table-header .cursorPointer{

‎packages/v-table/src/table.vue‎

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@
2020
@mouseout.stop="handleTitleMouseOut()">
2121
<div :class="['v-table-title-cell',showVerticalBorder?'vertical-border':'',showHorizontalBorder?'horizontal-border':'']"
2222
:style="{'width':titleColumnWidth(col.fields)+'px','height':titleColumnHeight(col.rowspan)+'px','text-align':col.titleAlign}">
23-
<span class="table-title" v-html="col.title"></span>
24-
<span @click.stop="sortControl(col.fields[0],col.orderBy)"
25-
class="v-table-sort-icon" v-if="enableSort(col.orderBy)">
26-
<i :class='["v-icon-up-dir",col.orderBy ==="asc" ? "checked":""]'></i>
27-
<i :class='["v-icon-down-dir",col.orderBy ==="desc" ? "checked":""]'></i>
23+
<span class="table-title">
24+
<span v-html="col.title"></span>
25+
<span @click.stop="sortControl(col.fields[0],col.orderBy)"
26+
class="v-table-sort-icon" v-if="enableSort(col.orderBy)">
27+
<i :class='["v-icon-up-dir",col.orderBy ==="asc" ? "checked":""]'></i>
28+
<i :class='["v-icon-down-dir",col.orderBy ==="desc" ? "checked":""]'></i>
29+
</span>
2830
</span>
2931
</div>
3032
</td>
@@ -40,12 +42,14 @@
4042
@mouseout.stop="handleTitleMouseOut()">
4143
<div :class="['v-table-title-cell',showVerticalBorder?'vertical-border':'',showHorizontalBorder?'horizontal-border':'']"
4244
:style="{'width':col.width+'px','height':titleRowHeight+'px','text-align':col.titleAlign}">
43-
<span class="table-title" v-html="col.title"></span>
44-
<span @click.stop="sortControl(col.field,col.orderBy)"
45-
class="v-table-sort-icon" v-if="enableSort(col.orderBy)">
46-
<i :class='["v-icon-up-dir",col.orderBy ==="asc" ? "checked":""]'></i>
47-
<i :class='["v-icon-down-dir",col.orderBy ==="desc" ? "checked":""]'></i>
48-
</span>
45+
<span class="table-title">
46+
<span v-html="col.title"></span>
47+
<span @click.stop="sortControl(col.field,col.orderBy)"
48+
class="v-table-sort-icon" v-if="enableSort(col.orderBy)">
49+
<i :class='["v-icon-up-dir",col.orderBy ==="asc" ? "checked":""]'></i>
50+
<i :class='["v-icon-down-dir",col.orderBy ==="desc" ? "checked":""]'></i>
51+
</span>
52+
</span>
4953
</div>
5054
</td>
5155
</tr>
@@ -95,7 +99,8 @@
9599
>
96100
<template
97101
v-if="typeof col.componentName ==='string' && col.componentName.length > 0">
98-
<component :rowData="item" :field="col.field ? col.field : ''" :index="rowIndex"
102+
<component :rowData="item" :field="col.field ? col.field : ''"
103+
:index="rowIndex"
99104
:is="col.componentName"></component>
100105
</template>
101106
<template v-else>
@@ -135,13 +140,14 @@
135140
@mouseout.stop="handleTitleMouseOut()">
136141
<div :class="['v-table-title-cell',showVerticalBorder?'vertical-border':'',showHorizontalBorder?'horizontal-border':'']"
137142
:style="{'width':titleColumnWidth(col.fields)+'px','height':titleColumnHeight(col.rowspan)+'px','text-align':col.titleAlign}">
138-
<span class="table-title" v-html="col.title"></span>
139-
<span @click.stop="sortControl(col.fields[0],col.orderBy)"
140-
class="v-table-sort-icon" v-if="enableSort(col.orderBy)">
141-
<i :class='["v-icon-up-dir",col.orderBy ==="asc" ? "checked":""]'></i>
142-
<i :class='["v-icon-down-dir",col.orderBy ==="desc" ? "checked":""]'></i>
143+
<span class="table-title">
144+
<span v-html="col.title"></span>
145+
<span @click.stop="sortControl(col.fields[0],col.orderBy)"
146+
class="v-table-sort-icon" v-if="enableSort(col.orderBy)">
147+
<i :class='["v-icon-up-dir",col.orderBy ==="asc" ? "checked":""]'></i>
148+
<i :class='["v-icon-down-dir",col.orderBy ==="desc" ? "checked":""]'></i>
149+
</span>
143150
</span>
144-
145151
</div>
146152
</td>
147153
</tr>
@@ -156,11 +162,13 @@
156162
@mouseout.stop="handleTitleMouseOut()">
157163
<div :class="['v-table-title-cell',showVerticalBorder?'vertical-border':'',showHorizontalBorder?'horizontal-border':'']"
158164
:style="{'width':col.width+'px','height':titleRowHeight+'px','text-align':col.titleAlign}">
159-
<span class="table-title" v-html="col.title"></span>
160-
<span @click.stop="sortControl(col.field,col.orderBy)" class="v-table-sort-icon"
161-
v-if="enableSort(col.orderBy)">
162-
<i :class='["v-icon-up-dir",col.orderBy ==="asc" ? "checked":""]'></i>
163-
<i :class='["v-icon-down-dir",col.orderBy ==="desc" ? "checked":""]'></i>
165+
<span class="table-title">
166+
<span v-html="col.title"></span>
167+
<span @click.stop="sortControl(col.field,col.orderBy)" class="v-table-sort-icon"
168+
v-if="enableSort(col.orderBy)">
169+
<i :class='["v-icon-up-dir",col.orderBy ==="asc" ? "checked":""]'></i>
170+
<i :class='["v-icon-down-dir",col.orderBy ==="desc" ? "checked":""]'></i>
171+
</span>
164172
</span>
165173
</div>
166174
</td>

0 commit comments

Comments
 (0)