Browse Source

Pull request #2057: 无JIRA icon_text_item 增加一个iconCls props

Merge in VISUAL/fineui from ~DAILER/fineui:master to master

* commit 'b523566884fab600ce003e8d509b96c89c8c0085':
  无JIRA icon_text_item 增加一个iconCls props 去掉默认值.
  无JIRA icon_text_item 增加一个iconCls props
es6
Dailer 3 years ago
parent
commit
05cd2fbf59
  1. 9
      demo/js/core/abstract/combination/demo.combo.js
  2. 2
      demo/js/core/abstract/combination/demo.combo_group.js
  3. 4
      src/base/single/button/listitem/blankiconicontextitem.js
  4. 4
      src/base/single/button/listitem/blankicontexticonitem.js
  5. 3
      src/base/single/button/listitem/blankicontextitem.js
  6. 4
      src/base/single/button/listitem/icontexticonitem.js
  7. 2
      src/base/single/button/listitem/icontextitem.js
  8. 3
      src/base/single/button/listitem/texticonitem.js

9
demo/js/core/abstract/combination/demo.combo.js

@ -26,7 +26,8 @@ Demo.Func = BI.inherit(BI.Widget, {
text: "2010年", text: "2010年",
value: 2010, value: 2010,
height: 25, height: 25,
iconCls: "close-ha-font" iconCls1: "close-ha-font",
iconCls2: "close-ha-font"
}, },
children: [{ children: [{
type: "bi.single_select_item", type: "bi.single_select_item",
@ -38,7 +39,9 @@ Demo.Func = BI.inherit(BI.Widget, {
height: 25, height: 25,
text: "二月", text: "二月",
value: 12, 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 text: "2011年", value: 2011
@ -417,7 +420,7 @@ Demo.Func = BI.inherit(BI.Widget, {
}] }]
}, { }, {
type: "bi.absolute", type: "bi.absolute",
el: {left: 4, top: 2, right: 4, bottom: 2} el: { left: 4, top: 2, right: 4, bottom: 2 }
}] }]
} }
}, },

2
demo/js/core/abstract/combination/demo.combo_group.js

@ -22,6 +22,8 @@ Demo.Func = BI.inherit(BI.Widget, {
height: 25, height: 25,
text: "二月", text: "二月",
value: 12, value: 12,
iconCls1: "close-ha-font",
iconCls2: "close-ha-font",
children: [{type: "bi.single_select_item", text: "一号", value: 101, height: 25}] children: [{type: "bi.single_select_item", text: "一号", value: 101, height: 25}]
}] }]
}, { }, {

4
src/base/single/button/listitem/blankiconicontextitem.js

@ -14,8 +14,8 @@ BI.BlankIconIconTextItem = BI.inherit(BI.BasicButton, {
logic: { logic: {
dynamic: false dynamic: false
}, },
iconCls1: "close-ha-font", iconCls1: "",
iconCls2: "close-ha-font", iconCls2: "",
blankWidth: 0, blankWidth: 0,
iconHeight: null, iconHeight: null,
iconWidth: null, iconWidth: null,

4
src/base/single/button/listitem/blankicontexticonitem.js

@ -15,8 +15,8 @@ BI.BlankIconTextIconItem = BI.inherit(BI.BasicButton, {
logic: { logic: {
dynamic: false dynamic: false
}, },
iconCls1: "close-ha-font", iconCls1: "",
iconCls2: "close-ha-font", iconCls2: "",
blankWidth: 0, blankWidth: 0,
iconHeight: null, iconHeight: null,
iconWidth: null, iconWidth: null,

3
src/base/single/button/listitem/blankicontextitem.js

@ -14,10 +14,10 @@ BI.BlankIconTextItem = BI.inherit(BI.BasicButton, {
logic: { logic: {
dynamic: false dynamic: false
}, },
cls: "close-ha-font",
blankWidth: 0, blankWidth: 0,
iconHeight: null, iconHeight: null,
iconWidth: null, iconWidth: null,
iconCls: "",
textHgap: 0, textHgap: 0,
textVgap: 0, textVgap: 0,
textLgap: 0, textLgap: 0,
@ -46,6 +46,7 @@ BI.BlankIconTextItem = BI.inherit(BI.BasicButton, {
}); });
this.icon = BI.createWidget({ this.icon = BI.createWidget({
type: "bi.icon_label", type: "bi.icon_label",
cls: o.iconCls,
width: o.height, width: o.height,
height: o.height, height: o.height,
iconWidth: o.iconWidth, iconWidth: o.iconWidth,

4
src/base/single/button/listitem/icontexticonitem.js

@ -15,8 +15,8 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, {
logic: { logic: {
dynamic: false dynamic: false
}, },
iconCls1: "close-ha-font", iconCls1: "",
iconCls2: "close-ha-font", iconCls2: "",
iconHeight: null, iconHeight: null,
iconWidth: null, iconWidth: null,
textHgap: 0, textHgap: 0,

2
src/base/single/button/listitem/icontextitem.js

@ -18,6 +18,7 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
iconWrapperWidth: null, iconWrapperWidth: null,
iconHeight: null, iconHeight: null,
iconWidth: null, iconWidth: null,
iconCls: "",
textHgap: 0, textHgap: 0,
textVgap: 0, textVgap: 0,
textLgap: 0, textLgap: 0,
@ -42,6 +43,7 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
}); });
this.icon = BI.createWidget({ this.icon = BI.createWidget({
type: "bi.icon_label", type: "bi.icon_label",
cls: o.iconCls,
width: o.iconWrapperWidth || o.height, width: o.iconWrapperWidth || o.height,
height: o.height, height: o.height,
iconWidth: o.iconWidth, iconWidth: o.iconWidth,

3
src/base/single/button/listitem/texticonitem.js

@ -15,9 +15,9 @@ BI.TextIconItem = BI.inherit(BI.BasicButton, {
logic: { logic: {
dynamic: false dynamic: false
}, },
cls: "close-ha-font",
iconHeight: null, iconHeight: null,
iconWidth: null, iconWidth: null,
iconCls: "",
textHgap: 0, textHgap: 0,
textVgap: 0, textVgap: 0,
textLgap: 0, textLgap: 0,
@ -42,6 +42,7 @@ BI.TextIconItem = BI.inherit(BI.BasicButton, {
}); });
this.icon = BI.createWidget({ this.icon = BI.createWidget({
type: "bi.icon_label", type: "bi.icon_label",
cls: o.iconCls,
width: o.height, width: o.height,
height: o.height, height: o.height,
iconWidth: o.iconWidth, iconWidth: o.iconWidth,

Loading…
Cancel
Save