From fea68f99af025924e250854d97e72f6af278930f Mon Sep 17 00:00:00 2001 From: Kira Date: Fri, 8 Oct 2021 17:25:05 +0800 Subject: [PATCH] =?UTF-8?q?JSY-10375=20fix:=20=E5=8A=A8=E6=80=81=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E8=BE=B9=E6=A1=86=E6=98=BE=E7=A4=BA=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 | 4 ++-- src/widget/dynamicdatetime/dynamicdatetime.combo.js | 4 ++-- src/widget/year/combo.year.js | 4 ++-- src/widget/yearmonth/combo.yearmonth.js | 4 ++-- src/widget/yearquarter/combo.yearquarter.js | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/widget/dynamicdate/dynamicdate.combo.js b/src/widget/dynamicdate/dynamicdate.combo.js index 3b634bbe6..ca40812c6 100644 --- a/src/widget/dynamicdate/dynamicdate.combo.js +++ b/src/widget/dynamicdate/dynamicdate.combo.js @@ -32,12 +32,13 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, { this.storeValue = opts.value; return { type: "bi.htape", + cls: "bi-border bi-border-radius", items: [{ el: { type: "bi.icon_button", cls: "bi-trigger-icon-button date-change-h-font", width: opts.height, - height: opts.height, + height: opts.height - 2, ref: function () { self.changeIcon = this; } @@ -48,7 +49,6 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, { items: [{ el: { type: "bi.combo", - 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 616a5c01c..722ab299b 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.combo.js @@ -32,12 +32,13 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { this.storeValue = opts.value; return { type: "bi.htape", + cls: "bi-border bi-border-radius", items: [{ el: { type: "bi.icon_button", cls: "bi-trigger-icon-button date-change-h-font", width: opts.height, - height: opts.height, + height: opts.height - 2, ref: function () { self.changeIcon = this; } @@ -48,7 +49,6 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { items: [{ el: { type: "bi.combo", - cls: "bi-border bi-border-radius", destroyWhenHide: true, container: opts.container, ref: function () { diff --git a/src/widget/year/combo.year.js b/src/widget/year/combo.year.js index b7082be9c..da6233f1c 100644 --- a/src/widget/year/combo.year.js +++ b/src/widget/year/combo.year.js @@ -59,7 +59,6 @@ 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, @@ -121,6 +120,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, { BI.createWidget({ type: "bi.htape", + cls: "bi-border bi-border-radius", element: this, ref: function () { self.comboWrapper = this; @@ -130,7 +130,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, { type: "bi.icon_button", cls: "bi-trigger-icon-button date-change-h-font", width: 24, - height: 24, + height: o.height - 2, ref: function () { self.changeIcon = this; } diff --git a/src/widget/yearmonth/combo.yearmonth.js b/src/widget/yearmonth/combo.yearmonth.js index ec3720d85..662dcc0eb 100644 --- a/src/widget/yearmonth/combo.yearmonth.js +++ b/src/widget/yearmonth/combo.yearmonth.js @@ -59,7 +59,6 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, { this.combo = BI.createWidget({ type: "bi.combo", - cls: "bi-border bi-border-radius", container: o.container, isNeedAdjustHeight: o.isNeedAdjustHeight, isNeedAdjustWidth: o.isNeedAdjustWidth, @@ -125,6 +124,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, { BI.createWidget({ type: "bi.htape", + cls: "bi-border bi-border-radius", element: this, ref: function () { self.comboWrapper = this; @@ -134,7 +134,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, { type: "bi.icon_button", cls: "bi-trigger-icon-button date-change-h-font", width: 24, - height: 24, + height: o.height - 2, ref: function () { self.changeIcon = this; } diff --git a/src/widget/yearquarter/combo.yearquarter.js b/src/widget/yearquarter/combo.yearquarter.js index 7a6def0d0..129d5edf6 100644 --- a/src/widget/yearquarter/combo.yearquarter.js +++ b/src/widget/yearquarter/combo.yearquarter.js @@ -59,7 +59,6 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, { this.combo = BI.createWidget({ type: "bi.combo", - cls: "bi-border bi-border-radius", container: o.container, isNeedAdjustHeight: o.isNeedAdjustHeight, isNeedAdjustWidth: o.isNeedAdjustWidth, @@ -125,6 +124,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, { BI.createWidget({ type: "bi.htape", + cls: "bi-border bi-border-radius", element: this, ref: function () { self.comboWrapper = this; @@ -134,7 +134,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, { type: "bi.icon_button", cls: "bi-trigger-icon-button date-change-h-font", width: 24, - height: 24, + height: o.height - 2, ref: function () { self.changeIcon = this; }