diff --git a/src/forge/Branch/SelectOverlay.jsx b/src/forge/Branch/SelectOverlay.jsx
index 618b13dd..f043a8f5 100644
--- a/src/forge/Branch/SelectOverlay.jsx
+++ b/src/forge/Branch/SelectOverlay.jsx
@@ -11,13 +11,13 @@ function SelectOverlay({ changeBranch , tagflag , branchList , projectsId , owne
const [ datas , setDatas ] = useState(undefined);
const [ keys ,setKeys] = useState("branch");
- useEffect(()=>{
- if(visible){
- setKeys("branch");
- getBranchs(projectsId,owner);
- setIsSpin(true);
- }
- },[visible])
+ // useEffect(()=>{
+ // if(visible){
+ // setKeys("branch");
+ // getBranchs(projectsId,owner);
+ // setIsSpin(true);
+ // }
+ // },[visible])
useEffect(()=>{
if(branchList){
diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index 7f3c66cc..70d1901e 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -340,8 +340,8 @@ function CoderDepot(props){
const mdFlag = n && n.substring(n.length-3,n.length) === ".md";
const { current_user } = props;
- const baseOper = projectDetail && projectDetail.permission;
- const baseOperate = projectDetail && projectDetail.permission && projectDetail.permission !=="Reporter";
+ const baseOper = current_user && current_user.login && issuesFlag;
+ const baseOperate = projectDetail && projectDetail.permission && projectDetail.permission !=="Reporter" && projectDetail.type !== 2 && pullsFlag;
const fileOperate = type === "dir" && projectDetail && projectDetail.type !== 2 && ((projectDetail.permission && projectDetail.permission !=="Reporter") || (current_user && current_user.admin));
return(
@@ -400,35 +400,35 @@ function CoderDepot(props){
returnMain={returnMain}
getPathUrl={getPathUrl}
/>
- :
-
-
-
-
- 分支
- {projectDetail && projectDetail.branches && projectDetail.branches.total_count}
-
-
-
-
-
- 标签
- {projectDetail && projectDetail.tags && projectDetail.tags.total_count}
-
-
-
+ :
+
+
+
+
+ 分支
+ {projectDetail && projectDetail.branches && projectDetail.branches.total_count}
+
+
+
+
+
+ 标签
+ {projectDetail && projectDetail.tags && projectDetail.tags.total_count}
+
+
+
}
{
- ((baseOperate && projectDetail.type !== 2 && pullsFlag) || (baseOper && issuesFlag)) &&
+ (baseOperate || baseOper) &&
{
- baseOperate && projectDetail.type !== 2 && pullsFlag &&
+ baseOperate &&
urlLink(`/${owner}/${projectsId}/pulls/new/${branchName || defaultBranch}`)} >+ 合并请求
}
{
- baseOper && issuesFlag &&
+ baseOper &&
urlLink(`/${owner}/${projectsId}/issues/new`)} >+ 易修
}
diff --git a/src/forge/Main/tag/Index.jsx b/src/forge/Main/tag/Index.jsx
index 5e296e13..88cca13b 100644
--- a/src/forge/Main/tag/Index.jsx
+++ b/src/forge/Main/tag/Index.jsx
@@ -59,7 +59,7 @@ function Tags(props) {
return (
- {truncateCommitId(item.id)}
+ {truncateCommitId(item.commit && item.commit.sha)}
)
}
diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js
index 65fa7ec2..84ae9b33 100644
--- a/src/forge/Newfile/UserSubmitComponent.js
+++ b/src/forge/Newfile/UserSubmitComponent.js
@@ -83,8 +83,9 @@ class UserSubmitComponent extends Component {
if (result.data && result.data.name) {
this.props.showNotification("文件新建成功!");
if(submitType === "1"){
- const { getTopCount } = this.props;
+ const { getTopCount , getDetail } = this.props;
getTopCount && getTopCount(values.branchname);
+ getDetail && getDetail();
}
let url = `/${owner}/${projectsId}${values.branchname ? `/tree/${turnbar(values.branchname)}`: (branch ? `/tree/${turnbar(branch)}` : "")}`;
this.props.history.push(url);
@@ -147,6 +148,7 @@ class UserSubmitComponent extends Component {
const { current_user, filepath, projectDetail , currentBranch } = this.props;
const { editor_type } = this.props;
let b = currentBranch || branch;
+
return (
diff --git a/src/forge/Team/Sub/SubDetail.jsx b/src/forge/Team/Sub/SubDetail.jsx
index 8307a8b1..278fef07 100644
--- a/src/forge/Team/Sub/SubDetail.jsx
+++ b/src/forge/Team/Sub/SubDetail.jsx
@@ -50,7 +50,7 @@ export default ((props)=>{
{detail && detail.organization && detail.organization.nickname}
- {detail ? detail.name : "新建团队"}
+ {detail ? detail.nickname : "新建团队"}
{
detail &&