欧阳子桐 / RuoYi · 提交

转到一个项目

作者 RuoYi
提交 74f52677be7718d63eef89e01c367058a2e43e57 1 个父辈 60d5c03e

表格右侧工具栏组件

内嵌 并排对比
正在显示 18 个修改的文件 包含 57 行增加 和 57 行删除
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 v-hasPermi="['${moduleName}:${businessName}:add']" 66 v-hasPermi="['${moduleName}:${businessName}:add']"
67 >新增</el-button> 67 >新增</el-button>
68 </el-col> 68 </el-col>
69 - <table-tools-ext :showSearch.sync="showSearch" @queryTable="getList"></table-tools-ext> 69 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
70 </el-row> 70 </el-row>
71 71
72 <el-table 72 <el-table
@@ -95,7 +95,7 @@ @@ -95,7 +95,7 @@
95 v-hasPermi="['${moduleName}:${businessName}:export']" 95 v-hasPermi="['${moduleName}:${businessName}:export']"
96 >导出</el-button> 96 >导出</el-button>
97 </el-col> 97 </el-col>
98 - <table-tools-ext :showSearch.sync="showSearch" @queryTable="getList"></table-tools-ext> 98 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
99 </el-row> 99 </el-row>
100 100
101 <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange"> 101 <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
1 -<!-- @author Shiyn/ huangmx 20200807优化-->  
2 -<template>  
3 - <div class="top-right-btn">  
4 - <el-row>  
5 - <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">  
6 - <el-button size="mini" circle icon="el-icon-search" @click="clickSearch()" />  
7 - </el-tooltip>  
8 - <el-tooltip class="item" effect="dark" content="刷新" placement="top">  
9 - <el-button size="mini" circle icon="el-icon-refresh" @click="clickFresh()" />  
10 - </el-tooltip>  
11 - </el-row>  
12 - </div>  
13 -</template>  
14 -<script>  
15 -export default {  
16 - name: "TableToolsExt",  
17 - data() {  
18 - return {};  
19 - },  
20 - props: {  
21 - showSearch: {  
22 - type: Boolean,  
23 - default: true,  
24 - },  
25 - },  
26 -  
27 - methods: {  
28 - //搜索  
29 - clickSearch() {  
30 - this.$emit("update:showSearch", !this.showSearch);  
31 - },  
32 - //刷新  
33 - clickFresh() {  
34 - this.$emit("queryTable");  
35 - },  
36 - },  
37 -};  
38 -</script>  
  1 +<!-- @author Shiyn/ huangmx 20200807优化-->
  2 +<template>
  3 + <div class="top-right-btn">
  4 + <el-row>
  5 + <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
  6 + <el-button size="mini" circle icon="el-icon-search" @click="toggleSearch()" />
  7 + </el-tooltip>
  8 + <el-tooltip class="item" effect="dark" content="刷新" placement="top">
  9 + <el-button size="mini" circle icon="el-icon-refresh" @click="refresh()" />
  10 + </el-tooltip>
  11 + </el-row>
  12 + </div>
  13 +</template>
  14 +<script>
  15 +export default {
  16 + name: "RightToolbar",
  17 + data() {
  18 + return {};
  19 + },
  20 + props: {
  21 + showSearch: {
  22 + type: Boolean,
  23 + default: true,
  24 + },
  25 + },
  26 +
  27 + methods: {
  28 + //搜索
  29 + toggleSearch() {
  30 + this.$emit("update:showSearch", !this.showSearch);
  31 + },
  32 + //刷新
  33 + refresh() {
  34 + this.$emit("queryTable");
  35 + },
  36 + },
  37 +};
  38 +</script>
