From 71f6450f36c5d631665740020817030c4e26c0a1 Mon Sep 17 00:00:00 2001
From: vapao <live1989@foxmail.com>
Date: Mon, 25 Jul 2022 09:13:53 +0800
Subject: [PATCH] =?UTF-8?q?F=20=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=94=B3=E8=AF=B7=E6=97=B6Tag=E5=92=8C?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=E7=89=88=E6=9C=AC=E6=97=A0=E6=B3=95=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E7=9A=84=E9=97=AE=E9=A2=98=20#530?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spug_web/src/pages/deploy/request/Ext1Form.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/spug_web/src/pages/deploy/request/Ext1Form.js b/spug_web/src/pages/deploy/request/Ext1Form.js
index 4be9330..5401e63 100644
--- a/spug_web/src/pages/deploy/request/Ext1Form.js
+++ b/spug_web/src/pages/deploy/request/Ext1Form.js
@@ -8,7 +8,7 @@ import { observer } from 'mobx-react';
 import { Modal, Form, Input, Select, DatePicker, Button, message } from 'antd';
 import { LoadingOutlined, SyncOutlined } from '@ant-design/icons';
 import HostSelector from './HostSelector';
-import { http, history } from 'libs';
+import { http, history, includes } from 'libs';
 import store from './store';
 import lds from 'lodash';
 import moment from 'moment';
@@ -170,12 +170,14 @@ export default observer(function () {
                 placeholder="请稍等"
                 onChange={switchExtra1}
                 notFoundContent={git_type === 'repository' ? <NoVersions/> : undefined}
-                filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}>
+                filterOption={(input, option) => includes(option.content, input)}>
                 {git_type === 'branch' ? (
-                  Object.keys(branches || {}).map(b => <Select.Option key={b} value={b}>{b}</Select.Option>)
+                  Object.keys(branches || {}).map(b => (
+                    <Select.Option key={b} value={b} content={b}>{b}</Select.Option>
+                  ))
                 ) : git_type === 'tag' ? (
                   Object.entries(tags || {}).map(([tag, info]) => (
-                    <Select.Option key={tag} value={tag}>
+                    <Select.Option key={tag} value={tag} content={`${tag} ${info.author} ${info.message}`}>
                       <div style={{display: 'flex', justifyContent: 'space-between'}}>
                         <span style={{
                           width: 200,
@@ -188,7 +190,8 @@ export default observer(function () {
                   ))
                 ) : (
                   repositories.map(item => (
-                    <Select.Option key={item.id} value={item.id} disabled={type === '2' && item.id >= rb_id}>
+                    <Select.Option key={item.id} value={item.id} content={item.version}
+                                   disabled={type === '2' && item.id >= rb_id}>
                       <div style={{display: 'flex', justifyContent: 'space-between'}}>
                         <span>{item.version}</span>
                         <span style={{color: '#999', fontSize: 12}}>构建于 {moment(item.created_at).fromNow()}</span>