From b8d75ac26e7cae33e37456b26f377fd67491d114 Mon Sep 17 00:00:00 2001
From: Kobi <Kobi@fanruan.com>
Date: Wed, 2 Jun 2021 14:40:22 +0800
Subject: [PATCH 1/4] =?UTF-8?q?KERNEL-7828=20=E8=A1=A5=E5=85=85=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8B=E7=B1=BB=E5=9E=8B=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 typescript/base/single/button/buttons/button.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/typescript/base/single/button/buttons/button.ts b/typescript/base/single/button/buttons/button.ts
index f4cf8de03..568015305 100644
--- a/typescript/base/single/button/buttons/button.ts
+++ b/typescript/base/single/button/buttons/button.ts
@@ -7,6 +7,7 @@ export declare class Button extends BasicButton {
     static EVENT_CHANGE: string;
 
     props: {
+        text?: string;
         minWidth?: number;
         readonly?: boolean;
         iconCls?: string;

From 04c0697e2d8fd0995d305dfeae12582e76715432 Mon Sep 17 00:00:00 2001
From: Kobi <Kobi@fanruan.com>
Date: Wed, 2 Jun 2021 16:04:36 +0800
Subject: [PATCH 2/4] =?UTF-8?q?KERNEL-7828=20=E8=A1=A5=E5=85=85=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8B=E7=B1=BB=E5=9E=8B=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 typescript/base/single/text.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

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;

From 8144788be4b1932729060d6e10c2aaa297c3ef70 Mon Sep 17 00:00:00 2001
From: Kobi <Kobi@fanruan.com>
Date: Thu, 3 Jun 2021 10:54:40 +0800
Subject: [PATCH 3/4] =?UTF-8?q?KERNEL-7828=20=E6=A0=B9=E6=8D=AEcomment?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 typescript/base/single/button/buttons/button.ts | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/typescript/base/single/button/buttons/button.ts b/typescript/base/single/button/buttons/button.ts
index 568015305..c63a6c84d 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 {
@@ -7,7 +7,6 @@ export declare class Button extends BasicButton {
     static EVENT_CHANGE: string;
 
     props: {
-        text?: string;
         minWidth?: number;
         readonly?: boolean;
         iconCls?: string;
@@ -15,11 +14,9 @@ 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'];
+        highLight: boolean,
+        handler: Function | null,
+    } & AbstractLabel['props'] & IconLabel['props'] & BasicButton['props'];
 
     text: Label;
     icon?: IconLabel;

From ab689b393b6d00c8fa5feafe008903a1229404c6 Mon Sep 17 00:00:00 2001
From: Kobi <Kobi@fanruan.com>
Date: Thu, 3 Jun 2021 10:55:26 +0800
Subject: [PATCH 4/4] =?UTF-8?q?KERNEL-7828=20=E6=A0=B9=E6=8D=AEcomment?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                    | 2 +-
 typescript/base/single/button/buttons/button.ts | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/package.json b/package.json
index a0bc787e9..ecbaa152d 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 c63a6c84d..55f62ef8b 100644
--- a/typescript/base/single/button/buttons/button.ts
+++ b/typescript/base/single/button/buttons/button.ts
@@ -14,8 +14,6 @@ export declare class Button extends BasicButton {
         block?: boolean; // 是否块状显示，即不显示边框，没有最小宽度的限制
         clear?: boolean; // 是否去掉边框和背景
         ghost?: boolean; // 是否幽灵显示, 即正常状态无背景
-        highLight: boolean,
-        handler: Function | null,
     } & AbstractLabel['props'] & IconLabel['props'] & BasicButton['props'];
 
     text: Label;