diff --git a/packages/zanui-css/package.json b/packages/zanui-css/package.json index 05ddab234..a70d997e2 100644 --- a/packages/zanui-css/package.json +++ b/packages/zanui-css/package.json @@ -1,6 +1,6 @@ { "name": "@youzan/zanui-css", - "version": "0.0.29", + "version": "0.0.30", "description": "zanui css.", "main": "lib/index.css", "style": "lib/index.css", diff --git a/src/index.js b/src/index.js index 939ba485f..49b52d67d 100644 --- a/src/index.js +++ b/src/index.js @@ -69,7 +69,7 @@ if (typeof window !== 'undefined' && window.Vue) { module.exports = { install, - version: '0.0.29', + version: '0.0.30', Button, Switch, Field, diff --git a/src/mixins/popup/index.js b/src/mixins/popup/index.js index 5050b28df..acb441b97 100644 --- a/src/mixins/popup/index.js +++ b/src/mixins/popup/index.js @@ -2,18 +2,17 @@ import Vue from 'vue'; import merge from 'src/utils/merge'; import PopupManager from './popup-manager'; -let popupContext = { - idSeed: 1, - zIndex: 2000, - hasModal: false, - instances: {}, - modalStack: [] -}; - -if (Vue.prototype.$isServer) { - global.popupContext = popupContext; +let popupContext; +if (!window.popupContext) { + popupContext = window.popupContext = { + idSeed: 1, + zIndex: 2000, + hasModal: false, + instances: {}, + modalStack: [] + }; } else { - window.popupContext = popupContext; + popupContext = window.popupContext; } const getDOM = function(dom) {