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

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

@@ -1,7 +1,14 @@
-import { _Single } from "../single";
+import { Single, _Single } from "../single";
 export interface _Iframe extends _Single {
     setSrc(v: string): void;
     getSrc(): string;
-    setNam(v: string): void;
+    setName(v: string): void;
+    getName(): string;
+}
+export declare class iframe extends Single {
+    static xtype: string;
+    setSrc(v: string): void;
+    getSrc(): string;
+    setName(v: string): void;
     getName(): string;
 }

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

@@ -0,0 +1,20 @@
+import { Widget } from "../../widget";
+import { Layout } from "../layout";
+export declare class CardLayout extends Layout {
+    static xtype: string;
+    empty(): void;
+    isCardExisted(cardName: string): boolean;
+    getCardByName<T>(name: string): T;
+    deleteCardByName(cardName: string): void;
+    addCardByName(cardName: string, cardItem: any): Widget;
+    showCardByName(cardName: string, action: any, callback: () => void): void;
+    showLastCard(): void;
+    setDefaultShowName(name: string): void;
+    getDefaultShowName(): string;
+    getAllCardNames(): string[];
+    getShowingCard<T>(): T;
+    deleteAllCard(): void;
+    hideAllCard(): void;
+    isAllCardHide(): boolean;
+    removeWidget(nameOrWidget: string | Widget): void;
+}

dist/lib/index.d.ts

@@ -8,7 +8,7 @@ import { _Button, _ButtonStatic, Button } from "./base/single/button/buttons/but
 import { TextButton, _TextButton, _TextButtonStatic } from "./base/single/button/buttons/button.text";
 import { _IconTextItem, _IconTextItemStatic } from "./base/single/button/listitem/icontextitem";
 import { _Editor, _EditorStatic, Editor } from "./base/single/editor/editor";
-import { _Iframe } from "./base/single/iframe/iframe";
+import { iframe, _Iframe } from "./base/single/iframe/iframe";
 import { _Checkbox, _CheckboxStatic } from "./base/single/input/checkbox";
 import { _Input, _InputStatic } from "./base/single/input/input";
 import { _AbstractLabel, AbstractLabel } from "./base/single/label/abstract.label";
@@ -105,9 +105,16 @@ 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";
+import { CardLayout } from "./core/wrapper/layout/layout.card";
+import { DynamicYearMonthCombo } from "./widget/yearmonth/combo.yearmonth";
+import { TimeCombo } from "./widget/time/time.combo";
 import { ListTreeView } from "./base/tree/ztree/list/listtreeview";
 import { ListAsyncTree } from "./base/tree/ztree/list/listasynctree";
 import { AsyncTree } from "./base/tree/ztree/asynctree";
+import { MultiLayerSingleTreeCombo } from "./widget/multilayersingletree/multilayersingletree.combo";
+import { MultiLayerSelectTreeCombo } from "./widget/multilayerselecttree/multilayerselecttree.combo";
+import { MultiTreeListCombo } from "./widget/multitree/multi.tree.list.combo";
+import { MultiTreeInsertCombo } from "./widget/multitree/multi.tree.insert.combo";
 declare type ClassConstructor<T extends {}> = T & {
     new (config: any): T;
     (config: any): T;
@@ -162,6 +169,10 @@ export interface BI extends _func, _i18n, _base, _inject {
     ListTreeView: typeof ListTreeView;
     ListAsyncTree: typeof ListAsyncTree;
     AsyncTree: typeof AsyncTree;
+    MultiLayerSingleTreeCombo: typeof MultiLayerSingleTreeCombo;
+    MultiLayerSelectTreeCombo: typeof MultiLayerSelectTreeCombo;
+    MultiTreeListCombo: typeof MultiTreeListCombo;
+    MultiTreeInsertCombo: typeof MultiTreeInsertCombo;
     Decorators: typeof decorator;
     DownListCombo: ClassConstructor<_DownListCombo> & _DownListComboStatic;
     Iframe: ClassConstructor<_Iframe>;
@@ -226,9 +237,12 @@ export interface BI extends _func, _i18n, _base, _inject {
     SingleSelectRadioItem: typeof SingleSelectRadioItem;
     SingleSelectInsertCombo: typeof SingleSelectInsertCombo;
     SingleSelectCombo: typeof SingleSelectCombo;
+    CardLayout: typeof CardLayout;
+    DynamicYearMonthCombo: typeof DynamicYearMonthCombo;
+    TimeCombo: typeof TimeCombo;
 }
 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, 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, MultiLayerSelectTreePopup, MultiLayerSingleTreePopup, TreeView, ListTreeView, ListAsyncTree, AsyncTree, 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, };
+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, MultiLayerSelectTreePopup, MultiLayerSingleTreePopup, TreeView, ListTreeView, ListAsyncTree, AsyncTree, MultiLayerSingleTreeCombo, MultiLayerSelectTreeCombo, MultiTreeListCombo, MultiTreeInsertCombo, 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, CardLayout, DynamicYearMonthCombo, TimeCombo, iframe, };

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

