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

changelog.md

@@ -1,4 +1,7 @@
 # 更新日志
+2.0(2021-05)
+- 解决了树列表populate调用两次itemsCreator的问题
+
 2.0(2021-03)
 - 优化left_right_vertical_adapt布局，去掉float属性只使用flex
 - inline布局支持用calc计算fill列宽度

dist/lib/base/base.d.ts

@@ -0,0 +1,4 @@
+import { LayerController } from "../core/controller/controller.layer";
+import { BroadcastController } from "../core/controller/controller.broadcast";
+export declare type Layers = LayerController;
+export declare type Broadcasts = BroadcastController;

dist/lib/core/controller/controller.broadcast.d.ts

@@ -0,0 +1,6 @@
+import { Controller } from './controller';
+export declare class BroadcastController extends Controller {
+    on(name: string, fn: Function): Function;
+    send(name: string, ...args: any[]): void;
+    remove(name: string, fn?: Function): this;
+}

dist/lib/core/controller/controller.layer.d.ts

@@ -1,9 +1,10 @@
 import { Controller } from './controller';
 export declare class LayerController extends Controller {
-    make<T>(name: string, container: any, op: any, context: any): T;
-    create<T>(name: string, from: any, op: any, context: any): T;
-    hide(name: string, callback: boolean): LayerController;
-    show(name: string, callback: boolean): LayerController;
+    make<T>(name: string, op: any, context?: any): T;
+    make<T>(name: string, container: any, op?: any, context?: any): T;
+    create<T>(name: string, from?: any, op?: any, context?: any): T;
+    hide(name: string, callback?: boolean): LayerController;
+    show(name: string, callback?: boolean): LayerController;
     isVisible(name: string): boolean;
     add(name: string, layer: any, layout: any): LayerController;
     get<T>(name: string): T;

dist/lib/core/widget.d.ts

@@ -306,6 +306,10 @@ export interface _Widget extends _OB {
      * 请除元素
      */
     empty(): void;
+    /**
+     * 刷新控件
+     */
+    reset(): void;
     /**
      * 内部destory方法
      */
@@ -635,6 +639,10 @@ export declare class Widget extends OB {
      * 请除元素
      */
     empty(): void;
+    /**
+     * 刷新控件
+     */
+    reset(): void;
     /**
      * 内部destory方法
      */

dist/lib/index.d.ts

@@ -161,6 +161,8 @@ import { FloatHorizontalLayout } from "./core/wrapper/layout/adapt/float.horizon
 import { AdaptiveLayout } from "./core/wrapper/layout/layout.adaptive";
 import { HexColorChooserPopup } from './case/colorchooser/colorchooser.popup.hex';
 import { BlankIconTextItem } from './base/single/button/listitem/blankicontextitem';
+import { Broadcasts, Layers } from "./base/base";
+import { BroadcastController } from "./core/controller/controller.broadcast";
 export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     OB: typeof OB;
     Plugin: _Plugin;
@@ -177,7 +179,10 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     ActionFactory: typeof ActionFactory;
     ShowAction: typeof ShowAction;
     Controller: typeof Controller;
+    Layers: Layers;
     LayerController: typeof LayerController;
+    Broadcasts: Broadcasts;
+    BroadcastController: typeof BroadcastController;
     Behavior: typeof Behavior;
     BehaviorFactory: typeof BehaviorFactory;
     HighlightBehavior: typeof HighlightBehavior;
@@ -331,4 +336,4 @@ declare const _default: {
     Decorators: typeof decorator;
 };
 export default _default;
-export { OB, Widget, Single, BasicButton, Checkbox, Icon, LeftVerticalAdaptLayout, LeftRightVerticalAdaptLayout, SearchTextValueCombo, Input, IconTextItem, AllValueMultiTextValueCombo, IconTextIconItem, Layout, HorizontalAutoLayout, InlineVerticalAdaptLayout, RightVerticalAdaptLayout, TableAdaptLayout, AbsoluteCenterLayout, HorizontalAdaptLayout, FloatLeftLayout, FloatRightLayout, VerticalLayout, AbsoluteLayout, DefaultLayout, HTapeLayout, CenterAdaptLayout, VTapeLayout, VerticalAdaptLayout, IconButton, Trigger, TriggerIconButton, Action, ActionFactory, ShowAction, Controller, LayerController, Behavior, BehaviorFactory, RedMarkBehavior, HighlightBehavior, LoadingPane, Searcher, AbstractLabel, Label, TextButton, DownListCombo, IconChangeButton, Button, TextEditor, A, Html, Switcher, BubbleCombo, Loader, ListPane, MultiPopupView, MultiSelectBar, SelectList, TextValueCombo, SmallTextValueCombo, 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, TextValueDownListCombo, Switch, HorizontalLayout, ShelterEditor, TextTrigger, SelectTextTrigger, DateInterval, DynamicDatePane, AllCountPager, PopupView, BubblePopupView, BubblePopupBarView, TextBubblePopupBarView, ArrowTreeGroupNodeCheckbox, NumberInterval, DynamicYearQuarterCombo, DynamicYearCombo, IntervalSlider, MultiSelectInsertList, YearMonthInterval, TextValueCheckCombo, NumberEditor, LinearSegment, Img, EditorIconCheckCombo, IconTextValueCombo, ListView, FloatCenterLayout, DynamicYearMonthPopup, DateCalendarPopup, Tree, Node, TextNode, TextValueCheckComboPopup, ImageButton, Router, History, DateTimeCombo, FloatHorizontalLayout, AdaptiveLayout, HexColorChooserPopup, BlankIconTextItem, };
+export { OB, Widget, Single, BasicButton, Checkbox, Icon, LeftVerticalAdaptLayout, LeftRightVerticalAdaptLayout, SearchTextValueCombo, Input, IconTextItem, AllValueMultiTextValueCombo, IconTextIconItem, Layout, HorizontalAutoLayout, InlineVerticalAdaptLayout, RightVerticalAdaptLayout, TableAdaptLayout, AbsoluteCenterLayout, HorizontalAdaptLayout, FloatLeftLayout, FloatRightLayout, VerticalLayout, AbsoluteLayout, DefaultLayout, HTapeLayout, CenterAdaptLayout, VTapeLayout, VerticalAdaptLayout, IconButton, Trigger, TriggerIconButton, Action, ActionFactory, ShowAction, Controller, LayerController, BroadcastController, Behavior, BehaviorFactory, RedMarkBehavior, HighlightBehavior, LoadingPane, Searcher, AbstractLabel, Label, TextButton, DownListCombo, IconChangeButton, Button, TextEditor, A, Html, Switcher, BubbleCombo, Loader, ListPane, MultiPopupView, MultiSelectBar, SelectList, TextValueCombo, SmallTextValueCombo, 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, TextValueDownListCombo, Switch, HorizontalLayout, ShelterEditor, TextTrigger, SelectTextTrigger, DateInterval, DynamicDatePane, AllCountPager, PopupView, BubblePopupView, BubblePopupBarView, TextBubblePopupBarView, ArrowTreeGroupNodeCheckbox, NumberInterval, DynamicYearQuarterCombo, DynamicYearCombo, IntervalSlider, MultiSelectInsertList, YearMonthInterval, TextValueCheckCombo, NumberEditor, LinearSegment, Img, EditorIconCheckCombo, IconTextValueCombo, ListView, FloatCenterLayout, DynamicYearMonthPopup, DateCalendarPopup, Tree, Node, TextNode, TextValueCheckComboPopup, ImageButton, Router, History, DateTimeCombo, FloatHorizontalLayout, AdaptiveLayout, HexColorChooserPopup, BlankIconTextItem, };

dist/lib/router/router.d.ts

@@ -20,6 +20,10 @@ export declare class History {
     }): void;
     stop(): void;
     route(route: string, callback: Function): void;
+    checkRoute(route: string): {
+        route: string;
+        callback: Function;
+    };
     unRoute(route: string): void;
     checkUrl(e?: Event): void;
     loadUrl(fragment: string): boolean;

dist/lib/widget/datepane/datepane.d.ts

@@ -2,6 +2,9 @@ import { Widget } from "../../core/widget";
 export declare class DynamicDatePane extends Widget {
     static xtype: string;
     static EVENT_CHANGE: string;
+    static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW: string;
     static Static: 1;
     static Dynamic: 2;
+    setMinDate(minDate: string): void;
+    setMaxDate(minDate: string): void;
 }

dist/lib/widget/datetimepane/datetimepane.d.ts

@@ -0,0 +1,8 @@
+import { Widget } from "../../core/widget";
+export declare class DynamicDateTimePane extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW: string;
+    setMinDate(minDate: string): void;
+    setMaxDate(minDate: string): void;
+}

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

@@ -11,6 +11,7 @@ export declare class DynamicDateCombo extends Single {
     static EVENT_VALID: string;
     static EVENT_ERROR: string;
     static EVENT_BEFORE_POPUPVIEW: string;
+    static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW: string;
     setMinDate(minDate: string): void;
     setMaxDate(maxDate: string): void;
     getKey(): string;

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

@@ -9,6 +9,7 @@ export declare class DynamicDateTimeCombo extends Single {
     static EVENT_VALID: string;
     static EVENT_ERROR: string;
     static EVENT_BEFORE_POPUPVIEW: string;
+    static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW: string;
     static Static: 1;
     static Dynamic: 2;
     setMinDate(minDate: string): void;

dist/lib/widget/intervalslider/intervalslider.d.ts

@@ -9,8 +9,8 @@ export declare class IntervalSlider extends Single {
         max: number;
     };
     setMinAndMax(v: {
-        min: number;
-        max: number;
+        min: number | string;
+        max: number | string;
     }): void;
     reset(): void;
 }

dist/lib/widget/multiselecttree/multiselecttree.d.ts

@@ -0,0 +1,7 @@
+import { Single } from '../../base/single/single';
+export declare class MultiSelectTree extends Single {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    stopSearch(): void;
+    setSelectedValue(v: string[]): void;
+}

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

@@ -0,0 +1,5 @@
+import { Single } from "../../base/single/single";
+export declare class SingleSelectInsertList extends Single {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+}

dist/lib/widget/timeinterval/dateinterval.d.ts

@@ -5,8 +5,11 @@ export declare class DateInterval extends Single {
     static EVENT_CHANGE: string;
     static EVENT_VALID: string;
     static EVENT_ERROR: string;
+    static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW: string;
     getValue(): {
         start: DynamicDataComboValue;
         end: DynamicDataComboValue;
     };
+    setMinDate(minDate: string): void;
+    setMaxDate(minDate: string): void;
 }

dist/lib/widget/timeinterval/timeinterval.d.ts

@@ -0,0 +1,14 @@
+import { Single } from "../../base/single/single";
+import { DynamicDataComboValue } from "../dynamicdate/dynamicdate.combo";
+export declare class TimeInterval extends Single {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    static EVENT_VALID: string;
+    static EVENT_ERROR: string;
+    getValue(): {
+        start: DynamicDataComboValue;
+        end: DynamicDataComboValue;
+    };
+    setMinDate(minDate: string): void;
+    setMaxDate(minDate: string): void;
+}

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

@@ -3,4 +3,6 @@ export declare class DynamicYearCombo extends Widget {
     static xtype: string;
     static EVENT_CONFIRM: string;
     static EVENT_BEFORE_POPUPVIEW: string;
+    setMinDate(minDate: string): void;
+    setMaxDate(maxDate: string): void;
 }

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

@@ -8,4 +8,6 @@ export declare class DynamicYearMonthCombo extends Single {
     static EVENT_BEFORE_POPUPVIEW: string;
     hideView(): void;
     getKey(): string;
+    setMinDate(minDate: string): void;
+    setMaxDate(maxDate: string): void;
 }

dist/lib/widget/yearmonthinterval/yearmonthinterval.d.ts

@@ -9,4 +9,6 @@ export declare class YearMonthInterval extends Single {
         start: number;
         end: number;
     };
+    setMinDate(minDate: string): void;
+    setMaxDate(maxDate: string): void;
 }

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

@@ -3,4 +3,6 @@ export declare class DynamicYearQuarterCombo extends Widget {
     static xtype: string;
     static EVENT_CONFIRM: string;
     static EVENT_BEFORE_POPUPVIEW: string;
+    setMinDate(minDate: string): void;
+    setMaxDate(maxDate: string): void;
 }

dist/utils.js

@@ -1,4 +1,4 @@
-/*! time: 2021-5-6 9:40:23 AM */
+/*! time: 2021-5-13 11:30:29 AM */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -82,7 +82,7 @@
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1252);
+/******/ 	return __webpack_require__(__webpack_require__.s = 1254);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2916,7 +2916,7 @@ _.extend(BI, {
 
 /***/ }),
 
