Merge pull request #579 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit '5595d106ad52eff0ee7d40c74324db929f8a4014':
  BI-29344 combo下拉箭头展开用旋转实现

demo/js/case/combo/demo.static_combo.js

@@ -1,45 +0,0 @@
-/**
- * Created by Dailer on 2017/7/11.
- */
-Demo.StaticCombo = BI.inherit(BI.Widget, {
-    props: {
-        baseCls: ""
-    },
-
-
-    beforeMount: function () {
-        this.refs.setValue(2);
-    },
-
-    render: function () {
-
-        var self = this;
-
-        return {
-            type: "bi.horizontal_auto",
-            items: [{
-                type: "bi.static_combo",
-                text: "Value 不变",
-                width: 300,
-                ref: function (_ref) {
-                    self.refs = _ref;
-                },
-                items: [
-                    {
-                        text: "MVC-1",
-                        value: 1
-                    }, {
-                        text: "MVC-2",
-                        value: 2
-                    }, {
-                        text: "MVC-3",
-                        value: 3
-                    }
-                ]
-            }],
-            vgap: 20
-        };
-    }
-});
-
-BI.shortcut("demo.static_combo", Demo.StaticCombo);

demo/js/config/case.js

@@ -122,10 +122,6 @@ Demo.CASE_CONFIG = [{
     pId: 306,
     text: "bi.icon_combo",
     value: "demo.icon_combo"
-}, {
-    pId: 306,
-    text: "bi.static_combo",
-    value: "demo.static_combo"
 }, {
     pId: 306,
     text: "bi.text_value_combo",

dist/base.css

@@ -464,6 +464,11 @@
   display: block !important;
   visibility: visible !important;
 }
+.bi-combo.bi-combo-popup > .bi-trigger .bi-trigger-icon-button .x-icon {
+  -webkit-transform: rotate(180deg);
+  -moz-transform: rotate(180deg);
+  transform: rotate(180deg);
+}
 .bi-combo.bi-combo-popup > .bi-border,
 .bi-combo.bi-combo-hover > .bi-border,
 .bi-combo:hover > .bi-border {
@@ -476,17 +481,10 @@
 .bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button {
   color: #ff4949;
 }
-.bi-search-text-value-combo .trigger-up {
+.bi-search-text-value-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon {
-  display: none;
+  -webkit-transform: rotate(180deg);
-}
+  -moz-transform: rotate(180deg);
-.bi-search-text-value-combo .trigger-down {
+  transform: rotate(180deg);
-  display: block;
-}
-.bi-search-text-value-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-search-text-value-combo.combo-show .trigger-down {
-  display: none;
 }
 
 .bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {

dist/bundle.css

@@ -2360,6 +2360,11 @@ textarea {
   display: block !important;
   visibility: visible !important;
 }
+.bi-combo.bi-combo-popup > .bi-trigger .bi-trigger-icon-button .x-icon {
+  -webkit-transform: rotate(180deg);
+  -moz-transform: rotate(180deg);
+  transform: rotate(180deg);
+}
 .bi-combo.bi-combo-popup > .bi-border,
 .bi-combo.bi-combo-hover > .bi-border,
 .bi-combo:hover > .bi-border {
@@ -2372,17 +2377,10 @@ textarea {
 .bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button {
   color: #ff4949;
 }
-.bi-search-text-value-combo .trigger-up {
+.bi-search-text-value-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon {
-  display: none;
+  -webkit-transform: rotate(180deg);
-}
+  -moz-transform: rotate(180deg);
-.bi-search-text-value-combo .trigger-down {
+  transform: rotate(180deg);
-  display: block;
-}
-.bi-search-text-value-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-search-text-value-combo.combo-show .trigger-down {
-  display: none;
 }
 
 .bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
@@ -3437,33 +3435,19 @@ ul.ztree.zTreeDragUL {
 .bi-multi-select-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
-.bi-multi-select-combo .trigger-up {
+.bi-multi-select-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon {
-  display: none;
+  -webkit-transform: rotate(180deg);
-}
+  -moz-transform: rotate(180deg);
-.bi-multi-select-combo .trigger-down {
+  transform: rotate(180deg);
-  display: block;
-}
-.bi-multi-select-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-multi-select-combo.combo-show .trigger-down {
-  display: none;
 }
 
 .bi-multi-select-insert-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
-.bi-multi-select-insert-combo .trigger-up {
+.bi-multi-select-insert-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon {
-  display: none;
+  -webkit-transform: rotate(180deg);
-}
+  -moz-transform: rotate(180deg);
-.bi-multi-select-insert-combo .trigger-down {
+  transform: rotate(180deg);
-  display: block;
-}
-.bi-multi-select-insert-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-multi-select-insert-combo.combo-show .trigger-down {
-  display: none;
 }
 
 
@@ -3488,17 +3472,10 @@ ul.ztree.zTreeDragUL {
 .bi-multi-tree-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
-.bi-multi-tree-combo .trigger-up {
+.bi-multi-tree-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon {
-  display: none;
+  -webkit-transform: rotate(180deg);
-}
+  -moz-transform: rotate(180deg);
-.bi-multi-tree-combo .trigger-down {
+  transform: rotate(180deg);
-  display: block;
-}
-.bi-multi-tree-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-multi-tree-combo.combo-show .trigger-down {
-  display: none;
 }
 .bi-multi-tree-popup .popup-view-tree {
   min-height: 170px;
@@ -3570,32 +3547,13 @@ ul.ztree.zTreeDragUL {
 .bi-search-multi-text-value-combo.combo-error .bi-multi-select-searcher .tip-text-style {
   color: #ff4949;
 }
-.bi-search-multi-text-value-combo .trigger-up {
-  display: none;
-}
-.bi-search-multi-text-value-combo .trigger-down {
-  display: block;
-}
-.bi-search-multi-text-value-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-search-multi-text-value-combo.combo-show .trigger-down {
-  display: none;
-}
 .bi-single-select-combo .single-select-trigger-icon-button {
   font-size: 16px;
 }
-.bi-single-select-combo .trigger-up {
+.bi-single-select-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon {
-  display: none;
+  -webkit-transform: rotate(180deg);
-}
+  -moz-transform: rotate(180deg);
-.bi-single-select-combo .trigger-down {
+  transform: rotate(180deg);
-  display: block;
-}
-.bi-single-select-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-single-select-combo.combo-show .trigger-down {
-  display: none;
 }
 .bi-single-slider-label {
   min-height: 50px;
@@ -4655,11 +4613,11 @@ textarea::-webkit-scrollbar-thumb:hover {
 }
 .trigger-triangle-font .b-font:before {
   content: "\e64e";
-  color: #999999;
+  color: inherit;
 }
 .trigger-triangle-font.disabled .b-font:before {
   content: "\e64e";
-  color: #999999;
+  color: inherit;
 }
 .pull-up-font .b-font {
   *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');

dist/bundle.js

@@ -48593,31 +48593,19 @@ BI.shortcut("bi.half_icon_button", BI.HalfIconButton);/**
  * Created by GUY on 2015/9/16.
  * @class BI.TriggerIconButton
  * @extends BI.IconButton
- *
- * attention: 不要加invisible, 不要单独拿出去用
  */
-BI.TriggerIconButton = BI.inherit(BI.BasicButton, {
+BI.TriggerIconButton = BI.inherit(BI.IconButton, {
 
     _defaultConfig: function () {
         var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-trigger-icon-button"
+            baseCls: (conf.baseCls || "") + " bi-trigger-icon-button",
+            extraCls: "pull-down-font"
         });
     },
 
     _init: function () {
         BI.TriggerIconButton.superclass._init.apply(this, arguments);
-        BI.createWidget({
-            type: "bi.center_adapt",
-            element: this,
-            items: [{
-                type: "bi.icon_button",
-                cls: "pull-down-font trigger-down"
-            }, {
-                type: "bi.icon_button",
-                cls: "pull-up-font trigger-up"
-            }]
-        });
     },
 
     doClick: function () {
@@ -53235,12 +53223,10 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
                         eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
                         action: function () {
                             // self.trigger.stopEditing();
-                            self.element.removeClass("combo-show");
                         }
                     }, {
                         eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
                         action: function () {
-                            self.element.removeClass("combo-show").addClass("combo-show");
                             self.fireEvent(BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW);
                         }
                     }],
@@ -53388,7 +53374,7 @@ BI.shortcut("bi.search_text_value_combo_popup", BI.SearchTextValueComboPopup);/*
 BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
 
     props: {
-        baseCls: "bi-search-text-value-trigger bi-border",
+        extraCls: "bi-search-text-value-trigger bi-border",
         height: 24
     },
 
@@ -66574,12 +66560,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
             }
         });
 
-        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
-        });
-
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self.populate();
@@ -66958,12 +66939,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             }
         });
 
-        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
-        });
-
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self.populate();
@@ -67349,12 +67325,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
             }
         });
 
-        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
-        });
-
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self.populate();
@@ -70937,7 +70908,6 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
         });
 
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             if (isSearching()) {
                 return;
             }
@@ -70950,7 +70920,6 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
 
         });
         this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
             if (isSearching()) {
                 self.trigger.stopEditing();
                 self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
@@ -72540,12 +72509,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
             }
         });
 
-        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
-        });
-
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self._populate();
@@ -74302,12 +74266,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
             value: o.value
         });
 
-        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
-        });
-
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self.populate();

dist/case.js

@@ -117,31 +117,19 @@ BI.shortcut("bi.half_icon_button", BI.HalfIconButton);/**
  * Created by GUY on 2015/9/16.
  * @class BI.TriggerIconButton
  * @extends BI.IconButton
- *
- * attention: 不要加invisible, 不要单独拿出去用
  */
-BI.TriggerIconButton = BI.inherit(BI.BasicButton, {
+BI.TriggerIconButton = BI.inherit(BI.IconButton, {
 
     _defaultConfig: function () {
         var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-trigger-icon-button"
+            baseCls: (conf.baseCls || "") + " bi-trigger-icon-button",
+            extraCls: "pull-down-font"
         });
     },
 
     _init: function () {
         BI.TriggerIconButton.superclass._init.apply(this, arguments);
-        BI.createWidget({
-            type: "bi.center_adapt",
-            element: this,
-            items: [{
-                type: "bi.icon_button",
-                cls: "pull-down-font trigger-down"
-            }, {
-                type: "bi.icon_button",
-                cls: "pull-up-font trigger-up"
-            }]
-        });
     },
 
     doClick: function () {
@@ -4759,12 +4747,10 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
                         eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
                         action: function () {
                             // self.trigger.stopEditing();
-                            self.element.removeClass("combo-show");
                         }
                     }, {
                         eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
                         action: function () {
-                            self.element.removeClass("combo-show").addClass("combo-show");
                             self.fireEvent(BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW);
                         }
                     }],
@@ -4912,7 +4898,7 @@ BI.shortcut("bi.search_text_value_combo_popup", BI.SearchTextValueComboPopup);/*
 BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
 
     props: {
-        baseCls: "bi-search-text-value-trigger bi-border",
+        extraCls: "bi-search-text-value-trigger bi-border",
         height: 24
     },
 

dist/demo.js

@@ -1631,50 +1631,6 @@ Demo.SearchTextValueCombo = BI.inherit(BI.Widget, {
 BI.shortcut("demo.search_text_value_combo", Demo.SearchTextValueCombo);/**
  * Created by Dailer on 2017/7/11.
  */
-Demo.StaticCombo = BI.inherit(BI.Widget, {
-    props: {
-        baseCls: ""
-    },
-
-
-    beforeMount: function () {
-        this.refs.setValue(2);
-    },
-
-    render: function () {
-
-        var self = this;
-
-        return {
-            type: "bi.horizontal_auto",
-            items: [{
-                type: "bi.static_combo",
-                text: "Value 不变",
-                width: 300,
-                ref: function (_ref) {
-                    self.refs = _ref;
-                },
-                items: [
-                    {
-                        text: "MVC-1",
-                        value: 1
-                    }, {
-                        text: "MVC-2",
-                        value: 2
-                    }, {
-                        text: "MVC-3",
-                        value: 3
-                    }
-                ]
-            }],
-            vgap: 20
-        };
-    }
-});
-
-BI.shortcut("demo.static_combo", Demo.StaticCombo);/**
- * Created by Dailer on 2017/7/11.
- */
 Demo.TextValueCombo = BI.inherit(BI.Widget, {
     props: {
         baseCls: ""
@@ -4365,10 +4321,6 @@ BI.shortcut("demo.value_chooser_pane", Demo.ValueChooserPane);Demo.BASE_CONFIG =
     pId: 306,
     text: "bi.icon_combo",
     value: "demo.icon_combo"
-}, {
-    pId: 306,
-    text: "bi.static_combo",
-    value: "demo.static_combo"
 }, {
     pId: 306,
     text: "bi.text_value_combo",

dist/fineui.css

@@ -2360,6 +2360,11 @@ textarea {
   display: block !important;
   visibility: visible !important;
 }
+.bi-combo.bi-combo-popup > .bi-trigger .bi-trigger-icon-button .x-icon {
+  -webkit-transform: rotate(180deg);
+  -moz-transform: rotate(180deg);
+  transform: rotate(180deg);
+}
 .bi-combo.bi-combo-popup > .bi-border,
 .bi-combo.bi-combo-hover > .bi-border,
 .bi-combo:hover > .bi-border {
@@ -2372,17 +2377,10 @@ textarea {
 .bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button {
   color: #ff4949;
 }
-.bi-search-text-value-combo .trigger-up {
+.bi-search-text-value-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon {
-  display: none;
+  -webkit-transform: rotate(180deg);
-}
+  -moz-transform: rotate(180deg);
-.bi-search-text-value-combo .trigger-down {
+  transform: rotate(180deg);
-  display: block;
-}
-.bi-search-text-value-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-search-text-value-combo.combo-show .trigger-down {
-  display: none;
 }
 
 .bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {
@@ -3437,33 +3435,19 @@ ul.ztree.zTreeDragUL {
 .bi-multi-select-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
-.bi-multi-select-combo .trigger-up {
+.bi-multi-select-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon {
-  display: none;
+  -webkit-transform: rotate(180deg);
-}
+  -moz-transform: rotate(180deg);
-.bi-multi-select-combo .trigger-down {
+  transform: rotate(180deg);
-  display: block;
-}
-.bi-multi-select-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-multi-select-combo.combo-show .trigger-down {
-  display: none;
 }
 
 .bi-multi-select-insert-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
-.bi-multi-select-insert-combo .trigger-up {
+.bi-multi-select-insert-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon {
-  display: none;
+  -webkit-transform: rotate(180deg);
-}
+  -moz-transform: rotate(180deg);
-.bi-multi-select-insert-combo .trigger-down {
+  transform: rotate(180deg);
-  display: block;
-}
-.bi-multi-select-insert-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-multi-select-insert-combo.combo-show .trigger-down {
-  display: none;
 }
 
 
@@ -3488,17 +3472,10 @@ ul.ztree.zTreeDragUL {
 .bi-multi-tree-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
-.bi-multi-tree-combo .trigger-up {
+.bi-multi-tree-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon {
-  display: none;
+  -webkit-transform: rotate(180deg);
-}
+  -moz-transform: rotate(180deg);
-.bi-multi-tree-combo .trigger-down {
+  transform: rotate(180deg);
-  display: block;
-}
-.bi-multi-tree-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-multi-tree-combo.combo-show .trigger-down {
-  display: none;
 }
 .bi-multi-tree-popup .popup-view-tree {
   min-height: 170px;
@@ -3570,32 +3547,13 @@ ul.ztree.zTreeDragUL {
 .bi-search-multi-text-value-combo.combo-error .bi-multi-select-searcher .tip-text-style {
   color: #ff4949;
 }
-.bi-search-multi-text-value-combo .trigger-up {
-  display: none;
-}
-.bi-search-multi-text-value-combo .trigger-down {
-  display: block;
-}
-.bi-search-multi-text-value-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-search-multi-text-value-combo.combo-show .trigger-down {
-  display: none;
-}
 .bi-single-select-combo .single-select-trigger-icon-button {
   font-size: 16px;
 }
-.bi-single-select-combo .trigger-up {
+.bi-single-select-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon {
-  display: none;
+  -webkit-transform: rotate(180deg);
-}
+  -moz-transform: rotate(180deg);
-.bi-single-select-combo .trigger-down {
+  transform: rotate(180deg);
-  display: block;
-}
-.bi-single-select-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-single-select-combo.combo-show .trigger-down {
-  display: none;
 }
 .bi-single-slider-label {
   min-height: 50px;
@@ -4655,11 +4613,11 @@ textarea::-webkit-scrollbar-thumb:hover {
 }
 .trigger-triangle-font .b-font:before {
   content: "\e64e";
-  color: #999999;
+  color: inherit;
 }
 .trigger-triangle-font.disabled .b-font:before {
   content: "\e64e";
-  color: #999999;
+  color: inherit;
 }
 .pull-up-font .b-font {
   *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');

dist/fineui.js

@@ -48814,31 +48814,19 @@ BI.shortcut("bi.half_icon_button", BI.HalfIconButton);/**
  * Created by GUY on 2015/9/16.
  * @class BI.TriggerIconButton
  * @extends BI.IconButton
- *
- * attention: 不要加invisible, 不要单独拿出去用
  */
-BI.TriggerIconButton = BI.inherit(BI.BasicButton, {
+BI.TriggerIconButton = BI.inherit(BI.IconButton, {
 
     _defaultConfig: function () {
         var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-trigger-icon-button"
+            baseCls: (conf.baseCls || "") + " bi-trigger-icon-button",
+            extraCls: "pull-down-font"
         });
     },
 
     _init: function () {
         BI.TriggerIconButton.superclass._init.apply(this, arguments);
-        BI.createWidget({
-            type: "bi.center_adapt",
-            element: this,
-            items: [{
-                type: "bi.icon_button",
-                cls: "pull-down-font trigger-down"
-            }, {
-                type: "bi.icon_button",
-                cls: "pull-up-font trigger-up"
-            }]
-        });
     },
 
     doClick: function () {
@@ -53456,12 +53444,10 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
                         eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
                         action: function () {
                             // self.trigger.stopEditing();
-                            self.element.removeClass("combo-show");
                         }
                     }, {
                         eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
                         action: function () {
-                            self.element.removeClass("combo-show").addClass("combo-show");
                             self.fireEvent(BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW);
                         }
                     }],
@@ -53609,7 +53595,7 @@ BI.shortcut("bi.search_text_value_combo_popup", BI.SearchTextValueComboPopup);/*
 BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
 
     props: {
-        baseCls: "bi-search-text-value-trigger bi-border",
+        extraCls: "bi-search-text-value-trigger bi-border",
         height: 24
     },
 
@@ -66795,12 +66781,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
             }
         });
 
-        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
-        });
-
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self.populate();
@@ -67179,12 +67160,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             }
         });
 
-        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
-        });
-
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self.populate();
@@ -67570,12 +67546,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
             }
         });
 
-        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
-        });
-
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self.populate();
@@ -71158,7 +71129,6 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
         });
 
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             if (isSearching()) {
                 return;
             }
@@ -71171,7 +71141,6 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
 
         });
         this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
             if (isSearching()) {
                 self.trigger.stopEditing();
                 self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
@@ -72761,12 +72730,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
             }
         });
 
-        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
-        });
-
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self._populate();
@@ -74523,12 +74487,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
             value: o.value
         });
 
-        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
-        });
-
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self.populate();

dist/resource.css

@@ -952,11 +952,11 @@ textarea::-webkit-scrollbar-thumb:hover {
 }
 .trigger-triangle-font .b-font:before {
   content: "\e64e";
-  color: #999999;
+  color: inherit;
 }
 .trigger-triangle-font.disabled .b-font:before {
   content: "\e64e";
-  color: #999999;
+  color: inherit;
 }
 .pull-up-font .b-font {
   *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');

dist/widget.css

@@ -44,33 +44,19 @@
 .bi-multi-select-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
-.bi-multi-select-combo .trigger-up {
+.bi-multi-select-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon {
-  display: none;
+  -webkit-transform: rotate(180deg);
-}
+  -moz-transform: rotate(180deg);
-.bi-multi-select-combo .trigger-down {
+  transform: rotate(180deg);
-  display: block;
-}
-.bi-multi-select-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-multi-select-combo.combo-show .trigger-down {
-  display: none;
 }
 
 .bi-multi-select-insert-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
-.bi-multi-select-insert-combo .trigger-up {
+.bi-multi-select-insert-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon {
-  display: none;
+  -webkit-transform: rotate(180deg);
-}
+  -moz-transform: rotate(180deg);
-.bi-multi-select-insert-combo .trigger-down {
+  transform: rotate(180deg);
-  display: block;
-}
-.bi-multi-select-insert-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-multi-select-insert-combo.combo-show .trigger-down {
-  display: none;
 }
 
 
@@ -95,17 +81,10 @@
 .bi-multi-tree-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
-.bi-multi-tree-combo .trigger-up {
+.bi-multi-tree-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon {
-  display: none;
+  -webkit-transform: rotate(180deg);
-}
+  -moz-transform: rotate(180deg);
-.bi-multi-tree-combo .trigger-down {
+  transform: rotate(180deg);
-  display: block;
-}
-.bi-multi-tree-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-multi-tree-combo.combo-show .trigger-down {
-  display: none;
 }
 .bi-multi-tree-popup .popup-view-tree {
   min-height: 170px;
@@ -177,32 +156,13 @@
 .bi-search-multi-text-value-combo.combo-error .bi-multi-select-searcher .tip-text-style {
   color: #ff4949;
 }
-.bi-search-multi-text-value-combo .trigger-up {
-  display: none;
-}
-.bi-search-multi-text-value-combo .trigger-down {
-  display: block;
-}
-.bi-search-multi-text-value-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-search-multi-text-value-combo.combo-show .trigger-down {
-  display: none;
-}
 .bi-single-select-combo .single-select-trigger-icon-button {
   font-size: 16px;
 }
-.bi-single-select-combo .trigger-up {
+.bi-single-select-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon {
-  display: none;
+  -webkit-transform: rotate(180deg);
-}
+  -moz-transform: rotate(180deg);
-.bi-single-select-combo .trigger-down {
+  transform: rotate(180deg);
-  display: block;
-}
-.bi-single-select-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-single-select-combo.combo-show .trigger-down {
-  display: none;
 }
 .bi-single-slider-label {
   min-height: 50px;

dist/widget.js

@@ -8307,12 +8307,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
             }
         });
 
-        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
-        });
-
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self.populate();
@@ -8691,12 +8686,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             }
         });
 
-        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
-        });
-
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self.populate();
@@ -9082,12 +9072,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
             }
         });
 
-        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
-        });
-
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self.populate();
@@ -12670,7 +12655,6 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
         });
 
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             if (isSearching()) {
                 return;
             }
@@ -12683,7 +12667,6 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
 
         });
         this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
             if (isSearching()) {
                 self.trigger.stopEditing();
                 self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);
@@ -14273,12 +14256,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
             }
         });
 
-        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
-        });
-
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self._populate();
@@ -16035,12 +16013,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
             value: o.value
         });
 
-        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
-        });
-
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self.populate();

public/css/font.css

@@ -568,11 +568,11 @@
 }
 .trigger-triangle-font .b-font:before {
   content: "\e64e";
-  color: #999999;
+  color: inherit;
 }
 .trigger-triangle-font.disabled .b-font:before {
   content: "\e64e";
-  color: #999999;
+  color: inherit;
 }
 .pull-up-font .b-font {
   *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');

src/case/button/icon/icon.trigger.js

@@ -4,31 +4,19 @@
  * Created by GUY on 2015/9/16.
  * @class BI.TriggerIconButton
  * @extends BI.IconButton
- *
- * attention: 不要加invisible, 不要单独拿出去用
  */
-BI.TriggerIconButton = BI.inherit(BI.BasicButton, {
+BI.TriggerIconButton = BI.inherit(BI.IconButton, {
 
     _defaultConfig: function () {
         var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-trigger-icon-button"
+            baseCls: (conf.baseCls || "") + " bi-trigger-icon-button",
+            extraCls: "pull-down-font"
         });
     },
 
     _init: function () {
         BI.TriggerIconButton.superclass._init.apply(this, arguments);
-        BI.createWidget({
-            type: "bi.center_adapt",
-            element: this,
-            items: [{
-                type: "bi.icon_button",
-                cls: "pull-down-font trigger-down"
-            }, {
-                type: "bi.icon_button",
-                cls: "pull-up-font trigger-up"
-            }]
-        });
     },
 
     doClick: function () {

src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js

@@ -75,12 +75,10 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
                         eventName: BI.Combo.EVENT_AFTER_HIDEVIEW,
                         action: function () {
                             // self.trigger.stopEditing();
-                            self.element.removeClass("combo-show");
                         }
                     }, {
                         eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
                         action: function () {
-                            self.element.removeClass("combo-show").addClass("combo-show");
                             self.fireEvent(BI.SearchTextValueCombo.EVENT_BEFORE_POPUPVIEW);
                         }
                     }],

src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js

@@ -4,7 +4,7 @@
 BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {
 
     props: {
-        baseCls: "bi-search-text-value-trigger bi-border",
+        extraCls: "bi-search-text-value-trigger bi-border",
         height: 24
     },
 

src/css/base/combo/combo.css

@@ -83,6 +83,11 @@
   display: block !important;
   visibility: visible !important;
 }
+.bi-combo.bi-combo-popup > .bi-trigger .bi-trigger-icon-button .x-icon {
+  -webkit-transform: rotate(180deg);
+  -moz-transform: rotate(180deg);
+  transform: rotate(180deg);
+}
 .bi-combo.bi-combo-popup > .bi-border,
 .bi-combo.bi-combo-hover > .bi-border,
 .bi-combo:hover > .bi-border {
@@ -95,17 +100,10 @@
 .bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button {
   color: #ff4949;
 }
-.bi-search-text-value-combo .trigger-up {
+.bi-search-text-value-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon {
-  display: none;
+  -webkit-transform: rotate(180deg);
-}
+  -moz-transform: rotate(180deg);
-.bi-search-text-value-combo .trigger-down {
+  transform: rotate(180deg);
-  display: block;
-}
-.bi-search-text-value-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-search-text-value-combo.combo-show .trigger-down {
-  display: none;
 }
 
 .bi-icon-text-value-combo.combo-error .bi-text-trigger .select-text-label {

src/css/resource/font.css

@@ -568,11 +568,11 @@
 }
 .trigger-triangle-font .b-font:before {
   content: "\e64e";
-  color: #999999;
+  color: inherit;
 }
 .trigger-triangle-font.disabled .b-font:before {
   content: "\e64e";
-  color: #999999;
+  color: inherit;
 }
 .pull-up-font .b-font {
   *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');

src/css/widget/multiselect/multiselect.css

@@ -1,33 +1,19 @@
 .bi-multi-select-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
-.bi-multi-select-combo .trigger-up {
+.bi-multi-select-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon {
-  display: none;
+  -webkit-transform: rotate(180deg);
-}
+  -moz-transform: rotate(180deg);
-.bi-multi-select-combo .trigger-down {
+  transform: rotate(180deg);
-  display: block;
-}
-.bi-multi-select-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-multi-select-combo.combo-show .trigger-down {
-  display: none;
 }
 
 .bi-multi-select-insert-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
-.bi-multi-select-insert-combo .trigger-up {
+.bi-multi-select-insert-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon {
-  display: none;
+  -webkit-transform: rotate(180deg);
-}
+  -moz-transform: rotate(180deg);
-.bi-multi-select-insert-combo .trigger-down {
+  transform: rotate(180deg);
-  display: block;
-}
-.bi-multi-select-insert-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-multi-select-insert-combo.combo-show .trigger-down {
-  display: none;
 }
 
 

src/css/widget/multitree/multi.css

@@ -1,15 +1,8 @@
 .bi-multi-tree-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
-.bi-multi-tree-combo .trigger-up {
+.bi-multi-tree-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon {
-  display: none;
+  -webkit-transform: rotate(180deg);
-}
+  -moz-transform: rotate(180deg);
-.bi-multi-tree-combo .trigger-down {
+  transform: rotate(180deg);
-  display: block;
-}
-.bi-multi-tree-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-multi-tree-combo.combo-show .trigger-down {
-  display: none;
 }

src/css/widget/searchmultiselect/searchmultiselect.css

@@ -4,15 +4,3 @@
 .bi-search-multi-text-value-combo.combo-error .bi-multi-select-searcher .tip-text-style {
   color: #ff4949;
 }
-.bi-search-multi-text-value-combo .trigger-up {
-  display: none;
-}
-.bi-search-multi-text-value-combo .trigger-down {
-  display: block;
-}
-.bi-search-multi-text-value-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-search-multi-text-value-combo.combo-show .trigger-down {
-  display: none;
-}

src/css/widget/singleselect/singleselect.css

@@ -1,15 +1,8 @@
 .bi-single-select-combo .single-select-trigger-icon-button {
   font-size: 16px;
 }
-.bi-single-select-combo .trigger-up {
+.bi-single-select-combo .bi-combo.bi-combo-popup + .bi-trigger-icon-button .x-icon {
-  display: none;
+  -webkit-transform: rotate(180deg);
-}
+  -moz-transform: rotate(180deg);
-.bi-single-select-combo .trigger-down {
+  transform: rotate(180deg);
-  display: block;
-}
-.bi-single-select-combo.combo-show .trigger-up {
-  display: block;
-}
-.bi-single-select-combo.combo-show .trigger-down {
-  display: none;
 }

src/less/base/combo/combo.less

@@ -3,6 +3,13 @@
   &.bi-combo-popup {
     display: block !important;
     visibility: visible !important;
+    & > .bi-trigger {
+      & .bi-trigger-icon-button{
+        & .x-icon {
+          .rotate(180deg);
+        }
+      }
+    }
   }
   &.bi-combo-popup, &.bi-combo-hover, &:hover {
     & > .bi-border {

src/less/base/combo/combo.searchtextvalue.less

@@ -11,18 +11,10 @@
       }
     }
   }
-  & .trigger-up {
+  // 此combo的trigger_button是absolute上去的，与bi-combo在同一层级，独立写一下
-    display: none;
+  & .bi-combo.bi-combo-popup + .bi-trigger-icon-button {
-  }
+    & .x-icon {
-  & .trigger-down {
+      .rotate(180deg);
-    display: block;
-  }
-  &.combo-show {
-    & .trigger-up {
-      display: block;
-    }
-    & .trigger-down {
-      display: none;
     }
   }
 }

src/less/resource/font.less

@@ -75,7 +75,7 @@
 .font-hover(solid-triangle-bottom-font, @font-solid-bottom);
 
 //下拉框小小三角
-.font(trigger-triangle-font, @font-no-sort-no-filter, @color-bi-text-gray);
+.font(trigger-triangle-font, @font-no-sort-no-filter);
 
 //单选下拉框
 //向下展开子菜单

src/less/visual.less

@@ -47,6 +47,12 @@
   transition: @transition;
 }
 
+.rotate(@rotate) {
+  -webkit-transform: rotate(@rotate);
+  -moz-transform: rotate(@rotate);
+  transform: rotate(@rotate);
+}
+
 //渐变
 .gradient(@start, @end) {
   background: @start; //不支持的用这个

src/less/widget/multiselect/multiselect.combo.less

@@ -4,18 +4,10 @@
   & .multi-select-trigger-icon-button{
     font-size: 16px;
   }
-  & .trigger-up {
+  // 此combo的trigger_button是absolute上去的，与bi-combo在同一层级，独立写一下
-    display: none;
+  & .bi-combo.bi-combo-popup + .bi-trigger-icon-button {
-  }
+    & .x-icon {
-  & .trigger-down {
+      .rotate(180deg);
-    display: block;
-  }
-  &.combo-show {
-    & .trigger-up {
-      display: block;
-    }
-    & .trigger-down {
-      display: none;
     }
   }
 }

src/less/widget/multiselect/multiselect.insert.combo.less

@@ -4,18 +4,10 @@
   & .multi-select-trigger-icon-button{
     font-size: 16px;
   }
-  & .trigger-up {
+  // 此combo的trigger_button是absolute上去的，与bi-combo在同一层级，独立写一下
-    display: none;
+  & .bi-combo.bi-combo-popup + .bi-trigger-icon-button {
-  }
+    & .x-icon {
-  & .trigger-down {
+      .rotate(180deg);
-    display: block;
-  }
-  &.combo-show {
-    & .trigger-up {
-      display: block;
-    }
-    & .trigger-down {
-      display: none;
     }
   }
 }

src/less/widget/multitree/multi.tree.combo.less

@@ -4,18 +4,10 @@
   & .multi-select-trigger-icon-button{
     font-size: 16px;
   }
-  & .trigger-up {
+  // 此combo的trigger_button是absolute上去的，与bi-combo在同一层级，独立写一下
-    display: none;
+  & .bi-combo.bi-combo-popup + .bi-trigger-icon-button {
-  }
+    & .x-icon {
-  & .trigger-down {
+      .rotate(180deg);
-    display: block;
-  }
-  &.combo-show {
-    & .trigger-up {
-      display: block;
-    }
-    & .trigger-down {
-      display: none;
     }
   }
 }

src/less/widget/searchmultiselect/searchmultiselect.less

@@ -11,18 +11,4 @@
       }
     }
   }
-  & .trigger-up {
-    display: none;
-  }
-  & .trigger-down {
-    display: block;
-  }
-  &.combo-show {
-    & .trigger-up {
-      display: block;
-    }
-    & .trigger-down {
-      display: none;
-    }
-  }
 }

src/less/widget/singleselect/singleselect.combo.less

@@ -4,18 +4,10 @@
   & .single-select-trigger-icon-button{
     font-size: 16px;
   }
-  & .trigger-up {
+  // 此combo的trigger_button是absolute上去的，与bi-combo在同一层级，独立写一下
-    display: none;
+  & .bi-combo.bi-combo-popup + .bi-trigger-icon-button {
-  }
+    & .x-icon {
-  & .trigger-down {
+      .rotate(180deg);
-    display: block;
-  }
-  &.combo-show {
-    & .trigger-up {
-      display: block;
-    }
-    & .trigger-down {
-      display: none;
     }
   }
 }

src/widget/multiselect/multiselect.combo.js

@@ -168,12 +168,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
             }
         });
 
-        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
-        });
-
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self.populate();

src/widget/multiselect/multiselect.insert.combo.js

@@ -161,12 +161,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             }
         });
 
-        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
-        });
-
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self.populate();

src/widget/multiselect/multiselect.insert.combo.nobar.js

@@ -173,12 +173,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
             }
         });
 
-        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
-        });
-
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self.populate();

src/widget/multitree/multi.tree.combo.js

@@ -181,7 +181,6 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
         });
 
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             if (isSearching()) {
                 return;
             }
@@ -194,7 +193,6 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
 
         });
         this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
             if (isSearching()) {
                 self.trigger.stopEditing();
                 self.fireEvent(BI.MultiTreeCombo.EVENT_CONFIRM);

src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js

@@ -170,12 +170,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
             }
         });
 
-        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
-        });
-
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self._populate();

src/widget/singleselect/singleselect.combo.js

@@ -130,12 +130,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
             value: o.value
         });
 
-        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
-            self.element.removeClass("combo-show");
-        });
-
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.element.removeClass("combo-show").addClass("combo-show");
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self.populate();

ui/css/font.css

@@ -568,11 +568,11 @@
 }
 .trigger-triangle-font .b-font:before {
   content: "\e64e";
-  color: #999999;
+  color: inherit;
 }
 .trigger-triangle-font.disabled .b-font:before {
   content: "\e64e";
-  color: #999999;
+  color: inherit;
 }
 .pull-up-font .b-font {
   *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');