[incubator-apisix-dashboard] branch master updated: combine import (#348)

[juzhiyuan]

This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-dashboard.git


The following commit(s) were added to refs/heads/master by this push:
     new b1660a2  combine import (#348)
b1660a2 is described below

commit b1660a21ddd11d4d5775b5e7d950eadc240dd7a8
Author: TikWind <65604564+tikw...@users.noreply.github.com>
AuthorDate: Fri Jul 31 09:42:09 2020 +0800

    combine import (#348)
---
 src/pages/Consumer/Create.tsx | 3 +--
 src/pages/Consumer/List.tsx   | 3 +--
 src/pages/Route/List.tsx      | 3 +--
 src/pages/SSL/Create.tsx      | 3 +--
 src/pages/Upstream/Create.tsx | 3 +--
 src/pages/Upstream/List.tsx   | 3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/pages/Consumer/Create.tsx b/src/pages/Consumer/Create.tsx
index 544b324..aef6311 100644
--- a/src/pages/Consumer/Create.tsx
+++ b/src/pages/Consumer/Create.tsx
@@ -1,8 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { PageContainer } from '@ant-design/pro-layout';
 import { Card, Steps, notification, Form } from 'antd';
-import { history } from 'umi';
-import { useIntl } from 'umi';
+import { history, useIntl } from 'umi';
 
 import ActionBar from '@/components/ActionBar';
 import PluginPage from '@/components/PluginPage';
diff --git a/src/pages/Consumer/List.tsx b/src/pages/Consumer/List.tsx
index 27c508f..1985f21 100644
--- a/src/pages/Consumer/List.tsx
+++ b/src/pages/Consumer/List.tsx
@@ -5,8 +5,7 @@ import { PlusOutlined } from '@ant-design/icons';
 import { Popconfirm, Button, notification, Input } from 'antd';
 import moment from 'moment';
 
-import { history } from 'umi';
-import { useIntl } from 'umi';
+import { history, useIntl } from 'umi';
 import { fetchList, remove } from './service';
 
 const Page: React.FC = () => {
diff --git a/src/pages/Route/List.tsx b/src/pages/Route/List.tsx
index ed19a40..3fecff6 100644
--- a/src/pages/Route/List.tsx
+++ b/src/pages/Route/List.tsx
@@ -4,8 +4,7 @@ import ProTable, { ProColumns, ActionType } from 
'@ant-design/pro-table';
 import { Button, Popconfirm, notification, Tag, Input } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import moment from 'moment';
-import { history } from 'umi';
-import { useIntl } from 'umi';
+import { history, useIntl } from 'umi';
 
 import { fetchList, remove } from './service';
 
diff --git a/src/pages/SSL/Create.tsx b/src/pages/SSL/Create.tsx
index 27e26ae..7b31f32 100644
--- a/src/pages/SSL/Create.tsx
+++ b/src/pages/SSL/Create.tsx
@@ -2,10 +2,9 @@ import React, { useState } from 'react';
 import { Card, Steps, notification, Form } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import moment from 'moment';
-import { useIntl } from 'umi';
+import { history, useIntl } from 'umi';
 
 import ActionBar from '@/components/ActionBar';
-import { history } from 'umi';
 import Step1 from '@/pages/SSL/components/Step1';
 import Step2 from '@/pages/SSL/components/Step2';
 import { verifyKeyPaire, create, update } from '@/pages/SSL/service';
diff --git a/src/pages/Upstream/Create.tsx b/src/pages/Upstream/Create.tsx
index 53f8435..80c11bb 100644
--- a/src/pages/Upstream/Create.tsx
+++ b/src/pages/Upstream/Create.tsx
@@ -3,8 +3,7 @@ import { PageContainer } from '@ant-design/pro-layout';
 import { Card, Steps, notification, Form } from 'antd';
 
 import ActionBar from '@/components/ActionBar';
-import { history } from 'umi';
-import { useIntl } from 'umi';
+import { history, useIntl } from 'umi';
 
 import Step1 from './components/Step1';
 import Preview from './components/Preview';
diff --git a/src/pages/Upstream/List.tsx b/src/pages/Upstream/List.tsx
index 44878cb..8f6bb5e 100644
--- a/src/pages/Upstream/List.tsx
+++ b/src/pages/Upstream/List.tsx
@@ -3,8 +3,7 @@ import { PageContainer } from '@ant-design/pro-layout';
 import ProTable, { ProColumns, ActionType } from '@ant-design/pro-table';
 import { PlusOutlined } from '@ant-design/icons';
 import { Popconfirm, Button, notification, Input } from 'antd';
-import { history } from 'umi';
-import { useIntl } from 'umi';
+import { history, useIntl } from 'umi';
 import moment from 'moment';
 
 import { fetchList, remove } from './service';