From 37f63bf20c51312b48ca5b468f10514729948a97 Mon Sep 17 00:00:00 2001
From: FairyEver <1711467488@qq.com>
Date: Fri, 23 Jul 2021 11:17:33 +0800
Subject: [PATCH] fix: merge replaced Object.assign

https://github.com/d2-projects/d2-admin/issues/342
---
 src/api/_service.js                                 | 4 ++--
 src/components/d2-container/components/mixins/bs.js | 4 +++-
 src/components/d2-mde/index.vue                     | 4 +++-
 src/libs/util.cookies.js                            | 3 ++-
 src/store/modules/d2admin/modules/page.js           | 6 +++---
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/api/_service.js b/src/api/_service.js
index 47e34359..b7f6a7af 100644
--- a/src/api/_service.js
+++ b/src/api/_service.js
@@ -1,7 +1,7 @@
 import { Message } from 'element-ui'
 import axios from 'axios'
 import Adapter from 'axios-mock-adapter'
-import { get, isEmpty } from 'lodash'
+import { get, isEmpty, merge } from 'lodash'
 import qs from 'qs'
 import util from '@/libs/util'
 import store from '@/store'
@@ -132,7 +132,7 @@ function createRequest (service) {
       baseURL: process.env.VUE_APP_API,
       data: {}
     }
-    const option = Object.assign(configDefault, config)
+    const option = merge(configDefault, config)
     // 处理 get 请求的参数
     // 请根据实际需要修改
     if (!isEmpty(option.params)) {
diff --git a/src/components/d2-container/components/mixins/bs.js b/src/components/d2-container/components/mixins/bs.js
index bece609b..e659da3f 100644
--- 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: {
diff --git a/src/components/d2-mde/index.vue b/src/components/d2-mde/index.vue
index 13781f83..0fc80e80 100644
--- a/src/components/d2-mde/index.vue
+++ b/src/components/d2-mde/index.vue
@@ -3,8 +3,10 @@
 </template>
 
 <script>
+import { merge } from 'lodash'
 import SimpleMDE from 'simplemde'
 import 'simplemde/dist/simplemde.min.css'
+
 export default {
   name: 'd2-mde',
   props: {
@@ -44,7 +46,7 @@ export default {
     // 初始化
     init () {
       // 合并参数
-      const config = Object.assign({}, this.defaultConfig, this.config)
+      const config = merge({}, this.defaultConfig, this.config)
       // 初始化
       this.mde = new SimpleMDE({
         ...config,
diff --git a/src/libs/util.cookies.js b/src/libs/util.cookies.js
index b4d7a30b..c99e8ef1 100644
--- a/src/libs/util.cookies.js
+++ b/src/libs/util.cookies.js
@@ -1,3 +1,4 @@
+import { merge } from 'lodash'
 import Cookies from 'js-cookie'
 
 const cookies = {}
@@ -12,7 +13,7 @@ cookies.set = function (name = 'default', value = '', cookieSetting = {}) {
   const currentCookieSetting = {
     expires: 1
   }
-  Object.assign(currentCookieSetting, cookieSetting)
+  merge(currentCookieSetting, cookieSetting)
   Cookies.set(`d2admin-${process.env.VUE_APP_VERSION}-${name}`, value, currentCookieSetting)
 }
 
diff --git a/src/store/modules/d2admin/modules/page.js b/src/store/modules/d2admin/modules/page.js
index 412c5134..c4a933df 100644
--- a/src/store/modules/d2admin/modules/page.js
+++ b/src/store/modules/d2admin/modules/page.js
@@ -1,4 +1,4 @@
-import { cloneDeep, uniq, get } from 'lodash'
+import { cloneDeep, uniq, get, merge } from 'lodash'
 import router from '@/router'
 import setting from '@/setting.js'
 
@@ -64,7 +64,7 @@ export default {
           valid.push(find ? 1 : 0)
           // 返回合并后的数据 新的覆盖旧的
           // 新的数据中一般不会携带 params 和 query, 所以旧的参数会留存
-          return Object.assign({}, opened, find)
+          return merge({}, opened, find)
         })
         .filter((opened, index) => valid[index] === 1)
       // 标记已经加载多标签页数据 https://github.com/d2-projects/d2-admin/issues/201
@@ -164,7 +164,7 @@ export default {
         // 如果这里没有找到 page 代表这个路由虽然在框架内 但是不参与标签页显示
         if (page) {
           await dispatch('add', {
-            tag: Object.assign({}, page),
+            tag: merge({}, page),
             params,
             query,
             fullPath