From 872f6b9dfbbf1efd168a927b5b9d2cf91c035255 Mon Sep 17 00:00:00 2001
From: wuyanwen <wuyanwen@baijiayun.com>
Date: Sun, 29 Dec 2019 17:01:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0icon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/permissions/roles/roles.vue     | 22 ++++++++++---------
 .../src/views/permissions/rules/rules.vue     | 22 ++++++++++---------
 .../src/views/permissions/users/users.vue     | 14 +++++-------
 .../src/views/system/database/index.vue       | 14 +++++++-----
 4 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/view/catch-admin/src/views/permissions/roles/roles.vue b/view/catch-admin/src/views/permissions/roles/roles.vue
index 3dbeb91..dabd918 100644
--- a/view/catch-admin/src/views/permissions/roles/roles.vue
+++ b/view/catch-admin/src/views/permissions/roles/roles.vue
@@ -4,12 +4,12 @@
       <a-form layout="inline">
         <a-row :gutter="48">
           <a-col :md="4" :sm="24">
-            <a-input v-model="queryParam.role_name" placeholder="请输入角色名"/>
+            <a-input allowClear v-model="queryParam.role_name" placeholder="请输入角色名"/>
           </a-col>
           <a-col :md="4" :sm="24">
             <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
+              <a-button icon="search" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+              <a-button icon="sync" style="margin-left: 8px" @click="resetSearchForm()">重置</a-button>
             </span>
           </a-col>
         </a-row>
@@ -33,9 +33,13 @@
         <template>
           <a @click="handleEdit(record)">编辑</a>
           <a-divider type="vertical" />
-          <a @click="handleAddSon(record)">新增子角色</a>
-          <a-divider type="vertical" />
-          <a @click="handleDel(record)">删除</a>
+          <a-dropdown>
+            <a-menu slot="overlay">
+              <a-menu-item><a @click="handleAddSon(record)">新增子角色</a></a-menu-item>
+              <a-menu-item><a @click="handleDel(record)">删除</a></a-menu-item>
+            </a-menu>
+            <a>更多<a-icon type="down"/></a>
+          </a-dropdown>
         </template>
       </span>
     </s-table>
@@ -44,7 +48,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { STable } from '@/components'
 import CreateRole from './form/create'
 import { getRoleList, del } from '@/api/role'
@@ -131,9 +134,8 @@ export default {
       this.handleCancel()
     },
     resetSearchForm () {
-      this.queryParam = {
-        date: moment(new Date())
-      }
+      this.queryParam = {}
+      this.handleOk()
     }
   }
 }
diff --git a/view/catch-admin/src/views/permissions/rules/rules.vue b/view/catch-admin/src/views/permissions/rules/rules.vue
index f9b1632..963df47 100644
--- a/view/catch-admin/src/views/permissions/rules/rules.vue
+++ b/view/catch-admin/src/views/permissions/rules/rules.vue
@@ -4,12 +4,12 @@
       <a-form layout="inline">
         <a-row :gutter="48">
           <a-col :md="4" :sm="24">
-            <a-input v-model="queryParam.permission_name" placeholder="请输入菜单名名称"/>
+            <a-input allowClear v-model="queryParam.permission_name" placeholder="请输入菜单名名称"/>
           </a-col>
           <a-col :md="4" :sm="24">
             <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
+              <a-button icon="search" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+              <a-button icon="sync" style="margin-left: 8px" @click="resetSearchForm()">重置</a-button>
             </span>
           </a-col>
         </a-row>
@@ -33,9 +33,13 @@
         <template>
           <a @click="handleEdit(record)">编辑</a>
           <a-divider type="vertical" />
-          <a @click="handleAddSon(record)">新增子菜单</a>
-          <a-divider type="vertical" />
-          <a @click="handleDel(record)">删除</a>
+          <a-dropdown>
+            <a-menu slot="overlay">
+              <a-menu-item><a @click="handleAddSon(record)">新增子菜单</a></a-menu-item>
+              <a-menu-item><a @click="handleDel(record)">删除</a></a-menu-item>
+            </a-menu>
+            <a>更多<a-icon type="down"/></a>
+          </a-dropdown>
         </template>
       </span>
     </s-table>
@@ -44,7 +48,6 @@
 </template>
 
 <script>
-import moment from 'moment'
 import { STable } from '@/components'
 import CreatePermission from './form/create'
 import { getPermissionList, del } from '@/api/permission'
