From bedb5448a618f26dc51286fe334e87aa57575789 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 28 May 2020 11:52:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=87=8C=E7=A8=8B?= =?UTF-8?q?=E7=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Order/UpdateMilepost.js | 18 ++++++++---------- src/forge/Order/newMilepost.js | 13 ++----------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/src/forge/Order/UpdateMilepost.js b/src/forge/Order/UpdateMilepost.js index 13b1374a..65f918d3 100644 --- a/src/forge/Order/UpdateMilepost.js +++ b/src/forge/Order/UpdateMilepost.js @@ -1,7 +1,8 @@ import React, { Component } from 'react'; import { Calendar, Select, Radio, Col, Row, Divider, Input, Form, Spin } from 'antd'; import axios from 'axios'; -import moment from 'moment' +import moment from 'moment'; +import '../Order/order.css'; const TextArea = Input.TextArea; @@ -46,7 +47,7 @@ class UpdateMilepost extends Component { if (result) { this.setState({ data: result.data, - selectedValue: moment(result.data.effective_date) + selectedValue: result.data.effective_date && moment(result.data.effective_date) }) this.props.form.setFieldsValue({ name: result.data.name, @@ -69,12 +70,9 @@ class UpdateMilepost extends Component { const { projectsId } = this.props.match.params; const { meilid } = this.props.match.params; const url = `/projects/${projectsId}/versions/${meilid}.json`; - let time = undefined; - if (this.state.selectedValue === undefined) { - } else { - time = this.state.selectedValue.format("YYYY-MM-DD") - } + let time = this.state.selectedValue && this.state.selectedValue.format("YYYY-MM-DD"); + axios.put(url, { ...values, project_id: projectsId, @@ -97,6 +95,7 @@ class UpdateMilepost extends Component { } }) } + // 清楚截止日期 claertime = () => { this.setState({ selectedValue: undefined, @@ -105,8 +104,7 @@ class UpdateMilepost extends Component { render() { const { getFieldDecorator } = this.props.form; - const { isSpin } = this.state; - + const { isSpin , selectedValue } = this.state; return (
@@ -144,7 +142,7 @@ class UpdateMilepost extends Component {
截止日期(可选) 清除
- +
{ - - } - onPanelChange = (time, mode) => { this.setState({ value: time @@ -80,11 +76,6 @@ class NewMilepost extends Component { return (
- {/*
*/} - {/*
*/}

新的里程碑

里程碑可以组织任务和合并请求，并跟踪进度.
From 8b80d60996f3d57342df06744053bc7c47c1f925 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 28 May 2020 15:18:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/CoderRootDirectory.js | 5 +++-- src/forge/Main/list.css | 2 +- src/forge/Version/New.jsx | 30 ++++++++++++---------------- src/forge/Version/version.css | 8 ++++++++ 4 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js index 5878c780..85f80937 100644 --- a/src/forge/Main/CoderRootDirectory.js +++ b/src/forge/Main/CoderRootDirectory.js @@ -283,7 +283,7 @@ class CoderRootDirectory extends Component{ dataIndex: 'name', width:"30%", render: (text,item) => ( - this.goToSubRoot(item.path)}> + this.goToSubRoot(item.path)} className="ml12"> {text} ), @@ -297,8 +297,9 @@ class CoderRootDirectory extends Component{ },{ dataIndex:"commit", width:"10%", + className:"edu-txt-right", render:(text,item)=>( - item.commit && item.commit.time_from_now ? {item.commit.time_from_now} :"" + item.commit && item.commit.time_from_now ? {item.commit.time_from_now} :"" ) } ]; diff --git a/src/forge/Main/list.css b/src/forge/Main/list.css index 34170e71..eff4b42d 100644 --- a/src/forge/Main/list.css +++ b/src/forge/Main/list.css @@ -408,7 +408,7 @@ } .wrap-commit-table .ant-table-title{ background-color: rgba(241,248,255,1); - padding: 13px 8px!important; + padding: 13px 16px!important; } .commitKey{ border:1px solid #FD7700; diff --git a/src/forge/Version/New.jsx b/src/forge/Version/New.jsx index bed9a642..76944c84 100644 --- a/src/forge/Version/New.jsx +++ b/src/forge/Version/New.jsx @@ -23,15 +23,8 @@ export default Form.create()( const [desc, setDesc] = useState(null); const [fileList, setFileList] = useState(undefined); const [attachment, setAttachment] = useState(undefined); + const [options , setOptions] = useState(undefined); - const SelectDiv = styled.div` - display: flex; - align-item: center; - margin-bottom: 5px; - & .ant-row { - margin-bottom: 0px; - } - `; const Span = styled.span` margin: 0px 15px; color: #bbb; @@ -68,6 +61,7 @@ export default Form.create()( .then(result => { if (result) { setTagList(result.data); + setOptions(renderTagList(result.data)); } }) .catch(error => { @@ -88,10 +82,6 @@ export default Form.create()( return array || undefined; } } - function changeT(value) { - // let l = tagList.filter(item => item.name.indexOf(value) > -1); - // setTagList(l); - } function submit() { validateFields((err, value) => { if (versionId) { @@ -137,23 +127,29 @@ export default Form.create()( ), [] ); + // 输入标签名 + function changeAuto(value){ + let l = tagList.filter(item=>item.name.indexOf(value) > -1); + setOptions(renderTagList(l)); + } return (

创建发行版

- +
{helper( "", "tag_name", [{ required: true, message: "请输入获取或选择一个标签" }], + > + {options} + )} @ {helper( @@ -168,7 +164,7 @@ export default Form.create()( {renderTagList(branchList)} )} - +

选择一个已经存在的标签，或者在发布时新建一个标签

diff --git a/src/forge/Version/version.css b/src/forge/Version/version.css index 3b68d509..18a32dab 100644 --- a/src/forge/Version/version.css +++ b/src/forge/Version/version.css @@ -194,4 +194,12 @@ display: flex; height: 20px; align-items: center; +} +.itemInline{ + display: flex; + align-item: center; + margin-bottom: 5px; +} +.itemInline .ant-row{ + margin-bottom: 0px; } \ No newline at end of file From ed26a1780957e0743bd39edcca08453481f3366e Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 28 May 2020 15:30:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Version/New.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/forge/Version/New.jsx b/src/forge/Version/New.jsx index 76944c84..b45dc082 100644 --- a/src/forge/Version/New.jsx +++ b/src/forge/Version/New.jsx @@ -57,7 +57,9 @@ export default Form.create()( if (repo_id) { const url = `/repositories/${repo_id}/tags.json`; axios - .get(url) + .get(url,{params:{ + limit:1000 + }}) .then(result => { if (result) { setTagList(result.data);