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] =?UTF-8?q?=E5=8E=BB=E5=A4=9A=E4=BD=99=E7=9A=84attributes?= 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 8454c0fec..95db2b7f8 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 a27660215..6ff16b119 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 1edffb863..46c3d65ed 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 bbf8ecdd5..c5515c496 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 b03ed0d9a..605b01591 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 66c602fee..3fb8716f9 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 17c4d5c7c..ce7cbfe3d 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 f23d4d0c8..b02e33198 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 039e17b8c..72774a277 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 d1ee954ae..559d07734 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 21db8c952..598610100 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 84216eadd..aefe50ef0 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 4717807b2..5ac0b03a6 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 a998fd473..cfaece933 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 13e0516d8..45842cfda 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 c22524983..d5e30c98e 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 5edcf4422..749569b0e 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 404350b6f..9a2ce8833 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 3398ed97c..858fd3f70 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 eb7242cde..67720c572 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 f78ba22db..f79675f27 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: {