- {item.name} + {/* 如果是点击最新则发行版列表页只展示最新的一个 */} + {item.name} 最新
{item.created_at}
diff --git a/src/forge/Component/User.jsx b/src/forge/Component/User.jsx index 3066518b8..0d970173f 100644 --- a/src/forge/Component/User.jsx +++ b/src/forge/Component/User.jsx @@ -5,6 +5,7 @@ import { Link } from 'react-router-dom'; export default ({ url , name , column , id , login })=>{ const Img = styled.span` display:flex; + font-weight: bold; ${column && "flex-direction: column;text-align:center;"} align-items: center; & img{ @@ -15,7 +16,6 @@ export default ({ url , name , column , id , login })=>{ ${!column && ` & span{ margin-left:8px; - font-weight: bold; }` } `; diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js index 6c9b03273..183523888 100644 --- a/src/forge/Main/CoderRootCommit.js +++ b/src/forge/Main/CoderRootCommit.js @@ -6,6 +6,7 @@ import { AlignTop } from '../Component/layout'; import SelectBranch from '../Branch/Select'; import Nodata from '../Nodata'; +import User from '../Component/User' import Tree from './img/tree.png'; import axios from 'axios'; import {Link} from "react-router-dom"; @@ -19,6 +20,12 @@ function returnbar(str){ } return str; } + +function timeFormat(seconds) { + const time = new Date(seconds*1000); + return time.getFullYear()+"-"+(time.getMonth()+1)+"-"+time.getDate()+" "+(time.getHours()+1)+":"+time.getMinutes(); +} + //代码库--提交页面 class CoderRootCommit extends Component{ constructor(props){ @@ -36,8 +43,12 @@ class CoderRootCommit extends Component{ componentDidMount=()=>{ this.Init(); this.getBranchs(); + // goBack + // addEventListener } + // componentde + // 获取分支列表 getBranchs=()=>{ const { projectsId , owner } = this.props.match.params; @@ -90,7 +101,8 @@ class CoderRootCommit extends Component{ image_url:item.author && item.author.image_url, sha:item.sha, time_from_now:item.time_from_now, - message:item.message + message:item.message, + timestamp:item.timestamp }) }) this.setState({ @@ -116,6 +128,7 @@ class CoderRootCommit extends Component{ }) this.getCommitList(branchName , page , limit); } + render(){ const { commitDatas , dataCount , limit , page , isSpining , branchList } = this.state; const { projectDetail, commit_class , defaultBranch } = this.props; @@ -144,29 +157,25 @@ class CoderRootCommit extends Component{{item.message}
- {
- item.id ?
-
- {item.image_url?:""}
-
- :
-
- {item.image_url?
:""}
-
-
- }
+
-
-
+
+
- {truncateCommitId(`${item.sha}`)}
-
+ {truncateCommitId(`${item.sha}`)}
+
diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx
index 192b80e3c..5330b9df3 100644
--- a/src/forge/Main/Diff.jsx
+++ b/src/forge/Main/Diff.jsx
@@ -4,11 +4,10 @@ import { Button ,Spin } from "antd";
import { truncateCommitId } from '../common/util';
import { getImageUrl } from 'educoder';
import Files from '../Merge/Files';
-
import Tree from "./img/tree.png";
import User from "../Component/User";
-
import axios from "axios";
+import { Link } from "react-router-dom";
const Infos = styled.div`
border: 1px solid #FAFCFF;
@@ -17,7 +16,7 @@ const Infos = styled.div`
background-color: #f1f8ff;
border: 1px solid rgba(42, 97, 255, 0.23);
border-radius: 3px 3px 0px 0px;
- padding: 10px 8px 10px 16px;
+ padding: 10px 20px 10px 16px;
& .f-wrap-between{
align-items: center;
}
@@ -32,22 +31,25 @@ const Infos = styled.div`
}
}
& > .f-wrap-between {
- padding: 14px 8px 14px 16px;
+ padding: 14px 20px 14px 16px;
border-radius: 3px 3px 0px 0px;
border: 1px solid #D0D0D0;
.df{
align-items: center;
+ & .underline:hover{
+ text-decoration: underline;
+ }
}
}
`;
//提交详情页
-export default ({ match , history }) => {
+export default (props) => {
+ const {match , history } = props;
const [data, setData] = useState({undefined});
const [commit, setCommit] = useState(undefined);
const [parents, setParents] = useState(undefined);
const [committer, setCommitter] = useState(undefined);
const [isSpin, setIsSpin] = useState(true);
-
const { sha , projectsId, owner, branchName } = match.params;
useEffect(() => {
if (projectsId && owner && sha) {
@@ -68,6 +70,11 @@ export default ({ match , history }) => {
});
}
}, [projectsId , owner, sha]);
+
+ function timeFormat(seconds) {
+ const time = new Date(seconds*1000);
+ return time.getFullYear()+"-"+(time.getMonth()+1)+"-"+time.getDate()+" "+(time.getHours()+1)+":"+time.getMinutes();
+ }
return (
@@ -76,10 +83,10 @@ export default ({ match , history }) => {
@@ -87,10 +94,12 @@ export default ({ match , history }) => {
{
@@ -99,7 +108,7 @@ export default ({ match , history }) => {
- {truncateCommitId(item.sha)}
+ {truncateCommitId(item.sha)}
)
})
diff --git a/src/forge/Main/version/Empty.jsx b/src/forge/Main/version/Empty.jsx
index 5dac793ec..3200d3e8f 100644
--- a/src/forge/Main/version/Empty.jsx
+++ b/src/forge/Main/version/Empty.jsx
@@ -5,15 +5,15 @@ import './version.scss';
function Empty({operation,addFunc}) {
return(
- {commit && commit.message &&
-
{commit.message}
- }
- {branchName}
+ {commit && commit.message &&
+ {commit.message}
+ }
+ {branchName}
- 提交于{commit.time_from_now} } + {commit && commit.timestamp &&
- 提交于{timeFormat(commit.timestamp)} }
-
- 这里暂未发布过任何版本
+
+ 这里暂未发布过任何版本
发行版功能基于仓库中的历史标记
建议使用类似 V1.0 的版本标记作为发布点
diff --git a/src/forge/Main/version/New.jsx b/src/forge/Main/version/New.jsx
index 6b1dc2489..d9028b848 100644
--- a/src/forge/Main/version/New.jsx
+++ b/src/forge/Main/version/New.jsx
@@ -130,7 +130,7 @@ export default Form.create()(
setBranch(params);
}
return (
- 建议使用类似 V1.0 的版本标记作为发布点
{
operation ?
:
- 该项目暂时没有发布版本
+ 该项目暂时没有发布版本
}
+