diff --git a/src/forge/SecuritySetting/bot/disposition/detail.jsx b/src/forge/SecuritySetting/bot/disposition/detail.jsx
index 6a267f1a4..ebcc209f9 100644
--- a/src/forge/SecuritySetting/bot/disposition/detail.jsx
+++ b/src/forge/SecuritySetting/bot/disposition/detail.jsx
@@ -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 &&
@@ -192,7 +201,7 @@ function DispositionDetail(props){
{botState ? '开始使用该Bot,授予该Bot所需的仓库访问权限' : '暂停停止使用该bot,阻塞该bot拥有的仓库访问权限'}
- {botDetail && !botDetail.is_public && login !== botDetail.register_login ? : }
+ {botDetail && !botDetail.is_public && login !== botDetail.register_login ? : }
}
diff --git a/src/forge/SecuritySetting/bot/disposition/index.scss b/src/forge/SecuritySetting/bot/disposition/index.scss
index c2d580a31..e020c4b1e 100644
--- a/src/forge/SecuritySetting/bot/disposition/index.scss
+++ b/src/forge/SecuritySetting/bot/disposition/index.scss
@@ -106,6 +106,10 @@
}
}
.changeStatusTip{color:#99a2af;}
+ .myInstallBotStatus{
+ position: relative;
+ top: -4px;
+ }
}
.nullBotsBox{
border-radius: 4px 4px 0px 0px;
diff --git a/src/forge/SecuritySetting/bot/exploit/configuration/compenent/jurisdiction.jsx b/src/forge/SecuritySetting/bot/exploit/configuration/compenent/jurisdiction.jsx
index 58d4ae689..bf223907e 100644
--- a/src/forge/SecuritySetting/bot/exploit/configuration/compenent/jurisdiction.jsx
+++ b/src/forge/SecuritySetting/bot/exploit/configuration/compenent/jurisdiction.jsx
@@ -143,9 +143,9 @@ function Jurisdiction(props){
})(
- 合并请求
合并请求被打开、被关闭、被重新打开或被编辑
+ 合并请求
合并请求被打开、被关闭或被编辑
合并请求分配
合并请求被分配或取消分配
- 合并请求被评论
合并请求评论被创建、编辑或删除
+ 合并请求被评论
合并请求评论被创建或删除
)}
diff --git a/src/forge/SecuritySetting/bot/exploit/new/index.jsx b/src/forge/SecuritySetting/bot/exploit/new/index.jsx
index b19da5e05..bdecfa7de 100644
--- a/src/forge/SecuritySetting/bot/exploit/new/index.jsx
+++ b/src/forge/SecuritySetting/bot/exploit/new/index.jsx
@@ -193,9 +193,9 @@ function Disposition(props){
})(
- 合并请求
合并请求被打开、被关闭、被重新打开或被编辑
+ 合并请求
合并请求被打开、被关闭或被编辑
合并请求分配
合并请求被分配或取消分配
- 合并请求被评论
合并请求评论被创建、编辑或删除
+ 合并请求被评论
合并请求评论被创建或删除
)}
diff --git a/src/forge/Settings/Webhooks/New.jsx b/src/forge/Settings/Webhooks/New.jsx
index 299859ce3..1e2d4caae 100644
--- a/src/forge/Settings/Webhooks/New.jsx
+++ b/src/forge/Settings/Webhooks/New.jsx
@@ -283,7 +283,7 @@ function New({ form , match , showNotification , history, projectDetail }) {
合并请求
- 合并请求被打开、被关闭、被重新打开或被编辑
+ 合并请求被打开、被关闭或被编辑
合并请求分配
@@ -291,7 +291,7 @@ function New({ form , match , showNotification , history, projectDetail }) {
合并请求被评论
- 合并请求评论被创建、编辑或删除
+ 合并请求评论被创建或删除
{/*
合并请求收入里程碑
diff --git a/src/modules/loginRegister/Register.jsx b/src/modules/loginRegister/Register.jsx
index 6083fe6f6..b8c3ef2c2 100644
--- a/src/modules/loginRegister/Register.jsx
+++ b/src/modules/loginRegister/Register.jsx
@@ -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,