Merge branch 'master' of ssh://code.fineres.com:7999/~windy/fui

# Conflicts:
#	changelog.md

changelog.md

@@ -1,6 +1,7 @@
 # 更新日志
 2.0(2020-12)
 - 文件上传控件新增API(setMaxFileLength)以动态设置最大上传文件数量
+- 复选下拉树显示查看已选效果改成和复选下拉列表一致
 - Pane系列提供small和big两种大小的加载动画
 - 同步树列表系列支持不显示节点连接线和展开收起图标
 - 规范了下拉树trigger中显示值的显示顺序

dist/lib/base/combination/group.button.d.ts

@@ -1,4 +1,4 @@
-import { _Widget } from "../../core/widget";
+import { _Widget, Widget } from "../../core/widget";
 export interface _ButtonGroup extends _Widget {
     prependItems<T>(items: T[]): void;
     addItems<T>(items: T[]): void;
@@ -27,3 +27,28 @@ export interface _ButtonGroupChooseType {
 export interface _ButtonGroupStatic {
     EVENT_CHANGE: string;
 }
+export declare class ButtonGroup extends Widget {
+    static xtype: string;
+    static CHOOSE_TYPE_SINGLE: number;
+    static CHOOSE_TYPE_MULTI: number;
+    static CHOOSE_TYPE_ALL: number;
+    static CHOOSE_TYPE_NONE: number;
+    static CHOOSE_TYPE_DEFAULT: number;
+    static EVENT_CHANGE: string;
+    prependItems<T>(items: T[]): void;
+    addItems<T>(items: T[]): void;
+    removeItemAt(indexes: any): void;
+    removeItems(values: any): void;
+    populate(items?: any, ...args: any[]): void;
+    setNotSelectedValue(v: any): void;
+    getNotSelectedValue<T>(): T[];
+    setEnabledValue(v: any): void;
+    getAllButtons<T>(): T[];
+    getAllLeaves<T>(): T[];
+    getSelectedButtons<T>(): T[];
+    getNotSelectedButtons<T>(): T[];
+    getIndexByValue(value: any): number;
+    getNodeById(id: any): any;
+    getNodeByValue(value: any): any;
+    getValue<T>(): T[];
+}

dist/lib/base/combination/tree.button.d.ts

@@ -0,0 +1,5 @@
+import { ButtonGroup } from './group.button';
+export declare class ButtonTree extends ButtonGroup {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+}

dist/lib/base/pane.d.ts

@@ -1,4 +1,4 @@
-import { _Widget } from "../core/widget";
+import { _Widget, Widget } from "../core/widget";
 export interface _Pane extends _Widget {
     _assertTip(..._args: any[]): void;
     loading(..._args: any[]): void;
@@ -9,3 +9,12 @@ export interface _Pane extends _Widget {
 export interface _PaneStatic {
     EVENT_LOADED: string;
 }
+export declare class Pane extends Widget {
+    static EVENT_LOADED: string;
+    _assertTip(..._args: any[]): void;
+    loading(): void;
+    loaded(): void;
+    check(): void;
+    setTipVisible(b: boolean): void;
+    populate(items?: any[]): void;
+}

dist/lib/base/single/button/button.node.d.ts

@@ -1,7 +1,13 @@
-import { _BasicButton } from "./button.basic";
+import { _BasicButton, BasicButton } from "./button.basic";
 export interface _NodeButton extends _BasicButton {
     isOpened(): void;
     setOpened(b: boolean): void;
     triggerCollapse(): void;
     triggerExpand(): void;
 }
+export declare class NodeButton extends BasicButton {
+    isOpened(): boolean;
+    setOpened(b: boolean): void;
+    triggerCollapse(): void;
+    triggerExpand(): void;
+}

dist/lib/base/single/button/buttons/button.d.ts

@@ -1,3 +1,4 @@
+import { IconLabel, Label } from "../../../..";
 import { BasicButton, _BasicButton } from "../button.basic";
 export interface _Button extends _BasicButton {
     doRedMark(...args: any[]): void;
@@ -11,6 +12,8 @@ export interface _ButtonStatic {
 export declare class Button extends BasicButton {
     static xtype: string;
     static EVENT_CHANGE: string;
+    text: Label;
+    icon?: IconLabel;
     doRedMark(...args: any[]): void;
     unRedMark(...args: any[]): void;
     doHighLight(...args: any[]): void;

dist/lib/base/single/text.d.ts

@@ -1,4 +1,4 @@
-import { _Single } from "./single";
+import { _Single, Single } from "./single";
 export interface _Text extends _Single {
     doRedMark(keyword: string): void;
     unRedMark(): void;
@@ -7,3 +7,11 @@ export interface _Text extends _Single {
     setStyle(css: any): void;
     setText(v: string): void;
 }
+export declare class Text extends Single {
+    static xtype: string;
+    doRedMark(keyword: string): void;
+    unRedMark(): void;
+    doHighLight(): void;
+    unHighLight(): void;
+    setStyle(css: any): void;
+}

dist/lib/base/tree/customtree.d.ts

@@ -0,0 +1,13 @@
+import { Widget } from '../../core/widget';
+export declare class CustomTree extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    initTree(nodes: any, ...args: any[]): void;
+    stroke(...args: any[]): void;
+    populate(nodes: any, ...args: any[]): void;
+    getAllButtons<T>(): T[];
+    getAllLeaves<T>(): T[];
+    getNodeById(id: any): any;
+    getNodeByValue(value: any): any;
+    getValue<T>(): T[];
+}

dist/lib/case/button/node/node.icon.arrow.d.ts

@@ -0,0 +1,6 @@
+import { NodeButton } from '../../../base/single/button/button.node';
+export declare class IconArrowNode extends NodeButton {
+    static xtype: string;
+    doRedMark(...args: any[]): void;
+    unRedMark(...args: any[]): void;
+}

dist/lib/case/button/treeitem/item.first.treeleaf.d.ts

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

dist/lib/case/button/treeitem/item.last.treeleaf.d.ts

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

dist/lib/case/button/treeitem/item.mid.treeleaf.d.ts

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

dist/lib/case/colorchooser/colorchooser.simple.d.ts

@@ -0,0 +1,8 @@
+import { Widget } from '../../core/widget';
+export declare class SimpleColorChooser extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    isViewVisible(): boolean;
+    hideView(): void;
+    showView(): void;
+}

dist/lib/case/editor/editor.sign.d.ts

@@ -1,4 +1,4 @@
-import { _Widget } from "../../core/widget";
+import { Widget, _Widget } from "../../core/widget";
 export interface _SignEditor extends _Widget {
     setTitle(v: string | Function): void;
     setWarningTitle(v: string | Function): void;
@@ -36,3 +36,38 @@ export interface _SignEditorStatic {
     EVENT_SPACE: string;
     EVENT_EMPTY: string;
 }
+export declare class SignEditor extends Widget {
+    static xtype: string;
+    static EVENT_FOCUS: string;
+    static EVENT_BLUR: string;
+    static EVENT_CHANGE: string;
+    static EVENT_CLICK: string;
+    static EVENT_KEY_DOWN: string;
+    static EVENT_CLICK_LABEL: string;
+    static EVENT_START: string;
+    static EVENT_PAUSE: string;
+    static EVENT_STOP: string;
+    static EVENT_CONFIRM: string;
+    static EVENT_CHANGE_CONFIRM: string;
+    static EVENT_VALID: string;
+    static EVENT_ERROR: string;
+    static EVENT_ENTER: string;
+    static EVENT_RESTRICT: string;
+    static EVENT_SPACE: string;
+    static EVENT_EMPTY: string;
+    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;
+    setErrorText(v: string): void;
+    getErrorText(): string;
+    isEditing(): boolean;
+    getLastChangedValue(): string;
+    getState(): any;
+    setState(...args: any[]): void;
+}

dist/lib/core/wrapper/layout.d.ts

@@ -17,6 +17,7 @@ export interface _Layout extends _Widget {
     resize(): void;
 }
 export declare class Layout extends Widget {
+    static xtype: string;
     addItem(item: any): any;
     prependItem(item: any): any;
     addItemAt(index: string, item: any): any;

dist/lib/core/wrapper/layout/adapt/absolute.center.d.ts

@@ -0,0 +1,4 @@
+import { Layout } from "../../layout";
+export declare class AbsoluteCenterLayout extends Layout {
+    static xtype: string;
+}

dist/lib/core/wrapper/layout/adapt/adapt.center.d.ts

@@ -0,0 +1,4 @@
+import { Layout } from "../../layout";
+export declare class CenterAdaptLayout extends Layout {
+    static xtype: string;
+}

dist/lib/core/wrapper/layout/adapt/adapt.horizontal.d.ts

@@ -0,0 +1,4 @@
+import { Layout } from "../../layout";
+export declare class HorizontalAdaptLayout extends Layout {
+    static xtype: string;
+}

dist/lib/core/wrapper/layout/adapt/adapt.vertical.d.ts

@@ -0,0 +1,4 @@
+import { Layout } from "../../layout";
+export declare class VerticalAdaptLayout extends Layout {
+    static xtype: string;
+}

dist/lib/core/wrapper/layout/layout.absolute.d.ts

@@ -1,6 +1,9 @@
-import { _Layout } from "../layout";
+import { Layout, _Layout } from "../layout";
 export interface _AbsoluteLayout extends _Layout {
     resize(): void;
     stroke<T>(items: T[]): void;
     populate<T>(items?: T[]): void;
 }
+export declare class AbsoluteLayout extends Layout {
+    static xtype: string;
+}

dist/lib/core/wrapper/layout/layout.default.d.ts

@@ -1,5 +1,8 @@
-import { _Layout } from "../layout";
+import { Layout, _Layout } from "../layout";
 export interface _DefaultLayout extends _Layout {
     resize(): void;
     populate<T>(items?: T[]): void;
 }
+export declare class DefaultLayout extends Layout {
+    static xtype: string;
+}

dist/lib/core/wrapper/layout/layout.flow.d.ts

@@ -0,0 +1,4 @@
+import { Layout } from "../layout";
+export declare class FloatLeftLayout extends Layout {
+    static xtype: string;
+}

dist/lib/core/wrapper/layout/layout.tape.d.ts

@@ -1,4 +1,4 @@
-import { _Layout } from "../layout";
+import { _Layout, Layout } from "../layout";
 export interface _HTapeLayout extends _Layout {
     resize(): void;
     stroke<T>(items: T[]): void;
@@ -11,3 +11,9 @@ export interface _VTapeLayout extends _Layout {
     update(): void;
     populate<T>(items?: T[]): void;
 }
+export declare class HTapeLayout extends Layout {
+    static xtype: string;
+}
+export declare class VTapeLayout extends Layout {
+    static xtype: string;
+}

dist/lib/core/wrapper/layout/layout.vertical.d.ts

@@ -1,5 +1,8 @@
-import { _Layout } from "../layout";
+import { Layout, _Layout } from "../layout";
 export interface _VerticalLayout extends _Layout {
     resize(): void;
     populate<T>(items?: T[]): void;
 }
+export declare class VerticalLayout extends Layout {
+    static xtype: string;
+}

dist/lib/index.d.ts

@@ -1,9 +1,9 @@
 import { _Combo, _ComboStatic } from "./base/combination/combo";
-import { _ButtonGroup, _ButtonGroupChooseType, _ButtonGroupStatic } from "./base/combination/group.button";
+import { _ButtonGroup, _ButtonGroupChooseType, _ButtonGroupStatic, ButtonGroup } from "./base/combination/group.button";
 import { _Tab, _TabStatic, Tab } from "./base/combination/tab";
-import { _Pane, _PaneStatic } from "./base/pane";
+import { _Pane, _PaneStatic, Pane } from "./base/pane";
 import { _BasicButton, _BasicButtonStatic, BasicButton } from "./base/single/button/button.basic";
-import { _NodeButton } from "./base/single/button/button.node";
+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, _IconTextItemStatic } from "./base/single/button/listitem/icontextitem";
@@ -14,14 +14,14 @@ import { _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 } from "./base/single/text";
+import { _Text, Text } from "./base/single/text";
 import { _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, _BubbleComboStatic } from "./case/combo/bubblecombo/combo.bubble";
 import { _TextValueCombo, _TextValueComboStatic, TextValueCombo } from "./case/combo/combo.textvalue";
 import { _SearchTextValueCombo, _SearchTextValueComboStatic } from "./case/combo/searchtextvaluecombo/combo.searchtextvalue";
-import { _SignEditor, _SignEditorStatic } from "./case/editor/editor.sign";
+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";
@@ -39,11 +39,11 @@ import { _Plugin } from "./core/plugin";
 import { _OB } from "./core/ob";
 import { _Widget, _WidgetStatic, Widget } from "./core/widget";
 import { _inject } from "./core/inject";
-import { _Layout } from "./core/wrapper/layout";
+import { Layout, _Layout } from "./core/wrapper/layout";
-import { _AbsoluteLayout } from "./core/wrapper/layout/layout.absolute";
+import { AbsoluteLayout, _AbsoluteLayout } from "./core/wrapper/layout/layout.absolute";
-import { _HTapeLayout, _VTapeLayout } from "./core/wrapper/layout/layout.tape";
+import { HTapeLayout, VTapeLayout, _HTapeLayout, _VTapeLayout } from "./core/wrapper/layout/layout.tape";
-import { _VerticalLayout } from "./core/wrapper/layout/layout.vertical";
+import { VerticalLayout, _VerticalLayout } from "./core/wrapper/layout/layout.vertical";
-import { _DefaultLayout } from "./core/wrapper/layout/layout.default";
+import { DefaultLayout, _DefaultLayout } from "./core/wrapper/layout/layout.default";
 import { DownListCombo, _DownListCombo, _DownListComboStatic } from "./widget/downlist/combo.downlist";
 import { Icon } from "./base/single/icon/icon";
 import { _LeftVerticalAdapt } from "./core/wrapper/layout/adapt/adapt.leftvertical";
@@ -58,6 +58,24 @@ import { IconLabel } from "./base/single/label/icon.label";
 import { Popover, BarPopover } from "./base/layer/layer.popover";
 import { IconCombo } from "./case/combo/iconcombo/combo.icon";
 import { DynamicDateCombo } from "./widget/dynamicdate/dynamicdate.combo";
+import { CustomTree } from "./base/tree/customtree";
+import { ButtonTree } from "./base/combination/tree.button";
+import { IconArrowNode } from "./case/button/node/node.icon.arrow";
+import { MidTreeLeafItem } from "./case/button/treeitem/item.mid.treeleaf";
+import { FirstTreeLeafItem } from "./case/button/treeitem/item.first.treeleaf";
+import { LastTreeLeafItem } from "./case/button/treeitem/item.last.treeleaf";
+import { SmallTextEditor } from "./widget/editor/editor.text.small";
+import { MultifileEditor } from "./widget/editor/editor.multifile";
+import { AbsoluteCenterLayout } from "./core/wrapper/layout/adapt/absolute.center";
+import { HorizontalAdaptLayout } from "./core/wrapper/layout/adapt/adapt.horizontal";
+import { FloatLeftLayout } from "./core/wrapper/layout/layout.flow";
+import { CenterAdaptLayout } from "./core/wrapper/layout/adapt/adapt.center";
+import { VerticalAdaptLayout } from "./core/wrapper/layout/adapt/adapt.vertical";
+import { MultiSelectInsertCombo } from "./widget/multiselect/multiselect.insert.combo";
+import { MultiSelectCombo } from "./widget/multiselect/multiselect.combo";
+import { SearchEditor } from "./widget/editor/editor.search";
+import { MultiLayerSingleLevelTree } from "./widget/multilayersingletree/multilayersingletree.leveltree";
+import { SimpleColorChooser } from "./case/colorchooser/colorchooser.simple";
 declare type ClassConstructor<T extends {}> = T & {
     new (config: any): T;
     (config: any): T;
@@ -119,6 +137,11 @@ export interface BI extends _func, _i18n, _base, _inject {
     InlineVerticalAdaptLayout: typeof InlineVerticalAdaptLayout;
     RightVerticalAdaptLayout: typeof RightVerticalAdaptLayout;
     TableAdaptLayout: typeof TableAdaptLayout;
+    AbsoluteCenterLayout: typeof AbsoluteCenterLayout;
+    HorizontalAdaptLayout: typeof HorizontalAdaptLayout;
+    FloatLeftLayout: typeof FloatLeftLayout;
+    CenterAdaptLayout: typeof CenterAdaptLayout;
+    VerticalAdaptLayout: typeof VerticalAdaptLayout;
     IconButton: typeof IconButton;
     TextEditor: typeof TextEditor;
     IconLabel: typeof IconLabel;
@@ -126,9 +149,22 @@ export interface BI extends _func, _i18n, _base, _inject {
     BarPopover: typeof BarPopover;
     IconCombo: typeof IconCombo;
     DynamicDateCombo: typeof DynamicDateCombo;
+    CustomTree: typeof CustomTree;
+    ButtonTree: typeof ButtonTree;
+    IconArrowNode: typeof IconArrowNode;
+    MidTreeLeafItem: typeof MidTreeLeafItem;
+    FirstTreeLeafItem: typeof FirstTreeLeafItem;
+    LastTreeLeafItem: typeof LastTreeLeafItem;
+    SmallTextEditor: typeof SmallTextEditor;
+    MultifileEditor: typeof MultifileEditor;
+    MultiSelectInsertCombo: typeof MultiSelectInsertCombo;
+    MultiSelectCombo: typeof MultiSelectCombo;
+    SearchEditor: typeof SearchEditor;
+    MultiLayerSingleLevelTree: typeof MultiLayerSingleLevelTree;
+    SimpleColorChooser: typeof SimpleColorChooser;
 }
 declare const _default: {
     Decorators: typeof decorator;
 };
 export default _default;
-export { Widget, Single, BasicButton, Icon, LeftRightVerticalAdaptLayout, IconTextIconItem, HorizontalAutoLayout, InlineVerticalAdaptLayout, RightVerticalAdaptLayout, TableAdaptLayout, IconButton, AbstractLabel, Label, TextButton, DownListCombo, IconChangeButton, Button, TextEditor, TextValueCombo, Editor, IconLabel, Popover, BarPopover, Tab, IconCombo, DynamicDateCombo, MultiSelectItem, };
+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, 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, };

dist/lib/widget/editor/editor.multifile.d.ts

@@ -0,0 +1,18 @@
+import { Widget } from "../../core/widget";
+export declare class MultifileEditor extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    static EVENT_UPLOADSTART: string;
+    static EVENT_ERROR: string;
+    static EVENT_PROGRESS: string;
+    static EVENT_UPLOADED: string;
+    _reset(): void;
+    select(): void;
+    getValue(): {
+        attach_id: string;
+        attach_type: string;
+        filename: string;
+    }[];
+    upload(): void;
+    reset(): void;
+}

dist/lib/widget/editor/editor.search.d.ts

@@ -0,0 +1,31 @@
+import { Widget } from '../../core/widget';
+export declare class SearchEditor extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    static EVENT_FOCUS: string;
+    static EVENT_BLUR: string;
+    static EVENT_CLICK: string;
+    static EVENT_KEY_DOWN: string;
+    static EVENT_SPACE: string;
+    static EVENT_BACKSPACE: string;
+    static EVENT_CLEAR: string;
+    static EVENT_START: string;
+    static EVENT_PAUSE: string;
+    static EVENT_STOP: string;
+    static EVENT_CONFIRM: string;
+    static EVENT_CHANGE_CONFIRM: string;
+    static EVENT_VALID: string;
+    static EVENT_ERROR: string;
+    static EVENT_ENTER: string;
+    static EVENT_RESTRICT: string;
+    static EVENT_REMOVE: string;
+    static EVENT_EMPTY: string;
+    setWaterMark(v: string): void;
+    focus(): void;
+    blur(): void;
+    getKeywords(): string[];
+    getLastValidValue(): string;
+    getLastChangedValue(): string;
+    isEditing(): boolean;
+    isValid(): boolean;
+}

dist/lib/widget/editor/editor.text.small.d.ts

@@ -0,0 +1,4 @@
+import { TextEditor } from "./editor.text";
+export declare class SmallTextEditor extends TextEditor {
+    static xtype: string;
+}

dist/lib/widget/multilayersingletree/multilayersingletree.leveltree.d.ts

@@ -0,0 +1,10 @@
+import { Pane } from '../../base/pane';
+export declare class MultiLayerSingleLevelTree extends Pane {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    initTree(nodes: any, ...args: any[]): void;
+    populate(nodes: any, ...args: any[]): void;
+    getAllLeaves<T>(): T[];
+    getNodeById(id: any): any;
+    getNodeByValue(value: any): any;
+}

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

@@ -0,0 +1,40 @@
+import { Single } from "../../base/single/single";
+export declare class MultiSelectCombo 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;
+    static REQ_GET_DATA_LENGTH: 1;
+    static REQ_GET_ALL_DATA: -1;
+    _itemsCreator4Trigger(op: any, callback: Function): void;
+    _stopEditing(): void;
+    _defaultState(): void;
+    _assertValue(): void;
+    _makeMap(): Obj;
+    _joinKeywords(keywords: string[], callback: Function): void;
+    _joinAll(res: {
+        type: string;
+        value: string[];
+        assist: string[];
+    }, callback: Function): void;
+    _adjust(callback: Function): void;
+    _join(): void;
+    _setStartValue(value: string): void;
+    _populate(...args: any[]): void;
+    showView(): void;
+    hideView(): void;
+    setValue(value: {
+        type: string;
+        value: string[];
+        assist: string[];
+    }[]): void;
+    getValue(): {
+        type: string;
+        value: string[];
+        assist: string[];
+    }[];
+    populate(...args: any[]): void;
+}

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

@@ -0,0 +1,42 @@
+import { Single } from "../../base/single/single";
+export declare class MultiSelectInsertCombo 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;
+    static EVENT_ADD_ITEM: string;
+    static REQ_GET_DATA_LENGTH: 1;
+    static REQ_GET_ALL_DATA: -1;
+    _itemsCreator4Trigger(op: any, callback: Function): void;
+    _addItem(assertShowValue: () => void, matched: boolean): void;
+    _stopEditing(): void;
+    _defaultState(): void;
+    _assertValue(): void;
+    _makeMap(): Obj;
+    _joinKeywords(keywords: string[], callback: Function): void;
+    _joinAll(res: {
+        type: string;
+        value: string[];
+        assist: string[];
+    }, callback: Function): void;
+    _adjust(callback: Function): void;
+    _join(): void;
+    _setStartValue(value: string): void;
+    _populate(...args: any[]): void;
+    showView(): void;
+    hideView(): void;
+    setValue(value: {
+        type: string;
+        value: string[];
+        assist: string[];
+    }[]): void;
+    getValue(): {
+        type: string;
+        value: string[];
+        assist: string[];
+    }[];
+    populate(...args: any[]): void;
+}

dist/resource.js

@@ -92,7 +92,7 @@ BI.i18n = {
     "BI-Summary_Values": "汇总",
     "BI-Basic_Clear": "清除",
     "BI-Upload_File_Size_Error": "文件大小不支持",
-    "BI-Upload_File_Count_Error": "超出上传数量上限，请重新上传",
+    "BI-Upload_File_Count_Error": "超出上传数量上限{R1}，请重新上传",
     "BI-Up_Page": "向上翻页",
     "BI-Basic_Simple_Sunday": "日",
     "BI-Multi_Date_Relative_Current_Time": "相对当前时间",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20201214144203",
+  "version": "2.0.20201215105145",
   "description": "fineui",
   "main": "dist/fineui.min.js",
   "types": "dist/lib/index.d.ts",
@@ -55,7 +55,7 @@
   },
   "scripts": {
     "webpack:dev": "node --max_old_space_size=4096 node_modules/webpack-dev-server/bin/webpack-dev-server.js -p --progress --host 0.0.0.0 --config=webpack/webpack.dev.js --mode development",
-    "webpack:prod": "webpack -p --progress --config=webpack/webpack.prod.js --mode production",
+    "webpack:prod": "node --max_old_space_size=4096 node_modules/webpack/bin/webpack -p --progress --config=webpack/webpack.prod.js --mode production",
     "start": "node server.js",
     "build": "npm run webpack:prod && tsc",
     "postbuild": "node ./lib/postbuild/postbuild.js",

src/less/widget/multitree/trigger/multi.tree.button.checkselected.less

@@ -5,4 +5,8 @@
     color: @color-bi-text-highlight;
     z-index: 1;
   }
+  .trigger-check-text {
+    .border-radius(8px);
+    z-index: 1;
+  }
 }

src/widget/multiselect/multiselect.combo.js

@@ -92,6 +92,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                     assertShowValue();
                     self.populate();
                     self._setStartValue("");
+                    self._dataChange = true;
                 });
             }
         });
