Pull request #1670: KERNEL-6464 补充描述

Merge in VISUAL/fineui from ~TELLER/fineui:bugfix to master

* commit 'c366d4caba580768226fd804f726b53908db5d89':
  refactor: 补充描述

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

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>(): T;
+
+    hasMatched(): boolean;
+
+    adjustHeight(): void;
+
+    adjustView(): void;
+
+    setValue(v: any): void;
+
+    getKeyword(): string;
+
+    getKeywords(): string[];
+
+    getValue<T>(): T;
+
+    populate(...args: any[]): void;
+}

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

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

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 {}

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

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>(): T;
+
+    populate<T>(items: T[]): void;
+}

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>(): T;
+
+    populate<T>(items: T[]): void;
+}

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>(): T;
+
+    getAllValue<T>(): T;
+
+    populate<T>(items: T[]): void;
+}

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 { _AbstractTreeValueChooser, AbstractTreeValueChooser } from "./component/treevaluechooser/abstract.treevaluechooser";
-import { _AbstractListTreeValueChooser } from "./component/treevaluechooser/abstract.treevaluechooser.list";
+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 extends {}> = 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,