Gitlink
/
forgeplus-react
0
0
Fork 37
Code Issues Pull Requests 5 Releases 1 Wiki Activity

pull xiesi

This commit is contained in:
caishi 2023-04-13 15:05:19 +08:00
parent a0391abdd9 e3abad3f46
commit a269acf31a
6 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/forge/SecuritySetting/bot/disposition/detail.jsx
View File

@ -5,6 +5,7 @@ import { Link } from "react-router-dom";
import { getInstallBot, updateInstallBot } from "../../../../softbot/api";
import { getImageUrl } from 'educoder';
import './index.scss';
import '../exploit/index.scss';
function DispositionDetail(props){
const {match:{params:{id}}, current_user, current_user:{login, user_id}} = props;
@ -16,6 +17,8 @@ function DispositionDetail(props){
// bot状态
const [botState, setBotState] = useState(true);
const [error, setError] = useState(false);
// 保存按钮loading效果
const [saveLoading, setSaveLoading] = useState(false);
// 获取bot详情
useEffect(()=>{
@ -122,6 +125,7 @@ function DispositionDetail(props){
repo_owner_map[item.id+""] = login;
});
}
setSaveLoading(true);
current_user && updateInstallBot({
bot_id: id,
password: "",
@ -134,6 +138,7 @@ function DispositionDetail(props){
installed_store_list: botDetail.store_id_list
}).then(res=>{
if(res && res.code === 200){
setSaveLoading(false);
setSelectValue([]);
const repoIds = new Set();
options.map(item=>{
@ -143,6 +148,7 @@ function DispositionDetail(props){
getInsBotDetail(repoIds);
message.success('更改成功');
}else{
setSaveLoading(false);
message.error(res.message);
}
})
@ -154,7 +160,10 @@ function DispositionDetail(props){
{botDetail && <div className="oneLine">
<img src={getImageUrl(botDetail.logo)} alt="" className="botImg imgBox"/>
<div className="ml40 font-16">
<div className="font-22"><a href={`/softbot/${id}`}>{botDetail && botDetail.market_name}</a></div>
<div className="font-22">
<a href={`/softbot/${id}`}>{botDetail && botDetail.market_name}</a>
<span className={`font-12 ml10 statusBot myInstallBotStatus ${botDetail.is_public ? 'public' : 'private'}`}>{botDetail.is_public ? '公开' : '私有'}</span>
</div>
<a className="mr30 color88" href={`/${botDetail.register_login}`}>{botDetail && botDetail.register_name}</a>
<span className="color88">{botDetail && botDetail.create_time}</span>
</div>
@ -192,7 +201,7 @@ function DispositionDetail(props){
<span className='changeStatusTip'>{botState ? '开始使用该Bot，授予该Bot所需的仓库访问权限' : '暂停停止使用该bot，阻塞该bot拥有的仓库访问权限'}</span>
</div>
</div>
{botDetail && !botDetail.is_public && login !== botDetail.register_login ? <Tooltip title="该bot为私有bot，仅bot开发者有权限更改"><Button type="primary" style={{width: '100px', height: '36px'}} className="mt30" disabled>保存</Button></Tooltip> : <Button type="primary" style={{width: '100px', height: '36px'}} className="mt30" onClick={updateInsBot}>保存</Button>}
{botDetail && !botDetail.is_public && login !== botDetail.register_login ? <Tooltip title="该bot为私有bot，仅bot开发者有权限更改"><Button type="primary" style={{width: '100px', height: '36px'}} className="mt30" disabled>保存</Button></Tooltip> : <Button type="primary" style={{width: '100px', height: '36px'}} className="mt30" onClick={updateInsBot} loading={saveLoading}>保存</Button>}
</div>
</Spin>
}

4
src/forge/SecuritySetting/bot/disposition/index.scss
View File

@ -106,6 +106,10 @@
}
}
.changeStatusTip{color:#99a2af;}
.myInstallBotStatus{
position: relative;
top: -4px;
}
}
.nullBotsBox{
border-radius: 4px 4px 0px 0px;

4
src/forge/SecuritySetting/bot/exploit/configuration/compenent/jurisdiction.jsx
View File

@ -143,9 +143,9 @@ function Jurisdiction(props){
})(
<Checkbox.Group>
<Row>
<Col span={16}><Checkbox value={3}>合并请求<br/><span className="color-99">合并请求被打开、被关闭、被重新打开或被编辑</span></Checkbox></Col>
<Col span={16}><Checkbox value={3}>合并请求<br/><span className="color-99">合并请求被打开、被关闭或被编辑</span></Checkbox></Col>
<Col span={8}><Checkbox value={4}>合并请求分配<br/><span className="color-99">合并请求被分配或取消分配</span></Checkbox></Col>
<Col span={16}><Checkbox value={6}>合并请求被评论<br/><span className="color-99">合并请求评论被创建、编辑或删除</span></Checkbox></Col>
<Col span={16}><Checkbox value={6}>合并请求被评论<br/><span className="color-99">合并请求评论被创建或删除</span></Checkbox></Col>
</Row>
</Checkbox.Group>
)}

4
src/forge/SecuritySetting/bot/exploit/new/index.jsx
View File

@ -193,9 +193,9 @@ function Disposition(props){
})(
<Checkbox.Group>
<Row>
<Col span={16}><Checkbox value={3}>合并请求<br/><span className="color-99">合并请求被打开、被关闭、被重新打开或被编辑</span></Checkbox></Col>
<Col span={16}><Checkbox value={3}>合并请求<br/><span className="color-99">合并请求被打开、被关闭或被编辑</span></Checkbox></Col>
<Col span={8}><Checkbox value={4}>合并请求分配<br/><span className="color-99">合并请求被分配或取消分配</span></Checkbox></Col>
<Col span={16}><Checkbox value={6}>合并请求被评论<br/><span className="color-99">合并请求评论被创建、编辑或删除</span></Checkbox></Col>
<Col span={16}><Checkbox value={6}>合并请求被评论<br/><span className="color-99">合并请求评论被创建或删除</span></Checkbox></Col>
</Row>
</Checkbox.Group>
)}

4
src/forge/Settings/Webhooks/New.jsx
View File

@ -283,7 +283,7 @@ function New({ form , match , showNotification , history, projectDetail }) {
<div className="colSpan">
<span>
<Checkbox value="pull_request_only">合并请求</Checkbox>
<span>合并请求被打开、被关闭、被重新打开或被编辑</span>
<span>合并请求被打开、被关闭或被编辑</span>
</span>
<span>
<Checkbox value="pull_request_assign">合并请求分配</Checkbox>
@ -291,7 +291,7 @@ function New({ form , match , showNotification , history, projectDetail }) {
</span>
<span>
<Checkbox value="pull_request_comment">合并请求被评论</Checkbox>
<span>合并请求评论被创建、编辑或删除</span>
<span>合并请求评论被创建或删除</span>
</span>
{/* <span>
<Checkbox value="pull_request_milestone">合并请求收入里程碑</Checkbox>

6
src/modules/loginRegister/Register.jsx
View File

@ -71,7 +71,7 @@ function Register(props){
type: 1
}).then(response => {
if (response.data.status === -1) {
callback('该名称已经被使用');
callback(response.data.message);
} else {
setLoginStr(value);
setUserNameGo(false);
@ -250,6 +250,10 @@ function Register(props){
pattern: /[a-zA-Z0-9]$/,
message: "用户名只能使用英文字母和数字"
},
{
pattern: /^\s*$/,
message: "用户名不能包含空格"
},
{
min: 4,
max: 15,