Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~frank.qiu/fineui

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/index.d.ts

@@ -21,7 +21,7 @@ import { _MultiSelectItem, _MultiSelectItemStatic, MultiSelectItem } from "./cas
 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";
@@ -64,11 +64,15 @@ 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";
@@ -151,6 +155,10 @@ export interface BI extends _func, _i18n, _base, _inject {
     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;
@@ -159,4 +167,4 @@ 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, TextValueCombo, Editor, IconLabel, Popover, BarPopover, Tab, IconCombo, DynamicDateCombo, MultiSelectItem, CustomTree, ButtonGroup, ButtonTree, NodeButton, IconArrowNode, MidTreeLeafItem, FirstTreeLeafItem, LastTreeLeafItem, SearchEditor, Text, Pane, MultiLayerSingleLevelTree, SimpleColorChooser, };
+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.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

@@ -1,6 +1,7 @@
 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[];

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

package.json

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

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/adapt/inline.vertical.ts

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

typescript/index.ts

@@ -21,7 +21,7 @@ import { _MultiSelectItem, _MultiSelectItemStatic, MultiSelectItem } from "./cas
 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";
@@ -64,14 +64,18 @@ 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"
+import { SimpleColorChooser } from "./case/colorchooser/colorchooser.simple";
 
 
 type ClassConstructor<T extends {}> = T & {
@@ -154,6 +158,10 @@ export interface BI extends _func, _i18n, _base, _inject {
     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;
@@ -209,6 +217,11 @@ export {
     MidTreeLeafItem,
     FirstTreeLeafItem,
     LastTreeLeafItem,
+    SmallTextEditor,
+    MultifileEditor,
+    SignEditor,
+    MultiSelectInsertCombo,
+    MultiSelectCombo,
     SearchEditor,
     Text,
     Pane,

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.text.small.ts

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

typescript/widget/multilayersingletree/multilayersingletree.leveltree.ts

@@ -2,6 +2,7 @@ import { Pane } from '../../base/pane'
 
 export declare class MultiLayerSingleLevelTree extends Pane {
     static xtype: string;
+    static EVENT_CHANGE: string;
 
     initTree(nodes: any, ...args: any[]): void;
 

typescript/widget/multiselect/multiselect.combo.ts

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

typescript/widget/multiselect/multiselect.insert.combo.ts

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