From f193c2ab1113c2f3b2187f0450d8f8b5cbd444c5 Mon Sep 17 00:00:00 2001 From: youki Date: Thu, 24 Dec 2020 13:36:28 +0800 Subject: [PATCH] =?UTF-8?q?KERNEL-6569=20refactor:=20=E5=8E=BB=E9=99=A4Cla?= =?UTF-8?q?ssConstructor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typescript/base/combination/combo.ts | 34 +--- typescript/base/combination/group.button.ts | 48 +---- typescript/base/combination/tab.ts | 20 +- typescript/base/pane.ts | 14 +- typescript/base/single/button/button.basic.ts | 42 +--- typescript/base/single/button/button.node.ts | 12 +- .../base/single/button/buttons/button.text.ts | 18 +- .../base/single/button/buttons/button.ts | 16 +- .../single/button/listitem/icontextitem.ts | 16 +- typescript/base/single/editor/editor.ts | 57 +----- typescript/base/single/iframe/iframe.ts | 12 +- typescript/base/single/input/checkbox.ts | 10 +- typescript/base/single/input/input.ts | 46 +---- .../base/single/label/abstract.label.ts | 18 +- typescript/base/single/label/label.ts | 8 +- typescript/base/single/single.ts | 30 +-- typescript/base/single/text.ts | 16 +- typescript/base/single/trigger/trigger.ts | 8 +- typescript/case/button/icon/icon.change.ts | 14 +- typescript/case/button/item.multiselect.ts | 16 +- .../case/combo/bubblecombo/combo.bubble.ts | 22 +-- typescript/case/combo/combo.textvalue.ts | 10 +- .../combo.searchtextvalue.ts | 15 +- typescript/case/editor/editor.sign.ts | 56 +----- typescript/case/loading/loading_pane.ts | 6 +- .../abstract.treevaluechooser.list.ts | 4 +- .../abstract.treevaluechooser.ts | 38 +--- typescript/core/action/action.show.ts | 5 +- typescript/core/action/action.ts | 12 +- .../core/behavior/behavior.highlight.ts | 5 +- typescript/core/behavior/behavior.redmark.ts | 5 +- typescript/core/behavior/behavior.ts | 10 +- typescript/core/wrapper/layout.ts | 34 +--- .../layout/adapt/adapt.leftvertical.ts | 8 +- .../core/wrapper/layout/layout.absolute.ts | 10 +- .../core/wrapper/layout/layout.default.ts | 8 +- typescript/core/wrapper/layout/layout.tape.ts | 22 +-- .../core/wrapper/layout/layout.vertical.ts | 8 +- typescript/index.ts | 182 +++++++++--------- typescript/widget/downlist/combo.downlist.ts | 16 +- 40 files changed, 126 insertions(+), 805 deletions(-) diff --git a/typescript/base/combination/combo.ts b/typescript/base/combination/combo.ts index 0cacd5e5c..01f50712b 100644 --- a/typescript/base/combination/combo.ts +++ b/typescript/base/combination/combo.ts @@ -1,36 +1,4 @@ -import { Widget, _Widget } from "../../core/widget"; - -export interface _Combo extends _Widget { - populate(...args: any[]): void; - - _setEnable(v: boolean): void; - - isViewVisible(): boolean; - - showView(e?: Event): void; - - hideView(): void; - - getView(): any; - - getPopupPosition(): any; - - adjustHeight(e?: MouseEvent): void; - - toggle(): void; -} - -export interface _ComboStatic { - EVENT_TRIGGER_CHANGE: string; - EVENT_CHANGE: string; - EVENT_EXPAND: string; - EVENT_COLLAPSE: string; - EVENT_AFTER_INIT: string; - EVENT_BEFORE_POPUPVIEW: string; - EVENT_AFTER_POPUPVIEW: string; - EVENT_BEFORE_HIDEVIEW: string; - EVENT_AFTER_HIDEVIEW: string; -} +import { Widget } from "../../core/widget"; export declare class Combo extends Widget { static xtype: string; diff --git a/typescript/base/combination/group.button.ts b/typescript/base/combination/group.button.ts index ad744504a..eca1a224b 100644 --- a/typescript/base/combination/group.button.ts +++ b/typescript/base/combination/group.button.ts @@ -1,50 +1,4 @@ -import { _Widget, Widget } from "../../core/widget"; - -export interface _ButtonGroup extends _Widget { - prependItems(items: T[]): void; - - addItems(items: T[]): void; - - removeItemAt(indexes: any): void; - - removeItems(values: any): void; - - populate(items?: any, ...args: any[]): void; - - setNotSelectedValue(v: any): void; - - getNotSelectedValue(): T[]; - - setEnabledValue(v: any): void; - - getAllButtons(): T[]; - - getAllLeaves(): T[]; - - getSelectedButtons(): T[]; - - getNotSelectedButtons(): T[]; - - getIndexByValue(value: any): number; - - getNodeById(id: any): any; - - getNodeByValue(value: any): any; - - getValue(): T[]; -} - -export interface _ButtonGroupChooseType { - CHOOSE_TYPE_SINGLE: number; - CHOOSE_TYPE_MULTI: number; - CHOOSE_TYPE_ALL: number; - CHOOSE_TYPE_NONE: number; - CHOOSE_TYPE_DEFAULT: number; -} - -export interface _ButtonGroupStatic { - EVENT_CHANGE: string; -} +import { Widget } from "../../core/widget"; export declare class ButtonGroup extends Widget { static xtype: string; diff --git a/typescript/base/combination/tab.ts b/typescript/base/combination/tab.ts index fdef5c485..79ceee3d2 100644 --- a/typescript/base/combination/tab.ts +++ b/typescript/base/combination/tab.ts @@ -1,22 +1,4 @@ -import { Widget, _Widget } from "../../core/widget"; - -export interface _Tab extends _Widget { - setSelect(v: string | number): void; - - removeTab(v: string | number): void; - - getSelect(): string | number; - - getSelectedTab(): any; - - getTab(v: string | number): any; - - populate(): void; -} - -export interface _TabStatic { - EVENT_CHANGE: string; -} +import { Widget } from "../../core/widget"; export declare class Tab extends Widget { static xtype: string; diff --git a/typescript/base/pane.ts b/typescript/base/pane.ts index e0bf5343d..f552808e1 100644 --- a/typescript/base/pane.ts +++ b/typescript/base/pane.ts @@ -1,16 +1,4 @@ -import { _Widget, Widget } from "../core/widget"; - -export interface _Pane extends _Widget { - _assertTip(..._args: any[]): void; - loading(..._args: any[]): void; - loaded(..._args: any[]): void; - check(..._args: any[]): void; - populate(...args: any[]): void; -} - -export interface _PaneStatic { - EVENT_LOADED: string; -} +import { Widget } from "../core/widget"; export declare class Pane extends Widget { static EVENT_LOADED: string; diff --git a/typescript/base/single/button/button.basic.ts b/typescript/base/single/button/button.basic.ts index 6bfe6b986..3d15bd2dd 100644 --- a/typescript/base/single/button/button.basic.ts +++ b/typescript/base/single/button/button.basic.ts @@ -1,44 +1,4 @@ -import { Single, _Single } from "../single"; - -export interface _BasicButton extends _Single { - _createShadow(): void; - - bindEvent(): void; - - _trigger(e: Event): void; - - _doClick(e: Event): void; - - beforeClick(): void; - - doClick(): void; - - handle(): _BasicButton; - - hover(): void; - - dishover(): void; - - setSelected(b: boolean): void; - - isSelected(): boolean; - - isOnce(): boolean; - - isForceSelected(): boolean; - - isForceNotSelected(): boolean; - - isDisableSelected(): boolean; - - setText(v: string): void; - - getText(): string; -} - -export interface _BasicButtonStatic { - EVENT_CHANGE: string; -} +import { Single } from "../single"; export declare class BasicButton extends Single { static EVENT_CHANGE: string; diff --git a/typescript/base/single/button/button.node.ts b/typescript/base/single/button/button.node.ts index 6c21e9b1a..7414ddf4e 100644 --- a/typescript/base/single/button/button.node.ts +++ b/typescript/base/single/button/button.node.ts @@ -1,14 +1,4 @@ -import { _BasicButton, BasicButton } from "./button.basic"; - -export interface _NodeButton extends _BasicButton { - isOpened(): boolean; - - setOpened(b: boolean): void; - - triggerCollapse(): void; - - triggerExpand(): void; -} +import { BasicButton } from "./button.basic"; export declare class NodeButton extends BasicButton { isOpened(): boolean; diff --git a/typescript/base/single/button/buttons/button.text.ts b/typescript/base/single/button/buttons/button.text.ts index 83242574f..f85def105 100644 --- a/typescript/base/single/button/buttons/button.text.ts +++ b/typescript/base/single/button/buttons/button.text.ts @@ -1,20 +1,4 @@ -import { BasicButton, _BasicButton } from "../button.basic"; - -export interface _TextButton extends _BasicButton { - setStyle(style: any): void; - - doRedMark(...args: any[]): void; - - unRedMark(...args: any[]): void; - - doHighLight(...args: any[]): void; - - unHighLight(...args: any[]): void; -} - -export interface _TextButtonStatic { - EVENT_CHANGE: string; -} +import { BasicButton } from "../button.basic"; export declare class TextButton extends BasicButton { static xtype: string; diff --git a/typescript/base/single/button/buttons/button.ts b/typescript/base/single/button/buttons/button.ts index 882374da0..328bd0596 100644 --- a/typescript/base/single/button/buttons/button.ts +++ b/typescript/base/single/button/buttons/button.ts @@ -1,19 +1,5 @@ import { IconLabel, Label } from "../../../.."; -import { BasicButton, _BasicButton } from "../button.basic"; - -export interface _Button extends _BasicButton { - doRedMark(...args: any[]): void; - - unRedMark(...args: any[]): void; - - doHighLight(...args: any[]): void; - - unHighLight(...args: any[]): void; -} - -export interface _ButtonStatic { - EVENT_CHANGE: string; -} +import { BasicButton } from "../button.basic"; export declare class Button extends BasicButton { static xtype: string; diff --git a/typescript/base/single/button/listitem/icontextitem.ts b/typescript/base/single/button/listitem/icontextitem.ts index e43b24b93..87c8c1e08 100644 --- a/typescript/base/single/button/listitem/icontextitem.ts +++ b/typescript/base/single/button/listitem/icontextitem.ts @@ -1,18 +1,4 @@ -import { BasicButton, _BasicButton } from "../button.basic"; - -export interface _IconTextItem extends _BasicButton { - doRedMark(...args: any[]): void; - - unRedMark(...args: any[]): void; - - doHighLight(...args: any[]): void; - - unHighLight(...args: any[]): void; -} - -export interface _IconTextItemStatic { - EVENT_CHANGE: string; -} +import { BasicButton } from "../button.basic"; export declare class IconTextItem extends BasicButton { static xtype: string; diff --git a/typescript/base/single/editor/editor.ts b/typescript/base/single/editor/editor.ts index bd212eeaa..9841fd977 100644 --- a/typescript/base/single/editor/editor.ts +++ b/typescript/base/single/editor/editor.ts @@ -1,59 +1,4 @@ -import { _Single, Single } from "../single"; - -export interface _Editor extends _Single { - setErrorText(v: string): void; - - getErrorText(): string; - - setWaterMark(v: string): void; - - disableError(): void; - - enableError(): void; - - disableWaterMark(): void; - - enableWaterMark(): void; - - focus(): void; - - blur(): void; - - selectAll(): void; - - onKeyDown(keyCode: number): void; - - getValue(): string; - - getLastValidValue(): string; - - getLastChangedValue(): string; - - isEditing(): boolean; - - isValid(): boolean; -} - -export interface _EditorStatic { - EVENT_CHANGE: string; - EVENT_FOCUS: string; - EVENT_BLUR: string; - EVENT_CLICK: string; - EVENT_KEY_DOWN: string; - EVENT_SPACE: string; - EVENT_BACKSPACE: string; - EVENT_START: string; - EVENT_PAUSE: string; - EVENT_STOP: string; - EVENT_CONFIRM: string; - EVENT_CHANGE_CONFIRM: string; - EVENT_VALID: string; - EVENT_ERROR: string; - EVENT_ENTER: string; - EVENT_RESTRICT: string; - EVENT_REMOVE: string; - EVENT_EMPTY: string; -} +import { Single } from "../single"; export declare class Editor extends Single { static xtype: string; diff --git a/typescript/base/single/iframe/iframe.ts b/typescript/base/single/iframe/iframe.ts index 2b9f66db1..700cff7d6 100644 --- a/typescript/base/single/iframe/iframe.ts +++ b/typescript/base/single/iframe/iframe.ts @@ -1,14 +1,4 @@ -import { Single, _Single } from "../single"; - -export interface _Iframe extends _Single { - setSrc(v: string): void; - - getSrc(): string; - - setName(v: string): void; - - getName(): string; -} +import { Single } from "../single"; export declare class Iframe extends Single { static xtype: string; diff --git a/typescript/base/single/input/checkbox.ts b/typescript/base/single/input/checkbox.ts index 6f8e0c081..570e2df28 100644 --- a/typescript/base/single/input/checkbox.ts +++ b/typescript/base/single/input/checkbox.ts @@ -1,12 +1,4 @@ -import { BasicButton, _BasicButton } from "../button/button.basic"; - -export interface _Checkbox extends _BasicButton { - _setEnable(enable: boolean): void; -} - -export interface _CheckboxStatic { - EVENT_CHANGE: string; -} +import { BasicButton } from "../button/button.basic"; export declare class Checkbox extends BasicButton { static xtype: string; diff --git a/typescript/base/single/input/input.ts b/typescript/base/single/input/input.ts index 9b1f2ff6d..2e68ea603 100644 --- a/typescript/base/single/input/input.ts +++ b/typescript/base/single/input/input.ts @@ -1,48 +1,4 @@ -import { _Single, Single } from "../single"; - -export interface _Input extends _Single { - onClick(): void; - - onKeyDown(keyCode: number): void; - - focus(): void; - - blur(): void; - - selectAll(): void; - - setValue(v: string): void; - - getValue(): string; - - isEditing(): boolean; - - getLastValidValue(): string; - - getLastChangedValue(): string; -} - -export interface _InputStatic { - EVENT_CHANGE: string; - EVENT_FOCUS: string; - EVENT_CLICK: string; - EVENT_BLUR: string; - EVENT_KEY_DOWN: string; - EVENT_QUICK_DOWN: string; - EVENT_SPACE: string; - EVENT_BACKSPACE: string; - EVENT_START: string; - EVENT_PAUSE: string; - EVENT_STOP: string; - EVENT_CHANGE_CONFIRM: string; - EVENT_CONFIRM: string; - EVENT_REMOVE: string; - EVENT_EMPTY: string; - EVENT_VALID: string; - EVENT_ERROR: string; - EVENT_ENTER: string; - EVENT_RESTRICT: string; -} +import { Single } from "../single"; export declare class Input extends Single { static xtype: string; diff --git a/typescript/base/single/label/abstract.label.ts b/typescript/base/single/label/abstract.label.ts index 86ae31581..bf9266b20 100644 --- a/typescript/base/single/label/abstract.label.ts +++ b/typescript/base/single/label/abstract.label.ts @@ -1,20 +1,4 @@ -import { _Single, Single } from "../single"; - -export interface _AbstractLabel extends _Single { - doRedMark(...args: any[]): void; - - unRedMark(...args: any[]): void; - - doHighLight(...args: any[]): void; - - unHighLight(...args: any[]): void; - - setText(v: string): void; - - getText(): string; - - setStyle(css: any): void; -} +import { Single } from "../single"; export declare class AbstractLabel extends Single { static xtype: string; diff --git a/typescript/base/single/label/label.ts b/typescript/base/single/label/label.ts index 89b6f588e..c64973af9 100644 --- a/typescript/base/single/label/label.ts +++ b/typescript/base/single/label/label.ts @@ -1,10 +1,4 @@ -import { _AbstractLabel, AbstractLabel } from "./abstract.label"; - -export interface _Label extends _AbstractLabel { - doRedMark(...args: any[]): void; - - unRedMark(...args: any[]): void -} +import { AbstractLabel } from "./abstract.label"; export declare class Label extends AbstractLabel { static xtype: string; diff --git a/typescript/base/single/single.ts b/typescript/base/single/single.ts index ff6b668d7..c5e72b1ac 100644 --- a/typescript/base/single/single.ts +++ b/typescript/base/single/single.ts @@ -1,32 +1,4 @@ -import { Widget, _Widget } from "../../core/widget"; - -export interface _Single extends _Widget { - _showToolTip(e: Event, opt?: SingleOpt): void; - - _hideTooltip(): void; - - _clearTimeOut(): void; - - enableHover(opt?: SingleOpt): void; - - disabledHover(): void; - - setTitle(title: string | Function, opt?: SingleOpt): void; - - setWarningTitle(title: string, opt?: SingleOpt): void; - - setTipType(v: string): void; - - getTipType(): string; - - isReadOnly(): boolean; - - getTitle(): string; - - getWarningTitle(): string; - - populate(..._args: any[]): void; -} +import { Widget } from "../../core/widget"; interface SingleOpt { container?: any, belowMouse?: boolean diff --git a/typescript/base/single/text.ts b/typescript/base/single/text.ts index 43de92670..4ec46e9a4 100644 --- a/typescript/base/single/text.ts +++ b/typescript/base/single/text.ts @@ -1,18 +1,4 @@ -import { _Single, Single } from "./single"; - -export interface _Text extends _Single { - doRedMark(keyword: string): void; - - unRedMark(): void; - - doHighLight(): void; - - unHighLight(): void; - - setStyle(css: any): void; - - setText(v: string): void; -} +import { Single } from "./single"; export declare class Text extends Single { static xtype: string; diff --git a/typescript/base/single/trigger/trigger.ts b/typescript/base/single/trigger/trigger.ts index 7bf009b7c..abf3a96dc 100644 --- a/typescript/base/single/trigger/trigger.ts +++ b/typescript/base/single/trigger/trigger.ts @@ -1,10 +1,4 @@ -import { Single, _Single } from "../single"; - -export interface _Trigger extends _Single { - setKey(..._args: any[]): void; - - getKey(): string; -} +import { Single } from "../single"; export declare class Trigger extends Single { setKey(..._args: any[]): void; diff --git a/typescript/case/button/icon/icon.change.ts b/typescript/case/button/icon/icon.change.ts index c98cde2c3..3e134140a 100644 --- a/typescript/case/button/icon/icon.change.ts +++ b/typescript/case/button/icon/icon.change.ts @@ -1,16 +1,4 @@ -import { Single, _Single } from "../../../base/single/single"; - -export interface _IconChangeButton extends _Single { - isSelected(): boolean; - - setSelected(v: boolean): void; - - setIcon(cls: string): void; -} - -export interface _IconChangeButtonStatic { - EVENT_CHANGE: string; -} +import { Single } from "../../../base/single/single"; export declare class IconChangeButton extends Single { static xtype: string; diff --git a/typescript/case/button/item.multiselect.ts b/typescript/case/button/item.multiselect.ts index 99210a278..2f5eb95ef 100644 --- a/typescript/case/button/item.multiselect.ts +++ b/typescript/case/button/item.multiselect.ts @@ -1,18 +1,4 @@ -import { _BasicButton, BasicButton } from "../../base/single/button/button.basic"; - -export interface _MultiSelectItem extends _BasicButton { - doClick(...args: any[]): void; - - doRedMark(...args: any[]): void; - - unRedMark(...args: any[]): void; - - setSelected(v: boolean): void; -} - -export interface _MultiSelectItemStatic { - EVENT_CHANGE: string; -} +import { BasicButton } from "../../base/single/button/button.basic"; export declare class MultiSelectItem extends BasicButton { static xtype: string; diff --git a/typescript/case/combo/bubblecombo/combo.bubble.ts b/typescript/case/combo/bubblecombo/combo.bubble.ts index 555aeee54..cd50d722b 100644 --- a/typescript/case/combo/bubblecombo/combo.bubble.ts +++ b/typescript/case/combo/bubblecombo/combo.bubble.ts @@ -1,24 +1,4 @@ -import { Widget, _Widget } from "../../../core/widget"; - -export interface _BubbleCombo extends _Widget { - hideView(): void; - - showView(): void; - - isViewVisible(): boolean; -} - -export interface _BubbleComboStatic { - EVENT_TRIGGER_CHANGE: string; - EVENT_CHANGE: string; - EVENT_EXPAND: string; - EVENT_COLLAPSE: string; - EVENT_AFTER_INIT: string; - EVENT_BEFORE_POPUPVIEW: string; - EVENT_AFTER_POPUPVIEW: string; - EVENT_BEFORE_HIDEVIEW: string; - EVENT_AFTER_HIDEVIEW: string; -} +import { Widget } from "../../../core/widget"; export declare class BubbleCombo extends Widget { static xtype: string; diff --git a/typescript/case/combo/combo.textvalue.ts b/typescript/case/combo/combo.textvalue.ts index e31cc0875..0a50d2342 100644 --- a/typescript/case/combo/combo.textvalue.ts +++ b/typescript/case/combo/combo.textvalue.ts @@ -1,12 +1,4 @@ -import { _Widget, Widget } from "../../core/widget"; - -export interface _TextValueCombo extends _Widget { - populate(items: any): void; -} - -export interface _TextValueComboStatic { - EVENT_CHANGE: string; -} +import { Widget } from "../../core/widget"; export declare class TextValueCombo extends Widget { static xtype: string; diff --git a/typescript/case/combo/searchtextvaluecombo/combo.searchtextvalue.ts b/typescript/case/combo/searchtextvaluecombo/combo.searchtextvalue.ts index 15869d990..b47c0cc38 100644 --- a/typescript/case/combo/searchtextvaluecombo/combo.searchtextvalue.ts +++ b/typescript/case/combo/searchtextvaluecombo/combo.searchtextvalue.ts @@ -1,17 +1,4 @@ -import { Widget, _Widget } from "../../../core/widget"; - -export interface _SearchTextValueCombo extends _Widget { - populate(items: any[]): void; - - setValue(v: any): void; - - getValue(): T[]; -} - -export interface _SearchTextValueComboStatic { - EVENT_CHANGE: string; - EVENT_BEFORE_POPUPVIEW: string; -} +import { Widget } from "../../../core/widget"; export declare class SearchTextValueCombo extends Widget { static xtype: string; diff --git a/typescript/case/editor/editor.sign.ts b/typescript/case/editor/editor.sign.ts index 2cb13d3de..9ff4b032b 100644 --- a/typescript/case/editor/editor.sign.ts +++ b/typescript/case/editor/editor.sign.ts @@ -1,58 +1,4 @@ -import { Widget, _Widget } from "../../core/widget"; - -export interface _SignEditor extends _Widget { - setTitle(v: string | Function): void; - - setWarningTitle(v: string | Function): void; - - setWaterMark(v: string): void; - - focus(): void; - - blur(): void; - - doRedMark(...args: any[]): void; - - unRedMark(...args: any[]): void; - - doHighLight(...args: any[]): void; - - unHighLight(...args: any[]): void; - - isValid(): boolean; - - setErrorText(v: string): void; - - getErrorText(): string; - - isEditing(): boolean; - - getLastChangedValue(): string; - - getState(): any; - - setState(...args: any[]): void; -} - -export interface _SignEditorStatic { - EVENT_CHANGE: string; - EVENT_FOCUS: string; - EVENT_BLUR: string; - EVENT_CLICK: string; - EVENT_KEY_DOWN: string; - EVENT_CLICK_LABEL: string; - EVENT_START: string; - EVENT_PAUSE: string; - EVENT_STOP: string; - EVENT_CONFIRM: string; - EVENT_CHANGE_CONFIRM: string; - EVENT_VALID: string; - EVENT_ERROR: string; - EVENT_ENTER: string; - EVENT_RESTRICT: string; - EVENT_SPACE: string; - EVENT_EMPTY: string; -} +import { Widget } from "../../core/widget"; export declare class SignEditor extends Widget { static xtype: string; diff --git a/typescript/case/loading/loading_pane.ts b/typescript/case/loading/loading_pane.ts index 773df51f9..362c8f1b4 100644 --- a/typescript/case/loading/loading_pane.ts +++ b/typescript/case/loading/loading_pane.ts @@ -1,8 +1,4 @@ -import { _Pane, Pane } from "../../base/pane"; - -export interface _LoadingPane extends _Pane { - __loaded: (...args: any[]) => void; -} +import { Pane } from "../../base/pane"; export declare class LoadingPane extends Pane { __loaded: (...args: any[]) => void; diff --git a/typescript/component/treevaluechooser/abstract.treevaluechooser.list.ts b/typescript/component/treevaluechooser/abstract.treevaluechooser.list.ts index 14a53afbe..a8ecd8a78 100644 --- a/typescript/component/treevaluechooser/abstract.treevaluechooser.list.ts +++ b/typescript/component/treevaluechooser/abstract.treevaluechooser.list.ts @@ -1,5 +1,3 @@ -import { AbstractTreeValueChooser, _AbstractTreeValueChooser } from "./abstract.treevaluechooser"; - -export interface _AbstractListTreeValueChooser extends _AbstractTreeValueChooser {} +import { AbstractTreeValueChooser } from "./abstract.treevaluechooser"; export declare class AbstractListTreeValueChooser extends AbstractTreeValueChooser {} diff --git a/typescript/component/treevaluechooser/abstract.treevaluechooser.ts b/typescript/component/treevaluechooser/abstract.treevaluechooser.ts index de00a7d97..15cd741b5 100644 --- a/typescript/component/treevaluechooser/abstract.treevaluechooser.ts +++ b/typescript/component/treevaluechooser/abstract.treevaluechooser.ts @@ -1,40 +1,4 @@ -import { Widget, _Widget } from "../../core/widget"; - -export interface _AbstractTreeValueChooser extends _Widget { - _valueFormatter: (v: string) => string; - - _initData: (items: any[]) => void; - - _itemsCreator: (options: any, callback: Function) => void; - - _reqDisplayTreeNode: (options: any, callback: Function) => void; - - _reqSelectedTreeNode: (options: any, callback: Function) => void; - - _reqAdjustTreeNode: (options: any, callback: Function) => void; - - _reqInitTreeNode: (options: any, callback: Function) => void; - - _reqTreeNode: (options: any, callback: Function) => void; - - _getAddedValueNode: (parentValues: any[], selectedValues: any) => any[]; - - _getNode: (selectedValues: any, parentValues: any[]) => any; - - _deleteNode: (selectedValues: any, values: any[]) => void; - - _buildTree: (jo: any, values: any) => void; - - _isMatch: (parentValues: any, value: any, keyword: any) => boolean; - - _getTreeNode: (parentValues: any, v: any) => any; - - _getChildren: (parentValues: any) => any; - - _getAllChildren: (parentValues: any) => any; - - _getChildCount: (parentValues: any) => number; -} +import { Widget } from "../../core/widget"; export declare class AbstractTreeValueChooser extends Widget { _valueFormatter: (v: string) => string; diff --git a/typescript/core/action/action.show.ts b/typescript/core/action/action.show.ts index 847ce9754..9ad07b2e3 100644 --- a/typescript/core/action/action.show.ts +++ b/typescript/core/action/action.show.ts @@ -1,8 +1,5 @@ -import { _Action, Action } from "./action"; +import { Action } from "./action"; -export interface _ShowAction extends _Action { - -} export declare class ShowAction extends Action { } diff --git a/typescript/core/action/action.ts b/typescript/core/action/action.ts index b1f1a99c3..c3d439ffa 100644 --- a/typescript/core/action/action.ts +++ b/typescript/core/action/action.ts @@ -1,14 +1,4 @@ -import { _OB, OB } from "../ob"; - -export interface _Action extends _OB { - actionPerformed(src: any, tar: any, callback: Function): void; - - actionBack(tar: any, src: any, callback: Function): void; -} - -export interface _ActionFactory { - createAction(key: string, options: any): _Action; -} +import { OB } from "../ob"; export declare class Action extends OB { actionPerformed(src: any, tar: any, callback: Function): void; diff --git a/typescript/core/behavior/behavior.highlight.ts b/typescript/core/behavior/behavior.highlight.ts index d3a947e32..fd2cce04f 100644 --- a/typescript/core/behavior/behavior.highlight.ts +++ b/typescript/core/behavior/behavior.highlight.ts @@ -1,7 +1,4 @@ -import { _Behavior, Behavior } from "./behavior"; -export interface _HighlightBehavior extends _Behavior { - -} +import { Behavior } from "./behavior"; export declare class HighlightBehavior extends Behavior { diff --git a/typescript/core/behavior/behavior.redmark.ts b/typescript/core/behavior/behavior.redmark.ts index 985d3b1f8..37c8fba39 100644 --- a/typescript/core/behavior/behavior.redmark.ts +++ b/typescript/core/behavior/behavior.redmark.ts @@ -1,7 +1,4 @@ -import { _Behavior, Behavior } from "./behavior"; -export interface _RedMarkBehavior extends _Behavior { - -} +import { Behavior } from "./behavior"; export declare class RedMarkBehavior extends Behavior { diff --git a/typescript/core/behavior/behavior.ts b/typescript/core/behavior/behavior.ts index 795698edd..7c62fd3bd 100644 --- a/typescript/core/behavior/behavior.ts +++ b/typescript/core/behavior/behavior.ts @@ -1,12 +1,4 @@ -import { _OB, OB } from "../ob"; - -export interface _Behavior extends _OB { - doBehavior(items: any[]): void; -} - -export interface _BehaviorFactory { - createBehavior(key: string, options: any): _Behavior; -} +import { OB } from "../ob"; export declare class Behavior extends OB { doBehavior(items: any[]): void; diff --git a/typescript/core/wrapper/layout.ts b/typescript/core/wrapper/layout.ts index 33b9c5472..abc57bc55 100644 --- a/typescript/core/wrapper/layout.ts +++ b/typescript/core/wrapper/layout.ts @@ -1,36 +1,4 @@ -import { _Widget, Widget } from "../widget"; - -export interface _Layout extends _Widget { - addItem(item: any): any; - - prependItem(item: any): any; - - addItemAt(index: string, item: any): any; - - removeItemAt(indexes: any): void; - - shouldUpdateItem(index: number, item: any): boolean; - - updateItemAt(index: number, item: any): any; - - addItems(items: T[], context?: any): void; - - prependItems(items: T[], context?: any): void; - - getValue(): T[]; - - setText(v: string): void; - - update(opt: any): any; - - stroke(items: T[]): void; - - removeWidget(nameOrWidget: any): void; - - populate(items?: T[]): void; - - resize(): void; -} +import { Widget } from "../widget"; export declare class Layout extends Widget { static xtype: string; diff --git a/typescript/core/wrapper/layout/adapt/adapt.leftvertical.ts b/typescript/core/wrapper/layout/adapt/adapt.leftvertical.ts index 8a4108b47..7c3353202 100644 --- a/typescript/core/wrapper/layout/adapt/adapt.leftvertical.ts +++ b/typescript/core/wrapper/layout/adapt/adapt.leftvertical.ts @@ -1,10 +1,4 @@ -import { Layout, _Layout } from "../../layout"; - -export interface _LeftVerticalAdapt extends _Layout { - resize(): void; - - populate(items?: T[]): void; -} +import { Layout } from "../../layout"; export declare class LeftVerticalAdaptLayout extends Layout { static xtype: string; diff --git a/typescript/core/wrapper/layout/layout.absolute.ts b/typescript/core/wrapper/layout/layout.absolute.ts index 118d5ea16..64943fb4e 100644 --- a/typescript/core/wrapper/layout/layout.absolute.ts +++ b/typescript/core/wrapper/layout/layout.absolute.ts @@ -1,12 +1,4 @@ -import { Layout, _Layout } from "../layout"; - -export interface _AbsoluteLayout extends _Layout { - resize(): void; - - stroke(items: T[]): void; - - populate(items?: T[]): void; -} +import { Layout } from "../layout"; export declare class AbsoluteLayout extends Layout { static xtype: string; diff --git a/typescript/core/wrapper/layout/layout.default.ts b/typescript/core/wrapper/layout/layout.default.ts index 0a63abbe5..7ddfa1fdb 100644 --- a/typescript/core/wrapper/layout/layout.default.ts +++ b/typescript/core/wrapper/layout/layout.default.ts @@ -1,10 +1,4 @@ -import { Layout, _Layout } from "../layout"; - -export interface _DefaultLayout extends _Layout { - resize(): void; - - populate(items?: T[]): void; -} +import { Layout } from "../layout"; export declare class DefaultLayout extends Layout { static xtype: string; diff --git a/typescript/core/wrapper/layout/layout.tape.ts b/typescript/core/wrapper/layout/layout.tape.ts index a6e1ba027..152679c7d 100644 --- a/typescript/core/wrapper/layout/layout.tape.ts +++ b/typescript/core/wrapper/layout/layout.tape.ts @@ -1,24 +1,4 @@ -import { _Layout, Layout } from "../layout"; - -export interface _HTapeLayout extends _Layout { - resize(): void; - - stroke(items: T[]): void; - - update(): any; - - populate(items?: T[]): void; -} - -export interface _VTapeLayout extends _Layout { - resize(): void; - - stroke(items: T[]): void; - - update(): void; - - populate(items?: T[]): void; -} +import { Layout } from "../layout"; export declare class HTapeLayout extends Layout { static xtype: string; diff --git a/typescript/core/wrapper/layout/layout.vertical.ts b/typescript/core/wrapper/layout/layout.vertical.ts index 3d0e5f4f2..90ec615d5 100644 --- a/typescript/core/wrapper/layout/layout.vertical.ts +++ b/typescript/core/wrapper/layout/layout.vertical.ts @@ -1,10 +1,4 @@ -import { Layout, _Layout } from "../layout"; - -export interface _VerticalLayout extends _Layout { - resize(): void; - - populate(items?: T[]): void; -} +import { Layout } from "../layout"; export declare class VerticalLayout extends Layout { static xtype: string; diff --git a/typescript/index.ts b/typescript/index.ts index 30730d025..5000546a8 100644 --- a/typescript/index.ts +++ b/typescript/index.ts @@ -1,53 +1,53 @@ -import { Combo, _Combo, _ComboStatic } from "./base/combination/combo"; -import { _ButtonGroup, _ButtonGroupChooseType, _ButtonGroupStatic, ButtonGroup } from "./base/combination/group.button"; -import { _Tab, _TabStatic, Tab } from "./base/combination/tab"; -import { _Pane, _PaneStatic, Pane } from "./base/pane"; -import { _BasicButton, _BasicButtonStatic, BasicButton } from "./base/single/button/button.basic"; -import { _NodeButton, NodeButton } from "./base/single/button/button.node"; -import { _Button, _ButtonStatic, Button } from "./base/single/button/buttons/button"; -import { TextButton, _TextButton, _TextButtonStatic } from "./base/single/button/buttons/button.text"; -import { IconTextItem, _IconTextItem, _IconTextItemStatic } from "./base/single/button/listitem/icontextitem"; -import { _Editor, _EditorStatic, Editor } from "./base/single/editor/editor"; -import { Iframe, _Iframe } from "./base/single/iframe/iframe"; -import { Checkbox, _Checkbox, _CheckboxStatic } from "./base/single/input/checkbox"; -import { Input, _Input, _InputStatic } from "./base/single/input/input"; -import { _AbstractLabel, AbstractLabel } from "./base/single/label/abstract.label"; -import { _Label, Label } from "./base/single/label/label"; -import { _Single, Single } from "./base/single/single"; -import { _Text, Text } from "./base/single/text"; -import { Trigger, _Trigger } from "./base/single/trigger/trigger"; -import { IconChangeButton, _IconChangeButton, _IconChangeButtonStatic } from "./case/button/icon/icon.change"; -import { _MultiSelectItem, _MultiSelectItemStatic, MultiSelectItem } from "./case/button/item.multiselect"; -import { BubbleCombo, _BubbleCombo, _BubbleComboStatic } from "./case/combo/bubblecombo/combo.bubble"; -import { _TextValueCombo, _TextValueComboStatic, TextValueCombo } from "./case/combo/combo.textvalue"; -import { SearchTextValueCombo, _SearchTextValueCombo, _SearchTextValueComboStatic } from "./case/combo/searchtextvaluecombo/combo.searchtextvalue"; -import { _SignEditor, _SignEditorStatic, SignEditor } from "./case/editor/editor.sign"; -import { LoadingPane, _LoadingPane } from "./case/loading/loading_pane"; -import { AllValueMultiTextValueCombo, _AllValueMultiTextValueCombo, _AllValueMultiTextValueComboStatic } from "./component/allvaluemultitextvaluecombo/allvalue.multitextvalue.combo"; -import { _AbstractTreeValueChooser, AbstractTreeValueChooser } from "./component/treevaluechooser/abstract.treevaluechooser"; -import { _AbstractListTreeValueChooser, AbstractListTreeValueChooser } from "./component/treevaluechooser/abstract.treevaluechooser.list"; -import { Action, ActionFactory, _Action, _ActionFactory } from "./core/action/action"; -import { ShowAction, _ShowAction } from "./core/action/action.show"; +import { Combo } from "./base/combination/combo"; +import { ButtonGroup } from "./base/combination/group.button"; +import { Tab } from "./base/combination/tab"; +import { Pane } from "./base/pane"; +import { BasicButton } from "./base/single/button/button.basic"; +import { NodeButton } from "./base/single/button/button.node"; +import { Button } from "./base/single/button/buttons/button"; +import { TextButton } from "./base/single/button/buttons/button.text"; +import { IconTextItem } from "./base/single/button/listitem/icontextitem"; +import { Editor } from "./base/single/editor/editor"; +import { Iframe } from "./base/single/iframe/iframe"; +import { Checkbox } from "./base/single/input/checkbox"; +import { Input } from "./base/single/input/input"; +import { AbstractLabel } from "./base/single/label/abstract.label"; +import { Label } from "./base/single/label/label"; +import { Single } from "./base/single/single"; +import { Text } from "./base/single/text"; +import { Trigger } from "./base/single/trigger/trigger"; +import { IconChangeButton } from "./case/button/icon/icon.change"; +import { MultiSelectItem } from "./case/button/item.multiselect"; +import { BubbleCombo } from "./case/combo/bubblecombo/combo.bubble"; +import { TextValueCombo } from "./case/combo/combo.textvalue"; +import { SearchTextValueCombo } from "./case/combo/searchtextvaluecombo/combo.searchtextvalue"; +import { SignEditor } from "./case/editor/editor.sign"; +import { LoadingPane } from "./case/loading/loading_pane"; +import { AllValueMultiTextValueCombo } from "./component/allvaluemultitextvaluecombo/allvalue.multitextvalue.combo"; +import { AbstractTreeValueChooser } from "./component/treevaluechooser/abstract.treevaluechooser"; +import { AbstractListTreeValueChooser } from "./component/treevaluechooser/abstract.treevaluechooser.list"; +import { Action, ActionFactory } from "./core/action/action"; +import { ShowAction } from "./core/action/action.show"; import { _base } from "./core/base"; -import { Behavior, BehaviorFactory, _Behavior, _BehaviorFactory } from "./core/behavior/behavior"; -import { HighlightBehavior, _HighlightBehavior } from "./core/behavior/behavior.highlight"; -import { RedMarkBehavior, _RedMarkBehavior } from "./core/behavior/behavior.redmark"; +import { Behavior, BehaviorFactory } from "./core/behavior/behavior"; +import { HighlightBehavior } from "./core/behavior/behavior.highlight"; +import { RedMarkBehavior } from "./core/behavior/behavior.redmark"; import * as decorator from "./core/decorator/decorator"; import { _func } from "./core/func"; import { _i18n } from "./core/i18n"; import { _Plugin } from "./core/plugin"; import { _var } from "./core/var"; -import { OB, _OB } from "./core/ob"; -import { _Widget, _WidgetStatic, Widget } from "./core/widget"; +import { OB } from "./core/ob"; +import { Widget } from "./core/widget"; import { _inject } from "./core/inject"; -import { Layout, _Layout } from "./core/wrapper/layout"; -import { AbsoluteLayout, _AbsoluteLayout } from "./core/wrapper/layout/layout.absolute"; -import { HTapeLayout, VTapeLayout, _HTapeLayout, _VTapeLayout } from "./core/wrapper/layout/layout.tape"; -import { VerticalLayout, _VerticalLayout } from "./core/wrapper/layout/layout.vertical"; -import { DefaultLayout, _DefaultLayout } from "./core/wrapper/layout/layout.default"; -import { DownListCombo, _DownListCombo, _DownListComboStatic } from "./widget/downlist/combo.downlist"; +import { Layout } from "./core/wrapper/layout"; +import { AbsoluteLayout } from "./core/wrapper/layout/layout.absolute"; +import { HTapeLayout, VTapeLayout } from "./core/wrapper/layout/layout.tape"; +import { VerticalLayout } from "./core/wrapper/layout/layout.vertical"; +import { DefaultLayout } from "./core/wrapper/layout/layout.default"; +import { DownListCombo } from "./widget/downlist/combo.downlist"; import { Icon } from "./base/single/icon/icon"; -import { LeftVerticalAdaptLayout, _LeftVerticalAdapt } from "./core/wrapper/layout/adapt/adapt.leftvertical"; +import { LeftVerticalAdaptLayout } from "./core/wrapper/layout/adapt/adapt.leftvertical"; import { LeftRightVerticalAdaptLayout, RightVerticalAdaptLayout } from "./core/wrapper/layout/adapt/adapt.leftrightvertical"; import { IconTextIconItem } from "./base/single/button/listitem/icontexticonitem"; import { HorizontalAutoLayout } from "./core/wrapper/layout/adapt/auto.horizontal"; @@ -143,53 +143,45 @@ import { ListView } from './base/list/listview'; import { FloatCenterLayout } from './core/wrapper/layout/middle/middle.float.center'; import { DynamicYearMonthPopup } from './widget/yearmonth/popup.yearmonth'; - -type ClassConstructor = T & { - new(config: any): T; - (config: any): T; - readonly prototype: T; - readonly xtype: string; -} - export interface BI extends _func, _i18n, _base, _inject, _var { - OB: ClassConstructor<_OB>; + OB: typeof OB; Plugin: _Plugin; - Widget: ClassConstructor<_Widget> & _WidgetStatic; - Single: ClassConstructor<_Single>; - BasicButton: ClassConstructor<_BasicButton> & _BasicButtonStatic; - NodeButton: ClassConstructor<_NodeButton>; - Checkbox: ClassConstructor<_Checkbox> & _CheckboxStatic; - Button: ClassConstructor<_Button> & _ButtonStatic; - TextButton: ClassConstructor<_TextButton> & _TextButtonStatic; - IconChangeButton: ClassConstructor<_IconChangeButton> & _IconChangeButtonStatic; - Trigger: ClassConstructor<_Trigger>; - Action: ClassConstructor<_Action>; - ActionFactory: ClassConstructor<_ActionFactory>; - ShowAction: ClassConstructor<_ShowAction>; - Behavior: ClassConstructor<_Behavior>; - BehaviorFactory: ClassConstructor<_BehaviorFactory>; - HighlightBehavior: ClassConstructor<_HighlightBehavior>; - RedMarkBehavior: ClassConstructor<_RedMarkBehavior>; - Pane: ClassConstructor<_Pane> & _PaneStatic; - LoadingPane: ClassConstructor<_LoadingPane>; - Tab: ClassConstructor<_Tab> & _TabStatic; - ButtonGroup: ClassConstructor<_ButtonGroup> & _ButtonGroupChooseType & _ButtonGroupStatic; - Combo: ClassConstructor<_Combo> & _ComboStatic; - TextValueCombo: ClassConstructor<_TextValueCombo> & _TextValueComboStatic; - BubbleCombo: ClassConstructor<_BubbleCombo> & _BubbleComboStatic; - AllValueMultiTextValueCombo: ClassConstructor<_AllValueMultiTextValueCombo> & _AllValueMultiTextValueComboStatic; - IconTextItem: ClassConstructor<_IconTextItem> & _IconTextItemStatic; - MultiSelectItem: ClassConstructor<_MultiSelectItem> & _MultiSelectItemStatic; - AbstractLabel: ClassConstructor<_AbstractLabel>; - Label: ClassConstructor<_Label>; - Text: ClassConstructor<_Text>; - Editor: ClassConstructor<_Editor> & _EditorStatic; - SignEditor: ClassConstructor<_SignEditor> & _SignEditorStatic; - Layout: ClassConstructor<_Layout>; - HTapeLayout: ClassConstructor<_HTapeLayout>; - VTapeLayout: ClassConstructor<_VTapeLayout>; - AbstractTreeValueChooser: ClassConstructor<_AbstractTreeValueChooser>; - AbstractListTreeValueChooser: ClassConstructor<_AbstractListTreeValueChooser>; + Widget: typeof Widget; + Single: typeof Single; + BasicButton: typeof BasicButton; + NodeButton: typeof NodeButton; + Checkbox: typeof Checkbox; + Button: typeof Button; + TextButton: typeof TextButton; + IconChangeButton: typeof IconChangeButton; + Trigger: typeof Trigger; + Action: typeof Action; + ActionFactory: typeof ActionFactory; + ShowAction: typeof ShowAction; + Behavior: typeof Behavior; + BehaviorFactory: typeof BehaviorFactory; + HighlightBehavior: typeof HighlightBehavior; + RedMarkBehavior: typeof RedMarkBehavior; + Pane: typeof Pane; + LoadingPane: typeof LoadingPane; + Tab: typeof Tab; + ButtonGroup: typeof ButtonGroup; + Combo: typeof Combo; + TextValueCombo: typeof TextValueCombo; + BubbleCombo: typeof BubbleCombo; + AllValueMultiTextValueCombo: typeof AllValueMultiTextValueCombo; + IconTextItem: typeof IconTextItem; + MultiSelectItem: typeof MultiSelectItem; + AbstractLabel: typeof AbstractLabel; + Label: typeof Label; + Text: typeof Text; + Editor: typeof Editor; + SignEditor: typeof SignEditor; + Layout: typeof Layout; + HTapeLayout: typeof HTapeLayout; + VTapeLayout: typeof VTapeLayout; + AbstractTreeValueChooser: typeof AbstractTreeValueChooser; + AbstractListTreeValueChooser: typeof AbstractListTreeValueChooser; ListTreeValueChooserInsertCombo: typeof ListTreeValueChooserInsertCombo; TreeValueChooserCombo: typeof TreeValueChooserCombo; TreeValueChooserInsertCombo: typeof TreeValueChooserInsertCombo; @@ -204,15 +196,15 @@ export interface BI extends _func, _i18n, _base, _inject, _var { MultiTreeListCombo: typeof MultiTreeListCombo; MultiTreeInsertCombo: typeof MultiTreeInsertCombo; Decorators: typeof decorator; - DownListCombo: ClassConstructor<_DownListCombo> & _DownListComboStatic; - Iframe: ClassConstructor<_Iframe>; - AbsoluteLayout: ClassConstructor<_AbsoluteLayout>; - VerticalLayout: ClassConstructor<_VerticalLayout>; - DefaultLayout: ClassConstructor<_DefaultLayout>; - Input: ClassConstructor<_Input> & _InputStatic; - SearchTextValueCombo: ClassConstructor<_SearchTextValueCombo> & _SearchTextValueComboStatic; + DownListCombo: typeof DownListCombo; + Iframe: typeof Iframe; + AbsoluteLayout: typeof AbsoluteLayout; + VerticalLayout: typeof VerticalLayout; + DefaultLayout: typeof DefaultLayout; + Input: typeof Input; + SearchTextValueCombo: typeof SearchTextValueCombo; Icon: typeof Icon; - LeftVerticalAdaptLayout: ClassConstructor<_LeftVerticalAdapt>; + LeftVerticalAdaptLayout: typeof LeftVerticalAdaptLayout; LeftRightVerticalAdaptLayout: typeof LeftRightVerticalAdaptLayout; IconTextIconItem: typeof IconTextIconItem; HorizontalAutoLayout: typeof HorizontalAutoLayout; diff --git a/typescript/widget/downlist/combo.downlist.ts b/typescript/widget/downlist/combo.downlist.ts index 43e22cf36..e587df6d8 100644 --- a/typescript/widget/downlist/combo.downlist.ts +++ b/typescript/widget/downlist/combo.downlist.ts @@ -1,18 +1,4 @@ -import { Widget, _Widget } from "../../core/widget"; - -export interface _DownListCombo extends _Widget { - hideView: () => void; - - showView: (e?: any) => void; - - populate: (items?: any) => void; -} - -export interface _DownListComboStatic { - EVENT_CHANGE: string; - EVENT_SON_VALUE_CHANGE: string; - EVENT_BEFORE_POPUPVIEW: string; -} +import { Widget } from "../../core/widget"; export declare class DownListCombo extends Widget { static xtype: string;