From 3b55bd2247a6c1890b73be62c3c95ee7c34b9182 Mon Sep 17 00:00:00 2001 From: iapyang Date: Wed, 16 Dec 2020 15:56:10 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=A1=A5=E5=85=85=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typescript/base/combination/combo.ts | 35 ++++++++++++++++- typescript/base/combination/searcher.ts | 39 +++++++++++++++++++ typescript/base/single/input/radio/radio.ts | 7 ++++ typescript/case/button/icon/icon.trigger.ts | 7 ++++ .../abstract.treevaluechooser.list.ts | 4 +- .../abstract.treevaluechooser.ts | 38 +++++++++++++++++- .../combo.listtreevaluechooser.ts | 22 +++++++++++ .../combo.treevaluechooser.insert.ts | 22 +++++++++++ .../combo.treevaluechooser.ts | 24 ++++++++++++ typescript/index.ts | 27 +++++++++++-- 10 files changed, 218 insertions(+), 7 deletions(-) create mode 100644 typescript/base/combination/searcher.ts create mode 100644 typescript/base/single/input/radio/radio.ts create mode 100644 typescript/case/button/icon/icon.trigger.ts create mode 100644 typescript/component/treevaluechooser/combo.listtreevaluechooser.ts create mode 100644 typescript/component/treevaluechooser/combo.treevaluechooser.insert.ts create mode 100644 typescript/component/treevaluechooser/combo.treevaluechooser.ts diff --git a/typescript/base/combination/combo.ts b/typescript/base/combination/combo.ts index 6e050ed81..0cacd5e5c 100644 --- a/typescript/base/combination/combo.ts +++ b/typescript/base/combination/combo.ts @@ -1,4 +1,4 @@ -import { _Widget } from "../../core/widget"; +import { Widget, _Widget } from "../../core/widget"; export interface _Combo extends _Widget { populate(...args: any[]): void; @@ -7,7 +7,7 @@ export interface _Combo extends _Widget { isViewVisible(): boolean; - showView(e?: any): void; + showView(e?: Event): void; hideView(): void; @@ -31,3 +31,34 @@ export interface _ComboStatic { EVENT_BEFORE_HIDEVIEW: string; EVENT_AFTER_HIDEVIEW: string; } + +export declare class Combo extends Widget { + static xtype: string; + static EVENT_TRIGGER_CHANGE: string; + static EVENT_CHANGE: string; + static EVENT_EXPAND: string; + static EVENT_COLLAPSE: string; + static EVENT_AFTER_INIT: string; + static EVENT_BEFORE_POPUPVIEW: string; + static EVENT_AFTER_POPUPVIEW: string; + static EVENT_BEFORE_HIDEVIEW: string; + static EVENT_AFTER_HIDEVIEW: string; + + 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; +} diff --git a/typescript/base/combination/searcher.ts b/typescript/base/combination/searcher.ts new file mode 100644 index 000000000..4d391eac5 --- /dev/null +++ b/typescript/base/combination/searcher.ts @@ -0,0 +1,39 @@ +import { Widget } from "../../core/widget"; + +export declare class Searcher extends Widget { + static xtype: string; + static EVENT_CHANGE: string; + static EVENT_START: string; + static EVENT_STOP: string; + static EVENT_PAUSE: string; + static EVENT_SEARCHING: string; + static EVENT_AFTER_INIT: string; + + setAdapter(adapter: any): void; + + doSearch(): void; + + stopSearch(): void; + + isSearching(): boolean; + + isViewVisible(): boolean; + + getView(): T; + + hasMatched(): boolean; + + adjustHeight(): void; + + adjustView(): void; + + setValue(v: any): void; + + getKeyword(): string; + + getKeywords(): string[]; + + getValue(): T; + + populate(...args: any[]): void; +} diff --git a/typescript/base/single/input/radio/radio.ts b/typescript/base/single/input/radio/radio.ts new file mode 100644 index 000000000..cd82da6b9 --- /dev/null +++ b/typescript/base/single/input/radio/radio.ts @@ -0,0 +1,7 @@ +import { BasicButton } from "../../button/button.basic"; + +export declare class Radio extends BasicButton { + static xtype: string; + + static EVENT_CHANGE: string; +} diff --git a/typescript/case/button/icon/icon.trigger.ts b/typescript/case/button/icon/icon.trigger.ts new file mode 100644 index 000000000..ec32c5882 --- /dev/null +++ b/typescript/case/button/icon/icon.trigger.ts @@ -0,0 +1,7 @@ +import { IconButton } from "../../../base/single/button/buttons/button.icon"; + +export declare class TriggerIconButton extends IconButton { + static xtype: string; + + static EVENT_CHANGE: string; +} diff --git a/typescript/component/treevaluechooser/abstract.treevaluechooser.list.ts b/typescript/component/treevaluechooser/abstract.treevaluechooser.list.ts index 313b15f44..14a53afbe 100644 --- a/typescript/component/treevaluechooser/abstract.treevaluechooser.list.ts +++ b/typescript/component/treevaluechooser/abstract.treevaluechooser.list.ts @@ -1,3 +1,5 @@ -import { _AbstractTreeValueChooser } from "./abstract.treevaluechooser"; +import { AbstractTreeValueChooser, _AbstractTreeValueChooser } from "./abstract.treevaluechooser"; export interface _AbstractListTreeValueChooser extends _AbstractTreeValueChooser {} + +export declare class AbstractListTreeValueChooser extends AbstractTreeValueChooser {} diff --git a/typescript/component/treevaluechooser/abstract.treevaluechooser.ts b/typescript/component/treevaluechooser/abstract.treevaluechooser.ts index 7dae875cd..de00a7d97 100644 --- a/typescript/component/treevaluechooser/abstract.treevaluechooser.ts +++ b/typescript/component/treevaluechooser/abstract.treevaluechooser.ts @@ -1,4 +1,4 @@ -import { _Widget } from "../../core/widget"; +import { Widget, _Widget } from "../../core/widget"; export interface _AbstractTreeValueChooser extends _Widget { _valueFormatter: (v: string) => string; @@ -35,3 +35,39 @@ export interface _AbstractTreeValueChooser extends _Widget { _getChildCount: (parentValues: any) => number; } + +export declare class 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; +} diff --git a/typescript/component/treevaluechooser/combo.listtreevaluechooser.ts b/typescript/component/treevaluechooser/combo.listtreevaluechooser.ts new file mode 100644 index 000000000..9905e830d --- /dev/null +++ b/typescript/component/treevaluechooser/combo.listtreevaluechooser.ts @@ -0,0 +1,22 @@ +import { AbstractListTreeValueChooser } from "./abstract.treevaluechooser.list"; + +export declare class ListTreeValueChooserInsertCombo extends AbstractListTreeValueChooser { + static xtype: string; + static EVENT_FOCUS: string; + static EVENT_BLUR: string; + static EVENT_STOP: string; + static EVENT_CLICK_ITEM: string; + static EVENT_SEARCHING: string; + static EVENT_CONFIRM: string; + static EVENT_BEFORE_POPUPVIEW: string; + + showView(): void; + + hideView(): void; + + setValue(v: any): void; + + getValue(): T; + + populate(items: T[]): void; +} diff --git a/typescript/component/treevaluechooser/combo.treevaluechooser.insert.ts b/typescript/component/treevaluechooser/combo.treevaluechooser.insert.ts new file mode 100644 index 000000000..b93afde63 --- /dev/null +++ b/typescript/component/treevaluechooser/combo.treevaluechooser.insert.ts @@ -0,0 +1,22 @@ +import { AbstractTreeValueChooser } from "./abstract.treevaluechooser"; + +export declare class TreeValueChooserInsertCombo extends AbstractTreeValueChooser { + static xtype: string; + static EVENT_FOCUS: string; + static EVENT_BLUR: string; + static EVENT_STOP: string; + static EVENT_CLICK_ITEM: string; + static EVENT_SEARCHING: string; + static EVENT_CONFIRM: string; + static EVENT_BEFORE_POPUPVIEW: string; + + showView(): void; + + hideView(): void; + + setValue(v: any): void; + + getValue(): T; + + populate(items: T[]): void; +} diff --git a/typescript/component/treevaluechooser/combo.treevaluechooser.ts b/typescript/component/treevaluechooser/combo.treevaluechooser.ts new file mode 100644 index 000000000..a0a87626d --- /dev/null +++ b/typescript/component/treevaluechooser/combo.treevaluechooser.ts @@ -0,0 +1,24 @@ +import { AbstractTreeValueChooser } from "./abstract.treevaluechooser"; + +export declare class TreeValueChooserCombo extends AbstractTreeValueChooser { + static xtype: string; + static EVENT_BEFORE_POPUPVIEW: string; + static EVENT_CONFIRM: string; + static EVENT_FOCUS: string; + static EVENT_BLUR: string; + static EVENT_STOP: string; + static EVENT_CLICK_ITEM: string; + static EVENT_SEARCHING: string; + + showView(): void; + + hideView(): void; + + setValue(v: any): void; + + getValue(): T; + + getAllValue(): T; + + populate(items: T[]): void; +} diff --git a/typescript/index.ts b/typescript/index.ts index 0b182167a..e82441f3c 100644 --- a/typescript/index.ts +++ b/typescript/index.ts @@ -1,4 +1,4 @@ -import { _Combo, _ComboStatic } from "./base/combination/combo"; +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"; @@ -24,8 +24,8 @@ import { _SearchTextValueCombo, _SearchTextValueComboStatic } from "./case/combo import { _SignEditor, _SignEditorStatic, SignEditor } from "./case/editor/editor.sign"; import { _LoadingPane } from "./case/loading/loading_pane"; import { _AllValueMultiTextValueCombo, _AllValueMultiTextValueComboStatic } from "./component/allvaluemultitextvaluecombo/allvalue.multitextvalue.combo"; -import { _AbstractTreeValueChooser } from "./component/treevaluechooser/abstract.treevaluechooser"; -import { _AbstractListTreeValueChooser } from "./component/treevaluechooser/abstract.treevaluechooser.list"; +import { _AbstractTreeValueChooser, AbstractTreeValueChooser } from "./component/treevaluechooser/abstract.treevaluechooser"; +import { _AbstractListTreeValueChooser, 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"; @@ -92,6 +92,12 @@ import { MultiTreeCombo } from "./widget/multitree/multi.tree.combo"; import { CenterLayout } from "./core/wrapper/layout/middle/middle.center"; import { VirtualGroup } from "./base/combination/group.virtual"; import { GridLayout } from "./core/wrapper/layout/layout.grid"; +import { TriggerIconButton } from "./case/button/icon/icon.trigger"; +import { Searcher } from "./base/combination/searcher"; +import { ListTreeValueChooserInsertCombo } from "./component/treevaluechooser/combo.listtreevaluechooser"; +import { TreeValueChooserCombo } from "./component/treevaluechooser/combo.treevaluechooser"; +import { TreeValueChooserInsertCombo } from "./component/treevaluechooser/combo.treevaluechooser.insert"; +import { Radio } from "./base/single/input/radio/radio"; type ClassConstructor = T & { @@ -140,6 +146,9 @@ export interface BI extends _func, _i18n, _base, _inject { VTapeLayout: ClassConstructor<_VTapeLayout>; AbstractTreeValueChooser: ClassConstructor<_AbstractTreeValueChooser>; AbstractListTreeValueChooser: ClassConstructor<_AbstractListTreeValueChooser>; + ListTreeValueChooserInsertCombo: typeof ListTreeValueChooserInsertCombo; + TreeValueChooserCombo: typeof TreeValueChooserCombo; + TreeValueChooserInsertCombo: typeof TreeValueChooserInsertCombo; Decorators: typeof decorator; DownListCombo: ClassConstructor<_DownListCombo> & _DownListComboStatic; Iframe: ClassConstructor<_Iframe>; @@ -162,7 +171,10 @@ export interface BI extends _func, _i18n, _base, _inject { CenterAdaptLayout: typeof CenterAdaptLayout; VerticalAdaptLayout: typeof VerticalAdaptLayout; IconButton: typeof IconButton; + TriggerIconButton: typeof TriggerIconButton; + Searcher: typeof Searcher; TextEditor: typeof TextEditor; + Radio: typeof Radio; A: typeof A; Html: typeof Html; Switcher: typeof Switcher; @@ -225,6 +237,8 @@ export { VTapeLayout, VerticalAdaptLayout, IconButton, + TriggerIconButton, + Searcher, AbstractLabel, Label, TextButton, @@ -246,8 +260,15 @@ export { Popover, BarPopover, Tab, + AbstractTreeValueChooser, + AbstractListTreeValueChooser, + ListTreeValueChooserInsertCombo, + TreeValueChooserCombo, + TreeValueChooserInsertCombo, + Combo, IconCombo, DynamicDateCombo, + Radio, MultiSelectItem, CustomTree, ButtonGroup,