Pull request #1943: KERNEL-7826 refactor: 补充props声明

Merge in VISUAL/fineui from ~KIRA/fineui:master to master

* commit '20184e51e22863d257ef8f14bb18e96d01535a55':
  KERNEL-7826 refactor: 补充props声明
  KERNEL-7826 refactor: 补充props声明

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

@@ -3,4 +3,9 @@ import { BasicButton } from "../button.basic";
 export declare class IconButton extends BasicButton {
     static xtype: string;
     static EVENT_CHANGE: string;
+
+    props: {
+        iconWidth: number;
+        iconHeight: number;
+    } & BasicButton['props']
 }

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",
+        textAlign: "left" | "center" | "right";
-        whiteSpace: "nowrap" | "normal",
+        whiteSpace: "nowrap" | "normal";
-        textWidth: number | null,
+        textWidth: number | null;
-        textHeight: number | null,
+        textHeight: number | null;
-        highLight: boolean,
+        highLight: boolean;
-        handler: Function | null,
+        handler: Function | null;
+        text: string;
     } & Single['props']
 
     doRedMark(...args: any[]): void;

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;
+}

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;

typescript/case/button/icon/icon.change.ts

@@ -1,9 +1,14 @@
+import { IconButton } from "../../../base/single/button/buttons/button.icon";
 import { Single } from "../../../base/single/single";
 
 export declare class IconChangeButton extends Single {
     static xtype: string;
     static EVENT_CHANGE: string;
 
+    props: {
+        iconCls: string;
+    } & IconButton['props']
+
     isSelected(): boolean;
 
     setSelected(v: boolean): void;

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;
+    }
 }

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,
 };

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 {