Skip to content

F
front-backend
Commit a5c9f588 by zhengjie
Options

v1.9 发布，详情查看发行版说明

parent ff6b5d16
Showing with 66 additions and 50 deletions
src/config/index.js
...@@ -15,6 +15,10 @@ export default { ...@@ -15,6 +15,10 @@ export default {
*/ */
webName: 'eladmin', webName: 'eladmin',
/** /**
* @description 是否只保持一个子菜单的展开
*/
uniqueOpened: true,
/**
* @description token key * @description token key
*/ */
TokenKey: 'EL-ADMIN-TOEKN', TokenKey: 'EL-ADMIN-TOEKN',
......
src/store/modules/settings.js
...@@ -8,7 +8,8 @@ const settings = { ...@@ -8,7 +8,8 @@ const settings = {
fixedHeader: Config.fixedHeader, fixedHeader: Config.fixedHeader,
sidebarLogo: Config.sidebarLogo, sidebarLogo: Config.sidebarLogo,
theme: variables.theme, theme: variables.theme,
settingBtn: Config.settingBtn settingBtn: Config.settingBtn,
uniqueOpened: Config.uniqueOpened
}, },
mutations: { mutations: {
CHANGE_SETTING: (state, { key, value }) => { CHANGE_SETTING: (state, { key, value }) => {
......
src/views/layout/components/Settings/index.vue
...@@ -2,25 +2,27 @@ ...@@ -2,25 +2,27 @@
<div class="drawer-container"> <div class="drawer-container">
<div> <div>
<h3 class="drawer-title">系统布局配置</h3> <h3 class="drawer-title">系统布局配置</h3>
<div class="drawer-item"> <div class="drawer-item">
<span>开启 Tags-Views</span> <span>显示 Logo</span>
<el-switch v-model="tagsView" class="drawer-switch" /> <el-switch v-model="sidebarLogo" class="drawer-switch" />
</div> </div>
<div class="drawer-item"> <div class="drawer-item">
<span>固定 Header</span> <span>固定 Header</span>
<el-switch v-model="fixedHeader" class="drawer-switch" /> <el-switch v-model="fixedHeader" class="drawer-switch" />
</div> </div>
<div class="drawer-item"> <div class="drawer-item">
<span>显示 Logo</span> <span>开启 Tags-Views</span>
<el-switch v-model="sidebarLogo" class="drawer-switch" /> <el-switch v-model="tagsView" class="drawer-switch" />
</div> </div>
<div class="drawer-item"> <div class="drawer-item">
<span>显示 SettingBtn</span> <span>显示 SettingBtn</span>
<el-switch v-model="settingBtn" class="drawer-switch" /> <el-switch v-model="settingBtn" class="drawer-switch" />
</div> </div>
<div class="drawer-item">
<span>菜单 uniqueOpened</span>
<el-switch v-model="uniqueOpened" class="drawer-switch" />
</div>
</div> </div>
</div> </div>
...@@ -75,6 +77,17 @@ export default { ...@@ -75,6 +77,17 @@ export default {
value: val value: val
}) })
} }
},
uniqueOpened: {
get() {
return this.$store.state.settings.uniqueOpened
},
set(val) {
this.$store.dispatch('changeSetting', {
key: 'uniqueOpened',
value: val
})
}
} }
} }
} }
......
src/views/layout/components/Sidebar/index.vue
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
:show-timeout="200" :show-timeout="200"
:default-active="$route.path" :default-active="$route.path"
:collapse="isCollapse" :collapse="isCollapse"
:unique-opened="$store.state.settings.uniqueOpened"
mode="vertical" mode="vertical"
background-color="#304156" background-color="#304156"
text-color="#bfcbd9" text-color="#bfcbd9"
......
src/views/monitor/redis/module/header.vue
...@@ -4,9 +4,8 @@ ...@@ -4,9 +4,8 @@
<el-input v-model="query.value" clearable placeholder="输入关键词搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/> <el-input v-model="query.value" clearable placeholder="输入关键词搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button> <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
<!-- 新增 --> <!-- 新增 -->
<div style="display: inline-block;margin: 0px 2px;"> <div v-permission="['ADMIN','REDIS_ALL','REDIS_CREATE']" style="display: inline-block;margin: 0px 2px;">
<el-button <el-button
v-permission="['ADMIN','REDIS_ALL','REDIS_CREATE']"
class="filter-item" class="filter-item"
size="mini" size="mini"
type="primary" type="primary"
...@@ -14,8 +13,10 @@ ...@@ -14,8 +13,10 @@
@click="$refs.form.dialog = true">新增</el-button> @click="$refs.form.dialog = true">新增</el-button>
<eForm ref="form" :is-add="true"/> <eForm ref="form" :is-add="true"/>
</div> </div>
<!-- 清空缓存 --> <div style="display: inline-block;">
<el-button v-permission="['ADMIN','REDIS_ALL','REDIS_DELETE']" :loading="deleteAllLoading" type="warning" size="mini" class="filter-item" icon="el-icon-delete" @click="deleteAll">清空缓存</el-button> <!-- 清空缓存 -->
<el-button v-permission="['ADMIN','REDIS_ALL','REDIS_DELETE']" :loading="deleteAllLoading" type="warning" size="mini" class="filter-item" icon="el-icon-delete" @click="deleteAll">清空缓存</el-button>
</div>
</div> </div>
</template> </template>
......
src/views/system/dept/module/header.vue
...@@ -7,9 +7,8 @@ ...@@ -7,9 +7,8 @@
</el-select> </el-select>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button> <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
<!-- 新增 --> <!-- 新增 -->
<div style="display: inline-block;margin: 0px 2px;"> <div v-permission="['ADMIN','DEPT_ALL','DEPT_CREATE']" style="display: inline-block;margin: 0px 2px;">
<el-button <el-button
v-permission="['ADMIN','DEPT_ALL','DEPT_CREATE']"
class="filter-item" class="filter-item"
size="mini" size="mini"
type="primary" type="primary"
...@@ -17,13 +16,13 @@ ...@@ -17,13 +16,13 @@
@click="add">新增</el-button> @click="add">新增</el-button>
<eForm ref="form" :is-add="true" :dicts="dicts"/> <eForm ref="form" :is-add="true" :dicts="dicts"/>
</div> </div>
<div style="display: inline-block;margin: 0px 2px;"> <div style="display: inline-block;">
<el-button <el-button
class="filter-item" class="filter-item"
size="mini" size="mini"
type="warning" type="warning"
icon="el-icon-more" icon="el-icon-more"
@click="expand">展开/折叠</el-button> @click="expand">{{ $parent.expand ? '折叠' : '展开' }}</el-button>
<eForm ref="form" :is-add="true" :dicts="dicts"/> <eForm ref="form" :is-add="true" :dicts="dicts"/>
</div> </div>
</div> </div>
......
src/views/system/job/module/header.vue
...@@ -7,9 +7,8 @@ ...@@ -7,9 +7,8 @@
</el-select> </el-select>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button> <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
<!-- 新增 --> <!-- 新增 -->
<div style="display: inline-block;margin: 0px 2px;"> <div v-permission="['ADMIN','USERJOB_ALL','USERJOB_CREATE']" style="display: inline-block;margin: 0px 2px;">
<el-button <el-button
v-permission="['ADMIN','USERJOB_ALL','USERJOB_CREATE']"
class="filter-item" class="filter-item"
size="mini" size="mini"
type="primary" type="primary"
......
src/views/system/menu/module/header.vue
...@@ -4,9 +4,8 @@ ...@@ -4,9 +4,8 @@
<el-input v-model="query.value" clearable placeholder="输入名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/> <el-input v-model="query.value" clearable placeholder="输入名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button> <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
<!-- 新增 --> <!-- 新增 -->
<div style="display: inline-block;margin: 0px 2px;"> <div v-permission="['ADMIN','MENU_ALL','MENU_CREATE']" style="display: inline-block;margin: 0px 2px;">
<el-button <el-button
v-permission="['ADMIN','MENU_ALL','MENU_CREATE']"
class="filter-item" class="filter-item"
size="mini" size="mini"
type="primary" type="primary"
...@@ -14,13 +13,13 @@ ...@@ -14,13 +13,13 @@
@click="add">新增</el-button> @click="add">新增</el-button>
<eForm ref="form" :is-add="true"/> <eForm ref="form" :is-add="true"/>
</div> </div>
<div style="display: inline-block;margin: 0px 2px;"> <div style="display: inline-block;">
<el-button <el-button
class="filter-item" class="filter-item"
size="mini" size="mini"
type="warning" type="warning"
icon="el-icon-more" icon="el-icon-more"
@click="expand">展开/折叠</el-button> @click="expand">{{ $parent.expand ? '折叠' : '展开' }}</el-button>
<eForm ref="form" :is-add="true"/> <eForm ref="form" :is-add="true"/>
</div> </div>
</div> </div>
......
src/views/system/permission/module/header.vue
...@@ -4,9 +4,8 @@ ...@@ -4,9 +4,8 @@
<el-input v-model="query.value" clearable placeholder="输入名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/> <el-input v-model="query.value" clearable placeholder="输入名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button> <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
<!-- 新增 --> <!-- 新增 -->
<div style="display: inline-block;margin: 0px 2px;"> <div v-permission="['ADMIN','PERMISSION_ALL','PERMISSION_CREATE']" style="display: inline-block;margin: 0px 2px 0px">
<el-button <el-button
v-permission="['ADMIN','PERMISSION_ALL','PERMISSION_CREATE']"
class="filter-item" class="filter-item"
size="mini" size="mini"
type="primary" type="primary"
...@@ -14,13 +13,13 @@ ...@@ -14,13 +13,13 @@
@click="add">新增</el-button> @click="add">新增</el-button>
<eForm ref="form" :is-add="true"/> <eForm ref="form" :is-add="true"/>
</div> </div>
<div style="display: inline-block;margin: 0px 2px;"> <div style="display: inline-block;">
<el-button <el-button
class="filter-item" class="filter-item"
size="mini" size="mini"
type="warning" type="warning"
icon="el-icon-more" icon="el-icon-more"
@click="expand">展开/折叠</el-button> @click="expand">{{ $parent.expand ? '折叠' : '展开' }}</el-button>
<eForm ref="form" :is-add="true"/> <eForm ref="form" :is-add="true"/>
</div> </div>
</div> </div>
......
src/views/system/role/module/header.vue
...@@ -4,9 +4,8 @@ ...@@ -4,9 +4,8 @@
<el-input v-model="query.value" clearable placeholder="输入名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/> <el-input v-model="query.value" clearable placeholder="输入名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button> <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
<!-- 新增 --> <!-- 新增 -->
<div style="display: inline-block;margin: 0px 2px;"> <div v-permission="['ADMIN','ROLES_ALL','ROLES_CREATE']" style="display: inline-block;margin: 0px 2px;">
<el-button <el-button
v-permission="['ADMIN','ROLES_ALL','ROLES_CREATE']"
class="filter-item" class="filter-item"
size="mini" size="mini"
type="primary" type="primary"
......
src/views/system/timing/module/header.vue
...@@ -4,9 +4,8 @@ ...@@ -4,9 +4,8 @@
<el-input v-model="query.value" clearable placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/> <el-input v-model="query.value" clearable placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button> <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
<!-- 新增 --> <!-- 新增 -->
<div style="display: inline-block;margin: 0px 2px;"> <div v-permission="['ADMIN','JOB_ALL','JOB_CREATE']" style="display: inline-block;margin: 0px 2px;">
<el-button <el-button
v-permission="['ADMIN','JOB_ALL','JOB_CREATE']"
class="filter-item" class="filter-item"
size="mini" size="mini"
type="primary" type="primary"
...@@ -15,7 +14,7 @@ ...@@ -15,7 +14,7 @@
<eForm ref="form" :is-add="true"/> <eForm ref="form" :is-add="true"/>
</div> </div>
<!-- 任务日志 --> <!-- 任务日志 -->
<div style="display: inline-block;margin: 0px 2px;"> <div v-permission="['ADMIN','JOB_ALL','JOB_SELECT']" style="display: inline-block;">
<el-button <el-button
class="filter-item" class="filter-item"
size="mini" size="mini"
......
src/views/system/user/module/header.vue
...@@ -10,9 +10,8 @@ ...@@ -10,9 +10,8 @@
</el-select> </el-select>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button> <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="toQuery">搜索</el-button>
<!-- 新增 --> <!-- 新增 -->
<div style="display: inline-block;margin: 0px 2px;"> <div v-permission="['ADMIN','USER_ALL','USER_CREATE']" style="display: inline-block;margin: 0px 2px;">
<el-button <el-button
v-permission="['ADMIN','USER_ALL','USER_CREATE']"
class="filter-item" class="filter-item"
size="mini" size="mini"
type="primary" type="primary"
...@@ -21,14 +20,16 @@ ...@@ -21,14 +20,16 @@
<eForm ref="form" :sup_this="sup_this" :is-add="true" :dicts="dicts"/> <eForm ref="form" :sup_this="sup_this" :is-add="true" :dicts="dicts"/>
</div> </div>
<!-- 导出 --> <!-- 导出 -->
<el-button <div style="display: inline-block;">
v-permission="['ADMIN']" <el-button
:loading="downloadLoading" v-permission="['ADMIN']"
size="mini" :loading="downloadLoading"
class="filter-item" size="mini"
type="warning" class="filter-item"
icon="el-icon-download" type="warning"
@click="download">导出</el-button> icon="el-icon-download"
@click="download">导出</el-button>
</div>
</div> </div>
</template> </template>
......
src/views/tools/picture/module/header.vue
...@@ -17,15 +17,16 @@ ...@@ -17,15 +17,16 @@
@click="$refs.form.dialog = true">上传图片</el-button> @click="$refs.form.dialog = true">上传图片</el-button>
<eForm ref="form"/> <eForm ref="form"/>
</div> </div>
<el-button <div v-permission="['ADMIN','PICTURE_ALL','PICTURE_DELETE']" style="display: inline-block;">
v-permission="['ADMIN','PICTURE_ALL','PICTURE_DELETE']" <el-button
:loading="delLoading" :loading="delLoading"
:disabled="$parent.data.length === 0 || $parent.$refs.table.selection.length === 0" :disabled="$parent.data.length === 0 || $parent.$refs.table.selection.length === 0"
class="filter-item" class="filter-item"
size="mini" size="mini"
type="danger" type="danger"
icon="el-icon-delete" icon="el-icon-delete"
@click="open">删除</el-button> @click="open">删除</el-button>
</div>
</div> </div>
</template> </template>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment