From a423485a15cdaff2ebdb40db399682b0da027d82 Mon Sep 17 00:00:00 2001 From: iapyang Date: Fri, 17 Sep 2021 20:14:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-59338=20fix:=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F=E7=B1=BB=E6=8E=A7=E4=BB=B6?= =?UTF-8?q?=E8=BE=B9=E6=A1=86=E9=80=A0=E6=88=90size=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/dynamicdate/dynamicdate.combo.js | 7 +++---- src/widget/dynamicdatetime/dynamicdatetime.combo.js | 7 +++---- src/widget/time/time.combo.js | 2 +- src/widget/yearmonth/combo.yearmonth.js | 7 +++---- src/widget/yearquarter/combo.yearquarter.js | 7 +++---- 5 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/widget/dynamicdate/dynamicdate.combo.js b/src/widget/dynamicdate/dynamicdate.combo.js index c2c3e4a73..e5c5a8293 100644 --- a/src/widget/dynamicdate/dynamicdate.combo.js +++ b/src/widget/dynamicdate/dynamicdate.combo.js @@ -7,7 +7,7 @@ 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", @@ -22,8 +22,6 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, { }, _init: function () { - var o = this.options; - o.height -= 2; BI.DynamicDateCombo.superclass._init.apply(this, arguments); }, @@ -50,6 +48,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, { items: [{ el: { type: "bi.combo", + cls: "bi-border bi-border-radius bi-focus-shadow", container: opts.container, ref: function () { self.combo = this; @@ -65,7 +64,7 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, { format: opts.format, allowEdit: opts.allowEdit, watermark: opts.watermark, - height: opts.height, + height: opts.height - 2, 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 b4fe649a1..fcefc2a5b 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", @@ -22,8 +22,6 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { }, _init: function () { - var o = this.options; - o.height -= 2; BI.DynamicDateTimeCombo.superclass._init.apply(this, arguments); }, @@ -50,6 +48,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { items: [{ el: { type: "bi.combo", + cls: "bi-border bi-border-radius bi-focus-shadow", destroyWhenHide: true, container: opts.container, ref: function () { @@ -65,7 +64,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { allowEdit: opts.allowEdit, watermark: opts.watermark, format: opts.format, - height: opts.height, + height: opts.height - 2, value: opts.value, ref: function () { self.trigger = this; diff --git a/src/widget/time/time.combo.js b/src/widget/time/time.combo.js index dcd6c2799..5f411d33a 100644 --- a/src/widget/time/time.combo.js +++ b/src/widget/time/time.combo.js @@ -72,7 +72,7 @@ isNeedAdjustWidth: opts.isNeedAdjustWidth, el: { type: "bi.time_trigger", - height: opts.height, + height: opts.height - 2, allowEdit: opts.allowEdit, watermark: opts.watermark, format: opts.format, diff --git a/src/widget/yearmonth/combo.yearmonth.js b/src/widget/yearmonth/combo.yearmonth.js index 5b7bd5fa6..79a9482f9 100644 --- a/src/widget/yearmonth/combo.yearmonth.js +++ b/src/widget/yearmonth/combo.yearmonth.js @@ -1,7 +1,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, { props: { - baseCls: "bi-year-month-combo bi-border bi-border-radius bi-focus-shadow", + baseCls: "bi-year-month-combo", behaviors: {}, minDate: "1900-01-01", // 最小日期 maxDate: "2099-12-31", // 最大日期 @@ -13,8 +13,6 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, { _init: function () { var self = this, o = this.options; - o.height -= 2; - BI.isNumeric(o.width) && (o.width -= 2); BI.DynamicYearMonthCombo.superclass._init.apply(this, arguments); this.storeValue = o.value; this.storeTriggerValue = ""; @@ -22,7 +20,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, { type: "bi.dynamic_year_month_trigger", min: o.minDate, max: o.maxDate, - height: o.height, + height: o.height - 2, value: o.value || "" }); this.trigger.on(BI.DynamicYearMonthTrigger.EVENT_KEY_DOWN, function () { @@ -61,6 +59,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, { this.combo = BI.createWidget({ type: "bi.combo", + cls: 'bi-border bi-border-radius bi-focus-shadow', 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 32830ea26..28d1ac5c0 100644 --- a/src/widget/yearquarter/combo.yearquarter.js +++ b/src/widget/yearquarter/combo.yearquarter.js @@ -1,7 +1,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, { props: { - baseCls: "bi-year-quarter-combo bi-border bi-border-radius bi-focus-shadow", + baseCls: "bi-year-quarter-combo", behaviors: {}, minDate: "1900-01-01", // 最小日期 maxDate: "2099-12-31", // 最大日期 @@ -13,8 +13,6 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, { _init: function () { var self = this, o = this.options; - o.height -= 2; - BI.isNumeric(o.width) && (o.width -= 2); BI.DynamicYearQuarterCombo.superclass._init.apply(this, arguments); this.storeValue = o.value; self.storeTriggerValue = ""; @@ -22,7 +20,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, { type: "bi.dynamic_year_quarter_trigger", min: o.minDate, max: o.maxDate, - height: o.height, + height: o.height - 2, value: o.value || "" }); this.trigger.on(BI.DynamicYearQuarterTrigger.EVENT_KEY_DOWN, function () { @@ -61,6 +59,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, { this.combo = BI.createWidget({ type: "bi.combo", + cls: 'bi-border bi-border-radius bi-focus-shadow', container: o.container, isNeedAdjustHeight: o.isNeedAdjustHeight, isNeedAdjustWidth: o.isNeedAdjustWidth, From 585f31b7f4e61f9900ca476d766bbe64499bc321 Mon Sep 17 00:00:00 2001 From: iapyang Date: Fri, 17 Sep 2021 20:24:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E7=BB=9F=E4=B8=80=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/yearmonth/combo.yearmonth.js | 2 +- src/widget/yearquarter/combo.yearquarter.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widget/yearmonth/combo.yearmonth.js b/src/widget/yearmonth/combo.yearmonth.js index 79a9482f9..427a6b189 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 bi-focus-shadow", 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 28d1ac5c0..7cb1cd80d 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 bi-focus-shadow", container: o.container, isNeedAdjustHeight: o.isNeedAdjustHeight, isNeedAdjustWidth: o.isNeedAdjustWidth,