@@ -0,0 +1,12 @@
+import { Widget } from "../../core/widget";
+export declare class MultiLayerSelectTreeCombo extends Widget {
+    static xtype: string;
+    static EVENT_SEARCHING: string;
+    static EVENT_BLUR: string;
+    static EVENT_FOCUS: string;
+    static EVENT_CHANGE: string;
+    static EVENT_BEFORE_POPUPVIEW: string;
+    setValue(v: string[] | string): void;
+    getValue(): string[];
+    populate<T>(items: T[]): void;
+}

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

@@ -0,0 +1,12 @@
+import { Widget } from "../../core/widget";
+export declare class MultiLayerSingleTreeCombo extends Widget {
+    static xtype: string;
+    static EVENT_SEARCHING: string;
+    static EVENT_BLUR: string;
+    static EVENT_FOCUS: string;
+    static EVENT_CHANGE: string;
+    static EVENT_BEFORE_POPUPVIEW: string;
+    setValue(v: string[] | string): void;
+    getValue(): string[];
+    populate<T>(items: T[]): void;
+}

dist/lib/widget/multitree/multi.tree.insert.combo.d.ts

@@ -0,0 +1,17 @@
+import { Single } from "../../base/single/single";
+import { TreeValue } from "../../base/tree/ztree/treeview";
+export declare class MultiTreeInsertCombo extends Single {
+    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: TreeValue): void;
+    getValue(): TreeValue;
+    populate(): void;
+}

dist/lib/widget/multitree/multi.tree.list.combo.d.ts

@@ -0,0 +1,16 @@
+import { Single } from "../../base/single/single";
+export declare class MultiTreeListCombo extends Single {
+    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: string[]): void;
+    getValue(): string[];
+    populate(): void;
+}

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

@@ -0,0 +1,11 @@
+import { Single } from "../../base/single/single";
+export declare class TimeCombo extends Single {
+    static xtype: string;
+    static EVENT_KEY_DOWN: string;
+    static EVENT_CONFIRM: string;
+    static EVENT_CHANGE: string;
+    static EVENT_VALID: string;
+    static EVENT_ERROR: string;
+    static EVENT_BEFORE_POPUPVIEW: string;
+    hidePopupView(): void;
+}

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

@@ -0,0 +1,11 @@
+import { Single } from "../../base/single/single";
+export declare class DynamicYearMonthCombo extends Single {
+    static xtype: string;
+    static EVENT_ERROR: string;
+    static EVENT_VALID: string;
+    static EVENT_FOCUS: string;
+    static EVENT_CONFIRM: string;
+    static EVENT_BEFORE_POPUPVIEW: string;
+    hideView(): void;
+    getKey(): string;
+}

dist/utils.js

