From 2aaf322da40c9f2e1ff560f25af5cb9563dd39ab Mon Sep 17 00:00:00 2001 From: docoder Date: Thu, 9 Jan 2020 13:17:30 +0800 Subject: [PATCH] Alert Loading fix --- example/src/containers/Loadings/index.js | 5 ++--- package.json | 2 +- src/components/UI/Loading/index.js | 14 +++++++++----- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/example/src/containers/Loadings/index.js b/example/src/containers/Loadings/index.js index dc19f19..e5047c9 100644 --- a/example/src/containers/Loadings/index.js +++ b/example/src/containers/Loadings/index.js @@ -20,9 +20,8 @@ export default function Loadings () { const [isAlertLoading, setAlertLoading] = useState(false); return ( - {setAlertLoading(true)}} /> - {setAlertLoading(false)}} /> - {setOverallLoading(true)}} /> + {setAlertLoading(!isAlertLoading)}} /> + {setOverallLoading(!isOverallLoading)}} /> {setOverallLoading(false)}} /> {setAlertLoading(false)}} /> diff --git a/package.json b/package.json index 1c916ad..b70ae81 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-colony-ui", - "version": "1.7.18", + "version": "1.7.19", "description": "Ant Colony UI Toolkit based on Ant Design and React", "author": "docoder", "license": "MIT", diff --git a/src/components/UI/Loading/index.js b/src/components/UI/Loading/index.js index 7eaebc4..81beacc 100644 --- a/src/components/UI/Loading/index.js +++ b/src/components/UI/Loading/index.js @@ -51,14 +51,18 @@ export default class Loading extends React.Component { this.timer = null } } + componentDidUpdate(preProps) { + if (preProps.show !== this.props.show && this.props.type==='alert') { + if (this.props.show) { + message.loading(this.props.message, 30, this.props.timeout) + }else { + message.destroy() + } + } + } render() { switch(this.props.type) { case 'alert': - this.props.show - ? - message.loading(this.props.message, 30, this.props.timeout) - : - message.destroy() return null; case 'overall': return(