- {
- projectDetail && projectDetail.forked_from_project_id ?
-
-
- : ""
- }
{projectDetail && projectDetail.author && projectDetail.author.name}
/
@@ -312,6 +305,9 @@ class Detail extends Component{
{
projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
+
+
forked from
{projectDetail.fork_info.fork_project_user_name}
@@ -327,7 +323,9 @@ class Detail extends Component{
- -1 || urlFlag) ? "active" : ""}>
+ -1 || urlFlag) ? "active" : ""}>
+
-1 && !(url.indexOf("Milepost")>0 || url.indexOf("meilpost")>0 || url.indexOf("tags")>0))? "active" : ""}>
-1 ? "active" : ""}>
-1 ? "active" : ""}>
diff --git a/src/forge/Main/list.css b/src/forge/Main/list.css
index 747648ed0..14998df94 100644
--- a/src/forge/Main/list.css
+++ b/src/forge/Main/list.css
@@ -492,14 +492,16 @@ body,#root{
margin-top: 25px;
}
.commonBox .commonBox-title{
- padding:10px 15px;
+ padding:3px 15px;
box-sizing: border-box;
- font-size: 18px;
+ font-size: 15px;
background: #f0f0f0;
+ font-weight: bold;
}
.commonBox .commonBox-info{
padding:20px 15px;
}
+.commonBox-title-read{vertical-align: middle;}
@media screen and (max-width: 370px){
.p-r-tags,.p-r-btn{
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index a0942179f..f1367f941 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -5,12 +5,12 @@ import axios from 'axios';
import Nav from '../Order/Nav';
import UploadComponent from '../Upload/Index';
import { getImageUrl } from 'educoder';
-import {Modal, Form, Input, Tooltip, Popconfirm, Pagination , Spin,Dropdown,Icon,Menu} from 'antd'
+import {Modal, Form, Input, Tooltip, Popconfirm, Pagination, Spin, Dropdown, Icon, Menu, Select} from 'antd'
import Attachments from '../Upload/attachment'
import './merge.css';
import QuillForEditor from '../quillForEditor';
import MergeSubmit from './MergeSubmit';
-
+const Option = Select.Option;
const TextArea = Input.TextArea;
const options = [
@@ -49,7 +49,12 @@ class MessageCount extends Component{
body:'',
commentsContent:undefined,
quillFlag:false,
- SpinFlag:true
+ SpinFlag:true,
+ editMerge: false,
+ issue_tag_ids: undefined,
+ issue_chosen: undefined,
+ fixed_version_id: undefined,
+ assigned_to_id: undefined
}
}
@@ -318,6 +323,52 @@ class MessageCount extends Component{
}
}
+ handleSubmit=()=>{
+ const { fileList } = this.state;
+ this.props.form.validateFieldsAndScroll((err, values) => {
+ if(!err){
+ const { projectsId , mergeId } = this.props.match.params;
+ const url = `/projects/${projectsId}/pull_requests/${mergeId}/simple_update.json`;
+
+ if(values.issue_tag_ids===''){
+ values.issue_tag_ids = []
+ }else{
+
+ }
+
+ if(values.assigned_to_id===0){
+ values.assigned_to_id = ""
+ }
+ axios.post(url,{
+ ...values
+ }).then(result=>{
+ if(result){
+ this.setState({
+ editMerge:false
+ })
+ this.props.showNotification(result.data.message);
+ }
+
+ }).catch(error=>{
+ console.log(error);
+ })
+
+ }
+ })
+ }
+
+ renderSelect=(list)=>{
+ if(list && list.length >0){
+ return(
+ list.map((item,key)=>{
+ return(
+ {item.name}
+ )
+ })
+ )
+ }
+ }
+
// 翻页
ChangePage=(page)=>{
@@ -329,12 +380,25 @@ class MessageCount extends Component{
this.getjournalslist(page,limit);
}
getOption=(e)=>{
- this.setState({
- mergename:e.item.props.value,
- mergekey:e.key,
- title:'',
- body:''
- })
+ if(e.key === "rebase"){
+ this.setState({
+ mergename:e.item.props.value,
+ mergekey:e.key,
+ title:'',
+ body:'',
+ buttonshow:'block'
+ })
+ }else{
+ this.setState({
+ mergename:e.item.props.value,
+ mergekey:e.key,
+ title:'',
+ body:'',
+ ismesrge:'block',
+ buttonshow:'block'
+ })
+ }
+
}
changeComments=(value)=>{
@@ -347,6 +411,29 @@ class MessageCount extends Component{
})
}
}
+ cancelSubmit=()=>{
+ this.setState({
+ editMerge: false
+ })
+ }
+
+ change_to_edit=()=>{
+ const { projectsId , mergeId} = this.props.match.params;
+ const url = `/projects/${projectsId}/pull_requests/${mergeId}/edit.json`;
+ axios.get(url).then((result)=>{
+ if(result){
+ this.setState({
+ issue_chosen:result.data.issue.issue_chosen,
+ issue_tag_ids: result.data.issue.issue_tags && result.data.issue.issue_tags[0].id,
+ fixed_version_id: result.data.issue.fixed_version_id,
+ assigned_to_id: result.data.issue.assigned_to_id,
+ editMerge: true
+ })
+ }
+ }).catch((error)=>{
+ console.log(error);
+ })
+ }
stringJson=(value) =>{
let _value = null;
@@ -378,12 +465,65 @@ class MessageCount extends Component{
render(){
const { projectsId,mergeId } = this.props.match.params;
- const { data,journalsdata, page, limit, search_count, isSpin, isedit, showFiles , commentsContent , quillFlag } = this.state;
+ const { data,journalsdata, page, limit, search_count, isSpin, isedit, showFiles , commentsContent , quillFlag, editMerge, issue_tag_ids, issue_chosen,fixed_version_id,assigned_to_id } = this.state;
const { getFieldDecorator } = this.props.form;
const { current_user } = this.props;
const url = this.props.history.location.pathname;
+ const editMergeForm =()=>{
+ return(
+
+ )
+ }
+
+
const menu = (
this.getOption(e)}>
合并请求
@@ -511,11 +651,16 @@ class MessageCount extends Component{
请求从 {data && data.pull_request.head} 分支合并到 {data && data.pull_request.base} 分支
- {
- data && data.issue.user_permission ?
- 编辑
+ : ''
+ }
@@ -541,6 +686,65 @@ class MessageCount extends Component{
+ {
+ data && data.issue.user_permission ?
+
+
+
+
+
该合并请求可以进行自动合并操作
+
+ {/* {this.state.mergename} */}
+ {/* */}
+ */}
+
+
+
+
+ {/*
*/}
+ {/*
*/}
+
+
+
+ this.prmerge()}>合并请求
+ 取消
+
+
+
+
+
+
+
+ : ''
+ }
+
{renderList()}
@@ -549,51 +753,6 @@ class MessageCount extends Component{
{ Paginations }
- {
- data && data.issue.user_permission ?
-
-
-
-
该合并请求可以进行自动合并操作
-
- {/* {this.state.mergename} */}
- {/* */}
- */}
-
-
-
-
- {/*
*/}
- {/*
*/}
-
-
-
- this.prmerge()}>合并请求
- 取消
-
-
-
-
-
- 标签
- {
- data && data.issue.issue_tags ? {data.issue.issue_tags[0].name} : "--"
- }
-
-
- 里程碑
- {
- data && data.issue.version ? data.issue.version : "--"
- }
-
-
- 指派给
- {data && data.issue.assign_user_name ? data.issue.assign_user_name : "--"}
-
+ {
+ editMerge ?
+
+ { editMergeForm() }
+
+
+ :
+
+
+ 标签
+ {
+ data && data.issue.issue_tags ? {data.issue.issue_tags[0].name} : "--"
+ }
+
+
+ 里程碑
+ {
+ data && data.issue.version ? data.issue.version : "--"
+ }
+
+
+ 指派给
+ {data && data.issue.assign_user_name ? data.issue.assign_user_name : "--"}
+
+
+
+ }
-
:
diff --git a/src/forge/Merge/merge.css b/src/forge/Merge/merge.css
index ce8061acb..36112f160 100644
--- a/src/forge/Merge/merge.css
+++ b/src/forge/Merge/merge.css
@@ -34,4 +34,7 @@
/*width: 110px;*/
border-radius: 4px;
line-height: 32px;
- }
\ No newline at end of file
+ }
+form .ant-cascader-picker, form .ant-select {
+ width: 100%;
+}
\ No newline at end of file