@@ -21,7 +21,7 @@ import { getConfigKey } from "@/api/system/config"; @@ -21,7 +21,7 @@ import { getConfigKey } from "@/api/system/config";
21 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi"; 21 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi";
22 import Pagination from "@/components/Pagination"; 22 import Pagination from "@/components/Pagination";
23 //自定义表格工具扩展 23 //自定义表格工具扩展
24 -import TableToolsExt from "@/components/TableToolsExt" 24 +import RightToolbar from "@/components/RightToolbar"
25 25
26 // 全局方法挂载 26 // 全局方法挂载
27 Vue.prototype.getDicts = getDicts 27 Vue.prototype.getDicts = getDicts
@@ -48,7 +48,7 @@ Vue.prototype.msgInfo = function (msg) { @@ -48,7 +48,7 @@ Vue.prototype.msgInfo = function (msg) {
48 48
49 // 全局组件挂载 49 // 全局组件挂载
50 Vue.component('Pagination', Pagination) 50 Vue.component('Pagination', Pagination)
51 -Vue.component('TableToolsExt', TableToolsExt) 51 +Vue.component('RightToolbar', RightToolbar)
52 52
53 Vue.use(permission) 53 Vue.use(permission)
54 54
@@ -84,7 +84,7 @@ @@ -84,7 +84,7 @@
84 v-hasPermi="['monitor:job:query']" 84 v-hasPermi="['monitor:job:query']"
85 >日志</el-button> 85 >日志</el-button>
86 </el-col> 86 </el-col>
87 - <table-tools-ext :showSearch.sync="showSearch" @queryTable="getList"></table-tools-ext> 87 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
88 </el-row> 88 </el-row>
89 89
90 <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange"> 90 <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 v-hasPermi="['monitor:job:export']" 90 v-hasPermi="['monitor:job:export']"
91 >导出</el-button> 91 >导出</el-button>
92 </el-col> 92 </el-col>
93 - <table-tools-ext :showSearch.sync="showSearch" @queryTable="getList"></table-tools-ext> 93 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
94 </el-row> 94 </el-row>
95 95
96 <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange"> 96 <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
@@ -84,7 +84,7 @@ @@ -84,7 +84,7 @@
84 v-hasPermi="['system:logininfor:export']" 84 v-hasPermi="['system:logininfor:export']"
85 >导出</el-button> 85 >导出</el-button>
86 </el-col> 86 </el-col>
87 - <table-tools-ext :showSearch.sync="showSearch" @queryTable="getList"></table-tools-ext> 87 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
88 </el-row> 88 </el-row>
89 89
90 <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange"> 90 <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
@@ -100,7 +100,7 @@ @@ -100,7 +100,7 @@
100 v-hasPermi="['system:config:export']" 100 v-hasPermi="['system:config:export']"
101 >导出</el-button> 101 >导出</el-button>
102 </el-col> 102 </el-col>
103 - <table-tools-ext :showSearch.sync="showSearch" @queryTable="getList"></table-tools-ext> 103 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
104 </el-row> 104 </el-row>
105 105
106 <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange"> 106 <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
@@ -97,7 +97,7 @@ @@ -97,7 +97,7 @@
97 v-hasPermi="['system:config:remove']" 97 v-hasPermi="['system:config:remove']"
98 >清理缓存</el-button> 98 >清理缓存</el-button>
99 </el-col> 99 </el-col>
100 - <table-tools-ext :showSearch.sync="showSearch" @queryTable="getList"></table-tools-ext> 100 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
101 </el-row> 101 </el-row>
102 102
103 <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange"> 103 <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 v-hasPermi="['system:dept:add']" 36 v-hasPermi="['system:dept:add']"
37 >新增</el-button> 37 >新增</el-button>
38 </el-col> 38 </el-col>
39 - <table-tools-ext :showSearch.sync="showSearch" @queryTable="getList"></table-tools-ext> 39 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
40 </el-row> 40 </el-row>
41 41
42 <el-table 42 <el-table
@@ -75,7 +75,7 @@ @@ -75,7 +75,7 @@
75 v-hasPermi="['system:dict:export']" 75 v-hasPermi="['system:dict:export']"
76 >导出</el-button> 76 >导出</el-button>
77 </el-col> 77 </el-col>
78 - <table-tools-ext :showSearch.sync="showSearch" @queryTable="getList"></table-tools-ext> 78 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
79 </el-row> 79 </el-row>
80 80
81 <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange"> 81 <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
@@ -103,7 +103,7 @@ @@ -103,7 +103,7 @@
103 v-hasPermi="['system:dict:remove']" 103 v-hasPermi="['system:dict:remove']"
104 >清理缓存</el-button> 104 >清理缓存</el-button>
105 </el-col> 105 </el-col>
106 - <table-tools-ext :showSearch.sync="showSearch" @queryTable="getList"></table-tools-ext> 106 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
107 </el-row> 107 </el-row>
108 108
109 <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange"> 109 <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 v-hasPermi="['system:menu:add']" 36 v-hasPermi="['system:menu:add']"
37 >新增</el-button> 37 >新增</el-button>
38 </el-col> 38 </el-col>
39 - <table-tools-ext :showSearch.sync="showSearch" @queryTable="getList"></table-tools-ext> 39 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
40 </el-row> 40 </el-row>
41 41
42 <el-table 42 <el-table
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 v-hasPermi="['system:notice:remove']" 65 v-hasPermi="['system:notice:remove']"
66 >删除</el-button> 66 >删除</el-button>
67 </el-col> 67 </el-col>
68 - <table-tools-ext :showSearch.sync="showSearch" @queryTable="getList"></table-tools-ext> 68 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
69 </el-row> 69 </el-row>
70 70
71 <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange"> 71 <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
@@ -164,7 +164,7 @@ @@ -164,7 +164,7 @@
164 </el-col> 164 </el-col>
165 </el-row> 165 </el-row>
166 </el-form> 166 </el-form>
167 - <div slot="footer" class="dialog-footer" style="padding-top:20px"> 167 + <div slot="footer" class="dialog-footer" style="padding-top:30px">
168 <el-button type="primary" @click="submitForm">确 定</el-button> 168 <el-button type="primary" @click="submitForm">确 定</el-button>
169 <el-button @click="cancel">取 消</el-button> 169 <el-button @click="cancel">取 消</el-button>
170 </div> 170 </div>
@@ -74,7 +74,7 @@ @@ -74,7 +74,7 @@
74 v-hasPermi="['system:post:export']" 74 v-hasPermi="['system:post:export']"
75 >导出</el-button> 75 >导出</el-button>
76 </el-col> 76 </el-col>
77 - <table-tools-ext :showSearch.sync="showSearch" @queryTable="getList"></table-tools-ext> 77 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
78 </el-row> 78 </el-row>
79 79
80 <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange"> 80 <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
@@ -94,7 +94,7 @@ @@ -94,7 +94,7 @@
94 v-hasPermi="['system:role:export']" 94 v-hasPermi="['system:role:export']"
95 >导出</el-button> 95 >导出</el-button>
96 </el-col> 96 </el-col>
97 - <table-tools-ext :showSearch.sync="showSearch" @queryTable="getList"></table-tools-ext> 97 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
98 </el-row> 98 </el-row>
99 99
100 <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange"> 100 <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 <el-col :span="1.5"> 49 <el-col :span="1.5">
50 <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button> 50 <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button>
51 </el-col> 51 </el-col>
52 - <table-tools-ext :showSearch.sync="showSearch" @queryTable="getList"></table-tools-ext> 52 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
53 </el-row> 53 </el-row>
54 54
55 <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange"> 55 <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 v-hasPermi="['tool:gen:remove']" 76 v-hasPermi="['tool:gen:remove']"
77 >删除</el-button> 77 >删除</el-button>
78 </el-col> 78 </el-col>
79 - <table-tools-ext :showSearch.sync="showSearch" @queryTable="getList"></table-tools-ext> 79 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
80 </el-row> 80 </el-row>
81 81
82 <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange"> 82 <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">