Merge branch 'master' of ssh://code.fineres.com:7999/~alan/fineui

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/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/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/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 { _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";
@@ -58,6 +58,12 @@ 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";
 declare type ClassConstructor<T extends {}> = T & {
     new (config: any): T;
     (config: any): T;
@@ -126,9 +132,15 @@ 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;
 }
 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, HorizontalAutoLayout, InlineVerticalAdaptLayout, RightVerticalAdaptLayout, TableAdaptLayout, 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, };

package.json

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

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 "typescript";
+
+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 "typescript";
+
+export declare class VerticalAdaptLayout 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,3 +1,4 @@
+import { Layout } from "typescript";
 import { _Layout } from "../layout";
 
 export interface _HTapeLayout extends _Layout {
@@ -19,3 +20,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

@@ -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 { _AbsoluteLayout } from "./core/wrapper/layout/layout.absolute";
-import { _HTapeLayout, _VTapeLayout } from "./core/wrapper/layout/layout.tape";
-import { _VerticalLayout } from "./core/wrapper/layout/layout.vertical";
-import { _DefaultLayout } from "./core/wrapper/layout/layout.default";
+import { Layout, _Layout } from "./core/wrapper/layout";
+import { AbsoluteLayout, _AbsoluteLayout } from "./core/wrapper/layout/layout.absolute";
+import { HTapeLayout, VTapeLayout, _HTapeLayout, _VTapeLayout } from "./core/wrapper/layout/layout.tape";
+import { VerticalLayout, _VerticalLayout } from "./core/wrapper/layout/layout.vertical";
+import { DefaultLayout, _DefaultLayout } from "./core/wrapper/layout/layout.default";
 import { DownListCombo, _DownListCombo, _DownListComboStatic } from "./widget/downlist/combo.downlist";
 import { Icon } from "./base/single/icon/icon";
 import { _LeftVerticalAdapt } from "./core/wrapper/layout/adapt/adapt.leftvertical";
@@ -66,6 +66,11 @@ 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";
 
 
 type ClassConstructor<T extends {}> = T & {
@@ -130,6 +135,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;
@@ -157,10 +167,21 @@ export {
     Icon,
     LeftRightVerticalAdaptLayout,
     IconTextIconItem,
+    Layout,
     HorizontalAutoLayout,
     InlineVerticalAdaptLayout,
     RightVerticalAdaptLayout,
     TableAdaptLayout,
+    AbsoluteCenterLayout,
+    HorizontalAdaptLayout,
+    FloatLeftLayout,
+    VerticalLayout,
+    AbsoluteLayout,
+    DefaultLayout,
+    HTapeLayout,
+    CenterAdaptLayout,
+    VTapeLayout,
+    VerticalAdaptLayout,
     IconButton,
     AbstractLabel,
     Label,