From fb08647c5d1d46fe58f30ac22fb3e0bac0d24e22 Mon Sep 17 00:00:00 2001 From: "Zhenfei.Li" Date: Fri, 31 Aug 2018 15:27:36 +0800 Subject: [PATCH] =?UTF-8?q?BI-31697=20pane=E7=9A=84loading=E5=8A=A8?= =?UTF-8?q?=E7=94=BB=EF=BC=9A=E7=9F=A9=E5=BD=A2=E5=AE=BD=E5=BA=A6=E8=B0=83?= =?UTF-8?q?=E4=B8=BA3=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=9C=89=E4=BA=9B?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E5=AF=B9=E5=B0=8F=E6=95=B0=E7=82=B9?= =?UTF-8?q?=E5=83=8F=E7=B4=A0=E7=9A=84=E8=A1=A5=E6=AD=A3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/pane.js | 8 +-- src/less/base/pane.less | 7 +-- src/less/lib/icon.less | 109 ++++++++++++++++++++-------------------- 3 files changed, 63 insertions(+), 61 deletions(-) diff --git a/src/base/pane.js b/src/base/pane.js index a839febe0e..3323319318 100644 --- a/src/base/pane.js +++ b/src/base/pane.js @@ -55,23 +55,23 @@ BI.Pane = BI.inherit(BI.Widget, { cls: "bi-loading-widget" + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""), height: 30, width: 30, - hgap: 5.625, + hgap: 5.25, vgap: 2.5, items: [{ type: "bi.layout", cls: "rect1", height: 25, - width: 2.5 + width: 3 }, { type: "bi.layout", cls: "rect2", height: 25, - width: 2.5 + width: 3 }, { type: "bi.layout", cls: "rect3", height: 25, - width: 2.5 + width: 3 }] }); // pane在同步方式下由items决定tipText的显示与否 diff --git a/src/less/base/pane.less b/src/less/base/pane.less index ede0efd743..d4260c3c82 100644 --- a/src/less/base/pane.less +++ b/src/less/base/pane.less @@ -1,5 +1,6 @@ @import "../index"; -@import "../resource/background"; +@import "../image"; +@import "../lib/icon"; .bi-pane { min-height: 55px; & .loading-container { @@ -11,7 +12,7 @@ font-size: 0; div { .background-color(@background-color-highlight, 90%); - .border-radius(1.25px); + .border-radius(1.5px); .animation(loading-widget 0.8s infinite linear); } .rect2 { @@ -29,7 +30,7 @@ } }); &.hack { - .loading-background; + .image2xPath(@icon-wave-loading); div { .background-color(@background-color-highlight, 0%); } diff --git a/src/less/lib/icon.less b/src/less/lib/icon.less index efb44cb37d..f93fda71c4 100644 --- a/src/less/lib/icon.less +++ b/src/less/lib/icon.less @@ -1,55 +1,56 @@ -@icon-checkbox-normal: "icon/check_box_normal.png"; -@icon-checkbox-active: "icon/check_box_active.png"; -@icon-checkbox-disable: "icon/check_box_disable.png"; -@icon-checkbox-active-disable: "icon/check_box_disable2.png"; - -@icon-radio-normal: "icon/radio_normal.png"; -@icon-radio-active: "icon/radio_active.png"; -@icon-radio-disable: "icon/radio_disable.png"; -@icon-radio-active-disable: "icon/radio_disable2.png"; - -@icon-half-select: "icon/half_selected.png"; - -@icon-tree-expand-type1: "icon/tree_expand_1.png"; -@icon-tree-expand-type2: "icon/tree_expand_2.png"; -@icon-tree-expand-type3: "icon/tree_expand_3.png"; -@icon-tree-expand-type4: "icon/tree_expand_4.png"; - -@icon-tree-collapse-type1: "icon/tree_collapse_1.png"; -@icon-tree-collapse-type2: "icon/tree_collapse_2.png"; -@icon-tree-collapse-type3: "icon/tree_collapse_3.png"; -@icon-tree-collapse-type4: "icon/tree_collapse_4.png"; - -@icon-tree-vertical-line-1: "icon/tree_vertical_line_1.png"; -@icon-tree-vertical-line-2: "icon/tree_vertical_line_2.png"; -@icon-tree-vertical-line-3: "icon/tree_vertical_line_3.png"; -@icon-tree-vertical-line-4: "icon/tree_vertical_line_4.png"; - -@icon-tree-expand-type1-theme-dark: "icon/dark/tree_expand_1.png"; -@icon-tree-expand-type2-theme-dark: "icon/dark/tree_expand_2.png"; -@icon-tree-expand-type3-theme-dark: "icon/dark/tree_expand_3.png"; -@icon-tree-expand-type4-theme-dark: "icon/dark/tree_expand_4.png"; - -@icon-tree-collapse-type1-theme-dark: "icon/dark/tree_collapse_1.png"; -@icon-tree-collapse-type2-theme-dark: "icon/dark/tree_collapse_2.png"; -@icon-tree-collapse-type3-theme-dark: "icon/dark/tree_collapse_3.png"; -@icon-tree-collapse-type4-theme-dark: "icon/dark/tree_collapse_4.png"; - -@icon-tree-vertical-line-1-theme-dark: "icon/dark/tree_vertical_line_1.png"; -@icon-tree-vertical-line-2-theme-dark: "icon/dark/tree_vertical_line_2.png"; -@icon-tree-vertical-line-3-theme-dark: "icon/dark/tree_vertical_line_3.png"; -@icon-tree-vertical-line-4-theme-dark: "icon/dark/tree_vertical_line_4.png"; - -@icon-loading: "icon/loading.gif"; - -//滑块 -@icon-slider-normal: "icon/slider_normal_small.png"; -@icon-slider-active: "icon/slider_active_small.png"; - -//颜色自动、透明 -@icon-auto-normal: "icon/auto_normal.png"; -@icon-auto-select: "icon/auto_select.png"; -@icon-auto-disable: "icon/auto_disable.png"; -@icon-trans-normal: "icon/trans_normal.png"; -@icon-trans-select: "icon/trans_select.png"; +@icon-checkbox-normal: "icon/check_box_normal.png"; +@icon-checkbox-active: "icon/check_box_active.png"; +@icon-checkbox-disable: "icon/check_box_disable.png"; +@icon-checkbox-active-disable: "icon/check_box_disable2.png"; + +@icon-radio-normal: "icon/radio_normal.png"; +@icon-radio-active: "icon/radio_active.png"; +@icon-radio-disable: "icon/radio_disable.png"; +@icon-radio-active-disable: "icon/radio_disable2.png"; + +@icon-half-select: "icon/half_selected.png"; + +@icon-tree-expand-type1: "icon/tree_expand_1.png"; +@icon-tree-expand-type2: "icon/tree_expand_2.png"; +@icon-tree-expand-type3: "icon/tree_expand_3.png"; +@icon-tree-expand-type4: "icon/tree_expand_4.png"; + +@icon-tree-collapse-type1: "icon/tree_collapse_1.png"; +@icon-tree-collapse-type2: "icon/tree_collapse_2.png"; +@icon-tree-collapse-type3: "icon/tree_collapse_3.png"; +@icon-tree-collapse-type4: "icon/tree_collapse_4.png"; + +@icon-tree-vertical-line-1: "icon/tree_vertical_line_1.png"; +@icon-tree-vertical-line-2: "icon/tree_vertical_line_2.png"; +@icon-tree-vertical-line-3: "icon/tree_vertical_line_3.png"; +@icon-tree-vertical-line-4: "icon/tree_vertical_line_4.png"; + +@icon-tree-expand-type1-theme-dark: "icon/dark/tree_expand_1.png"; +@icon-tree-expand-type2-theme-dark: "icon/dark/tree_expand_2.png"; +@icon-tree-expand-type3-theme-dark: "icon/dark/tree_expand_3.png"; +@icon-tree-expand-type4-theme-dark: "icon/dark/tree_expand_4.png"; + +@icon-tree-collapse-type1-theme-dark: "icon/dark/tree_collapse_1.png"; +@icon-tree-collapse-type2-theme-dark: "icon/dark/tree_collapse_2.png"; +@icon-tree-collapse-type3-theme-dark: "icon/dark/tree_collapse_3.png"; +@icon-tree-collapse-type4-theme-dark: "icon/dark/tree_collapse_4.png"; + +@icon-tree-vertical-line-1-theme-dark: "icon/dark/tree_vertical_line_1.png"; +@icon-tree-vertical-line-2-theme-dark: "icon/dark/tree_vertical_line_2.png"; +@icon-tree-vertical-line-3-theme-dark: "icon/dark/tree_vertical_line_3.png"; +@icon-tree-vertical-line-4-theme-dark: "icon/dark/tree_vertical_line_4.png"; + +@icon-loading: "icon/loading.gif"; +@icon-wave-loading: "icon/wave_loading.gif"; + +//滑块 +@icon-slider-normal: "icon/slider_normal_small.png"; +@icon-slider-active: "icon/slider_active_small.png"; + +//颜色自动、透明 +@icon-auto-normal: "icon/auto_normal.png"; +@icon-auto-select: "icon/auto_select.png"; +@icon-auto-disable: "icon/auto_disable.png"; +@icon-trans-normal: "icon/trans_normal.png"; +@icon-trans-select: "icon/trans_select.png"; @icon-trans-disable: "icon/trans_disable.png"; \ No newline at end of file