-/***/ 1110:
+/***/ 1112:
 /***/ (function(module, exports) {
 
 BI.i18n = {
@@ -3130,7 +3130,7 @@ BI.Req = {
 
 /***/ }),
 
-/***/ 1252:
+/***/ 1254:
 /***/ (function(module, exports, __webpack_require__) {
 
 __webpack_require__(91);
@@ -3149,8 +3149,8 @@ __webpack_require__(97);
 __webpack_require__(98);
 __webpack_require__(108);
 __webpack_require__(109);
-__webpack_require__(1110);
-__webpack_require__(1253);
+__webpack_require__(1112);
+__webpack_require__(1255);
 __webpack_require__(110);
 __webpack_require__(111);
 module.exports = __webpack_require__(112);
@@ -3158,7 +3158,7 @@ module.exports = __webpack_require__(112);
 
 /***/ }),
 
-/***/ 1253:
+/***/ 1255:
 /***/ (function(module, exports) {
 
 /**
@@ -3261,7 +3261,7 @@ module.exports = g;
 
 /***/ }),
 
-/***/ 59:
+/***/ 60:
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
@@ -4931,7 +4931,7 @@ if (!_global.BI) {
     });
 })();
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(14), __webpack_require__(59).setImmediate))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(14), __webpack_require__(60).setImmediate))
 
 /***/ }),
 

