fix: merge replaced Object.assign

https://github.com/d2-projects/d2-admin/issues/342
2021-07-23 11:17:33 +08:00
parent 10223f7aef
commit 37f63bf20c
5 changed files with 13 additions and 8 deletions
--- a/src/components/d2-container/components/mixins/bs.js
+++ b/src/components/d2-container/components/mixins/bs.js
@@ -1,4 +1,6 @@
+import { merge } from 'lodash'
 import BScroll from 'better-scroll'
+
 export default {
  props: {
    // 滚动优化的选项
@@ -22,7 +24,7 @@ export default {
  methods: {
    scrollInit () {
      // 初始化 bs
-      this.BS = new BScroll(this.$refs.wrapper, Object.assign({
+      this.BS = new BScroll(this.$refs.wrapper, merge({
        mouseWheel: true,
        click: true,
        scrollbar: {