mirror of
https://gitee.com/ant-design-vue/ant-design-vue.git
synced 2024-12-02 03:58:05 +08:00
fix: badge animation and other style
This commit is contained in:
parent
9e33ed9db1
commit
689921fe91
@ -51,16 +51,30 @@ export default {
|
|||||||
updated() {
|
updated() {
|
||||||
const { animateStarted, count } = this;
|
const { animateStarted, count } = this;
|
||||||
if (animateStarted) {
|
if (animateStarted) {
|
||||||
this.setState(
|
this.clearTimeout();
|
||||||
{
|
// Let browser has time to reset the scroller before actually
|
||||||
animateStarted: false,
|
// performing the transition.
|
||||||
sCount: count,
|
this.timeout = setTimeout(() => {
|
||||||
},
|
this.setState(
|
||||||
this.onAnimated,
|
{
|
||||||
);
|
animateStarted: false,
|
||||||
|
sCount: count,
|
||||||
|
},
|
||||||
|
this.onAnimated,
|
||||||
|
);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
beforeDestroy() {
|
||||||
|
this.clearTimeout();
|
||||||
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
clearTimeout() {
|
||||||
|
if (this.timeout) {
|
||||||
|
clearTimeout(this.timeout);
|
||||||
|
this.timeout = undefined;
|
||||||
|
}
|
||||||
|
},
|
||||||
getPositionByNum(num, i) {
|
getPositionByNum(num, i) {
|
||||||
const { sCount } = this;
|
const { sCount } = this;
|
||||||
const currentCount = Math.abs(Number(sCount));
|
const currentCount = Math.abs(Number(sCount));
|
||||||
|
@ -102,6 +102,10 @@
|
|||||||
line-height: 1;
|
line-height: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.@{ant-prefix}-input-disabled + &-icon {
|
||||||
|
cursor: not-allowed;
|
||||||
|
}
|
||||||
|
|
||||||
&-small &-clear,
|
&-small &-clear,
|
||||||
&-small &-icon {
|
&-small &-icon {
|
||||||
right: @control-padding-horizontal-sm;
|
right: @control-padding-horizontal-sm;
|
||||||
|
@ -10,6 +10,10 @@
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.@{ant-prefix}-row + .@{ant-prefix}-row::before {
|
||||||
|
clear: both;
|
||||||
|
}
|
||||||
|
|
||||||
.@{ant-prefix}-row-flex {
|
.@{ant-prefix}-row-flex {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-flow: row wrap;
|
flex-flow: row wrap;
|
||||||
|
@ -33,7 +33,7 @@ export const ResultProps = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const renderIcon = (h, prefixCls, { status, icon }) => {
|
const renderIcon = (h, prefixCls, { status, icon }) => {
|
||||||
if (ExceptionStatus.includes(status)) {
|
if (ExceptionStatus.includes(`${status}`)) {
|
||||||
const SVGComponent = ExceptionMap[status];
|
const SVGComponent = ExceptionMap[status];
|
||||||
return (
|
return (
|
||||||
<div class={`${prefixCls}-icon ${prefixCls}-image`}>
|
<div class={`${prefixCls}-icon ${prefixCls}-image`}>
|
||||||
|
@ -445,16 +445,14 @@
|
|||||||
box-shadow: @box-shadow-base;
|
box-shadow: @box-shadow-base;
|
||||||
|
|
||||||
.@{ant-prefix}-dropdown-menu {
|
.@{ant-prefix}-dropdown-menu {
|
||||||
|
// https://github.com/ant-design/ant-design/issues/4916
|
||||||
|
// https://github.com/ant-design/ant-design/issues/19542
|
||||||
|
max-height: calc(100vh - 130px);
|
||||||
|
overflow-x: hidden;
|
||||||
border: 0;
|
border: 0;
|
||||||
border-radius: @border-radius-base @border-radius-base 0 0;
|
border-radius: @border-radius-base @border-radius-base 0 0;
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
|
|
||||||
// https://github.com/ant-design/ant-design/issues/4916
|
|
||||||
&-without-submenu {
|
|
||||||
max-height: 400px;
|
|
||||||
overflow-x: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
&-item > label + span {
|
&-item > label + span {
|
||||||
padding-right: 0;
|
padding-right: 0;
|
||||||
}
|
}
|
||||||
|
@ -6,7 +6,7 @@ const path = require('path');
|
|||||||
|
|
||||||
const owner = 'ant-design';
|
const owner = 'ant-design';
|
||||||
const repo = 'ant-design';
|
const repo = 'ant-design';
|
||||||
const tag = '3.26.12';
|
const tag = '3.26.13';
|
||||||
const clientId = '5f6ccfdc4cdc69f8ba12';
|
const clientId = '5f6ccfdc4cdc69f8ba12';
|
||||||
const clientSecret = process.env.CLIENT_SECRET;
|
const clientSecret = process.env.CLIENT_SECRET;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user