From d67e383c2832c88fff3c10653193247875d2d535 Mon Sep 17 00:00:00 2001
From: GraceWalk <gracewalk1999@163.com>
Date: Wed, 21 Sep 2022 16:21:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=89=8B=E5=8A=A8=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/ConfigManage/index.tsx          | 39 +++++-----
 .../src/pages/OperationLog/index.tsx          | 48 +++++++------
 .../src/pages/UserManage/RoleTabContent.tsx   | 71 ++++++++++---------
 .../src/pages/UserManage/UserTabContent.tsx   | 40 ++++++-----
 .../src/pages/UserManage/index.less           | 10 ---
 5 files changed, 114 insertions(+), 94 deletions(-)

diff --git a/km-console/packages/config-manager-fe/src/pages/ConfigManage/index.tsx b/km-console/packages/config-manager-fe/src/pages/ConfigManage/index.tsx
index 84b5d2f6..762661f9 100644
--- a/km-console/packages/config-manager-fe/src/pages/ConfigManage/index.tsx
+++ b/km-console/packages/config-manager-fe/src/pages/ConfigManage/index.tsx
@@ -15,6 +15,7 @@ import {
   AppContainer,
   Utils,
 } from 'knowdesign';
+import { IconFont } from '@knowdesign/icons';
 import { PlusOutlined } from '@ant-design/icons';
 import moment from 'moment';
 // 引入代码编辑器
