Browse Source

Pull request #160932: REPORT-79369 改动提交一份到release

Merge in DEC/fineui from ~TREECAT/dec-fineui:release/11.0 to release/11.0

* commit '48f39f48865616bc2d55db7fce52afc12f44ad25':
  Pull request #3033: REPORT-79369 fix:修正按钮文字计算公式 & 无jira feat:补充按钮ts类型
research/test
treecat 2 years ago
parent
commit
ca6f5ca95b
  1. 4
      demo/js/base/button/demo.button.js
  2. 5
      src/base/single/button/buttons/button.js
  3. 11
      typescript/base/single/button/buttons/button.ts

4
demo/js/base/button/demo.button.js

@ -381,6 +381,10 @@ Demo.Button = BI.inherit(BI.Widget, {
text: "文字偏左的按钮",
textAlign: "left",
width: 200,
}, {
type: "bi.button",
text: "小于最小宽度的按钮",
width: 50,
}];
return {

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

@ -107,8 +107,9 @@
});
}
// 用于 whiteSpace
var textWidth = iconInvisible && o.width ? o.width - o.hgap * 2 : null;
// 用户可能设置的 width 小于按钮的最小宽度
var actualWidth = (o.minWidth > 0 && o.width < o.minWidth) ? o.minWidth : o.width;
var textWidth = iconInvisible && o.width ? actualWidth - o.hgap * 2 : null;
if (BI.isNotNull(o.textWidth)) {
// textWidth 需要减去图标
textWidth = o.textWidth - (iconInvisible || isVertical(o.iconPosition) ? 0 : this._const.iconWidth);

11
typescript/base/single/button/buttons/button.ts

@ -14,6 +14,9 @@ export declare class Button extends BasicButton {
block?: boolean; // 是否块状显示,即不显示边框,没有最小宽度的限制
clear?: boolean; // 是否去掉边框和背景
ghost?: boolean; // 是否幽灵显示, 即正常状态无背景
iconGap?: number;
iconPosition?: string;
textWidth?: number;
} & AbstractLabel['props'] & IconLabel['props'] & BasicButton['props'];
text: Label;
@ -26,4 +29,12 @@ export declare class Button extends BasicButton {
doHighLight(...args: any[]): void;
unHighLight(...args: any[]): void;
loading(): void;
loaded(): void;
setIcon(iconCls: string): void;
isLoading(): boolean;
}

Loading…
Cancel
Save