diff --git a/public/css/iconfont.css b/public/css/iconfont.css index 289ae1bef..8e911f346 100644 --- a/public/css/iconfont.css +++ b/public/css/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 2340181 */ - src: url('iconfont.woff2?t=1680167204025') format('woff2'), - url('iconfont.woff?t=1680167204025') format('woff'), - url('iconfont.ttf?t=1680167204025') format('truetype'); + src: url('iconfont.woff2?t=1680498859493') format('woff2'), + url('iconfont.woff?t=1680498859493') format('woff'), + url('iconfont.ttf?t=1680498859493') format('truetype'); } .iconfont { @@ -13,6 +13,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-a-zu37:before { + content: "\e961"; +} + .icon-guanzhuicon:before { content: "\e95b"; } diff --git a/public/css/iconfont.js b/public/css/iconfont.js index d4255bf12..3f3eaec7c 100644 --- a/public/css/iconfont.js +++ b/public/css/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_2340181='',function(c){var a=(a=document.getElementsByTagName("script"))[a.length-1],l=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var h,i,o,z,t,p=function(a,l){l.parentNode.insertBefore(a,l)};if(l&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_2340181,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?p(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,z=c.document,t=!1,m(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,v())})}function v(){t||(t=!0,o())}function m(){try{z.documentElement.doScroll("left")}catch(a){return void setTimeout(m,50)}v()}}(window); \ No newline at end of file +window._iconfont_svg_string_2340181='',function(c){var a=(a=document.getElementsByTagName("script"))[a.length-1],l=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var h,i,o,z,t,p=function(a,l){l.parentNode.insertBefore(a,l)};if(l&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,l=document.createElement("div");l.innerHTML=c._iconfont_svg_string_2340181,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(a=document.body).firstChild?p(l,a.firstChild):a.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,z=c.document,t=!1,m(),z.onreadystatechange=function(){"complete"==z.readyState&&(z.onreadystatechange=null,v())})}function v(){t||(t=!0,o())}function m(){try{z.documentElement.doScroll("left")}catch(a){return void setTimeout(m,50)}v()}}(window); \ No newline at end of file diff --git a/public/css/iconfont.json b/public/css/iconfont.json index bceea0f34..04f995369 100644 --- a/public/css/iconfont.json +++ b/public/css/iconfont.json @@ -5,6 +5,13 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "34875122", + "name": "组 37", + "font_class": "a-zu37", + "unicode": "e961", + "unicode_decimal": 59745 + }, { "icon_id": "34819652", "name": "关注icon", diff --git a/public/css/iconfont.ttf b/public/css/iconfont.ttf index a4c9cfb07..6a5a417bf 100644 Binary files a/public/css/iconfont.ttf and b/public/css/iconfont.ttf differ diff --git a/public/css/iconfont.woff b/public/css/iconfont.woff index 573aa7749..de9899f07 100644 Binary files a/public/css/iconfont.woff and b/public/css/iconfont.woff differ diff --git a/public/css/iconfont.woff2 b/public/css/iconfont.woff2 index 73422223f..7c5a61f6c 100644 Binary files a/public/css/iconfont.woff2 and b/public/css/iconfont.woff2 differ diff --git a/src/forge/Settings/Webhooks/Index.jsx b/src/forge/Settings/Webhooks/Index.jsx index 3ca800d33..f398200d1 100644 --- a/src/forge/Settings/Webhooks/Index.jsx +++ b/src/forge/Settings/Webhooks/Index.jsx @@ -86,12 +86,13 @@ function Index(props) { } function gotoEditWebhook(webhook){ - if(webhook.isJianMu){ - setEditId(webhook.id); - setEditVisible(true); - }else{ - props.history.push(`/${owner}/${projectsId}/settings/webhooks/${webhook.id}`); - } + props.history.push(`/${owner}/${projectsId}/settings/webhooks/${webhook.id}`); + // if(webhook.isJianMu){ + // setEditId(webhook.id); + // setEditVisible(true); + // }else{ + // props.history.push(`/${owner}/${projectsId}/settings/webhooks/${webhook.id}`); + // } } return( @@ -104,7 +105,7 @@ function Index(props) { content="您确定要删除此Webhook吗？" subTitle={deleteWebHookModSubTitle} /> - {setEditVisible(false)}} title="请谨慎编辑此Webhook" @@ -115,7 +116,7 @@ function Index(props) { > 您确定要编辑此Webhook吗？

该Webhook由流水线创建, 编辑此Webhook后, 将大概率导致本仓库相关流水线失效。确定要修改此Webhook?

- + */} Webhooks(网络钩子) @@ -128,15 +129,15 @@ function Index(props) { {data.map((i,k)=>{ return( - + {i.isJianMu ? {i.url} : i.url} {!i.isJianMu && i.type !== "softbot" && } {(i.isJianMu || i.type === "softbot") && - - + + } ) diff --git a/src/forge/Settings/Webhooks/New.jsx b/src/forge/Settings/Webhooks/New.jsx index 0dd151af0..ce98ef6f6 100644 --- a/src/forge/Settings/Webhooks/New.jsx +++ b/src/forge/Settings/Webhooks/New.jsx @@ -20,6 +20,7 @@ function New({ form , match , showNotification , history, projectDetail }) { const [ visible , setVisible ] = useState(false); const [ data , setData ] = useState(undefined); const [ eventFlag , setEventFlag ] = useState(false); + const [ unEdit, setUnEdit] = useState(false); const { getFieldDecorator, validateFields , setFieldsValue } = form; const { id , owner , projectsId } = match.params; @@ -69,6 +70,10 @@ function New({ form , match , showNotification , history, projectDetail }) { const url = `/${owner}/${projectsId}/webhooks/${id}/edit.json`; axios.get(url).then(result=>{ if(result){ + const reg1 = new RegExp("https://(.*?)jianmuhub.com(.*?)"); + const reg2 = new RegExp("https://jianmu.gitlink.org.cn(.*?)"); + const {url, type} = result.data; + setUnEdit(reg1.test(url) || reg2.test(url) || type === "softbot") let e = compareArray(result.data.events); setFieldsValue({ ...result.data, @@ -190,7 +195,7 @@ function New({ form , match , showNotification , history, projectDetail }) { Webhooks - {id ? "更新" : "添加"}Webhook + { unEdit ? '查看' : id ? "更新" : "添加"}Webhook
@@ -206,21 +211,21 @@ function New({ form , match , showNotification , history, projectDetail }) { } ] })( - + )} {getFieldDecorator("secret",{ rules:[] })( - + )} {getFieldDecorator("http_method",{ rules:[] })( - GET POST @@ -234,7 +239,7 @@ function New({ form , match , showNotification , history, projectDetail }) { {getFieldDecorator("content_type",{ rules:[] })( - application/json application/x-www-form-urlencoded @@ -244,7 +249,7 @@ function New({ form , match , showNotification , history, projectDetail }) { {getFieldDecorator("eventCondition",{ rules:[] })( - + 只是push事件 所有事件 自定义事件 @@ -254,7 +259,7 @@ function New({ form , match , showNotification , history, projectDetail }) {
- {setEvent(e)}}> + {setEvent(e)}} disabled = {unEdit}>

代码库事件

@@ -318,7 +323,7 @@ function New({ form , match , showNotification , history, projectDetail }) { {getFieldDecorator("branch_filter",{ rules:[] })( - + )} 激活激活后触发事件的信息将发送到此Webhook地址 + 激活激活后触发事件的信息将发送到此Webhook地址 )} - + { - id && + id && }