From cec5c84f6debae48cff3b860be80bde70c9dbd65 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 15 Dec 2023 14:52:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=88=A0=E5=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/merge.js      |  4 ++--
 src/forge/Merge/merge_form.js |  4 ++--
 src/forge/New/Index.js        | 15 ++++++++++++---
 src/forge/Order/order_form.js |  4 ++--
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js
index d8d83e15..991412b4 100644
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@@ -374,7 +374,7 @@ class merge extends Component {
               </Dropdown>
             </li>
 
-            <li>
+            {/* <li>
               <Dropdown
                 className="topWrapperSelect"
                 overlay={this.renderMenu(
@@ -390,7 +390,7 @@ class merge extends Component {
                   <Icon type="caret-down" className="ml5" />
                 </span>
               </Dropdown>
-            </li>
+            </li> */}
 
             <li>
               <Dropdown
diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js
index 2525cd5f..715518ec 100644
--- a/src/forge/Merge/merge_form.js
+++ b/src/forge/Merge/merge_form.js
@@ -358,7 +358,7 @@ class MergeForm extends Component {
                       </Select>
                     )}
                   </Form.Item>
-                  <Form.Item>
+                  {/* <Form.Item>
                     {getFieldDecorator("fixed_version_id", {
                       initialValue: fixed_version_id,
                     })(
@@ -378,7 +378,7 @@ class MergeForm extends Component {
                         {this.renderSelect(issue_versions)}
                       </Select>
                     )}
-                  </Form.Item>
+                  </Form.Item> */}
                   <Form.Item>
                     {getFieldDecorator("issue_tag_ids", {
                       initialValue: issue_tag_ids,
diff --git a/src/forge/New/Index.js b/src/forge/New/Index.js
index 77d0ac38..5eca4814 100644
--- a/src/forge/New/Index.js
+++ b/src/forge/New/Index.js
@@ -57,7 +57,8 @@ class Index extends Component {
       tokenConTri: false,
 
       gitHubUrl:false,
-      checkToken:undefined
+      checkToken:undefined,
+      ownerDisabled:false
     }
   }
   componentDidMount = () => {
@@ -94,15 +95,21 @@ class Index extends Component {
         })
         if(OIdentifier){
           owner = owner.filter(item=>item.login === OIdentifier);
+          this.setState({
+            ownerDisabled:owner[0].id ? true :false
+          })
         }else if(user_id){
           owner = owner.filter(item=>item.id === user_id);
+          this.setState({
+            ownerDisabled:false
+          })
         }
         this.props.form.setFieldsValue({
           user_id:owner && owner[0].id
         })
         owner && this.setState({
           owners_id:owner[0].id,
-          owners_name:owner[0].name
+          owners_name:owner[0].name,
         })
         this.setOptionsList(owner, 'owners');
       }
@@ -426,7 +433,8 @@ class Index extends Component {
       categoreFlag,
       tokenConTri,
       gitHubUrl,
-      checkToken
+      checkToken,
+      ownerDisabled
     } = this.state;
     return (
       <div className="main back-white" style={{padding:"0px",border:"none"}}>
@@ -526,6 +534,7 @@ class Index extends Component {
                     })(
                       <Select 
                         showSearch
+                        disabled={ownerDisabled}
                         style={{width:"260px",height:"33px"}}
                         placeholder="请选择拥有者"
                         className="plateAutoComplete"
diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js
index 7eb22d6d..c66c96b2 100644
--- a/src/forge/Order/order_form.js
+++ b/src/forge/Order/order_form.js
@@ -514,7 +514,7 @@ class order_form extends Component {
                   )}
                 </Form.Item>
 
-                <Form.Item label="里程碑">
+                {/* <Form.Item label="里程碑">
                   {getFieldDecorator("fixed_version_id", {rules: []})(
                     <Select
                       showSearch
@@ -536,7 +536,7 @@ class order_form extends Component {
                       )}
                     </Select>
                   )}
-                </Form.Item>
+                </Form.Item> */}
                 <Form.Item label="标记">
                   {getFieldDecorator("issue_tag_ids", {rules: []})(
                     <Select