From 5ba41e9fef047d400a5ebfe64e16a63e0f5c3139 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 19 Feb 2021 11:15:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?BI-81668=20combo=E7=9A=84border=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E5=8A=A0=E5=9C=A8combo=E6=9C=AC=E8=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../combo/icontextvaluecombo/combo.icontextvalue.js | 5 ++++- .../searchtextvaluecombo/combo.searchtextvalue.js | 1 + .../searchtextvaluecombo/trigger.searchtextvalue.js | 4 ++-- .../combo/textvaluecheckcombo/combo.textvaluecheck.js | 5 ++++- src/case/combo/textvaluecombo/combo.textvalue.js | 3 ++- src/case/trigger/trigger.icon.text.select.js | 5 ++--- src/case/trigger/trigger.text.select.js | 5 ++--- src/less/base/combo/combo.less | 6 +++--- src/widget/dynamicdate/dynamicdate.combo.js | 3 +++ .../multilayerselecttree/multilayerselecttree.combo.js | 7 ++++++- .../multilayersingletree/multilayersingletree.combo.js | 8 +++++++- src/widget/multiselect/multiselect.combo.js | 5 ++++- src/widget/multiselect/multiselect.combo.nobar.js | 5 ++++- src/widget/multiselect/multiselect.insert.combo.js | 5 ++++- .../multiselect/multiselect.insert.combo.nobar.js | 5 ++++- src/widget/multiselect/multiselect.insert.trigger.js | 5 +---- src/widget/multiselect/multiselect.trigger.js | 5 +---- src/widget/multitree/multi.tree.combo.js | 10 ++++++++-- src/widget/multitree/multi.tree.insert.combo.js | 10 ++++++++-- src/widget/multitree/multi.tree.list.combo.js | 10 ++++++++-- .../multitextvalue.combo.search.js | 4 ++++ .../multitextvalue.combo.trigger.search.js | 5 +---- src/widget/selecttree/selecttree.combo.js | 3 ++- src/widget/singleselect/singleselect.combo.js | 4 ++++ src/widget/singleselect/singleselect.insert.combo.js | 5 ++++- src/widget/singleselect/singleselect.trigger.js | 5 +---- src/widget/singletree/singletree.combo.js | 5 +++-- .../textvaluedownlistcombo/combo.textvaluedownlist.js | 2 +- src/widget/time/time.combo.js | 5 ++++- 29 files changed, 102 insertions(+), 48 deletions(-) diff --git a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js index ff29bfc445..b80c4563a5 100644 --- a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js +++ b/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", diff --git a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js index 4929a2f7f1..e39c16c866 100644 --- a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js +++ b/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, diff --git a/src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js b/src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js index d3e11c8604..7943ff0f3c 100644 --- a/src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js +++ b/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", - height: 24, + extraCls: "bi-search-text-value-trigger", + height: 22, watermark: BI.i18nText("BI-Basic_Search") }; }, diff --git a/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js b/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js index e5c1c16977..2173ca76c7 100644 --- a/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js +++ b/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", diff --git a/src/case/combo/textvaluecombo/combo.textvalue.js b/src/case/combo/textvaluecombo/combo.textvalue.js index 796ad0196c..3208f9a40a 100644 --- a/src/case/combo/textvaluecombo/combo.textvalue.js +++ b/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({ diff --git a/src/case/trigger/trigger.icon.text.select.js b/src/case/trigger/trigger.icon.text.select.js index 38e3c3ded4..f1611f83e4 100644 --- a/src/case/trigger/trigger.icon.text.select.js +++ b/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", - height: 24, + baseCls: "bi-select-text-trigger", + 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); diff --git a/src/case/trigger/trigger.text.select.js b/src/case/trigger/trigger.text.select.js index 04d3e92db6..8e19fcc11d 100644 --- 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", - height: 24 + baseCls: "bi-select-text-trigger", + 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); diff --git a/src/less/base/combo/combo.less b/src/less/base/combo/combo.less index 14f3cd1541..ab380ec4a8 100644 --- 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; } } diff --git a/src/widget/dynamicdate/dynamicdate.combo.js b/src/widget/dynamicdate/dynamicdate.combo.js index 4cda9f9b75..717b868903 100644 --- a/src/widget/dynamicdate/dynamicdate.combo.js +++ b/src/widget/dynamicdate/dynamicdate.combo.js @@ -14,6 +14,9 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, { format: "", allowEdit: true, supportDynamic: true, + attributes: { + tabIndex: 0 + } }, diff --git a/src/widget/multilayerselecttree/multilayerselecttree.combo.js b/src/widget/multilayerselecttree/multilayerselecttree.combo.js index fd47795728..17c4d5c7ca 100644 --- a/src/widget/multilayerselecttree/multilayerselecttree.combo.js +++ b/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; diff --git a/src/widget/multilayersingletree/multilayersingletree.combo.js b/src/widget/multilayersingletree/multilayersingletree.combo.js index 5cf34118dc..f23d4d0c8a 100644 --- a/src/widget/multilayersingletree/multilayersingletree.combo.js +++ b/src/widget/multilayersingletree/multilayersingletree.combo.js @@ -9,7 +9,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.MultiLayerSingleTreeCombo.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-multilayer-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, diff --git a/src/widget/multiselect/multiselect.combo.js b/src/widget/multiselect/multiselect.combo.js index ce3e60fe39..d7e06f9421 100644 --- a/src/widget/multiselect/multiselect.combo.js +++ b/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, diff --git a/src/widget/multiselect/multiselect.combo.nobar.js b/src/widget/multiselect/multiselect.combo.nobar.js index e49b9dc476..a6226a966c 100644 --- a/src/widget/multiselect/multiselect.combo.nobar.js +++ b/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, diff --git a/src/widget/multiselect/multiselect.insert.combo.js b/src/widget/multiselect/multiselect.insert.combo.js index a28858b872..d82f60de1c 100644 --- a/src/widget/multiselect/multiselect.insert.combo.js +++ b/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, diff --git a/src/widget/multiselect/multiselect.insert.combo.nobar.js b/src/widget/multiselect/multiselect.insert.combo.nobar.js index 845ae893c9..91c50c5bba 100644 --- a/src/widget/multiselect/multiselect.insert.combo.nobar.js +++ b/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, diff --git a/src/widget/multiselect/multiselect.insert.trigger.js b/src/widget/multiselect/multiselect.insert.trigger.js index e9c6c4d518..3878538d46 100644 --- 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", diff --git a/src/widget/multiselect/multiselect.trigger.js b/src/widget/multiselect/multiselect.trigger.js index 7c4ff62958..d24d9c23a3 100644 --- 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", diff --git a/src/widget/multitree/multi.tree.combo.js b/src/widget/multitree/multi.tree.combo.js index f66ddc721b..634216f8cd 100644 --- a/src/widget/multitree/multi.tree.combo.js +++ b/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 }] }); }, diff --git a/src/widget/multitree/multi.tree.insert.combo.js b/src/widget/multitree/multi.tree.insert.combo.js index 436fbe575b..a4bb8fede0 100644 --- a/src/widget/multitree/multi.tree.insert.combo.js +++ b/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, diff --git a/src/widget/multitree/multi.tree.list.combo.js b/src/widget/multitree/multi.tree.list.combo.js index be75e27ae1..29899934b3 100644 --- a/src/widget/multitree/multi.tree.list.combo.js +++ b/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, diff --git a/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js b/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js index 258f9a612a..777fcf9e30 100644 --- a/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js +++ b/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, diff --git a/src/widget/searchmultitextvaluecombo/multitextvalue.combo.trigger.search.js b/src/widget/searchmultitextvaluecombo/multitextvalue.combo.trigger.search.js index d4ba0f002c..3256994ae7 100644 --- 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", diff --git a/src/widget/selecttree/selecttree.combo.js b/src/widget/selecttree/selecttree.combo.js index 900c5fa412..89812010ab 100644 --- a/src/widget/selecttree/selecttree.combo.js +++ b/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; diff --git a/src/widget/singleselect/singleselect.combo.js b/src/widget/singleselect/singleselect.combo.js index d90a588eb8..8ee0860fe7 100644 --- a/src/widget/singleselect/singleselect.combo.js +++ b/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, diff --git a/src/widget/singleselect/singleselect.insert.combo.js b/src/widget/singleselect/singleselect.insert.combo.js index d02ecce5d6..a7b0a68b84 100644 --- a/src/widget/singleselect/singleselect.insert.combo.js +++ b/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, diff --git a/src/widget/singleselect/singleselect.trigger.js b/src/widget/singleselect/singleselect.trigger.js index 53605bf5bb..44b6f6f028 100644 --- 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", diff --git a/src/widget/singletree/singletree.combo.js b/src/widget/singletree/singletree.combo.js index fae7f8ff50..3398ed97c9 100644 --- a/src/widget/singletree/singletree.combo.js +++ b/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", diff --git a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js b/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js index 734395889f..6dfdb8ed53 100644 --- a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js +++ b/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 diff --git a/src/widget/time/time.combo.js b/src/widget/time/time.combo.js index 14bdce0955..f78ba22db0 100644 --- a/src/widget/time/time.combo.js +++ b/src/widget/time/time.combo.js @@ -17,7 +17,10 @@ // width: 78, // height: 22, format: "", - allowEdit: false + allowEdit: false, + attributes: { + tabIndex: 0 + } }, render: function () { From 2237feda612e4e8bebf63b20e6bc75e29cb9b84f Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 19 Feb 2021 11:29:51 +0800 Subject: [PATCH 2/4] color chooser --- src/case/colorchooser/colorchooser.js | 15 ++++++++++----- src/case/colorchooser/colorchooser.trigger.js | 2 +- .../colorchooser/colorchooser.trigger.long.js | 2 +- .../combo.textvaluedownlist.js | 4 +++- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/case/colorchooser/colorchooser.js b/src/case/colorchooser/colorchooser.js index aad99a4bb1..850333b3cf 100644 --- a/src/case/colorchooser/colorchooser.js +++ b/src/case/colorchooser/colorchooser.js @@ -9,17 +9,22 @@ 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: {}, + attributes: { + tabIndex: 0 + } }); }, _init: function () { BI.ColorChooser.superclass._init.apply(this, arguments); var self = this, o = this.options; - + if (o.height) { + this.setHeight(o.height - 2); + } o.value = o.value || ""; this.combo = BI.createWidget({ type: "bi.combo", @@ -33,8 +38,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({ diff --git a/src/case/colorchooser/colorchooser.trigger.js b/src/case/colorchooser/colorchooser.trigger.js index ab1ad1862a..3314026de8 100644 --- a/src/case/colorchooser/colorchooser.trigger.js +++ b/src/case/colorchooser/colorchooser.trigger.js @@ -10,7 +10,7 @@ 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", + baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", height: 22 }); }, diff --git a/src/case/colorchooser/colorchooser.trigger.long.js b/src/case/colorchooser/colorchooser.trigger.long.js index 74421ce730..e22df78826 100644 --- a/src/case/colorchooser/colorchooser.trigger.long.js +++ b/src/case/colorchooser/colorchooser.trigger.long.js @@ -10,7 +10,7 @@ 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", + baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", height: 22 }); }, diff --git a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js b/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js index 6dfdb8ed53..3a2eea2de6 100644 --- a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js +++ b/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js @@ -16,7 +16,9 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { _init: function () { BI.TextValueDownListCombo.superclass._init.apply(this, arguments); var self = this, o = this.options; - + if (o.height) { + this.setHeight(o.height - 2); + } this._createValueMap(); var value; From 3b9d151e14ea30be613341dea4e6724692a17d92 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 19 Feb 2021 14:15:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8C=89=E7=85=A7comment=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/colorchooser/colorchooser.js | 6 ++---- src/case/colorchooser/colorchooser.trigger.js | 2 +- src/case/colorchooser/colorchooser.trigger.long.js | 2 +- src/case/combo/icontextvaluecombo/combo.icontextvalue.js | 6 ++---- .../combo/searchtextvaluecombo/combo.searchtextvalue.js | 3 --- .../combo/searchtextvaluecombo/trigger.searchtextvalue.js | 2 +- src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js | 6 ++---- src/case/combo/textvaluecombo/combo.textvalue.js | 4 ++-- src/case/trigger/trigger.icon.text.select.js | 2 +- src/case/trigger/trigger.text.select.js | 2 +- src/widget/dynamicdate/dynamicdate.combo.js | 7 ++++++- src/widget/dynamicdatetime/dynamicdatetime.combo.js | 7 ++++++- src/widget/multiselect/multiselect.combo.js | 6 ++---- src/widget/multiselect/multiselect.combo.nobar.js | 6 ++---- src/widget/multiselect/multiselect.insert.combo.js | 6 ++---- src/widget/multiselect/multiselect.insert.combo.nobar.js | 6 ++---- src/widget/multitree/multi.tree.combo.js | 7 ++----- src/widget/multitree/multi.tree.insert.combo.js | 7 ++----- src/widget/multitree/multi.tree.list.combo.js | 7 ++----- .../multitextvalue.combo.search.js | 6 ++---- src/widget/selecttree/selecttree.combo.js | 4 ++-- src/widget/singleselect/singleselect.combo.js | 6 ++---- src/widget/singleselect/singleselect.insert.combo.js | 6 ++---- .../textvaluedownlistcombo/combo.textvaluedownlist.js | 6 ++---- src/widget/year/combo.year.js | 5 +++-- src/widget/yearmonth/combo.yearmonth.js | 5 +++-- src/widget/yearmonth/trigger.yearmonth.js | 2 +- src/widget/yearquarter/combo.yearquarter.js | 5 +++-- src/widget/yearquarter/trigger.yearquarter.js | 2 +- 29 files changed, 60 insertions(+), 81 deletions(-) diff --git a/src/case/colorchooser/colorchooser.js b/src/case/colorchooser/colorchooser.js index 850333b3cf..8454c0fec0 100644 --- a/src/case/colorchooser/colorchooser.js +++ b/src/case/colorchooser/colorchooser.js @@ -20,11 +20,9 @@ BI.ColorChooser = BI.inherit(BI.Widget, { }, _init: function () { - BI.ColorChooser.superclass._init.apply(this, arguments); var self = this, o = this.options; - if (o.height) { - this.setHeight(o.height - 2); - } + o.height -= 2; + BI.ColorChooser.superclass._init.apply(this, arguments); o.value = o.value || ""; this.combo = BI.createWidget({ type: "bi.combo", diff --git a/src/case/colorchooser/colorchooser.trigger.js b/src/case/colorchooser/colorchooser.trigger.js index 3314026de8..17dd665da7 100644 --- a/src/case/colorchooser/colorchooser.trigger.js +++ b/src/case/colorchooser/colorchooser.trigger.js @@ -11,7 +11,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, { var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", - height: 22 + height: 24 }); }, diff --git a/src/case/colorchooser/colorchooser.trigger.long.js b/src/case/colorchooser/colorchooser.trigger.long.js index e22df78826..238c13f2c4 100644 --- a/src/case/colorchooser/colorchooser.trigger.long.js +++ b/src/case/colorchooser/colorchooser.trigger.long.js @@ -11,7 +11,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, { var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", - height: 22 + height: 24 }); }, diff --git a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js index b80c4563a5..a276602150 100644 --- a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js +++ b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js @@ -17,11 +17,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); - } + 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", diff --git a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js index e39c16c866..aa4402ff5d 100644 --- 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 () { diff --git a/src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js b/src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js index 7943ff0f3c..8c204fa620 100644 --- a/src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js +++ b/src/case/combo/searchtextvaluecombo/trigger.searchtextvalue.js @@ -6,7 +6,7 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { props: function () { return { extraCls: "bi-search-text-value-trigger", - height: 22, + height: 24, watermark: BI.i18nText("BI-Basic_Search") }; }, diff --git a/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js b/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js index 2173ca76c7..1edffb8632 100644 --- a/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js +++ b/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js @@ -18,11 +18,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); - } + o.height -= 2; + BI.TextValueCheckCombo.superclass._init.apply(this, arguments); this.trigger = BI.createWidget({ type: "bi.select_text_trigger", cls: "text-value-trigger", diff --git a/src/case/combo/textvaluecombo/combo.textvalue.js b/src/case/combo/textvaluecombo/combo.textvalue.js index 3208f9a40a..bbf8ecdd51 100644 --- a/src/case/combo/textvaluecombo/combo.textvalue.js +++ b/src/case/combo/textvaluecombo/combo.textvalue.js @@ -19,9 +19,9 @@ 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; + o.height -= 2; + BI.TextValueCombo.superclass._init.apply(this, arguments); this.trigger = BI.createWidget({ type: "bi.select_text_trigger", cls: "text-value-trigger", diff --git a/src/case/trigger/trigger.icon.text.select.js b/src/case/trigger/trigger.icon.text.select.js index f1611f83e4..a980b055a7 100644 --- a/src/case/trigger/trigger.icon.text.select.js +++ b/src/case/trigger/trigger.icon.text.select.js @@ -6,7 +6,7 @@ BI.SelectIconTextTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { return BI.extend(BI.SelectIconTextTrigger.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-select-text-trigger", - height: 22, + height: 24, iconHeight: null, iconWidth: null, iconCls: "" diff --git a/src/case/trigger/trigger.text.select.js b/src/case/trigger/trigger.text.select.js index 8e19fcc11d..ee7a2c078a 100644 --- a/src/case/trigger/trigger.text.select.js +++ b/src/case/trigger/trigger.text.select.js @@ -10,7 +10,7 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { return BI.extend(BI.SelectTextTrigger.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-select-text-trigger", - height: 22 + height: 24 }); }, diff --git a/src/widget/dynamicdate/dynamicdate.combo.js b/src/widget/dynamicdate/dynamicdate.combo.js index 717b868903..b03ed0d9a9 100644 --- a/src/widget/dynamicdate/dynamicdate.combo.js +++ b/src/widget/dynamicdate/dynamicdate.combo.js @@ -8,7 +8,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, { props: { baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow bi-border-radius", - height: 22, + height: 24, minDate: "1900-01-01", maxDate: "2099-12-31", format: "", @@ -19,6 +19,11 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, { } }, + _init: function () { + var o = this.options; + o.height -= 2; + BI.DynamicDateCombo.superclass._init.apply(this, arguments); + }, render: function () { var self = this, opts = this.options; diff --git a/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/src/widget/dynamicdatetime/dynamicdatetime.combo.js index 350a163c28..66c602feed 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.combo.js @@ -8,7 +8,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { props: { baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow bi-border-radius", - height: 22, + 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; diff --git a/src/widget/multiselect/multiselect.combo.js b/src/widget/multiselect/multiselect.combo.js index d7e06f9421..039e17b8cf 100644 --- a/src/widget/multiselect/multiselect.combo.js +++ b/src/widget/multiselect/multiselect.combo.js @@ -20,11 +20,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); - } + 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) { diff --git a/src/widget/multiselect/multiselect.combo.nobar.js b/src/widget/multiselect/multiselect.combo.nobar.js index a6226a966c..d1ee954aef 100644 --- a/src/widget/multiselect/multiselect.combo.nobar.js +++ b/src/widget/multiselect/multiselect.combo.nobar.js @@ -19,11 +19,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); - } + 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) { diff --git a/src/widget/multiselect/multiselect.insert.combo.js b/src/widget/multiselect/multiselect.insert.combo.js index d82f60de1c..21db8c9525 100644 --- a/src/widget/multiselect/multiselect.insert.combo.js +++ b/src/widget/multiselect/multiselect.insert.combo.js @@ -20,11 +20,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); - } + 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) { diff --git a/src/widget/multiselect/multiselect.insert.combo.nobar.js b/src/widget/multiselect/multiselect.insert.combo.nobar.js index 91c50c5bba..84216eadd1 100644 --- a/src/widget/multiselect/multiselect.insert.combo.nobar.js +++ b/src/widget/multiselect/multiselect.insert.combo.nobar.js @@ -19,11 +19,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); - } + 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) { diff --git a/src/widget/multitree/multi.tree.combo.js b/src/widget/multitree/multi.tree.combo.js index 634216f8cd..4717807b25 100644 --- a/src/widget/multitree/multi.tree.combo.js +++ b/src/widget/multitree/multi.tree.combo.js @@ -30,12 +30,9 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { }, _init: function () { - BI.MultiTreeCombo.superclass._init.apply(this, arguments); - var self = this, o = this.options; - if (o.height) { - this.setHeight(o.height - 2); - } + o.height -= 2; + BI.MultiTreeCombo.superclass._init.apply(this, arguments); var isInit = false; var want2showCounter = false; diff --git a/src/widget/multitree/multi.tree.insert.combo.js b/src/widget/multitree/multi.tree.insert.combo.js index a4bb8fede0..a998fd4738 100644 --- a/src/widget/multitree/multi.tree.insert.combo.js +++ b/src/widget/multitree/multi.tree.insert.combo.js @@ -30,12 +30,9 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, { }, _init: function () { - BI.MultiTreeInsertCombo.superclass._init.apply(this, arguments); - var self = this, o = this.options; - if (o.height) { - this.setHeight(o.height - 2); - } + o.height -= 2; + BI.MultiTreeInsertCombo.superclass._init.apply(this, arguments); var isInit = false; var want2showCounter = false; diff --git a/src/widget/multitree/multi.tree.list.combo.js b/src/widget/multitree/multi.tree.list.combo.js index 29899934b3..13e0516d8e 100644 --- a/src/widget/multitree/multi.tree.list.combo.js +++ b/src/widget/multitree/multi.tree.list.combo.js @@ -31,12 +31,9 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, { }, _init: function () { - BI.MultiTreeListCombo.superclass._init.apply(this, arguments); - var self = this, o = this.options; - if (o.height) { - this.setHeight(o.height - 2); - } + o.height -= 2; + BI.MultiTreeListCombo.superclass._init.apply(this, arguments); var isInit = false; var want2showCounter = false; diff --git a/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js b/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js index 777fcf9e30..4410a21320 100644 --- a/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js +++ b/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js @@ -14,11 +14,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); - } + 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(); diff --git a/src/widget/selecttree/selecttree.combo.js b/src/widget/selecttree/selecttree.combo.js index 89812010ab..c22524983e 100644 --- a/src/widget/selecttree/selecttree.combo.js +++ b/src/widget/selecttree/selecttree.combo.js @@ -18,9 +18,9 @@ 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; + o.height -= 2; + BI.SelectTreeCombo.superclass._init.apply(this, arguments); this.trigger = BI.createWidget({ type: "bi.single_tree_trigger", diff --git a/src/widget/singleselect/singleselect.combo.js b/src/widget/singleselect/singleselect.combo.js index 8ee0860fe7..5edcf44225 100644 --- a/src/widget/singleselect/singleselect.combo.js +++ b/src/widget/singleselect/singleselect.combo.js @@ -20,11 +20,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); - } + o.height -= 2; + BI.SingleSelectCombo.superclass._init.apply(this, arguments); var assertShowValue = function () { BI.isKey(self._startValue) && (self.storeValue = self._startValue); diff --git a/src/widget/singleselect/singleselect.insert.combo.js b/src/widget/singleselect/singleselect.insert.combo.js index a7b0a68b84..404350b6fc 100644 --- a/src/widget/singleselect/singleselect.insert.combo.js +++ b/src/widget/singleselect/singleselect.insert.combo.js @@ -20,11 +20,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); - } + 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); diff --git a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js b/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js index 3a2eea2de6..eb7242cde4 100644 --- a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js +++ b/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js @@ -14,11 +14,9 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { }, _init: function () { - BI.TextValueDownListCombo.superclass._init.apply(this, arguments); var self = this, o = this.options; - if (o.height) { - this.setHeight(o.height - 2); - } + o.height -= 2; + BI.TextValueDownListCombo.superclass._init.apply(this, arguments); this._createValueMap(); var value; diff --git a/src/widget/year/combo.year.js b/src/widget/year/combo.year.js index 071eca3024..7de86c8208 100644 --- 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", diff --git a/src/widget/yearmonth/combo.yearmonth.js b/src/widget/yearmonth/combo.yearmonth.js index b6eaef9781..7f2c30a58f 100644 --- 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({ diff --git a/src/widget/yearmonth/trigger.yearmonth.js b/src/widget/yearmonth/trigger.yearmonth.js index 102b55e375..0266d7aa45 100644 --- 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) { diff --git a/src/widget/yearquarter/combo.yearquarter.js b/src/widget/yearquarter/combo.yearquarter.js index 1bbf3c3643..28b0832d07 100644 --- 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({ diff --git a/src/widget/yearquarter/trigger.yearquarter.js b/src/widget/yearquarter/trigger.yearquarter.js index cdebb770d4..eb807eff27 100644 --- 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 () { From 4667993af14ffb87011f316fd26a010da171516f Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 19 Feb 2021 14:34:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8E=BB=E5=A4=9A=E4=BD=99=E7=9A=84attribu?= =?UTF-8?q?tes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/colorchooser/colorchooser.js | 3 --- .../icontextvaluecombo/combo.icontextvalue.js | 3 --- .../textvaluecheckcombo/combo.textvaluecheck.js | 3 --- .../combo/textvaluecombo/combo.textvalue.js | 3 --- src/widget/dynamicdate/dynamicdate.combo.js | 6 ++---- .../dynamicdatetime/dynamicdatetime.combo.js | 3 ++- .../multilayerselecttree.combo.js | 3 --- .../multilayersingletree.combo.js | 3 --- src/widget/multiselect/multiselect.combo.js | 3 --- .../multiselect/multiselect.combo.nobar.js | 3 --- .../multiselect/multiselect.insert.combo.js | 3 --- .../multiselect.insert.combo.nobar.js | 3 --- src/widget/multitree/multi.tree.combo.js | 3 --- src/widget/multitree/multi.tree.insert.combo.js | 3 --- src/widget/multitree/multi.tree.list.combo.js | 3 --- src/widget/selecttree/selecttree.combo.js | 3 --- src/widget/singleselect/singleselect.combo.js | 3 --- .../singleselect/singleselect.insert.combo.js | 3 --- src/widget/singletree/singletree.combo.js | 3 --- .../combo.textvaluedownlist.js | 3 --- src/widget/time/time.combo.js | 17 ++++++++++------- 21 files changed, 14 insertions(+), 66 deletions(-) diff --git a/src/case/colorchooser/colorchooser.js b/src/case/colorchooser/colorchooser.js index 8454c0fec0..95db2b7f87 100644 --- a/src/case/colorchooser/colorchooser.js +++ b/src/case/colorchooser/colorchooser.js @@ -13,9 +13,6 @@ BI.ColorChooser = BI.inherit(BI.Widget, { value: "", height: 24, el: {}, - attributes: { - tabIndex: 0 - } }); }, diff --git a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js index a276602150..6ff16b1191 100644 --- a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js +++ b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js @@ -10,9 +10,6 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, { iconHeight: null, iconWidth: null, value: "", - attributes: { - tabIndex: 0 - } }); }, diff --git a/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js b/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js index 1edffb8632..46c3d65ed4 100644 --- a/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js +++ b/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js @@ -11,9 +11,6 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, { height: 24, chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE, value: "", - attributes: { - tabIndex: 0 - } }); }, diff --git a/src/case/combo/textvaluecombo/combo.textvalue.js b/src/case/combo/textvaluecombo/combo.textvalue.js index bbf8ecdd51..c5515c4960 100644 --- a/src/case/combo/textvaluecombo/combo.textvalue.js +++ b/src/case/combo/textvaluecombo/combo.textvalue.js @@ -12,9 +12,6 @@ BI.TextValueCombo = BI.inherit(BI.Widget, { chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE, text: "", value: "", - attributes: { - tabIndex: 0 - } }); }, diff --git a/src/widget/dynamicdate/dynamicdate.combo.js b/src/widget/dynamicdate/dynamicdate.combo.js index b03ed0d9a9..605b01591c 100644 --- a/src/widget/dynamicdate/dynamicdate.combo.js +++ b/src/widget/dynamicdate/dynamicdate.combo.js @@ -7,16 +7,13 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, { }, props: { - baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow bi-border-radius", + baseCls: "bi-dynamic-date-combo", height: 24, minDate: "1900-01-01", maxDate: "2099-12-31", format: "", allowEdit: true, supportDynamic: true, - attributes: { - tabIndex: 0 - } }, _init: function () { @@ -48,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; diff --git a/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/src/widget/dynamicdatetime/dynamicdatetime.combo.js index 66c602feed..3fb8716f94 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.combo.js @@ -7,7 +7,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { }, props: { - baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow bi-border-radius", + baseCls: "bi-dynamic-date-combo", height: 24, minDate: "1900-01-01", maxDate: "2099-12-31", @@ -45,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 () { diff --git a/src/widget/multilayerselecttree/multilayerselecttree.combo.js b/src/widget/multilayerselecttree/multilayerselecttree.combo.js index 17c4d5c7ca..ce7cbfe3dd 100644 --- a/src/widget/multilayerselecttree/multilayerselecttree.combo.js +++ b/src/widget/multilayerselecttree/multilayerselecttree.combo.js @@ -13,9 +13,6 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, { itemsCreator: BI.emptyFn, items: [], value: "", - attributes: { - tabIndex: 0 - }, allowEdit: false, allowSearchValue: false, allowInsertValue: false, diff --git a/src/widget/multilayersingletree/multilayersingletree.combo.js b/src/widget/multilayersingletree/multilayersingletree.combo.js index f23d4d0c8a..b02e331981 100644 --- a/src/widget/multilayersingletree/multilayersingletree.combo.js +++ b/src/widget/multilayersingletree/multilayersingletree.combo.js @@ -16,9 +16,6 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, { itemsCreator: BI.emptyFn, items: [], value: "", - attributes: { - tabIndex: 0 - }, allowEdit: false, allowSearchValue: false, allowInsertValue: false, diff --git a/src/widget/multiselect/multiselect.combo.js b/src/widget/multiselect/multiselect.combo.js index 039e17b8cf..72774a2777 100644 --- a/src/widget/multiselect/multiselect.combo.js +++ b/src/widget/multiselect/multiselect.combo.js @@ -12,9 +12,6 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { valueFormatter: BI.emptyFn, itemHeight: 24, height: 24, - attributes: { - tabIndex: 0 - }, allowEdit: true }); }, diff --git a/src/widget/multiselect/multiselect.combo.nobar.js b/src/widget/multiselect/multiselect.combo.nobar.js index d1ee954aef..559d077343 100644 --- a/src/widget/multiselect/multiselect.combo.nobar.js +++ b/src/widget/multiselect/multiselect.combo.nobar.js @@ -12,9 +12,6 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, { valueFormatter: BI.emptyFn, itemHeight: 24, height: 24, - attributes: { - tabIndex: 0 - } }); }, diff --git a/src/widget/multiselect/multiselect.insert.combo.js b/src/widget/multiselect/multiselect.insert.combo.js index 21db8c9525..5986101003 100644 --- a/src/widget/multiselect/multiselect.insert.combo.js +++ b/src/widget/multiselect/multiselect.insert.combo.js @@ -12,9 +12,6 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { valueFormatter: BI.emptyFn, height: 24, itemHeight: 24, - attributes: { - tabIndex: 0 - }, allowEdit: true }); }, diff --git a/src/widget/multiselect/multiselect.insert.combo.nobar.js b/src/widget/multiselect/multiselect.insert.combo.nobar.js index 84216eadd1..aefe50ef0e 100644 --- a/src/widget/multiselect/multiselect.insert.combo.nobar.js +++ b/src/widget/multiselect/multiselect.insert.combo.nobar.js @@ -12,9 +12,6 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, { valueFormatter: BI.emptyFn, itemsHeight: 24, height: 24, - attributes: { - tabIndex: 0 - } }); }, diff --git a/src/widget/multitree/multi.tree.combo.js b/src/widget/multitree/multi.tree.combo.js index 4717807b25..5ac0b03a60 100644 --- a/src/widget/multitree/multi.tree.combo.js +++ b/src/widget/multitree/multi.tree.combo.js @@ -23,9 +23,6 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { height: 24, allowEdit: true, isNeedAdjustWidth: true, - attributes: { - tabIndex: 0 - } }); }, diff --git a/src/widget/multitree/multi.tree.insert.combo.js b/src/widget/multitree/multi.tree.insert.combo.js index a998fd4738..cfaece9334 100644 --- a/src/widget/multitree/multi.tree.insert.combo.js +++ b/src/widget/multitree/multi.tree.insert.combo.js @@ -23,9 +23,6 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, { height: 24, allowEdit: true, isNeedAdjustWidth: true, - attributes: { - tabIndex: 0 - } }); }, diff --git a/src/widget/multitree/multi.tree.list.combo.js b/src/widget/multitree/multi.tree.list.combo.js index 13e0516d8e..45842cfda4 100644 --- a/src/widget/multitree/multi.tree.list.combo.js +++ b/src/widget/multitree/multi.tree.list.combo.js @@ -24,9 +24,6 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, { allowEdit: true, allowInsertValue: true, isNeedAdjustWidth: true, - attributes: { - tabIndex: 0 - } }); }, diff --git a/src/widget/selecttree/selecttree.combo.js b/src/widget/selecttree/selecttree.combo.js index c22524983e..d5e30c98ef 100644 --- a/src/widget/selecttree/selecttree.combo.js +++ b/src/widget/selecttree/selecttree.combo.js @@ -11,9 +11,6 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, { text: "", items: [], value: "", - attributes: { - tabIndex: 0 - } }); }, diff --git a/src/widget/singleselect/singleselect.combo.js b/src/widget/singleselect/singleselect.combo.js index 5edcf44225..749569b0e1 100644 --- a/src/widget/singleselect/singleselect.combo.js +++ b/src/widget/singleselect/singleselect.combo.js @@ -12,9 +12,6 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, { itemsCreator: BI.emptyFn, valueFormatter: BI.emptyFn, height: 24, - attributes: { - tabIndex: 0 - }, allowEdit: true }); }, diff --git a/src/widget/singleselect/singleselect.insert.combo.js b/src/widget/singleselect/singleselect.insert.combo.js index 404350b6fc..9a2ce8833a 100644 --- a/src/widget/singleselect/singleselect.insert.combo.js +++ b/src/widget/singleselect/singleselect.insert.combo.js @@ -12,9 +12,6 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, { itemsCreator: BI.emptyFn, valueFormatter: BI.emptyFn, height: 24, - attributes: { - tabIndex: 0 - }, allowEdit: true }); }, diff --git a/src/widget/singletree/singletree.combo.js b/src/widget/singletree/singletree.combo.js index 3398ed97c9..858fd3f70c 100644 --- a/src/widget/singletree/singletree.combo.js +++ b/src/widget/singletree/singletree.combo.js @@ -12,9 +12,6 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, { text: "", items: [], value: "", - attributes: { - tabIndex: 0 - } }); }, diff --git a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js b/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js index eb7242cde4..67720c572b 100644 --- a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js +++ b/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js @@ -7,9 +7,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, { return BI.extend(BI.TextValueDownListCombo.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-text-value-down-list-combo bi-border bi-focus-shadow", height: 24, - attributes: { - tabIndex: 0 - } }); }, diff --git a/src/widget/time/time.combo.js b/src/widget/time/time.combo.js index f78ba22db0..f79675f27e 100644 --- a/src/widget/time/time.combo.js +++ b/src/widget/time/time.combo.js @@ -13,14 +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, - attributes: { - tabIndex: 0 - } + }, + + _init: function () { + var o = this.options; + o.height -= 2; + BI.TimeCombo.superclass._init.apply(this, arguments); }, render: function () { @@ -62,6 +64,7 @@ items: [{ el: { type: "bi.combo", + cls: "bi-border bi-border-radius bi-focus-shadow", container: opts.container, toggle: false, isNeedAdjustHeight: false, @@ -167,7 +170,7 @@ }, top: 0, left: 0, - right: 22, + right: 0, bottom: 0 }, { el: {