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

# Conflicts:
#	typescript/index.ts

dist/lib/base/combination/combo.d.ts

@@ -1,9 +1,9 @@
-import { _Widget } from "../../core/widget";
+import { Widget, _Widget } from "../../core/widget";
 export interface _Combo extends _Widget {
     populate(...args: any[]): void;
     _setEnable(v: boolean): void;
     isViewVisible(): boolean;
-    showView(e?: any): void;
+    showView(e?: Event): void;
     hideView(): void;
     getView(): any;
     getPopupPosition(): any;
@@ -21,3 +21,24 @@ 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;
+}

dist/lib/base/combination/searcher.d.ts

@@ -0,0 +1,24 @@
+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;
+}

dist/lib/base/single/input/radio/radio.d.ts

@@ -0,0 +1,5 @@
+import { BasicButton } from "../../button/button.basic";
+export declare class Radio extends BasicButton {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+}

dist/lib/case/button/icon/icon.trigger.d.ts

@@ -0,0 +1,5 @@
+import { IconButton } from "../../../base/single/button/buttons/button.icon";
+export declare class TriggerIconButton extends IconButton {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+}

dist/lib/case/button/item.singleselect.radio.d.ts

@@ -0,0 +1,7 @@
+import { BasicButton } from "../../base/single/button/button.basic";
+export declare class SingleSelectRadioItem extends BasicButton {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    doRedMark(...args: any[]): void;
+    unRedMark(...args: any[]): void;
+}

dist/lib/component/treevaluechooser/abstract.treevaluechooser.d.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;
     _initData: (items: any[]) => void;
@@ -18,3 +18,22 @@ export interface _AbstractTreeValueChooser extends _Widget {
     _getAllChildren: (parentValues: any) => any;
     _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;
+}

dist/lib/component/treevaluechooser/abstract.treevaluechooser.list.d.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 {
+}

dist/lib/component/treevaluechooser/combo.listtreevaluechooser.d.ts

@@ -0,0 +1,16 @@
+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;
+}

dist/lib/component/treevaluechooser/combo.treevaluechooser.d.ts

@@ -0,0 +1,17 @@
+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;
+}

dist/lib/component/treevaluechooser/combo.treevaluechooser.insert.d.ts

@@ -0,0 +1,16 @@
+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;
+}

