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. 11
      demo/js/core/abstract/combination/demo.combo.js
  2. 4
      demo/js/core/abstract/combination/demo.combo_group.js
  3. 6
      src/base/single/button/listitem/blankiconicontextitem.js
  4. 6
      src/base/single/button/listitem/blankicontexticonitem.js
  5. 5
      src/base/single/button/listitem/blankicontextitem.js
  6. 6
      src/base/single/button/listitem/icontexticonitem.js
  7. 4
      src/base/single/button/listitem/icontextitem.js
  8. 5
      src/base/single/button/listitem/texticonitem.js

11
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);
BI.shortcut("demo.combo", Demo.Func);

4
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);
BI.shortcut("demo.combo_group", Demo.Func);

6
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);
BI.shortcut("bi.blank_icon_icon_text_item", BI.BlankIconIconTextItem);

6
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);
BI.shortcut("bi.blank_icon_text_icon_item", BI.BlankIconTextIconItem);

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

@ -14,10 +14,10 @@ BI.BlankIconTextItem = BI.inherit(BI.BasicButton, {
logic: {
dynamic: false
},
cls: "close-ha-font",
blankWidth: 0,
iconHeight: null,
iconWidth: null,
iconCls: "",
textHgap: 0,
textVgap: 0,
textLgap: 0,
@ -46,6 +46,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 +102,4 @@ BI.BlankIconTextItem = BI.inherit(BI.BasicButton, {
}
});
BI.BlankIconTextItem.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.blank_icon_text_item", BI.BlankIconTextItem);
BI.shortcut("bi.blank_icon_text_item", BI.BlankIconTextItem);

6
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);
BI.shortcut("bi.icon_text_icon_item", BI.IconTextIconItem);

4
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);
BI.shortcut("bi.icon_text_item", BI.IconTextItem);

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

@ -15,9 +15,9 @@ BI.TextIconItem = BI.inherit(BI.BasicButton, {
logic: {
dynamic: false
},
cls: "close-ha-font",
iconHeight: null,
iconWidth: null,
iconCls: "",
textHgap: 0,
textVgap: 0,
textLgap: 0,
@ -42,6 +42,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 +98,4 @@ BI.TextIconItem = BI.inherit(BI.BasicButton, {
}
});
BI.TextIconItem.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.text_icon_item", BI.TextIconItem);
BI.shortcut("bi.text_icon_item", BI.TextIconItem);

Loading…
Cancel
Save