From df6c902d6fc02c441a04073ddd2c7e21a0a5af72 Mon Sep 17 00:00:00 2001 From: Young Date: Wed, 22 Aug 2018 10:41:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BI-30819=E3=80=905.0=E4=B8=89=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92=E3=80=91=E6=B1=87=E6=80=BB=E8=A1=A8=E8=A1=8C?= =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E6=9C=89=E5=AD=97=E6=AE=B5=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=EF=BC=8C=E5=88=87=E6=8D=A2=E4=B8=BA=E6=A0=91?= =?UTF-8?q?=E7=8A=B6=E5=B1=95=E7=A4=BA=EF=BC=8C=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/fineui_without_jquery_polyfill.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index b6812cf34..9d4f1e0b8 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -11783,12 +11783,6 @@ _.extend(BI.OB.prototype, { */ !(function () { - var lazy = (typeof document !== "undefined" && - typeof document.documentMode === "number") || - (typeof navigator !== "undefined" && - typeof navigator.userAgent === "string" && - /\bEdge\/\d/.test(navigator.userAgent)); - BI.Widget = BI.inherit(BI.OB, { _defaultConfig: function () { return BI.extend(BI.Widget.superclass._defaultConfig.apply(this), { @@ -11969,13 +11963,12 @@ _.extend(BI.OB.prototype, { } this.beforeMount && this.beforeMount(); this._isMounted = true; - !lazy && this._mountChildren && this._mountChildren(); + this._mountChildren && this._mountChildren(); BI.each(this._children, function (i, widget) { !self.isEnabled() && widget._setEnable(false); !self.isValid() && widget._setValid(false); widget._mount && widget._mount(); }); - lazy && this._mountChildren && this._mountChildren(); this.mounted && this.mounted(); return true; }, From a21f3191d29a936e5d28a899375a35e1aace3972 Mon Sep 17 00:00:00 2001 From: Young Date: Wed, 29 Aug 2018 15:08:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?BI-28955=20=E5=85=BC=E5=AE=B9IE10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/base.css | 2 ++ dist/base.js | 2 ++ dist/bundle.css | 2 ++ dist/bundle.js | 2 ++ dist/fineui.css | 2 ++ dist/fineui.js | 2 ++ dist/fineui_without_jquery_polyfill.js | 2 ++ src/base/pane.js | 2 ++ src/css/base/pane.css | 2 ++ src/less/base/pane.less | 4 +++- 10 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dist/base.css b/dist/base.css index c268a921d..5a5c474ab 100644 --- a/dist/base.css +++ b/dist/base.css @@ -997,6 +997,8 @@ } .bi-pane { min-height: 55px; +} +.bi-pane .loading-container { background-color: rgba(247, 248, 250, 0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00f7f8fa,endColorstr=#00f7f8fa); } diff --git a/dist/base.js b/dist/base.js index 58f880206..7acc05290 100644 --- a/dist/base.js +++ b/dist/base.js @@ -279,6 +279,7 @@ BI.Pane = BI.inherit(BI.Widget, { if (!BI.Layers.has(this.getName())) { BI.createWidget({ type: "bi.absolute_center_adapt", + cls: "loading-container", items: [{ el: loadingAnimation }], @@ -292,6 +293,7 @@ BI.Pane = BI.inherit(BI.Widget, { BI.createWidget({ type: "bi.absolute_center_adapt", element: this, + cls: "loading-container", items: [{ el: this._loading, left: 0, diff --git a/dist/bundle.css b/dist/bundle.css index 1f9302f0d..a076bc564 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -2951,6 +2951,8 @@ textarea { } .bi-pane { min-height: 55px; +} +.bi-pane .loading-container { background-color: rgba(247, 248, 250, 0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00f7f8fa,endColorstr=#00f7f8fa); } diff --git a/dist/bundle.js b/dist/bundle.js index 20ab24a50..7a8203c7b 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -35575,6 +35575,7 @@ BI.Pane = BI.inherit(BI.Widget, { if (!BI.Layers.has(this.getName())) { BI.createWidget({ type: "bi.absolute_center_adapt", + cls: "loading-container", items: [{ el: loadingAnimation }], @@ -35588,6 +35589,7 @@ BI.Pane = BI.inherit(BI.Widget, { BI.createWidget({ type: "bi.absolute_center_adapt", element: this, + cls: "loading-container", items: [{ el: this._loading, left: 0, diff --git a/dist/fineui.css b/dist/fineui.css index 3a812fd72..e64b1afc8 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -2951,6 +2951,8 @@ textarea { } .bi-pane { min-height: 55px; +} +.bi-pane .loading-container { background-color: rgba(247, 248, 250, 0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00f7f8fa,endColorstr=#00f7f8fa); } diff --git a/dist/fineui.js b/dist/fineui.js index 25f9135cf..1cababd2d 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -35817,6 +35817,7 @@ BI.Pane = BI.inherit(BI.Widget, { if (!BI.Layers.has(this.getName())) { BI.createWidget({ type: "bi.absolute_center_adapt", + cls: "loading-container", items: [{ el: loadingAnimation }], @@ -35830,6 +35831,7 @@ BI.Pane = BI.inherit(BI.Widget, { BI.createWidget({ type: "bi.absolute_center_adapt", element: this, + cls: "loading-container", items: [{ el: this._loading, left: 0, diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index 1518090b9..4075a3b8e 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -24407,6 +24407,7 @@ BI.Pane = BI.inherit(BI.Widget, { if (!BI.Layers.has(this.getName())) { BI.createWidget({ type: "bi.absolute_center_adapt", + cls: "loading-container", items: [{ el: loadingAnimation }], @@ -24420,6 +24421,7 @@ BI.Pane = BI.inherit(BI.Widget, { BI.createWidget({ type: "bi.absolute_center_adapt", element: this, + cls: "loading-container", items: [{ el: this._loading, left: 0, diff --git a/src/base/pane.js b/src/base/pane.js index ac78a8ba4..c617aeb94 100644 --- a/src/base/pane.js +++ b/src/base/pane.js @@ -78,6 +78,7 @@ BI.Pane = BI.inherit(BI.Widget, { if (!BI.Layers.has(this.getName())) { BI.createWidget({ type: "bi.absolute_center_adapt", + cls: "loading-container", items: [{ el: loadingAnimation }], @@ -91,6 +92,7 @@ BI.Pane = BI.inherit(BI.Widget, { BI.createWidget({ type: "bi.absolute_center_adapt", element: this, + cls: "loading-container", items: [{ el: this._loading, left: 0, diff --git a/src/css/base/pane.css b/src/css/base/pane.css index b978d88b9..d382f079a 100644 --- a/src/css/base/pane.css +++ b/src/css/base/pane.css @@ -344,6 +344,8 @@ } .bi-pane { min-height: 55px; +} +.bi-pane .loading-container { background-color: rgba(247, 248, 250, 0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00f7f8fa,endColorstr=#00f7f8fa); } diff --git a/src/less/base/pane.less b/src/less/base/pane.less index 605d44bb8..0cc614ff5 100644 --- a/src/less/base/pane.less +++ b/src/less/base/pane.less @@ -2,7 +2,9 @@ @import "../resource/background"; .bi-pane { min-height: 55px; - .background-color(@color-bi-background-normal, 0); + & .loading-container { + .background-color(@color-bi-background-normal, 0); + } } .bi-loading-widget {