dist/lib/index.d.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,16 @@ 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";
+import { MultiTreePopup } from "./widget/multitree/multi.tree.popup";
+import { SingleSelectRadioItem } from "./case/button/item.singleselect.radio";
+import { SingleSelectInsertCombo } from "./widget/singleselect/singleselect.insert.combo";
+import { SingleSelectCombo } from "./widget/singleselect/singleselect.combo";
 declare type ClassConstructor<T extends {}> = T & {
     new (config: any): T;
     (config: any): T;
@@ -137,6 +147,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>;
@@ -159,7 +172,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;
@@ -194,9 +210,13 @@ export interface BI extends _func, _i18n, _base, _inject {
     CenterLayout: typeof CenterLayout;
     VirtualGroup: typeof VirtualGroup;
     GridLayout: typeof GridLayout;
+    MultiTreePopup: typeof MultiTreePopup;
+    SingleSelectRadioItem: typeof SingleSelectRadioItem;
+    SingleSelectInsertCombo: typeof SingleSelectInsertCombo;
+    SingleSelectCombo: typeof SingleSelectCombo;
 }
 declare const _default: {
     Decorators: typeof decorator;
 };
 export default _default;
-export { Widget, Single, BasicButton, Icon, LeftRightVerticalAdaptLayout, IconTextIconItem, Layout, HorizontalAutoLayout, InlineVerticalAdaptLayout, RightVerticalAdaptLayout, TableAdaptLayout, AbsoluteCenterLayout, HorizontalAdaptLayout, FloatLeftLayout, VerticalLayout, AbsoluteLayout, DefaultLayout, HTapeLayout, CenterAdaptLayout, VTapeLayout, VerticalAdaptLayout, IconButton, AbstractLabel, Label, TextButton, DownListCombo, IconChangeButton, Button, TextEditor, A, Html, Switcher, BubbleCombo, Loader, ListPane, MultiSelectBar, SelectList, TextValueCombo, Editor, IconLabel, Popover, BarPopover, Tab, IconCombo, DynamicDateCombo, MultiSelectItem, CustomTree, ButtonGroup, ButtonTree, NodeButton, IconArrowNode, MidTreeLeafItem, FirstTreeLeafItem, LastTreeLeafItem, SmallTextEditor, MultifileEditor, SignEditor, MultiSelectInsertCombo, MultiSelectCombo, SearchEditor, Text, Pane, MultiLayerSingleLevelTree, SimpleColorChooser, AbstractAllValueChooser, AllValueChooserCombo, TextAreaEditor, SingleSelectItem, DynamicDateTimeCombo, MultiTreeCombo, CenterLayout, VirtualGroup, GridLayout, };
+export { Widget, Single, BasicButton, Icon, LeftRightVerticalAdaptLayout, IconTextIconItem, Layout, HorizontalAutoLayout, InlineVerticalAdaptLayout, RightVerticalAdaptLayout, TableAdaptLayout, AbsoluteCenterLayout, HorizontalAdaptLayout, FloatLeftLayout, VerticalLayout, AbsoluteLayout, DefaultLayout, HTapeLayout, CenterAdaptLayout, VTapeLayout, VerticalAdaptLayout, IconButton, TriggerIconButton, Searcher, AbstractLabel, Label, TextButton, DownListCombo, IconChangeButton, Button, TextEditor, A, Html, Switcher, BubbleCombo, Loader, ListPane, MultiSelectBar, SelectList, TextValueCombo, Editor, IconLabel, Popover, BarPopover, Tab, AbstractTreeValueChooser, AbstractListTreeValueChooser, ListTreeValueChooserInsertCombo, TreeValueChooserCombo, TreeValueChooserInsertCombo, Combo, IconCombo, DynamicDateCombo, Radio, MultiSelectItem, CustomTree, ButtonGroup, ButtonTree, NodeButton, IconArrowNode, MidTreeLeafItem, FirstTreeLeafItem, LastTreeLeafItem, SmallTextEditor, MultifileEditor, SignEditor, MultiSelectInsertCombo, MultiSelectCombo, SearchEditor, Text, Pane, MultiLayerSingleLevelTree, SimpleColorChooser, AbstractAllValueChooser, AllValueChooserCombo, TextAreaEditor, SingleSelectItem, DynamicDateTimeCombo, MultiTreeCombo, CenterLayout, VirtualGroup, GridLayout, MultiTreePopup, SingleSelectRadioItem, SingleSelectInsertCombo, SingleSelectCombo, };

dist/lib/widget/multitree/multi.tree.popup.d.ts

@@ -0,0 +1,11 @@
+import { Pane } from "../../base/pane";
+export declare class MultiTreePopup extends Pane {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    static EVENT_CLICK_CONFIRM: string;
+    static EVENT_CLICK_CLEAR: string;
+    static EVENT_AFTERINIT: string;
+    hasChecked(): boolean;
+    resetHeight(h: number): void;
+    resetWidth(w: number): void;
+}

dist/lib/widget/singleselect/singleselect.combo.d.ts

@@ -0,0 +1,10 @@
+import { Single } from "../../base/single/single";
+export declare class SingleSelectCombo extends Single {
+    static xtype: string;
+    static EVENT_BLUR: string;
+    static EVENT_FOCUS: string;
+    static EVENT_STOP: string;
+    static EVENT_SEARCHING: string;
+    static EVENT_CLICK_ITEM: string;
+    static EVENT_CONFIRM: string;
+}

dist/lib/widget/singleselect/singleselect.insert.combo.d.ts

@@ -0,0 +1,10 @@
+import { Single } from "../../base/single/single";
+export declare class SingleSelectInsertCombo extends Single {
+    static xtype: string;
+    static EVENT_FOCUS: string;
+    static EVENT_BLUR: string;
+    static EVENT_STOP: string;
+    static EVENT_SEARCHING: string;
+    static EVENT_CLICK_ITEM: string;
+    static EVENT_CONFIRM: string;
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20201216113239",
+  "version": "2.0.20201216173206",
   "description": "fineui",
   "main": "dist/fineui.min.js",
   "types": "dist/lib/index.d.ts",

typescript/case/button/item.singleselect.radio.ts

@@ -0,0 +1,10 @@
+import { BasicButton } from "../../base/single/button/button.basic";
+
+export declare class SingleSelectRadioItem extends BasicButton {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+
+    doRedMark(...args: any[]): void;
+
+    unRedMark(...args: any[]): void;
+}

typescript/index.ts

@@ -101,6 +101,10 @@ import { Radio } from "./base/single/input/radio/radio";
 import { MultiLayerSelectTreePopup } from "./widget/multilayerselecttree/multilayerselecttree.popup";
 import { MultiLayerSingleTreePopup } from "./widget/multilayersingletree/multilayersingletree.popup";
 import { TreeView } from "./base/tree/ztree/treeview";
+import { MultiTreePopup } from "./widget/multitree/multi.tree.popup";
+import { SingleSelectRadioItem } from "./case/button/item.singleselect.radio";
+import { SingleSelectInsertCombo } from "./widget/singleselect/singleselect.insert.combo";
+import { SingleSelectCombo } from "./widget/singleselect/singleselect.combo";
 
 
 type ClassConstructor<T extends {}> = T & {
@@ -215,6 +219,10 @@ export interface BI extends _func, _i18n, _base, _inject {
     CenterLayout: typeof CenterLayout;
     VirtualGroup: typeof VirtualGroup;
     GridLayout: typeof GridLayout;
+    MultiTreePopup: typeof MultiTreePopup;
+    SingleSelectRadioItem: typeof SingleSelectRadioItem;
+    SingleSelectInsertCombo: typeof SingleSelectInsertCombo;
+    SingleSelectCombo: typeof SingleSelectCombo;
 }
 
 export default {
@@ -306,4 +314,8 @@ export {
     CenterLayout,
     VirtualGroup,
     GridLayout,
+    MultiTreePopup,
+    SingleSelectRadioItem,
+    SingleSelectInsertCombo,
+    SingleSelectCombo,
 };

typescript/widget/multitree/multi.tree.popup.ts

@@ -0,0 +1,15 @@
+import { Pane } from "../../base/pane";
+
+export declare class MultiTreePopup extends Pane {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    static EVENT_CLICK_CONFIRM: string;
+    static EVENT_CLICK_CLEAR: string;
+    static EVENT_AFTERINIT: string;
+    
+    hasChecked(): boolean;
+
+    resetHeight(h: number): void;
+
+    resetWidth(w: number): void;
+}

typescript/widget/singleselect/singleselect.combo.ts

@@ -0,0 +1,11 @@
+import { Single } from "../../base/single/single";
+
+export declare class SingleSelectCombo extends Single {
+    static xtype: string;
+    static EVENT_BLUR: string;
+    static EVENT_FOCUS: string;
+    static EVENT_STOP: string;
+    static EVENT_SEARCHING: string;
+    static EVENT_CLICK_ITEM: string;
+    static EVENT_CONFIRM: string;
+}

typescript/widget/singleselect/singleselect.insert.combo.ts

@@ -0,0 +1,11 @@
+import { Single } from "../../base/single/single";
+
+export declare class SingleSelectInsertCombo extends Single {
+    static xtype: string;
+    static EVENT_FOCUS: string;
+    static EVENT_BLUR: string;
+    static EVENT_STOP: string;
+    static EVENT_SEARCHING: string;
+    static EVENT_CLICK_ITEM: string;
+    static EVENT_CONFIRM: string;
+}