@@ -109,6 +110,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                         self.combo.setValue(self.storeValue);
                         assertShowValue();
                     }
+                    self._dataChange = true;
                 });
             }
             self.fireEvent(BI.MultiSelectCombo.EVENT_SEARCHING);
@@ -124,6 +126,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                     assertShowValue();
                 });
             }
+            self._dataChange = true;
             self.fireEvent(BI.MultiSelectCombo.EVENT_CLICK_ITEM);
         });
         this.trigger.on(BI.MultiSelectTrigger.EVENT_BEFORE_COUNTER_POPUPVIEW, function () {
@@ -153,6 +156,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                 listeners: [{
                     eventName: BI.MultiSelectPopupView.EVENT_CHANGE,
                     action: function () {
+                        self._dataChange = true;
                         self.storeValue = this.getValue();
                         self._adjust(function () {
                             assertShowValue();
@@ -190,6 +194,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
         });
 
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
+            self._dataChange = false;// 标记数据是否发生变化
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self._populate();
@@ -203,7 +208,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
             if (self.requesting === true) {
                 self.wants2Quit = true;
             } else {
-                self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM);
+                self._dataChange && self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM);
             }
         });
 
@@ -390,7 +395,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
         callback();
         function adjust () {
             if (self.wants2Quit === true) {
-                self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM);
+                self._dataChange && self.fireEvent(BI.MultiSelectCombo.EVENT_CONFIRM);
                 self.wants2Quit = false;
             }
             self.requesting = false;

src/widget/multiselect/multiselect.combo.nobar.js

@@ -100,6 +100,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
                         self.combo.setValue(self.storeValue);
                         assertShowValue();
                     }
