From 2881c41cd8d9ab8ee422552858a9a5a071a527a1 Mon Sep 17 00:00:00 2001 From: "Zhenfei.Li" Date: Tue, 28 Aug 2018 17:28:04 +0800 Subject: [PATCH] =?UTF-8?q?BI-30745=20=E4=BD=BF=E7=94=A8js=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6ie=E6=9D=A5=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E4=BD=8E=E7=89=88=E6=9C=ACie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/pane.js | 14 ++++++++++---- src/less/base/pane.less | 6 +++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/base/pane.js b/src/base/pane.js index 5a5e202dd..421f31273 100644 --- a/src/base/pane.js +++ b/src/base/pane.js @@ -74,22 +74,28 @@ BI.Pane = BI.inherit(BI.Widget, { width: 5 }] }); + var loadingGif = BI.createWidget({ + type: "bi.layout", + cls: "loading-background", + height: 30 + }); + var loadingEffect = (BI.isIE() && BI.getIEVersion() < 10) ? loadingGif : loadingAnimation; if (o.overlap === true) { if (!BI.Layers.has(this.getName())) { BI.createWidget({ - type: "bi.center_adapt", + type: "bi.absolute_center_adapt", items: [{ - el: loadingAnimation + el: loadingEffect }], element: BI.Layers.make(this.getName(), this) }); } BI.Layers.show(self.getName()); } else if (BI.isNull(this._loading)) { - this._loading = loadingAnimation; + this._loading = loadingEffect; this._loading.element.css("zIndex", 1); BI.createWidget({ - type: "bi.absolute", + type: "bi.absolute_center_adapt", element: this, items: [{ el: this._loading, diff --git a/src/less/base/pane.less b/src/less/base/pane.less index 1e2246c58..8818dfb87 100644 --- a/src/less/base/pane.less +++ b/src/less/base/pane.less @@ -5,15 +5,15 @@ } .bi-loading-widget { - &>div { + div { .background-color(@background-color-highlight, 90%); .border-radius(2.5px); .animation(loading-widget 0.8s infinite linear); } - & .rect2 { + .rect2 { .animation-delay(-0.2s); } - & .rect3 { + .rect3 { .animation-delay(-0.4s); } .keyframes (loading-widget, {