- {item.message}
+ {item.message}
{
});
}
}, [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 (
diff --git a/src/forge/Main/version/New.jsx b/src/forge/Main/version/New.jsx
index d9028b84..3f432e94 100644
--- a/src/forge/Main/version/New.jsx
+++ b/src/forge/Main/version/New.jsx
@@ -32,9 +32,9 @@ export default Form.create()(
const [fileList, setFileList] = useState(undefined);
const [attachment, setAttachment] = useState(undefined);
const [options , setOptions] = useState(undefined);
-
+ const stable = history && history.location && history.location.state.stable;
const { projectsId, versionId , owner } = match.params;
-
+
useEffect(()=>{
if(projectDetail && projectDetail.default_branch){
setBranch(projectDetail.default_branch);
@@ -129,6 +129,7 @@ export default Form.create()(
function changeBranch(params) {
setBranch(params);
}
+
return (
diff --git a/src/forge/Main/version/version.js b/src/forge/Main/version/version.js
index 5b48affa..ba4ff8b2 100644
--- a/src/forge/Main/version/version.js
+++ b/src/forge/Main/version/version.js
@@ -8,6 +8,7 @@ import './version.scss';
import axios from 'axios';
import Tree from '../img/tree-black.png';
import RenderHtml from '../../../components/render-html';
+import User from "../../Component/User";
function version(props) {
console.log(props);
@@ -29,6 +30,7 @@ function version(props) {
axios.get(url).then((result) => {
if (result) {
setData(result.data);
+ console.log('data',result.data)
const { releases = [] } = result.data;
//默认第一个展开（body参数)
releases.length && (releases[0].bodyshow = true);
@@ -48,7 +50,6 @@ function version(props) {
}
//删除
function deleteRelease(releaseId) {
- console.log(releaseId);
if(releaseId){
axios.delete(`/${owner}/${projectsId}/releases/${releaseId}.json`).then((result)=>{
if(result){
@@ -64,28 +65,29 @@ function version(props) {
{item.draft}
- {item.tag_name}{item.draft === "预发行" ?"(standalone)":""}
+ {item.tag_name}
- {truncateCommitId(item.sha)}
+ {truncateCommitId(item.sha)}
- 发布{item.name}{item.draft === "预发行" ?"(standalone)版本":""}
+ 发布{item.name}
- {
- (isManager || isDeveloper) && type !==2 &&
-
- }
- {current_user_login == owner && {deleteRelease(item.version_id)}}>}
+ {data && data.user_admin_permission && }
+ {data && data.user_admin_permission && {deleteRelease(item.version_id)}}>}
-
+
showBody(key,item.bodyshow)}>
- })
- {item.user_name}
+
发布于{item.created_at}
{
@@ -96,16 +98,14 @@ function version(props) {
}
- {item.tag_name}.TAR.gz
- {item.tag_name}.ZIP
-
- {/* 发行版附件下载 */}
- {/* {item.attachments.length !=0 &&
- 附件： */}
+ {/* 发行版附件下载 */}
{item.attachments && item.attachments.map((item)=>{
- return({item.title})
+ return(下载 {item.title})
})}
- {/*
} */}
+ {/* 发行版下载包 */}
+ 下载 {item.tag_name}.TAR.gz
+ 下载 {item.tag_name}.ZIP
+
)
@@ -115,7 +115,7 @@ function version(props) {
return (
{
- data && data.user_permission && type !== 2 &&
+ data && data.user_admin_permission &&
@@ -128,7 +128,7 @@ function version(props) {
} else if (releases && releases.length === 0) {
return (
)
@@ -136,7 +136,7 @@ function version(props) {
}
function addFunc(){
- props.history.push(`/${owner}/${projectsId}/releases/new`);
+ props.history.push({pathname:`/${owner}/${projectsId}/releases/new`,state:{stable:true}});
}
return (
diff --git a/src/forge/Main/version/version.scss b/src/forge/Main/version/version.scss
index 7985f374..7cd5ddb4 100644
--- a/src/forge/Main/version/version.scss
+++ b/src/forge/Main/version/version.scss
@@ -26,6 +26,12 @@
flex-direction: column;
align-items: flex-end;
padding-right: 15px;
+ &>.color-grey-3{
+ max-width: 10rem;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
}
.versionInfo_right{
flex: 1;
@@ -54,6 +60,13 @@
.body-show{
padding: 5px 10px 10px 10px;
}
+ & .version-user>a>span{
+ display: inline-block;
+ & img{
+ width: 20px;
+ height: 20px;
+ }
+ }
}
.versionTag{
display: inline;
@@ -95,7 +108,7 @@
margin-top: 5px;
padding-top: 20px;
border-top: 1px solid #eee;
- width: 100%;
+ // width: 100%;
a{
display: block;
color: #333;
diff --git a/src/forge/Merge/Files.jsx b/src/forge/Merge/Files.jsx
index 32215d10..fef63198 100644
--- a/src/forge/Merge/Files.jsx
+++ b/src/forge/Merge/Files.jsx
@@ -10,7 +10,21 @@ function Files(props){
const [ files , setFiles ] = useState(data && data.files);
const [ copyfileTipTitle, setCopyfileTipTitle] = useState("复制文件路径");
const [ isOpen, setIsOpen] = useState(false);
- const commitPage = history && history.location && history.location.query && history.location.query.page;
+ const commitPage = history && history.location && history.location.query && history.location.query.commitPage;
+ // console.log('222',commitPage);
+ // const nextHref = useRef(null);
+
+ // useEffect(()=>{
+ // const unlisten = history.listen((location)=>{
+ // if(nextHref.current !== location.pathname){
+ // nextHref.current = location.pathname;
+ // history.replace({pathname:location.pathname,search:`commitPage=${commitPage}`});
+ // // history.replace({pathname:location.pathname, query:{page:commitPage}});
+ // } else{
+ // unlisten;
+ // }
+ // })
+ // })
useEffect(()=>{
if(data){
diff --git a/src/forge/common/util.js b/src/forge/common/util.js
index 4f8f0bf3..1b35ea23 100644
--- a/src/forge/common/util.js
+++ b/src/forge/common/util.js
@@ -6,3 +6,11 @@ export function truncateCommitId(str) {
return str
}
}
+
+// 秒数转2021-9-29 01:01
+export function timeFormat(SecondsStr){
+ const time = new Date(SecondsStr*1000);
+ const hour = time.getHours()<10?"0".concat(time.getHours()):time.getHours();
+ const minutes = time.getMinutes()<10?"0".concat(time.getMinutes()):time.getMinutes();
+ return time.getFullYear()+"-"+(time.getMonth()+1)+"-"+time.getDate()+" "+hour+":"+minutes;
+}
\ No newline at end of file
diff --git a/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js b/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js
index 4f1e6d81..d6df12c4 100644
--- a/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js
+++ b/src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js
@@ -53,8 +53,6 @@ class CompetitionContentspdfpeopledata extends Component {
let url = `/users/accounts/${id}.json`;
axios.get(url).then((result) => {
if (result.data) {
- console.log("GetuseridApi");
- console.log(result.data);
this.setState({
userdata:result.data
})