@@ -431,22 +432,28 @@ export default () => {
       <TypicalListCard title="配置管理">
         <div className="config-manage-page">
           <div className="operate-bar">
-            <Form form={form} layout="inline" onFinish={() => getConfigList({ page: 1 })}>
-              <Form.Item name="valueGroup">
-                <Select style={{ width: 180 }} placeholder="请选择模块" options={configGroupList} />
-              </Form.Item>
-              <Form.Item name="valueName">
-                <Input style={{ width: 180 }} placeholder="请输入配置键" />
-              </Form.Item>
-              <Form.Item name="memo">
-                <Input style={{ width: 180 }} placeholder="请输入描述" />
-              </Form.Item>
-              <Form.Item>
-                <Button type="primary" ghost htmlType="submit">
-                  查询
-                </Button>
-              </Form.Item>
-            </Form>
+            <div className="left">
+              <div className="refresh-icon" onClick={() => getConfigList()}>
+                <IconFont className="icon" type="icon-shuaxin1" />
+              </div>
+              <Divider type="vertical" style={{ height: 20, top: 0 }} />
+              <Form form={form} layout="inline" onFinish={() => getConfigList({ page: 1 })}>
+                <Form.Item name="valueGroup">
+                  <Select style={{ width: 180 }} placeholder="请选择模块" options={configGroupList} />
+                </Form.Item>
+                <Form.Item name="valueName">
+                  <Input style={{ width: 180 }} placeholder="请输入配置键" />
+                </Form.Item>
+                <Form.Item name="memo">
+                  <Input style={{ width: 180 }} placeholder="请输入描述" />
+                </Form.Item>
+                <Form.Item>
+                  <Button type="primary" ghost htmlType="submit">
+                    查询
+                  </Button>
+                </Form.Item>
+              </Form>
+            </div>
             {global.hasPermission && global.hasPermission(ConfigPermissionMap.CONFIG_ADD) ? (
               <Button
                 type="primary"
diff --git a/km-console/packages/config-manager-fe/src/pages/OperationLog/index.tsx b/km-console/packages/config-manager-fe/src/pages/OperationLog/index.tsx
index 59d71db9..064d89d1 100644
--- a/km-console/packages/config-manager-fe/src/pages/OperationLog/index.tsx
+++ b/km-console/packages/config-manager-fe/src/pages/OperationLog/index.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react';
-import { Button, Form, Input, Select, ProTable, DatePicker, Utils, Tooltip } from 'knowdesign';
+import { Button, Form, Input, Select, ProTable, DatePicker, Utils, Tooltip, Divider } from 'knowdesign';
+import { IconFont } from '@knowdesign/icons';
 import api from 'api';
 import { defaultPagination } from 'constants/common';
 import TypicalListCard from '../../components/TypicalListCard';
@@ -119,25 +120,32 @@ export default () => {
     <>
       <TypicalListCard title="操作记录">
         <div className="operate-bar">
-          <Form form={form} layout="inline" onFinish={() => getData({ page: 1 })}>
-            <Form.Item name="targetType">
-              <Select placeholder="请选择模块" options={configGroupList} style={{ width: 160 }} />
-            </Form.Item>
-            <Form.Item name="target">
-              <Input placeholder="请输入操作对象" />
-            </Form.Item>
-            <Form.Item name="detail">
-              <Input placeholder="请输入操作内容" />
-            </Form.Item>
-            <Form.Item name="time">
-              <RangePicker showTime />
-            </Form.Item>
-            <Form.Item>
-              <Button type="primary" ghost htmlType="submit">
-                查询
-              </Button>
-            </Form.Item>
-          </Form>
+          <div className="left">
+            <div className="refresh-icon" onClick={() => getData()}>
+              <IconFont className="icon" type="icon-shuaxin1" />
+            </div>
+            <Divider type="vertical" style={{ height: 20, top: 0 }} />
+
+            <Form form={form} layout="inline" onFinish={() => getData({ page: 1 })}>
+              <Form.Item name="targetType">
+                <Select placeholder="请选择模块" options={configGroupList} style={{ width: 160 }} />
+              </Form.Item>
+              <Form.Item name="target">
+                <Input placeholder="请输入操作对象" />
+              </Form.Item>
+              <Form.Item name="detail">
+                <Input placeholder="请输入操作内容" />
+              </Form.Item>
+              <Form.Item name="time">
+                <RangePicker showTime />
+              </Form.Item>
+              <Form.Item>
+                <Button type="primary" ghost htmlType="submit">
+                  查询
+                </Button>
+              </Form.Item>
+            </Form>
+          </div>
         </div>
 
         <ProTable
diff --git a/km-console/packages/config-manager-fe/src/pages/UserManage/RoleTabContent.tsx b/km-console/packages/config-manager-fe/src/pages/UserManage/RoleTabContent.tsx
index 2ab8b223..c24f8e4a 100644
--- a/km-console/packages/config-manager-fe/src/pages/UserManage/RoleTabContent.tsx
+++ b/km-console/packages/config-manager-fe/src/pages/UserManage/RoleTabContent.tsx
@@ -611,38 +611,45 @@ export default (props: { curTabKey: string }): JSX.Element => {
 
   return (
     <>
-      <div className="operate-bar-right">
-        <Input
-          className="search-input"
-          suffix={
-            <IconFont
-              type="icon-fangdajing"
-              onClick={(_) => {
-                setSearchKeywords(searchKeywordsInput);
-              }}
-              style={{ fontSize: '16px' }}
-            />
-          }
-          placeholder="请输入角色名称"
-          value={searchKeywordsInput}
-          onPressEnter={(_) => {
-            setSearchKeywords(searchKeywordsInput);
-          }}
-          onChange={(e) => {
-            setSearchKeywordsInput(e.target.value);
-          }}
-        />
-        {global.hasPermission && global.hasPermission(ConfigPermissionMap.ROLE_ADD) ? (
-          <Button
-            type="primary"
-            icon={<PlusOutlined />}
-            onClick={() => detailRef.current.onOpen(true, RoleOperate.Add, getRoleList, undefined)}
-          >
-            新增角色
-          </Button>
-        ) : (
-          <></>
-        )}
+      <div className="operate-bar">
+        <div className="left">
+          <div className="refresh-icon" onClick={() => getRoleList()}>
+            <IconFont className="icon" type="icon-shuaxin1" />
+          </div>
+        </div>
+        <div className="right">
+          <Input
+            className="search-input"
+            suffix={
+              <IconFont
+                type="icon-fangdajing"
+                onClick={(_) => {
+                  setSearchKeywords(searchKeywordsInput);
+                }}
+                style={{ fontSize: '16px' }}
+              />
+            }
+            placeholder="请输入角色名称"
+            value={searchKeywordsInput}
+            onPressEnter={(_) => {
+              setSearchKeywords(searchKeywordsInput);
+            }}
+            onChange={(e) => {
+              setSearchKeywordsInput(e.target.value);
+            }}
+          />
+          {global.hasPermission && global.hasPermission(ConfigPermissionMap.ROLE_ADD) ? (
+            <Button
+              type="primary"
+              icon={<PlusOutlined />}
+              onClick={() => detailRef.current.onOpen(true, RoleOperate.Add, getRoleList, undefined)}
+            >
+              新增角色
+            </Button>
+          ) : (
+            <></>
+          )}
+        </div>
       </div>
 
       <ProTable
diff --git a/km-console/packages/config-manager-fe/src/pages/UserManage/UserTabContent.tsx b/km-console/packages/config-manager-fe/src/pages/UserManage/UserTabContent.tsx
index 6ef6f958..092b3c84 100644
--- a/km-console/packages/config-manager-fe/src/pages/UserManage/UserTabContent.tsx
+++ b/km-console/packages/config-manager-fe/src/pages/UserManage/UserTabContent.tsx
@@ -1,5 +1,6 @@
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState } from 'react';
 import { Form, ProTable, Select, Button, Input, Modal, message, Drawer, Space, Divider, AppContainer, Utils } from 'knowdesign';
+import { IconFont } from '@knowdesign/icons';
 import { PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons';
 import moment from 'moment';
 import { defaultPagination } from 'constants/common';
@@ -341,22 +342,29 @@ export default (props: { curTabKey: string }) => {
   return (
     <>
       <div className="operate-bar">
-        <Form form={form} layout="inline" onFinish={() => getUserList({ page: 1 })}>
-          <Form.Item name="userName">
-            <Input placeholder="请输入用户账号" />
-          </Form.Item>
-          <Form.Item name="realName">
-            <Input placeholder="请输入用户实名" />
-          </Form.Item>
-          <Form.Item name="roleId">
-            <Select style={{ width: 190 }} placeholder="选择平台已创建的角色名" options={simpleRoleList} />
-          </Form.Item>
-          <Form.Item>
-            <Button type="primary" ghost htmlType="submit">
-              查询
-            </Button>
-          </Form.Item>
-        </Form>
+        <div className="left">
+          <div className="refresh-icon" onClick={() => getUserList()}>
+            <IconFont className="icon" type="icon-shuaxin1" />
+          </div>
+          <Divider type="vertical" style={{ height: 20, top: 0 }} />
+
+          <Form form={form} layout="inline" onFinish={() => getUserList({ page: 1 })}>
+            <Form.Item name="userName">
+              <Input placeholder="请输入用户账号" />
+            </Form.Item>
+            <Form.Item name="realName">
+              <Input placeholder="请输入用户实名" />
+            </Form.Item>
+            <Form.Item name="roleId">
+              <Select style={{ width: 190 }} placeholder="选择平台已创建的角色名" options={simpleRoleList} />
+            </Form.Item>
+            <Form.Item>
+              <Button type="primary" ghost htmlType="submit">
+                查询
+              </Button>
+            </Form.Item>
+          </Form>
+        </div>
         {global.hasPermission && global.hasPermission(ConfigPermissionMap.USER_ADD) ? (
           <Button
             type="primary"
diff --git a/km-console/packages/config-manager-fe/src/pages/UserManage/index.less b/km-console/packages/config-manager-fe/src/pages/UserManage/index.less
index 5a3bb1cd..c1c5c6a1 100644
--- a/km-console/packages/config-manager-fe/src/pages/UserManage/index.less
+++ b/km-console/packages/config-manager-fe/src/pages/UserManage/index.less
@@ -44,13 +44,3 @@
 .role-tab-assign-user .desc-row {
   margin-bottom: 24px;
 }
-
-.operate-bar-right {
-  display: flex;
-  justify-content: right;
-  margin-bottom: 12px;
-  .search-input {
-    width: 248px;
-    margin-right: 8px;
-  }
-}
\ No newline at end of file