From 2b47c1ff9aad4894cdd6837f392355ca26beb27b Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 30 Jul 2021 17:02:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E4=B8=8A-=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Settings/Webhooks/New.jsx | 2 +- src/forge/Settings/Webhooks/sub/PushHistory.jsx | 11 +++++++---- src/forge/css/index.scss | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/forge/Settings/Webhooks/New.jsx b/src/forge/Settings/Webhooks/New.jsx index a0a60f24..7a2b0b31 100644 --- a/src/forge/Settings/Webhooks/New.jsx +++ b/src/forge/Settings/Webhooks/New.jsx @@ -329,7 +329,7 @@ function New({ form , match , showNotification , history }) { } - { id && } + { id && } ) } diff --git a/src/forge/Settings/Webhooks/sub/PushHistory.jsx b/src/forge/Settings/Webhooks/sub/PushHistory.jsx index 592da008..b9c6a462 100644 --- a/src/forge/Settings/Webhooks/sub/PushHistory.jsx +++ b/src/forge/Settings/Webhooks/sub/PushHistory.jsx @@ -5,7 +5,7 @@ import Content from './historyContent'; import Fault from '../images/fault.png'; const { Panel } = Collapse; -function PushHistory({id,owner,projectsId}) { +function PushHistory({id,owner,projectsId,showNotification}) { const [ list , setList ] = useState(undefined); const [ isSpin , setIsSpin ] = useState(false); @@ -32,8 +32,8 @@ function PushHistory({id,owner,projectsId}) { const url = `/${owner}/${projectsId}/webhooks/${id}/test.json`; axios.post(url).then(result=>{ if(result && result.data){ - Init(); - }else{ + // Init(); + showNotification("测试推送已经加入到队列,请耐心等待数秒再刷新推送记录!"); setIsSpin(false); } }).catch(error=>{setIsSpin(false);}) @@ -43,7 +43,10 @@ function PushHistory({id,owner,projectsId}) {
最近推送历史 - + + 刷新 + +
{ list && list.length>0 && diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss index 8f2e97d3..00e46b6f 100644 --- a/src/forge/css/index.scss +++ b/src/forge/css/index.scss @@ -262,8 +262,8 @@ form{ border-color: #D0D0D0; } .ant-btn.ant-btn-background-ghost.ant-btn-primary:hover{ - background-color: #2A61FF!important; - border-color: #2A61FF; + background-color: #1890ff!important; + border-color: #1890ff; color: #fff; } .ant-btn.ant-btn-background-ghost.ant-btn-danger:hover{