Переглянути джерело

表格右侧工具栏组件

RuoYi 5 роки тому
батько
коміт
b70e8ad81e

+ 1 - 8
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm

@@ -66,14 +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
-      <div class="top-right-btn">
70
-        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
71
-          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
72
-        </el-tooltip>
73
-        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
74
-          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
75
-        </el-tooltip>
76
-      </div>
69
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
77
     </el-row>
70
     </el-row>
78
 
71
 
79
     <el-table
72
     <el-table

+ 1 - 8
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm

@@ -95,14 +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
-      <div class="top-right-btn">
99
-        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
100
-          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
101
-        </el-tooltip>
102
-        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
103
-          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
104
-        </el-tooltip>
105
-      </div>
98
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
106
     </el-row>
99
     </el-row>
107
 
100
 
108
     <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
101
     <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">

+ 37 - 0
ruoyi-ui/src/components/RightToolbar/index.vue

@@ -0,0 +1,37 @@
1
+<template>
2
+  <div class="top-right-btn">
3
+    <el-row>
4
+      <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
5
+        <el-button size="mini" circle icon="el-icon-search" @click="toggleSearch()" />
6
+      </el-tooltip>
7
+      <el-tooltip class="item" effect="dark" content="刷新" placement="top">
8
+        <el-button size="mini" circle icon="el-icon-refresh" @click="refresh()" />
9
+      </el-tooltip>
10
+    </el-row>
11
+  </div>
12
+</template>
13
+<script>
14
+export default {
15
+  name: "RightToolbar",
16
+  data() {
17
+    return {};
18
+  },
19
+  props: {
20
+    showSearch: {
21
+      type: Boolean,
22
+      default: true,
23
+    },
24
+  },
25
+
26
+  methods: {
27
+    //搜索
28
+    toggleSearch() {
29
+      this.$emit("update:showSearch", !this.showSearch);
30
+    },
31
+    //刷新
32
+    refresh() {
33
+      this.$emit("queryTable");
34
+    },
35
+  },
36
+};
37
+</script>

+ 3 - 0
ruoyi-ui/src/main.js

@@ -21,6 +21,8 @@ import { getDicts } from "@/api/system/dict/data";
21
 import { getConfigKey } from "@/api/system/config";
21
 import { getConfigKey } from "@/api/system/config";
22
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
22
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
23
 import Pagination from "@/components/Pagination";
23
 import Pagination from "@/components/Pagination";
24
+//自定义表格工具扩展
25
+import RightToolbar from "@/components/RightToolbar"
24
 
26
 
25
 // 全局方法挂载
27
 // 全局方法挂载
26
 Vue.prototype.getDicts = getDicts
28
 Vue.prototype.getDicts = getDicts
