From 9ccce7cd5c3b7b673688b9b28f156d1cd12d46c6 Mon Sep 17 00:00:00 2001 From: cookfront Date: Thu, 16 Mar 2017 17:55:13 +0800 Subject: [PATCH] fix popup --- packages/zanui-css/src/button.css | 4 ++++ src/mixins/popup/popup-manager.js | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/zanui-css/src/button.css b/packages/zanui-css/src/button.css index 3b35437d6..0dc62e8f7 100644 --- a/packages/zanui-css/src/button.css +++ b/packages/zanui-css/src/button.css @@ -32,6 +32,10 @@ margin-left: 10px; } + & + .zan-button--block { + margin-left: 0; + } + @m default { color: $button-default-color; background-color: $button-default-background-color; diff --git a/src/mixins/popup/popup-manager.js b/src/mixins/popup/popup-manager.js index 5296b66d7..69b02de00 100644 --- a/src/mixins/popup/popup-manager.js +++ b/src/mixins/popup/popup-manager.js @@ -77,7 +77,11 @@ const PopupManager = { addClass(modalDom, 'zan-modal'); - document.body.appendChild(modalDom); + if (dom && dom.parentNode && dom.parentNode.nodeType !== 11) { + dom.parentNode.appendChild(modalDom); + } else { + document.body.appendChild(modalDom); + } if (zIndex) { modalDom.style.zIndex = zIndex;