+                    self._dataChange = true;
                 });
             }
         });
@@ -114,6 +115,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
                     assertShowValue();
                 });
             }
+            self._dataChange = true;
             self.fireEvent(BI.MultiSelectNoBarCombo.EVENT_CLICK_ITEM);
         });
         this.trigger.on(BI.MultiSelectTrigger.EVENT_BEFORE_COUNTER_POPUPVIEW, function () {
@@ -143,6 +145,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
                 listeners: [{
                     eventName: BI.MultiSelectPopupView.EVENT_CHANGE,
                     action: function () {
+                        self._dataChange = true;
                         self.storeValue = this.getValue();
                         self._adjust(function () {
                             assertShowValue();
@@ -184,6 +187,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
         });
 
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
+            self._dataChange = false;// 标记数据是否发生变化
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self._populate();
@@ -197,7 +201,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
             if (self.requesting === true) {
                 self.wants2Quit = true;
             } else {
-                self.fireEvent(BI.MultiSelectNoBarCombo.EVENT_CONFIRM);
+                self._dataChange && self.fireEvent(BI.MultiSelectNoBarCombo.EVENT_CONFIRM);
             }
         });
 
@@ -302,6 +306,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
             assertShowValue();
             self.populate();
             self._setStartValue("");
+            self._dataChange = true;
         });
     },
 
