From 62f43a7b37c508ff5687edbebe5f1405834c0931 Mon Sep 17 00:00:00 2001
From: vapao <live1989@foxmail.com>
Date: Fri, 27 Nov 2020 10:05:42 +0800
Subject: [PATCH] style migrate v3

---
 spug_web/src/pages/config/app/index.js        | 10 +--
 .../src/pages/config/environment/index.js     |  8 +-
 spug_web/src/pages/config/service/Form.js     | 79 ++++++++-----------
 spug_web/src/pages/config/service/Table.js    | 70 ++++++++--------
 spug_web/src/pages/config/service/index.js    | 23 +++---
 spug_web/src/pages/config/service/store.js    |  8 +-
 6 files changed, 95 insertions(+), 103 deletions(-)

diff --git a/spug_web/src/pages/config/app/index.js b/spug_web/src/pages/config/app/index.js
index f1d0790..34b0141 100644
--- a/spug_web/src/pages/config/app/index.js
+++ b/spug_web/src/pages/config/app/index.js
@@ -16,10 +16,10 @@ export default observer(function () {
   return (
     <AuthDiv auth="config.app.view">
       <Breadcrumb>
-          <Breadcrumb.Item>首页</Breadcrumb.Item>
-          <Breadcrumb.Item>配置中心</Breadcrumb.Item>
-          <Breadcrumb.Item>应用配置</Breadcrumb.Item>
-        </Breadcrumb>
+        <Breadcrumb.Item>首页</Breadcrumb.Item>
+        <Breadcrumb.Item>配置中心</Breadcrumb.Item>
+        <Breadcrumb.Item>应用配置</Breadcrumb.Item>
+      </Breadcrumb>
       <SearchForm>
         <SearchForm.Item span={8} title="应用名称">
           <Input allowClear value={store.f_name} onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
@@ -27,7 +27,7 @@ export default observer(function () {
       </SearchForm>
       <ComTable/>
       {store.formVisible && <ComForm/>}
-      {store.relVisible && <Rel />}
+      {store.relVisible && <Rel/>}
     </AuthDiv>
   )
 })
diff --git a/spug_web/src/pages/config/environment/index.js b/spug_web/src/pages/config/environment/index.js
index 9fba7c7..cb81641 100644
--- a/spug_web/src/pages/config/environment/index.js
+++ b/spug_web/src/pages/config/environment/index.js
@@ -15,10 +15,10 @@ export default observer(function () {
   return (
     <AuthDiv auth="config.env.view">
       <Breadcrumb>
-          <Breadcrumb.Item>首页</Breadcrumb.Item>
-          <Breadcrumb.Item>配置中心</Breadcrumb.Item>
-          <Breadcrumb.Item>环境管理</Breadcrumb.Item>
-        </Breadcrumb>
+        <Breadcrumb.Item>首页</Breadcrumb.Item>
+        <Breadcrumb.Item>配置中心</Breadcrumb.Item>
+        <Breadcrumb.Item>环境管理</Breadcrumb.Item>
+      </Breadcrumb>
       <SearchForm>
         <SearchForm.Item span={8} title="环境名称">
           <Input allowClear value={store.f_name} onChange={e => store.f_name = e.target.value} placeholder="请输入"/>
diff --git a/spug_web/src/pages/config/service/Form.js b/spug_web/src/pages/config/service/Form.js
index 0069130..be6f479 100644
--- a/spug_web/src/pages/config/service/Form.js
+++ b/spug_web/src/pages/config/service/Form.js
@@ -3,65 +3,48 @@
  * Copyright (c) <spug.dev@gmail.com>
  * Released under the AGPL-3.0 License.
  */
-import React from 'react';
+import React, { useState } from 'react';
 import { observer } from 'mobx-react';
 import { Modal, Form, Input, message } from 'antd';
 import http from 'libs/http';
 import store from './store';
 
-@observer
-class ComForm extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      loading: false,
-    }
-  }
+export default observer(function () {
+  const [form] = Form.useForm();
+  const [loading, setLoading] = useState(false);
 
-  handleSubmit = () => {
-    this.setState({loading: true});
-    const formData = this.props.form.getFieldsValue();
+  function handleSubmit() {
+    setLoading(true);
+    const formData = form.getFieldsValue();
     formData['id'] = store.record.id;
     http.post('/api/config/service/', formData)
       .then(res => {
         message.success('操作成功');
         store.formVisible = false;
         store.fetchRecords()
-      }, () => this.setState({loading: false}))
-  };
-
-  render() {
-    const info = store.record;
-    const {getFieldDecorator} = this.props.form;
-    return (
-      <Modal
-        visible
-        width={800}
-        maskClosable={false}
-        title={store.record.id ? '编辑服务' : '新建服务'}
-        onCancel={() => store.formVisible = false}
-        confirmLoading={this.state.loading}
-        onOk={this.handleSubmit}>
-        <Form labelCol={{span: 6}} wrapperCol={{span: 14}}>
-          <Form.Item required label="服务名称">
-            {getFieldDecorator('name', {initialValue: info['name']})(
-              <Input placeholder="请输入服务名称，例如：订单数据库"/>
-            )}
-          </Form.Item>
-          <Form.Item required label="唯一标识符">
-            {getFieldDecorator('key', {initialValue: info['key']})(
-              <Input placeholder="请输入唯一标识符，例如：mysql_order"/>
-            )}
-          </Form.Item>
-          <Form.Item label="备注信息">
-            {getFieldDecorator('desc', {initialValue: info['desc']})(
-              <Input.TextArea placeholder="请输入备注信息"/>
-            )}
-          </Form.Item>
-        </Form>
-      </Modal>
-    )
+      }, () => setLoading(false))
   }
-}
 
-export default Form.create()(ComForm)
+  return (
+    <Modal
+      visible
+      width={800}
+      maskClosable={false}
+      title={store.record.id ? '编辑服务' : '新建服务'}
+      onCancel={() => store.formVisible = false}
+      confirmLoading={loading}
+      onOk={handleSubmit}>
+      <Form form={form} initialValues={store.record} labelCol={{span: 6}} wrapperCol={{span: 14}}>
+        <Form.Item required name="name" label="服务名称">
+          <Input placeholder="请输入服务名称，例如：订单数据库"/>
+        </Form.Item>
+        <Form.Item required name="key" label="唯一标识符">
+          <Input placeholder="请输入唯一标识符，例如：mysql_order"/>
+        </Form.Item>
+        <Form.Item name="desc" label="备注信息">
+          <Input.TextArea placeholder="请输入备注信息"/>
+        </Form.Item>
+      </Form>
+    </Modal>
+  )
+})
\ No newline at end of file
diff --git a/spug_web/src/pages/config/service/Table.js b/spug_web/src/pages/config/service/Table.js
index df8df67..db1fcf3 100644
--- a/spug_web/src/pages/config/service/Table.js
+++ b/spug_web/src/pages/config/service/Table.js
@@ -6,10 +6,10 @@
 import React from 'react';
 import { observer } from 'mobx-react';
 import { Table, Modal, message } from 'antd';
-import ComForm from './Form';
+import { PlusOutlined } from '@ant-design/icons';
+import { Action, TableCard, AuthButton } from 'components';
 import { http, hasPermission } from 'libs';
 import store from './store';
-import { Action } from "components";
 
 @observer
 class ComTable extends React.Component {
@@ -32,39 +32,41 @@ class ComTable extends React.Component {
   };
 
   render() {
-    let data = store.records;
-    if (store.f_name) {
-      data = data.filter(item => item['name'].toLowerCase().includes(store.f_name.toLowerCase()))
-    }
     return (
-      <React.Fragment>
-        <Table
-          rowKey="id"
-          loading={store.isFetching}
-          dataSource={data}
-          pagination={{
-            showSizeChanger: true,
-            showLessItems: true,
-            hideOnSinglePage: true,
-            showTotal: total => `共 ${total} 条`,
-            pageSizeOptions: ['10', '20', '50', '100']
-          }}>
-          <Table.Column title="序号" key="series" render={(_, __, index) => index + 1}/>
-          <Table.Column title="服务名称" dataIndex="name"/>
-          <Table.Column title="标识符" dataIndex="key"/>
-          <Table.Column ellipsis title="描述信息" dataIndex="desc"/>
-          {hasPermission('config.src.edit|config.src.del|config.src.view_config') && (
-            <Table.Column title="操作" render={info => (
-              <Action>
-                <Action.Button auth="config.src.edit" onClick={() => store.showForm(info)}>编辑</Action.Button>
-                <Action.Button auth="config.src.del" onClick={() => this.handleDelete(info)}>删除</Action.Button>
-                <Action.Link auth="config.src.view_config" to={`/config/setting/src/${info.id}`}>配置</Action.Link>
-              </Action>
-            )}/>
-          )}
-        </Table>
-        {store.formVisible && <ComForm/>}
-      </React.Fragment>
+      <TableCard
+        rowKey="id"
+        title="服务列表"
+        loading={store.isFetching}
+        dataSource={store.dataSource}
+        onReload={store.fetchRecords}
+        actions={[
+          <AuthButton
+            auth="config.src.add"
+            type="primary"
+            icon={<PlusOutlined/>}
+            onClick={() => store.showForm()}>新建</AuthButton>
+        ]}
+        pagination={{
+          showSizeChanger: true,
+          showLessItems: true,
+          hideOnSinglePage: true,
+          showTotal: total => `共 ${total} 条`,
+          pageSizeOptions: ['10', '20', '50', '100']
+        }}>
+        <Table.Column title="序号" key="series" render={(_, __, index) => index + 1}/>
+        <Table.Column title="服务名称" dataIndex="name"/>
+        <Table.Column title="标识符" dataIndex="key"/>
+        <Table.Column ellipsis title="描述信息" dataIndex="desc"/>
+        {hasPermission('config.src.edit|config.src.del|config.src.view_config') && (
+          <Table.Column title="操作" render={info => (
+            <Action>
+              <Action.Button auth="config.src.edit" onClick={() => store.showForm(info)}>编辑</Action.Button>
+              <Action.Button auth="config.src.del" onClick={() => this.handleDelete(info)}>删除</Action.Button>
+              <Action.Link auth="config.src.view_config" to={`/config/setting/src/${info.id}`}>配置</Action.Link>
+            </Action>
+          )}/>
+        )}
+      </TableCard>
     )
   }
 }
diff --git a/spug_web/src/pages/config/service/index.js b/spug_web/src/pages/config/service/index.js
index cdaf7eb..5481e79 100644
--- a/spug_web/src/pages/config/service/index.js
+++ b/spug_web/src/pages/config/service/index.js
@@ -5,26 +5,27 @@
  */
 import React from 'react';
 import { observer } from 'mobx-react';
-import { Input, Button } from 'antd';
-import { SearchForm, AuthDiv, AuthCard } from 'components';
+import { Input } from 'antd';
+import { SearchForm, AuthDiv, Breadcrumb } from 'components';
 import ComTable from './Table';
+import ComForm from './Form';
 import store from './store';
 
 export default observer(function () {
   return (
-    <AuthCard auth="config.src.view">
+    <AuthDiv auth="config.src.view">
+      <Breadcrumb>
+        <Breadcrumb.Item>首页</Breadcrumb.Item>
+        <Breadcrumb.Item>配置中心</Breadcrumb.Item>
+        <Breadcrumb.Item>应用配置</Breadcrumb.Item>
+      </Breadcrumb>
       <SearchForm>
         <SearchForm.Item span={8} title="服务名称">
           <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>
-        </SearchForm.Item>
       </SearchForm>
-      <AuthDiv auth="config.src.add" style={{marginBottom: 16}}>
-        <Button type="primary" icon="plus" onClick={() => store.showForm()}>新建</Button>
-      </AuthDiv>
       <ComTable/>
-    </AuthCard>
-  )
+      {store.formVisible && <ComForm/>}
+    </AuthDiv>
+  );
 })
diff --git a/spug_web/src/pages/config/service/store.js b/spug_web/src/pages/config/service/store.js
index 663df31..b0844ae 100644
--- a/spug_web/src/pages/config/service/store.js
+++ b/spug_web/src/pages/config/service/store.js
@@ -3,7 +3,7 @@
  * Copyright (c) <spug.dev@gmail.com>
  * Released under the AGPL-3.0 License.
  */
-import { observable } from "mobx";
+import { observable, computed } from 'mobx';
 import http from 'libs/http';
 
 class Store {
@@ -14,6 +14,12 @@ class Store {
 
   @observable f_name;
 
+  @computed get dataSource() {
+    let records = this.records;
+    if (this.f_name) records = records.filter(x => x.name.toLowerCase().includes(this.f_name.toLowerCase()));
+    return records
+  }
+
   fetchRecords = () => {
     this.isFetching = true;
     return http.get('/api/config/service/')