@@ -47,6 +49,7 @@ Vue.prototype.msgInfo = function (msg) {
47
 
49
 
48
 // 全局组件挂载
50
 // 全局组件挂载
49
 Vue.component('Pagination', Pagination)
51
 Vue.component('Pagination', Pagination)
52
+Vue.component('RightToolbar', RightToolbar)
50
 
53
 
51
 Vue.use(permission)
54
 Vue.use(permission)
52
 
55
 

+ 1 - 8
ruoyi-ui/src/views/monitor/job/index.vue

@@ -84,14 +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
-      <div class="top-right-btn">
88
-        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
89
-          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
90
-        </el-tooltip>
91
-        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
92
-          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
93
-        </el-tooltip>
94
-      </div>
87
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
95
     </el-row>
88
     </el-row>
96
 
89
 
97
     <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">
90
     <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">

+ 1 - 8
ruoyi-ui/src/views/monitor/job/log.vue

@@ -90,14 +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
-      <div class="top-right-btn">
94
-        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
95
-          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
96
-        </el-tooltip>
97
-        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
98
-          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
99
-        </el-tooltip>
100
-      </div>
93
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
101
     </el-row>
94
     </el-row>
102
 
95
 
103
     <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
96
     <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">

+ 1 - 8
ruoyi-ui/src/views/system/client/index.vue

@@ -46,14 +46,7 @@
46
           v-hasPermi="['system:client:remove']"
46
           v-hasPermi="['system:client:remove']"
47
         >删除</el-button>
47
         >删除</el-button>
48
       </el-col>
48
       </el-col>
49
-      <div class="top-right-btn">
50
-        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
51
-          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
52
-        </el-tooltip>
53
-        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
54
-          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
55
-        </el-tooltip>
56
-      </div>
49
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
57
     </el-row>
50
     </el-row>
58
 
51
 
59
     <el-table v-loading="loading" :data="clientList" @selection-change="handleSelectionChange">
52
     <el-table v-loading="loading" :data="clientList" @selection-change="handleSelectionChange">

+ 1 - 8
ruoyi-ui/src/views/system/config/index.vue

@@ -97,14 +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
-      <div class="top-right-btn">
101
-        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
102
-          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
103
-        </el-tooltip>
104
-        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
105
-          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
106
-        </el-tooltip>
107
-      </div>
100
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
108
     </el-row>
101
     </el-row>
109
 
102
 
110
     <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
103
     <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">

+ 1 - 8
ruoyi-ui/src/views/system/dept/index.vue

@@ -36,14 +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
-      <div class="top-right-btn">
40
-        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
41
-          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
42
-        </el-tooltip>
43
-        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
44
-          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
45
-        </el-tooltip>
46
-      </div>
39
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
47
     </el-row>
40
     </el-row>
48
 
41
 
49
     <el-table
42
     <el-table

+ 1 - 8
ruoyi-ui/src/views/system/dict/data.vue

@@ -75,14 +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
-      <div class="top-right-btn">
79
-        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
80
-          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
81
-        </el-tooltip>
82
-        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
83
-          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
84
-        </el-tooltip>
85
-      </div>
78
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
86
     </el-row>
79
     </el-row>
87
 
80
 
88
     <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
81
     <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">

+ 1 - 8
ruoyi-ui/src/views/system/dict/index.vue

@@ -103,14 +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
-      <div class="top-right-btn">
107
-        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
108
-          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
109
-        </el-tooltip>
110
-        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
111
-          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
112
-        </el-tooltip>
113
-      </div>
106
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
114
     </el-row>
107
     </el-row>
115
 
108
 
116
     <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
109
     <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">

+ 1 - 8
ruoyi-ui/src/views/system/logininfor/index.vue

@@ -84,14 +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
-      <div class="top-right-btn">
88
-        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
89
-          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
90
-        </el-tooltip>
91
-        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
92
-          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
93
-        </el-tooltip>
94
-      </div>
87
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
95
     </el-row>
88
     </el-row>
96
 
89
 
97
     <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
90
     <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">

+ 1 - 8
ruoyi-ui/src/views/system/menu/index.vue

@@ -36,14 +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
-      <div class="top-right-btn">
40
-        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
41
-          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
42
-        </el-tooltip>
43
-        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
44
-          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
45
-        </el-tooltip>
46
-      </div>
39
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
47
     </el-row>
40
     </el-row>
48
 
41
 
49
     <el-table
42
     <el-table

+ 2 - 9
ruoyi-ui/src/views/system/notice/index.vue

@@ -65,14 +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
-      <div class="top-right-btn">
69
-        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
70
-          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
71
-        </el-tooltip>
72
-        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
73
-          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
74
-        </el-tooltip>
75
-      </div>
68
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
76
     </el-row>
69
     </el-row>
77
 
70
 
78
     <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
71
     <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
@@ -171,7 +164,7 @@
171
           </el-col>
164
           </el-col>
172
         </el-row>
165
         </el-row>
173
       </el-form>
166
       </el-form>
174
-      <div slot="footer" class="dialog-footer" style="padding-top:20px">
167
+      <div slot="footer" class="dialog-footer" style="padding-top:30px">
175
         <el-button type="primary" @click="submitForm">确 定</el-button>
168
         <el-button type="primary" @click="submitForm">确 定</el-button>
176
         <el-button @click="cancel">取 消</el-button>
169
         <el-button @click="cancel">取 消</el-button>
177
       </div>
170
       </div>

+ 1 - 8
ruoyi-ui/src/views/system/operlog/index.vue

@@ -100,14 +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
-      <div class="top-right-btn">
104
-        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
105
-          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
106
-        </el-tooltip>
107
-        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
108
-          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
109
-        </el-tooltip>
110
-      </div>
103
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
111
     </el-row>
104
     </el-row>
112
 
105
 
113
     <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
106
     <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">

+ 1 - 8
ruoyi-ui/src/views/system/post/index.vue

@@ -74,14 +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
-      <div class="top-right-btn">
78
-        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
79
-          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
80
-        </el-tooltip>
81
-        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
82
-          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
83
-        </el-tooltip>
84
-      </div>
77
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
85
     </el-row>
78
     </el-row>
86
 
79
 
87
     <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
80
     <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">

+ 1 - 8
ruoyi-ui/src/views/system/role/index.vue

@@ -94,14 +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
-      <div class="top-right-btn">
98
-        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
99
-          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
100
-        </el-tooltip>
101
-        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
102
-          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
103
-        </el-tooltip>
104
-      </div>
97
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
105
     </el-row>
98
     </el-row>
106
 
99
 
107
     <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
100
     <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">

+ 1 - 8
ruoyi-ui/src/views/system/user/index.vue

@@ -130,14 +130,7 @@
130
               v-hasPermi="['system:user:export']"
130
               v-hasPermi="['system:user:export']"
131
             >导出</el-button>
131
             >导出</el-button>
132
           </el-col>
132
           </el-col>
133
-          <div class="top-right-btn">
134
-            <el-tooltip class="item" effect="dark" content="刷新" placement="top">
135
-              <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
136
-            </el-tooltip>
137
-            <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
138
-              <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
139
-            </el-tooltip>
140
-          </div>
133
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
141
         </el-row>
134
         </el-row>
142
 
135
 
143
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
136
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">

+ 1 - 8
ruoyi-ui/src/views/tool/gen/index.vue

@@ -76,14 +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
-      <div class="top-right-btn">
80
-        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
81
-          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
82
-        </el-tooltip>
83
-        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
84
-          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
85
-        </el-tooltip>
86
-      </div>
79
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
87
     </el-row>
80
     </el-row>
88
 
81
 
89
     <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
82
     <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">