From eb378647a547e84aeecd6b1ca78518c983840f47 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 16 Jul 2019 10:12:46 +0800 Subject: [PATCH] =?UTF-8?q?BI-48006=20fix:=20IE=E4=B8=8B=E9=83=BD=E7=94=A8?= =?UTF-8?q?gif?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/background.css | 7 +++++++ src/base/pane.js | 5 +++-- src/css/base/colorchooser/colorpicker/editor.css | 7 +++++++ src/css/base/pane.css | 7 ------- src/css/resource/background.css | 7 +++++++ src/less/base/pane.less | 6 ------ src/less/resource/background.less | 4 +++- ui/css/background.css | 7 +++++++ 8 files changed, 34 insertions(+), 16 deletions(-) diff --git a/public/css/background.css b/public/css/background.css index 1440b9854..cd4e97deb 100644 --- a/public/css/background.css +++ b/public/css/background.css @@ -210,3 +210,10 @@ .trans-color-disabled-background.hack { background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/background/trans_disable.png') no-repeat center center; } +.wave-loading { + background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/2x/icon/wave_loading.gif') no-repeat center center; + background-size: contain; +} +.wave-loading.hack { + background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/wave_loading.gif') no-repeat center center; +} diff --git a/src/base/pane.js b/src/base/pane.js index 94089d04c..4018a8d3d 100644 --- a/src/base/pane.js +++ b/src/base/pane.js @@ -36,14 +36,15 @@ BI.Pane = BI.inherit(BI.Widget, { loading: function () { var self = this, o = this.options; + var isIE = BI.isIE(); var loadingAnimation = BI.createWidget({ type: "bi.horizontal", - cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""), + cls: "bi-loading-widget" + (isIE ? " wave-loading hack" : ""), height: 30, width: 30, hgap: 5, vgap: 2.5, - items: [{ + items: isIE ? [] : [{ type: "bi.layout", cls: "animate-rect rect1", height: 25, diff --git a/src/css/base/colorchooser/colorpicker/editor.css b/src/css/base/colorchooser/colorpicker/editor.css index ffd4e071e..69a565b42 100644 --- a/src/css/base/colorchooser/colorpicker/editor.css +++ b/src/css/base/colorchooser/colorpicker/editor.css @@ -210,6 +210,13 @@ .trans-color-disabled-background.hack { background: url('images/1x/background/trans_disable.png') no-repeat center center; } +.wave-loading { + background: url('images/2x/icon/wave_loading.gif') no-repeat center center; + background-size: contain; +} +.wave-loading.hack { + background: url('images/1x/icon/wave_loading.gif') no-repeat center center; +} .bi-color-picker-editor .color-picker-editor-display { -webkit-border-radius: 2px; -moz-border-radius: 2px; diff --git a/src/css/base/pane.css b/src/css/base/pane.css index 69cadb0bf..9848cdd08 100644 --- a/src/css/base/pane.css +++ b/src/css/base/pane.css @@ -122,10 +122,3 @@ transform: scaleY(1); } } -.bi-loading-widget.hack { - background: url('images/1x/icon/wave_loading.gif') no-repeat center center; -} -.bi-loading-widget.hack .animate-rect { - background-color: rgba(54, 133, 242, 0); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#003685f2,endColorstr=#003685f2); -} diff --git a/src/css/resource/background.css b/src/css/resource/background.css index 1adb7984d..b17349bdf 100644 --- a/src/css/resource/background.css +++ b/src/css/resource/background.css @@ -210,3 +210,10 @@ .trans-color-disabled-background.hack { background: url('images/1x/background/trans_disable.png') no-repeat center center; } +.wave-loading { + background: url('images/2x/icon/wave_loading.gif') no-repeat center center; + background-size: contain; +} +.wave-loading.hack { + background: url('images/1x/icon/wave_loading.gif') no-repeat center center; +} diff --git a/src/less/base/pane.less b/src/less/base/pane.less index b078dd013..27cbda2d0 100644 --- a/src/less/base/pane.less +++ b/src/less/base/pane.less @@ -33,10 +33,4 @@ .transform (scaleY(1)); } }); - &.hack { - .imagePath(@icon-wave-loading); - & .animate-rect { - .background-color(@background-color-highlight, 0%); - } - } } \ No newline at end of file diff --git a/src/less/resource/background.less b/src/less/resource/background.less index e1eb69d35..b7b4a6848 100644 --- a/src/less/resource/background.less +++ b/src/less/resource/background.less @@ -307,4 +307,6 @@ &.hack{ .imagePath(@background-trans-color-disabled); } -} \ No newline at end of file +} + +.background(wave-loading, @icon-wave-loading); \ No newline at end of file diff --git a/ui/css/background.css b/ui/css/background.css index be8d957f1..09de0c5a4 100644 --- a/ui/css/background.css +++ b/ui/css/background.css @@ -210,3 +210,10 @@ .trans-color-disabled-background.hack { background: url('resources?path=/com/fr/web/ui/images/1x/background/trans_disable.png') no-repeat center center; } +.wave-loading { + background: url('resources?path=/com/fr/web/ui/images/2x/icon/wave_loading.gif') no-repeat center center; + background-size: contain; +} +.wave-loading.hack { + background: url('resources?path=/com/fr/web/ui/images/1x/icon/wave_loading.gif') no-repeat center center; +}