diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js
index 8655fbfc7..36585fe3d 100644
--- a/src/forge/Main/CoderRootCommit.js
+++ b/src/forge/Main/CoderRootCommit.js
@@ -113,8 +113,8 @@ class CoderRootCommit extends Component{
return(
- {truncateCommitId(`${item.sha}`)}
- {item.message}
+ {truncateCommitId(`${item.sha}`)}
+ {item.message}
diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js
index 12dbf73b8..1ff47e862 100644
--- a/src/forge/Main/CoderRootDirectory.js
+++ b/src/forge/Main/CoderRootDirectory.js
@@ -381,6 +381,7 @@ class CoderRootDirectory extends Component {
title = (branchLastCommit,lastCommitAuthor) => {
if (branchLastCommit) {
+ const { projectsId , owner } = this.props.match.params;
return (
{lastCommitAuthor ? (
@@ -406,13 +407,13 @@ class CoderRootDirectory extends Component {
) : (
""
)}
-
+
{branchLastCommit.message}
-
+
{branchLastCommit.time_from_now}
-
+
{truncateCommitId(branchLastCommit.sha)}
-
+
);
}else{
@@ -440,9 +441,9 @@ class CoderRootDirectory extends Component {
width: "60%",
render: (text, item) =>
item.commit && item.commit.message ?
-
+
{item.commit.message}
-
+
: ""
},
{
diff --git a/src/forge/Main/CoderRootTag.js b/src/forge/Main/CoderRootTag.js
index e295a6cdc..6a035fee8 100644
--- a/src/forge/Main/CoderRootTag.js
+++ b/src/forge/Main/CoderRootTag.js
@@ -3,13 +3,12 @@ import axios from 'axios';
import { Spin } from 'antd';
import { truncateCommitId } from '../common/util';
import Nodata from '../Nodata';
-
+import { Link } from 'react-router-dom'
export default (( props, { projectDetail }) => {
const [isSpin, setSpin] = useState(true);
const [data, setData] = useState(undefined);
- const repo_id = projectDetail && projectDetail.repo_id;
const { projectsId , owner } = props.match.params;
useEffect(() => {
@@ -49,7 +48,7 @@ export default (( props, { projectDetail }) => {
{item.name}
- {truncateCommitId(`${item.id}`)}
+ {truncateCommitId(`${item.id}`)}
TAR
diff --git a/src/forge/Main/list.css b/src/forge/Main/list.css
index c3006fd75..272583d1c 100644
--- a/src/forge/Main/list.css
+++ b/src/forge/Main/list.css
@@ -412,6 +412,7 @@
padding: 13px 16px!important;
}
.commitKey{
+ cursor: pointer;
border:1px solid #FD7700;
background-color:#FFF3DC;
color: #FD7700!important;
diff --git a/src/forge/Merge/Commits.jsx b/src/forge/Merge/Commits.jsx
index 7e326bdfa..bb16d6b0a 100644
--- a/src/forge/Merge/Commits.jsx
+++ b/src/forge/Merge/Commits.jsx
@@ -18,7 +18,7 @@ function Commits({ commits , projectsId , owner }){
- {truncateCommitId(`${item.sha}`)}
+ {truncateCommitId(`${item.sha}`)}
{item.message}
浏览代码
diff --git a/src/forge/Merge/MergeSubmit.js b/src/forge/Merge/MergeSubmit.js
index 9ebb3bb2b..478081be9 100644
--- a/src/forge/Merge/MergeSubmit.js
+++ b/src/forge/Merge/MergeSubmit.js
@@ -5,6 +5,7 @@ import axios from 'axios';
import{ Form , Table , Spin } from 'antd'
import { getImageUrl } from 'educoder';
import {Link} from "react-router-dom";
+import { truncateCommitId} from '../common/util';
class MergeSubmit extends Component{
constructor(props){
super(props);
@@ -85,6 +86,7 @@ class MergeSubmit extends Component{
render(){
+ const { projectsId , owner } = this.props.match.params;
const { titledata } = this.state;
const columns=[{
title:"作者",
@@ -102,7 +104,7 @@ class MergeSubmit extends Component{
title:"SHA",
dataIndex: 'sha',
render: (text) => (
- {text}
+ {text}
)
},{
title:"备注",