dalete merge && class operating methods

2017-08-22 19:43:15 +08:00
parent 9bb88ee295
commit bc169e905a
7 changed files with 21 additions and 124 deletions
@@ -1,4 +1,3 @@
-import merge from '../../utils/merge';
 import Vue from 'vue';

 let context;
@@ -16,7 +15,10 @@ const DEFAULT_CONTEXT = {
  modalStack: []
 };

-context = _global.popupContext = merge({}, DEFAULT_CONTEXT, context);
+context = _global.popupContext = {
+  ...DEFAULT_CONTEXT,
+  ...context
+};

 const PopupContext = {
  getContext(key) {