diff --git a/public/index.html b/public/index.html index 70396e4c..b024c3b7 100755 --- a/public/index.html +++ b/public/index.html @@ -20,7 +20,7 @@ - --> @@ -43,7 +43,7 @@
- + diff --git a/src/App.js b/src/App.js index 534706b8..28ec0d5f 100644 --- a/src/App.js +++ b/src/App.js @@ -213,13 +213,13 @@ class App extends Component { - + {/* */} this.Modifyloginvalue()}> - - - - - + {/* */} + {/* */} + {/* */} + {/* */} + {/* */} {/*项目*/} diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js index aeecf7eb..47c2b0a5 100644 --- a/src/forge/Main/CoderRootDirectory.js +++ b/src/forge/Main/CoderRootDirectory.js @@ -427,7 +427,7 @@ class CoderRootDirectory extends Component { width: "60%", render: (text, item) => item.commit && item.commit.message ? - + {item.commit.message} : "" diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index c837ccb4..c7052fe7 100644 --- a/src/forge/Merge/MessageCount.js +++ b/src/forge/Merge/MessageCount.js @@ -378,14 +378,12 @@ class MessageCount extends Component { -
- {data.issue.description && - data.issue.description.length > 0 ? ( - this.commentCtx(data.issue.description) - ) : ( - 没有描述 - )} -
+ { + data.issue.description ? +
{this.commentCtx(data.issue.description)}
+ : +

没有描述

+ }
{pr_status === 2 && ( diff --git a/src/forge/Order/newMilepost.js b/src/forge/Order/newMilepost.js index 0e3e25d9..965e5a6a 100644 --- a/src/forge/Order/newMilepost.js +++ b/src/forge/Order/newMilepost.js @@ -52,12 +52,9 @@ class NewMilepost extends Component { const { projectsId , owner } = this.props.match.params; const url = `/${owner}/${projectsId}/milestones.json`; let time = undefined; - if (this.state.selectedValue === undefined) { - - } else { - time = this.state.selectedValue.format("YYYY-MM-DD") + if (this.state.selectedValue) { + time = this.state.selectedValue.format("YYYY-MM-DD"); } - axios.post(url, { ...values, project_id: projectsId, @@ -68,10 +65,8 @@ class NewMilepost extends Component { this.setState({ isSpin: false }) this.props.history.push(`/projects/${owner}/${projectsId}/milestones`); } - }).catch(error => { this.setState({ isSpin: false }) - console.log(error); }) }else{ this.setState({ isSpin: false }) diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css index f47632d3..cf3b7ffe 100644 --- a/src/modules/tpm/TPMIndex.css +++ b/src/modules/tpm/TPMIndex.css @@ -29,7 +29,7 @@ body>.-task-title { width: 100%; height:70px; min-width: 1200px; - z-index: 1000; + z-index: 10000; -moz-box-shadow: 0px 2px 10px 0px rgba(0,0,0,0.1); background:rgba(255,255,255,1); box-shadow:0px 2px 10px 0px rgba(0,0,0,0.1); diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js index a4c47d4f..e267d8d3 100644 --- a/src/modules/tpm/TPMIndexHOC.js +++ b/src/modules/tpm/TPMIndexHOC.js @@ -8,7 +8,6 @@ import './TPMIndex.css'; import LoginDialog from '../login/LoginDialog'; import AccountProfile from '../user/AccountProfile'; import AccountPhoneemail from '../user/AccountPhoneemail'; -import cookies from 'react-cookies'; export function TPMIndexHOC(WrappedComponent) { return class II extends React.Component { @@ -184,15 +183,16 @@ export function TPMIndexHOC(WrappedComponent) { json[key] = value; } } while (arr); - return json; }; + hideLoginDialog = () => { this.setState({ isRender: false, isloginCancel: undefined }) } + showLoginDialog = () => { this.setState({ isRender: true, @@ -209,6 +209,7 @@ export function TPMIndexHOC(WrappedComponent) { AccountProfiletype: false }) } + showProfileCompleteDialog = () => { this.dialogObj = {} this.setState({