@@ -144,9 +147,8 @@ export default {
       this.handleCancel()
     },
     resetSearchForm () {
-      this.queryParam = {
-        date: moment(new Date())
-      }
+      this.queryParam = {}
+      this.handleOk()
     },
     renderType (value, row, index) {
       return value === 1 ? <a-button type="normal" size="small">菜单</a-button> : <a-button type="danger" size="small">按钮</a-button>
diff --git a/view/catch-admin/src/views/permissions/users/users.vue b/view/catch-admin/src/views/permissions/users/users.vue
index f46c965..445b75a 100644
--- a/view/catch-admin/src/views/permissions/users/users.vue
+++ b/view/catch-admin/src/views/permissions/users/users.vue
@@ -4,21 +4,21 @@
       <a-form layout="inline">
         <a-row :gutter="48">
           <a-col :md="4" :sm="24">
-            <a-input v-model="queryParam.username" placeholder="请输入用户名"/>
+            <a-input allowClear v-model="queryParam.username" placeholder="请输入用户名"/>
           </a-col>
           <a-col :md="4" :sm="24">
-            <a-input v-model="queryParam.email" placeholder="请输入邮箱"/>
+            <a-input allowClear v-model="queryParam.email" placeholder="请输入邮箱"/>
           </a-col>
           <a-col :md="4" :sm="24">
-            <a-select v-model="queryParam.status" placeholder="请选择状态" default-value="0">
+            <a-select allowClear v-model="queryParam.status" placeholder="请选择状态" default-value="0">
               <a-select-option value="1">正常</a-select-option>
               <a-select-option value="2">禁用</a-select-option>
             </a-select>
           </a-col>
           <a-col :md="4" :sm="24">
             <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm()">重置</a-button>
+              <a-button icon="search" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+              <a-button icon="sync" style="margin-left: 8px" @click="resetSearchForm()">重置</a-button>
             </span>
           </a-col>
         </a-row>
@@ -117,10 +117,9 @@ export default {
           })
       },
       selectedRowKeys: [],
-      selectedRows: [],
       // custom table alert & rowSelection
       options: {
-        alert: { show: false, clear: () => { this.selectedRowKeys = [] } },
+        alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
         rowSelection: {
           selectedRowKeys: this.selectedRowKeys,
           onChange: this.onSelectChange
@@ -190,7 +189,6 @@ export default {
     },
     onSelectChange (selectedRowKeys, selectedRows) {
       this.selectedRowKeys = selectedRowKeys
-      this.selectedRows = selectedRows
     },
     resetSearchForm () {
       this.queryParam = {}
diff --git a/view/catch-admin/src/views/system/database/index.vue b/view/catch-admin/src/views/system/database/index.vue
index c6e04d2..b06da39 100644
--- a/view/catch-admin/src/views/system/database/index.vue
+++ b/view/catch-admin/src/views/system/database/index.vue
@@ -14,8 +14,8 @@
           </a-col>
           <a-col :md="4" :sm="24">
             <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm()">重置</a-button>
+              <a-button icon="search" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
+              <a-button icon="sync" style="margin-left: 8px" @click="resetSearchForm()">重置</a-button>
             </span>
           </a-col>
         </a-row>
@@ -23,8 +23,8 @@
     </div>
 
     <div class="table-operator" v-if="selectTables.length > 0">
-      <a-button type="primary" icon="plus" @click="optimizeTables()">优化</a-button>
-      <a-button type="primary" icon="plus" @click="backupTables">备份</a-button>
+      <a-button type="primary" icon="safety" @click="optimizeTables()">优化</a-button>
+      <a-button type="primary" icon="database" @click="backupTables">备份</a-button>
     </div>
 
     <s-table
@@ -119,9 +119,9 @@ export default {
       selectTables: [],
       // custom table alert & rowSelection
       options: {
-        alert: { show: false, clear: () => { this.selectedRowKeys = [] } },
+        alert: { show: false, clear: () => { this.selectTables = [] } },
         rowSelection: {
-          selectedRowKeys: this.selectedRowKeys,
+          selectedRowKeys: this.selectTables,
           onChange: this.onSelectChange
         }
       }
@@ -135,6 +135,7 @@ export default {
           duration: 4
         })
         this.selectTables = []
+        this.selectedRowKeys = []
       })
     },
     backupTables () {
@@ -144,6 +145,7 @@ export default {
           duration: 4
         })
         this.selectTables = []
+        this.selectedRowKeys = []
       })
     },
     handleOk () {