Browse Source

Merge remote-tracking branch 'origin/master' into bugfix

es6
iapyang 4 years ago
parent
commit
d27917b309
  1. 6
      typescript/base/single/label/abstract.label.ts
  2. 4
      typescript/base/single/label/label.ts
  3. 6
      typescript/index.ts

6
typescript/base/single/label/abstract.label.ts

@ -17,6 +17,8 @@ export interface _AbstractLabel extends _Single {
} }
export declare class AbstractLabel extends Single { export declare class AbstractLabel extends Single {
static xtype: string;
doRedMark(...args: any[]): void; doRedMark(...args: any[]): void;
unRedMark(...args: any[]): void; unRedMark(...args: any[]): void;
@ -25,9 +27,5 @@ export declare class AbstractLabel extends Single {
unHighLight(...args: any[]): void; unHighLight(...args: any[]): void;
setText(v: string): void;
getText(): string;
setStyle(css: any): void; setStyle(css: any): void;
} }

4
typescript/base/single/label/label.ts

@ -6,4 +6,6 @@ export interface _Label extends _AbstractLabel {
unRedMark(...args: any[]): void unRedMark(...args: any[]): void
} }
export declare class Label extends AbstractLabel {} export declare class Label extends AbstractLabel {
static xtype: string;
}

6
typescript/index.ts

@ -11,8 +11,8 @@ import { _Editor, _EditorStatic } from "./base/single/editor/editor";
import { _Iframe } from "./base/single/iframe/iframe"; import { _Iframe } from "./base/single/iframe/iframe";
import { _Checkbox, _CheckboxStatic } from "./base/single/input/checkbox"; import { _Checkbox, _CheckboxStatic } from "./base/single/input/checkbox";
import { _Input, _InputStatic } from "./base/single/input/input"; import { _Input, _InputStatic } from "./base/single/input/input";
import { _AbstractLabel } from "./base/single/label/abstract.label"; import { _AbstractLabel, AbstractLabel } from "./base/single/label/abstract.label";
import { _Label } from "./base/single/label/label"; import { _Label, Label } from "./base/single/label/label";
import { _Single, Single } from "./base/single/single"; import { _Single, Single } from "./base/single/single";
import { _Text } from "./base/single/text"; import { _Text } from "./base/single/text";
import { _Trigger } from "./base/single/trigger/trigger"; import { _Trigger } from "./base/single/trigger/trigger";
@ -135,4 +135,6 @@ export {
RightVerticalAdaptLayout, RightVerticalAdaptLayout,
TableAdaptLayout, TableAdaptLayout,
IconButton, IconButton,
AbstractLabel,
Label,
}; };

Loading…
Cancel
Save