@@ -407,7 +412,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
 
         function adjust() {
             if (self.wants2Quit === true) {
-                self.fireEvent(BI.MultiSelectNoBarCombo.EVENT_CONFIRM);
+                self._dataChange && self.fireEvent(BI.MultiSelectNoBarCombo.EVENT_CONFIRM);
                 self.wants2Quit = false;
             }
             self.requesting = false;

src/widget/multiselect/multiselect.insert.combo.js

@@ -104,6 +104,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
                         self.combo.setValue(self.storeValue);
                         assertShowValue();
                     }
+                    self._dataChange = true;
                 });
             }
             self.fireEvent(BI.MultiSelectInsertCombo.EVENT_SEARCHING);
@@ -119,6 +120,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
                     assertShowValue();
                 });
             }
+            self._dataChange = true;
             self.fireEvent(BI.MultiSelectInsertCombo.EVENT_CLICK_ITEM);
         });
         this.trigger.on(BI.MultiSelectInsertTrigger.EVENT_BEFORE_COUNTER_POPUPVIEW, function () {
@@ -148,6 +150,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
                 listeners: [{
                     eventName: BI.MultiSelectPopupView.EVENT_CHANGE,
                     action: function () {
+                        self._dataChange = true;
                         self.storeValue = this.getValue();
                         self._adjust(function () {
                             assertShowValue();
@@ -186,6 +189,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
         });
 
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
+            self._dataChange = false;// 标记数据是否发生变化
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self._populate();
@@ -199,7 +203,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             if (self.requesting === true) {
                 self.wants2Quit = true;
             } else {
-                self.fireEvent(BI.MultiSelectInsertCombo.EVENT_CONFIRM);
+                self._dataChange && self.fireEvent(BI.MultiSelectInsertCombo.EVENT_CONFIRM);
             }
         });
 
@@ -218,7 +222,6 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             }
         });
 
