From 4cd25cffc7bc254971c84bc0e980f01060a44ee6 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 26 Apr 2022 17:48:21 +0800
Subject: [PATCH] =?UTF-8?q?issue/pr=E5=90=84=E4=B8=8B=E6=8B=89=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/CreateMerge.js | 24 ++++++++++++++++++
 src/forge/Merge/merge.css      |  3 +++
 src/forge/Merge/merge_form.js  | 23 ++++++++++++++++-
 src/forge/Order/order.css      |  6 ++++-
 src/forge/Order/order_form.js  | 45 +++++++++++++++++++++++++++++++---
 5 files changed, 95 insertions(+), 6 deletions(-)

diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js
index 3aeaa4a24..81400f220 100644
--- a/src/forge/Merge/CreateMerge.js
+++ b/src/forge/Merge/CreateMerge.js
@@ -338,6 +338,28 @@ class CreateMerge extends Component {
     return <div dangerouslySetInnerHTML={{ __html: html }}></div>;
   };
 
+  // 源分支-分支搜索
+  changePullValue=(value,cate)=>{
+    const branchParams = getBranchParams(this.props.location.pathname);
+    const { pullOwner , projectId } = branchParams;
+    const url = `/${pullOwner}/${projectId}/pulls/new.json`;
+    axios.get(url,{
+      params:{branch_name:value || undefined}
+    }).then(result=>{
+      if(result){
+        if(cate === "pull"){
+          this.setState({
+            pullBranch:result.data.branches
+          })
+        }else{
+          this.setState({
+            mergeBranch:result.data.branches
+          })
+        }
+      }
+    }).catch(error=>{})
+  }
+
   render() {
     const {
       data,
@@ -380,6 +402,7 @@ class CreateMerge extends Component {
                     className="merge-flex1 flex1 matchwidth"
                     dropdownMatchSelectWidth={false}
                     dropdownClassName="overlihide"
+                    onSearch={(e)=>this.changePullValue(e,"pull")}
                   >
                     {this.renderBrances(pullBranches)}
                   </Select>
@@ -408,6 +431,7 @@ class CreateMerge extends Component {
                       className="merge-flex1 flex1 matchwidth"
                       dropdownMatchSelectWidth={false}
                       dropdownClassName="overlihide"
+                      onSearch={(e)=>this.changePullValue(e,"merge")}
                     >
                       {this.renderBrances(mergeBranches)}
                     </Select>
diff --git a/src/forge/Merge/merge.css b/src/forge/Merge/merge.css
index 0ac43c7dd..0fc5effb9 100644
--- a/src/forge/Merge/merge.css
+++ b/src/forge/Merge/merge.css
@@ -226,4 +226,7 @@ form .ant-cascader-picker, form .ant-select {
  /* 距离底部加大 @列表被遮挡 */
  .updateMerge{
    margin: 30px auto 60px;
+ }
+ .searchIcon .ant-select-arrow{
+   margin-top:-9px
  }
\ No newline at end of file
diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js
index c6de96388..f9ab0f3b2 100644
--- a/src/forge/Merge/merge_form.js
+++ b/src/forge/Merge/merge_form.js
@@ -315,7 +315,16 @@ class MergeForm extends Component {
                     {getFieldDecorator("assigned_to_id", {
                       initialValue: assigned_to_id,
                     })(
-                      <Select placeholder="未选择审查人员" showSearch>
+                      <Select 
+                        placeholder="未选择审查人员" 
+                        showSearch
+                        className="searchIcon"
+                        suffixIcon={<i className="iconfont icon-sousuo1"></i>}
+                        optionFilterProp="children"
+                        filterOption={(input, option) =>
+                          option.props.value && option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                        }
+                      >
                         <Option key={0} value={""}>未选择审查人员</Option>
                         {this.renderSelect(members)}
                       </Select>
@@ -330,6 +339,12 @@ class MergeForm extends Component {
                           issue_versions && issue_versions.length > 0? "未选择里程碑": "请添加里程碑"
                         }
                         showSearch
+                        className="searchIcon"
+                        suffixIcon={<i className="iconfont icon-sousuo1"></i>}
+                        optionFilterProp="children"
+                        filterOption={(input, option) =>
+                          option.props.value && option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                        }
                       >
                         <Option key={0} value={""}>{issue_versions && issue_versions.length > 0? "未选择里程碑": "请添加里程碑"}</Option>
                         {this.renderSelect(issue_versions)}
@@ -345,6 +360,12 @@ class MergeForm extends Component {
                           issue_tags && issue_tags.length > 0 ? "未选择标记" : "请在仓库设置里添加标记"
                         }
                         showSearch
+                        className="searchIcon"
+                        suffixIcon={<i className="iconfont icon-sousuo1"></i>}
+                        optionFilterProp="children"
+                        filterOption={(input, option) =>
+                          option.props.value && option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                        }
                       >
                         <Option key={0} value={""}>{issue_tags && issue_tags.length > 0 ? "未选择标记" : "请在仓库设置里添加标记"}</Option>
                         {this.renderSelect(issue_tags)}
diff --git a/src/forge/Order/order.css b/src/forge/Order/order.css
index 40adc855b..f763903fc 100644
--- a/src/forge/Order/order.css
+++ b/src/forge/Order/order.css
@@ -710,4 +710,8 @@ a.issue-type-button.active:hover {
 .boder-4{border-radius: 4px;}
 .pbt20{padding: 20px 0;}
 .inline-block{display: inline-block;}
-.pd10{padding: 10px;}
\ No newline at end of file
+.pd10{padding: 10px;}
+
+.searchIcon .ant-select-arrow{
+  margin-top:-9px
+}
\ No newline at end of file
diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js
index e3a2eb912..c6502cb9f 100644
--- a/src/forge/Order/order_form.js
+++ b/src/forge/Order/order_form.js
@@ -437,7 +437,17 @@ class order_form extends Component {
               <div className="pd20 background-f issue-form-right">
                 <Form.Item label="指派成员">
                   {getFieldDecorator("assigned_to_id", {rules: []})(
-                    <Select>
+                    <Select 
+                      showSearch
+                      className="searchIcon"
+                      showArrow={true}
+                      suffixIcon={<i className="iconfont icon-sousuo1"></i>}
+                      optionFilterProp="children"
+                      filterOption={(input, option) =>
+                        option.props.children[1] && option.props.children[1].toLowerCase().indexOf(input.toLowerCase()) >= 0
+                      }
+                      placeholder="搜索成员"
+                    >
                       <Option value={""}>未指派成员</Option>
                       {this.renderSelect(
                         issue_chosen && issue_chosen.assign_user
@@ -485,7 +495,16 @@ class order_form extends Component {
 
                 <Form.Item label="里程碑">
                   {getFieldDecorator("fixed_version_id", {rules: []})(
-                    <Select>
+                    <Select
+                      showSearch
+                      className="searchIcon"
+                      showArrow={true}
+                      suffixIcon={<i className="iconfont icon-sousuo1"></i>}
+                      optionFilterProp="children"
+                      filterOption={(input, option) =>
+                        option.props.children[1] && option.props.children[1].toLowerCase().indexOf(input.toLowerCase()) >= 0
+                      }
+                    >
                       <Option value={""}>
                         {issue_chosen && issue_chosen.issue_version.length > 0
                           ? "未选择里程碑"
@@ -499,7 +518,16 @@ class order_form extends Component {
                 </Form.Item>
                 <Form.Item label="标记">
                   {getFieldDecorator("issue_tag_ids", {rules: []})(
-                    <Select>
+                    <Select
+                      showSearch
+                      className="searchIcon"
+                      showArrow={true}
+                      suffixIcon={<i className="iconfont icon-sousuo1"></i>}
+                      optionFilterProp="children"
+                      filterOption={(input, option) =>
+                        option.props.children[1] && option.props.children[1].toLowerCase().indexOf(input.toLowerCase()) >= 0
+                      }
+                    >
                       <Option value={""}>
                         {issue_chosen && issue_chosen.issue_tag.length > 0
                           ? "未选择标记"
@@ -537,7 +565,16 @@ class order_form extends Component {
                   {getFieldDecorator("branch_name", {
                     rules: []
                   })(
-                    <Select>
+                    <Select
+                      showSearch
+                      className="searchIcon"
+                      showArrow={true}
+                      suffixIcon={<i className="iconfont icon-sousuo1"></i>}
+                      optionFilterProp="children"
+                      filterOption={(input, option) =>
+                        option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                      }
+                    >
                       <Option value={""}>分支未指定</Option>
                       {branches && branches.length > 0 && branches.map((item, key) => {
                         return (