Merge pull request #439 in FUI/fineui from ~WINDY/fui:master to master

* commit 'd7acc52e9443ce70e854545dd77c593f67d84bf4':
  update
  BI-24064
  BI-23912

demo/js/widget/downlist/demo.downlist.js

@@ -29,7 +29,6 @@ Demo.Downlist = BI.inherit(BI.Widget, {
                 ref: function (_ref) {
                     self.downlist = _ref;
                 },
-                cls: "layout-bg3",
                 // value: [{"childValue":22,"value":11},{"value":18},{"value":20}],
                 height: 30,
                 width: 100,

dist/base.css

@@ -305,6 +305,18 @@
 .bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button {
   color: #ff4949;
 }
+.bi-search-text-value-combo .trigger-up {
+  display: none;
+}
+.bi-search-text-value-combo .trigger-down {
+  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-text-value-combo.combo-error .bi-select-text-trigger .bi-label {
   color: #ff4949;
@@ -2402,6 +2414,18 @@ ul.ztree.zTreeDragUL {
 .bi-trigger .bi-trigger-icon-button {
   font-size: 16px;
 }
+.bi-trigger .trigger-up {
+  display: none;
+}
+.bi-trigger .trigger-down {
+  display: block;
+}
+.bi-combo-popup .trigger-up {
+  display: block;
+}
+.bi-combo-popup .trigger-down {
+  display: none;
+}
 
 .bi-select-text-trigger {
   -webkit-border-radius: 2px;

dist/base.js

@@ -16693,6 +16693,7 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
             return BI.extend(conf, {
                 baseCls: (conf.baseCls || "") + " bi-button",
                 minWidth: (props.block === true || props.clear === true) ? 0 : 80,
+                height: 24,
                 shadow: props.clear !== true,
                 isShadowShowingOnSelected: true,
                 readonly: true,

dist/bundle.css

@@ -2351,6 +2351,18 @@ 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 {
+  display: none;
+}
+.bi-search-text-value-combo .trigger-down {
+  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-text-value-combo.combo-error .bi-select-text-trigger .bi-label {
   color: #ff4949;
@@ -4448,6 +4460,18 @@ ul.ztree.zTreeDragUL {
 .bi-trigger .bi-trigger-icon-button {
   font-size: 16px;
 }
+.bi-trigger .trigger-up {
+  display: none;
+}
+.bi-trigger .trigger-down {
+  display: block;
+}
+.bi-combo-popup .trigger-up {
+  display: block;
+}
+.bi-combo-popup .trigger-down {
+  display: none;
+}
 
 .bi-select-text-trigger {
   -webkit-border-radius: 2px;
@@ -4753,10 +4777,34 @@ ul.ztree.zTreeDragUL {
 .bi-multi-select-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
+.bi-multi-select-combo .trigger-up {
+  display: none;
+}
+.bi-multi-select-combo .trigger-down {
+  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 {
+  display: none;
+}
+.bi-multi-select-insert-combo .trigger-down {
+  display: block;
+}
+.bi-multi-select-insert-combo.combo-show .trigger-up {
+  display: block;
+}
+.bi-multi-select-insert-combo.combo-show .trigger-down {
+  display: none;
+}
 
 
 .bi-multi-select-trigger {
@@ -4793,6 +4841,18 @@ ul.ztree.zTreeDragUL {
 .bi-multi-tree-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
+.bi-multi-tree-combo .trigger-up {
+  display: none;
+}
+.bi-multi-tree-combo .trigger-down {
+  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-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
@@ -5105,6 +5165,18 @@ ul.ztree.zTreeDragUL {
 .bi-single-select-combo .single-select-trigger-icon-button {
   font-size: 16px;
 }
+.bi-single-select-combo .trigger-up {
+  display: none;
+}
+.bi-single-select-combo .trigger-down {
+  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/bundle.js

@@ -52459,6 +52459,7 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
             return BI.extend(conf, {
                 baseCls: (conf.baseCls || "") + " bi-button",
                 minWidth: (props.block === true || props.clear === true) ? 0 : 80,
+                height: 24,
                 shadow: props.clear !== true,
                 isShadowShowingOnSelected: true,
                 readonly: true,
@@ -72607,19 +72608,31 @@ 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.IconButton, {
+BI.TriggerIconButton = BI.inherit(BI.BasicButton, {
 
     _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 () {
@@ -78594,10 +78607,12 @@ 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);
                         }
                     }],
@@ -83292,7 +83307,8 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
             });
             this.elm.element.css({
                 minHeight: BI.isNumber(o.height) ? (o.height - 8) + "px" : o.height,
-                outline: "none"
+                outline: "none",
+                padding: "0 10px"
             }).html(o.value);
 
             if(o.readOnly) {
@@ -89810,7 +89826,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
             stopPropagation: o.stopPropagation,
             el: BI.createWidget(o.el, {
                 type: "bi.icon_trigger",
-                extraCls: o.iconCls ? o.iconCls : "pull-down-font",
+                extraCls: o.iconCls ? o.iconCls : "",
                 width: o.width,
                 height: o.height
             }),
@@ -97647,7 +97663,12 @@ 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();
@@ -98029,7 +98050,12 @@ 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();
@@ -98399,7 +98425,12 @@ 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();
@@ -101470,6 +101501,7 @@ 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;
             }
@@ -101482,6 +101514,7 @@ 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);
@@ -105263,7 +105296,12 @@ 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,19 +117,31 @@ 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.IconButton, {
+BI.TriggerIconButton = BI.inherit(BI.BasicButton, {
 
     _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 () {
@@ -6104,10 +6116,12 @@ 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);
                         }
                     }],
@@ -10802,7 +10816,8 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
             });
             this.elm.element.css({
                 minHeight: BI.isNumber(o.height) ? (o.height - 8) + "px" : o.height,
-                outline: "none"
+                outline: "none",
+                padding: "0 10px"
             }).html(o.value);
 
             if(o.readOnly) {

dist/demo.js

@@ -11019,111 +11019,6 @@ BI.shortcut("demo.tmp", Demo.Func);
     });
 
     BI.shortcut("demo.fix_global_watcher", Demo.Fix);
-}());(function () {
-    var State = BI.inherit(Fix.Model, {
-        state: function () {
-            return {
-                name: "原始属性",
-                info: {
-                    age: 12,
-                    sex: "male",
-                    birth: {
-                        year: 2018,
-                        month: 9,
-                        day: 11
-                    }
-                },
-                career: [{
-                    a: 1,
-                    b: 2,
-                    c: 3
-                }]
-            };
-        },
-        computed: {
-            b: function () {
-                return this.model.name + "-计算属性";
-            },
-            birth: function () {
-                return this.model.info.birth;
-            }
-        }
-    });
-
-    Demo.Fix = BI.inherit(BI.Widget, {
-        _store: function () {
-            return new State();
-        },
-        watch: {
-            b: function () {
-                this.button.setText(this.model.b);
-            },
-            "birth.**": function () {
-                console.log(123);
-            }
-        },
-        render: function () {
-            var self = this;
-            return {
-                type: "bi.vertical",
-                items: [{
-                    el: {
-                        type: "bi.button",
-                        ref: function () {
-                            self.button = this;
-                        },
-                        handler: function () {
-                            self.model.name = "这是改变后的属性";
-                        },
-                        text: this.model.b
-                    }
-                }, {
-                    el: {
-                        type: "bi.button",
-                        ref: function () {
-                            self.button = this;
-                        },
-                        handler: function () {
-                            self.model.birth.year = 2019;
-                        },
-                        text: "birthYearButton"
-                    }
-                }, {
-                    el: {
-                        type: "bi.button",
-                        ref: function () {
-                            self.button = this;
-                        },
-                        handler: function () {
-                            self.model.career.push({
-                                year: 2017,
-                                month: 3,
-                                day: 24
-                            });
-                        },
-                        text: "careerAddButton"
-                    }
-                }, {
-                    el: {
-                        type: "bi.button",
-                        ref: function () {
-                            self.button = this;
-                        },
-                        handler: function () {
-                            self.model.career[0].a = 24;
-                        },
-                        text: "careerChangeButton"
-                    }
-                }]
-            };
-        },
-        mounted: function () {
-
-
-        }
-    });
-
-    BI.shortcut("demo.fix_immutable", Demo.Fix);
 }());/**
  * @Author: Young
  * @CreationDate 2017-11-06 10:32
@@ -12509,7 +12404,6 @@ BI.shortcut("demo.date_time", Demo.CustomDateTime);Demo.Downlist = BI.inherit(BI
                 ref: function (_ref) {
                     self.downlist = _ref;
                 },
-                cls: "layout-bg3",
                 // value: [{"childValue":22,"value":11},{"value":18},{"value":20}],
                 height: 30,
                 width: 100,

dist/fineui.css

@@ -2351,6 +2351,18 @@ 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 {
+  display: none;
+}
+.bi-search-text-value-combo .trigger-down {
+  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-text-value-combo.combo-error .bi-select-text-trigger .bi-label {
   color: #ff4949;
@@ -4448,6 +4460,18 @@ ul.ztree.zTreeDragUL {
 .bi-trigger .bi-trigger-icon-button {
   font-size: 16px;
 }
+.bi-trigger .trigger-up {
+  display: none;
+}
+.bi-trigger .trigger-down {
+  display: block;
+}
+.bi-combo-popup .trigger-up {
+  display: block;
+}
+.bi-combo-popup .trigger-down {
+  display: none;
+}
 
 .bi-select-text-trigger {
   -webkit-border-radius: 2px;
@@ -4753,10 +4777,34 @@ ul.ztree.zTreeDragUL {
 .bi-multi-select-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
+.bi-multi-select-combo .trigger-up {
+  display: none;
+}
+.bi-multi-select-combo .trigger-down {
+  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 {
+  display: none;
+}
+.bi-multi-select-insert-combo .trigger-down {
+  display: block;
+}
+.bi-multi-select-insert-combo.combo-show .trigger-up {
+  display: block;
+}
+.bi-multi-select-insert-combo.combo-show .trigger-down {
+  display: none;
+}
 
 
 .bi-multi-select-trigger {
@@ -4793,6 +4841,18 @@ ul.ztree.zTreeDragUL {
 .bi-multi-tree-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
+.bi-multi-tree-combo .trigger-up {
+  display: none;
+}
+.bi-multi-tree-combo .trigger-down {
+  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-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
@@ -5105,6 +5165,18 @@ ul.ztree.zTreeDragUL {
 .bi-single-select-combo .single-select-trigger-icon-button {
   font-size: 16px;
 }
+.bi-single-select-combo .trigger-up {
+  display: none;
+}
+.bi-single-select-combo .trigger-down {
+  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/fineui.js

@@ -52702,6 +52702,7 @@ BI.shortcut("bi.image_button", BI.ImageButton);(function ($) {
             return BI.extend(conf, {
                 baseCls: (conf.baseCls || "") + " bi-button",
                 minWidth: (props.block === true || props.clear === true) ? 0 : 80,
+                height: 24,
                 shadow: props.clear !== true,
                 isShadowShowingOnSelected: true,
                 readonly: true,
@@ -72850,19 +72851,31 @@ 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.IconButton, {
+BI.TriggerIconButton = BI.inherit(BI.BasicButton, {
 
     _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 () {
@@ -78837,10 +78850,12 @@ 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);
                         }
                     }],
@@ -83535,7 +83550,8 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
             });
             this.elm.element.css({
                 minHeight: BI.isNumber(o.height) ? (o.height - 8) + "px" : o.height,
-                outline: "none"
+                outline: "none",
+                padding: "0 10px"
             }).html(o.value);
 
             if(o.readOnly) {
@@ -90053,7 +90069,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
             stopPropagation: o.stopPropagation,
             el: BI.createWidget(o.el, {
                 type: "bi.icon_trigger",
-                extraCls: o.iconCls ? o.iconCls : "pull-down-font",
+                extraCls: o.iconCls ? o.iconCls : "",
                 width: o.width,
                 height: o.height
             }),
@@ -97890,7 +97906,12 @@ 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();
@@ -98272,7 +98293,12 @@ 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();
@@ -98642,7 +98668,12 @@ 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();
@@ -101713,6 +101744,7 @@ 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;
             }
@@ -101725,6 +101757,7 @@ 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);
@@ -105506,7 +105539,12 @@ 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/widget.css

@@ -248,10 +248,34 @@
 .bi-multi-select-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
+.bi-multi-select-combo .trigger-up {
+  display: none;
+}
+.bi-multi-select-combo .trigger-down {
+  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 {
+  display: none;
+}
+.bi-multi-select-insert-combo .trigger-down {
+  display: block;
+}
+.bi-multi-select-insert-combo.combo-show .trigger-up {
+  display: block;
+}
+.bi-multi-select-insert-combo.combo-show .trigger-down {
+  display: none;
+}
 
 
 .bi-multi-select-trigger {
@@ -288,6 +312,18 @@
 .bi-multi-tree-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
+.bi-multi-tree-combo .trigger-up {
+  display: none;
+}
+.bi-multi-tree-combo .trigger-down {
+  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-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
@@ -600,6 +636,18 @@
 .bi-single-select-combo .single-select-trigger-icon-button {
   font-size: 16px;
 }
+.bi-single-select-combo .trigger-up {
+  display: none;
+}
+.bi-single-select-combo .trigger-down {
+  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

@@ -2186,7 +2186,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
             stopPropagation: o.stopPropagation,
             el: BI.createWidget(o.el, {
                 type: "bi.icon_trigger",
-                extraCls: o.iconCls ? o.iconCls : "pull-down-font",
+                extraCls: o.iconCls ? o.iconCls : "",
                 width: o.width,
                 height: o.height
             }),
@@ -10023,7 +10023,12 @@ 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();
@@ -10405,7 +10410,12 @@ 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();
@@ -10775,7 +10785,12 @@ 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();
@@ -13846,6 +13861,7 @@ 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;
             }
@@ -13858,6 +13874,7 @@ 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);
@@ -17639,7 +17656,12 @@ 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();

src/base/single/button/buttons/button.js

@@ -15,6 +15,7 @@
             return BI.extend(conf, {
                 baseCls: (conf.baseCls || "") + " bi-button",
                 minWidth: (props.block === true || props.clear === true) ? 0 : 80,
+                height: 24,
                 shadow: props.clear !== true,
                 isShadowShowingOnSelected: true,
                 readonly: true,

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

@@ -4,19 +4,31 @@
  * Created by GUY on 2015/9/16.
  * @class BI.TriggerIconButton
  * @extends BI.IconButton
+ *
+ * attention: 不要加invisible, 不要单独拿出去用
  */
-BI.TriggerIconButton = BI.inherit(BI.IconButton, {
+BI.TriggerIconButton = BI.inherit(BI.BasicButton, {
 
     _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

@@ -69,10 +69,12 @@ 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/richeditor/niceditor/niceditor.js

@@ -109,7 +109,8 @@
             });
             this.elm.element.css({
                 minHeight: BI.isNumber(o.height) ? (o.height - 8) + "px" : o.height,
-                outline: "none"
+                outline: "none",
+                padding: "0 10px"
             }).html(o.value);
 
             if(o.readOnly) {

src/css/base/combo/combo.css

@@ -118,6 +118,18 @@
 .bi-search-text-value-combo.combo-error .bi-search-text-value-trigger .bi-text-button {
   color: #ff4949;
 }
+.bi-search-text-value-combo .trigger-up {
+  display: none;
+}
+.bi-search-text-value-combo .trigger-down {
+  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-text-value-combo.combo-error .bi-select-text-trigger .bi-label {
   color: #ff4949;

src/css/base/trigger/trigger.css

@@ -3,6 +3,18 @@
 .bi-trigger .bi-trigger-icon-button {
   font-size: 16px;
 }
+.bi-trigger .trigger-up {
+  display: none;
+}
+.bi-trigger .trigger-down {
+  display: block;
+}
+.bi-combo-popup .trigger-up {
+  display: block;
+}
+.bi-combo-popup .trigger-down {
+  display: none;
+}
 
 .bi-select-text-trigger {
   -webkit-border-radius: 2px;

src/css/widget/multiselect/multiselect.css

@@ -1,10 +1,34 @@
 .bi-multi-select-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
+.bi-multi-select-combo .trigger-up {
+  display: none;
+}
+.bi-multi-select-combo .trigger-down {
+  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 {
+  display: none;
+}
+.bi-multi-select-insert-combo .trigger-down {
+  display: block;
+}
+.bi-multi-select-insert-combo.combo-show .trigger-up {
+  display: block;
+}
+.bi-multi-select-insert-combo.combo-show .trigger-down {
+  display: none;
+}
 
 
 .bi-multi-select-trigger {

src/css/widget/multitree/multi.css

@@ -1,3 +1,15 @@
 .bi-multi-tree-combo .multi-select-trigger-icon-button {
   font-size: 16px;
 }
+.bi-multi-tree-combo .trigger-up {
+  display: none;
+}
+.bi-multi-tree-combo .trigger-down {
+  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/singleselect/multiselect.css

@@ -1,3 +1,15 @@
 .bi-single-select-combo .single-select-trigger-icon-button {
   font-size: 16px;
 }
+.bi-single-select-combo .trigger-up {
+  display: none;
+}
+.bi-single-select-combo .trigger-down {
+  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.searchtextvalue.less

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

src/less/base/trigger/trigger.less

@@ -4,4 +4,19 @@
   & .bi-trigger-icon-button{
     font-size: @font-size-16;
   }
+  & .trigger-up {
+    display: none;
+  }
+  & .trigger-down {
+    display: block;
+  }
+}
+
+.bi-combo-popup {
+  & .trigger-up {
+    display: block;
+  }
+  & .trigger-down {
+    display: none;
+  }
 }

src/less/widget/downlist/combo.downlist.less

@@ -1,8 +1,5 @@
 @import "../../index";
 
 .bi-down-list-combo {
-  & .down-list-group {
+
-  }
-  & .bi-down-list-spliter {
-  }
 }

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

@@ -4,4 +4,18 @@
   & .multi-select-trigger-icon-button{
     font-size: 16px;
   }
+  & .trigger-up {
+    display: none;
+  }
+  & .trigger-down {
+    display: block;
+  }
+  &.combo-show {
+    & .trigger-up {
+      display: block;
+    }
+    & .trigger-down {
+      display: none;
+    }
+  }
 }

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

@@ -4,4 +4,18 @@
   & .multi-select-trigger-icon-button{
     font-size: 16px;
   }
+  & .trigger-up {
+    display: none;
+  }
+  & .trigger-down {
+    display: block;
+  }
+  &.combo-show {
+    & .trigger-up {
+      display: block;
+    }
+    & .trigger-down {
+      display: none;
+    }
+  }
 }

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

@@ -4,4 +4,18 @@
   & .multi-select-trigger-icon-button{
     font-size: 16px;
   }
+  & .trigger-up {
+    display: none;
+  }
+  & .trigger-down {
+    display: block;
+  }
+  &.combo-show {
+    & .trigger-up {
+      display: block;
+    }
+    & .trigger-down {
+      display: none;
+    }
+  }
 }

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

@@ -4,4 +4,18 @@
   & .single-select-trigger-icon-button{
     font-size: 16px;
   }
+  & .trigger-up {
+    display: none;
+  }
+  & .trigger-down {
+    display: block;
+  }
+  &.combo-show {
+    & .trigger-up {
+      display: block;
+    }
+    & .trigger-down {
+      display: none;
+    }
+  }
 }

src/widget/downlist/combo.downlist.js

@@ -48,7 +48,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
             stopPropagation: o.stopPropagation,
             el: BI.createWidget(o.el, {
                 type: "bi.icon_trigger",
-                extraCls: o.iconCls ? o.iconCls : "pull-down-font",
+                extraCls: o.iconCls ? o.iconCls : "",
                 width: o.width,
                 height: o.height
             }),

src/widget/multiselect/multiselect.combo.js

@@ -163,7 +163,12 @@ 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

@@ -164,7 +164,12 @@ 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

@@ -176,7 +176,12 @@ 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

@@ -180,6 +180,7 @@ 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;
             }
@@ -192,6 +193,7 @@ 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/singleselect/singleselect.combo.js

@@ -134,7 +134,12 @@ 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();