From 1b6e17ce728387e2c7d717c0bece2acbb6bc823d Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 3 Jul 2018 09:54:37 +0800 Subject: [PATCH] BI-25579 --- src/case/combo/iconcombo/combo.icon.js | 2 +- src/case/combo/iconcombo/trigger.iconcombo.js | 4 ++-- src/widget/downlist/popup.downlist.js | 5 +++-- src/widget/numberinterval/numberinterval.js | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/case/combo/iconcombo/combo.icon.js b/src/case/combo/iconcombo/combo.icon.js index 84185a4f8e..409e1a0032 100644 --- a/src/case/combo/iconcombo/combo.icon.js +++ b/src/case/combo/iconcombo/combo.icon.js @@ -8,7 +8,7 @@ BI.IconCombo = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.IconCombo.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-icon-combo", - width: 28, + width: 24, height: 24, el: {}, popup: {}, diff --git a/src/case/combo/iconcombo/trigger.iconcombo.js b/src/case/combo/iconcombo/trigger.iconcombo.js index 7d1c4431ac..e6042f337a 100644 --- a/src/case/combo/iconcombo/trigger.iconcombo.js +++ b/src/case/combo/iconcombo/trigger.iconcombo.js @@ -11,7 +11,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, { el: {}, items: [], iconCls: "", - width: 28, + width: 24, height: 24, isShowDown: true, value: "" @@ -30,7 +30,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, { cls: "icon-combo-trigger-icon", iconCls: iconCls, disableSelected: true, - width: o.isShowDown ? o.width - 12 : o.width, + width: o.isShowDown ? o.width - 2 : o.width, height: o.height, iconWidth: o.iconWidth, iconHeight: o.iconHeight, diff --git a/src/widget/downlist/popup.downlist.js b/src/widget/downlist/popup.downlist.js index f9974604a4..1de6027770 100644 --- a/src/widget/downlist/popup.downlist.js +++ b/src/widget/downlist/popup.downlist.js @@ -70,7 +70,8 @@ BI.DownListPopup = BI.inherit(BI.Pane, { BI.createWidget({ type: "bi.vertical", element: this, - items: [this.popup] + items: [this.popup], + vgap: 5 }); }, @@ -97,7 +98,6 @@ BI.DownListPopup = BI.inherit(BI.Pane, { item.el.height = self.constants.height; item.el.iconCls2 = self.constants.nextIcon; item.popup = { - lgap: 4, el: { type: "bi.button_tree", chooseType: 0, @@ -106,6 +106,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, { }] }, + vgap: 5, maxHeight: 378 }; item.el.childValues = []; diff --git a/src/widget/numberinterval/numberinterval.js b/src/widget/numberinterval/numberinterval.js index 243f10e6c9..8059254752 100644 --- a/src/widget/numberinterval/numberinterval.js +++ b/src/widget/numberinterval/numberinterval.js @@ -11,7 +11,7 @@ BI.NumberInterval = BI.inherit(BI.Single, { signalError: "signalBubble", editorWidth: 114, columns: 5, - width: 30, + width: 24, rows: 1, numberErrorCls: "number-error", border: 1, @@ -23,7 +23,7 @@ BI.NumberInterval = BI.inherit(BI.Single, { var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { extraCls: "bi-number-interval", - height: 25, + height: 24, validation: "valid", closeMin: true });