Browse Source

fix: badge animation and other style

pull/1886/head
tangjinzhou 5 years ago
parent
commit
689921fe91
  1. 28
      components/badge/ScrollNumber.jsx
  2. 4
      components/date-picker/style/Picker.less
  3. 4
      components/grid/style/index.less
  4. 2
      components/result/index.jsx
  5. 10
      components/table/style/index.less
  6. 2
      scripts/syncStyleFromAntd.js

28
components/badge/ScrollNumber.jsx

@ -51,16 +51,30 @@ export default {
updated() {
const { animateStarted, count } = this;
if (animateStarted) {
this.setState(
{
animateStarted: false,
sCount: count,
},
this.onAnimated,
);
this.clearTimeout();
// Let browser has time to reset the scroller before actually
// performing the transition.
this.timeout = setTimeout(() => {
this.setState(
{
animateStarted: false,
sCount: count,
},
this.onAnimated,
);
});
}
},
beforeDestroy() {
this.clearTimeout();
},
methods: {
clearTimeout() {
if (this.timeout) {
clearTimeout(this.timeout);
this.timeout = undefined;
}
},
getPositionByNum(num, i) {
const { sCount } = this;
const currentCount = Math.abs(Number(sCount));

4
components/date-picker/style/Picker.less

@ -102,6 +102,10 @@
line-height: 1;
}
.@{ant-prefix}-input-disabled + &-icon {
cursor: not-allowed;
}
&-small &-clear,
&-small &-icon {
right: @control-padding-horizontal-sm;

4
components/grid/style/index.less

@ -10,6 +10,10 @@
box-sizing: border-box;
}
.@{ant-prefix}-row + .@{ant-prefix}-row::before {
clear: both;
}
.@{ant-prefix}-row-flex {
display: flex;
flex-flow: row wrap;

2
components/result/index.jsx

@ -33,7 +33,7 @@ export const ResultProps = {
};
const renderIcon = (h, prefixCls, { status, icon }) => {
if (ExceptionStatus.includes(status)) {
if (ExceptionStatus.includes(`${status}`)) {
const SVGComponent = ExceptionMap[status];
return (
<div class={`${prefixCls}-icon ${prefixCls}-image`}>

10
components/table/style/index.less

@ -445,16 +445,14 @@
box-shadow: @box-shadow-base;
.@{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-radius: @border-radius-base @border-radius-base 0 0;
box-shadow: none;
// https://github.com/ant-design/ant-design/issues/4916
&-without-submenu {
max-height: 400px;
overflow-x: hidden;
}
&-item > label + span {
padding-right: 0;
}

2
scripts/syncStyleFromAntd.js

@ -6,7 +6,7 @@ const path = require('path');
const owner = 'ant-design';
const repo = 'ant-design';
const tag = '3.26.12';
const tag = '3.26.13';
const clientId = '5f6ccfdc4cdc69f8ba12';
const clientSecret = process.env.CLIENT_SECRET;

Loading…
Cancel
Save