Pull request #1769: BI-81668 combo的border统一加在combo本身

Merge in VISUAL/fineui from ~WINDY/fui:master to master * commit '4667993af14ffb87011f316fd26a010da171516f': 去多余的attributes 按照comment修改 color chooser BI-81668 combo的border统一加在combo本身
3 years ago · 895af02b8d
38 changed files with 123 additions and 135 deletions
--- a/src/case/colorchooser/colorchooser.js
+++ b/src/case/colorchooser/colorchooser.js
@ -9,17 +9,17 @@ BI.ColorChooser = BI.inherit(BI.Widget, {

    _defaultConfig: function () {
        return BI.extend(BI.ColorChooser.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-color-chooser",
+            baseCls: "bi-color-chooser bi-border bi-focus-shadow",
            value: "",
            height: 24,
-            el: {}
+            el: {},
        });
    },

    _init: function () {
-        BI.ColorChooser.superclass._init.apply(this, arguments);
        var self = this, o = this.options;
-
+        o.height -= 2;
+        BI.ColorChooser.superclass._init.apply(this, arguments);
        o.value = o.value || "";
        this.combo = BI.createWidget({
            type: "bi.combo",
@ -33,8 +33,8 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
                ref: function (_ref) {
                    self.trigger = _ref;
                },
-                width: o.el.type ? o.width : o.width - 2,
-                height: o.el.type ? o.height : o.height - 2
+                width: o.width,
+                height: o.height
            }, o.el),
            popup: {
                el: BI.extend({
--- a/src/case/colorchooser/colorchooser.trigger.js
+++ b/src/case/colorchooser/colorchooser.trigger.js
@ -10,8 +10,8 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
    _defaultConfig: function () {
        var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
        return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border",
-            height: 22
+            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger",
+            height: 24
        });
    },

--- a/src/case/colorchooser/colorchooser.trigger.long.js
+++ b/src/case/colorchooser/colorchooser.trigger.long.js
@ -10,8 +10,8 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
    _defaultConfig: function () {
        var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
        return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border",
-            height: 22
+            baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger",
+            height: 24
        });
    },

--- a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js
+++ b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js
@ -5,20 +5,18 @@
 BI.IconTextValueCombo = BI.inherit(BI.Widget, {
    _defaultConfig: function () {
        return BI.extend(BI.IconTextValueCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-icon-text-value-combo",
+            baseCls: "bi-icon-text-value-combo bi-border bi-focus-shadow bi-border-radius",
            height: 24,
            iconHeight: null,
            iconWidth: null,
            value: "",
-            attributes: {
-                tabIndex: 0
-            }
        });
    },

    _init: function () {
-        BI.IconTextValueCombo.superclass._init.apply(this, arguments);
        var self = this, o = this.options;
+        o.height -= 2;
+        BI.IconTextValueCombo.superclass._init.apply(this, arguments);
        this.trigger = BI.createWidget({
            type: "bi.select_icon_text_trigger",
            cls: "icon-text-value-trigger",
--- a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
+++ b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
@ -10,9 +10,6 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
        items: [],
        tipType: "",
        warningTitle: "",
-        attributes: {
-            tabIndex: 0
-        }
    },

    render: function () {
@ -22,6 +19,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
            items: [{
                el: {
                    type: "bi.combo",
+                    cls: "bi-border bi-focus-shadow",
                    container: o.container,
                    adjustLength: 2,
                    toggle: false,
--- a/src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js
+++ b/src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js
@ -5,7 +5,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, {

    props: function () {
        return {
-            extraCls: "bi-search-text-value-trigger bi-border",
+            extraCls: "bi-search-text-value-trigger",
            height: 24,
            watermark: BI.i18nText("BI-Basic_Search")
        };
--- a/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
+++ b/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
@ -6,20 +6,18 @@
 BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
    _defaultConfig: function () {
        return BI.extend(BI.TextValueCheckCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-text-value-check-combo",
+            baseCls: "bi-text-value-check-combo bi-border bi-focus-shadow",
            width: 100,
            height: 24,
            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
            value: "",
-            attributes: {
-                tabIndex: 0
-            }
        });
    },

    _init: function () {
-        BI.TextValueCheckCombo.superclass._init.apply(this, arguments);
        var self = this, o = this.options;
+        o.height -= 2;
+        BI.TextValueCheckCombo.superclass._init.apply(this, arguments);
        this.trigger = BI.createWidget({
            type: "bi.select_text_trigger",
            cls: "text-value-trigger",
--- a/src/case/combo/textvaluecombo/combo.textvalue.js
+++ b/src/case/combo/textvaluecombo/combo.textvalue.js
@ -7,20 +7,18 @@
 BI.TextValueCombo = BI.inherit(BI.Widget, {
    _defaultConfig: function () {
        return BI.extend(BI.TextValueCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-text-value-combo",
+            baseCls: "bi-text-value-combo bi-border bi-focus-shadow",
            height: 24,
            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
            text: "",
            value: "",
-            attributes: {
-                tabIndex: 0
-            }
        });
    },

    _init: function () {
-        BI.TextValueCombo.superclass._init.apply(this, arguments);
        var self = this, o = this.options;
+        o.height -= 2;
+        BI.TextValueCombo.superclass._init.apply(this, arguments);
        this.trigger = BI.createWidget({
            type: "bi.select_text_trigger",
            cls: "text-value-trigger",
--- a/src/case/trigger/trigger.icon.text.select.js
+++ b/src/case/trigger/trigger.icon.text.select.js
@ -5,7 +5,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {

    _defaultConfig: function () {
        return BI.extend(BI.SelectIconTextTrigger.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-select-text-trigger bi-border",
+            baseCls: "bi-select-text-trigger",
            height: 24,
            iconHeight: null,
            iconWidth: null,
@ -14,7 +14,6 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, {
    },

    _init: function () {
-        this.options.height -= 2;
        BI.SelectIconTextTrigger.superclass._init.apply(this, arguments);
        var self = this, o = this.options;
        var obj = this._digist(o.value, o.items);
--- a/src/case/trigger/trigger.text.select.js
+++ b/src/case/trigger/trigger.text.select.js
@ -9,13 +9,12 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {

    _defaultConfig: function () {
        return BI.extend(BI.SelectTextTrigger.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-select-text-trigger bi-border bi-focus-shadow",
+            baseCls: "bi-select-text-trigger",
            height: 24
        });
    },

    _init: function () {
-        this.options.height -= 2;
        BI.SelectTextTrigger.superclass._init.apply(this, arguments);
        var self = this, o = this.options;
        var obj = this._digest(o.value, o.items);
--- a/src/less/base/combo/combo.less
+++ b/src/less/base/combo/combo.less
@ -22,13 +22,13 @@
    }
  }
  &.bi-combo-popup, &.bi-combo-hover, &:hover {
-    & > .bi-border {
+    &.bi-border {
      border-color: @color-bi-border-highlight;
    }
  }
  &.disabled {
    &.bi-combo-hover, &:hover {
-      & > .bi-border {
+      &.bi-border {
        border-color: @border-color-line;
      }
    }
@ -39,7 +39,7 @@
  .bi-combo {
    &.disabled {
      &.bi-combo-hover, &:hover {
-        & > .bi-border {
+        &.bi-border {
          border-color: @border-color-line-theme-dark;
        }
      }
--- a/src/widget/dynamicdate/dynamicdate.combo.js
+++ b/src/widget/dynamicdate/dynamicdate.combo.js
@ -7,8 +7,8 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
    },

    props: {
-        baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow bi-border-radius",
-        height: 22,
+        baseCls: "bi-dynamic-date-combo",
+        height: 24,
        minDate: "1900-01-01",
        maxDate: "2099-12-31",
        format: "",
@ -16,6 +16,11 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
        supportDynamic: true,
    },

+    _init: function () {
+        var o = this.options;
+        o.height -= 2;
+        BI.DynamicDateCombo.superclass._init.apply(this, arguments);
+    },

    render: function () {
        var self = this, opts = this.options;
@ -40,6 +45,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
                items: [{
                    el: {
                        type: "bi.combo",
+                        cls: "bi-border bi-focus-shadow bi-border-radius",
                        container: opts.container,
                        ref: function () {
                            self.combo = this;
--- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js
+++ b/src/widget/dynamicdatetime/dynamicdatetime.combo.js
@ -7,8 +7,8 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
    },

    props: {
-        baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow bi-border-radius",
-        height: 22,
+        baseCls: "bi-dynamic-date-combo",
+        height: 24,
        minDate: "1900-01-01",
        maxDate: "2099-12-31",
        format: "",
@ -16,6 +16,11 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
        supportDynamic: true
    },

+    _init: function () {
+        var o = this.options;
+        o.height -= 2;
+        BI.DynamicDateTimeCombo.superclass._init.apply(this, arguments);
+    },

    render: function () {
        var self = this, opts = this.options;
@ -40,6 +45,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
                items: [{
                    el: {
                        type: "bi.combo",
+                        cls: "bi-border bi-focus-shadow bi-border-radius",
                        destroyWhenHide: true,
                        container: opts.container,
                        ref: function () {
--- a/src/widget/multilayerselecttree/multilayerselecttree.combo.js
+++ b/src/widget/multilayerselecttree/multilayerselecttree.combo.js
@ -6,16 +6,13 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {

    _defaultConfig: function () {
        return BI.extend(BI.MultiLayerSelectTreeCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-multilayer-select-tree-combo",
+            baseCls: "bi-multilayer-select-tree-combo bi-border bi-focus-shadow bi-border-radius",
            isDefaultInit: false,
            height: 24,
            text: "",
            itemsCreator: BI.emptyFn,
            items: [],
            value: "",
-            attributes: {
-                tabIndex: 0
-            },
            allowEdit: false,
            allowSearchValue: false,
            allowInsertValue: false,
@ -23,6 +20,11 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
        });
    },

+    _init: function () {
+        this.options.height -= 2;
+        BI.MultiLayerSelectTreeCombo.superclass._init.apply(this, arguments);
+    },
+
    render: function () {
        var self = this, o = this.options;

--- a/src/widget/multilayersingletree/multilayersingletree.combo.js
+++ b/src/widget/multilayersingletree/multilayersingletree.combo.js
@ -9,16 +9,13 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {

    _defaultConfig: function () {
        return BI.extend(BI.MultiLayerSingleTreeCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-multilayer-single-tree-combo",
+            baseCls: "bi-multilayer-single-tree-combo bi-border bi-focus-shadow bi-border-radius",
            isDefaultInit: false,
            height: 24,
            text: "",
            itemsCreator: BI.emptyFn,
            items: [],
            value: "",
-            attributes: {
-                tabIndex: 0
-            },
            allowEdit: false,
            allowSearchValue: false,
            allowInsertValue: false,
@ -26,6 +23,11 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
        });
    },

+    _init: function () {
+        this.options.height -= 2;
+        BI.MultiLayerSingleTreeCombo.superclass._init.apply(this, arguments);
+    },
+
    render: function () {
        var self = this, o = this.options;

@ -33,6 +35,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {

        return (!o.allowEdit && o.itemsCreator === BI.emptyFn) ? combo : {
            type: "bi.absolute",
+            height: o.height - 2,
            items: [{
                el: combo,
                left: 0,
--- a/src/widget/multiselect/multiselect.combo.js
+++ b/src/widget/multiselect/multiselect.combo.js
@ -12,17 +12,14 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
            valueFormatter: BI.emptyFn,
            itemHeight: 24,
            height: 24,
-            attributes: {
-                tabIndex: 0
-            },
            allowEdit: true
        });
    },

    _init: function () {
-        BI.MultiSelectCombo.superclass._init.apply(this, arguments);
        var self = this, o = this.options;
-
+        o.height -= 2;
+        BI.MultiSelectCombo.superclass._init.apply(this, arguments);
        var assertShowValue = function () {
            if (BI.isKey(self._startValue)) {
                if (self.storeValue.type === BI.Selection.All) {
@ -142,6 +139,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {

        this.combo = BI.createWidget({
            type: "bi.combo",
+            cls: "bi-border bi-focus-shadow bi-border-radius",
            toggle: !o.allowEdit,
            container: o.container,
            el: this.trigger,
--- a/src/widget/multiselect/multiselect.combo.nobar.js
+++ b/src/widget/multiselect/multiselect.combo.nobar.js
@ -12,16 +12,13 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
            valueFormatter: BI.emptyFn,
            itemHeight: 24,
            height: 24,
-            attributes: {
-                tabIndex: 0
-            }
        });
    },

    _init: function () {
-        BI.MultiSelectNoBarCombo.superclass._init.apply(this, arguments);
        var self = this, o = this.options;
-
+        o.height -= 2;
+        BI.MultiSelectNoBarCombo.superclass._init.apply(this, arguments);
        var assertShowValue = function () {
            if (BI.isKey(self._startValue)) {
                if (self.storeValue.type === BI.Selection.All) {
@ -131,6 +128,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {

        this.combo = BI.createWidget({
            type: "bi.combo",
+            cls: "bi-border bi-focus-shadow bi-border-radius",
            toggle: false,
            container: o.container,
            el: this.trigger,
--- a/src/widget/multiselect/multiselect.insert.combo.js
+++ b/src/widget/multiselect/multiselect.insert.combo.js
@ -12,17 +12,14 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
            valueFormatter: BI.emptyFn,
            height: 24,
            itemHeight: 24,
-            attributes: {
-                tabIndex: 0
-            },
            allowEdit: true
        });
    },

    _init: function () {
-        BI.MultiSelectInsertCombo.superclass._init.apply(this, arguments);
        var self = this, o = this.options;
-
+        o.height -= 2;
+        BI.MultiSelectInsertCombo.superclass._init.apply(this, arguments);
        var assertShowValue = function () {
            if (BI.isKey(self._startValue)) {
                if(self.storeValue.type === BI.Selection.All) {
@ -136,6 +133,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {

        this.combo = BI.createWidget({
            type: "bi.combo",
+            cls: "bi-border bi-focus-shadow bi-border-radius",
            toggle: !o.allowEdit,
            el: this.trigger,
            adjustLength: 1,
--- a/src/widget/multiselect/multiselect.insert.combo.nobar.js
+++ b/src/widget/multiselect/multiselect.insert.combo.nobar.js
@ -12,16 +12,13 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
            valueFormatter: BI.emptyFn,
            itemsHeight: 24,
            height: 24,
-            attributes: {
-                tabIndex: 0
-            }
        });
    },

    _init: function () {
-        BI.MultiSelectInsertNoBarCombo.superclass._init.apply(this, arguments);
        var self = this, o = this.options;
-
+        o.height -= 2;
+        BI.MultiSelectInsertNoBarCombo.superclass._init.apply(this, arguments);
        var assertShowValue = function () {
            if (BI.isKey(self._startValue)) {
                if (self.storeValue.type === BI.Selection.All) {
@ -129,6 +126,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {

        this.combo = BI.createWidget({
            type: "bi.combo",
+            cls: "bi-border bi-focus-shadow bi-border-radius",
            toggle: false,
            container: o.container,
            el: this.trigger,
--- a/src/widget/multiselect/multiselect.insert.trigger.js
+++ b/src/widget/multiselect/multiselect.insert.trigger.js
@ -15,7 +15,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {

    _defaultConfig: function () {
        return BI.extend(BI.MultiSelectInsertTrigger.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-multi-select-trigger bi-border bi-border-radius",
+            baseCls: "bi-multi-select-trigger",
            itemsCreator: BI.emptyFn,
            valueFormatter: BI.emptyFn,
            itemHeight: 24,
@ -32,9 +32,6 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
        BI.MultiSelectInsertTrigger.superclass._init.apply(this, arguments);

        var self = this, o = this.options;
-        if (o.height) {
-            this.setHeight(o.height - 2);
-        }

        this.searcher = BI.createWidget(o.searcher, {
            type: "bi.multi_select_insert_searcher",
--- a/src/widget/multiselect/multiselect.trigger.js
+++ b/src/widget/multiselect/multiselect.trigger.js
@ -15,7 +15,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {

    _defaultConfig: function () {
        return BI.extend(BI.MultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-multi-select-trigger bi-border bi-border-radius",
+            baseCls: "bi-multi-select-trigger",
            itemsCreator: BI.emptyFn,
            valueFormatter: BI.emptyFn,
            searcher: {},
@ -32,9 +32,6 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
        BI.MultiSelectTrigger.superclass._init.apply(this, arguments);

        var self = this, o = this.options;
-        if (o.height) {
-            this.setHeight(o.height - 2);
-        }

        this.searcher = BI.createWidget(o.searcher, {
            type: "bi.multi_select_searcher",
--- a/src/widget/multitree/multi.tree.combo.js
+++ b/src/widget/multitree/multi.tree.combo.js
@ -27,10 +27,9 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
    },

    _init: function () {
-        BI.MultiTreeCombo.superclass._init.apply(this, arguments);
-
        var self = this, o = this.options;
-
+        o.height -= 2;
+        BI.MultiTreeCombo.superclass._init.apply(this, arguments);
        var isInit = false;
        var want2showCounter = false;

@ -56,6 +55,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {

        this.combo = BI.createWidget({
            type: "bi.combo",
+            cls: "bi-border bi-focus-shadow bi-border-radius",
            toggle: !o.allowEdit,
            container: o.container,
            el: this.trigger,
@ -302,7 +302,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
                },
                right: o.height,
                top: 0,
-                height: o.height,
+                bottom: 0
            }]
        });
    },
--- a/src/widget/multitree/multi.tree.insert.combo.js
+++ b/src/widget/multitree/multi.tree.insert.combo.js
@ -22,15 +22,14 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
            valueFormatter: BI.emptyFn,
            height: 24,
            allowEdit: true,
-            isNeedAdjustWidth: true
+            isNeedAdjustWidth: true,
        });
    },

    _init: function () {
-        BI.MultiTreeInsertCombo.superclass._init.apply(this, arguments);
-
        var self = this, o = this.options;
-
+        o.height -= 2;
+        BI.MultiTreeInsertCombo.superclass._init.apply(this, arguments);
        var isInit = false;
        var want2showCounter = false;

@ -71,6 +70,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {

        this.combo = BI.createWidget({
            type: "bi.combo",
+            cls: "bi-border bi-focus-shadow bi-border-radius",
            toggle: !o.allowEdit,
            container: o.container,
            el: this.trigger,
--- a/src/widget/multitree/multi.tree.list.combo.js
+++ b/src/widget/multitree/multi.tree.list.combo.js
@ -23,15 +23,14 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
            height: 24,
            allowEdit: true,
            allowInsertValue: true,
-            isNeedAdjustWidth: true
+            isNeedAdjustWidth: true,
        });
    },

    _init: function () {
-        BI.MultiTreeListCombo.superclass._init.apply(this, arguments);
-
        var self = this, o = this.options;
-
+        o.height -= 2;
+        BI.MultiTreeListCombo.superclass._init.apply(this, arguments);
        var isInit = false;
        var want2showCounter = false;

@ -87,6 +86,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {

        this.combo = BI.createWidget({
            type: "bi.combo",
+            cls: "bi-border bi-focus-shadow bi-border-radius",
            toggle: !o.allowEdit,
            container: o.container,
            el: this.trigger,
--- a/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
+++ b/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
@ -14,8 +14,9 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
    },

    _init: function () {
-        BI.SearchMultiTextValueCombo.superclass._init.apply(this, arguments);
        var self = this, o = this.options;
+        o.height -= 2;
+        BI.SearchMultiTextValueCombo.superclass._init.apply(this, arguments);
        var assertShowValue = function () {
            BI.isKey(self._startValue) && (self.storeValue.type === BI.Selection.All ? BI.remove(self.storeValue.value, self._startValue) : BI.pushDistinct(self.storeValue.value, self._startValue));
            self._updateAllValue();
@ -127,6 +128,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {

        this.combo = BI.createWidget({
            type: "bi.combo",
+            cls: "bi-border bi-focus-shadow bi-border-radius",
            toggle: false,
            container: o.container,
            el: this.trigger,
--- a/src/widget/searchmultitextvaluecombo/multitextvalue.combo.trigger.search.js
+++ b/src/widget/searchmultitextvaluecombo/multitextvalue.combo.trigger.search.js
@ -8,7 +8,7 @@ BI.SearchMultiSelectTrigger = BI.inherit(BI.Trigger, {

    _defaultConfig: function () {
        return BI.extend(BI.SearchMultiSelectTrigger.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-multi-select-trigger bi-border",
+            baseCls: "bi-multi-select-trigger",
            itemsCreator: BI.emptyFn,
            valueFormatter: BI.emptyFn,
            searcher: {},
@ -23,9 +23,6 @@ BI.SearchMultiSelectTrigger = BI.inherit(BI.Trigger, {
        BI.SearchMultiSelectTrigger.superclass._init.apply(this, arguments);

        var self = this, o = this.options;
-        if (o.height) {
-            this.setHeight(o.height - 2);
-        }

        this.searcher = BI.createWidget(o.searcher, {
            type: "bi.search_multi_select_searcher",
--- a/src/widget/selecttree/selecttree.combo.js
+++ b/src/widget/selecttree/selecttree.combo.js
@ -6,20 +6,18 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {

    _defaultConfig: function () {
        return BI.extend(BI.SelectTreeCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-select-tree-combo",
+            baseCls: "bi-select-tree-combo bi-border bi-focus-shadow bi-border-radius",
            height: 24,
            text: "",
            items: [],
            value: "",
-            attributes: {
-                tabIndex: 0
-            }
        });
    },

    _init: function () {
-        BI.SelectTreeCombo.superclass._init.apply(this, arguments);
        var self = this, o = this.options;
+        o.height -= 2;
+        BI.SelectTreeCombo.superclass._init.apply(this, arguments);

        this.trigger = BI.createWidget({
            type: "bi.single_tree_trigger",
--- a/src/widget/singleselect/singleselect.combo.js
+++ b/src/widget/singleselect/singleselect.combo.js
@ -12,16 +12,14 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
            itemsCreator: BI.emptyFn,
            valueFormatter: BI.emptyFn,
            height: 24,
-            attributes: {
-                tabIndex: 0
-            },
            allowEdit: true
        });
    },

    _init: function () {
-        BI.SingleSelectCombo.superclass._init.apply(this, arguments);
        var self = this, o = this.options;
+        o.height -= 2;
+        BI.SingleSelectCombo.superclass._init.apply(this, arguments);

        var assertShowValue = function () {
            BI.isKey(self._startValue) && (self.storeValue = self._startValue);
@ -108,6 +106,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {

        this.combo = BI.createWidget({
            type: "bi.combo",
+            cls: "bi-border bi-border-radius",
            container: o.container,
            toggle: false,
            el: this.trigger,
--- a/src/widget/singleselect/singleselect.insert.combo.js
+++ b/src/widget/singleselect/singleselect.insert.combo.js
@ -12,17 +12,14 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
            itemsCreator: BI.emptyFn,
            valueFormatter: BI.emptyFn,
            height: 24,
-            attributes: {
-                tabIndex: 0
-            },
            allowEdit: true
        });
    },

    _init: function () {
-        BI.SingleSelectInsertCombo.superclass._init.apply(this, arguments);
        var self = this, o = this.options;
-
+        o.height -= 2;
+        BI.SingleSelectInsertCombo.superclass._init.apply(this, arguments);
        var assertShowValue = function () {
            BI.isKey(self._startValue) && (self.storeValue = self._startValue);
            self.trigger.getSearcher().setState(self.storeValue);
@ -124,6 +121,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {

        this.combo = BI.createWidget({
            type: "bi.combo",
+            cls: "bi-border bi-border-radius",
            container: o.container,
            toggle: false,
            el: this.trigger,
--- a/src/widget/singleselect/singleselect.trigger.js
+++ b/src/widget/singleselect/singleselect.trigger.js
@ -15,7 +15,7 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {

    _defaultConfig: function () {
        return BI.extend(BI.SingleSelectTrigger.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-single-select-trigger bi-border bi-border-radius",
+            baseCls: "bi-single-select-trigger",
            allowNoSelect: false,
            itemsCreator: BI.emptyFn,
            valueFormatter: BI.emptyFn,
@ -32,9 +32,6 @@ BI.SingleSelectTrigger = BI.inherit(BI.Trigger, {
        BI.SingleSelectTrigger.superclass._init.apply(this, arguments);

        var self = this, o = this.options;
-        if (o.height) {
-            this.setHeight(o.height - 2);
-        }

        this.searcher = BI.createWidget(o.searcher, {
            type: "bi.single_select_searcher",
--- a/src/widget/singletree/singletree.combo.js
+++ b/src/widget/singletree/singletree.combo.js
@ -6,21 +6,19 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, {

    _defaultConfig: function () {
        return BI.extend(BI.SingleTreeCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-single-tree-combo",
+            baseCls: "bi-single-tree-combo bi-border bi-focus-shadow bi-border-radius",
            trigger: {},
            height: 24,
            text: "",
            items: [],
            value: "",
-            attributes: {
-                tabIndex: 0
-            }
        });
    },

    _init: function () {
-        BI.SingleTreeCombo.superclass._init.apply(this, arguments);
        var self = this, o = this.options;
+        o.height -= 2;
+        BI.SingleTreeCombo.superclass._init.apply(this, arguments);

        this.trigger = BI.createWidget(BI.extend({
            type: "bi.single_tree_trigger",
--- a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js
+++ b/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js
@ -5,18 +5,15 @@
 BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
    _defaultConfig: function () {
        return BI.extend(BI.TextValueDownListCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-text-value-down-list-combo",
+            baseCls: "bi-text-value-down-list-combo bi-border bi-focus-shadow",
            height: 24,
-            attributes: {
-                tabIndex: 0
-            }
        });
    },

    _init: function () {
-        BI.TextValueDownListCombo.superclass._init.apply(this, arguments);
        var self = this, o = this.options;
-
+        o.height -= 2;
+        BI.TextValueDownListCombo.superclass._init.apply(this, arguments);
        this._createValueMap();

        var value;
--- a/src/widget/time/time.combo.js
+++ b/src/widget/time/time.combo.js
@ -13,11 +13,16 @@
            border: 1
        },
        props: {
-            baseCls: "bi-time-combo bi-border bi-border-radius bi-focus-shadow",
-            // width: 78,
-            // height: 22,
+            baseCls: "bi-time-combo",
+            height: 24,
            format: "",
-            allowEdit: false
+            allowEdit: false,
+        },
+
+        _init: function () {
+            var o = this.options;
+            o.height -= 2;
+            BI.TimeCombo.superclass._init.apply(this, arguments);
        },

        render: function () {
@ -59,6 +64,7 @@
                    items: [{
                        el: {
                            type: "bi.combo",
+                            cls: "bi-border bi-border-radius bi-focus-shadow",
                            container: opts.container,
                            toggle: false,
                            isNeedAdjustHeight: false,
@ -164,7 +170,7 @@
                        },
                        top: 0,
                        left: 0,
-                        right: 22,
+                        right: 0,
                        bottom: 0
                    }, {
                        el: {
--- a/src/widget/year/combo.year.js
+++ b/src/widget/year/combo.year.js
@ -5,13 +5,14 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
        behaviors: {},
        minDate: "1900-01-01", // 最小日期
        maxDate: "2099-12-31", // 最大日期
-        height: 22,
+        height: 24,
        supportDynamic: true,
    },

    _init: function () {
-        BI.DynamicYearCombo.superclass._init.apply(this, arguments);
        var self = this, o = this.options;
+        o.height -= 2;
+        BI.DynamicYearCombo.superclass._init.apply(this, arguments);
        this.storeValue = o.value;
        this.trigger = BI.createWidget({
            type: "bi.dynamic_year_trigger",
--- a/src/widget/yearmonth/combo.yearmonth.js
+++ b/src/widget/yearmonth/combo.yearmonth.js
@ -5,13 +5,14 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
        behaviors: {},
        minDate: "1900-01-01", // 最小日期
        maxDate: "2099-12-31", // 最大日期
-        height: 22,
+        height: 24,
        supportDynamic: true
    },

    _init: function () {
-        BI.DynamicYearMonthCombo.superclass._init.apply(this, arguments);
        var self = this, o = this.options;
+        o.height -= 2;
+        BI.DynamicYearMonthCombo.superclass._init.apply(this, arguments);
        this.storeValue = o.value;
        this.storeTriggerValue = "";
        this.trigger = BI.createWidget({
--- a/src/widget/yearmonth/trigger.yearmonth.js
+++ b/src/widget/yearmonth/trigger.yearmonth.js
@ -8,7 +8,7 @@ BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, {
        extraCls: "bi-year-month-trigger",
        min: "1900-01-01", // 最小日期
        max: "2099-12-31", // 最大日期
-        height: 22
+        height: 24
    },

    beforeInit: function (callback) {
--- a/src/widget/yearquarter/combo.yearquarter.js
+++ b/src/widget/yearquarter/combo.yearquarter.js
@ -5,13 +5,14 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
        behaviors: {},
        minDate: "1900-01-01", // 最小日期
        maxDate: "2099-12-31", // 最大日期
-        height: 22,
+        height: 24,
        supportDynamic: true,
    },

    _init: function () {
-        BI.DynamicYearQuarterCombo.superclass._init.apply(this, arguments);
        var self = this, o = this.options;
+        o.height -= 2;
+        BI.DynamicYearQuarterCombo.superclass._init.apply(this, arguments);
        this.storeValue = o.value;
        self.storeTriggerValue = "";
        this.trigger = BI.createWidget({
--- a/src/widget/yearquarter/trigger.yearquarter.js
+++ b/src/widget/yearquarter/trigger.yearquarter.js
@ -8,7 +8,7 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
        extraCls: "bi-year-quarter-trigger",
        min: "1900-01-01", // 最小日期
        max: "2099-12-31", // 最大日期
-        height: 22
+        height: 24
    },

    _init: function () {