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/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 (