From 69f3fcd33cb39c02437ab5110d1df27a99b94103 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 10 Jul 2019 09:38:47 +0800 Subject: [PATCH] =?UTF-8?q?BI-47753=20fix:=20=E5=8F=AF=E4=BB=A5=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E7=9A=84=E5=A4=9A=E5=B1=82=E7=BA=A7=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A0=91=E4=B8=89=E8=A7=92=E6=B2=A1=E6=9C=89=E5=8A=A8=E7=94=BB?= =?UTF-8?q?=EF=BC=8C=E5=92=8C=E5=A4=8D=E9=80=89=E4=B8=8B=E6=8B=89=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../multilayerselecttree.css | 22 +++++++++++++++++++ .../multilayersingletree.css | 22 +++++++++++++++++++ .../multilayerselecttree.combo.less | 20 +++++++++++++++++ .../multilayersingletree.combo.less | 20 +++++++++++++++++ .../multilayersingletree.combo.js | 2 +- 5 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 src/less/widget/multilayerselecttree/multilayerselecttree.combo.less create mode 100644 src/less/widget/multilayersingletree/multilayersingletree.combo.less diff --git a/src/css/widget/multilayerselecttree/multilayerselecttree.css b/src/css/widget/multilayerselecttree/multilayerselecttree.css index 0c06cc29df..14917bad01 100644 --- a/src/css/widget/multilayerselecttree/multilayerselecttree.css +++ b/src/css/widget/multilayerselecttree/multilayerselecttree.css @@ -1,3 +1,25 @@ +.bi-multilayer-select-tree-combo .trigger-icon-button { + font-size: 16px; +} +.bi-multilayer-select-tree-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon { + -webkit-transform: rotate(180deg); + -moz-transform: rotate(180deg); + transform: rotate(180deg); + -webkit-transition: transform 0.3s ease; + -moz-transition: transform 0.3s ease; + -o-transition: transform 0.3s ease; + transition: transform 0.3s ease; +} +.bi-multilayer-select-tree-combo .bi-combo + .bi-trigger-icon-button .x-icon { + -webkit-transform: rotate(0deg); + -moz-transform: rotate(0deg); + transform: rotate(0deg); + -webkit-transition: transform 0.3s ease; + -moz-transition: transform 0.3s ease; + -o-transition: transform 0.3s ease; + transition: transform 0.3s ease; +} + .bi-multilayer-select-level-tree .tree-view { min-width: 100%; } diff --git a/src/css/widget/multilayersingletree/multilayersingletree.css b/src/css/widget/multilayersingletree/multilayersingletree.css index 38759f6a44..60ff7dba53 100644 --- a/src/css/widget/multilayersingletree/multilayersingletree.css +++ b/src/css/widget/multilayersingletree/multilayersingletree.css @@ -1,3 +1,25 @@ +.bi-multilayer-single-tree-combo .trigger-icon-button { + font-size: 16px; +} +.bi-multilayer-single-tree-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon { + -webkit-transform: rotate(180deg); + -moz-transform: rotate(180deg); + transform: rotate(180deg); + -webkit-transition: transform 0.3s ease; + -moz-transition: transform 0.3s ease; + -o-transition: transform 0.3s ease; + transition: transform 0.3s ease; +} +.bi-multilayer-single-tree-combo .bi-combo + .bi-trigger-icon-button .x-icon { + -webkit-transform: rotate(0deg); + -moz-transform: rotate(0deg); + transform: rotate(0deg); + -webkit-transition: transform 0.3s ease; + -moz-transition: transform 0.3s ease; + -o-transition: transform 0.3s ease; + transition: transform 0.3s ease; +} + .bi-multilayer-single-level-tree .tree-view { min-width: 100%; } diff --git a/src/less/widget/multilayerselecttree/multilayerselecttree.combo.less b/src/less/widget/multilayerselecttree/multilayerselecttree.combo.less new file mode 100644 index 0000000000..6a43b1d0f5 --- /dev/null +++ b/src/less/widget/multilayerselecttree/multilayerselecttree.combo.less @@ -0,0 +1,20 @@ +@import "../../index"; +@val: transform .3s ease; +.bi-multilayer-select-tree-combo { + & .trigger-icon-button{ + font-size: 16px; + } + // 此combo的trigger_button是absolute上去的,与bi-combo在同一层级,独立写一下 + & .bi-combo.bi-combo-popup + .bi-trigger-icon-button { + & .x-icon { + .rotate(180deg); + .transition(@val); + } + } + & .bi-combo + .bi-trigger-icon-button { + & .x-icon { + .rotate(0deg); + .transition(@val); + } + } +} \ No newline at end of file diff --git a/src/less/widget/multilayersingletree/multilayersingletree.combo.less b/src/less/widget/multilayersingletree/multilayersingletree.combo.less new file mode 100644 index 0000000000..ec139af050 --- /dev/null +++ b/src/less/widget/multilayersingletree/multilayersingletree.combo.less @@ -0,0 +1,20 @@ +@import "../../index"; +@val: transform .3s ease; +.bi-multilayer-single-tree-combo { + & .trigger-icon-button{ + font-size: 16px; + } + // 此combo的trigger_button是absolute上去的,与bi-combo在同一层级,独立写一下 + & .bi-combo.bi-combo-popup + .bi-trigger-icon-button { + & .x-icon { + .rotate(180deg); + .transition(@val); + } + } + & .bi-combo + .bi-trigger-icon-button { + & .x-icon { + .rotate(0deg); + .transition(@val); + } + } +} \ No newline at end of file diff --git a/src/widget/multilayersingletree/multilayersingletree.combo.js b/src/widget/multilayersingletree/multilayersingletree.combo.js index 8ce263dd8b..f3b3c10d5f 100644 --- a/src/widget/multilayersingletree/multilayersingletree.combo.js +++ b/src/widget/multilayersingletree/multilayersingletree.combo.js @@ -9,7 +9,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.MultiLayerSingleTreeCombo.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-multilayer-singletree-combo", + baseCls: "bi-multilayer-single-tree-combo", isDefaultInit: false, height: 24, text: "",