package.json

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

src/base/combination/combo.js

@@ -12,7 +12,7 @@
                 attributes: {
                     tabIndex: -1
                 },
-                trigger: "click",
+                trigger: "click", // click || hover || click-hover || ""
                 toggle: true,
                 direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right||right,innerRight||right,innerLeft||innerRight||innerLeft
                 logic: {
@@ -182,62 +182,16 @@
                         });
                         break;
                     case "click-hover":
-                    case "click-blur":
-                        // IE走click-hover逻辑
-                        if (BI.isIE() || ev === "click-hover") {
-                            var debounce = BI.debounce(function (e) {
-                                if (self.combo.element.__isMouseInBounds__(e)) {
-                                    if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid()) {
-                                        // if (self.isViewVisible()) {
-                                        //     return;
-                                        // }
-                                        self._popupView(e);
-                                        if (self.isViewVisible()) {
-                                            self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.EXPAND, "", self.combo);
-                                            self.fireEvent(BI.Combo.EVENT_EXPAND);
-                                        }
-                                    }
-                                }
-                            }, BI.EVENT_RESPONSE_TIME, {
-                                "leading": true,
-                                "trailing": false
-                            });
-                            self.element.off("click." + self.getName()).on("click." + self.getName(), function (e) {
-                                debounce(e);
-                                st(e);
-                            });
-                            self.element.on("mouseleave." + self.getName(), function (e) {
-                                if (self.popupView) {
-                                    self.popupView.element.on("mouseenter." + self.getName(), function (e) {
-                                        enterPopup = true;
-                                        self.popupView.element.on("mouseleave." + self.getName(), function (e) {
-                                            hide(e);
-                                        });
-                                        self.popupView.element.off("mouseenter." + self.getName());
-                                    });
-                                    BI.defer(function () {
-                                        if (!enterPopup) {
-                                            hide(e);
-                                        }
-                                    }, 50);
-                                }
-                            });
-                            break;
-                        }
-
                         var debounce = BI.debounce(function (e) {
                             if (self.combo.element.__isMouseInBounds__(e)) {
                                 if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid()) {
-                                    // if (!o.toggle && self.isViewVisible()) {
+                                    // if (self.isViewVisible()) {
                                     //     return;
                                     // }
-                                    o.toggle ? self._toggle(e) : self._popupView(e);
+                                    self._popupView(e);
                                     if (self.isViewVisible()) {
                                         self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.EXPAND, "", self.combo);
                                         self.fireEvent(BI.Combo.EVENT_EXPAND);
-                                    } else {
-                                        self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.COLLAPSE, "", self.combo);
-                                        self.fireEvent(BI.Combo.EVENT_COLLAPSE);
                                     }
                                 }
                             }
