+
(
{/* diff */}
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index c37b1d92c..730e0d3ec 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -94,6 +94,11 @@ const MessageCount = Loadable({
loading: Loading,
})
+const UpdateMerge = Loadable({
+ loader: () => import('../Merge/UpdateMerge'),
+ loading: Loading,
+})
+
const MilepostDetail = Loadable({
loader: () => import('../Order/MilepostDetail'),
loading: Loading,
@@ -547,7 +552,7 @@ class Detail extends Component {
(
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index dd9eb8093..5cdb2b9b4 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -1,6 +1,8 @@
import React, { Component } from "react";
import { Link } from "react-router-dom";
-import { Popconfirm } from "antd";
+import { Popconfirm, Tag } from "antd";
+import { getImageUrl } from "educoder";
+import "./merge.css"
class MergeItem extends Component {
constructor(props) {
@@ -29,7 +31,7 @@ class MergeItem extends Component {
if (issue_tags && issue_tags.length > 0) {
return issue_tags.map((item, key) => {
return (
-
+
{item.name}
);
@@ -40,7 +42,7 @@ class MergeItem extends Component {
};
render() {
- const { issues, search_count, page, limit } = this.props;
+ const { issues, project_name } = this.props;
const { projectsId } = this.props.match.params;
const { current_user } = this.props;
const renderList = () => {
@@ -49,34 +51,66 @@ class MergeItem extends Component {
return (
-
- - # {search_count - (key + (page - 1) * limit)} - +
{item.name}
+
- {item.format_time}
- 发布
- {item.updated_at === item.format_time ? (
- ""
- ) : (
-
- {item.updated_at}
- 更新
+
+
+
+
+
+
+ {item && item.author_name}
+
+
+ {item.pull_request_staus === "open"
+ ? "创建于"
+ : item.pull_request_staus === "merged"
+ ? "合并于"
+ : "更新于"}
- )}
+ {item.pr_time}
+
+
- this.onMouseMove(item.id)}
onMouseOut={() => this.onMouseOut()}
>
+
- {item.priority}
- {this.set_issue_tags(item.issue_tags)} - {/*
- {item.issue_type || "--"} */} -
- {item.version || "--"}
- {item.assign_user_name ? ( +
- {item.version || "--"} +
-
- +{item.journals_count ? ( - + {item.journals_count} ) : ( diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index 4b0e335af..40fa5a352 100644 --- a/src/forge/Merge/MessageCount.js +++ b/src/forge/Merge/MessageCount.js @@ -6,22 +6,19 @@ import { getImageUrl } from "educoder"; import { Form, Input, - Pagination, Spin, Dropdown, Icon, Menu, Select, Tag, + Button, + Alert, } from "antd"; -import Attachments from "../Upload/attachment"; import "./merge.css"; -import MergeSubmit from "./MergeSubmit"; -import AmplifyImg from "../Order/AmplifyImg"; -// import MDEditor from "../../modules/tpm/challengesnew/tpm-md-editor"; import RenderHtml from "../../components/render-html"; -import Comments from "../comments/comments"; import "../Order/order.css"; +import MergeFooter from "./merge_footer"; const Option = Select.Option; const TextArea = Input.TextArea; @@ -31,50 +28,21 @@ class MessageCount extends Component { super(props); this.state = { data: undefined, - isShow: false, - imgsrc: "", - journalsdata: undefined, - //图片区域是否显示 none 隐藏 block 显示 - display: "none", - titledisplay: "none", - countvalue: "", - //是否需要编辑 - isedit: undefined, - fileList: undefined, - limit: 10, - page: 1, - search_count: undefined, isSpin: false, - showFiles: true, - ismesrge: "none", + ismesrge: false, buttonshow: "none", mergename: "合并请求", mergekey: "merge", title: "", body: "", - commentsContent: undefined, - quillFlag: false, SpinFlag: true, - editMerge: false, - issue_tag_ids: undefined, - issue_chosen: undefined, - fixed_version_id: undefined, - assigned_to_id: undefined, - imageUrl: undefined, - visible: false, SpinMerge: false, - journal_spin: false, edit_spin: false, + pr_status: undefined, }; } componentDidMount = () => { - const url = this.props.history.location.pathname; - if (url.indexOf("updatemerge") > -1) { - this.setState({ - editMerge: true, - }); - } this.setState({ SpinFlag: true, }); @@ -91,8 +59,10 @@ class MessageCount extends Component { this.setState({ data: result.data, SpinFlag: false, + pr_status: result.data.pull_request.status, }); - // this.getjournalslist(); + } else { + this.setState({ SpinFlag: false }); } }) .catch((error) => { @@ -103,121 +73,29 @@ class MessageCount extends Component { }); }; - handleok = () => { - this.setState({ - isShow: false, - }); - }; - handleCancel = () => { - this.setState({ - isShow: false, - }); - }; - - imgshow = () => { - this.setState({ - isShow: true, - }); - }; - - //添加评论 - // addjournals = () => { - // const { data, page, limit, fileList, commentsContent } = this.state; - // this.setState({ - // journal_spin: true, - // }); - // if (!commentsContent) { - // this.setState({ - // quillFlag: true, - // }); - // return; - // } - // this.props.form.validateFieldsAndScroll((err, values) => { - // if (!err) { - // const url = `/issues/${data.issue.id}/journals.json`; - // axios - // .post(url, { - // ...values, - // content: commentsContent, - // issue_id: data.id, - // attachment_ids: fileList, - // }) - // .then((result) => { - // if (result) { - // this.props.form.setFieldsValue({ - // content: "", - // attachments_ids: undefined, - // }); - // this.setState({ - // showFiles: false, - // quillFlag: false, - // commentsContent: "", - // journal_spin: false, - // }); - // this.getjournalslist(page, limit); - // this.props.showNotification("评论成功！"); - // } - // }) - // .catch((error) => { - // this.setState({ - // journal_spin: false, - // }); - // console.log(error); - // }); - // } else { - // this.setState({ - // journal_spin: false, - // }); - // } - // }); - // }; - // //获取评论信息 - // getjournalslist = (page, limit) => { - // const { data } = this.state; - // const url = `/issues/${data.issue.id}/journals.json`; - // let id = data.id; - // axios - // .get(url, { - // params: { - // id, - // page, - // limit, - // }, - // }) - // .then((result) => { - // if (result) { - // this.setState({ - // journalsdata: result.data, - // search_count: result.data.journals_count, - // isSpin: false, - // fileList: undefined, - // showFiles: true, - // SpinFlag: false, - // }); - // } - // }) - // .catch((error) => { - // console.log(error); - // }); - // }; - //关闭任务 - closedetail = (id) => { - const { projectsId, orderId } = this.props.match.params; - const { data } = this.state; - const url = `/projects/${projectsId}/issues/${data.issue.id}/close_issue.json`; + closedetail = () => { + this.setState({ isSpin: true }); + const { projectsId, mergeId } = this.props.match.params; + const url = `/projects/${projectsId}/pull_requests/${mergeId}/refuse_merge.json`; axios - .post(url, { - project_id: projectsId, - id: orderId, - status_id: id, - }) + .post(url) .then((result) => { if (result) { - this.getDetail(); + this.setState({ + isSpin: false, + pr_status: 2, + }); + } else { + this.setState({ + isSpin: false, + }); } }) .catch((error) => { + this.setState({ + isSpin: false, + }); console.log(error); }); }; @@ -228,7 +106,7 @@ class MessageCount extends Component { SpinMerge: true, }); const { projectsId } = this.props.match.params; - const { data, title, body, mergekey } = this.state; + const { data, title, body, mergekey, pr_status } = this.state; const url = `/projects/${projectsId}/pull_requests/${data.pull_request.id}/pr_merge.json`; axios .post(url, { @@ -240,10 +118,12 @@ class MessageCount extends Component { }) .then((result) => { if (result) { - this.getDetail(); this.setState({ SpinMerge: false, + pr_status: 1, }); + } else { + this.setState({ SpinMerge: false }); } }) .catch((error) => { @@ -254,70 +134,6 @@ class MessageCount extends Component { }); }; - //修改评论 - // updatedetail = (id) => { - // this.setState({ - // edit_spin: true, - // }); - // const { page, limit, data } = this.state; - // const { orderId } = this.props.match.params; - // const url = `/issues/${data.issue.id}/journals/${id}.json`; - // axios - // .put(url, { - // issue_id: orderId, - // id: id, - // content: this.state.countvalue, - // }) - // .then((result) => { - // if (result) { - // this.setState({ - // isedit: undefined, - // edit_spin: false, - // }); - // this.getjournalslist(page, limit); - // } - // }) - // .catch((error) => { - // this.setState({ - // edit_spin: false, - // }); - // console.log(error); - // }); - // }; - // 获取上传后的文件id数组 - UploadFunc = (fileList) => { - this.setState({ - fileList, - }); - }; - - //删除评论 - // deleteorder = (id) => { - // const { orderId } = this.props.match.params; - // const { page, limit, data } = this.state; - // const url = `/issues/${data.issue.id}/journals/${id}.json`; - // axios - // .delete(url, { - // data: { - // issue_id: orderId, - // id: id, - // }, - // }) - // .then((result) => { - // if (result) { - // this.getjournalslist(page, limit); - // } - // }) - // .catch((error) => { - // console.log(error); - // }); - // }; - - changmodelname = (value) => { - this.setState({ - countvalue: value, - }); - }; changtitlepr = (e) => { this.setState({ title: e.target.value, @@ -329,126 +145,29 @@ class MessageCount extends Component { body: e.target.value, }); }; - editdetail = (count, status) => { - this.setState({ - countvalue: count, - isedit: status, - }); - }; + submitmerge = () => { if (this.state.mergekey === "rebase") { this.setState({ buttonshow: "block", - ismesrge: "none", + ismesrge: true, }); } else { this.setState({ ismesrge: "block", - buttonshow: "block", + buttonshow: false, }); } }; nonemerge = () => { this.setState({ - ismesrge: "none", + ismesrge: false, buttonshow: "none", }); }; - renderJournalList = (list) => { - if (list && list.length > 0) { - return list.map((item, key) => { - return ( -- {item.detail}： - - {item.old_value && item.old_value.length > 0 ? "更新为" : "新增"} - - - {item.value && item.value.length > 0 ? ( - item.detail === "标签" ? ( - - {item.value[0].name} - - ) : ( - item.value - ) - ) : ( - "无" - )} - -- ); - }); - } else { - return ( -- 没有评论~ -- ); - } - }; - handleSubmit = () => { - 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 { - values.issue_tag_ids = [parseInt(values.issue_tag_ids)]; - } - - if (values.assigned_to_id === 0) { - values.assigned_to_id = ""; - } - axios - .post(url, { - ...values, - }) - .then((result) => { - if (result.data.status === 0) { - this.setState({ - editMerge: false, - }); - this.getDetail(); - this.props.showNotification(result.data.message); - } - }) - .catch((error) => { - console.log(error); - }); - } - }); - }; - - renderSelect = (list) => { - if (list && list.length > 0) { - return list.map((item, key) => { - return ( - - ); - }); - } - }; - - // 翻页 - // ChangePage = (page) => { - // this.setState({ - // page, - // isSpin: true, - // }); - // const { limit } = this.state; - // this.getjournalslist(page, limit); - // }; getOption = (e) => { if (e.key === "rebase") { this.setState({ @@ -464,170 +183,35 @@ class MessageCount extends Component { mergekey: e.key, title: "", body: "", - ismesrge: "block", + ismesrge: true, buttonshow: "block", }); } }; - changeComments = (value) => { - this.setState({ - commentsContent: value, - }); - if (value) { - this.setState({ - quillFlag: false, - }); - } - }; 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); - }); - }; - commentCtx = (v) => { return
; }; - handleShowImage = (value) => { - this.setState({ - imageUrl: value, - visible: true, - }); - }; - setVisible = (flag) => { - this.setState({ - visible: flag, - }); - }; + render() { const { projectsId, mergeId } = this.props.match.params; const { data, - journalsdata, - page, - limit, - search_count, - isSpin, - isedit, - showFiles, - commentsContent, - quillFlag, - editMerge, - issue_tag_ids, - issue_chosen, - fixed_version_id, - assigned_to_id, - visible, - imageUrl, SpinMerge, - journal_spin, - edit_spin, + pr_status, + isSpin, + ismesrge, + SpinFlag, } = this.state; - const { getFieldDecorator } = this.props.form; const { current_user } = this.props; - const url = this.props.history.location.pathname; - const get_color = (type) => { - if (type === 0) { - return "#21ba45"; - } else if (type === 1) { - return "#a333c8"; - } else { - return "#e60b0b"; - } - }; - - const editMergeForm = () => { - return ( - - -- ); - }; const menu = ( ); - const Paginations = ( -- {search_count > limit ? ( - -+ return ( + + {data ? ( ++) : ( "" )} - - ); - - return ( -++ ++++++++ + + {data.issue.subject} + + + + {data.pull_request && ( ++ { ++ {pr_status === 1 + ? "已合并" + : pr_status === 2 + ? "已拒绝" + : "开启的"} + + )} +++ } + ++ + {data.project_name}：{data.pull_request.head} + + + + + ++ + {data.project_name}：{data.pull_request.base} + + ++ +++ + + 由 + + {data.issue.author_name} + + + {pr_status === 0 + ? "创建于" + : pr_status === 1 + ? "合并于" + : "更新于"} + + {data.pr_time} + + 审查人员： + + {data.issue.assign_user_name ? data.issue.assign_user_name : "--"} + + + + 里程碑： + + {data.issue.version ? data.issue.version : "--"} + + + + 标签： + + {data.issue.issue_tags && + data.issue.issue_tags.length > 0 + ? data.issue.issue_tags[0].name + : "--"} + + + + 优先级： + + {data.issue.priority ? data.issue.priority : "--"} + + + +
+++ {current_user && + pr_status !== 2 && + (data.issue.author_login === current_user.login || + data.issue.user_permission) && ( + + )} + {data.issue.user_permission && pr_status === 0 && ( + + )} +++ {data.issue.description && + data.issue.description.length > 0 ? ( + this.commentCtx(data.issue.description) + ) : ( + 没有描述 + )} +++ {pr_status === 2 && ( +++ )} + {pr_status === 1 && ( + + )} + {pr_status === 0 && data.issue.user_permission && ( + + + )} ++++
+} + > + {this.state.mergename} + + + +++ + +++
++ + + +++ - {visible && ( -); } diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js index 5d8ba113d..dd7542eed 100644 --- a/src/forge/Merge/NewMerge.js +++ b/src/forge/Merge/NewMerge.js @@ -1,431 +1,187 @@ -import React, { Component } from 'react'; -import { Link } from 'react-router-dom'; -import { Radio, Form, Menu, Dropdown, Input, Select, Table, Spin } from 'antd'; -import axios from 'axios'; -import UploadComponent from '../Upload/Index'; -import { getImageUrl } from 'educoder'; -import '../Order/order.css'; -import MDEditor from '../../modules/tpm/challengesnew/tpm-md-editor'; - - -const { Button } = Radio; +import React, { Component } from "react"; +import { Input, Select, Button, Spin, Alert } from "antd"; +import axios from "axios"; +import "../Order/order.css"; +import "./merge.css"; +import MergeForm from "./merge_form" +import MergeFooter from "./merge_footer" const Option = Select.Option; - -const options = [ - ['bold', 'italic', 'underline'], - [{ header: [1, 2, 3, false] }], - ['blockquote', 'code-block'], - ['link', 'image'], - ['formula'] -]; class NewMerge extends Component { constructor(props) { super(props); this.state = { data: undefined, - //合并 拉取 + branches: undefined, + origin_branches: undefined, merge: undefined, pull: undefined, - //判断 是否显示创建合并请求的页面 - desc: undefined, - iscreatemerge: 'none', - issue_tag_ids: "", - fixed_version_id: "", - assigned_to_id: "", - titledata: undefined, - dataCount: undefined, - limit: 50, - page: 1, isSpin: false, - mergedata: undefined, - } + show_message: true, + default_message: "必须选择不同的分支", + }; } componentDidMount = () => { this.getmergelist(); - this.InitData(); - } - InitData = () => { - this.props.form.setFieldsValue({ - ...this.state - }); - } - - - onPanelChange = (time, mode) => { - this.setState({ - value: time - }); - } - - onSelect = (time) => { - this.setState({ - value: time, - selectedValue: time, - }); - } - - getOption = (name, id) => { - - if (id === 'branches') { - this.ischeckmerge(name, this.state.pull) - this.setState({ - merge: name - }) - } else { - if (this.state.iscreatemerge === 'block') { - if (this.state.merge === name) { - } else { - const { page, limit } = this.state; - this.getCommitList(name, page, limit); - } - } else { - - } - this.ischeckmerge(this.state.merge, name) - this.setState({ - pull: name - }) - } - } - - ismerge = () => { - this.setState({ - iscreatemerge: 'block' - }) - const { page, limit } = this.state; - this.getCommitList(this.state.pull, page, limit); - } - + }; //获取新建分枝数据 getmergelist = () => { const { projectsId } = this.props.match.params; const url = `/projects/${projectsId}/pull_requests/new.json`; - axios.get(url).then((result) => { - if (result) { - this.setState({ - data: result.data, - merge: result.data.branches[0], - pull: result.data.branches[0], - }) - } - }).catch((error) => { - console.log(error); - }) - } - - renderMenu = (array, id) => { - return ( - - ) - } - - renderSelect = (list) => { - if (list && list.length > 0) { - return ( - list.map((item, key) => { - return ( - - ) - }) - ) - } - } - - //创建合并请求 - - submit = () => { - this.setState({ - isSpin: true - }) - this.props.form.validateFieldsAndScroll((err, values) => { - if (!err) { - const { projectsId } = this.props.match.params; - const url = `/projects/${projectsId}/pull_requests.json`; - - if (values.issue_tag_ids.length > 0) { - values.issue_tag_ids = [parseInt(values.issue_tag_ids)] - } else { - values.issue_tag_ids = [] - } - const { desc } = this.state; - axios.post(url, { - ...values, - body: JSON.stringify(desc), - project_id: projectsId, - head: this.state.merge, - base: this.state.pull, - - }).then(result => { - if (result) { - this.setState({ - isSpin: false - }) - this.props.history.push(`/projects/${projectsId}/merge`); - const { getDetail } = this.props; - getDetail && getDetail(); - } - }).catch(error => { + axios + .get(url) + .then((result) => { + if (result) { this.setState({ - isSpin: false - }) - console.log(error); - }) - } else { - this.setState({ - isSpin: false - }) - } - }) - } + data: result.data, + branches: result.data.branches, + origin_branches: result.data.branches, + }); + } + }) + .catch((error) => { + console.log(error); + }); + }; - //获取提交列表 - getCommitList = (branch, page, limit) => { - const { projectsId } = this.props.match.params; - const url = `/repositories/${projectsId}/commits.json`; - axios.get(url, { - params: { - sha: branch, - page, - limit - } - }).then((result) => { - if (result) { - const array = []; - result.data && result.data.commits.length > 0 && result.data.commits.map((item, key) => { - array.push({ - name: item.author && item.author.name, - login: item.author && item.author.login, - image_url: item.author && item.author.image_url, - sha: item.sha, - time_from_now: item.time_from_now, - message: item.message - }) - }) - this.setState({ - titledata: array, - dataCount: result.data.total_count, - isSpin: false - }) - } - }).catch((error) => { console.log(error) }) - } + selectBrach = (type, value) => { + this.state[type] = value; + this.ischeckmerge(); + }; //判断2分支是否可以合并 - ischeckmerge = (head, base) => { + ischeckmerge = () => { + this.setState({ isSpin: true }); const { projectsId } = this.props.match.params; + const { pull, merge } = this.state; const url = `/projects/${projectsId}/pull_requests/check_can_merge.json`; - axios.post(url, { - project_id: projectsId, - head: head, - base: base, - - }).then(result => { - if (result) { - this.setState({ - mergedata: result.data - }) - } - - }).catch(error => { - console.log(error); - }) - - } - - onContentChange = (value) => { - this.setState({ - desc: value - }) - } - + axios + .post(url, { + project_id: projectsId, + head: merge ? merge : "master", + base: pull ? pull : "master", + }) + .then((result) => { + if (result) { + if (result.data.status === 0) { + this.setState({ + isSpin: false, + show_message: false, + }); + } else { + this.setState({ + isSpin: false, + show_message: true, + default_message: result.data.message, + }); + } + } else { + this.setState({ + isSpin: false, + show_message: true, + default_message: "出现错误了", + }); + } + }) + .catch((error) => { + this.setState({ isSpin: false, show_message: true }); + console.log(error); + }); + }; render() { - const { getFieldDecorator } = this.props.form; - const { projectsId } = this.props.match.params; - const { current_user } = this.props; - const { issue_tag_ids, fixed_version_id, assigned_to_id, data, titledata, desc, isSpin } = this.state; + const { + data, + branches, + origin_branches, + pull, + merge, + isSpin, + show_message, + default_message, + } = this.state; - - const columns = [{ - title: "作者", - dataIndex: 'name', - width: "10%", - render: (text, item) => ( - - -- )} - ---- {url.indexOf("Messagecount") > 0 || url.indexOf("updatemerge") > 0 ? ( -- -- {data && data.attachments.length > 0 ? ( ---- - 【合并请求 】 - - {data && data.issue.subject} - - - - {data && data.pull_request && ( --- {data.pull_request.status === 0 - ? "开启中" - : (data.pull_request.status === 1 - ? "已合并" - : "已拒绝")} - - )} -- 由 - - {data && data.issue.author_name} - - - 添加于 {data && data.issue.created_at} - - - 请求从 {data && data.pull_request.head} - 分支合并到 - {data && data.pull_request.base} - 分支 - - {data && data.issue.user_permission ? ( - - - this.closedetail( - data && data.issue.issue_status === "关闭" ? 2 : 5 - ) - } - > - {data && data.issue.issue_status === "关闭" - ? "点击开启" - : "关闭"} - - - 编辑 - - - ) : ( - "" - )} ---- ) : ( - "" - )} - -- -----
-
- 0 ? "active" : ""} - > - - 对话内容 - - -
- 0 ? "active" : ""} - > - - 代码提交 - - -
- - ) : ( ---- {data && data.issue.user_permission ? ( ---- ) : ( - "" - )} - { - data && data.issue && -- --- {data && data.issue.issue_status !== "关闭" && ( ---- )} -该合并请求可以进行自动合并操作
--
-} - > - {this.state.mergename} - - - - ---
-- this.prmerge()} - > - 合并请求 - - - 取消 - - -- } - - -- - )} -- - {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 - : "--"} - -
-- - - - ), - }, { - title: "SHA", - dataIndex: 'sha', - render: (text) => ( - {text} - ) - }, { - title: "备注", - dataIndex: 'message', - render: (text) => ( - {text} - ) - }, { - title: "提交时间", - className: "edu-txt-right", - dataIndex: 'time_from_now', - render: (text) => ( - {text} - ) - }] - - const title = () => { - return ( -
- 提交列表 -- ) - } - - const pull = () => { - if (this.state.mergedata && this.state.mergedata.status === -2) { - return ( -- 在这些分支直接合并请求已经存在：{this.state.mergedata && this.state.mergedata.pull_request_name} -- ) - } else { - return ( -- {this.state.mergedata && this.state.mergedata.status === 0 ? : "分支内容相同，无需创建合并请求"} -- ) + const renderBrances = (list) => { + if (list && list.length > 0) { + return list.map((item, key) => { + return ( + + ); + }); } - } - + }; + const withHtml = (html) => { + return ; + }; return ( -- -创建合并请求
-选择合并的目标分支和源分支
----- - - ... -- - +++-+ +-+-源分支:++ + + --- {pull()} ---