-
         this.numberCounter = BI.createWidget({
             type: "bi.multi_select_check_selected_switcher",
             masker: {
@@ -260,7 +263,6 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             }
         });
 
-
         BI.createWidget({
             type: "bi.absolute",
             element: this,
@@ -314,6 +316,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             assertShowValue();
             self.populate();
             self._setStartValue("");
+            self._dataChange = true;
         });
     },
 
@@ -407,7 +410,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
         callback();
         function adjust () {
             if (self.wants2Quit === true) {
-                self.fireEvent(BI.MultiSelectInsertCombo.EVENT_CONFIRM);
+                self._dataChange && self.fireEvent(BI.MultiSelectInsertCombo.EVENT_CONFIRM);
                 self.wants2Quit = false;
             }
             self.requesting = false;

src/widget/multiselect/multiselect.insert.combo.nobar.js

@@ -99,6 +99,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
                         self.combo.setValue(self.storeValue);
                         assertShowValue();
                     }
+                    self._dataChange = true;
                 });
             }
         });
@@ -113,6 +114,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
                     assertShowValue();
                 });
             }
+            self._dataChange = true;
         });
         this.trigger.on(BI.MultiSelectInsertTrigger.EVENT_BEFORE_COUNTER_POPUPVIEW, function () {
             // counter的值随点击项的改变而改变, 点击counter的时候不需要setValue(counter会请求刷新计数)
@@ -141,6 +143,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
                 listeners: [{
                     eventName: BI.MultiSelectPopupView.EVENT_CHANGE,
                     action: function () {
+                        self._dataChange = true;
                         self.storeValue = this.getValue();
                         self._adjust(function () {
                             assertShowValue();
@@ -181,6 +184,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
         });
 
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
+            self._dataChange = false;// 标记数据是否发生变化
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self._populate();
@@ -194,7 +198,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
             if (self.requesting === true) {
                 self.wants2Quit = true;
             } else {
-                self.fireEvent(BI.MultiSelectInsertNoBarCombo.EVENT_CONFIRM);
+                self._dataChange && self.fireEvent(BI.MultiSelectInsertNoBarCombo.EVENT_CONFIRM);
             }
         });
 
@@ -310,6 +314,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
             assertShowValue();
             self.populate();
             self._setStartValue("");
+            self._dataChange = true;
         });
     },
 

src/widget/multitree/trigger/multi.tree.button.checkselected.js

@@ -26,7 +26,7 @@ BI.MultiTreeCheckSelectedButton = BI.inherit(BI.Single, {
 
         this.checkSelected = BI.createWidget({
             type: "bi.text_button",
-            cls: "trigger-check-selected",
+            cls: "bi-high-light-background trigger-check-text",
             invisible: true,
             hgap: 4,
             text: BI.i18nText("BI-Check_Selected"),

src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js

@@ -81,6 +81,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
                     assertShowValue();
                     self._populate();
                     self._setStartValue("");
+                    self._dataChange = true;
                 });
             }
         });
@@ -98,6 +99,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
                         self.combo.setValue(self.storeValue);
                         assertShowValue();
                     }
+                    self._dataChange = true;
                 });
             }
         });
@@ -112,6 +114,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
                     assertShowValue();
                 });
             }
