From 27f62f445566d7f44291fd28a926e04abfe1a3e8 Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Wed, 29 Sep 2021 17:25:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E5=88=B6issue=E3=80=81=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E7=9A=84=E6=98=BE=E7=A4=BA=E5=90=8D=E7=A7=B0=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/Detail.js         | 13 +++++++++----
 src/forge/Main/list.scss         | 15 ++++++++-------
 src/forge/Order/CopyDetail.js    | 18 ++++++++++--------
 src/forge/Order/UpdateDetail.js  | 16 ++++++++--------
 src/forge/Order/order_form.js    |  2 +-
 src/forge/Team/Sub/SubDetail.jsx |  2 +-
 6 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index a1a74149..3d82db26 100644
--- a/src/forge/Main/Detail.js
+++ b/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"
diff --git a/src/forge/Main/list.scss b/src/forge/Main/list.scss
index 72c3437e..017a151c 100644
--- a/src/forge/Main/list.scss
+++ b/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;
diff --git a/src/forge/Order/CopyDetail.js b/src/forge/Order/CopyDetail.js
index 1f61e736..906de4be 100644
--- a/src/forge/Order/CopyDetail.js
+++ b/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;
\ No newline at end of file
diff --git a/src/forge/Order/UpdateDetail.js b/src/forge/Order/UpdateDetail.js
index 9cbb3cd6..0bf4f0f1 100644
--- a/src/forge/Order/UpdateDetail.js
+++ b/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;
diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js
index 936dc3d1..2c572d59 100644
--- a/src/forge/Order/order_form.js
+++ b/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,
diff --git a/src/forge/Team/Sub/SubDetail.jsx b/src/forge/Team/Sub/SubDetail.jsx
index b4f1d036..8307a8b1 100644
--- a/src/forge/Team/Sub/SubDetail.jsx
+++ b/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>