Merge remote-tracking branch 'origin/master' into feat-vue3

pull/2750/head
undefined 2020-08-22 10:49:44 +08:00
commit 9a100b04c2
3 changed files with 12 additions and 10 deletions

View File

@ -13,19 +13,22 @@ export default {
ColorPicker,
Table: {
filterTitle: '篩選器',
filterConfirm: '確 定',
filterReset: '重 置',
filterConfirm: '確定',
filterReset: '重置',
selectAll: '全部選取',
selectInvert: '反向選取',
sortTitle: '排序',
expand: '展開行',
collapse: '關閉行',
},
Modal: {
okText: '確 定',
cancelText: '取 消',
justOkText: 'OK',
okText: '確定',
cancelText: '取消',
justOkText: '知道了',
},
Popconfirm: {
okText: '確 定',
cancelText: '取 消',
okText: '確定',
cancelText: '取消',
},
Transfer: {
searchPlaceholder: '搜尋資料',

View File

@ -227,12 +227,11 @@
&-tbody > tr > td {
border-bottom: @border-width-base @border-style-base @border-color-split;
transition: all 0.3s, border 0s;
transition: background 0.3s;
}
&-thead > tr,
&-tbody > tr {
transition: all 0.3s, height 0s;
&.@{table-prefix-cls}-row-hover,
&:hover {
&:not(.@{table-prefix-cls}-expanded-row):not(.@{table-prefix-cls}-row-selected) > td {

View File

@ -133,7 +133,7 @@
"markdown-it-anchor": "^5.3.0",
"marked": "0.3.18",
"merge2": "^1.2.1",
"mini-css-extract-plugin": "^0.9.0",
"mini-css-extract-plugin": "^0.10.0",
"minimist": "^1.2.0",
"mkdirp": "^0.5.1",
"mockdate": "^2.0.2",