From 6da1371d28f83fd9c8ee3c9f149d4b1628c326c8 Mon Sep 17 00:00:00 2001
From: vapao <live1989@foxmail.com>
Date: Fri, 15 May 2020 21:12:02 +0800
Subject: [PATCH] =?UTF-8?q?A=20=E6=96=B0=E5=BB=BA=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E9=80=89=E6=8B=A9=E5=BA=94=E7=94=A8=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/deploy/request/SelectApp.js     | 19 +++++++++++----
 spug_web/src/pages/deploy/request/index.js    | 24 +++++++++----------
 .../src/pages/deploy/request/index.module.css |  3 +++
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/spug_web/src/pages/deploy/request/SelectApp.js b/spug_web/src/pages/deploy/request/SelectApp.js
index 73767ab..ebe51f7 100644
--- a/spug_web/src/pages/deploy/request/SelectApp.js
+++ b/spug_web/src/pages/deploy/request/SelectApp.js
@@ -6,7 +6,7 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
 import { observer } from 'mobx-react';
-import { Modal, Button, Menu, Spin, Icon, Tooltip } from 'antd';
+import { Modal, Button, Menu, Spin, Icon, Input, Tooltip } from 'antd';
 import store from './store';
 import styles from './index.module.css';
 import envStore from 'pages/config/environment/store';
@@ -17,7 +17,8 @@ class SelectApp extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
-      env_id: 0
+      env_id: 0,
+      search: ''
     }
   }
 
@@ -58,7 +59,10 @@ class SelectApp extends React.Component {
 
   render() {
     const {env_id} = this.state;
-    const records = store.deploys.filter(x => x.env_id === Number(env_id));
+    let records = store.deploys.filter(x => x.env_id === Number(env_id));
+    if (this.state.search) {
+      records = records.filter(x => x['app_name'].toLowerCase().includes(this.state.search.toLowerCase()))
+    }
     return (
       <Modal
         visible
@@ -83,7 +87,14 @@ class SelectApp extends React.Component {
 
           <div className={styles.right}>
             <Spin spinning={store.isLoading}>
-              <div className={styles.title}>{lds.get(envStore.idMap, `${env_id}.name`)}</div>
+              <div className={styles.title}>
+                <div>{lds.get(envStore.idMap, `${env_id}.name`)}</div>
+                <Input.Search
+                  allowClear
+                  style={{width: 200}}
+                  placeholder="请输入快速搜应用"
+                  onChange={e => this.setState({search: e.target.value})}/>
+              </div>
               {records.map(item => (
                 <Tooltip key={item.id} title={store.refs[item.id] ? item['app_name'] : null}>
                   <Button type="primary" className={styles.appBlock} onClick={() => this.handleClick(item)}>
diff --git a/spug_web/src/pages/deploy/request/index.js b/spug_web/src/pages/deploy/request/index.js
index 6b7ffb7..988b99b 100644
--- a/spug_web/src/pages/deploy/request/index.js
+++ b/spug_web/src/pages/deploy/request/index.js
@@ -6,7 +6,7 @@
 import React from 'react';
 import { observer } from 'mobx-react';
 import { Button, Select, DatePicker, Radio, Row, Col, Modal, Form, message } from 'antd';
-import { SearchForm, AuthButton, AuthCard } from 'components';
+import { SearchForm, AuthFragment, AuthCard } from 'components';
 import SelectApp from './SelectApp';
 import Ext1Form from './Ext1Form';
 import Ext2Form from './Ext2Form';
@@ -91,18 +91,16 @@ class Index extends React.Component {
             </Radio.Group>
           </Col>
           <Col span={8} style={{textAlign: 'right'}}>
-            <AuthButton
-              hide
-              type="primary"
-              icon="delete"
-              auth="deploy.request.del"
-              onClick={this.handleBatchDel} style={{marginRight: 20}}>批量删除</AuthButton>
-            <AuthButton
-              hide
-              type="primary"
-              icon="plus"
-              auth="deploy.request.add"
-              onClick={() => store.addVisible = true}>新建发布申请</AuthButton>
+            <AuthFragment auth="deploy.request.del">
+              <Button type="primary" icon="delete" onClick={this.handleBatchDel}>批量删除</Button>
+            </AuthFragment>
+            <AuthFragment auth="deploy.request.add">
+              <Button
+                type="primary"
+                icon="plus"
+                onClick={() => store.addVisible = true}
+                style={{marginLeft: 20}}>新建发布申请</Button>
+            </AuthFragment>
           </Col>
         </Row>
         <ComTable/>
diff --git a/spug_web/src/pages/deploy/request/index.module.css b/spug_web/src/pages/deploy/request/index.module.css
index 7bc5463..3e47ec9 100644
--- a/spug_web/src/pages/deploy/request/index.module.css
+++ b/spug_web/src/pages/deploy/request/index.module.css
@@ -14,6 +14,9 @@
 }
 
 .title {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
     margin-bottom: 12px;
     color: rgba(0, 0, 0, .85);
     font-weight: 500;