Browse Source

通过环境判断菜单是否展示

002390 1 year ago
parent
commit
79df3b869b

+ 5 - 5
src/assets/styles/sidebar.scss

@@ -3,7 +3,7 @@
   .main-container {
     min-height: 100%;
     transition: margin-left .28s;
-    // margin-left: $base-sidebar-width;
+    margin-left: $base-sidebar-width;
     margin-left: 0;
     position: relative;
   }
@@ -46,7 +46,7 @@
     }
 
     &.has-logo {
-      display: none;
+      // display: none;
       .el-scrollbar {
         height: calc(100% - 50px);
       }
@@ -111,13 +111,13 @@
 
   .hideSidebar {
     .sidebar-container {
-      display: none;
+      // display: none;
       width: 54px !important;
     }
 
     .main-container {
-      // margin-left: 54px;
-      margin-left: 0;
+      margin-left: 54px;
+      // margin-left: 0;
     }
 
     .submenu-title-noDropdown {

+ 1 - 0
src/components/super-table/index.vue

@@ -396,6 +396,7 @@ export default {
           </slot>
         </template>
       </el-table-column>
+      <slot ></slot>
     </el-table>
     <div
       v-if="pagination && buttonOperation"

+ 1 - 1
src/layout/components/Navbar.vue

@@ -117,7 +117,7 @@
     position: relative;
     background: #fff;
     box-shadow: 0 1px 4px rgba(0,21,41,.08);
-    display: none;
+    // display: none;
 
     .hamburger-container {
       line-height: 46px;

+ 1 - 1
src/layout/components/TagsView/index.vue

@@ -244,7 +244,7 @@ export default {
   background: #fff;
   border-bottom: 1px solid #d8dce5;
   box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
-  display: none;
+  // display: none;
   .tags-view-wrapper {
     .tags-view-item {
       display: inline-block;

+ 19 - 3
src/layout/index.vue

@@ -2,9 +2,9 @@
   <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
     <el-scrollbar>
       <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-      <sidebar v-if="!sidebar.hide" class="sidebar-container"/>
-      <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
-        <div :class="{'fixed-header':fixedHeader}">
+      <sidebar v-if="!sidebar.hide && handleNavigationBarShow()" class="sidebar-container"/>
+      <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container" :style="cssVar">
+        <div v-if="handleNavigationBarShow()" :class="{'fixed-header':fixedHeader}">
           <navbar/>
           <tags-view v-if="needTagsView"/>
         </div>
@@ -54,11 +54,23 @@ export default {
     },
     variables() {
       return variables;
+    },
+    cssVar(){
+      return {
+        'margin-left': this.handleNavigationBarShow() ? '54px': '0px'
     }
+  },  
   },
   methods: {
     handleClickOutside() {
       this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
+    },
+    handleNavigationBarShow(){
+
+      if(process.env.NODE_ENV === 'development'){
+        return true;
+      }
+      return false;
     }
   }
 }
@@ -68,6 +80,10 @@ export default {
   @import "~@/assets/styles/mixin.scss";
   @import "~@/assets/styles/variables.scss";
 
+  // #app .hideSidebar .main-container{
+  //   margin-left: var(--left)!important;
+  // }
+
   .app-wrapper {
     @include clearfix;
     position: relative;