刘元博
2023-04-15 b4f2a4f7dd8dc5b22d9b757c81b631aa4f988a52
恢复翻页/切换路由滚动功能
已修改2个文件
59 ■■■■■ 文件已修改
ruoyi-ui/src/layout/components/AppMain.vue 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/layout/index.vue 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-ui/src/layout/components/AppMain.vue
@@ -50,3 +50,26 @@
  }
}
</style>
<style lang="scss">
// fix css style bug in open el-dialog
.el-popup-parent--hidden {
  .fixed-header {
    padding-right: 6px;
  }
}
::-webkit-scrollbar {
  width: 6px;
  height: 6px;
}
::-webkit-scrollbar-track {
  background-color: #f1f1f1;
}
::-webkit-scrollbar-thumb {
  background-color: #c0c0c0;
  border-radius: 3px;
}
</style>
ruoyi-ui/src/layout/index.vue
@@ -1,19 +1,17 @@
<template>
  <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
      <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">
        <el-scrollbar>
          <div :class="{'fixed-header':fixedHeader}">
            <navbar/>
            <tags-view v-if="needTagsView"/>
          </div>
          <app-main/>
          <right-panel>
            <settings/>
          </right-panel>
        </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}">
        <navbar/>
        <tags-view v-if="needTagsView"/>
      </div>
      <app-main/>
      <right-panel>
        <settings/>
      </right-panel>
    </div>
  </div>
</template>
@@ -73,18 +71,6 @@
    position: relative;
    height: 100%;
    width: 100%;
    .el-scrollbar{
      height: 100%;
    }
    ::v-deep .el-scrollbar__bar.is-vertical {
      z-index: 10;
    }
    ::v-deep .el-scrollbar__wrap {
      overflow-x: hidden;
    }
    &.mobile.openSidebar {
      position: fixed;