From 54f12595d66ea3f19a94505b7bbb57c29baaa57f Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 22 Dec 2023 09:02:56 +0800 Subject: [PATCH] issue 3920 --- src/AppConfig.js | 28 ++++++++++++------------- src/forge/Issues/Component/allMenus.jsx | 15 +++++++++---- src/forge/Issues/Component/menus.jsx | 5 +++-- src/forge/Issues/Pages/list.jsx | 14 ++++++++----- 4 files changed, 36 insertions(+), 26 deletions(-) diff --git a/src/AppConfig.js b/src/AppConfig.js index 5c5b188a5..cf7fe8b6a 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -32,7 +32,7 @@ export function initAxiosInterceptors(props) { // 判断网络是否连接 initOnlineOfflineListener(); - var proxy = "http://172.20.32.202:4000"; + var proxy = "https://testforgeplus.trustie.net"; //响应前的设置 axios.interceptors.request.use( @@ -43,20 +43,18 @@ export function initAxiosInterceptors(props) { requestProxy(config); let url = `/api${config.url}`; - // if (`${config[0]}` !== `true`) { - // if (window.location.port === "3007") { - // config.url = `${proxy}${url}`; - // if (config.url.indexOf('?') === -1) { - // config.url = `${config.url}`; - // } else { - // config.url = `${config.url}`; - // } - // } else { - // config.url = url; - // } - // } - config.url = url; - config.withCredentials = false; + if (`${config[0]}` !== `true`) { + if (window.location.port === "3007") { + config.url = `${proxy}${url}`; + if (config.url.indexOf('?') === -1) { + config.url = `${config.url}?debug=${debugType}`; + } else { + config.url = `${config.url}&debug=${debugType}`; + } + } else { + config.url = url; + } + } return config; }, err => { diff --git a/src/forge/Issues/Component/allMenus.jsx b/src/forge/Issues/Component/allMenus.jsx index e4085a0b7..90c6c86ef 100644 --- a/src/forge/Issues/Component/allMenus.jsx +++ b/src/forge/Issues/Component/allMenus.jsx @@ -82,7 +82,9 @@ function AllMenus({owner,projectsId,chooseFunc,update,defaultNames,defaultIds,op const url = `/v1/${owner}/${projectsId}/issue_tags`; axios.get(url,{params:{keyword:tag,only_name:true}}).then(result=>{ if(result && result.data){ - setTagList(result.data.issue_tags); + let list = [{id:-1,name:"无标记"}]; + list = [...list,...result.data.issue_tags]; + setTagList(list); } }) } @@ -95,7 +97,9 @@ function AllMenus({owner,projectsId,chooseFunc,update,defaultNames,defaultIds,op const url = `/v1/${owner}/${projectsId}/milestones`; axios.get(url,{params:{keyword:millstone,only_name:true}}).then(result=>{ if(result && result.data){ - setMillstoneList(result.data.milestones); + let list = [{id:-1,name:"无里程碑"}]; + list = [...list,...result.data.milestones]; + setMillstoneList(list); } }) } @@ -106,18 +110,21 @@ function AllMenus({owner,projectsId,chooseFunc,update,defaultNames,defaultIds,op },[charge,update]) function getCharge(){ + let list = [{id:-1,name:"未指派负责人"}]; if(update){ const url = `/v1/${owner}/${projectsId}/collaborators`; axios.get(url,{params:{keyword:charge,only_name:true}}).then(result=>{ if(result && result.data){ - setChargeList(result.data.collaborators); + list = [...list,...result.data.collaborators]; + setChargeList(list); } }) }else{ const url = `/v1/${owner}/${projectsId}/issue_assigners`; axios.get(url,{params:{keyword:charge,only_name:true}}).then(result=>{ if(result && result.data){ - setChargeList(result.data.assigners); + list = [...list,...result.data.assigners]; + setChargeList(list); } }) } diff --git a/src/forge/Issues/Component/menus.jsx b/src/forge/Issues/Component/menus.jsx index 24aa86ad4..ce49c0db4 100644 --- a/src/forge/Issues/Component/menus.jsx +++ b/src/forge/Issues/Component/menus.jsx @@ -31,8 +31,9 @@ function Menus({className,name, ids , lists , size , imgControl , searchFunc , c function changeMenusValue(i){ let l = ids; let id = i.id.toString(); - if(double){ + if(double && id!=="-1"){ l = ids ? ids.split(",") : [] ; + l = l && l.length>0 ? l.filter(i=>i.toString()!=="-1") :[]; let nameArr = names ? names.split(",") : [] ; if(l && l.indexOf(id)>=0){ l = l.filter(k=>k.toString() !== id); @@ -69,7 +70,7 @@ function Menus({className,name, ids , lists , size , imgControl , searchFunc , c { data.map((i,j)=>{ return - {imgControl && } + {imgControl && i.image_url && } {i.color && } changeMenusValue(i)}>{i.name} diff --git a/src/forge/Issues/Pages/list.jsx b/src/forge/Issues/Pages/list.jsx index bb751f803..ef242b710 100644 --- a/src/forge/Issues/Pages/list.jsx +++ b/src/forge/Issues/Pages/list.jsx @@ -237,13 +237,17 @@ function List(props){ // 确认修改 allValue updateIds function sureUpdate(){ const url = `/v1/${owner}/${projectsId}/issues/batch_update`; + const { assigner_id ,issue_tag_ids , milestone_id ,issue_priorities_id , status_id } = updateChooseIds; + let assigner = assigner_id ? assigner_id === "-1" ? [] : assigner_id.split(",") : undefined; + let issueTag = issue_tag_ids ? issue_tag_ids === "-1" ? [] : issue_tag_ids.split(",") : undefined; + let milestone = milestone_id ? milestone_id === "-1" ? "" : milestone_id : undefined; axios.patch(url,{ - assigner_ids: updateChooseIds && updateChooseIds.assigner_id && updateChooseIds.assigner_id.split(","), + assigner_ids: assigner , ids: allValue, - issue_tag_ids: updateChooseIds && updateChooseIds.issue_tag_ids && updateChooseIds.issue_tag_ids.split(","), - milestone_id: updateChooseIds && updateChooseIds.milestone_id, - priority_id: updateChooseIds && updateChooseIds.issue_priorities_id, - status_id: updateChooseIds && updateChooseIds.status_id + issue_tag_ids: issueTag, + milestone_id: milestone, + priority_id: issue_priorities_id, + status_id: status_id }).then(result=>{ if(result){ setUpdateIds(undefined);