diff --git a/src/components/d2-scrollbar/index.vue b/src/components/d2-scrollbar/index.vue new file mode 100644 index 00000000..90baaa6a --- /dev/null +++ b/src/components/d2-scrollbar/index.vue @@ -0,0 +1,34 @@ + + + + + diff --git a/src/components/index.js b/src/components/index.js index c0845720..20e52be5 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -19,4 +19,5 @@ Vue.component('d2-mde', () => import('./d2-mde')) Vue.component('d2-module-index-banner', () => import('./d2-module-index-banner')) Vue.component('d2-module-index-menu', () => import('./d2-module-index-menu')) Vue.component('d2-quill', () => import('./d2-quill')) +Vue.component('d2-scrollbar', () => import('./d2-scrollbar')) Vue.component('d2-ueditor', () => import('./d2-ueditor')) diff --git a/src/layout/header-aside/components/menu-side/index.js b/src/layout/header-aside/components/menu-side/index.js index b876440a..fdc9b896 100644 --- a/src/layout/header-aside/components/menu-side/index.js +++ b/src/layout/header-aside/components/menu-side/index.js @@ -1,7 +1,6 @@ import { mapState } from 'vuex' import menuMixin from '../mixin/menu' import { createMenu } from '../libs/util.menu' -import BScroll from 'better-scroll' export default { name: 'd2-layout-header-aside-menu-side', @@ -10,73 +9,32 @@ export default { ], render (h) { return
- - { this.aside.map(menu => createMenu.call(this, h, menu)) } - - { - this.aside.length === 0 && !this.asideCollapse - ?
- - 没有侧栏菜单 -
- : null - } + + + { this.aside.map(menu => createMenu.call(this, h, menu)) } + + { + this.aside.length === 0 && !this.asideCollapse + ?
+ + 没有侧栏菜单 +
+ : null + } +
}, - data () { - return { - asideHeight: 300, - BS: null - } - }, computed: { ...mapState('d2admin/menu', [ 'aside', 'asideCollapse', 'asideTransition' ]) - }, - watch: { - // 折叠和展开菜单的时候销毁 better scroll - asideCollapse (val) { - this.scrollDestroy() - setTimeout(() => { - this.scrollInit() - }, 500) - } - }, - mounted () { - this.scrollInit() - }, - beforeDestroy () { - this.scrollDestroy() - }, - methods: { - scrollInit () { - this.BS = new BScroll(this.$el, { - mouseWheel: true, - click: true - // 如果你愿意可以打开显示滚动条 - // scrollbar: { - // fade: true, - // interactive: false - // } - }) - }, - scrollDestroy () { - // https://github.com/d2-projects/d2-admin/issues/75 - try { - this.BS.destroy() - } catch (e) { - delete this.BS - this.BS = null - } - } } }