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

Merge pull request #14619 from ant-design/fix-some-bugs-in-one-pr

Browse Source 
Fixes some bugs
This commit is contained in:
zombieJ 2019-01-29 16:44:16 +08:00 committed by GitHub
commit 66366cfe18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/checkbox/style/mixin.less
View File

@ -57,10 +57,10 @@
&:after {
@check-width: (@checkbox-size / 14) * 5px;
@check-height: (@checkbox-size / 14) * 8px;
transform: rotate(45deg) scale(0);
transform: rotate(45deg) scale(0) translate(-50%, -50%);
position: absolute;
left: (@checkbox-size - @check-width) / 2 - 0.5px * (@checkbox-size / 14);
top: (@checkbox-size - @check-height) / 2 - 2px * (@checkbox-size / 14);
top: 50%;
left: 21%;
display: table;
width: @check-width;
height: @check-height;
@ -89,7 +89,7 @@
// 选中状态
.@{checkbox-prefix-cls}-checked .@{checkbox-inner-prefix-cls}:after {
transform: rotate(45deg) scale(1);
transform: rotate(45deg) scale(1) translate(-50%, -50%);
position: absolute;
display: table;
border: 2px solid @checkbox-check-color;

3
components/config-provider/__tests__/__snapshots__/components.test.js.snap
View File

@ -16398,7 +16398,6 @@ exports[`ConfigProvider components Upload configProvider 1`] = `
>
<div
class="config-upload config-upload-select config-upload-select-text"
style="display:"
/>
<div
class="config-upload-list config-upload-list-text"
@ -16467,7 +16466,6 @@ exports[`ConfigProvider components Upload normal 1`] = `
>
<div
class="ant-upload ant-upload-select ant-upload-select-text"
style="display:"
/>
<div
class="ant-upload-list ant-upload-list-text"
@ -16536,7 +16534,6 @@ exports[`ConfigProvider components Upload prefixCls 1`] = `
>
<div
class="prefix-Upload prefix-Upload-select prefix-Upload-select-text"
style="display:"
/>
<div
class="ant-upload-list ant-upload-list-text"

1
components/form/__tests__/__snapshots__/demo.test.js.snap
View File

@ -3641,7 +3641,6 @@ exports[`renders ./components/form/demo/validate-other.md correctly 1`] = `
>
<div
class="ant-upload ant-upload-select ant-upload-select-picture"
style="display:"
/>
<div
class="ant-upload-list ant-upload-list-picture"

2
components/table/style/index.less
View File

@ -476,6 +476,8 @@
}
&-selection {
white-space: nowrap;
&-select-all-custom {
margin-right: 4px !important;
}

11
components/upload/Upload.tsx
View File

@ -185,8 +185,9 @@ class Upload extends React.Component<UploadProps, UploadState> {
}
handleManualRemove = (file: UploadFile) => {
this.upload.abort(file);
if (this.upload) {
this.upload.abort(file);
}
this.handleRemove(file);
};
@ -315,11 +316,11 @@ class Upload extends React.Component<UploadProps, UploadState> {
[`${prefixCls}-disabled`]: disabled,
});
const uploadButton = (
<div className={uploadButtonCls} style={{ display: children ? '' : 'none' }}>
const uploadButton = children ? (
<div className={uploadButtonCls}>
<RcUpload {...rcUploadProps} ref={this.saveUpload} />
</div>
);
) : null;
if (listType === 'picture-card') {
return (

9
components/upload/__tests__/__snapshots__/demo.test.js.snap
View File

@ -6,7 +6,6 @@ exports[`renders ./components/upload/demo/avatar.md correctly 1`] = `
>
<div
class="ant-upload ant-upload-select ant-upload-select-picture-card"
style="display:"
/>
</span>
`;
@ -17,7 +16,6 @@ exports[`renders ./components/upload/demo/basic.md correctly 1`] = `
>
<div
class="ant-upload ant-upload-select ant-upload-select-text"
style="display:"
/>
<div
class="ant-upload-list ant-upload-list-text"
@ -31,7 +29,6 @@ exports[`renders ./components/upload/demo/defaultFileList.md correctly 1`] = `
>
<div
class="ant-upload ant-upload-select ant-upload-select-text"
style="display:"
/>
<div
class="ant-upload-list ant-upload-list-text"
@ -217,7 +214,6 @@ exports[`renders ./components/upload/demo/directory.md correctly 1`] = `
>
<div
class="ant-upload ant-upload-select ant-upload-select-text"
style="display:"
/>
<div
class="ant-upload-list ant-upload-list-text"
@ -244,7 +240,6 @@ exports[`renders ./components/upload/demo/fileList.md correctly 1`] = `
>
<div
class="ant-upload ant-upload-select ant-upload-select-text"
style="display:"
/>
<div
class="ant-upload-list ant-upload-list-text"
@ -402,7 +397,6 @@ exports[`renders ./components/upload/demo/picture-card.md correctly 1`] = `
</div>
<div
class="ant-upload ant-upload-select ant-upload-select-picture-card"
style="display:"
/>
</span>
</div>
@ -415,7 +409,6 @@ exports[`renders ./components/upload/demo/picture-style.md correctly 1`] = `
>
<div
class="ant-upload ant-upload-select ant-upload-select-picture"
style="display:"
/>
<div
class="ant-upload-list ant-upload-list-picture"
@ -529,7 +522,6 @@ exports[`renders ./components/upload/demo/picture-style.md correctly 1`] = `
>
<div
class="ant-upload ant-upload-select ant-upload-select-picture"
style="display:"
/>
<div
class="ant-upload-list ant-upload-list-picture"
@ -646,7 +638,6 @@ exports[`renders ./components/upload/demo/upload-manually.md correctly 1`] = `
>
<div
class="ant-upload ant-upload-select ant-upload-select-text"
style="display:"
/>
<div
class="ant-upload-list ant-upload-list-text"