@@ -247,18 +201,23 @@
                         });
                         self.element.off("click." + self.getName()).on("click." + self.getName(), function (e) {
                             debounce(e);
-                            try {
-                                self.element[0].focus();
-                            } catch (e) {
-
-                            }
                             st(e);
                         });
-                        self.element.off("blur." + self.getName()).on("blur." + self.getName(), function (e) {
-                            if (self.isViewVisible()) {
-                                self._hideView(e);
+                        self.element.on("mouseleave." + self.getName(), function (e) {
+                            if (self.popupView) {
+                                self.popupView.element.on("mouseenter." + self.getName(), function (e) {
+                                    enterPopup = true;
+                                    self.popupView.element.on("mouseleave." + self.getName(), function (e) {
+                                        hide(e);
+                                    });
+                                    self.popupView.element.off("mouseenter." + self.getName());
+                                });
+                                BI.delay(function () {
+                                    if (!enterPopup) {
+                                        hide(e);
+                                    }
+                                }, 50);
                             }
-                            st(e);
                         });
                         break;
                 }
@@ -353,7 +312,7 @@
             this._assertPopupViewRender();
             this.fireEvent(BI.Combo.EVENT_BEFORE_POPUPVIEW);
             // popupVisible是为了获取其宽高, 放到可视范围之外以防止在IE下闪一下
-            this.popupView.css({left: -999999999, top: -99999999});
+            this.popupView.css({ left: -999999999, top: -99999999 });
             this.popupView.visible();
             BI.each(needHideWhenAnotherComboOpen, function (i, combo) {
                 if (i !== self.getName()) {

src/base/single/editor/editor.textarea.js

@@ -86,7 +86,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
             if (BI.isNotEmptyString(o.watermark)) {
                 if (!this.watermark) {
                     this.watermark = BI.createWidget({
-                        type: "bi.text_button",
+                        type: "bi.label",
                         cls: "bi-water-mark cursor-default textarea-watermark",
                         textAlign: "left",
                         whiteSpace: "normal",
@@ -96,8 +96,15 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
                         hgap: 4,
                         vgap: 4
                     });
-                    this.watermark.on(BI.TextButton.EVENT_CHANGE, function () {
-                        self.focus();
+                    this.watermark.element.bind({
+                        mousedown: function (e) {
+                            if (self.isEnabled()) {
+                                self.editor.focus();
+                            } else {
+                                self.editor.blur();
+                            }
+                            e.stopEvent();
+                        }
                     });
                     BI.createWidget({
                         type: "bi.absolute",

src/base/single/tip/tip.bubble.js

@@ -24,7 +24,7 @@ BI.Bubble = BI.inherit(BI.Tip, {
         };
         this.element.bind({click: fn, mousedown: fn, mouseup: fn, mouseover: fn, mouseenter: fn, mouseleave: fn, mousemove: fn});
         BI.createWidget({
-            type: "bi.left",
+            type: "bi.adaptive",
             element: this,
             items: [this["_" + this.options.direction]()]
         });
@@ -127,7 +127,7 @@ BI.BubbleView = BI.inherit(BI.Single, {
         };
         this.element.bind({click: fn, mousedown: fn, mouseup: fn, mouseover: fn, mouseenter: fn, mouseleave: fn, mousemove: fn});
         BI.createWidget({
-            type: "bi.left",
+            type: "bi.adaptive",
             element: this,
             items: [this["_" + this.options.direction]()]
         });

src/core/h.js

@@ -0,0 +1,35 @@
+BI.Fragment = function () {
+};
+
+BI.h = function (type, props, children) {
+    if (children != null) {
+        if (!BI.isArray(children)) {
+            children = [children];
+        }
+    } else {
+        children = [];
+    }
+    if (arguments.length > 3) {
+        for (var i = 3; i < arguments.length; i++) {
+            if (BI.isArray(arguments[i])) {
+                children = children.concat(arguments[i]);
+            } else {
+                children.push(arguments[i]);
+            }
+        }
+    }
+    if (type === BI.Fragment) {
+        return children;
+    }
+    if (BI.isFunction(type)) {
+        type = type.xtype;
+    }
+    if (type === "el") {
+        return BI.extend({
+            el: children[0]
+        }, props);
+    }
+    return BI.extend({
+        type: type,
+    }, children.length > 0 ? {items: children} : {}, props);
+};

src/less/base/single/editor/editor.textarea.less

@@ -24,4 +24,4 @@
       }
     }
   }
-}
+}

src/router/router.js

@@ -498,6 +498,17 @@
             this.handlers.unshift({route: route, callback: callback});
         },
 
+        // check route is Exist. if exist, return the route
+        checkRoute: function (route) {
+            for (var i = 0; i < this.handlers.length; i++) {
+                if (this.handlers[i].route.toString() === Router.prototype._routeToRegExp(route).toString()) {
+                    return this.handlers[i];
+                }
+            }
+
+            return null;
+        },
+
         // remove a route match in routes
         unRoute: function (route) {
             var index = _.findIndex(this.handlers, function (handler) {

src/widget/datetimepane/datetimepane.js

@@ -73,12 +73,12 @@ BI.DynamicDateTimePane = BI.inherit(BI.Widget, {
                                 listeners: [{
                                     eventName: "EVENT_CHANGE",
                                     action: function () {
-                                        self.fireEvent("EVENT_CHANGE");
+                                        self.fireEvent(BI.DynamicDateTimePane.EVENT_CHANGE);
                                     }
                                 }, {
                                     eventName: "EVENT_BEFORE_YEAR_MONTH_POPUPVIEW",
                                     action: function () {
-                                        self.fireEvent("EVENT_BEFORE_YEAR_MONTH_POPUPVIEW");
+                                        self.fireEvent(BI.DynamicDateTimePane.EVENT_BEFORE_YEAR_MONTH_POPUPVIEW);
                                     }
                                 }],
                                 ref: function () {
@@ -205,6 +205,7 @@ BI.DynamicDateTimePane = BI.inherit(BI.Widget, {
     }
 });
 BI.DynamicDateTimePane.EVENT_CHANGE = "EVENT_CHANGE";
+BI.DynamicDateTimePane.EVENT_BEFORE_YEAR_MONTH_POPUPVIEW = "EVENT_BEFORE_YEAR_MONTH_POPUPVIEW";
 BI.shortcut("bi.dynamic_date_time_pane", BI.DynamicDateTimePane);
 
 BI.extend(BI.DynamicDateTimePane, {

src/widget/multiselecttree/multiselecttree.js

@@ -164,7 +164,6 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
     },
 
     populate: function () {
-        this.searcher.populate();
         this.adapter.populate();
     }
 });

src/widget/singleselect/singleselect.list.js

@@ -7,6 +7,10 @@
  */
 BI.SingleSelectList = BI.inherit(BI.Widget, {
 
+    _constants: {
+        itemHeight: 24
+    },
+
     _defaultConfig: function () {
         return BI.extend(BI.SingleSelectList.superclass._defaultConfig.apply(this, arguments), {
             baseCls: "bi-select-list",
@@ -61,7 +65,7 @@ BI.SingleSelectList = BI.inherit(BI.Widget, {
             items: o.allowNoSelect ? BI.LogicFactory.createLogicItemsByDirection(o.direction, {
                 type: "bi.single_select_item",
                 cls: "bi-list-item-active",
-                height: 24,
+                height: this._constants.itemHeight,
                 forceNotSelected: true,
                 text: BI.i18nText("BI-Basic_No_Select"),
                 ref: function (_ref) {
@@ -116,7 +120,7 @@ BI.SingleSelectList = BI.inherit(BI.Widget, {
 
     resetHeight: function (h) {
         this.list.resetHeight ? this.list.resetHeight(h) :
-            this.list.element.css({"max-height": h / BI.pixRatio + BI.pixUnit});
+            this.list.element.css({"max-height": (h - (this.options.allowNoSelect ? this._constants.itemHeight : 0)) / BI.pixRatio + BI.pixUnit});
     },
 
     setNotSelectedValue: function () {

src/widget/singleselect/singleselect.loader.js

@@ -6,6 +6,10 @@
  */
 BI.SingleSelectLoader = BI.inherit(BI.Widget, {
 
+    _constants: {
+        itemVgap: 5
+    },
+
     _defaultConfig: function () {
         return BI.extend(BI.SingleSelectLoader.superclass._defaultConfig.apply(this, arguments), {
             baseCls: "bi-single-select-loader",
@@ -92,7 +96,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
             type: "bi.vertical",
             element: this,
             items: [this.button_group],
-            vgap: 5
+            vgap: this._constants.itemVgap
         });
 
         this.button_group.on(BI.Controller.EVENT_CHANGE, function () {
@@ -151,7 +155,7 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
     },
 
     resetHeight: function (h) {
-        this.button_group.resetHeight(h);
+        this.button_group.resetHeight(h - this._constants.itemVgap * 2);
     },
 
     resetWidth: function (w) {

typescript/base/base.ts

@@ -0,0 +1,7 @@
+import { LayerController } from "../core/controller/controller.layer";
+import { BroadcastController } from "../core/controller/controller.broadcast";
+
+export type Layers = LayerController;
+
+export type Broadcasts = BroadcastController;
+

typescript/core/controller/controller.broadcast.ts

@@ -0,0 +1,9 @@
+import { Controller } from './controller';
+
+export declare class BroadcastController extends Controller {
+    on(name: string, fn: Function): Function;
+
+    send(name: string, ...args: any[]): void;
+
+    remove(name: string, fn?: Function): this;
+}

typescript/core/controller/controller.layer.ts

@@ -1,13 +1,14 @@
 import { Controller } from './controller';
 
 export declare class LayerController extends Controller {
-    make<T>(name: string, container: any, op: any, context: any): T;
+    make<T>(name: string, op: any, context?: any): T;
+    make<T>(name: string, container: any, op?: any, context?: any): T;
 
-    create<T>(name: string, from: any, op: any, context: any): T;
+    create<T>(name: string, from?: any, op?: any, context?: any): T;
 
-    hide(name: string, callback: boolean): LayerController;
+    hide(name: string, callback?: boolean): LayerController;
 
-    show(name: string, callback: boolean): LayerController;
+    show(name: string, callback?: boolean): LayerController;
 
     isVisible(name: string): boolean;
 

typescript/core/widget.ts

@@ -380,6 +380,11 @@ export interface _Widget extends _OB {
      */
     empty(): void;
 
+    /**
+     * 刷新控件
+     */
+    reset(): void;
+
     /**
      * 内部destory方法
      */
@@ -787,6 +792,11 @@ export declare class Widget extends OB {
      */
     empty(): void;
 
+    /**
+     * 刷新控件
+     */
+    reset(): void;
+
     /**
      * 内部destory方法
      */

typescript/index.ts

@@ -161,6 +161,8 @@ import { FloatHorizontalLayout } from "./core/wrapper/layout/adapt/float.horizon
 import { AdaptiveLayout } from "./core/wrapper/layout/layout.adaptive";
 import { HexColorChooserPopup } from './case/colorchooser/colorchooser.popup.hex';
 import { BlankIconTextItem } from './base/single/button/listitem/blankicontextitem';
+import { Broadcasts, Layers } from "./base/base";
+import { BroadcastController } from "./core/controller/controller.broadcast";
 
 
 export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
@@ -179,7 +181,10 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     ActionFactory: typeof ActionFactory;
     ShowAction: typeof ShowAction;
     Controller: typeof Controller;
+    Layers: Layers;
     LayerController: typeof LayerController;
+    Broadcasts: Broadcasts;
+    BroadcastController: typeof BroadcastController;
     Behavior: typeof Behavior;
     BehaviorFactory: typeof BehaviorFactory;
     HighlightBehavior: typeof HighlightBehavior;
@@ -371,6 +376,7 @@ export {
     ShowAction,
     Controller,
     LayerController,
+    BroadcastController,
     Behavior,
     BehaviorFactory,
     RedMarkBehavior,

typescript/router/router.ts

@@ -26,6 +26,8 @@ export declare class History {
 
     route(route: string, callback: Function): void;
 
+    checkRoute(route: string): { route: string, callback: Function};
+
     unRoute(route: string): void;
 
     checkUrl(e?: Event): void;

typescript/widget/datepane/datepane.ts

@@ -3,6 +3,11 @@ import { Widget } from "../../core/widget";
 export declare class DynamicDatePane extends Widget {
     static xtype: string;
     static EVENT_CHANGE: string;
+    static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW: string;
     static Static: 1;
     static Dynamic: 2;
+
+    setMinDate(minDate: string): void;
+
+    setMaxDate(minDate: string): void;
 }

typescript/widget/datetimepane/datetimepane.ts

@@ -0,0 +1,11 @@
+import { Widget } from "../../core/widget";
+
+export declare class DynamicDateTimePane extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW: string;
+
+    setMinDate(minDate: string): void;
+
+    setMaxDate(minDate: string): void;
+}

typescript/widget/dynamicdate/dynamicdate.combo.ts

@@ -13,6 +13,7 @@ export declare class DynamicDateCombo extends Single {
     static EVENT_VALID: string;
     static EVENT_ERROR: string;
     static EVENT_BEFORE_POPUPVIEW: string;
+    static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW: string;
 
     setMinDate(minDate: string): void;
 

typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts

@@ -10,6 +10,7 @@ export declare class DynamicDateTimeCombo extends Single {
     static EVENT_VALID: string;
     static EVENT_ERROR: string;
     static EVENT_BEFORE_POPUPVIEW: string;
+    static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW: string;
     static Static: 1;
     static Dynamic: 2;
 

typescript/widget/intervalslider/intervalslider.ts

@@ -14,8 +14,8 @@ export declare class IntervalSlider extends Single {
     }
 
     setMinAndMax(v: {
-        min: number;
-        max: number;
+        min: number | string;
+        max: number | string;
     }): void;
 
     reset(): void

typescript/widget/multiselecttree/multiselecttree.ts

@@ -0,0 +1,10 @@
+import { Single } from '../../base/single/single';
+
+export declare class MultiSelectTree extends Single {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+
+    stopSearch(): void;
+
+    setSelectedValue(v: string[]): void;
+}

typescript/widget/singleselect/singleselectlist.insert.ts

@@ -0,0 +1,6 @@
+import { Single } from "../../base/single/single";
+
+export declare class SingleSelectInsertList extends Single {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+}

typescript/widget/timeinterval/dateinterval.ts

@@ -6,9 +6,14 @@ export declare class DateInterval extends Single {
     static EVENT_CHANGE: string;
     static EVENT_VALID: string;
     static EVENT_ERROR: string;
+    static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW: string;
 
     getValue(): {
         start: DynamicDataComboValue;
         end: DynamicDataComboValue;
     };
+
+    setMinDate(minDate: string): void;
+
+    setMaxDate(minDate: string): void;
 }

typescript/widget/timeinterval/timeinterval.ts

@@ -0,0 +1,18 @@
+import { Single } from "../../base/single/single";
+import { DynamicDataComboValue } from "../dynamicdate/dynamicdate.combo";
+
+export declare class TimeInterval extends Single {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    static EVENT_VALID: string;
+    static EVENT_ERROR: string;
+
+    getValue(): {
+        start: DynamicDataComboValue;
+        end: DynamicDataComboValue;
+    };
+
+    setMinDate(minDate: string): void;
+
+    setMaxDate(minDate: string): void;
+}

typescript/widget/year/combo.year.ts

@@ -4,4 +4,8 @@ export declare class DynamicYearCombo extends Widget {
     static xtype: string;
     static EVENT_CONFIRM: string;
     static EVENT_BEFORE_POPUPVIEW: string;
+
+    setMinDate(minDate: string): void;
+
+    setMaxDate(maxDate: string): void;
 }

typescript/widget/yearmonth/combo.yearmonth.ts

@@ -11,4 +11,8 @@ export declare class DynamicYearMonthCombo extends Single {
     hideView(): void;
 
     getKey(): string;
+
+    setMinDate(minDate: string): void;
+
+    setMaxDate(maxDate: string): void;
 }

typescript/widget/yearmonthinterval/yearmonthinterval.ts

@@ -11,4 +11,8 @@ export declare class YearMonthInterval extends Single {
         start: number;
         end: number;
     };
+
+    setMinDate(minDate: string): void;
+
+    setMaxDate(maxDate: string): void;
 }

typescript/widget/yearquarter/combo.yearquarter.ts

@@ -4,4 +4,8 @@ export declare class DynamicYearQuarterCombo extends Widget {
     static xtype: string;
     static EVENT_CONFIRM: string;
     static EVENT_BEFORE_POPUPVIEW: string;
+
+    setMinDate(minDate: string): void;
+
+    setMaxDate(maxDate: string): void;
 }