Commit 1a2c03bc7e67eb73de50da426fee23030b1a3115

Authored by YunaiV
1 parent 82a3a838

v3.8.2 开启TopNav没有子菜单情况隐藏侧边栏

Showing 44 changed files with 76 additions and 71 deletions
yudao-module-infra/yudao-module-infra-impl/src/main/resources/codegen/vue/views/index.vue.vm
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="app-container"> 2 <div class="app-container">
3 3
4 <!-- 搜索工作栏 --> 4 <!-- 搜索工作栏 -->
5 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 5 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
6 #foreach($column in $columns) 6 #foreach($column in $columns)
7 #if ($column.listOperation) 7 #if ($column.listOperation)
8 #set ($dictType=$column.dictType) 8 #set ($dictType=$column.dictType)
yudao-ui-admin/src/assets/styles/sidebar.scss
@@ -7,6 +7,10 @@ @@ -7,6 +7,10 @@
7 position: relative; 7 position: relative;
8 } 8 }
9 9
  10 + .sidebarHide {
  11 + margin-left: 0!important;
  12 + }
  13 +
10 .sidebar-container { 14 .sidebar-container {
11 -webkit-transition: width .28s; 15 -webkit-transition: width .28s;
12 transition: width 0.28s; 16 transition: width 0.28s;
yudao-ui-admin/src/components/TopNav/index.vue
@@ -71,7 +71,7 @@ export default { @@ -71,7 +71,7 @@ export default {
71 for (var item in router.children) { 71 for (var item in router.children) {
72 if (router.children[item].parentPath === undefined) { 72 if (router.children[item].parentPath === undefined) {
73 if(router.path === "/") { 73 if(router.path === "/") {
74 - router.children[item].path = "/redirect/" + router.children[item].path; 74 + router.children[item].path = "/" + router.children[item].path;
75 } else { 75 } else {
76 if(!this.ishttp(router.children[item].path)) { 76 if(!this.ishttp(router.children[item].path)) {
77 router.children[item].path = router.path + "/" + router.children[item].path; 77 router.children[item].path = router.path + "/" + router.children[item].path;
@@ -87,22 +87,23 @@ export default { @@ -87,22 +87,23 @@ export default {
87 // 默认激活的菜单 87 // 默认激活的菜单
88 activeMenu() { 88 activeMenu() {
89 const path = this.$route.path; 89 const path = this.$route.path;
90 - let activePath = this.defaultRouter(); 90 + let activePath = path;
91 if (path.lastIndexOf("/") > 0) { 91 if (path.lastIndexOf("/") > 0) {
92 const tmpPath = path.substring(1, path.length); 92 const tmpPath = path.substring(1, path.length);
93 activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/")); 93 activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/"));
  94 + this.$store.dispatch('app/toggleSideBarHide', false);
94 } else if ("/index" == path || "" == path) { 95 } else if ("/index" == path || "" == path) {
95 if (!this.isFrist) { 96 if (!this.isFrist) {
96 this.isFrist = true; 97 this.isFrist = true;
97 } else { 98 } else {
98 activePath = "index"; 99 activePath = "index";
99 } 100 }
  101 + this.$store.dispatch('app/toggleSideBarHide', true);
  102 + } else if(!this.$route.children) {
  103 + activePath = path;
  104 + this.$store.dispatch('app/toggleSideBarHide', true);
100 } 105 }
101 - var routes = this.activeRoutes(activePath);  
102 - if (routes.length === 0) {  
103 - activePath = this.currentIndex || this.defaultRouter()  
104 - this.activeRoutes(activePath);  
105 - } 106 + this.activeRoutes(activePath);
106 return activePath; 107 return activePath;
107 }, 108 },
108 }, 109 },
@@ -121,29 +122,21 @@ export default { @@ -121,29 +122,21 @@ export default {
121 const width = document.body.getBoundingClientRect().width / 3; 122 const width = document.body.getBoundingClientRect().width / 3;
122 this.visibleNumber = parseInt(width / 85); 123 this.visibleNumber = parseInt(width / 85);
123 }, 124 },
124 - // 默认激活的路由  
125 - defaultRouter() {  
126 - let router;  
127 - Object.keys(this.routers).some((key) => {  
128 - if (!this.routers[key].hidden) {  
129 - router = this.routers[key].path;  
130 - return true;  
131 - }  
132 - });  
133 - return router;  
134 - },  
135 // 菜单选择事件 125 // 菜单选择事件
136 handleSelect(key, keyPath) { 126 handleSelect(key, keyPath) {
137 this.currentIndex = key; 127 this.currentIndex = key;
  128 + const route = this.routers.find(item => item.path === key);
138 if (this.ishttp(key)) { 129 if (this.ishttp(key)) {
139 // http(s):// 路径新窗口打开 130 // http(s):// 路径新窗口打开
140 window.open(key, "_blank"); 131 window.open(key, "_blank");
141 - } else if (key.indexOf("/redirect") !== -1) {  
142 - // /redirect 路径内部打开  
143 - this.$router.push({ path: key.replace("/redirect", "") }); 132 + } else if (!route || !route.children) {
  133 + // 没有子路由路径内部打开
  134 + this.$router.push({ path: key });
  135 + this.$store.dispatch('app/toggleSideBarHide', true);
144 } else { 136 } else {
145 // 显示左侧联动菜单 137 // 显示左侧联动菜单
146 this.activeRoutes(key); 138 this.activeRoutes(key);
  139 + this.$store.dispatch('app/toggleSideBarHide', false);
147 } 140 }
148 }, 141 },
149 // 当前激活的路由 142 // 当前激活的路由
@@ -159,7 +152,6 @@ export default { @@ -159,7 +152,6 @@ export default {
159 if(routes.length > 0) { 152 if(routes.length > 0) {
160 this.$store.commit("SET_SIDEBAR_ROUTERS", routes); 153 this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
161 } 154 }
162 - return routes;  
163 }, 155 },
164 ishttp(url) { 156 ishttp(url) {
165 return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1 157 return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
yudao-ui-admin/src/layout/components/Settings/index.vue
@@ -108,6 +108,7 @@ export default { @@ -108,6 +108,7 @@ export default {
108 value: val 108 value: val
109 }) 109 })
110 if (!val) { 110 if (!val) {
  111 + this.$store.dispatch('app/toggleSideBarHide', false);
111 this.$store.commit("SET_SIDEBAR_ROUTERS", this.$store.state.permission.defaultRoutes); 112 this.$store.commit("SET_SIDEBAR_ROUTERS", this.$store.state.permission.defaultRoutes);
112 } 113 }
113 } 114 }
@@ -162,7 +163,7 @@ export default { @@ -162,7 +163,7 @@ export default {
162 this.sideTheme = val; 163 this.sideTheme = val;
163 }, 164 },
164 saveSetting() { 165 saveSetting() {
165 - this.$modal.loading("正在保存到本地,请稍后..."); 166 + this.$modal.loading("正在保存到本地,请稍候...");
166 this.$cache.local.set( 167 this.$cache.local.set(
167 "layout-setting", 168 "layout-setting",
168 `{ 169 `{
@@ -178,7 +179,7 @@ export default { @@ -178,7 +179,7 @@ export default {
178 setTimeout(this.$modal.closeLoading(), 1000) 179 setTimeout(this.$modal.closeLoading(), 1000)
179 }, 180 },
180 resetSetting() { 181 resetSetting() {
181 - this.$modal.loading("正在清除设置缓存并刷新,请稍后..."); 182 + this.$modal.loading("正在清除设置缓存并刷新,请稍候...");
182 this.$cache.local.remove("layout-setting") 183 this.$cache.local.remove("layout-setting")
183 setTimeout("window.location.reload()", 1000) 184 setTimeout("window.location.reload()", 1000)
184 } 185 }
yudao-ui-admin/src/layout/index.vue
1 <template> 1 <template>
2 <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}"> 2 <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
3 <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/> 3 <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
4 - <sidebar class="sidebar-container"/>  
5 - <div :class="{hasTagsView:needTagsView}" class="main-container"> 4 + <sidebar v-if="!sidebar.hide" class="sidebar-container" />
  5 + <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
6 <div :class="{'fixed-header':fixedHeader}"> 6 <div :class="{'fixed-header':fixedHeader}">
7 <navbar /> 7 <navbar />
8 <tags-view v-if="needTagsView" /> 8 <tags-view v-if="needTagsView" />
@@ -98,7 +98,7 @@ export default { @@ -98,7 +98,7 @@ export default {
98 } 98 }
99 99
100 .hideSidebar .fixed-header { 100 .hideSidebar .fixed-header {
101 - width: calc(100% - 54px) 101 + width: calc(100% - 54px);
102 } 102 }
103 103
104 .mobile .fixed-header { 104 .mobile .fixed-header {
yudao-ui-admin/src/router/index.js
@@ -164,6 +164,12 @@ export const constantRoutes = [ @@ -164,6 +164,12 @@ export const constantRoutes = [
164 } 164 }
165 ] 165 ]
166 166
  167 +// 防止连续点击多次路由报错
  168 +let routerPush = Router.prototype.push;
  169 +Router.prototype.push = function push(location) {
  170 + return routerPush.call(this, location).catch(err => err)
  171 +}
  172 +
167 export default new Router({ 173 export default new Router({
168 base: process.env.VUE_APP_APP_NAME ? process.env.VUE_APP_APP_NAME : "/", 174 base: process.env.VUE_APP_APP_NAME ? process.env.VUE_APP_APP_NAME : "/",
169 mode: 'history', // 去掉url中的# 175 mode: 'history', // 去掉url中的#
yudao-ui-admin/src/store/modules/app.js
@@ -3,7 +3,8 @@ import Cookies from &#39;js-cookie&#39; @@ -3,7 +3,8 @@ import Cookies from &#39;js-cookie&#39;
3 const state = { 3 const state = {
4 sidebar: { 4 sidebar: {
5 opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true, 5 opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true,
6 - withoutAnimation: false 6 + withoutAnimation: false,
  7 + hide: false
7 }, 8 },
8 device: 'desktop', 9 device: 'desktop',
9 size: Cookies.get('size') || 'medium' 10 size: Cookies.get('size') || 'medium'
@@ -30,6 +31,9 @@ const mutations = { @@ -30,6 +31,9 @@ const mutations = {
30 SET_SIZE: (state, size) => { 31 SET_SIZE: (state, size) => {
31 state.size = size 32 state.size = size
32 Cookies.set('size', size) 33 Cookies.set('size', size)
  34 + },
  35 + SET_SIDEBAR_HIDE: (state, status) => {
  36 + state.sidebar.hide = status
33 } 37 }
34 } 38 }
35 39
@@ -45,6 +49,9 @@ const actions = { @@ -45,6 +49,9 @@ const actions = {
45 }, 49 },
46 setSize({ commit }, size) { 50 setSize({ commit }, size) {
47 commit('SET_SIZE', size) 51 commit('SET_SIZE', size)
  52 + },
  53 + toggleSideBarHide({ commit }, status) {
  54 + commit('SET_SIDEBAR_HIDE', status)
48 } 55 }
49 } 56 }
50 57
yudao-ui-admin/src/store/modules/permission.js
@@ -18,12 +18,7 @@ const permission = { @@ -18,12 +18,7 @@ const permission = {
18 state.defaultRoutes = constantRoutes.concat(routes) 18 state.defaultRoutes = constantRoutes.concat(routes)
19 }, 19 },
20 SET_TOPBAR_ROUTES: (state, routes) => { 20 SET_TOPBAR_ROUTES: (state, routes) => {
21 - // 顶部导航菜单默认添加统计报表栏指向首页  
22 - const index = [{  
23 - path: 'index',  
24 - meta: { title: '统计报表', icon: 'dashboard'}  
25 - }]  
26 - state.topbarRouters = routes.concat(index); 21 + state.topbarRouters = routes
27 }, 22 },
28 SET_SIDEBAR_ROUTERS: (state, routes) => { 23 SET_SIDEBAR_ROUTERS: (state, routes) => {
29 state.sidebarRouters = routes 24 state.sidebarRouters = routes
yudao-ui-admin/src/views/bpm/form/index.vue
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <doc-alert title="工作流" url="https://doc.iocoder.cn/bpm" /> 3 <doc-alert title="工作流" url="https://doc.iocoder.cn/bpm" />
4 4
5 <!-- 搜索工作栏 --> 5 <!-- 搜索工作栏 -->
6 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 6 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
7 <el-form-item label="表单名" prop="name"> 7 <el-form-item label="表单名" prop="name">
8 <el-input v-model="queryParams.name" placeholder="请输入表单名" clearable @keyup.enter.native="handleQuery"/> 8 <el-input v-model="queryParams.name" placeholder="请输入表单名" clearable @keyup.enter.native="handleQuery"/>
9 </el-form-item> 9 </el-form-item>
yudao-ui-admin/src/views/bpm/group/index.vue
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <doc-alert title="工作流" url="https://doc.iocoder.cn/bpm" /> 3 <doc-alert title="工作流" url="https://doc.iocoder.cn/bpm" />
4 4
5 <!-- 搜索工作栏 --> 5 <!-- 搜索工作栏 -->
6 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 6 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
7 <el-form-item label="组名" prop="name"> 7 <el-form-item label="组名" prop="name">
8 <el-input v-model="queryParams.name" placeholder="请输入组名" clearable @keyup.enter.native="handleQuery"/> 8 <el-input v-model="queryParams.name" placeholder="请输入组名" clearable @keyup.enter.native="handleQuery"/>
9 </el-form-item> 9 </el-form-item>
yudao-ui-admin/src/views/bpm/model/index.vue
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <doc-alert title="工作流" url="https://doc.iocoder.cn/bpm" /> 3 <doc-alert title="工作流" url="https://doc.iocoder.cn/bpm" />
4 4
5 <!-- 搜索工作栏 --> 5 <!-- 搜索工作栏 -->
6 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 6 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
7 <el-form-item label="流程标识" prop="key"> 7 <el-form-item label="流程标识" prop="key">
8 <el-input v-model="queryParams.key" placeholder="请输入流程标识" clearable style="width: 240px;" 8 <el-input v-model="queryParams.key" placeholder="请输入流程标识" clearable style="width: 240px;"
9 @keyup.enter.native="handleQuery"/> 9 @keyup.enter.native="handleQuery"/>
yudao-ui-admin/src/views/bpm/oa/leave/index.vue
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <doc-alert title="工作流" url="https://doc.iocoder.cn/bpm" /> 3 <doc-alert title="工作流" url="https://doc.iocoder.cn/bpm" />
4 4
5 <!-- 搜索工作栏 --> 5 <!-- 搜索工作栏 -->
6 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 6 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
7 <el-form-item label="请假类型" prop="type"> 7 <el-form-item label="请假类型" prop="type">
8 <el-select v-model="queryParams.type" placeholder="请选择请假类型" clearable> 8 <el-select v-model="queryParams.type" placeholder="请选择请假类型" clearable>
9 <el-option v-for="dict in leaveTypeDictData" :key="dict.value" :label="dict.label" :value="dict.value" /> 9 <el-option v-for="dict in leaveTypeDictData" :key="dict.value" :label="dict.label" :value="dict.value" />
yudao-ui-admin/src/views/bpm/processInstance/index.vue
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <doc-alert title="工作流" url="https://doc.iocoder.cn/bpm" /> 3 <doc-alert title="工作流" url="https://doc.iocoder.cn/bpm" />
4 4
5 <!-- 搜索工作栏 --> 5 <!-- 搜索工作栏 -->
6 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 6 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
7 <el-form-item label="流程名" prop="name"> 7 <el-form-item label="流程名" prop="name">
8 <el-input v-model="queryParams.name" placeholder="请输入流程名" clearable @keyup.enter.native="handleQuery"/> 8 <el-input v-model="queryParams.name" placeholder="请输入流程名" clearable @keyup.enter.native="handleQuery"/>
9 </el-form-item> 9 </el-form-item>
yudao-ui-admin/src/views/bpm/task/done.vue
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <doc-alert title="工作流" url="https://doc.iocoder.cn/bpm" /> 3 <doc-alert title="工作流" url="https://doc.iocoder.cn/bpm" />
4 4
5 <!-- 搜索工作栏 --> 5 <!-- 搜索工作栏 -->
6 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 6 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
7 <el-form-item label="流程名" prop="name"> 7 <el-form-item label="流程名" prop="name">
8 <el-input v-model="queryParams.name" placeholder="请输入流程名" clearable @keyup.enter.native="handleQuery"/> 8 <el-input v-model="queryParams.name" placeholder="请输入流程名" clearable @keyup.enter.native="handleQuery"/>
9 </el-form-item> 9 </el-form-item>
yudao-ui-admin/src/views/bpm/task/todo.vue
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <doc-alert title="工作流" url="https://doc.iocoder.cn/bpm" /> 3 <doc-alert title="工作流" url="https://doc.iocoder.cn/bpm" />
4 4
5 <!-- 搜索工作栏 --> 5 <!-- 搜索工作栏 -->
6 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 6 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
7 <el-form-item label="流程名" prop="name"> 7 <el-form-item label="流程名" prop="name">
8 <el-input v-model="queryParams.name" placeholder="请输入流程名" clearable @keyup.enter.native="handleQuery"/> 8 <el-input v-model="queryParams.name" placeholder="请输入流程名" clearable @keyup.enter.native="handleQuery"/>
9 </el-form-item> 9 </el-form-item>
yudao-ui-admin/src/views/infra/apiAccessLog/index.vue
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="app-container"> 2 <div class="app-container">
3 3
4 <!-- 搜索工作栏 --> 4 <!-- 搜索工作栏 -->
5 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 5 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
6 <el-form-item label="用户编号" prop="userId"> 6 <el-form-item label="用户编号" prop="userId">
7 <el-input v-model="queryParams.userId" placeholder="请输入用户编号" clearable @keyup.enter.native="handleQuery"/> 7 <el-input v-model="queryParams.userId" placeholder="请输入用户编号" clearable @keyup.enter.native="handleQuery"/>
8 </el-form-item> 8 </el-form-item>
yudao-ui-admin/src/views/infra/apiErrorLog/index.vue
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="app-container"> 2 <div class="app-container">
3 3
4 <!-- 搜索工作栏 --> 4 <!-- 搜索工作栏 -->
5 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 5 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
6 <el-form-item label="用户编号" prop="userId"> 6 <el-form-item label="用户编号" prop="userId">
7 <el-input v-model="queryParams.userId" placeholder="请输入用户编号" clearable @keyup.enter.native="handleQuery"/> 7 <el-input v-model="queryParams.userId" placeholder="请输入用户编号" clearable @keyup.enter.native="handleQuery"/>
8 </el-form-item> 8 </el-form-item>
yudao-ui-admin/src/views/infra/codegen/index.vue
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="app-container"> 2 <div class="app-container">
3 <doc-alert title="代码生成" url="https://doc.iocoder.cn/new-feature/" /> 3 <doc-alert title="代码生成" url="https://doc.iocoder.cn/new-feature/" />
4 <!-- 操作工作栏 --> 4 <!-- 操作工作栏 -->
5 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 5 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
6 <el-form-item label="表名称" prop="tableName"> 6 <el-form-item label="表名称" prop="tableName">
7 <el-input v-model="queryParams.tableName" placeholder="请输入表名称" clearable 7 <el-input v-model="queryParams.tableName" placeholder="请输入表名称" clearable
8 @keyup.enter.native="handleQuery"/> 8 @keyup.enter.native="handleQuery"/>
yudao-ui-admin/src/views/infra/config/index.vue
1 <template> 1 <template>
2 <div class="app-container"> 2 <div class="app-container">
3 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 3 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
4 <el-form-item label="参数名称" prop="name"> 4 <el-form-item label="参数名称" prop="name">
5 <el-input v-model="queryParams.name" placeholder="请输入参数名称" clearable style="width: 240px" 5 <el-input v-model="queryParams.name" placeholder="请输入参数名称" clearable style="width: 240px"
6 @keyup.enter.native="handleQuery"/> 6 @keyup.enter.native="handleQuery"/>
yudao-ui-admin/src/views/infra/file/index.vue
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="app-container"> 2 <div class="app-container">
3 <doc-alert title="上传下载" url="https://doc.iocoder.cn/file/" /> 3 <doc-alert title="上传下载" url="https://doc.iocoder.cn/file/" />
4 <!-- 搜索工作栏 --> 4 <!-- 搜索工作栏 -->
5 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 5 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
6 <el-form-item label="文件路径" prop="path"> 6 <el-form-item label="文件路径" prop="path">
7 <el-input v-model="queryParams.path" placeholder="请输入文件路径" clearable @keyup.enter.native="handleQuery"/> 7 <el-input v-model="queryParams.path" placeholder="请输入文件路径" clearable @keyup.enter.native="handleQuery"/>
8 </el-form-item> 8 </el-form-item>
yudao-ui-admin/src/views/infra/fileConfig/index.vue
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="app-container"> 2 <div class="app-container">
3 <doc-alert title="上传下载" url="https://doc.iocoder.cn/file/" /> 3 <doc-alert title="上传下载" url="https://doc.iocoder.cn/file/" />
4 <!-- 搜索工作栏 --> 4 <!-- 搜索工作栏 -->
5 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 5 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
6 <el-form-item label="配置名" prop="name"> 6 <el-form-item label="配置名" prop="name">
7 <el-input v-model="queryParams.name" placeholder="请输入配置名" clearable @keyup.enter.native="handleQuery"/> 7 <el-input v-model="queryParams.name" placeholder="请输入配置名" clearable @keyup.enter.native="handleQuery"/>
8 </el-form-item> 8 </el-form-item>
yudao-ui-admin/src/views/infra/job/index.vue
1 <template> 1 <template>
2 <div class="app-container"> 2 <div class="app-container">
3 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="100px"> 3 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
4 <el-form-item label="任务名称" prop="name"> 4 <el-form-item label="任务名称" prop="name">
5 <el-input v-model="queryParams.name" placeholder="请输入任务名称" clearable @keyup.enter.native="handleQuery"/> 5 <el-input v-model="queryParams.name" placeholder="请输入任务名称" clearable @keyup.enter.native="handleQuery"/>
6 </el-form-item> 6 </el-form-item>
yudao-ui-admin/src/views/infra/job/log.vue
1 <template> 1 <template>
2 <div class="app-container"> 2 <div class="app-container">
3 <!-- 搜索工作栏 --> 3 <!-- 搜索工作栏 -->
4 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="120px"> 4 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
5 <el-form-item label="处理器的名字" prop="handlerName"> 5 <el-form-item label="处理器的名字" prop="handlerName">
6 <el-input v-model="queryParams.handlerName" placeholder="请输入处理器的名字" clearable @keyup.enter.native="handleQuery"/> 6 <el-input v-model="queryParams.handlerName" placeholder="请输入处理器的名字" clearable @keyup.enter.native="handleQuery"/>
7 </el-form-item> 7 </el-form-item>
yudao-ui-admin/src/views/infra/testDemo/index.vue
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="app-container"> 2 <div class="app-container">
3 3
4 <!-- 搜索工作栏 --> 4 <!-- 搜索工作栏 -->
5 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 5 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
6 <el-form-item label="名字" prop="name"> 6 <el-form-item label="名字" prop="name">
7 <el-input v-model="queryParams.name" placeholder="请输入名字" clearable @keyup.enter.native="handleQuery"/> 7 <el-input v-model="queryParams.name" placeholder="请输入名字" clearable @keyup.enter.native="handleQuery"/>
8 </el-form-item> 8 </el-form-item>
yudao-ui-admin/src/views/pay/app/index.vue
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="app-container"> 2 <div class="app-container">
3 3
4 <!-- 搜索工作栏 --> 4 <!-- 搜索工作栏 -->
5 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 5 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
6 <el-form-item label="应用名" prop="name"> 6 <el-form-item label="应用名" prop="name">
7 <el-input v-model="queryParams.name" placeholder="请输入应用名" clearable 7 <el-input v-model="queryParams.name" placeholder="请输入应用名" clearable
8 @keyup.enter.native="handleQuery"/> 8 @keyup.enter.native="handleQuery"/>
yudao-ui-admin/src/views/pay/merchant/index.vue
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="app-container"> 2 <div class="app-container">
3 3
4 <!-- 搜索工作栏 --> 4 <!-- 搜索工作栏 -->
5 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 5 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
6 <el-form-item label="商户号" prop="no"> 6 <el-form-item label="商户号" prop="no">
7 <el-input v-model="queryParams.no" placeholder="请输入商户号" clearable @keyup.enter.native="handleQuery"/> 7 <el-input v-model="queryParams.no" placeholder="请输入商户号" clearable @keyup.enter.native="handleQuery"/>
8 </el-form-item> 8 </el-form-item>
yudao-ui-admin/src/views/pay/order/index.vue
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="app-container"> 2 <div class="app-container">
3 3
4 <!-- 搜索工作栏 --> 4 <!-- 搜索工作栏 -->
5 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="120px"> 5 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
6 <el-form-item label="所属商户" prop="merchantId"> 6 <el-form-item label="所属商户" prop="merchantId">
7 <el-select v-model="queryParams.merchantId" clearable @clear="()=>{queryParams.merchantId = null}" 7 <el-select v-model="queryParams.merchantId" clearable @clear="()=>{queryParams.merchantId = null}"
8 filterable remote reserve-keyword placeholder="请选择所属商户" @change="handleGetAppListByMerchantId" 8 filterable remote reserve-keyword placeholder="请选择所属商户" @change="handleGetAppListByMerchantId"
yudao-ui-admin/src/views/pay/refund/index.vue
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="app-container"> 2 <div class="app-container">
3 3
4 <!-- 搜索工作栏 --> 4 <!-- 搜索工作栏 -->
5 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="120px"> 5 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
6 <el-form-item label="所属商户" prop="merchantId"> 6 <el-form-item label="所属商户" prop="merchantId">
7 <el-select v-model="queryParams.merchantId" clearable @clear="()=>{queryParams.merchantId = null}" 7 <el-select v-model="queryParams.merchantId" clearable @clear="()=>{queryParams.merchantId = null}"
8 filterable remote reserve-keyword placeholder="请选择所属商户" @change="handleGetAppListByMerchantId" 8 filterable remote reserve-keyword placeholder="请选择所属商户" @change="handleGetAppListByMerchantId"
yudao-ui-admin/src/views/system/dept/index.vue
1 <template> 1 <template>
2 <div class="app-container"> 2 <div class="app-container">
3 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch"> 3 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
4 <el-form-item label="部门名称" prop="name"> 4 <el-form-item label="部门名称" prop="name">
5 <el-input v-model="queryParams.name" placeholder="请输入部门名称" clearable @keyup.enter.native="handleQuery"/> 5 <el-input v-model="queryParams.name" placeholder="请输入部门名称" clearable @keyup.enter.native="handleQuery"/>
6 </el-form-item> 6 </el-form-item>
yudao-ui-admin/src/views/system/dict/data.vue
1 <template> 1 <template>
2 <div class="app-container"> 2 <div class="app-container">
3 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 3 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
4 <el-form-item label="字典名称" prop="dictType"> 4 <el-form-item label="字典名称" prop="dictType">
5 <el-select v-model="queryParams.dictType"> 5 <el-select v-model="queryParams.dictType">
6 <el-option v-for="item in typeOptions" :key="item.id" :label="item.name" :value="item.type"/> 6 <el-option v-for="item in typeOptions" :key="item.id" :label="item.name" :value="item.type"/>
yudao-ui-admin/src/views/system/dict/index.vue
1 <template> 1 <template>
2 <div class="app-container"> 2 <div class="app-container">
3 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 3 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
4 <el-form-item label="字典名称" prop="name"> 4 <el-form-item label="字典名称" prop="name">
5 <el-input v-model="queryParams.name" placeholder="请输入字典名称" clearable style="width: 240px" @keyup.enter.native="handleQuery"/> 5 <el-input v-model="queryParams.name" placeholder="请输入字典名称" clearable style="width: 240px" @keyup.enter.native="handleQuery"/>
6 </el-form-item> 6 </el-form-item>
yudao-ui-admin/src/views/system/errorCode/index.vue
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="app-container"> 2 <div class="app-container">
3 3
4 <!-- 搜索工作栏 --> 4 <!-- 搜索工作栏 -->
5 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="100px"> 5 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
6 <el-form-item label="错误码类型" prop="type"> 6 <el-form-item label="错误码类型" prop="type">
7 <el-select v-model="queryParams.type" placeholder="请选择错误码类型" clearable> 7 <el-select v-model="queryParams.type" placeholder="请选择错误码类型" clearable>
8 <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_ERROR_CODE_TYPE)" 8 <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_ERROR_CODE_TYPE)"
yudao-ui-admin/src/views/system/loginlog/index.vue
1 <template> 1 <template>
2 <div class="app-container"> 2 <div class="app-container">
3 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 3 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
4 <el-form-item label="登录地址" prop="userIp"> 4 <el-form-item label="登录地址" prop="userIp">
5 <el-input v-model="queryParams.userIp" placeholder="请输入登录地址" clearable style="width: 240px;" 5 <el-input v-model="queryParams.userIp" placeholder="请输入登录地址" clearable style="width: 240px;"
6 @keyup.enter.native="handleQuery"/> 6 @keyup.enter.native="handleQuery"/>
yudao-ui-admin/src/views/system/menu/index.vue
1 <template> 1 <template>
2 <div class="app-container"> 2 <div class="app-container">
3 <doc-alert title="功能权限" url="https://doc.iocoder.cn/resource-permission" /> 3 <doc-alert title="功能权限" url="https://doc.iocoder.cn/resource-permission" />
4 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch"> 4 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
5 <el-form-item label="菜单名称" prop="name"> 5 <el-form-item label="菜单名称" prop="name">
6 <el-input v-model="queryParams.name" placeholder="请输入菜单名称" clearable @keyup.enter.native="handleQuery"/> 6 <el-input v-model="queryParams.name" placeholder="请输入菜单名称" clearable @keyup.enter.native="handleQuery"/>
7 </el-form-item> 7 </el-form-item>
yudao-ui-admin/src/views/system/notice/index.vue
1 <template> 1 <template>
2 <div class="app-container"> 2 <div class="app-container">
3 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 3 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
4 <el-form-item label="公告标题" prop="title"> 4 <el-form-item label="公告标题" prop="title">
5 <el-input v-model="queryParams.title" placeholder="请输入公告标题" clearable @keyup.enter.native="handleQuery"/> 5 <el-input v-model="queryParams.title" placeholder="请输入公告标题" clearable @keyup.enter.native="handleQuery"/>
6 </el-form-item> 6 </el-form-item>
yudao-ui-admin/src/views/system/operatelog/index.vue
1 <template> 1 <template>
2 <div class="app-container"> 2 <div class="app-container">
3 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 3 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
4 <el-form-item label="系统模块" prop="title"> 4 <el-form-item label="系统模块" prop="title">
5 <el-input v-model="queryParams.title" placeholder="请输入系统模块" clearable style="width: 240px;" 5 <el-input v-model="queryParams.title" placeholder="请输入系统模块" clearable style="width: 240px;"
6 @keyup.enter.native="handleQuery"/> 6 @keyup.enter.native="handleQuery"/>
yudao-ui-admin/src/views/system/post/index.vue
1 <template> 1 <template>
2 <div class="app-container"> 2 <div class="app-container">
3 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 3 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
4 <el-form-item label="岗位编码" prop="code"> 4 <el-form-item label="岗位编码" prop="code">
5 <el-input v-model="queryParams.code" placeholder="请输入岗位编码" clearable @keyup.enter.native="handleQuery"/> 5 <el-input v-model="queryParams.code" placeholder="请输入岗位编码" clearable @keyup.enter.native="handleQuery"/>
6 </el-form-item> 6 </el-form-item>
yudao-ui-admin/src/views/system/session/index.vue
1 <template> 1 <template>
2 <div class="app-container"> 2 <div class="app-container">
3 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" label-width="68px"> 3 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
4 <el-form-item label="登录地址" prop="userIp"> 4 <el-form-item label="登录地址" prop="userIp">
5 <el-input v-model="queryParams.userIp" placeholder="请输入登录地址" clearable @keyup.enter.native="handleQuery"/> 5 <el-input v-model="queryParams.userIp" placeholder="请输入登录地址" clearable @keyup.enter.native="handleQuery"/>
6 </el-form-item> 6 </el-form-item>
yudao-ui-admin/src/views/system/sms/smsChannel.vue
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="app-container"> 2 <div class="app-container">
3 3
4 <!-- 搜索工作栏 --> 4 <!-- 搜索工作栏 -->
5 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 5 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
6 <el-form-item label="短信签名" prop="signature"> 6 <el-form-item label="短信签名" prop="signature">
7 <el-input v-model="queryParams.signature" placeholder="请输入短信签名" clearable @keyup.enter.native="handleQuery"/> 7 <el-input v-model="queryParams.signature" placeholder="请输入短信签名" clearable @keyup.enter.native="handleQuery"/>
8 </el-form-item> 8 </el-form-item>
yudao-ui-admin/src/views/system/sms/smsLog.vue
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="app-container"> 2 <div class="app-container">
3 3
4 <!-- 搜索工作栏 --> 4 <!-- 搜索工作栏 -->
5 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="100px"> 5 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
6 <el-form-item label="手机号" prop="mobile"> 6 <el-form-item label="手机号" prop="mobile">
7 <el-input v-model="queryParams.mobile" placeholder="请输入手机号" clearable @keyup.enter.native="handleQuery"/> 7 <el-input v-model="queryParams.mobile" placeholder="请输入手机号" clearable @keyup.enter.native="handleQuery"/>
8 </el-form-item> 8 </el-form-item>
yudao-ui-admin/src/views/system/sms/smsTemplate.vue
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="app-container"> 2 <div class="app-container">
3 3
4 <!-- 搜索工作栏 --> 4 <!-- 搜索工作栏 -->
5 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="150px"> 5 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="150px">
6 <el-form-item label="短信类型" prop="type"> 6 <el-form-item label="短信类型" prop="type">
7 <el-select v-model="queryParams.type" placeholder="请选择短信类型" clearable> 7 <el-select v-model="queryParams.type" placeholder="请选择短信类型" clearable>
8 <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE)" 8 <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE)"
yudao-ui-admin/src/views/system/tenant/index.vue
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="app-container"> 2 <div class="app-container">
3 <doc-alert title="SaaS 多租户" url="https://doc.iocoder.cn/saas-tenant/" /> 3 <doc-alert title="SaaS 多租户" url="https://doc.iocoder.cn/saas-tenant/" />
4 <!-- 搜索工作栏 --> 4 <!-- 搜索工作栏 -->
5 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 5 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
6 <el-form-item label="租户名" prop="name"> 6 <el-form-item label="租户名" prop="name">
7 <el-input v-model="queryParams.name" placeholder="请输入租户名" clearable @keyup.enter.native="handleQuery"/> 7 <el-input v-model="queryParams.name" placeholder="请输入租户名" clearable @keyup.enter.native="handleQuery"/>
8 </el-form-item> 8 </el-form-item>
yudao-ui-admin/src/views/system/tenantPackage/index.vue
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="app-container"> 2 <div class="app-container">
3 <doc-alert title="SaaS 多租户" url="https://doc.iocoder.cn/saas-tenant/" /> 3 <doc-alert title="SaaS 多租户" url="https://doc.iocoder.cn/saas-tenant/" />
4 <!-- 搜索工作栏 --> 4 <!-- 搜索工作栏 -->
5 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 5 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
6 <el-form-item label="套餐名" prop="name"> 6 <el-form-item label="套餐名" prop="name">
7 <el-input v-model="queryParams.name" placeholder="请输入套餐名" clearable @keyup.enter.native="handleQuery"/> 7 <el-input v-model="queryParams.name" placeholder="请输入套餐名" clearable @keyup.enter.native="handleQuery"/>
8 </el-form-item> 8 </el-form-item>
yudao-ui-admin/src/views/system/user/index.vue
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 </el-col> 13 </el-col>
14 <!--用户数据--> 14 <!--用户数据-->
15 <el-col :span="20" :xs="24"> 15 <el-col :span="20" :xs="24">
16 - <el-form :model="queryParams" ref="queryForm" size="small" inline="true" v-show="showSearch" label-width="68px"> 16 + <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
17 <el-form-item label="用户名称" prop="username"> 17 <el-form-item label="用户名称" prop="username">
18 <el-input v-model="queryParams.username" placeholder="请输入用户名称" clearable style="width: 240px" 18 <el-input v-model="queryParams.username" placeholder="请输入用户名称" clearable style="width: 240px"
19 @keyup.enter.native="handleQuery"/> 19 @keyup.enter.native="handleQuery"/>