From 56bd21b09b66c6b2851fc75dec1129fb419eed78 Mon Sep 17 00:00:00 2001
From: vapao <live1989@foxmail.com>
Date: Mon, 29 Jun 2020 23:37:04 +0800
Subject: [PATCH] =?UTF-8?q?F=20=E4=BF=AE=E5=A4=8D=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=9C=A8=E9=A1=B5=E9=9D=A2=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E5=90=8E=E6=9C=AA=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spug_web/src/pages/alarm/alarm/index.js        |  2 +-
 spug_web/src/pages/alarm/contact/index.js      |  2 +-
 spug_web/src/pages/alarm/group/index.js        |  2 +-
 spug_web/src/pages/config/app/index.js         |  2 +-
 spug_web/src/pages/config/environment/index.js |  2 +-
 spug_web/src/pages/config/service/index.js     |  2 +-
 spug_web/src/pages/config/setting/index.js     |  2 +-
 spug_web/src/pages/deploy/app/index.js         |  4 ++--
 spug_web/src/pages/deploy/request/index.js     | 15 ++++++++++-----
 spug_web/src/pages/exec/template/index.js      |  4 ++--
 spug_web/src/pages/monitor/index.js            |  6 +++---
 spug_web/src/pages/schedule/index.js           |  6 +++---
 spug_web/src/pages/system/account/index.js     |  9 +++++----
 spug_web/src/pages/system/role/index.js        |  2 +-
 14 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/spug_web/src/pages/alarm/alarm/index.js b/spug_web/src/pages/alarm/alarm/index.js
