提交merge1.3

openhis-ui-vue3/src/layout/components/Sidebar/index.vue

@@ -1,34 +1,5 @@
 <template>
   <div
-<<<<<<< HEAD
-  :class="{ 'has-logo': showLogo }"
-  :style="{
-    backgroundColor:
-      sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground,
-  }"
-  class="sidebar-layout"
->
-    <!-- <logo v-if="showLogo" :collapse="isCollapse" /> -->
-      <el-menu
-        :default-active="activeMenu"
-        :collapse="isCollapse"
-        :background-color="
-          sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground
-        "
-        :text-color="sideTheme === 'theme-dark' ? variables.menuColor : variables.menuLightColor"
-        :unique-opened="true"
-        :active-text-color="theme"
-        :collapse-transition="false"
-        mode="horizontal"
-      >
-        <sidebar-item
-          v-for="(route, index) in sidebarRouters"
-          :key="route.path + index"
-          :item="route"
-          :base-path="route.path"
-        />
-      </el-menu>
-=======
     :class="{ 'has-logo': showLogo }"
     class="sidebar-wrapper"
     :style="{
@@ -60,7 +31,6 @@
         </el-menu>
       </div>
     </div>
->>>>>>> v1.3
     <navbar @setLayout="setLayout" class="navbar-container" />
     <settings ref="settingRef" />
   </div>
@@ -103,9 +73,6 @@ function setLayout() {
 </script>
 
 <style lang="scss" scoped>
-<<<<<<< HEAD
-/* 移除滚动条样式 */
-=======
 .sidebar-wrapper {
   display: flex;
   flex-direction: row;
@@ -152,7 +119,6 @@ function setLayout() {
     background: transparent;
   }
 }
->>>>>>> v1.3
 
 .el-menu--horizontal {
   display: flex !important;
@@ -161,12 +127,7 @@ function setLayout() {
   background-color: transparent !important;
   min-width: auto;
   flex-wrap: nowrap;
-<<<<<<< HEAD
-  overflow: hidden !important;
-  white-space: nowrap;
-=======
   height: 50px;
->>>>>>> v1.3
 
   & > .el-menu-item,
   & > .el-sub-menu {
@@ -175,16 +136,11 @@ function setLayout() {
     color: #fff;
     padding: 0 15px !important;
     font-size: 14px;
-<<<<<<< HEAD
-    min-width: auto !important;
-    white-space: nowrap;
-=======
     min-width: 120px !important;
     flex-shrink: 0;
     white-space: nowrap;
     display: flex;
     align-items: center;
->>>>>>> v1.3
   }
 
   :deep(.svg-icon) {
@@ -194,13 +150,9 @@ function setLayout() {
 
   :deep(.el-sub-menu__title) {
     padding-right: 25px !important;
-<<<<<<< HEAD
-    white-space: nowrap;
-=======
     display: flex;
     align-items: center;
     height: 50px;
->>>>>>> v1.3
   }
 
   :deep(.el-sub-menu__icon-arrow) {
@@ -212,30 +164,6 @@ function setLayout() {
   }
 }
 
-<<<<<<< HEAD
-/* 水平布局，并与 Navbar 正确配合 */
-.sidebar-layout {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  height: 50px;
-  padding: 0;
-  width: 100%;
-
-  & > .el-menu {
-    flex: 1;
-    height: 50px;
-    min-width: 0;
-  }
-
-  &.has-logo {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    height: 50px;
-    padding: 0;
-    width: 100%;
-=======
 .navbar-container {
   flex-shrink: 0;
   height: 50px;
@@ -267,7 +195,6 @@ function setLayout() {
       min-width: 60px !important;
       font-size: 11px;
     }
->>>>>>> v1.3
   }
 }
 </style>