支持SSR、升级Vue版本和增加新的icon (#40)

* search component add new style

* update vue version and support ssr

* unit test

* add new icon

* new icon
This commit is contained in:
张敏
2017-06-15 19:46:56 +08:00
committed by Yao
parent 857da3a5ee
commit 0f5972e75e
59 changed files with 370 additions and 204 deletions
+6 -3
View File
@@ -1,8 +1,11 @@
import merge from 'src/utils/merge';
import Vue from 'vue';
let context;
if (window && window.popupContext) {
context = window.popupContext;
const _global = Vue.prototype.$isServer ? global : window;
if (_global && _global.popupContext) {
context = _global.popupContext;
}
const DEFAULT_CONTEXT = {
@@ -13,7 +16,7 @@ const DEFAULT_CONTEXT = {
modalStack: []
};
context = window.popupContext = merge({}, DEFAULT_CONTEXT, context);
context = _global.popupContext = merge({}, DEFAULT_CONTEXT, context);
const PopupContext = {
getContext(key) {