diff --git a/package.json b/package.json index 1af0d2de9..3469b999a 100644 --- a/package.json +++ b/package.json @@ -77,4 +77,4 @@ }, "author": "fanruan", "license": "MIT" -} \ No newline at end of file +} diff --git a/typescript/base/single/button/buttons/button.ts b/typescript/base/single/button/buttons/button.ts index f4cf8de03..55f62ef8b 100644 --- a/typescript/base/single/button/buttons/button.ts +++ b/typescript/base/single/button/buttons/button.ts @@ -1,4 +1,4 @@ -import { IconLabel, Label } from "../../../.."; +import { AbstractLabel, IconLabel, Label } from "../../../.."; import { BasicButton } from "../button.basic"; export declare class Button extends BasicButton { @@ -14,11 +14,7 @@ export declare class Button extends BasicButton { block?: boolean; // 是否块状显示,即不显示边框,没有最小宽度的限制 clear?: boolean; // 是否去掉边框和背景 ghost?: boolean; // 是否幽灵显示, 即正常状态无背景 - textAlign?: 'center' | 'left' | 'right'; - whiteSpace?: 'nowrap' | 'normal', - textWidth?: number | null, - textHeight?: number | null, - } & BasicButton['props']; + } & AbstractLabel['props'] & IconLabel['props'] & BasicButton['props']; text: Label; icon?: IconLabel; diff --git a/typescript/base/single/text.ts b/typescript/base/single/text.ts index 4ec46e9a4..c59a857a3 100644 --- a/typescript/base/single/text.ts +++ b/typescript/base/single/text.ts @@ -3,6 +3,15 @@ import { Single } from "./single"; export declare class Text extends Single { static xtype: string; + props: { + text?: string; + textAlign?: "left" | "center" | "right", + whiteSpace?: "nowrap" | "normal", + lineHeight?: null | number; + py?: string; + highLight?: boolean; + } & Single['props']; + doRedMark(keyword: string): void; unRedMark(): void;