Browse Source

KERNEL-9408 fix:按钮自定义图标的最终实现方式

es6
treecat 2 years ago
parent
commit
e487760d6c
  1. 6
      demo/js/base/button/demo.button.js
  2. 11
      src/base/single/button/buttons/button.js

6
demo/js/base/button/demo.button.js

@ -376,12 +376,6 @@ Demo.Button = BI.inherit(BI.Widget, {
this.loaded();
}, 5 * 1000);
},
}, {
type: "bi.button",
text: "图标的实现交给其他框架",
icon(element) {
element.append("<span>🧙</span>");
},
}];
return {

11
src/base/single/button/buttons/button.js

@ -91,16 +91,8 @@
}
var iconInvisible = !o.loading && !o.iconCls;
if (BI.isPlainObject(o.icon)) {
if (BI.isPlainObject(o.icon) && !o.loading) {
this.icon = BI.createWidget(o.icon);
o.loading ? (this.icon.loading && this.icon.loading())
: (this.icon.loaded && this.icon.loaded());
} else {
if (!o.loading && BI.isFunction(o.icon)) {
this.icon = BI.createWidget({
type: "bi.layout",
});
o.icon(this.icon.element);
} else {
this.icon = BI.createWidget({
type: "bi.icon_label",
@ -114,7 +106,6 @@
invisible: iconInvisible,
});
}
}
// 用于 whiteSpace
var textWidth = iconInvisible && o.width ? o.width - o.hgap * 2 : null;

Loading…
Cancel
Save