test/ant-design
1
0
Fork 0
mirror of https://gitee.com/ant-design/ant-design.git synced 2024-12-04 13:08:41 +08:00
Code Issues Actions 100 Packages Projects Releases Wiki Activity

Merge pull request #20951 from ant-design/master

Browse Source 
chore: feature merge master
This commit is contained in:
二货机器人 2020-01-16 21:54:04 +08:00 committed by GitHub
commit 8ff0413f77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/select/style/multiple.less
View File

@ -28,6 +28,10 @@
}
}
&.@{select-prefix-cls}-allow-clear .@{select-prefix-cls}-selector {
padding-right: @font-size-sm + @control-padding-horizontal;
}
// ======================== Selections ========================
.@{select-prefix-cls}-selection-item {
position: relative;

6
components/table/__tests__/__snapshots__/demo.test.js.snap
View File

@ -5187,7 +5187,7 @@ exports[`renders ./components/table/demo/fixed-columns-header.md correctly 1`] =
style="overflow-x:scroll;margin-bottom:0"
>
<table
style="table-layout:fixed"
style="table-layout:fixed;visibility:hidden"
>
<colgroup>
<col />
@ -6151,7 +6151,7 @@ exports[`renders ./components/table/demo/fixed-header.md correctly 1`] = `
class="ant-table-header"
>
<table
style="table-layout:fixed"
style="table-layout:fixed;visibility:hidden"
>
<colgroup>
<col />
@ -7316,7 +7316,7 @@ exports[`renders ./components/table/demo/grouping-columns.md correctly 1`] = `
style="overflow-x:scroll;margin-bottom:0"
>
<table
style="table-layout:fixed"
style="table-layout:fixed;visibility:hidden"
>
<colgroup>
<col />

2
package.json
View File

@ -90,7 +90,7 @@
"ie >= 11"
],
"dependencies": {
"@ant-design/icons": "^4.0.0-alpha.19",
"@ant-design/icons": "^4.0.0-rc.0",
"array-tree-filter": "^2.1.0",
"classnames": "~2.2.6",
"copy-to-clipboard": "^3.2.0",

4
site/theme/template/IconDisplay/IconPicSearcher.tsx
View File

@ -217,10 +217,10 @@ class PicSearcher extends Component<PicSearcherProps, PicSearcherState> {
<tbody>
{icons.map((icon: iconObject) => {
const { type } = icon;
const iconName = type
const iconName = `${type
.split('-')
.map(str => `${str[0].toUpperCase()}${str.slice(1)}`)
.join('');
.join('')}Outlined`;
return (
<tr key={iconName}>