From ad02aa48de62f2ec61cfe0c72908453e0c36d4cb Mon Sep 17 00:00:00 2001 From: Guyi Date: Fri, 30 Jul 2021 16:52:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E5=B9=B4=E6=9C=88=E5=8C=BA=E9=97=B4=E6=94=AF=E6=8C=81=E9=AB=98?= =?UTF-8?q?=E5=BA=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/yearmonthinterval/yearmonthinterval.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/widget/yearmonthinterval/yearmonthinterval.js b/src/widget/yearmonthinterval/yearmonthinterval.js index 0d8349fc9..c915c51f3 100644 --- a/src/widget/yearmonthinterval/yearmonthinterval.js +++ b/src/widget/yearmonthinterval/yearmonthinterval.js @@ -1,6 +1,5 @@ BI.YearMonthInterval = BI.inherit(BI.Single, { constants: { - height: 24, width: 25, lgap: 15, offset: -15, @@ -12,6 +11,7 @@ BI.YearMonthInterval = BI.inherit(BI.Single, { minDate: "1900-01-01", maxDate: "2099-12-31", supportDynamic: true, + height: 24 }, _init: function () { @@ -23,7 +23,7 @@ BI.YearMonthInterval = BI.inherit(BI.Single, { this.right = this._createCombo(o.value.end); this.label = BI.createWidget({ type: "bi.label", - height: this.constants.height, + height: o.height, width: this.constants.width, text: "-" }); @@ -31,7 +31,7 @@ BI.YearMonthInterval = BI.inherit(BI.Single, { element: self, type: "bi.center", hgap: 15, - height: this.constants.height, + height: o.height, items: [{ type: "bi.absolute", items: [{ @@ -66,6 +66,7 @@ BI.YearMonthInterval = BI.inherit(BI.Single, { var combo = BI.createWidget({ type: "bi.dynamic_year_month_combo", supportDynamic: o.supportDynamic, + height: o.height, minDate: o.minDate, maxDate: o.maxDate, behaviors: o.behaviors, From 7c4eb6174c0e5a6cf21a92877d63bd99011188f1 Mon Sep 17 00:00:00 2001 From: Guyi Date: Fri, 30 Jul 2021 19:38:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=EF=BC=8CMul?= =?UTF-8?q?tiSelectLoader=E4=B8=AD=E5=85=A8=E9=80=89=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/multiselect/multiselect.loader.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/widget/multiselect/multiselect.loader.js b/src/widget/multiselect/multiselect.loader.js index 4996f12da..f01ac18bc 100644 --- a/src/widget/multiselect/multiselect.loader.js +++ b/src/widget/multiselect/multiselect.loader.js @@ -37,6 +37,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, { toolbar: { type: "bi.multi_select_bar", cls: "bi-list-item-active", + height: this.options.itemHeight || BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, iconWrapperWidth: 36 }, el: BI.extend({