index 7046a4c..dbc031b 100644
--- a/spug_web/src/pages/alarm/alarm/index.js
+++ b/spug_web/src/pages/alarm/alarm/index.js
@@ -15,7 +15,7 @@ export default observer(function () {
     <AuthCard auth="alarm.alarm.view">
       <SearchForm>
         <SearchForm.Item span={8} title="任务名称">
-          <Input allowClear onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
+          <Input allowClear value={store.f_name} onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
         </SearchForm.Item>
         <SearchForm.Item span={8}>
           <Button type="primary" icon="sync" onClick={store.fetchRecords}>刷新</Button>
diff --git a/spug_web/src/pages/alarm/contact/index.js b/spug_web/src/pages/alarm/contact/index.js
index 875da0a..d139189 100644
--- a/spug_web/src/pages/alarm/contact/index.js
+++ b/spug_web/src/pages/alarm/contact/index.js
@@ -15,7 +15,7 @@ export default observer(function () {
     <AuthCard auth="alarm.contact.view">
       <SearchForm>
         <SearchForm.Item span={8} title="姓名">
-          <Input allowClear onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
+          <Input allowClear value={store.f_name} onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
         </SearchForm.Item>
         <SearchForm.Item span={8}>
           <Button type="primary" icon="sync" onClick={store.fetchRecords}>刷新</Button>
diff --git a/spug_web/src/pages/alarm/group/index.js b/spug_web/src/pages/alarm/group/index.js
index 4edb07b..31cdc84 100644
--- a/spug_web/src/pages/alarm/group/index.js
+++ b/spug_web/src/pages/alarm/group/index.js
@@ -15,7 +15,7 @@ export default observer(function () {
     <AuthCard auth="alarm.group.view">
       <SearchForm>
         <SearchForm.Item span={8} title="组名称">
-          <Input allowClear onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
+          <Input allowClear value={store.f_name} onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
         </SearchForm.Item>
         <SearchForm.Item span={8}>
           <Button type="primary" icon="sync" onClick={store.fetchRecords}>刷新</Button>
diff --git a/spug_web/src/pages/config/app/index.js b/spug_web/src/pages/config/app/index.js
index 8f4e29e..94d3722 100644
--- a/spug_web/src/pages/config/app/index.js
+++ b/spug_web/src/pages/config/app/index.js
@@ -17,7 +17,7 @@ export default observer(function () {
     <AuthCard auth="config.app.view">
       <SearchForm>
         <SearchForm.Item span={8} title="应用名称">
-          <Input allowClear onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
+          <Input allowClear value={store.f_name} onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
         </SearchForm.Item>
         <SearchForm.Item span={8}>
           <Button type="primary" icon="sync" onClick={store.fetchRecords}>刷新</Button>
diff --git a/spug_web/src/pages/config/environment/index.js b/spug_web/src/pages/config/environment/index.js
index c39cd37..a8b2aa6 100644
--- a/spug_web/src/pages/config/environment/index.js
+++ b/spug_web/src/pages/config/environment/index.js
@@ -15,7 +15,7 @@ export default observer(function () {
     <AuthCard auth="config.env.view">
       <SearchForm>
         <SearchForm.Item span={8} title="环境名称">
-          <Input allowClear onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
+          <Input allowClear value={store.f_name} onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
         </SearchForm.Item>
         <SearchForm.Item span={8}>
           <Button type="primary" icon="sync" onClick={store.fetchRecords}>刷新</Button>
diff --git a/spug_web/src/pages/config/service/index.js b/spug_web/src/pages/config/service/index.js
index b051cd9..cdaf7eb 100644
--- a/spug_web/src/pages/config/service/index.js
+++ b/spug_web/src/pages/config/service/index.js
@@ -15,7 +15,7 @@ export default observer(function () {
     <AuthCard auth="config.src.view">
       <SearchForm>
         <SearchForm.Item span={8} title="服务名称">
-          <Input allowClear onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
+          <Input allowClear value={store.f_name} onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
         </SearchForm.Item>
         <SearchForm.Item span={8}>
           <Button type="primary" icon="sync" onClick={store.fetchRecords}>刷新</Button>
diff --git a/spug_web/src/pages/config/setting/index.js b/spug_web/src/pages/config/setting/index.js
index 966d8cf..7d64c68 100644
--- a/spug_web/src/pages/config/setting/index.js
+++ b/spug_web/src/pages/config/setting/index.js
@@ -90,7 +90,7 @@ class Index extends React.Component {
               </Select>
             </SearchForm.Item>
             <SearchForm.Item span={7} title="Key">
-              <Input allowClear onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
+              <Input allowClear value={store.f_name} onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
             </SearchForm.Item>
             <SearchForm.Item span={3}>
               <Button type="primary" icon="sync" onClick={this.handleRefresh}>刷新</Button>
diff --git a/spug_web/src/pages/deploy/app/index.js b/spug_web/src/pages/deploy/app/index.js
index 1c32758..cdfa06d 100644
--- a/spug_web/src/pages/deploy/app/index.js
+++ b/spug_web/src/pages/deploy/app/index.js
@@ -19,10 +19,10 @@ export default observer(function () {
     <AuthCard auth="deploy.app.view">
       <SearchForm>
         <SearchForm.Item span={6} title="应用名称">
-          <Input allowClear onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
+          <Input allowClear value={store.f_name} onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
         </SearchForm.Item>
         <SearchForm.Item span={6} title="描述信息">
-          <Input allowClear onChange={e => store.f_desc = e.target.value} placeholder="请输入"/>
+          <Input allowClear value={store.f_desc} onChange={e => store.f_desc = e.target.value} placeholder="请输入"/>
         </SearchForm.Item>
         <SearchForm.Item span={8}>
           <Button type="primary" icon="sync" onClick={store.fetchRecords}>刷新</Button>
diff --git a/spug_web/src/pages/deploy/request/index.js b/spug_web/src/pages/deploy/request/index.js
index 7ebed2b..5e121ff 100644
--- a/spug_web/src/pages/deploy/request/index.js
+++ b/spug_web/src/pages/deploy/request/index.js
@@ -16,6 +16,7 @@ import http from 'libs/http';
 import envStore from 'pages/config/environment/store';
 import appStore from 'pages/config/app/store'
 import store from './store';
+import moment from 'moment';
 
 @observer
 class Index extends React.Component {
@@ -43,10 +44,12 @@ class Index extends React.Component {
       content: (
         <Form>
           <Form.Item label="截止日期" help={<div>将删除截止日期<span style={{color: 'red'}}>之前</span>的所有发布申请记录。</div>}>
-            <DatePicker style={{width: 200}} placeholder="请输入" onChange={val => this.setState({expire: val.format('YYYY-MM-DD')})}/>
+            <DatePicker style={{width: 200}} placeholder="请输入"
+                        onChange={val => this.setState({expire: val.format('YYYY-MM-DD')})}/>
           </Form.Item>
           <Form.Item label="保留记录" help="每个应用每个环境仅保留最新的N条发布申请，优先级高于截止日期">
-            <Input allowClear style={{width: 200}} placeholder="请输入保留个数" onChange={e => this.setState({count: e.target.value})} />
+            <Input allowClear style={{width: 200}} placeholder="请输入保留个数"
+                   onChange={e => this.setState({count: e.target.value})}/>
           </Form.Item>
         </Form>
       ),
@@ -66,21 +69,23 @@ class Index extends React.Component {
       <AuthCard auth="deploy.request.view">
         <SearchForm>
           <SearchForm.Item span={6} title="发布环境">
-            <Select allowClear onChange={v => store.f_env_id = v} placeholder="请选择">
+            <Select allowClear value={store.f_env_id} onChange={v => store.f_env_id = v} placeholder="请选择">
               {envStore.records.map(item => (
                 <Select.Option key={item.id} value={item.id}>{item.name}</Select.Option>
               ))}
             </Select>
           </SearchForm.Item>
           <SearchForm.Item span={6} title="应用名称">
-            <Select allowClear onChange={v => store.f_app_id = v} placeholder="请选择">
+            <Select allowClear value={store.f_app_id} onChange={v => store.f_app_id = v} placeholder="请选择">
               {appStore.records.map(item => (
                 <Select.Option key={item.id} value={item.id}>{item.name}</Select.Option>
               ))}
             </Select>
           </SearchForm.Item>
           <SearchForm.Item span={8} title="申请时间">
-            <DatePicker.RangePicker onChange={store.updateDate}/>
+            <DatePicker.RangePicker
+              value={store.f_s_date ? [moment(store.f_s_date), moment(store.f_e_date)] : undefined}
+              onChange={store.updateDate}/>
           </SearchForm.Item>
           <SearchForm.Item span={4} style={{textAlign: 'right'}}>
             <Button type="primary" icon="sync" onClick={store.fetchRecords}>刷新</Button>
diff --git a/spug_web/src/pages/exec/template/index.js b/spug_web/src/pages/exec/template/index.js
index abe6338..4ea9598 100644
--- a/spug_web/src/pages/exec/template/index.js
+++ b/spug_web/src/pages/exec/template/index.js
@@ -15,14 +15,14 @@ export default observer(function () {
     <AuthCard auth="exec.template.view">
       <SearchForm>
         <SearchForm.Item span={8} title="模板类型">
-          <Select allowClear onChange={v => store.f_type = v} placeholder="请选择">
+          <Select allowClear value={store.f_type} onChange={v => store.f_type = v} placeholder="请选择">
             {store.types.map(item => (
               <Select.Option value={item} key={item}>{item}</Select.Option>
             ))}
           </Select>
         </SearchForm.Item>
         <SearchForm.Item span={8} title="模版名称">
-          <Input allowClear onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
+          <Input allowClear value={store.f_name} onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
         </SearchForm.Item>
         <SearchForm.Item span={8}>
           <Button type="primary" icon="sync" onClick={store.fetchRecords}>刷新</Button>
diff --git a/spug_web/src/pages/monitor/index.js b/spug_web/src/pages/monitor/index.js
index ff98d32..214f094 100644
--- a/spug_web/src/pages/monitor/index.js
+++ b/spug_web/src/pages/monitor/index.js
@@ -15,15 +15,15 @@ export default observer(function () {
     <AuthCard auth="monitor.monitor.view">
       <SearchForm>
         <SearchForm.Item span={6} title="任务名称">
-          <Input allowClear onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
+          <Input allowClear value={store.f_name} onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
         </SearchForm.Item>
         <SearchForm.Item span={6} title="任务类型">
-          <Select allowClear onChange={v => store.f_type = v} placeholder="请选择">
+          <Select allowClear value={store.f_type} onChange={v => store.f_type = v} placeholder="请选择">
             {store.types.map(item => <Select.Option key={item} value={item}>{item}</Select.Option>)}
           </Select>
         </SearchForm.Item>
         <SearchForm.Item span={6} title="任务状态">
-          <Select allowClear onChange={v => store.f_status = v} placeholder="请选择">
+          <Select allowClear value={store.f_status} onChange={v => store.f_status = v} placeholder="请选择">
             <Select.Option value={-3}>未激活</Select.Option>
             <Select.Option value={-2}>已激活</Select.Option>
             <Select.Option value={-1}>待检测</Select.Option>
diff --git a/spug_web/src/pages/schedule/index.js b/spug_web/src/pages/schedule/index.js
index 3d9169a..356b666 100644
--- a/spug_web/src/pages/schedule/index.js
+++ b/spug_web/src/pages/schedule/index.js
@@ -15,7 +15,7 @@ export default observer(function () {
     <AuthCard auth="schedule.schedule.view">
       <SearchForm>
         <SearchForm.Item span={6} title="状态">
-          <Select allowClear onChange={v => store.f_status = v} placeholder="请选择">
+          <Select allowClear value={store.f_status} onChange={v => store.f_status = v} placeholder="请选择">
             <Select.Option value={-3}>未激活</Select.Option>
             <Select.Option value={-2}>已激活</Select.Option>
             <Select.Option value={-1}>待调度</Select.Option>
@@ -25,14 +25,14 @@ export default observer(function () {
           </Select>
         </SearchForm.Item>
         <SearchForm.Item span={6} title="类型">
-          <Select allowClear onChange={v => store.f_type = v} placeholder="请选择">
+          <Select allowClear value={store.f_type} onChange={v => store.f_type = v} placeholder="请选择">
             {store.types.map(item => (
               <Select.Option value={item} key={item}>{item}</Select.Option>
             ))}
           </Select>
         </SearchForm.Item>
         <SearchForm.Item span={6} title="名称">
-          <Input allowClear onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
+          <Input allowClear value={store.f_name} onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
         </SearchForm.Item>
         <SearchForm.Item span={6}>
           <Button type="primary" icon="sync" onClick={store.fetchRecords}>刷新</Button>
diff --git a/spug_web/src/pages/system/account/index.js b/spug_web/src/pages/system/account/index.js
index d16ee22..40ae70a 100644
--- a/spug_web/src/pages/system/account/index.js
+++ b/spug_web/src/pages/system/account/index.js
@@ -4,20 +4,21 @@
  * Released under the AGPL-3.0 License.
  */
 import React from 'react';
+import { observer } from 'mobx-react';
 import { Input, Select, Button } from 'antd';
 import { SearchForm, AuthCard } from 'components';
 import ComTable from './Table';
 import store from './store';
 
-export default function () {
+export default observer(function () {
   return (
     <AuthCard auth="system.account.view">
       <SearchForm>
         <SearchForm.Item span={8} title="账户名称">
-          <Input allowClear onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
+          <Input allowClear value={store.f_name} onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
         </SearchForm.Item>
         <SearchForm.Item span={8} title="账户状态">
-          <Select allowClear onChange={v => store.f_status = v} placeholder="请选择">
+          <Select allowClear value={store.f_status} onChange={v => store.f_status = v} placeholder="请选择">
             <Select.Option value="true">正常</Select.Option>
             <Select.Option value="false">禁用</Select.Option>
           </Select>
@@ -32,4 +33,4 @@ export default function () {
       <ComTable/>
     </AuthCard>
   )
-}
+})
diff --git a/spug_web/src/pages/system/role/index.js b/spug_web/src/pages/system/role/index.js
index 0f14ff1..fcd90ff 100644
--- a/spug_web/src/pages/system/role/index.js
+++ b/spug_web/src/pages/system/role/index.js
@@ -19,7 +19,7 @@ export default observer(function () {
     <AuthCard auth="system.role.view">
       <SearchForm>
         <SearchForm.Item span={8} title="角色名称">
-          <Input allowClear onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
+          <Input allowClear value={store.f_name} onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
         </SearchForm.Item>
         <SearchForm.Item span={8}>
           <Button type="primary" icon="sync" onClick={store.fetchRecords}>刷新</Button>