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

src/config/index.js

@@ -14,6 +14,10 @@ export default {
    * @description 此处修改网站名称
    */
   webName: 'eladmin',
+  /**
+   * @description 是否只保持一个子菜单的展开
+   */
+  uniqueOpened: true,
   /**
    * @description token key
    */

src/store/modules/settings.js

@@ -8,7 +8,8 @@ const settings = {
     fixedHeader: Config.fixedHeader,
     sidebarLogo: Config.sidebarLogo,
     theme: variables.theme,
-    settingBtn: Config.settingBtn
+    settingBtn: Config.settingBtn,
+    uniqueOpened: Config.uniqueOpened
   },
   mutations: {
     CHANGE_SETTING: (state, { key, value }) => {

src/views/layout/components/Settings/index.vue

@@ -2,25 +2,27 @@
   <div class="drawer-container">
     <div>
       <h3 class="drawer-title">系统布局配置</h3>
-      <div class="drawer-item">
-        <span>开启 Tags-Views</span>
-        <el-switch v-model="tagsView" class="drawer-switch" />
-      </div>
-
-      <div class="drawer-item">
-        <span>固定 Header</span>
-        <el-switch v-model="fixedHeader" class="drawer-switch" />
-      </div>
 
       <div class="drawer-item">
         <span>显示 Logo</span>
         <el-switch v-model="sidebarLogo" class="drawer-switch" />
       </div>
-
+      <div class="drawer-item">
+        <span>固定 Header</span>
+        <el-switch v-model="fixedHeader" class="drawer-switch" />
+      </div>
+      <div class="drawer-item">
+        <span>开启 Tags-Views</span>
+        <el-switch v-model="tagsView" class="drawer-switch" />
+      </div>
       <div class="drawer-item">
         <span>显示 SettingBtn</span>
         <el-switch v-model="settingBtn" class="drawer-switch" />
       </div>
+      <div class="drawer-item">
+        <span>菜单 uniqueOpened</span>
+        <el-switch v-model="uniqueOpened" class="drawer-switch" />
+      </div>
 
     </div>
   </div>
@@ -75,6 +77,17 @@ export default {
           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 @@
       :show-timeout="200"
       :default-active="$route.path"
       :collapse="isCollapse"
+      :unique-opened="$store.state.settings.uniqueOpened"
       mode="vertical"
       background-color="#304156"
       text-color="#bfcbd9"

src/views/monitor/redis/module/header.vue

@@ -4,9 +4,8 @@
     <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>
     <!-- 新增 -->
-    <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
-        v-permission="['ADMIN','REDIS_ALL','REDIS_CREATE']"
         class="filter-item"
         size="mini"
         type="primary"
@@ -14,8 +13,10 @@
         @click="$refs.form.dialog = true">新增</el-button>
       <eForm ref="form" :is-add="true"/>
     </div>
-    <!-- 清空缓存 -->
-    <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 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>
+    </div>
   </div>
 </template>
 

src/views/system/dept/module/header.vue

@@ -7,9 +7,8 @@
     </el-select>
     <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
-        v-permission="['ADMIN','DEPT_ALL','DEPT_CREATE']"
         class="filter-item"
         size="mini"
         type="primary"
@@ -17,13 +16,13 @@
         @click="add">新增</el-button>
       <eForm ref="form" :is-add="true" :dicts="dicts"/>
     </div>
-    <div style="display: inline-block;margin: 0px 2px;">
+    <div style="display: inline-block;">
       <el-button
         class="filter-item"
         size="mini"
         type="warning"
         icon="el-icon-more"
-        @click="expand">展开/折叠</el-button>
+        @click="expand">{{ $parent.expand ? '折叠' : '展开' }}</el-button>
       <eForm ref="form" :is-add="true" :dicts="dicts"/>
     </div>
   </div>

src/views/system/job/module/header.vue

@@ -7,9 +7,8 @@
     </el-select>
     <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
-        v-permission="['ADMIN','USERJOB_ALL','USERJOB_CREATE']"
         class="filter-item"
         size="mini"
         type="primary"

src/views/system/menu/module/header.vue

@@ -4,9 +4,8 @@
     <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>
     <!-- 新增 -->
-    <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
-        v-permission="['ADMIN','MENU_ALL','MENU_CREATE']"
         class="filter-item"
         size="mini"
         type="primary"
@@ -14,13 +13,13 @@
         @click="add">新增</el-button>
       <eForm ref="form" :is-add="true"/>
     </div>
-    <div style="display: inline-block;margin: 0px 2px;">
+    <div style="display: inline-block;">
       <el-button
         class="filter-item"
         size="mini"
         type="warning"
         icon="el-icon-more"
-        @click="expand">展开/折叠</el-button>
+        @click="expand">{{ $parent.expand ? '折叠' : '展开' }}</el-button>
       <eForm ref="form" :is-add="true"/>
     </div>
   </div>

src/views/system/permission/module/header.vue

@@ -4,9 +4,8 @@
     <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>
     <!-- 新增 -->
-    <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
-        v-permission="['ADMIN','PERMISSION_ALL','PERMISSION_CREATE']"
         class="filter-item"
         size="mini"
         type="primary"
@@ -14,13 +13,13 @@
         @click="add">新增</el-button>
       <eForm ref="form" :is-add="true"/>
     </div>
-    <div style="display: inline-block;margin: 0px 2px;">
+    <div style="display: inline-block;">
       <el-button
         class="filter-item"
         size="mini"
         type="warning"
         icon="el-icon-more"
-        @click="expand">展开/折叠</el-button>
+        @click="expand">{{ $parent.expand ? '折叠' : '展开' }}</el-button>
       <eForm ref="form" :is-add="true"/>
     </div>
   </div>

src/views/system/role/module/header.vue

@@ -4,9 +4,8 @@
     <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>
     <!-- 新增 -->
-    <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
-        v-permission="['ADMIN','ROLES_ALL','ROLES_CREATE']"
         class="filter-item"
         size="mini"
         type="primary"

src/views/system/timing/module/header.vue

@@ -4,9 +4,8 @@
     <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>
     <!-- 新增 -->
-    <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
-        v-permission="['ADMIN','JOB_ALL','JOB_CREATE']"
         class="filter-item"
         size="mini"
         type="primary"
@@ -15,7 +14,7 @@
       <eForm ref="form" :is-add="true"/>
     </div>
     <!-- 任务日志 -->
-    <div style="display: inline-block;margin: 0px 2px;">
+    <div v-permission="['ADMIN','JOB_ALL','JOB_SELECT']" style="display: inline-block;">
       <el-button
         class="filter-item"
         size="mini"

src/views/system/user/module/header.vue

@@ -10,9 +10,8 @@
     </el-select>
     <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
-        v-permission="['ADMIN','USER_ALL','USER_CREATE']"
         class="filter-item"
         size="mini"
         type="primary"
@@ -21,14 +20,16 @@
       <eForm ref="form" :sup_this="sup_this" :is-add="true" :dicts="dicts"/>
     </div>
     <!-- 导出 -->
-    <el-button
-      v-permission="['ADMIN']"
-      :loading="downloadLoading"
-      size="mini"
-      class="filter-item"
-      type="warning"
-      icon="el-icon-download"
-      @click="download">导出</el-button>
+    <div style="display: inline-block;">
+      <el-button
+        v-permission="['ADMIN']"
+        :loading="downloadLoading"
+        size="mini"
+        class="filter-item"
+        type="warning"
+        icon="el-icon-download"
+        @click="download">导出</el-button>
+    </div>
   </div>
 </template>
 

src/views/tools/picture/module/header.vue

@@ -17,15 +17,16 @@
         @click="$refs.form.dialog = true">上传图片</el-button>
       <eForm ref="form"/>
     </div>
-    <el-button
-      v-permission="['ADMIN','PICTURE_ALL','PICTURE_DELETE']"
-      :loading="delLoading"
-      :disabled="$parent.data.length === 0 || $parent.$refs.table.selection.length === 0"
-      class="filter-item"
-      size="mini"
-      type="danger"
-      icon="el-icon-delete"
-      @click="open">删除</el-button>
+    <div v-permission="['ADMIN','PICTURE_ALL','PICTURE_DELETE']" style="display: inline-block;">
+      <el-button
+        :loading="delLoading"
+        :disabled="$parent.data.length === 0 || $parent.$refs.table.selection.length === 0"
+        class="filter-item"
+        size="mini"
+        type="danger"
+        icon="el-icon-delete"
+        @click="open">删除</el-button>
+    </div>
   </div>
 </template>