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/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)
 }