Skip to content

Commit 9a100b0

Browse files
author
undefined
committed
Merge remote-tracking branch 'origin/master' into feat-vue3
2 parents 01c0a03 + 648b026 commit 9a100b0

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

components/locale/zh_TW.js

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,22 @@ export default {
1313
ColorPicker,
1414
Table: {
1515
filterTitle: '篩選器',
16-
filterConfirm: '確 定',
17-
filterReset: '重 置',
16+
filterConfirm: '確定',
17+
filterReset: '重置',
1818
selectAll: '全部選取',
1919
selectInvert: '反向選取',
20+
sortTitle: '排序',
21+
expand: '展開行',
22+
collapse: '關閉行',
2023
},
2124
Modal: {
22-
okText: '確 定',
23-
cancelText: '取 消',
24-
justOkText: 'OK',
25+
okText: '確定',
26+
cancelText: '取消',
27+
justOkText: '知道了',
2528
},
2629
Popconfirm: {
27-
okText: '確 定',
28-
cancelText: '取 消',
30+
okText: '確定',
31+
cancelText: '取消',
2932
},
3033
Transfer: {
3134
searchPlaceholder: '搜尋資料',

components/table/style/index.less

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,11 @@
227227

228228
&-tbody > tr > td {
229229
border-bottom: @border-width-base @border-style-base @border-color-split;
230-
transition: all 0.3s, border 0s;
230+
transition: background 0.3s;
231231
}
232232

233233
&-thead > tr,
234234
&-tbody > tr {
235-
transition: all 0.3s, height 0s;
236235
&.@{table-prefix-cls}-row-hover,
237236
&:hover {
238237
&:not(.@{table-prefix-cls}-expanded-row):not(.@{table-prefix-cls}-row-selected) > td {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
"markdown-it-anchor": "^5.3.0",
134134
"marked": "0.3.18",
135135
"merge2": "^1.2.1",
136-
"mini-css-extract-plugin": "^0.9.0",
136+
"mini-css-extract-plugin": "^0.10.0",
137137
"minimist": "^1.2.0",
138138
"mkdirp": "^0.5.1",
139139
"mockdate": "^2.0.2",

0 commit comments

Comments
 (0)