diff --git a/src/widget/dynamicdate/dynamicdate.combo.js b/src/widget/dynamicdate/dynamicdate.combo.js index e5c5a8293..3b634bbe6 100644 --- a/src/widget/dynamicdate/dynamicdate.combo.js +++ b/src/widget/dynamicdate/dynamicdate.combo.js @@ -48,7 +48,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, { items: [{ el: { type: "bi.combo", - cls: "bi-border bi-border-radius bi-focus-shadow", + cls: "bi-border 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 fcefc2a5b..616a5c01c 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.combo.js @@ -48,7 +48,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { items: [{ el: { type: "bi.combo", - cls: "bi-border bi-border-radius bi-focus-shadow", + cls: "bi-border 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 1f7d0e526..b512d4393 100644 --- a/src/widget/multilayerselecttree/multilayerselecttree.combo.js +++ b/src/widget/multilayerselecttree/multilayerselecttree.combo.js @@ -75,7 +75,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, { var self = this, o = this.options; return { type: "bi.combo", - cls: "bi-border bi-focus-shadow bi-border-radius", + cls: "bi-border bi-border-radius", container: o.container, destroyWhenHide: o.destroyWhenHide, adjustLength: 2, diff --git a/src/widget/multilayersingletree/multilayersingletree.combo.js b/src/widget/multilayersingletree/multilayersingletree.combo.js index f26b30d1c..48d2c0b9d 100644 --- a/src/widget/multilayersingletree/multilayersingletree.combo.js +++ b/src/widget/multilayersingletree/multilayersingletree.combo.js @@ -79,7 +79,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, { var self = this, o = this.options; return { type: "bi.combo", - cls: "bi-border bi-focus-shadow bi-border-radius", + cls: "bi-border bi-border-radius", container: o.container, destroyWhenHide: o.destroyWhenHide, adjustLength: 2, diff --git a/src/widget/multiselect/multiselect.combo.js b/src/widget/multiselect/multiselect.combo.js index b2164f867..88cc16689 100644 --- a/src/widget/multiselect/multiselect.combo.js +++ b/src/widget/multiselect/multiselect.combo.js @@ -123,7 +123,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { this.combo = BI.createWidget({ type: "bi.combo", - cls: "bi-border bi-focus-shadow bi-border-radius", + cls: "bi-border 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 db7f8d042..0c978ce89 100644 --- a/src/widget/multiselect/multiselect.combo.nobar.js +++ b/src/widget/multiselect/multiselect.combo.nobar.js @@ -122,7 +122,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, { this.combo = BI.createWidget({ type: "bi.combo", - cls: "bi-border bi-focus-shadow bi-border-radius", + cls: "bi-border 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 33bf5d9e2..d94fe7a61 100644 --- a/src/widget/multiselect/multiselect.insert.combo.js +++ b/src/widget/multiselect/multiselect.insert.combo.js @@ -124,7 +124,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { this.combo = BI.createWidget({ type: "bi.combo", - cls: "bi-border bi-focus-shadow bi-border-radius", + cls: "bi-border 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 05edc2407..226af3a3c 100644 --- a/src/widget/multiselect/multiselect.insert.combo.nobar.js +++ b/src/widget/multiselect/multiselect.insert.combo.nobar.js @@ -116,7 +116,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, { this.combo = BI.createWidget({ type: "bi.combo", - cls: "bi-border bi-focus-shadow bi-border-radius", + cls: "bi-border bi-border-radius", toggle: false, container: o.container, el: this.trigger, diff --git a/src/widget/multitree/multi.tree.combo.js b/src/widget/multitree/multi.tree.combo.js index 32e26146d..1b2e1e19e 100644 --- a/src/widget/multitree/multi.tree.combo.js +++ b/src/widget/multitree/multi.tree.combo.js @@ -54,7 +54,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, { this.combo = BI.createWidget({ type: "bi.combo", - cls: "bi-border bi-focus-shadow bi-border-radius", + cls: "bi-border bi-border-radius", toggle: !o.allowEdit, container: o.container, el: this.trigger, diff --git a/src/widget/multitree/multi.tree.insert.combo.js b/src/widget/multitree/multi.tree.insert.combo.js index bdaa8a964..7f8cc8eee 100644 --- a/src/widget/multitree/multi.tree.insert.combo.js +++ b/src/widget/multitree/multi.tree.insert.combo.js @@ -69,7 +69,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, { this.combo = BI.createWidget({ type: "bi.combo", - cls: "bi-border bi-focus-shadow bi-border-radius", + cls: "bi-border 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 4deeeba82..e279c49cf 100644 --- a/src/widget/multitree/multi.tree.list.combo.js +++ b/src/widget/multitree/multi.tree.list.combo.js @@ -85,7 +85,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, { this.combo = BI.createWidget({ type: "bi.combo", - cls: "bi-border bi-focus-shadow bi-border-radius", + cls: "bi-border 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 e993a7b26..87b252fa0 100644 --- a/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js +++ b/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js @@ -111,7 +111,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, { this.combo = BI.createWidget({ type: "bi.combo", - cls: "bi-border bi-focus-shadow bi-border-radius", + cls: "bi-border bi-border-radius", toggle: false, container: o.container, el: this.trigger, diff --git a/src/widget/time/time.combo.js b/src/widget/time/time.combo.js index 5f411d33a..e816b8fa6 100644 --- a/src/widget/time/time.combo.js +++ b/src/widget/time/time.combo.js @@ -65,7 +65,7 @@ items: [{ el: { type: "bi.combo", - cls: "bi-border bi-border-radius bi-focus-shadow", + cls: "bi-border bi-border-radius", container: opts.container, toggle: false, isNeedAdjustHeight: opts.isNeedAdjustHeight, diff --git a/src/widget/year/combo.year.js b/src/widget/year/combo.year.js index 6ae10c477..b7082be9c 100644 --- a/src/widget/year/combo.year.js +++ b/src/widget/year/combo.year.js @@ -1,7 +1,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, { props: { - baseCls: "bi-year-combo bi-border bi-border-radius bi-focus-shadow", + baseCls: "bi-year-combo", behaviors: {}, minDate: "1900-01-01", // 最小日期 maxDate: "2099-12-31", // 最大日期 @@ -11,15 +11,13 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, { _init: function () { var self = this, o = this.options; - o.height -= 2; - BI.isNumeric(o.width) && (o.width -= 2); BI.DynamicYearCombo.superclass._init.apply(this, arguments); this.storeValue = o.value; this.trigger = BI.createWidget({ type: "bi.dynamic_year_trigger", min: o.minDate, max: o.maxDate, - height: o.height, + height: o.height - 2, value: o.value || "" }); this.trigger.on(BI.DynamicYearTrigger.EVENT_KEY_DOWN, function () { @@ -61,6 +59,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, { this.combo = BI.createWidget({ type: "bi.combo", + cls: "bi-border bi-border-radius", container: o.container, isNeedAdjustHeight: false, isNeedAdjustWidth: false, diff --git a/src/widget/yearmonth/combo.yearmonth.js b/src/widget/yearmonth/combo.yearmonth.js index 427a6b189..ec3720d85 100644 --- a/src/widget/yearmonth/combo.yearmonth.js +++ b/src/widget/yearmonth/combo.yearmonth.js @@ -59,7 +59,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, { this.combo = BI.createWidget({ type: "bi.combo", - cls: "bi-border bi-border-radius bi-focus-shadow", + cls: "bi-border bi-border-radius", container: o.container, isNeedAdjustHeight: o.isNeedAdjustHeight, isNeedAdjustWidth: o.isNeedAdjustWidth, diff --git a/src/widget/yearquarter/combo.yearquarter.js b/src/widget/yearquarter/combo.yearquarter.js index 7cb1cd80d..7a6def0d0 100644 --- a/src/widget/yearquarter/combo.yearquarter.js +++ b/src/widget/yearquarter/combo.yearquarter.js @@ -59,7 +59,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, { this.combo = BI.createWidget({ type: "bi.combo", - cls: "bi-border bi-border-radius bi-focus-shadow", + cls: "bi-border bi-border-radius", container: o.container, isNeedAdjustHeight: o.isNeedAdjustHeight, isNeedAdjustWidth: o.isNeedAdjustWidth,