BI-81668 combo的border统一加在combo本身

src/case/combo/icontextvaluecombo/combo.icontextvalue.js

@@ -5,7 +5,7 @@
 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,
@@ -19,6 +19,9 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
     _init: function () {
         BI.IconTextValueCombo.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
+        if (o.height) {
+            this.setHeight(o.height - 2);
+        }
         this.trigger = BI.createWidget({
             type: "bi.select_icon_text_trigger",
             cls: "icon-text-value-trigger",

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

@@ -22,6 +22,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,

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

@@ -5,8 +5,8 @@ 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,
+            height: 22,
             watermark: BI.i18nText("BI-Basic_Search")
         };
     },

src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js

@@ -6,7 +6,7 @@
 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,
@@ -20,6 +20,9 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
     _init: function () {
         BI.TextValueCheckCombo.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
+        if (o.height) {
+            this.setHeight(o.height - 2);
+        }
         this.trigger = BI.createWidget({
             type: "bi.select_text_trigger",
             cls: "text-value-trigger",

src/case/combo/textvaluecombo/combo.textvalue.js

@@ -7,7 +7,7 @@
 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: "",
@@ -19,6 +19,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
     },
 
     _init: function () {
+        this.options.height -= 2;
         BI.TextValueCombo.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
         this.trigger = BI.createWidget({

src/case/trigger/trigger.icon.text.select.js

@@ -5,8 +5,8 @@ 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,
+            height: 22,
             iconHeight: null,
             iconWidth: null,
             iconCls: ""
@@ -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);

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
+            height: 22
         });
     },
 
     _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);

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;
         }
       }

src/widget/dynamicdate/dynamicdate.combo.js

@@ -14,6 +14,9 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
         format: "",
         allowEdit: true,
         supportDynamic: true,
+        attributes: {
+            tabIndex: 0
+        }
     },
 
 

src/widget/multilayerselecttree/multilayerselecttree.combo.js

@@ -6,7 +6,7 @@ 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: "",
@@ -23,6 +23,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;
 

src/widget/multilayersingletree/multilayersingletree.combo.js

@@ -9,7 +9,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
 
     _defaultConfig: function () {
         return BI.extend(BI.MultiLayerSingleTreeCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-multilayer-single-tree-combo",
+            baseCls: "bi-multilayer-single-tree-combo bi-border bi-focus-shadow bi-border-radius",
             isDefaultInit: false,
             height: 24,
             text: "",
@@ -26,6 +26,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 +38,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,

src/widget/multiselect/multiselect.combo.js

@@ -22,7 +22,9 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
     _init: function () {
         BI.MultiSelectCombo.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
-
+        if (o.height) {
+            this.setHeight(o.height - 2);
+        }
         var assertShowValue = function () {
             if (BI.isKey(self._startValue)) {
                 if (self.storeValue.type === BI.Selection.All) {
@@ -142,6 +144,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,

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

@@ -21,7 +21,9 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
     _init: function () {
         BI.MultiSelectNoBarCombo.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
-
+        if (o.height) {
+            this.setHeight(o.height - 2);
+        }
         var assertShowValue = function () {
             if (BI.isKey(self._startValue)) {
                 if (self.storeValue.type === BI.Selection.All) {
@@ -131,6 +133,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,

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

@@ -22,7 +22,9 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
     _init: function () {
         BI.MultiSelectInsertCombo.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
-
+        if (o.height) {
+            this.setHeight(o.height - 2);
+        }
         var assertShowValue = function () {
             if (BI.isKey(self._startValue)) {
                 if(self.storeValue.type === BI.Selection.All) {
@@ -136,6 +138,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,

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

@@ -21,7 +21,9 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
     _init: function () {
         BI.MultiSelectInsertNoBarCombo.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
-
+        if (o.height) {
+            this.setHeight(o.height - 2);
+        }
         var assertShowValue = function () {
             if (BI.isKey(self._startValue)) {
                 if (self.storeValue.type === BI.Selection.All) {
@@ -129,6 +131,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,

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",

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",

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

@@ -23,6 +23,9 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
             height: 24,
             allowEdit: true,
             isNeedAdjustWidth: true,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -30,7 +33,9 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
         BI.MultiTreeCombo.superclass._init.apply(this, arguments);
 
         var self = this, o = this.options;
-
+        if (o.height) {
+            this.setHeight(o.height - 2);
+        }
         var isInit = false;
         var want2showCounter = false;
 
@@ -56,6 +61,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 +308,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
                 },
                 right: o.height,
                 top: 0,
-                height: o.height,
+                bottom: 0
             }]
         });
     },

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

@@ -22,7 +22,10 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
             valueFormatter: BI.emptyFn,
             height: 24,
             allowEdit: true,
-            isNeedAdjustWidth: true
+            isNeedAdjustWidth: true,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -30,7 +33,9 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
         BI.MultiTreeInsertCombo.superclass._init.apply(this, arguments);
 
         var self = this, o = this.options;
-
+        if (o.height) {
+            this.setHeight(o.height - 2);
+        }
         var isInit = false;
         var want2showCounter = false;
 
@@ -71,6 +76,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,

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

@@ -23,7 +23,10 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
             height: 24,
             allowEdit: true,
             allowInsertValue: true,
-            isNeedAdjustWidth: true
+            isNeedAdjustWidth: true,
+            attributes: {
+                tabIndex: 0
+            }
         });
     },
 
@@ -31,7 +34,9 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
         BI.MultiTreeListCombo.superclass._init.apply(this, arguments);
 
         var self = this, o = this.options;
-
+        if (o.height) {
+            this.setHeight(o.height - 2);
+        }
         var isInit = false;
         var want2showCounter = false;
 
@@ -87,6 +92,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,

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

@@ -16,6 +16,9 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
     _init: function () {
         BI.SearchMultiTextValueCombo.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
+        if (o.height) {
+            this.setHeight(o.height - 2);
+        }
         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 +130,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,

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",

src/widget/selecttree/selecttree.combo.js

@@ -6,7 +6,7 @@ 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: [],
@@ -18,6 +18,7 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
     },
 
     _init: function () {
+        this.options.height -= 2;
         BI.SelectTreeCombo.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
 

src/widget/singleselect/singleselect.combo.js

@@ -22,6 +22,9 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
     _init: function () {
         BI.SingleSelectCombo.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
+        if (o.height) {
+            this.setHeight(o.height - 2);
+        }
 
         var assertShowValue = function () {
             BI.isKey(self._startValue) && (self.storeValue = self._startValue);
@@ -108,6 +111,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,

src/widget/singleselect/singleselect.insert.combo.js

@@ -22,7 +22,9 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
     _init: function () {
         BI.SingleSelectInsertCombo.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
-
+        if (o.height) {
+            this.setHeight(o.height - 2);
+        }
         var assertShowValue = function () {
             BI.isKey(self._startValue) && (self.storeValue = self._startValue);
             self.trigger.getSearcher().setState(self.storeValue);
@@ -124,6 +126,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,

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",

src/widget/singletree/singletree.combo.js

@@ -6,7 +6,7 @@ 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: "",
@@ -19,8 +19,9 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, {
     },
 
     _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",

src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js

@@ -5,7 +5,7 @@
 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

src/widget/time/time.combo.js

@@ -17,7 +17,10 @@
             // width: 78,
             // height: 22,
             format: "",
-            allowEdit: false
+            allowEdit: false,
+            attributes: {
+                tabIndex: 0
+            }
         },
 
         render: function () {