Merge branch 'master' into deploy

src/layout/components/Settings/index.vue

@@ -23,11 +23,6 @@
         <el-switch v-model="sidebarLogo" class="drawer-switch" />
       </div>
 
-      <div class="drawer-item">
-        <span>菜单UniqueOpened</span>
-        <el-switch v-model="uniqueOpened" class="drawer-switch" />
-      </div>
-
     </div>
   </div>
 </template>
@@ -73,17 +68,6 @@ export default {
           value: val
         })
       }
-    },
-    uniqueOpened: {
-      get() {
-        return this.$store.state.settings.uniqueOpened
-      },
-      set(val) {
-        this.$store.dispatch('settings/changeSetting', {
-          key: 'uniqueOpened',
-          value: val
-        })
-      }
     }
   },
   methods: {

src/layout/components/Sidebar/index.vue

@@ -7,9 +7,9 @@
         :collapse="isCollapse"
         :background-color="variables.menuBg"
         :text-color="variables.menuText"
-        :unique-opened="$store.state.settings.uniqueOpened"
         :active-text-color="variables.menuActiveText"
         :collapse-transition="false"
+        unique-opened
         mode="vertical"
       >
         <sidebar-item v-for="route in sidebarRouters" :key="route.path" :item="route" :base-path="route.path" />