From dfc74134d8c72897a779fbe2acb415a18e045fa9 Mon Sep 17 00:00:00 2001
From: Kira <Kira@fanruan.com>
Date: Tue, 1 Jun 2021 11:31:24 +0800
Subject: [PATCH] =?UTF-8?q?KERNEL-7826=20refactor:=20=E8=A1=A5=E5=85=85pro?=
 =?UTF-8?q?ps=E5=A3=B0=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 typescript/base/single/label/abstract.label.ts | 13 +++++++------
 typescript/base/single/label/html.label.ts     |  9 +++++++++
 typescript/base/single/label/label.ts          |  1 -
 typescript/core/wrapper/layout/layout.grid.ts  |  5 +++++
 typescript/index.ts                            |  3 +++
 typescript/shims-tsx.ts                        |  8 +++++++-
 6 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 typescript/base/single/label/html.label.ts

diff --git a/typescript/base/single/label/abstract.label.ts b/typescript/base/single/label/abstract.label.ts
index 683d6baefa..794844b24d 100644
--- a/typescript/base/single/label/abstract.label.ts
+++ b/typescript/base/single/label/abstract.label.ts
@@ -4,12 +4,13 @@ export declare class AbstractLabel extends Single {
     static xtype: string;
 
     props: {
-        textAlign: "left" | "center" | "right",
-        whiteSpace: "nowrap" | "normal",
-        textWidth: number | null,
-        textHeight: number | null,
-        highLight: boolean,
-        handler: Function | null,
+        textAlign: "left" | "center" | "right";
+        whiteSpace: "nowrap" | "normal";
+        textWidth: number | null;
+        textHeight: number | null;
+        highLight: boolean;
+        handler: Function | null;
+        text: string;
     } & Single['props']
 
     doRedMark(...args: any[]): void;
diff --git a/typescript/base/single/label/html.label.ts b/typescript/base/single/label/html.label.ts
new file mode 100644
index 0000000000..07d8c7c8de
--- /dev/null
+++ b/typescript/base/single/label/html.label.ts
@@ -0,0 +1,9 @@
+import { AbstractLabel } from "./abstract.label";
+
+export declare class HtmlLabel extends AbstractLabel {
+    props: {
+        lineHeight: number;
+    } & AbstractLabel['props'];
+
+    static xtype: string;
+}
diff --git a/typescript/base/single/label/label.ts b/typescript/base/single/label/label.ts
index d4c393a977..02704fff2c 100644
--- a/typescript/base/single/label/label.ts
+++ b/typescript/base/single/label/label.ts
@@ -4,7 +4,6 @@ export declare class Label extends AbstractLabel {
     props: {
         py: string;
         keyword: string;
-        text: string;
     } & AbstractLabel['props'];
 
     static xtype: string;
diff --git a/typescript/core/wrapper/layout/layout.grid.ts b/typescript/core/wrapper/layout/layout.grid.ts
index f79671759b..027ff5c2e5 100644
--- a/typescript/core/wrapper/layout/layout.grid.ts
+++ b/typescript/core/wrapper/layout/layout.grid.ts
@@ -2,4 +2,9 @@ import { Layout } from '../layout';
 
 export declare class GridLayout extends Layout {
     static xtype: string;
+
+    props: {
+        columns: number;
+        rows: number;
+    }
 }
diff --git a/typescript/index.ts b/typescript/index.ts
index 5a35dde5a5..bce1f1f199 100644
--- a/typescript/index.ts
+++ b/typescript/index.ts
@@ -168,6 +168,7 @@ import { TimeInterval } from './widget/timeinterval/timeinterval';
 import { DynamicDateTimePane } from './widget/datetimepane/datetimepane';
 import { SingleSelectInsertList } from './widget/singleselect/singleselectlist.insert';
 import { MultiSelectTree } from './widget/multiselecttree/multiselecttree';
+import { HtmlLabel } from "./base/single/label/html.label";
 
 
 export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
@@ -343,6 +344,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     DynamicDateTimePane: typeof DynamicDateTimePane;
     SingleSelectInsertList: typeof SingleSelectInsertList;
     MultiSelectTree: typeof MultiSelectTree;
+    HtmlLabel: typeof HtmlLabel;
 }
 
 export default {
@@ -518,4 +520,5 @@ export {
     DynamicDateTimePane,
     SingleSelectInsertList,
     MultiSelectTree,
+    HtmlLabel,
 };
diff --git a/typescript/shims-tsx.ts b/typescript/shims-tsx.ts
index cc39b52fd3..47854e9e1d 100644
--- a/typescript/shims-tsx.ts
+++ b/typescript/shims-tsx.ts
@@ -15,6 +15,12 @@ interface UIProps {
     hgap: number;
 }
 
+// 一些布局的附加属性
+interface AdditionalProps {
+    column: number;
+    row: number;
+}
+
 interface ElementClassProps<T> extends UIProps {
     cls: string;
     extraCls: string;
@@ -48,7 +54,7 @@ interface ElementClassProps<T> extends UIProps {
 declare namespace JSX {
     // for undefined
     interface IntrinsicElements {
-        [elemName: string]: Partial<UIProps>;
+        [elemName: string]: Partial<UIProps & AdditionalProps>;
     }
 
     interface ElementAttributesProperty {