Merge remote-tracking branch 'origin/dev' into dev

gaoluyang

昨天 b32d139e8c6b6e9590bf14479710e6d107a21d26

 src/layout/index.vue

@@ -1,10 +1,10 @@
<template>
  <div :class="classObj" class="app-wrapper" :style="{ '--current-color': theme }">
    <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
    <navbar @setLayout="setLayout" />
    <sidebar v-if="!sidebar.hide" class="sidebar-container" />
    <div :class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }" class="main-container">
      <div :class="{ 'fixed-header': fixedHeader }">
        <navbar @setLayout="setLayout" />
        <tags-view v-if="needTagsView" />
      </div>
      <app-main />
@@ -99,7 +99,7 @@
}

.hideSidebar .fixed-header {
  width: calc(100% - 54px);
  width: calc(100% - 120px);
}

.sidebarHide .fixed-header {