diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 222bfad5..a73ee8f0 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -55,7 +55,8 @@ const OrderupdateMilepost = Loadable({ }) const OrderupdateDetail = Loadable({ - loader: () => import('../Order/UpdateDetail'), + // loader: () => import('../Order/UpdateDetail'), + loader: () => import('../Order/order_form'), loading: Loading, }) @@ -213,6 +214,10 @@ class Detail extends Component { } } + componentWillUnmount() { + this.timerChannel && clearTimeout(this.timerChannel); + } + getProject = (num) => { const { projectsId, owner } = this.props.match.params; const url = `/${owner}/${projectsId}/simple.json`; @@ -275,7 +280,9 @@ class Detail extends Component { connected: () => { console.log("###### channel connected! ######"); }, - disconnected: () => { }, + disconnected: () => { + console.log("###### cannot connected! ######"); + }, received: data => { console.log(`###### ---received data--- ######`); console.log(data); @@ -296,10 +303,22 @@ class Detail extends Component { }); cable.subscriptions.consumer.disconnect(); } + }, + onerror:()=>{ + console.log("###### cannot connected! ######"); } - }) + }); + + this.timerChannel = setTimeout(this.reloadDetail,5000); } + reloadDetail=()=>{ + if(this.state.firstSync||this.state.secondSync){ + window.location.reload(); + } + } + + deleteProjectBack = () => { const { history } = this.props; const { projectsId, owner } = this.props.match.params; @@ -700,16 +719,16 @@ class Detail extends Component { (props) => () } > - {/* 修改详情 updatedetail*/} - () + (props) => () } > {/* 复制详情 copyetail*/} () + (props) => () } > diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js index b0c82acd..09a5958e 100644 --- a/src/forge/Order/Detail.js +++ b/src/forge/Order/Detail.js @@ -273,7 +273,7 @@ class Detail extends Component { 编辑 diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js index 55126e3a..6e661d69 100644 --- a/src/forge/Order/OrderItem.js +++ b/src/forge/Order/OrderItem.js @@ -94,7 +94,7 @@ class OrderItem extends Component { user_admin_or_member ?
- +
diff --git a/src/forge/Order/UpdateDetail.js b/src/forge/Order/UpdateDetail.js index 0bf4f0f1..06fae4d1 100644 --- a/src/forge/Order/UpdateDetail.js +++ b/src/forge/Order/UpdateDetail.js @@ -4,6 +4,7 @@ import OrderForm from './order_form' function CopyDetail(props){ const operateName = props.match.params.operateName; + console.log('operateName:'+operateName); return( ) diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js index 8aa94cbc..ef79eea8 100644 --- a/src/forge/Order/order_form.js +++ b/src/forge/Order/order_form.js @@ -169,11 +169,12 @@ class order_form extends Component { // 创建 handleSubmit = () => { - this.setState({ - isSpin: true, - }); + this.props.form.validateFieldsAndScroll((err, values) => { if (!err) { + this.setState({ + isSpin: true, + }); const { form_type } = this.props; const { projectsId , orderId , owner } = this.props.match.params; @@ -247,9 +248,6 @@ class order_form extends Component { }); } } - this.setState({ - isSpin: false, - }); }); }; diff --git a/src/forge/claims/claims.js b/src/forge/claims/claims.js index 329bddb6..22ab0cf0 100644 --- a/src/forge/claims/claims.js +++ b/src/forge/claims/claims.js @@ -251,7 +251,7 @@ class claims extends React.Component { { - claimerdata.length>0?( + claimerdata&&claimerdata.length>0?(
声明要关注/解决此易修的用户{claimerdata.length}
this.setVisibleFunc(false)}>