diff --git a/src/forge/Issues/Component/allMenus.jsx b/src/forge/Issues/Component/allMenus.jsx
index 740fb0301..302f27faf 100644
--- a/src/forge/Issues/Component/allMenus.jsx
+++ b/src/forge/Issues/Component/allMenus.jsx
@@ -44,6 +44,7 @@ function AllMenus({owner,projectsId,chooseFunc,update,defaultNames,defaultIds,op
useEffect(()=>{
if(defaultIds){
+ console.log("defaule:",defaultIds);
setIds(defaultIds);
}
},[defaultIds])
diff --git a/src/forge/Issues/Component/comments/list.jsx b/src/forge/Issues/Component/comments/list.jsx
index 00ea776fc..b62902c45 100644
--- a/src/forge/Issues/Component/comments/list.jsx
+++ b/src/forge/Issues/Component/comments/list.jsx
@@ -200,7 +200,7 @@ function IssueCommentList(props){
{login &&
{/* 平台管理员/仓库管理员/发布评论者/回复评论者/issue创建者 */}
- {(admin || isManager || login === i.user.login || login === i.reply_user.login || user_id === author.id) &&
{
setChooseValue(ids);
- console.log(ids);
setShowValue(names);
},[ids,names])
@@ -44,7 +43,6 @@ function Menus({name, ids , lists , size , imgControl , searchFunc , chooseFunc
setChooseValue(l);
setShowValue(nameArr.join(","));
chooseFunc(l,nameArr.join(","));
- console.log("choosed:",l);
}else{
if(l && l.indexOf(id)>=0){
setChooseValue([]);
diff --git a/src/forge/Issues/Pages/list.jsx b/src/forge/Issues/Pages/list.jsx
index 1a217f2a0..e3488ac81 100644
--- a/src/forge/Issues/Pages/list.jsx
+++ b/src/forge/Issues/Pages/list.jsx
@@ -63,6 +63,7 @@ function List(props){
useEffect(()=>{
const datas = cookie.load('issuestates');
let states = datas === "undefined" ? undefined : datas;
+ console.log(states);
if(states){
setAboutMe(states.participant_category);
setCategory(states.category);
@@ -72,8 +73,8 @@ function List(props){
setNames(states.names);
setBegin(states.begin_date);
setEnd(states.end_date);
- if(states.participant_category ==="all" && states.category === "opened" && states.page === 1 && states.limit===defaultLimit)
- Init({...states},states.page,states.names);
+ // if(states.participant_category ==="all" && states.category === "opened" && states.page === 1 && states.limit===defaultLimit)
+ // Init({...states},states.page,states.names);
}else{
Init();
}
@@ -102,7 +103,7 @@ function List(props){
}
// 使用自定义hook
- useUpdateEffect(handleAllDisabled, [aboutMe,keyword,category,limit,begin_date,end_date]);
+ useUpdateEffect(handleAllDisabled, [aboutMe,keyword,category,limit,end_date,updateIds]);
function getDirection(id){
@@ -128,6 +129,7 @@ function List(props){
// 获取issue列表数据
function Init(params,p,names){
+ setTotal(undefined);
const datas = cookie.load('issuestates');
let states = datas === "undefined" ? undefined : datas;
if(states){
@@ -144,7 +146,7 @@ function List(props){
limit,
begin_date,end_date,
sort_direction:getDirection(params && params.sort_by),
- sort_by:getBy(params && params.sort_by),
+ sort_by:getBy(params && params.sort_by),names:undefined
}
}).then(result=>{
if(result){
@@ -179,7 +181,7 @@ function List(props){
)
function chooseAboutMe(e){
setPage(1);
- setCategory("opened");
+ // setCategory("opened");
setAboutMe(e.key);
}
@@ -188,14 +190,16 @@ function List(props){
setKeyword(undefined);
setAboutMe("all");
setCategory("opened");
- setTotal(undefined);
setUpdateIds(undefined);
setAllValue([]);
+ setPage(1);
setValue(undefined);
setNames(undefined);
setEnd(undefined);
setBegin(undefined);
- (!value || begin_date || end_date ) && Init();
+ // if(!value){
+ // Init();
+ // }
// 清除下拉选项
menuRef.current && menuRef.current.clearChoose();
}
@@ -288,9 +292,14 @@ function List(props){
// setUpdateIds(ids);
setUpdateChooseIds(ids);
}else{
+ if(ids.status_id === "5"){
+ setCategory("closed");
+ }else{
+ setCategory("opened");
+ }
setUpdateIds(ids);
setTotal(undefined);
- Init(ids,1,n);
+ // Init(ids,1,n);
}
}
@@ -300,6 +309,19 @@ function List(props){
}
function changeCategory(value){
if(value !== category){
+ let ids = {...updateIds};
+ let ns = {...names};
+ if(value === "closed"){
+ ns = {...ns,status_name:"关闭"}
+ ids = {...ids,status_id:'5'};
+ setNames(ns)
+ setUpdateIds(ids);
+ }else{
+ ns = {...ns,status_name:undefined}
+ ids = {...ids,status_id:undefined};
+ setNames(ns)
+ setUpdateIds(ids);
+ }
setCategory(value);
setPage(1);
setTotal(undefined);
@@ -316,8 +338,8 @@ function List(props){
// 选择搜索时间
function changeBeginTime(data, value){
setPage(1);
- setBegin(value[0] || undefined);
- setEnd(value[1] || undefined);
+ setBegin(value[0] || '');
+ setEnd(value[1] || '');
}
return(
@@ -348,14 +370,7 @@ function List(props){
}
-
- {/*
- */}
+
{
permission && permission !== "Reporter" &&
标记管理
diff --git a/src/forge/SecuritySetting/bot/disposition/detail.jsx b/src/forge/SecuritySetting/bot/disposition/detail.jsx
index b27c8c181..5daae68ec 100644
--- a/src/forge/SecuritySetting/bot/disposition/detail.jsx
+++ b/src/forge/SecuritySetting/bot/disposition/detail.jsx
@@ -122,7 +122,7 @@ function DispositionDetail(props){
}
diff --git a/src/forge/SecuritySetting/bot/disposition/index.jsx b/src/forge/SecuritySetting/bot/disposition/index.jsx
index f8f4e9f43..b49484488 100644
--- a/src/forge/SecuritySetting/bot/disposition/index.jsx
+++ b/src/forge/SecuritySetting/bot/disposition/index.jsx
@@ -15,6 +15,7 @@ function DispositionBot(props){
const [reload, setReload] = useState(undefined);
useEffect(()=>{
+ window.scrollTo(0,0);
document.title='Bot安装';
}, [])
diff --git a/src/forge/SecuritySetting/bot/exploit/configuration/compenent/advancedInformation.jsx b/src/forge/SecuritySetting/bot/exploit/configuration/compenent/advancedInformation.jsx
index ce6cdede8..5fb53ade1 100644
--- a/src/forge/SecuritySetting/bot/exploit/configuration/compenent/advancedInformation.jsx
+++ b/src/forge/SecuritySetting/bot/exploit/configuration/compenent/advancedInformation.jsx
@@ -149,6 +149,9 @@ function AdvancedInformation(props){
setVisibleDelete(false);
message.success("更改成功");
setReload(Math.random());
+ }else{
+ setVisibleDelete(false);
+ message.error(res.message);
}
})
}
diff --git a/src/forge/SecuritySetting/bot/exploit/configuration/compenent/basicInformation.jsx b/src/forge/SecuritySetting/bot/exploit/configuration/compenent/basicInformation.jsx
index 1276e278a..510fa667b 100644
--- a/src/forge/SecuritySetting/bot/exploit/configuration/compenent/basicInformation.jsx
+++ b/src/forge/SecuritySetting/bot/exploit/configuration/compenent/basicInformation.jsx
@@ -54,8 +54,7 @@ function BasicInformation(props){
const params = {
...botDetail,
...fieldsValue,
- bot_id: parseInt(id),
- logo: imageId ? '/api/attachments/'+imageId : '/api/attachments/347246'
+ bot_id: parseInt(id)
}
registerUpdateBot(params).then(res=>{
if(res && res.code === 200){
diff --git a/src/forge/SecuritySetting/bot/exploit/index.jsx b/src/forge/SecuritySetting/bot/exploit/index.jsx
index 85ddfd828..a9e56092e 100644
--- a/src/forge/SecuritySetting/bot/exploit/index.jsx
+++ b/src/forge/SecuritySetting/bot/exploit/index.jsx
@@ -16,6 +16,7 @@ function ExploitBot(props){
const [reload, setReload] = useState(undefined);
useEffect(()=>{
+ window.scrollTo(0,0);
document.title='我的Bot';
}, [])
diff --git a/src/forge/SecuritySetting/bot/exploit/new/index.jsx b/src/forge/SecuritySetting/bot/exploit/new/index.jsx
index 21ee4139d..0e7d840ea 100644
--- a/src/forge/SecuritySetting/bot/exploit/new/index.jsx
+++ b/src/forge/SecuritySetting/bot/exploit/new/index.jsx
@@ -92,7 +92,7 @@ function Disposition(props){
return
- 开发Bot注册新的Bot
+ 我的Bot注册新的Bot
diff --git a/src/forge/users/Index.scss b/src/forge/users/Index.scss
index bfd6518a0..242ef640f 100644
--- a/src/forge/users/Index.scss
+++ b/src/forge/users/Index.scss
@@ -278,7 +278,7 @@ ul.ant-menu.menuStyle{
.infosRightMenu{
.ant-menu-item{
padding:0px;
- margin:0px 17px 0px 0px !important;
+ margin:0px 30px 0px 0px !important;
font-size: 17px;
height: 32px;
line-height: 0px;
diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js
index 22384126f..9981cd2d0 100644
--- a/src/forge/users/Infos.js
+++ b/src/forge/users/Infos.js
@@ -397,11 +397,11 @@ class Infos extends Component {
:""
}
- {
+ {/* {
current_user && current_user.login && current_user.login === username ?
DevOps引擎
:""
- }
+ } */}
参与组织
@@ -434,7 +434,7 @@ class Infos extends Component {
return ;
}}
>
- {
return ;
@@ -445,7 +445,7 @@ class Infos extends Component {
render={() => {
return ;
}}
- >
+ > */}
{