From f69a2820165667e2ee04ba58cda5bbf3f2d54c03 Mon Sep 17 00:00:00 2001 From: dailer Date: Tue, 27 Jul 2021 14:48:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=20icon=5Ftext=5Fitem=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AAiconCls=20props?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/single/button/listitem/blankicontextitem.js | 4 +++- src/base/single/button/listitem/icontextitem.js | 4 +++- src/base/single/button/listitem/texticonitem.js | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/base/single/button/listitem/blankicontextitem.js b/src/base/single/button/listitem/blankicontextitem.js index d57764e29..e9f492566 100644 --- a/src/base/single/button/listitem/blankicontextitem.js +++ b/src/base/single/button/listitem/blankicontextitem.js @@ -18,6 +18,7 @@ BI.BlankIconTextItem = BI.inherit(BI.BasicButton, { blankWidth: 0, iconHeight: null, iconWidth: null, + iconCls: "", textHgap: 0, textVgap: 0, textLgap: 0, @@ -46,6 +47,7 @@ BI.BlankIconTextItem = BI.inherit(BI.BasicButton, { }); this.icon = BI.createWidget({ type: "bi.icon_label", + cls: o.iconCls, width: o.height, height: o.height, iconWidth: o.iconWidth, @@ -101,4 +103,4 @@ BI.BlankIconTextItem = BI.inherit(BI.BasicButton, { } }); BI.BlankIconTextItem.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.blank_icon_text_item", BI.BlankIconTextItem); \ No newline at end of file +BI.shortcut("bi.blank_icon_text_item", BI.BlankIconTextItem); diff --git a/src/base/single/button/listitem/icontextitem.js b/src/base/single/button/listitem/icontextitem.js index e9bb02b21..a6c7b596d 100644 --- a/src/base/single/button/listitem/icontextitem.js +++ b/src/base/single/button/listitem/icontextitem.js @@ -18,6 +18,7 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, { iconWrapperWidth: null, iconHeight: null, iconWidth: null, + iconCls: "", textHgap: 0, textVgap: 0, textLgap: 0, @@ -42,6 +43,7 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, { }); this.icon = BI.createWidget({ type: "bi.icon_label", + cls: o.iconCls, width: o.iconWrapperWidth || o.height, height: o.height, iconWidth: o.iconWidth, @@ -97,4 +99,4 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, { } }); BI.IconTextItem.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.icon_text_item", BI.IconTextItem); \ No newline at end of file +BI.shortcut("bi.icon_text_item", BI.IconTextItem); diff --git a/src/base/single/button/listitem/texticonitem.js b/src/base/single/button/listitem/texticonitem.js index cb6560583..e015b44a6 100644 --- a/src/base/single/button/listitem/texticonitem.js +++ b/src/base/single/button/listitem/texticonitem.js @@ -18,6 +18,7 @@ BI.TextIconItem = BI.inherit(BI.BasicButton, { cls: "close-ha-font", iconHeight: null, iconWidth: null, + iconCls: "", textHgap: 0, textVgap: 0, textLgap: 0, @@ -42,6 +43,7 @@ BI.TextIconItem = BI.inherit(BI.BasicButton, { }); this.icon = BI.createWidget({ type: "bi.icon_label", + cls: o.iconCls, width: o.height, height: o.height, iconWidth: o.iconWidth, @@ -97,4 +99,4 @@ BI.TextIconItem = BI.inherit(BI.BasicButton, { } }); BI.TextIconItem.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.text_icon_item", BI.TextIconItem); \ No newline at end of file +BI.shortcut("bi.text_icon_item", BI.TextIconItem); From b523566884fab600ce003e8d509b96c89c8c0085 Mon Sep 17 00:00:00 2001 From: dailer Date: Tue, 27 Jul 2021 18:10:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0JIRA=20icon=5Ftext=5Fitem=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AAiconCls=20props=20=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E9=BB=98=E8=AE=A4=E5=80=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/js/core/abstract/combination/demo.combo.js | 11 +++++++---- demo/js/core/abstract/combination/demo.combo_group.js | 4 +++- .../single/button/listitem/blankiconicontextitem.js | 6 +++--- .../single/button/listitem/blankicontexticonitem.js | 6 +++--- src/base/single/button/listitem/blankicontextitem.js | 1 - src/base/single/button/listitem/icontexticonitem.js | 6 +++--- src/base/single/button/listitem/texticonitem.js | 1 - 7 files changed, 19 insertions(+), 16 deletions(-) diff --git a/demo/js/core/abstract/combination/demo.combo.js b/demo/js/core/abstract/combination/demo.combo.js index e849a1824..2ec3619b1 100644 --- a/demo/js/core/abstract/combination/demo.combo.js +++ b/demo/js/core/abstract/combination/demo.combo.js @@ -26,7 +26,8 @@ Demo.Func = BI.inherit(BI.Widget, { text: "2010年", value: 2010, height: 25, - iconCls: "close-ha-font" + iconCls1: "close-ha-font", + iconCls2: "close-ha-font" }, children: [{ type: "bi.single_select_item", @@ -38,7 +39,9 @@ Demo.Func = BI.inherit(BI.Widget, { height: 25, text: "二月", value: 12, - children: [{type: "bi.single_select_item", text: "一号", value: 101, height: 25}] + iconCls1: "close-ha-font", + iconCls2: "close-ha-font", + children: [{ type: "bi.single_select_item", text: "一号", value: 101, height: 25 }] }] }, { text: "2011年", value: 2011 @@ -417,7 +420,7 @@ Demo.Func = BI.inherit(BI.Widget, { }] }, { type: "bi.absolute", - el: {left: 4, top: 2, right: 4, bottom: 2} + el: { left: 4, top: 2, right: 4, bottom: 2 } }] } }, @@ -489,4 +492,4 @@ Demo.Func = BI.inherit(BI.Widget, { }; } }); -BI.shortcut("demo.combo", Demo.Func); \ No newline at end of file +BI.shortcut("demo.combo", Demo.Func); diff --git a/demo/js/core/abstract/combination/demo.combo_group.js b/demo/js/core/abstract/combination/demo.combo_group.js index 44ecc5a2b..aeb9a1936 100644 --- a/demo/js/core/abstract/combination/demo.combo_group.js +++ b/demo/js/core/abstract/combination/demo.combo_group.js @@ -22,6 +22,8 @@ Demo.Func = BI.inherit(BI.Widget, { height: 25, text: "二月", value: 12, + iconCls1: "close-ha-font", + iconCls2: "close-ha-font", children: [{type: "bi.single_select_item", text: "一号", value: 101, height: 25}] }] }, { @@ -84,4 +86,4 @@ Demo.Func = BI.inherit(BI.Widget, { }; } }); -BI.shortcut("demo.combo_group", Demo.Func); \ No newline at end of file +BI.shortcut("demo.combo_group", Demo.Func); diff --git a/src/base/single/button/listitem/blankiconicontextitem.js b/src/base/single/button/listitem/blankiconicontextitem.js index 109688fc8..a3b1704ff 100644 --- a/src/base/single/button/listitem/blankiconicontextitem.js +++ b/src/base/single/button/listitem/blankiconicontextitem.js @@ -14,8 +14,8 @@ BI.BlankIconIconTextItem = BI.inherit(BI.BasicButton, { logic: { dynamic: false }, - iconCls1: "close-ha-font", - iconCls2: "close-ha-font", + iconCls1: "", + iconCls2: "", blankWidth: 0, iconHeight: null, iconWidth: null, @@ -116,4 +116,4 @@ BI.BlankIconIconTextItem = BI.inherit(BI.BasicButton, { } }); BI.BlankIconIconTextItem.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.blank_icon_icon_text_item", BI.BlankIconIconTextItem); \ No newline at end of file +BI.shortcut("bi.blank_icon_icon_text_item", BI.BlankIconIconTextItem); diff --git a/src/base/single/button/listitem/blankicontexticonitem.js b/src/base/single/button/listitem/blankicontexticonitem.js index 23c68515d..652000414 100644 --- a/src/base/single/button/listitem/blankicontexticonitem.js +++ b/src/base/single/button/listitem/blankicontexticonitem.js @@ -15,8 +15,8 @@ BI.BlankIconTextIconItem = BI.inherit(BI.BasicButton, { logic: { dynamic: false }, - iconCls1: "close-ha-font", - iconCls2: "close-ha-font", + iconCls1: "", + iconCls2: "", blankWidth: 0, iconHeight: null, iconWidth: null, @@ -123,4 +123,4 @@ BI.BlankIconTextIconItem = BI.inherit(BI.BasicButton, { } }); BI.BlankIconTextIconItem.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.blank_icon_text_icon_item", BI.BlankIconTextIconItem); \ No newline at end of file +BI.shortcut("bi.blank_icon_text_icon_item", BI.BlankIconTextIconItem); diff --git a/src/base/single/button/listitem/blankicontextitem.js b/src/base/single/button/listitem/blankicontextitem.js index e9f492566..b21d99e98 100644 --- a/src/base/single/button/listitem/blankicontextitem.js +++ b/src/base/single/button/listitem/blankicontextitem.js @@ -14,7 +14,6 @@ BI.BlankIconTextItem = BI.inherit(BI.BasicButton, { logic: { dynamic: false }, - cls: "close-ha-font", blankWidth: 0, iconHeight: null, iconWidth: null, diff --git a/src/base/single/button/listitem/icontexticonitem.js b/src/base/single/button/listitem/icontexticonitem.js index 429e07db2..98defa2c2 100644 --- a/src/base/single/button/listitem/icontexticonitem.js +++ b/src/base/single/button/listitem/icontexticonitem.js @@ -15,8 +15,8 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, { logic: { dynamic: false }, - iconCls1: "close-ha-font", - iconCls2: "close-ha-font", + iconCls1: "", + iconCls2: "", iconHeight: null, iconWidth: null, textHgap: 0, @@ -120,4 +120,4 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, { } }); BI.IconTextIconItem.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.icon_text_icon_item", BI.IconTextIconItem); \ No newline at end of file +BI.shortcut("bi.icon_text_icon_item", BI.IconTextIconItem); diff --git a/src/base/single/button/listitem/texticonitem.js b/src/base/single/button/listitem/texticonitem.js index e015b44a6..08cb1f394 100644 --- a/src/base/single/button/listitem/texticonitem.js +++ b/src/base/single/button/listitem/texticonitem.js @@ -15,7 +15,6 @@ BI.TextIconItem = BI.inherit(BI.BasicButton, { logic: { dynamic: false }, - cls: "close-ha-font", iconHeight: null, iconWidth: null, iconCls: "",