@@ -1,4 +1,4 @@
-/*! time: 2020-12-17 14:10:24 */
+/*! time: 2020-12-17 18:10:25 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -82,12 +82,12 @@
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1179);
+/******/ 	return __webpack_require__(__webpack_require__.s = 1187);
 /******/ })
 /************************************************************************/
 /******/ ({
 
-/***/ 1040:
+/***/ 1048:
 /***/ (function(module, exports) {
 
 BI.i18n = {
@@ -315,7 +315,14 @@ if(_global.BI.prepares == null) {
 
 /***/ }),
 
-/***/ 1179:
+/***/ 118:
+/***/ (function(module, exports, __webpack_require__) {
+
+__webpack_require__(119)(__webpack_require__(120))
+
+/***/ }),
+
+/***/ 1187:
 /***/ (function(module, exports, __webpack_require__) {
 
 __webpack_require__(117);
@@ -345,8 +352,8 @@ __webpack_require__(134);
 __webpack_require__(135);
 __webpack_require__(136);
 __webpack_require__(137);
-__webpack_require__(1040);
-__webpack_require__(1180);
+__webpack_require__(1048);
+__webpack_require__(1188);
 __webpack_require__(147);
 __webpack_require__(148);
 module.exports = __webpack_require__(149);
@@ -354,14 +361,7 @@ module.exports = __webpack_require__(149);
 
 /***/ }),
 
-/***/ 118:
-/***/ (function(module, exports, __webpack_require__) {
-
-__webpack_require__(119)(__webpack_require__(120))
-
-/***/ }),
-
-/***/ 1180:
+/***/ 1188:
 /***/ (function(module, exports) {
 
 /**

package.json

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

typescript/index.ts

@@ -111,6 +111,10 @@ import { TimeCombo } from "./widget/time/time.combo";
 import { ListTreeView } from "./base/tree/ztree/list/listtreeview";
 import { ListAsyncTree } from "./base/tree/ztree/list/listasynctree";
 import { AsyncTree } from "./base/tree/ztree/asynctree";
+import { MultiLayerSingleTreeCombo } from "./widget/multilayersingletree/multilayersingletree.combo";
+import { MultiLayerSelectTreeCombo } from "./widget/multilayerselecttree/multilayerselecttree.combo";
+import { MultiTreeListCombo } from "./widget/multitree/multi.tree.list.combo";
+import { MultiTreeInsertCombo } from "./widget/multitree/multi.tree.insert.combo";
 
 
 type ClassConstructor<T extends {}> = T & {
@@ -168,6 +172,10 @@ export interface BI extends _func, _i18n, _base, _inject {
     ListTreeView: typeof ListTreeView;
     ListAsyncTree: typeof ListAsyncTree;
     AsyncTree: typeof AsyncTree;
+    MultiLayerSingleTreeCombo: typeof MultiLayerSingleTreeCombo;
+    MultiLayerSelectTreeCombo: typeof MultiLayerSelectTreeCombo;
+    MultiTreeListCombo: typeof MultiTreeListCombo;
+    MultiTreeInsertCombo: typeof MultiTreeInsertCombo;
     Decorators: typeof decorator;
     DownListCombo: ClassConstructor<_DownListCombo> & _DownListComboStatic;
     Iframe: ClassConstructor<_Iframe>;
@@ -297,6 +305,10 @@ export {
     ListTreeView,
     ListAsyncTree,
     AsyncTree,
+    MultiLayerSingleTreeCombo,
+    MultiLayerSelectTreeCombo,
+    MultiTreeListCombo,
+    MultiTreeInsertCombo,
     Combo,
     IconCombo,
     DynamicDateCombo,

typescript/widget/multilayerselecttree/multilayerselecttree.combo.ts

@@ -0,0 +1,16 @@
+import { Widget } from "../../core/widget";
+
+export declare class MultiLayerSelectTreeCombo extends Widget {
+    static xtype: string;
+    static EVENT_SEARCHING: string;
+    static EVENT_BLUR: string;
+    static EVENT_FOCUS: string;
+    static EVENT_CHANGE: string;
+    static EVENT_BEFORE_POPUPVIEW: string;
+
+    setValue(v: string[] | string): void;
+
+    getValue(): string[];
+
+    populate<T>(items: T[]): void;
+}

typescript/widget/multilayersingletree/multilayersingletree.combo.ts

@@ -0,0 +1,16 @@
+import { Widget } from "../../core/widget";
+
+export declare class MultiLayerSingleTreeCombo extends Widget {
+    static xtype: string;
+    static EVENT_SEARCHING: string;
+    static EVENT_BLUR: string;
+    static EVENT_FOCUS: string;
+    static EVENT_CHANGE: string;
+    static EVENT_BEFORE_POPUPVIEW: string;
+
+    setValue(v: string[] | string): void;
+
+    getValue(): string[];
+
+    populate<T>(items: T[]): void
+}

typescript/widget/multitree/multi.tree.insert.combo.ts

@@ -0,0 +1,23 @@
+import { Single } from "../../base/single/single";
+import { TreeValue } from "../../base/tree/ztree/treeview";
+
+export declare class MultiTreeInsertCombo extends Single {
+    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: TreeValue): void;
+
+    getValue(): TreeValue;
+
+    populate(): void;
+}

typescript/widget/multitree/multi.tree.list.combo.ts

@@ -0,0 +1,22 @@
+import { Single } from "../../base/single/single";
+
+export declare class MultiTreeListCombo extends Single {
+    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: string[]): void;
+
+    getValue(): string[];
+
+    populate(): void;
+}