+            self._dataChange = true;
         });
         this.trigger.on(BI.MultiSelectTrigger.EVENT_BEFORE_COUNTER_POPUPVIEW, function () {
             this.getCounter().setValue(self.storeValue);
@@ -137,6 +140,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
                 listeners: [{
                     eventName: BI.MultiSelectPopupView.EVENT_CHANGE,
                     action: function () {
+                        self._dataChange = true;
                         self.storeValue = this.getValue();
                         self._adjust(function () {
                             assertShowValue();
@@ -172,6 +176,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
         });
 
         this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
+            self._dataChange = false;// 标记数据是否发生变化
             this.setValue(self.storeValue);
             BI.nextTick(function () {
                 self._populate();
@@ -189,7 +194,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
                  * 在存在标红的情况，如果popover没有发生改变就确认需要同步trigger的值，否则对外value值和trigger样式不统一
                  */
                 assertShowValue();
-                self.fireEvent(BI.SearchMultiTextValueCombo.EVENT_CONFIRM);
+                self._dataChange && self.fireEvent(BI.SearchMultiTextValueCombo.EVENT_CONFIRM);
             }
         });
 

typescript/base/combination/group.button.ts

@@ -1,4 +1,4 @@
-import { _Widget } from "../../core/widget";
+import { _Widget, Widget } from "../../core/widget";
 
 export interface _ButtonGroup extends _Widget {
     prependItems<T>(items: T[]): void;
@@ -45,3 +45,45 @@ export interface _ButtonGroupChooseType {
 export interface _ButtonGroupStatic {
     EVENT_CHANGE: string;
 }
+
+export declare class ButtonGroup extends Widget {
+    static xtype: string;
+    static CHOOSE_TYPE_SINGLE: number;
+    static CHOOSE_TYPE_MULTI: number;
+    static CHOOSE_TYPE_ALL: number;
+    static CHOOSE_TYPE_NONE: number;
+    static CHOOSE_TYPE_DEFAULT: number; 
+    static EVENT_CHANGE: string;
+
+    prependItems<T>(items: T[]): void;
+
+    addItems<T>(items: T[]): void;
+
+    removeItemAt(indexes: any): void;
+
+    removeItems(values: any): void;
+
+    populate(items?: any, ...args: any[]): void;
+
+    setNotSelectedValue(v: any): void;
+
+    getNotSelectedValue<T>(): T[];
+
+    setEnabledValue(v: any): void;
+
+    getAllButtons<T>(): T[];
+
+    getAllLeaves<T>(): T[];
+
+    getSelectedButtons<T>(): T[];
+
+    getNotSelectedButtons<T>(): T[];
+
+    getIndexByValue(value: any): number;
+
+    getNodeById(id: any): any;
+
+    getNodeByValue(value: any): any;
+
+    getValue<T>(): T[];
+}

typescript/base/combination/tree.button.ts

@@ -0,0 +1,6 @@
+import { ButtonGroup } from './group.button';
+
+export declare class ButtonTree extends ButtonGroup {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+}

typescript/base/pane.ts

@@ -1,4 +1,4 @@
-import { _Widget } from "../core/widget";
+import { _Widget, Widget } from "../core/widget";
 
 export interface _Pane extends _Widget {
     _assertTip(..._args: any[]): void;
@@ -11,3 +11,14 @@ export interface _Pane extends _Widget {
 export interface _PaneStatic {
     EVENT_LOADED: string;
 }
+
+export declare class Pane extends Widget {
+    static EVENT_LOADED: string;
+
+    _assertTip(..._args: any[]): void;
+    loading(): void;
+    loaded(): void;
+    check(): void;
+    setTipVisible(b: boolean): void;
+    populate(items?: any[]): void;
+}

typescript/base/single/button/button.node.ts

@@ -1,4 +1,4 @@
-import { _BasicButton } from "./button.basic";
+import { _BasicButton, BasicButton } from "./button.basic";
 
 export interface _NodeButton extends _BasicButton {
     isOpened(): void;
@@ -9,3 +9,13 @@ export interface _NodeButton extends _BasicButton {
 
     triggerExpand(): void;
 }
+
+export declare class NodeButton extends BasicButton {
+    isOpened(): boolean;
+
+    setOpened(b: boolean): void;
+
+    triggerCollapse(): void;
+
+    triggerExpand(): void;
+}

typescript/base/single/button/buttons/button.ts

@@ -1,3 +1,4 @@
+import { IconLabel, Label } from "../../../..";
 import { BasicButton, _BasicButton } from "../button.basic";
 
 export interface _Button extends _BasicButton {
@@ -18,6 +19,9 @@ export declare class Button extends BasicButton {
     static xtype: string;
     
     static EVENT_CHANGE: string;
+
+    text: Label;
+    icon?: IconLabel;
     
     doRedMark(...args: any[]): void;
 
@@ -26,4 +30,4 @@ export declare class Button extends BasicButton {
     doHighLight(...args: any[]): void;
 
     unHighLight(...args: any[]): void;
-}
+}

typescript/base/single/text.ts

@@ -1,4 +1,4 @@
-import { _Single } from "./single";
+import { _Single, Single } from "./single";
 
 export interface _Text extends _Single {
     doRedMark(keyword: string): void;
@@ -13,3 +13,17 @@ export interface _Text extends _Single {
 
     setText(v: string): void;
 }
+
+export declare class Text extends Single {
+    static xtype: string;
+
+    doRedMark(keyword: string): void;
+
+    unRedMark(): void;
+
+    doHighLight(): void;
+
+    unHighLight(): void;
+
+    setStyle(css: any): void;
+}

typescript/base/tree/customtree.ts

@@ -0,0 +1,22 @@
+import { Widget } from '../../core/widget';
+
+export declare class CustomTree extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+
+    initTree(nodes: any, ...args: any[]): void;
+
+    stroke(...args: any[]): void;
+
+    populate(nodes: any, ...args: any[]): void;
+
+    getAllButtons<T>(): T[];
+
+    getAllLeaves<T>(): T[];
+
+    getNodeById(id: any): any;
+
+    getNodeByValue(value: any): any;
+
+    getValue<T>(): T[];
+}

typescript/case/button/node/node.icon.arrow.ts

@@ -0,0 +1,9 @@
+import { NodeButton } from '../../../base/single/button/button.node';
+
+export declare class IconArrowNode extends NodeButton {
+    static xtype: string;
+
+    doRedMark(...args: any[]): void;
+
+    unRedMark(...args: any[]): void;
+}

typescript/case/button/treeitem/item.first.treeleaf.ts

@@ -0,0 +1,17 @@
+import { BasicButton } from '../../../base/single/button/button.basic';
+
+export declare class FirstTreeLeafItem extends BasicButton {
+    static xtype: string;
+    
+    doRedMark(...args: any[]): void;
+
+    unRedMark(...args: any[]): void;
+
+    doHighLight(...args: any[]): void;
+
+    unHighLight(...args: any[]): void;
+
+    getId(): string;
+
+    getPId(): string;
+}

typescript/case/button/treeitem/item.last.treeleaf.ts

@@ -0,0 +1,17 @@
+import { BasicButton } from '../../../base/single/button/button.basic';
+
+export declare class LastTreeLeafItem extends BasicButton {
+    static xtype: string;
+    
+    doRedMark(...args: any[]): void;
+
+    unRedMark(...args: any[]): void;
+
+    doHighLight(...args: any[]): void;
+
+    unHighLight(...args: any[]): void;
+
+    getId(): string;
+
+    getPId(): string;
+}

typescript/case/button/treeitem/item.mid.treeleaf.ts

@@ -0,0 +1,17 @@
+import { BasicButton } from '../../../base/single/button/button.basic';
+
+export declare class MidTreeLeafItem extends BasicButton {
+    static xtype: string;
+    
+    doRedMark(...args: any[]): void;
+
+    unRedMark(...args: any[]): void;
+
+    doHighLight(...args: any[]): void;
+
+    unHighLight(...args: any[]): void;
+
+    getId(): string;
+
+    getPId(): string;
+}

typescript/case/colorchooser/colorchooser.simple.ts

@@ -0,0 +1,12 @@
+import { Widget } from '../../core/widget';
+
+export declare class SimpleColorChooser extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    
+    isViewVisible(): boolean;
+
+    hideView(): void;
+
+    showView(): void;
+}

typescript/case/editor/editor.sign.ts

@@ -1,4 +1,4 @@
-import { _Widget } from "../../core/widget";
+import { Widget, _Widget } from "../../core/widget";
 
 export interface _SignEditor extends _Widget {
     setTitle(v: string | Function): void;
@@ -53,3 +53,54 @@ export interface _SignEditorStatic {
     EVENT_SPACE: string;
     EVENT_EMPTY: string;
 }
+
+export declare class SignEditor extends Widget {
+    static xtype: string;
+    static EVENT_FOCUS: string;
+    static EVENT_BLUR: string;
+    static EVENT_CHANGE: string;
+    static EVENT_CLICK: string;
+    static EVENT_KEY_DOWN: string;
+    static EVENT_CLICK_LABEL: string;
+    static EVENT_START: string;
+    static EVENT_PAUSE: string;
+    static EVENT_STOP: string;
+    static EVENT_CONFIRM: string;
+    static EVENT_CHANGE_CONFIRM: string;
+    static EVENT_VALID: string;
+    static EVENT_ERROR: string;
+    static EVENT_ENTER: string;
+    static EVENT_RESTRICT: string;
+    static EVENT_SPACE: string;
+    static EVENT_EMPTY: string;
+
+    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;
+
+    setErrorText(v: string): void;
+
+    getErrorText(): string;
+
+    isEditing(): boolean;
+
+    getLastChangedValue(): string;
+
+    getState(): any;
+
+    setState(...args: any[]): void;
+}

typescript/core/wrapper/layout.ts

@@ -33,6 +33,8 @@ export interface _Layout extends _Widget {
 }
 
 export declare class Layout extends Widget {
+    static xtype: string;
+
     addItem(item: any): any;
 
     prependItem(item: any): any;

typescript/core/wrapper/layout/adapt/absolute.center.ts

@@ -0,0 +1,5 @@
+import { Layout } from "../../layout";
+
+export declare class AbsoluteCenterLayout extends Layout {
+    static xtype: string;
+}

typescript/core/wrapper/layout/adapt/adapt.center.ts

@@ -0,0 +1,5 @@
+import { Layout } from "../../layout";
+
+export declare class CenterAdaptLayout extends Layout {
+    static xtype: string;
+}

typescript/core/wrapper/layout/adapt/adapt.horizontal.ts

@@ -0,0 +1,5 @@
+import { Layout } from "../../layout";
+
+export declare class HorizontalAdaptLayout extends Layout {
+    static xtype: string;
+}

typescript/core/wrapper/layout/adapt/adapt.vertical.ts

@@ -0,0 +1,5 @@
+import { Layout } from "../../layout";
+
+export declare class VerticalAdaptLayout extends Layout {
+    static xtype: string;
+}

typescript/core/wrapper/layout/adapt/inline.vertical.ts

@@ -2,4 +2,4 @@ import { Layout } from "../../layout";
 
 export declare class InlineVerticalAdaptLayout extends Layout {
     static xtype: string;
-}
+}

typescript/core/wrapper/layout/layout.absolute.ts

@@ -1,4 +1,4 @@
-import { _Layout } from "../layout";
+import { Layout, _Layout } from "../layout";
 
 export interface _AbsoluteLayout extends _Layout {
     resize(): void;
@@ -7,3 +7,7 @@ export interface _AbsoluteLayout extends _Layout {
 
     populate<T>(items?: T[]): void;
 }
+
+export declare class AbsoluteLayout extends Layout {
+    static xtype: string;
+}

typescript/core/wrapper/layout/layout.default.ts

@@ -1,7 +1,11 @@
-import { _Layout } from "../layout";
+import { Layout, _Layout } from "../layout";
 
 export interface _DefaultLayout extends _Layout {
     resize(): void;
 
     populate<T>(items?: T[]): void;
 }
+
+export declare class DefaultLayout extends Layout {
+    static xtype: string;
+}

typescript/core/wrapper/layout/layout.flow.ts

@@ -0,0 +1,5 @@
+import { Layout } from "../layout";
+
+export declare class FloatLeftLayout extends Layout {
+    static xtype: string;
+}

typescript/core/wrapper/layout/layout.tape.ts

@@ -1,4 +1,4 @@
-import { _Layout } from "../layout";
+import { _Layout, Layout } from "../layout";
 
 export interface _HTapeLayout extends _Layout {
     resize(): void;
@@ -19,3 +19,11 @@ export interface _VTapeLayout extends _Layout {
 
     populate<T>(items?: T[]): void;
 }
+
+export declare class HTapeLayout extends Layout {
+    static xtype: string;
+}
+
+export declare class VTapeLayout extends Layout {
+    static xtype: string;
+}

typescript/core/wrapper/layout/layout.vertical.ts

@@ -1,7 +1,11 @@
-import { _Layout } from "../layout";
+import { Layout, _Layout } from "../layout";
 
 export interface _VerticalLayout extends _Layout {
     resize(): void;
 
     populate<T>(items?: T[]): void;
 }
+
+export declare class VerticalLayout extends Layout {
+    static xtype: string;
+}

typescript/index.ts

@@ -1,9 +1,9 @@
 import { _Combo, _ComboStatic } from "./base/combination/combo";
-import { _ButtonGroup, _ButtonGroupChooseType, _ButtonGroupStatic } from "./base/combination/group.button";
+import { _ButtonGroup, _ButtonGroupChooseType, _ButtonGroupStatic, ButtonGroup } from "./base/combination/group.button";
 import { _Tab, _TabStatic, Tab } from "./base/combination/tab";
-import { _Pane, _PaneStatic } from "./base/pane";
+import { _Pane, _PaneStatic, Pane } from "./base/pane";
 import { _BasicButton, _BasicButtonStatic, BasicButton } from "./base/single/button/button.basic";
-import { _NodeButton } from "./base/single/button/button.node";
+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, _IconTextItemStatic } from "./base/single/button/listitem/icontextitem";
@@ -14,14 +14,14 @@ import { _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 } from "./base/single/text";
+import { _Text, Text } from "./base/single/text";
 import { _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, _BubbleComboStatic } from "./case/combo/bubblecombo/combo.bubble";
 import { _TextValueCombo, _TextValueComboStatic, TextValueCombo } from "./case/combo/combo.textvalue";
 import { _SearchTextValueCombo, _SearchTextValueComboStatic } from "./case/combo/searchtextvaluecombo/combo.searchtextvalue";
-import { _SignEditor, _SignEditorStatic } from "./case/editor/editor.sign";
+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";
@@ -39,11 +39,11 @@ import { _Plugin } from "./core/plugin";
 import { _OB } from "./core/ob";
 import { _Widget, _WidgetStatic, Widget } from "./core/widget";
 import { _inject } from "./core/inject";
-import { _Layout } from "./core/wrapper/layout";
+import { Layout, _Layout } from "./core/wrapper/layout";
-import { _AbsoluteLayout } from "./core/wrapper/layout/layout.absolute";
+import { AbsoluteLayout, _AbsoluteLayout } from "./core/wrapper/layout/layout.absolute";
-import { _HTapeLayout, _VTapeLayout } from "./core/wrapper/layout/layout.tape";
+import { HTapeLayout, VTapeLayout, _HTapeLayout, _VTapeLayout } from "./core/wrapper/layout/layout.tape";
-import { _VerticalLayout } from "./core/wrapper/layout/layout.vertical";
+import { VerticalLayout, _VerticalLayout } from "./core/wrapper/layout/layout.vertical";
-import { _DefaultLayout } from "./core/wrapper/layout/layout.default";
+import { DefaultLayout, _DefaultLayout } from "./core/wrapper/layout/layout.default";
 import { DownListCombo, _DownListCombo, _DownListComboStatic } from "./widget/downlist/combo.downlist";
 import { Icon } from "./base/single/icon/icon";
 import { _LeftVerticalAdapt } from "./core/wrapper/layout/adapt/adapt.leftvertical";
@@ -58,6 +58,24 @@ import { IconLabel } from "./base/single/label/icon.label";
 import { Popover, BarPopover } from "./base/layer/layer.popover";
 import { IconCombo } from "./case/combo/iconcombo/combo.icon";
 import { DynamicDateCombo } from "./widget/dynamicdate/dynamicdate.combo";
+import { CustomTree } from "./base/tree/customtree";
+import { ButtonTree } from "./base/combination/tree.button";
+import { IconArrowNode } from "./case/button/node/node.icon.arrow";
+import { MidTreeLeafItem } from "./case/button/treeitem/item.mid.treeleaf";
+import { FirstTreeLeafItem } from "./case/button/treeitem/item.first.treeleaf";
+import { LastTreeLeafItem } from "./case/button/treeitem/item.last.treeleaf";
+import { SmallTextEditor } from "./widget/editor/editor.text.small";
+import { MultifileEditor } from "./widget/editor/editor.multifile";
+import { AbsoluteCenterLayout } from "./core/wrapper/layout/adapt/absolute.center";
+import { HorizontalAdaptLayout } from "./core/wrapper/layout/adapt/adapt.horizontal";
+import { FloatLeftLayout } from "./core/wrapper/layout/layout.flow";
+import { CenterAdaptLayout } from "./core/wrapper/layout/adapt/adapt.center";
+import { VerticalAdaptLayout } from "./core/wrapper/layout/adapt/adapt.vertical";
+import { MultiSelectInsertCombo } from "./widget/multiselect/multiselect.insert.combo";
+import { MultiSelectCombo } from "./widget/multiselect/multiselect.combo";
+import { SearchEditor } from "./widget/editor/editor.search";
+import { MultiLayerSingleLevelTree } from "./widget/multilayersingletree/multilayersingletree.leveltree";
+import { SimpleColorChooser } from "./case/colorchooser/colorchooser.simple";
 
 
 type ClassConstructor<T extends {}> = T & {
@@ -122,6 +140,11 @@ export interface BI extends _func, _i18n, _base, _inject {
     InlineVerticalAdaptLayout: typeof InlineVerticalAdaptLayout;
     RightVerticalAdaptLayout: typeof RightVerticalAdaptLayout;
     TableAdaptLayout: typeof TableAdaptLayout;
+    AbsoluteCenterLayout: typeof AbsoluteCenterLayout;
+    HorizontalAdaptLayout: typeof HorizontalAdaptLayout;
+    FloatLeftLayout: typeof FloatLeftLayout;
+    CenterAdaptLayout: typeof CenterAdaptLayout;
+    VerticalAdaptLayout: typeof VerticalAdaptLayout;
     IconButton: typeof IconButton;
     TextEditor: typeof TextEditor;
     IconLabel: typeof IconLabel;
@@ -129,6 +152,19 @@ export interface BI extends _func, _i18n, _base, _inject {
     BarPopover: typeof BarPopover;
     IconCombo: typeof IconCombo;
     DynamicDateCombo: typeof DynamicDateCombo;
+    CustomTree: typeof CustomTree;
+    ButtonTree: typeof ButtonTree;
+    IconArrowNode: typeof IconArrowNode;
+    MidTreeLeafItem: typeof MidTreeLeafItem;
+    FirstTreeLeafItem: typeof FirstTreeLeafItem;
+    LastTreeLeafItem: typeof LastTreeLeafItem;
+    SmallTextEditor: typeof SmallTextEditor;
+    MultifileEditor: typeof MultifileEditor;
+    MultiSelectInsertCombo: typeof MultiSelectInsertCombo;
+    MultiSelectCombo: typeof MultiSelectCombo;
+    SearchEditor: typeof SearchEditor;
+    MultiLayerSingleLevelTree: typeof MultiLayerSingleLevelTree;
+    SimpleColorChooser: typeof SimpleColorChooser;
 }
 
 export default {
@@ -141,10 +177,21 @@ export {
     Icon,
     LeftRightVerticalAdaptLayout,
     IconTextIconItem,
+    Layout,
     HorizontalAutoLayout,
     InlineVerticalAdaptLayout,
     RightVerticalAdaptLayout,
     TableAdaptLayout,
+    AbsoluteCenterLayout,
+    HorizontalAdaptLayout,
+    FloatLeftLayout,
+    VerticalLayout,
+    AbsoluteLayout,
+    DefaultLayout,
+    HTapeLayout,
+    CenterAdaptLayout,
+    VTapeLayout,
+    VerticalAdaptLayout,
     IconButton,
     AbstractLabel,
     Label,
@@ -162,4 +209,22 @@ export {
     IconCombo,
     DynamicDateCombo,
     MultiSelectItem,
+    CustomTree,
+    ButtonGroup,
+    ButtonTree,
+    NodeButton,
+    IconArrowNode,
+    MidTreeLeafItem,
+    FirstTreeLeafItem,
+    LastTreeLeafItem,
+    SmallTextEditor,
+    MultifileEditor,
+    SignEditor,
+    MultiSelectInsertCombo,
+    MultiSelectCombo,
+    SearchEditor,
+    Text,
+    Pane,
+    MultiLayerSingleLevelTree,
+    SimpleColorChooser,
 };

typescript/widget/editor/editor.multifile.ts

@@ -0,0 +1,24 @@
+import { Widget } from "../../core/widget";
+
+export declare class MultifileEditor extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    static EVENT_UPLOADSTART: string;
+    static EVENT_ERROR: string;
+    static EVENT_PROGRESS: string;
+    static EVENT_UPLOADED: string;
+
+    _reset(): void;
+
+    select(): void;
+
+    getValue(): {
+        attach_id: string;
+        attach_type: string;
+        filename: string;
+    }[];
+
+    upload(): void;
+    
+    reset(): void;
+}

typescript/widget/editor/editor.search.ts

@@ -0,0 +1,41 @@
+import { Widget } from '../../core/widget';
+
+export declare class SearchEditor extends Widget {
+    static xtype: string;
+
+    static EVENT_CHANGE: string;
+    static EVENT_FOCUS: string;
+    static EVENT_BLUR: string;
+    static EVENT_CLICK: string;
+    static EVENT_KEY_DOWN: string;
+    static EVENT_SPACE: string;
+    static EVENT_BACKSPACE: string;
+    static EVENT_CLEAR: string;
+    static EVENT_START: string;
+    static EVENT_PAUSE: string;
+    static EVENT_STOP: string;
+    static EVENT_CONFIRM: string;
+    static EVENT_CHANGE_CONFIRM: string;
+    static EVENT_VALID: string;
+    static EVENT_ERROR: string;
+    static EVENT_ENTER: string;
+    static EVENT_RESTRICT: string;
+    static EVENT_REMOVE: string;
+    static EVENT_EMPTY: string;
+    
+    setWaterMark(v: string): void;
+    
+    focus(): void;
+
+    blur(): void;
+
+    getKeywords(): string[];
+
+    getLastValidValue(): string;
+
+    getLastChangedValue(): string;
+
+    isEditing(): boolean;
+
+    isValid(): boolean;
+}

typescript/widget/editor/editor.text.small.ts

@@ -0,0 +1,5 @@
+import { TextEditor } from "./editor.text";
+
+export declare class SmallTextEditor extends TextEditor {
+    static xtype: string;
+}