diff --git a/src/widget/dynamicdate/dynamicdate.combo.js b/src/widget/dynamicdate/dynamicdate.combo.js index 774e41712f..05f48e61e4 100644 --- a/src/widget/dynamicdate/dynamicdate.combo.js +++ b/src/widget/dynamicdate/dynamicdate.combo.js @@ -7,13 +7,22 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, { }, props: { - baseCls: "bi-dynamic-date-combo", + baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow bi-border-radius", height: 24, minDate: "1900-01-01", maxDate: "2099-12-31", format: "", allowEdit: true, supportDynamic: true, + attributes: { + tabIndex: -1 + } + }, + + _init: function () { + var o = this.options; + o.height -= 2; + BI.DynamicDateCombo.superclass._init.apply(this, arguments); }, render: function () { @@ -39,7 +48,6 @@ 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; @@ -55,7 +63,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, { format: opts.format, allowEdit: opts.allowEdit, watermark: opts.watermark, - height: opts.height - 2, + height: opts.height, value: opts.value, ref: function () { self.trigger = this; diff --git a/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/src/widget/dynamicdatetime/dynamicdatetime.combo.js index 7764b2b968..05f63156b8 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.combo.js @@ -7,13 +7,22 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { }, props: { - baseCls: "bi-dynamic-date-combo", + baseCls: "bi-dynamic-date-combo bi-border bi-focus-shadow bi-border-radius", height: 24, minDate: "1900-01-01", maxDate: "2099-12-31", format: "", allowEdit: true, - supportDynamic: true + supportDynamic: true, + attributes: { + tabIndex: -1 + } + }, + + _init: function () { + var o = this.options; + o.height -= 2; + BI.DynamicDateTimeCombo.superclass._init.apply(this, arguments); }, render: function () { @@ -39,7 +48,6 @@ 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 () { @@ -55,7 +63,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { allowEdit: opts.allowEdit, watermark: opts.watermark, format: opts.format, - height: opts.height - 2, + height: opts.height, value: opts.value, ref: function () { self.trigger = this;