mirror of
https://gitee.com/ant-design/ant-design.git
synced 2024-12-04 21:18:01 +08:00
Merge pull request #14619 from ant-design/fix-some-bugs-in-one-pr
Fixes some bugs
This commit is contained in:
commit
66366cfe18
@ -57,10 +57,10 @@
|
|||||||
&:after {
|
&:after {
|
||||||
@check-width: (@checkbox-size / 14) * 5px;
|
@check-width: (@checkbox-size / 14) * 5px;
|
||||||
@check-height: (@checkbox-size / 14) * 8px;
|
@check-height: (@checkbox-size / 14) * 8px;
|
||||||
transform: rotate(45deg) scale(0);
|
transform: rotate(45deg) scale(0) translate(-50%, -50%);
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: (@checkbox-size - @check-width) / 2 - 0.5px * (@checkbox-size / 14);
|
top: 50%;
|
||||||
top: (@checkbox-size - @check-height) / 2 - 2px * (@checkbox-size / 14);
|
left: 21%;
|
||||||
display: table;
|
display: table;
|
||||||
width: @check-width;
|
width: @check-width;
|
||||||
height: @check-height;
|
height: @check-height;
|
||||||
@ -89,7 +89,7 @@
|
|||||||
|
|
||||||
// 选中状态
|
// 选中状态
|
||||||
.@{checkbox-prefix-cls}-checked .@{checkbox-inner-prefix-cls}:after {
|
.@{checkbox-prefix-cls}-checked .@{checkbox-inner-prefix-cls}:after {
|
||||||
transform: rotate(45deg) scale(1);
|
transform: rotate(45deg) scale(1) translate(-50%, -50%);
|
||||||
position: absolute;
|
position: absolute;
|
||||||
display: table;
|
display: table;
|
||||||
border: 2px solid @checkbox-check-color;
|
border: 2px solid @checkbox-check-color;
|
||||||
|
@ -16398,7 +16398,6 @@ exports[`ConfigProvider components Upload configProvider 1`] = `
|
|||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="config-upload config-upload-select config-upload-select-text"
|
class="config-upload config-upload-select config-upload-select-text"
|
||||||
style="display:"
|
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
class="config-upload-list config-upload-list-text"
|
class="config-upload-list config-upload-list-text"
|
||||||
@ -16467,7 +16466,6 @@ exports[`ConfigProvider components Upload normal 1`] = `
|
|||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="ant-upload ant-upload-select ant-upload-select-text"
|
class="ant-upload ant-upload-select ant-upload-select-text"
|
||||||
style="display:"
|
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
class="ant-upload-list ant-upload-list-text"
|
class="ant-upload-list ant-upload-list-text"
|
||||||
@ -16536,7 +16534,6 @@ exports[`ConfigProvider components Upload prefixCls 1`] = `
|
|||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="prefix-Upload prefix-Upload-select prefix-Upload-select-text"
|
class="prefix-Upload prefix-Upload-select prefix-Upload-select-text"
|
||||||
style="display:"
|
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
class="ant-upload-list ant-upload-list-text"
|
class="ant-upload-list ant-upload-list-text"
|
||||||
|
@ -3641,7 +3641,6 @@ exports[`renders ./components/form/demo/validate-other.md correctly 1`] = `
|
|||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="ant-upload ant-upload-select ant-upload-select-picture"
|
class="ant-upload ant-upload-select ant-upload-select-picture"
|
||||||
style="display:"
|
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
class="ant-upload-list ant-upload-list-picture"
|
class="ant-upload-list ant-upload-list-picture"
|
||||||
|
@ -476,6 +476,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
&-selection {
|
&-selection {
|
||||||
|
white-space: nowrap;
|
||||||
|
|
||||||
&-select-all-custom {
|
&-select-all-custom {
|
||||||
margin-right: 4px !important;
|
margin-right: 4px !important;
|
||||||
}
|
}
|
||||||
|
@ -185,8 +185,9 @@ class Upload extends React.Component<UploadProps, UploadState> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
handleManualRemove = (file: UploadFile) => {
|
handleManualRemove = (file: UploadFile) => {
|
||||||
|
if (this.upload) {
|
||||||
this.upload.abort(file);
|
this.upload.abort(file);
|
||||||
|
}
|
||||||
this.handleRemove(file);
|
this.handleRemove(file);
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -315,11 +316,11 @@ class Upload extends React.Component<UploadProps, UploadState> {
|
|||||||
[`${prefixCls}-disabled`]: disabled,
|
[`${prefixCls}-disabled`]: disabled,
|
||||||
});
|
});
|
||||||
|
|
||||||
const uploadButton = (
|
const uploadButton = children ? (
|
||||||
<div className={uploadButtonCls} style={{ display: children ? '' : 'none' }}>
|
<div className={uploadButtonCls}>
|
||||||
<RcUpload {...rcUploadProps} ref={this.saveUpload} />
|
<RcUpload {...rcUploadProps} ref={this.saveUpload} />
|
||||||
</div>
|
</div>
|
||||||
);
|
) : null;
|
||||||
|
|
||||||
if (listType === 'picture-card') {
|
if (listType === 'picture-card') {
|
||||||
return (
|
return (
|
||||||
|
@ -6,7 +6,6 @@ exports[`renders ./components/upload/demo/avatar.md correctly 1`] = `
|
|||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="ant-upload ant-upload-select ant-upload-select-picture-card"
|
class="ant-upload ant-upload-select ant-upload-select-picture-card"
|
||||||
style="display:"
|
|
||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
`;
|
`;
|
||||||
@ -17,7 +16,6 @@ exports[`renders ./components/upload/demo/basic.md correctly 1`] = `
|
|||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="ant-upload ant-upload-select ant-upload-select-text"
|
class="ant-upload ant-upload-select ant-upload-select-text"
|
||||||
style="display:"
|
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
class="ant-upload-list ant-upload-list-text"
|
class="ant-upload-list ant-upload-list-text"
|
||||||
@ -31,7 +29,6 @@ exports[`renders ./components/upload/demo/defaultFileList.md correctly 1`] = `
|
|||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="ant-upload ant-upload-select ant-upload-select-text"
|
class="ant-upload ant-upload-select ant-upload-select-text"
|
||||||
style="display:"
|
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
class="ant-upload-list ant-upload-list-text"
|
class="ant-upload-list ant-upload-list-text"
|
||||||
@ -217,7 +214,6 @@ exports[`renders ./components/upload/demo/directory.md correctly 1`] = `
|
|||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="ant-upload ant-upload-select ant-upload-select-text"
|
class="ant-upload ant-upload-select ant-upload-select-text"
|
||||||
style="display:"
|
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
class="ant-upload-list ant-upload-list-text"
|
class="ant-upload-list ant-upload-list-text"
|
||||||
@ -244,7 +240,6 @@ exports[`renders ./components/upload/demo/fileList.md correctly 1`] = `
|
|||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="ant-upload ant-upload-select ant-upload-select-text"
|
class="ant-upload ant-upload-select ant-upload-select-text"
|
||||||
style="display:"
|
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
class="ant-upload-list ant-upload-list-text"
|
class="ant-upload-list ant-upload-list-text"
|
||||||
@ -402,7 +397,6 @@ exports[`renders ./components/upload/demo/picture-card.md correctly 1`] = `
|
|||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="ant-upload ant-upload-select ant-upload-select-picture-card"
|
class="ant-upload ant-upload-select ant-upload-select-picture-card"
|
||||||
style="display:"
|
|
||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
@ -415,7 +409,6 @@ exports[`renders ./components/upload/demo/picture-style.md correctly 1`] = `
|
|||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="ant-upload ant-upload-select ant-upload-select-picture"
|
class="ant-upload ant-upload-select ant-upload-select-picture"
|
||||||
style="display:"
|
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
class="ant-upload-list ant-upload-list-picture"
|
class="ant-upload-list ant-upload-list-picture"
|
||||||
@ -529,7 +522,6 @@ exports[`renders ./components/upload/demo/picture-style.md correctly 1`] = `
|
|||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="ant-upload ant-upload-select ant-upload-select-picture"
|
class="ant-upload ant-upload-select ant-upload-select-picture"
|
||||||
style="display:"
|
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
class="ant-upload-list ant-upload-list-picture"
|
class="ant-upload-list ant-upload-list-picture"
|
||||||
@ -646,7 +638,6 @@ exports[`renders ./components/upload/demo/upload-manually.md correctly 1`] = `
|
|||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="ant-upload ant-upload-select ant-upload-select-text"
|
class="ant-upload ant-upload-select ant-upload-select-text"
|
||||||
style="display:"
|
|
||||||
/>
|
/>
|
||||||
<div
|
<div
|
||||||
class="ant-upload-list ant-upload-list-text"
|
class="ant-upload-list ant-upload-list-text"
|
||||||
|
Loading…
Reference in New Issue
Block a user