From a36557e75da07360a980ed05428bfe9acf3ba9e9 Mon Sep 17 00:00:00 2001 From: treecat Date: Mon, 23 May 2022 18:08:52 +0800 Subject: [PATCH 1/9] =?UTF-8?q?DESIGN-4069=20=E3=80=90=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=8C=96=E3=80=91=E5=8F=8D=E9=A6=88-=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/single/button/buttons/button.js | 58 ++++++++++++++++++------ 1 file changed, 45 insertions(+), 13 deletions(-) diff --git a/src/base/single/button/buttons/button.js b/src/base/single/button/buttons/button.js index 0863d0935..4f6a144de 100644 --- a/src/base/single/button/buttons/button.js +++ b/src/base/single/button/buttons/button.js @@ -1,3 +1,7 @@ +function isVertical(position) { + return position === "top" || position === "bottom"; +} + /** * 文字类型的按钮 * @class BI.Button @@ -9,18 +13,21 @@ BI.Button = BI.inherit(BI.BasicButton, { _const: { - iconWidth: 18 + iconWidth: 16 }, _defaultConfig: function (props) { var conf = BI.Button.superclass._defaultConfig.apply(this, arguments); + + return BI.extend(conf, { baseCls: (conf.baseCls || "") + " bi-button" + ((BI.isIE() && BI.isIE9Below()) ? " hack" : ""), attributes: { tabIndex: 1 }, minWidth: (props.block === true || props.clear === true) ? 0 : 80, - height: 24, + // 44 = 垂直间距 6 + 边框 2 + 图标 16 + 图标和文字间隔 8 + 文字 12 + height: isVertical(props.iconPosition) ? 44 + ((props.iconGap || 8) - 8) : 24, shadow: props.clear !== true, isShadowShowingOnSelected: true, readonly: true, @@ -38,7 +45,10 @@ BI.Button = BI.inherit(BI.BasicButton, { tgap: 0, bgap: 0, lgap: 0, - rgap: 0 + rgap: 0, + iconGap: 4, + iconPosition: "left", + iconSize: props.iconSize || 12 }); }, @@ -48,10 +58,14 @@ BI.Button = BI.inherit(BI.BasicButton, { // 由于button默认情况下有个边框，所以要主动算行高 var lineHeight, textHeight = o.textHeight; if (BI.isNumber(o.height)) { - if (o.clear || o.block) { - lineHeight = o.height; + if(!isVertical(o.iconPosition)) { + if (o.clear || o.block) { + lineHeight = o.height; + } else { + lineHeight = o.height - 2; + } } else { - lineHeight = o.height - 2; + lineHeight = textHeight; } } if (!textHeight) { @@ -63,11 +77,14 @@ BI.Button = BI.inherit(BI.BasicButton, { this.icon = BI.createWidget({ type: "bi.icon_label", cls: o.iconCls, - width: this._const.iconWidth, - height: lineHeight, - lineHeight: lineHeight, + width: o.iconWidth, + height: o.iconHeight, + lineHeight: o.iconHeight, iconWidth: o.iconWidth, - iconHeight: o.iconHeight + iconHeight: o.iconHeight, + css: { + fontSize: o.iconSize + "px" + } }); this.text = BI.createWidget({ type: "bi.label", @@ -77,15 +94,30 @@ BI.Button = BI.inherit(BI.BasicButton, { height: lineHeight, value: o.value }); + var layoutType = "bi.horizontal"; + var gapContainer = { + lgap: o.iconPosition === "left" && o.text ? o.iconGap : 0, + rgap: o.iconPosition === "right" ? o.iconGap : 0, + tgap: o.iconPosition === "top" ? o.iconGap : 0, + bgap: o.iconPosition === "bottom" ? o.iconGap : 0 + }; + var items = [this.icon, BI.extend({el: this.text}, gapContainer)]; + if (isVertical(o.iconPosition)) { + layoutType = "bi.vertical"; + } + if (o.iconPosition === "right" || o.iconPosition === "bottom") { + items = [BI.extend({el: this.text}, gapContainer), this.icon]; + } BI.createWidget({ type: "bi.center_adapt", element: this, hgap: o.hgap, vgap: o.vgap, items: [{ - type: "bi.horizontal", - columnSize: ["", "fill"], - items: [this.icon, this.text] + type: layoutType, + horizontalAlign: "center", + verticalAlign: "middle", + items: items }] }); } else { From ddd8fcf5d6b2e601efa3c3fb4ffc114968f4d8bc Mon Sep 17 00:00:00 2001 From: treecat Date: Tue, 24 May 2022 16:08:31 +0800 Subject: [PATCH 2/9] =?UTF-8?q?DESIGN-4069=20fix:=20=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=97=AD=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/js/base/button/demo.button.js | 30 +- src/base/single/button/buttons/button.js | 363 ++++++++++++----------- 2 files changed, 212 insertions(+), 181 deletions(-) diff --git a/demo/js/base/button/demo.button.js b/demo/js/base/button/demo.button.js index 0aa54de07..56a38620d 100644 --- a/demo/js/base/button/demo.button.js +++ b/demo/js/base/button/demo.button.js @@ -213,6 +213,34 @@ Demo.Button = BI.inherit(BI.Widget, { }, height: 30 } + }, { + el: { + type: "bi.button", + text: "图标在上面的按钮", + iconCls: "close-font", + iconPosition: "top" + } + }, { + el: { + type: "bi.button", + text: "图标在下面的按钮", + iconCls: "close-font", + iconPosition: "bottom" + } + }, { + el: { + type: "bi.button", + text: "图标在左边的按钮", + iconCls: "close-font", + iconPosition: "left" + } + }, { + el: { + type: "bi.button", + text: "图标在右边的按钮", + iconCls: "close-font", + iconPosition: "right" + } }]; // BI.each(items, function (i, item) { // item.el.handler = function () { @@ -228,4 +256,4 @@ Demo.Button = BI.inherit(BI.Widget, { }; } }); -BI.shortcut("demo.button", Demo.Button); \ No newline at end of file +BI.shortcut("demo.button", Demo.Button); diff --git a/src/base/single/button/buttons/button.js b/src/base/single/button/buttons/button.js index 4f6a144de..63e78faab 100644 --- a/src/base/single/button/buttons/button.js +++ b/src/base/single/button/buttons/button.js @@ -1,201 +1,204 @@ -function isVertical(position) { - return position === "top" || position === "bottom"; -} - -/** - * 文字类型的按钮 - * @class BI.Button - * @extends BI.BasicButton - * - * @cfg {JSON} options 配置属性 - * @cfg {'common'/'success'/'warning'/'ignore'} [options.level='common'] 按钮类型，用不同颜色强调不同的场景 - */ -BI.Button = BI.inherit(BI.BasicButton, { +(function () { + function isVertical(position) { + return position === "top" || position === "bottom"; + } - _const: { - iconWidth: 16 - }, + /** + * 文字类型的按钮 + * @class BI.Button + * @extends BI.BasicButton + * + * @cfg {JSON} options 配置属性 + * @cfg {'common'/'success'/'warning'/'ignore'} [options.level='common'] 按钮类型，用不同颜色强调不同的场景 + */ + BI.Button = BI.inherit(BI.BasicButton, { - _defaultConfig: function (props) { - var conf = BI.Button.superclass._defaultConfig.apply(this, arguments); + _const: { + iconWidth: 16 + }, + _defaultConfig: function (props) { + var conf = BI.Button.superclass._defaultConfig.apply(this, arguments); - return BI.extend(conf, { - baseCls: (conf.baseCls || "") + " bi-button" + ((BI.isIE() && BI.isIE9Below()) ? " hack" : ""), - attributes: { - tabIndex: 1 - }, - minWidth: (props.block === true || props.clear === true) ? 0 : 80, - // 44 = 垂直间距 6 + 边框 2 + 图标 16 + 图标和文字间隔 8 + 文字 12 - height: isVertical(props.iconPosition) ? 44 + ((props.iconGap || 8) - 8) : 24, - shadow: props.clear !== true, - isShadowShowingOnSelected: true, - readonly: true, - iconCls: "", - level: "common", - block: false, // 是否块状显示，即不显示边框，没有最小宽度的限制 - clear: false, // 是否去掉边框和背景 - ghost: false, // 是否幽灵显示, 即正常状态无背景 - textAlign: "center", - whiteSpace: "nowrap", - textWidth: null, - textHeight: null, - hgap: props.clear ? 0 : 10, - vgap: 0, - tgap: 0, - bgap: 0, - lgap: 0, - rgap: 0, - iconGap: 4, - iconPosition: "left", - iconSize: props.iconSize || 12 - }); - }, + return BI.extend(conf, { + baseCls: (conf.baseCls || "") + " bi-button" + ((BI.isIE() && BI.isIE9Below()) ? " hack" : ""), + attributes: { + tabIndex: 1 + }, + minWidth: (props.block === true || props.clear === true) ? 0 : 80, + // 44 = 垂直间距 6 + 边框 2 + 图标 16 + 图标和文字间隔 8 + 文字 12 + height: isVertical(props.iconPosition) ? 44 + ((props.iconGap || 8) - 8) : 24, + shadow: props.clear !== true, + isShadowShowingOnSelected: true, + readonly: true, + iconCls: "", + level: "common", + block: false, // 是否块状显示，即不显示边框，没有最小宽度的限制 + clear: false, // 是否去掉边框和背景 + ghost: false, // 是否幽灵显示, 即正常状态无背景 + textAlign: "center", + whiteSpace: "nowrap", + textWidth: null, + textHeight: null, + hgap: props.clear ? 0 : 10, + vgap: 0, + tgap: 0, + bgap: 0, + lgap: 0, + rgap: 0, + iconGap: 4, + iconPosition: "left", + iconSize: props.iconSize + }); + }, - render: function () { - var o = this.options, self = this; + render: function () { + var o = this.options; - // 由于button默认情况下有个边框，所以要主动算行高 - var lineHeight, textHeight = o.textHeight; - if (BI.isNumber(o.height)) { - if(!isVertical(o.iconPosition)) { - if (o.clear || o.block) { - lineHeight = o.height; + // 由于button默认情况下有个边框，所以要主动算行高 + var lineHeight, textHeight = o.textHeight; + if (BI.isNumber(o.height)) { + if (!isVertical(o.iconPosition)) { + if (o.clear || o.block) { + lineHeight = o.height; + } else { + lineHeight = o.height - 2; + } } else { - lineHeight = o.height - 2; + lineHeight = textHeight; } - } else { - lineHeight = textHeight; } - } - if (!textHeight) { - if (o.whiteSpace === "nowrap") { - textHeight = lineHeight; + if (!textHeight) { + if (o.whiteSpace === "nowrap") { + textHeight = lineHeight; + } } - } - if (BI.isKey(o.iconCls)) { - this.icon = BI.createWidget({ - type: "bi.icon_label", - cls: o.iconCls, - width: o.iconWidth, - height: o.iconHeight, - lineHeight: o.iconHeight, - iconWidth: o.iconWidth, - iconHeight: o.iconHeight, - css: { - fontSize: o.iconSize + "px" + if (BI.isKey(o.iconCls)) { + var iconCss = {}; + if (o.iconSize) { + iconCss.fontSize = o.iconSize / BI.pixRatio + BI.pixUnit; } - }); - this.text = BI.createWidget({ - type: "bi.label", - text: o.text, - textWidth: BI.isNotNull(o.textWidth) ? o.textWidth - this._const.iconWidth : null, - textHeight: textHeight, - height: lineHeight, - value: o.value - }); - var layoutType = "bi.horizontal"; - var gapContainer = { - lgap: o.iconPosition === "left" && o.text ? o.iconGap : 0, - rgap: o.iconPosition === "right" ? o.iconGap : 0, - tgap: o.iconPosition === "top" ? o.iconGap : 0, - bgap: o.iconPosition === "bottom" ? o.iconGap : 0 - }; - var items = [this.icon, BI.extend({el: this.text}, gapContainer)]; - if (isVertical(o.iconPosition)) { - layoutType = "bi.vertical"; + this.icon = BI.createWidget({ + type: "bi.icon_label", + cls: o.iconCls, + width: o.iconWidth, + height: o.iconHeight, + lineHeight: o.iconHeight, + iconWidth: o.iconSize, + iconHeight: o.iconSize, + css: iconCss + }); + this.text = BI.createWidget({ + type: "bi.label", + text: o.text, + textWidth: BI.isNotNull(o.textWidth) ? o.textWidth - this._const.iconWidth : null, + textHeight: textHeight, + height: lineHeight, + value: o.value + }); + var layoutType = "bi.horizontal"; + var gapContainer = { + lgap: o.iconPosition === "left" && o.text ? o.iconGap : 0, + rgap: o.iconPosition === "right" ? o.iconGap : 0, + tgap: o.iconPosition === "top" ? o.iconGap : 0, + bgap: o.iconPosition === "bottom" ? o.iconGap : 0 + }; + var items = [this.icon, BI.extend({el: this.text}, gapContainer)]; + if (isVertical(o.iconPosition)) { + layoutType = "bi.vertical"; + } + if (o.iconPosition === "right" || o.iconPosition === "bottom") { + items = [BI.extend({el: this.text}, gapContainer), this.icon]; + } + BI.createWidget({ + type: "bi.center_adapt", + element: this, + hgap: o.hgap, + vgap: o.vgap, + items: [{ + type: layoutType, + horizontalAlign: "center", + verticalAlign: "middle", + items: items + }] + }); + } else { + this.text = BI.createWidget({ + type: "bi.label", + height: o.height, + textAlign: o.textAlign, + whiteSpace: o.whiteSpace, + textWidth: o.textWidth, + textHeight: textHeight, + hgap: o.hgap, + vgap: o.vgap, + tgap: o.tgap, + bgap: o.bgap, + lgap: o.lgap, + rgap: o.rgap, + element: this, + text: o.text, + value: o.value + }); } - if (o.iconPosition === "right" || o.iconPosition === "bottom") { - items = [BI.extend({el: this.text}, gapContainer), this.icon]; + if (o.block === true) { + this.element.addClass("block"); } - BI.createWidget({ - type: "bi.center_adapt", - element: this, - hgap: o.hgap, - vgap: o.vgap, - items: [{ - type: layoutType, - horizontalAlign: "center", - verticalAlign: "middle", - items: items - }] - }); - } else { - this.text = BI.createWidget({ - type: "bi.label", - height: o.height, - textAlign: o.textAlign, - whiteSpace: o.whiteSpace, - textWidth: o.textWidth, - textHeight: textHeight, - hgap: o.hgap, - vgap: o.vgap, - tgap: o.tgap, - bgap: o.bgap, - lgap: o.lgap, - rgap: o.rgap, - element: this, - text: o.text, - value: o.value - }); - } - if (o.block === true) { - this.element.addClass("block"); - } - if (o.clear === true) { - this.element.addClass("clear"); - } - if (o.ghost === true) { - this.element.addClass("ghost"); - } - if (o.minWidth > 0) { - this.element.css({"min-width": o.minWidth / BI.pixRatio + BI.pixUnit}); - } - }, + if (o.clear === true) { + this.element.addClass("clear"); + } + if (o.ghost === true) { + this.element.addClass("ghost"); + } + if (o.minWidth > 0) { + this.element.css({"min-width": o.minWidth / BI.pixRatio + BI.pixUnit}); + } + }, - doClick: function () { - BI.Button.superclass.doClick.apply(this, arguments); - if (this.isValid()) { - this.fireEvent(BI.Button.EVENT_CHANGE, this); - } - }, + doClick: function () { + BI.Button.superclass.doClick.apply(this, arguments); + if (this.isValid()) { + this.fireEvent(BI.Button.EVENT_CHANGE, this); + } + }, - _setEnable: function (enable) { - BI.Button.superclass._setEnable.apply(this, arguments); - if (enable === true) { - this.element.attr("tabIndex", 1); - } else if (enable === false) { - this.element.removeAttr("tabIndex"); - } - }, + _setEnable: function (enable) { + BI.Button.superclass._setEnable.apply(this, arguments); + if (enable === true) { + this.element.attr("tabIndex", 1); + } else if (enable === false) { + this.element.removeAttr("tabIndex"); + } + }, - setText: function (text) { - BI.Button.superclass.setText.apply(this, arguments); - this.text.setText(text); - }, + setText: function (text) { + BI.Button.superclass.setText.apply(this, arguments); + this.text.setText(text); + }, - setValue: function (text) { - BI.Button.superclass.setValue.apply(this, arguments); - if (!this.isReadOnly()) { - this.text.setValue(text); - } - }, + setValue: function (text) { + BI.Button.superclass.setValue.apply(this, arguments); + if (!this.isReadOnly()) { + this.text.setValue(text); + } + }, - doRedMark: function () { - this.text.doRedMark.apply(this.text, arguments); - }, + doRedMark: function () { + this.text.doRedMark.apply(this.text, arguments); + }, - unRedMark: function () { - this.text.unRedMark.apply(this.text, arguments); - }, + unRedMark: function () { + this.text.unRedMark.apply(this.text, arguments); + }, - doHighLight: function () { - this.text.doHighLight.apply(this.text, arguments); - }, + doHighLight: function () { + this.text.doHighLight.apply(this.text, arguments); + }, - unHighLight: function () { - this.text.unHighLight.apply(this.text, arguments); - } -}); -BI.shortcut("bi.button", BI.Button); -BI.Button.EVENT_CHANGE = "EVENT_CHANGE"; + unHighLight: function () { + this.text.unHighLight.apply(this.text, arguments); + } + }); + BI.shortcut("bi.button", BI.Button); + BI.Button.EVENT_CHANGE = "EVENT_CHANGE"; +}()); From dceef8f14e07e0ceb05e23b6295ecdb4fda45573 Mon Sep 17 00:00:00 2001 From: treecat Date: Thu, 26 May 2022 10:11:30 +0800 Subject: [PATCH 3/9] =?UTF-8?q?ddd8fcf=20-=20DESIGN-4069=20fix:=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=20iconSize=20=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=8C=89=E9=92=AE=E7=9A=84?= =?UTF-8?q?=20loading=20=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/js/base/button/demo.button.js | 3 ++- src/base/single/button/buttons/button.js | 30 ++++++++++++++---------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/demo/js/base/button/demo.button.js b/demo/js/base/button/demo.button.js index 56a38620d..195fe06e2 100644 --- a/demo/js/base/button/demo.button.js +++ b/demo/js/base/button/demo.button.js @@ -216,8 +216,9 @@ Demo.Button = BI.inherit(BI.Widget, { }, { el: { type: "bi.button", - text: "图标在上面的按钮", + text: "图标在上面的按钮，而且可以自动撑开高度", iconCls: "close-font", + iconGap: 24, iconPosition: "top" } }, { diff --git a/src/base/single/button/buttons/button.js b/src/base/single/button/buttons/button.js index 63e78faab..7c3f4c186 100644 --- a/src/base/single/button/buttons/button.js +++ b/src/base/single/button/buttons/button.js @@ -36,6 +36,7 @@ block: false, // 是否块状显示，即不显示边框，没有最小宽度的限制 clear: false, // 是否去掉边框和背景 ghost: false, // 是否幽灵显示, 即正常状态无背景 + loading: false, // 是否处于加载中 textAlign: "center", whiteSpace: "nowrap", textWidth: null, @@ -46,9 +47,8 @@ bgap: 0, lgap: 0, rgap: 0, - iconGap: 4, - iconPosition: "left", - iconSize: props.iconSize + iconGap: 8, + iconPosition: "left" }); }, @@ -74,19 +74,12 @@ } } if (BI.isKey(o.iconCls)) { - var iconCss = {}; - if (o.iconSize) { - iconCss.fontSize = o.iconSize / BI.pixRatio + BI.pixUnit; - } this.icon = BI.createWidget({ type: "bi.icon_label", cls: o.iconCls, - width: o.iconWidth, - height: o.iconHeight, - lineHeight: o.iconHeight, - iconWidth: o.iconSize, - iconHeight: o.iconSize, - css: iconCss + width: this._const.iconWidth, + height: lineHeight, + lineHeight: lineHeight }); this.text = BI.createWidget({ type: "bi.label", @@ -150,6 +143,9 @@ if (o.ghost === true) { this.element.addClass("ghost"); } + if (o.loading === true) { + this.element.addClass("loading"); + } if (o.minWidth > 0) { this.element.css({"min-width": o.minWidth / BI.pixRatio + BI.pixUnit}); } @@ -171,6 +167,14 @@ } }, + setLoading: function (loading) { + if(loading) { + this.element.addClass("loading"); + } else { + this.element.removeClass("loading"); + } + }, + setText: function (text) { BI.Button.superclass.setText.apply(this, arguments); this.text.setText(text); From a6afa374d85aa9ae477a47df3417f1dd44344633 Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 26 May 2022 14:26:20 +0800 Subject: [PATCH 4/9] =?UTF-8?q?bugfix=EF=BC=9A=E9=BB=98=E8=AE=A4=E5=80=BC?= =?UTF-8?q?=E8=BF=98=E6=98=AF=E7=94=A851x=E7=9A=84=E5=B0=8F=E9=97=B4?= =?UTF-8?q?=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/single/tip/tip.toast.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/base/single/tip/tip.toast.js b/src/base/single/tip/tip.toast.js index bf00dc014..3d26f6bc0 100644 --- a/src/base/single/tip/tip.toast.js +++ b/src/base/single/tip/tip.toast.js @@ -20,7 +20,8 @@ BI.Toast = BI.inherit(BI.Tip, { text: "", level: "success", // success或warning autoClose: true, - closable: null + closable: null, + vgap: 7, }); }, @@ -102,7 +103,7 @@ BI.Toast = BI.inherit(BI.Tip, { horizontalAlign: BI.HorizontalAlign.Stretch, element: this, items: items, - vgap: 12, + vgap: o.vgap, columnSize: columnSize }); }, From ebae04216eed20e9456840e612c2dfae45d25008 Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 26 May 2022 14:29:26 +0800 Subject: [PATCH 5/9] =?UTF-8?q?bugfix=EF=BC=9A=E9=BB=98=E8=AE=A4=E5=80=BC?= =?UTF-8?q?=E8=BF=98=E6=98=AF=E7=94=A851x=E7=9A=84=E5=B0=8F=E9=97=B4?= =?UTF-8?q?=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/combo/bubblecombo/popup.bubble.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/case/combo/bubblecombo/popup.bubble.js b/src/case/combo/bubblecombo/popup.bubble.js index c65905821..7bc1f500c 100644 --- a/src/case/combo/bubblecombo/popup.bubble.js +++ b/src/case/combo/bubblecombo/popup.bubble.js @@ -48,8 +48,8 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, { if (BI.isWidget(buttonOpt)) { items.push({ el: buttonOpt, - lgap: i === 0 ? 20 : 15, - rgap: i === o.buttons.length - 1 ? 20 : 0 + lgap: i === 0 ? 15 : 10, + rgap: i === o.buttons.length - 1 ? 15 : 0 }); } else { items.push({ @@ -60,14 +60,14 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, { self.fireEvent(BI.BubblePopupBarView.EVENT_CLICK_TOOLBAR_BUTTON, v); } }, buttonOpt), - lgap: i === 0 ? 20 : 15, - rgap: i === o.buttons.length - 1 ? 20 : 0 + lgap: i === 0 ? 15 : 10, + rgap: i === o.buttons.length - 1 ? 15 : 0 }); } }); return BI.createWidget({ type: "bi.right_vertical_adapt", - height: 54, + height: 44, items: items }); }, @@ -90,7 +90,7 @@ BI.BubblePopupBarView = BI.inherit(BI.BubblePopupView, { }] }); - button.element.css("min-height", o.minHeight - 54); + button.element.css("min-height", o.minHeight - 44); return button; } From 41c3d28a960d4d44954b02d0fa0a6c868018b890 Mon Sep 17 00:00:00 2001 From: data Date: Thu, 26 May 2022 14:47:36 +0800 Subject: [PATCH 6/9] auto upgrade version to 2.0.20220526144705 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 97dbccae2..2b698613e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220525190446", + "version": "2.0.20220526144705", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From d6ebd80c69dc3c50a88245387c02a6399074ba7e Mon Sep 17 00:00:00 2001 From: data Date: Thu, 26 May 2022 14:55:17 +0800 Subject: [PATCH 7/9] auto upgrade version to 2.0.20220526145512 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2b698613e..0e74dc7a9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220526144705", + "version": "2.0.20220526145512", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 35a1325554c8ff666f787846ee0aeb61cfd969f2 Mon Sep 17 00:00:00 2001 From: data Date: Thu, 26 May 2022 20:35:12 +0800 Subject: [PATCH 8/9] auto upgrade version to 2.0.20220526203505 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0e74dc7a9..754c85161 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220526145512", + "version": "2.0.20220526203505", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 02793827adf8aeee69bbef8477bdb5c0b6366fae Mon Sep 17 00:00:00 2001 From: data Date: Fri, 27 May 2022 14:09:06 +0800 Subject: [PATCH 9/9] auto upgrade version to 2.0.20220527140850 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 754c85161..152a1d5b2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220526203505", + "version": "2.0.20220527140850", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts",