Merge pull request '本周issue任务上线（除gitlink首页外）' (#91) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev

src/forge/Main/Detail.js

@@ -681,17 +681,22 @@ class Detail extends Component {
                     (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
                   }
                 ></Route>
-                {/* 修改详情 */}
-                <Route path="/:owner/:projectsId/issues/:orderId/updatedetail"
+                {/* 修改详情 updatedetail*/}
+                <Route path="/:owner/:projectsId/issues/:orderId/:operateName"
                   render={
                     (props) => (<OrderupdateDetail  {...this.props} {...props} {...this.state} {...common} />)
                   }
                 ></Route>
-                {/* 复制详情 */}
-                <Route path="/:owner/:projectsId/issues/:orderId/copyetail"
+                {/* 复制详情 copyetail*/}
+                {/* <Route path="/:owner/:projectsId/issues/:orderId/copyetail"
                   render={
                     (props) => (<OrdercopyDetail  {...this.props} {...props} {...this.state} {...common} />)
                   }
+                ></Route> */}
+                <Route path="/:owner/:projectsId/issues/:orderId/:operateName"
+                  render={
+                    (props) => (<OrderupdateDetail  {...this.props} {...props} {...this.state} {...common} />)
+                  }
                 ></Route>
                  {/* 任务详情 */}
                  <Route path="/:owner/:projectsId/issues/:orderId"

src/forge/Main/list.scss

@@ -426,14 +426,15 @@
   border-right: none;
 }
 .gitAddressClone > input{
-  border:none;
   outline: none;
-  padding:0px 8px;
-  height: 40px;
-  line-height: 40px;
-  border-radius: 0px;
-  border: 1px solid #eee;
-  flex:1;
+  padding: 0px 8px;
+  height: 38px;
+  line-height: 38px;
+  border: none!important;
+  border-right: 1px solid #eee!important;
+  border-radius: 4px 0px 0px 4px;
+  flex: 1;
+  max-width: 249px;
 }
 .wrap-commit-table .ant-table-small > .ant-table-content > .ant-table-body{
   margin:0px;

src/forge/Order/CopyDetail.js

@@ -1,11 +1,13 @@
 
-import React, { Component } from "react";
+import React from "react";
 import OrderItem from './order_form'
-class CopyDetail extends Component {
-  render() {
-    return (
-      <OrderItem form_type="copy" {...this.props}></OrderItem>
-    )
-  }
+
+
+function CopyDetail(props){
+  const operate = props.match.params.operate;
+  console.log(operate);
+  return(
+    <OrderItem form_type="copy" {...props}></OrderItem>
+  )
 }
-export default CopyDetail;
+export default CopyDetail;

src/forge/Order/UpdateDetail.js

@@ -1,11 +1,11 @@
 
-import React, { Component } from "react";
+import React from "react";
 import OrderForm from './order_form'
-class UpdateDetail extends Component {
-  render() {
-    return (
-      <OrderForm form_type="edit" {...this.props}></OrderForm>
-    )
-  }
+
+function CopyDetail(props){
+  const operateName = props.match.params.operateName;
+  return(
+    <OrderForm form_type={operateName === "copyetail" ? "copy":"edit"} {...props}></OrderForm>
+  )
 }
-export default UpdateDetail;
+export default CopyDetail;

src/forge/Order/order_form.js

@@ -153,7 +153,7 @@ class order_form extends Component {
           values.issue_tag_ids = [values.issue_tag_ids];
         }
         const { description, start_date, due_date, issue_type } = this.state;
-        if (form_type === "new") {
+        if (form_type !== "edit") {
           const url = `/${owner}/${projectsId}/issues.json`;
           axios.post(url, {
             ...values,

src/forge/Team/Sub/SubDetail.jsx

@@ -48,7 +48,7 @@ export default ((props)=>{
     <div className="teamDetail" style={{paddingTop:"0px"}}>
       <div>
         <i className="iconfont icon-zuobiao mr5"></i>
-        <Link to={`/${OIdentifier}`}>{OIdentifier}</Link>
+        <Link to={`/${OIdentifier}`}>{detail && detail.organization && detail.organization.nickname}</Link>
         <i className="iconfont icon-youjiantou ml3 mr3 font-12 color-grey-9"></i>
         <span className="color-grey-9">{detail ? detail.name : "新建团队"}</span>
       </div>