Merge branch 'master' of https://code.fineres.com/scm/~guy/fineui

dist/lib/base/combination/combo.d.ts

@@ -10,6 +10,32 @@ export declare class Combo extends Widget {
     static EVENT_AFTER_POPUPVIEW: string;
     static EVENT_BEFORE_HIDEVIEW: string;
     static EVENT_AFTER_HIDEVIEW: string;
+    props: {
+        trigger: 'click' | 'hover' | 'click-hover' | '';
+        toggle: boolean;
+        direction: 'top' | 'bottom' | 'left' | 'right' | 'top,left' | 'top,right' | 'bottom,left' | 'bottom,right' | 'right,innerRight' | 'right,innerLeft' | 'innerRight' | 'innerLeft';
+        logic: {
+            dynamic: boolean;
+        };
+        container: any;
+        isDefaultInit: boolean;
+        destroyWhenHide: boolean;
+        hideWhenAnotherComboOpen: boolean;
+        isNeedAdjustHeight: boolean;
+        isNeedAdjustWidth: boolean;
+        stopEvent: boolean;
+        stopPropagation: boolean;
+        adjustLength: number;
+        adjustXOffset: number;
+        adjustYOffset: number;
+        hideChecker: Function;
+        offsetStyle: 'left' | 'right' | 'center';
+        el: any;
+        popup: any;
+        comboClass: string;
+        hoverClass: string;
+        belowMouse: boolean;
+    };
     populate(...args: any[]): void;
     _setEnable(v: boolean): void;
     isViewVisible(): boolean;

dist/lib/case/layer/pane.list.d.ts

@@ -6,7 +6,7 @@ export declare class ListPane extends Pane {
     hasNext(): boolean;
     prependItems<T>(items: T[]): void;
     addItems<T>(items: T[]): void;
-    removeItemAt(indexes: number): void;
+    removeItemAt(indexes?: number | number[]): void;
     populate<T>(items?: T[]): void;
     setNotSelectedValue(v: any): void;
     getNotSelectedValue<T>(): T[];

dist/lib/component/treevaluechooser/combo.listtreevaluechooser.d.ts

@@ -1,3 +1,4 @@
+import { Widget } from "../../core/widget";
 import { AbstractListTreeValueChooser } from "./abstract.treevaluechooser.list";
 export declare class ListTreeValueChooserInsertCombo extends AbstractListTreeValueChooser {
     static xtype: string;
@@ -13,4 +14,5 @@ export declare class ListTreeValueChooserInsertCombo extends AbstractListTreeVal
     setValue(v: any): void;
     getValue<T>(): T;
     populate<T>(items: T[]): void;
+    getSearcher(): Widget;
 }

dist/lib/component/treevaluechooser/combo.treevaluechooser.d.ts

@@ -1,3 +1,4 @@
+import { Widget } from "../../core/widget";
 import { AbstractTreeValueChooser } from "./abstract.treevaluechooser";
 export declare class TreeValueChooserCombo extends AbstractTreeValueChooser {
     static xtype: string;
@@ -14,4 +15,5 @@ export declare class TreeValueChooserCombo extends AbstractTreeValueChooser {
     getValue<T>(): T;
     getAllValue<T>(): T;
     populate<T>(items: T[]): void;
+    getSearcher(): Widget;
 }

dist/lib/component/treevaluechooser/combo.treevaluechooser.insert.d.ts

@@ -1,3 +1,4 @@
+import { Widget } from "../../core/widget";
 import { AbstractTreeValueChooser } from "./abstract.treevaluechooser";
 export declare class TreeValueChooserInsertCombo extends AbstractTreeValueChooser {
     static xtype: string;
@@ -13,4 +14,5 @@ export declare class TreeValueChooserInsertCombo extends AbstractTreeValueChoose
     setValue(v: any): void;
     getValue<T>(): T;
     populate<T>(items: T[]): void;
+    getSearcher(): Widget;
 }

dist/lib/component/treevaluechooser/pane.treevaluechooser.d.ts

@@ -0,0 +1,11 @@
+import { TreeValue } from '../../base/tree/ztree/treeview';
+import { AbstractTreeValueChooser } from "./abstract.treevaluechooser";
+export declare class TreeValueChooserPane extends AbstractTreeValueChooser {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    setSelectedValue(v: TreeValue): void;
+    setValue(v: TreeValue): void;
+    getValue(): TreeValue;
+    getAllValue(): TreeValue;
+    populate<T>(items?: T[]): void;
+}

dist/lib/index.d.ts

@@ -104,6 +104,7 @@ import { TreeValueChooserInsertCombo } from "./component/treevaluechooser/combo.
 import { Radio } from "./base/single/input/radio/radio";
 import { MultiLayerSelectTreePopup } from "./widget/multilayerselecttree/multilayerselecttree.popup";
 import { MultiLayerSingleTreePopup } from "./widget/multilayersingletree/multilayersingletree.popup";
+import { MultiLayerDownListPopup } from "./widget/multilayerdownlist/multilayerdownlist.popup";
 import { TreeView } from "./base/tree/ztree/treeview";
 import { MultiTreePopup } from "./widget/multitree/multi.tree.popup";
 import { SingleSelectRadioItem } from "./case/button/item.singleselect.radio";
@@ -117,6 +118,7 @@ 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 { MultiLayerDownListCombo } from "./widget/multilayerdownlist/multilayerdownlist.combo";
 import { MultiTreeListCombo } from "./widget/multitree/multi.tree.list.combo";
 import { MultiTreeInsertCombo } from "./widget/multitree/multi.tree.insert.combo";
 import { TextValueDownListCombo } from "./widget/textvaluedownlistcombo/combo.textvaluedownlist";
@@ -170,6 +172,7 @@ import { DynamicDateTimePane } from './widget/datetimepane/datetimepane';
 import { SingleSelectInsertList } from './widget/singleselect/singleselectlist.insert';
 import { MultiSelectTree } from './widget/multiselecttree/multiselecttree';
 import { HtmlLabel } from "./base/single/label/html.label";
+import { TreeValueChooserPane } from './component/treevaluechooser/pane.treevaluechooser';
 export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     OB: typeof OB;
     Plugin: _Plugin;
@@ -221,12 +224,14 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     TreeValueChooserInsertCombo: typeof TreeValueChooserInsertCombo;
     MultiLayerSelectTreePopup: typeof MultiLayerSelectTreePopup;
     MultiLayerSingleTreePopup: typeof MultiLayerSingleTreePopup;
+    MultiLayerDownListPopup: typeof MultiLayerDownListPopup;
     TreeView: typeof TreeView;
     ListTreeView: typeof ListTreeView;
     ListAsyncTree: typeof ListAsyncTree;
     AsyncTree: typeof AsyncTree;
     MultiLayerSingleTreeCombo: typeof MultiLayerSingleTreeCombo;
     MultiLayerSelectTreeCombo: typeof MultiLayerSelectTreeCombo;
+    MultiLayerDownListCombo: typeof MultiLayerDownListCombo;
     MultiTreeListCombo: typeof MultiTreeListCombo;
     MultiTreeInsertCombo: typeof MultiTreeInsertCombo;
     Decorators: typeof decorator;
@@ -345,9 +350,10 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     SingleSelectInsertList: typeof SingleSelectInsertList;
     MultiSelectTree: typeof MultiSelectTree;
     HtmlLabel: typeof HtmlLabel;
+    TreeValueChooserPane: typeof TreeValueChooserPane;
 }
 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, 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, StateEditor, 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, Pager, 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, TimeInterval, DynamicDateTimePane, SingleSelectInsertList, MultiSelectTree, HtmlLabel, };
+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, MultiLayerDownListPopup, TreeView, ListTreeView, ListAsyncTree, AsyncTree, MultiLayerSingleTreeCombo, MultiLayerSelectTreeCombo, MultiLayerDownListCombo, MultiTreeListCombo, MultiTreeInsertCombo, Combo, IconCombo, DynamicDateCombo, Radio, MultiSelectItem, CustomTree, ButtonGroup, ButtonTree, NodeButton, IconArrowNode, MidTreeLeafItem, FirstTreeLeafItem, LastTreeLeafItem, SmallTextEditor, MultifileEditor, SignEditor, StateEditor, 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, Pager, 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, TimeInterval, DynamicDateTimePane, SingleSelectInsertList, MultiSelectTree, HtmlLabel, TreeValueChooserPane, };

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

@@ -0,0 +1,24 @@
+import { Widget } from "../../core/widget";
+import { Combo } from "../../base/combination/combo";
+export declare class MultiLayerDownListCombo extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    static EVENT_SON_VALUE_CHANGE: string;
+    static EVENT_BEFORE_POPUPVIEW: string;
+    props: {
+        adjustLength: Combo['props']['adjustLength'];
+        direction: Combo['props']['direction'];
+        trigger: Combo['props']['trigger'];
+        container: Combo['props']['container'];
+        stopPropagation: Combo['props']['stopPropagation'];
+        el: Combo['props']['el'];
+        chooseType: number;
+        value: any;
+        iconCls: string;
+    };
+    hideView(): void;
+    showView(e?: Event): void;
+    setValue(v: any): void;
+    getValue<T>(): T;
+    populate<T>(items: T[]): void;
+}

dist/lib/widget/multilayerdownlist/multilayerdownlist.popup.d.ts

@@ -0,0 +1,14 @@
+import { Widget } from "../../core/widget";
+export declare class MultiLayerDownListPopup extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    static EVENT_SON_VALUE_CHANGE: string;
+    props: {
+        items: any[];
+        chooseType: number;
+        value: any;
+    };
+    getValue<T>(): T;
+    setValue(v: any): void;
+    populate<T>(items: T[]): void;
+}

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

@@ -9,4 +9,5 @@ export declare class MultiLayerSelectTreeCombo extends Widget {
     setValue(v: string[] | string): void;
     getValue(): string[];
     populate<T>(items: T[]): void;
+    getSearcher(): Widget;
 }

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

@@ -9,4 +9,5 @@ export declare class MultiLayerSingleTreeCombo extends Widget {
     setValue(v: string[] | string): void;
     getValue(): string[];
     populate<T>(items: T[]): void;
+    getSearcher(): Widget;
 }

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

@@ -1,4 +1,5 @@
 import { Single } from "../../base/single/single";
+import { Widget } from "../../core/widget";
 export declare class MultiTreeCombo extends Single {
     static xtype: string;
     static EVENT_FOCUS: string;
@@ -10,4 +11,5 @@ export declare class MultiTreeCombo extends Single {
     static EVENT_BEFORE_POPUPVIEW: string;
     showView(): void;
     hideView(): void;
+    getSearcher(): Widget;
 }

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

@@ -1,5 +1,6 @@
 import { Single } from "../../base/single/single";
 import { TreeValue } from "../../base/tree/ztree/treeview";
+import { Widget } from "../../core/widget";
 export declare class MultiTreeInsertCombo extends Single {
     static xtype: string;
     static EVENT_FOCUS: string;
@@ -14,4 +15,5 @@ export declare class MultiTreeInsertCombo extends Single {
     setValue(v: TreeValue): void;
     getValue(): TreeValue;
     populate(): void;
+    getSearcher(): Widget;
 }

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

@@ -1,4 +1,5 @@
 import { Single } from "../../base/single/single";
+import { Widget } from "../../core/widget";
 export declare class MultiTreeListCombo extends Single {
     static xtype: string;
     static EVENT_FOCUS: string;
@@ -13,4 +14,5 @@ export declare class MultiTreeListCombo extends Single {
     setValue(v: string[]): void;
     getValue(): string[];
     populate(): void;
+    getSearcher(): Widget;
 }

dist/utils.js

@@ -1,4 +1,4 @@
-/*! time: 2021-6-20 9:00:18 */
+/*! time: 2021-6-22 14:00:17 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -82,7 +82,7 @@
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1263);
+/******/ 	return __webpack_require__(__webpack_require__.s = 1266);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2927,7 +2927,7 @@ BI.Req = {
 
 /***/ }),
 
-/***/ 1121:
+/***/ 1124:
 /***/ (function(module, exports) {
 
 BI.i18n = {
@@ -3132,7 +3132,7 @@ BI.i18n = {
 
 /***/ }),
 
-/***/ 1263:
+/***/ 1266:
 /***/ (function(module, exports, __webpack_require__) {
 
 __webpack_require__(91);
@@ -3151,8 +3151,8 @@ __webpack_require__(97);
 __webpack_require__(98);
 __webpack_require__(108);
 __webpack_require__(109);
-__webpack_require__(1121);
-__webpack_require__(1264);
+__webpack_require__(1124);
+__webpack_require__(1267);
 __webpack_require__(110);
 __webpack_require__(111);
 module.exports = __webpack_require__(112);
@@ -3160,7 +3160,7 @@ module.exports = __webpack_require__(112);
 
 /***/ }),
 
-/***/ 1264:
+/***/ 1267:
 /***/ (function(module, exports) {
 
 /**

package.json

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

src/case/layer/pane.list.js

@@ -104,7 +104,7 @@ BI.ListPane = BI.inherit(BI.Pane, {
     },
 
     removeItemAt: function (indexes) {
-        indexes = indexes || [];
+        indexes = BI.isNull(indexes) ? [] : indexes;
         BI.removeAt(this.options.items, indexes);
         this.button_group.removeItemAt.apply(this.button_group, arguments);
         this.check();

src/case/trigger/trigger.text.js

@@ -55,6 +55,10 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
         });
     },
 
+    getTextor: function() {
+        return this.text;
+    },
+
     setTextCls: function(cls) {
         var o = this.options;
         var oldCls = o.textCls;

src/case/trigger/trigger.text.select.js

@@ -64,6 +64,10 @@ BI.SelectTextTrigger = BI.inherit(BI.Trigger, {
         this.trigger.setTipType(v);
     },
 
+    getTextor: function() {
+        return this.trigger.getTextor();
+    },
+
     populate: function (items) {
         this.options.items = items;
     }

src/case/trigger/trigger.text.select.small.js

@@ -21,7 +21,7 @@ BI.SmallSelectTextTrigger = BI.inherit(BI.Trigger, {
         this.trigger = BI.createWidget({
             type: "bi.small_text_trigger",
             element: this,
-            height: o.height - 2,
+            height: o.height,
             text: obj.text,
             cls: obj.cls
         });

src/component/treevaluechooser/combo.listtreevaluechooser.js

@@ -84,6 +84,10 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
         this.combo.hideView();
     },
 
+    getSearcher: function () {
+        return this.combo.getSearcher();
+    },
+
     setValue: function (v) {
         this.combo.setValue(v);
     },

src/component/treevaluechooser/combo.treevaluechooser.insert.js

@@ -83,6 +83,10 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, {
         this.combo.hideView();
     },
 
+    getSearcher: function () {
+        return this.combo.getSearcher();
+    },
+
     setValue: function (v) {
         this.combo.setValue(v);
     },

src/component/treevaluechooser/combo.treevaluechooser.js

@@ -83,6 +83,10 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
         this.combo.hideView();
     },
 
+    getSearcher: function () {
+        return this.combo.getSearcher();
+    },
+
     setValue: function (v) {
         this.combo.setValue(v);
     },

src/widget/datetime/datetime.combo.js

@@ -31,6 +31,7 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
         };
         this.trigger = BI.createWidget({
             type: "bi.date_time_trigger",
+            height: opts.height,
             min: opts.minDate,
             max: opts.maxDate,
             value: opts.value
@@ -82,8 +83,8 @@ BI.DateTimeCombo = BI.inherit(BI.Single, {
         var triggerBtn = BI.createWidget({
             type: "bi.icon_button",
             cls: "bi-trigger-icon-button date-font",
-            width: 24,
-            height: 24
+            width: opts.height,
+            height: opts.height,
         });
         triggerBtn.on(BI.IconButton.EVENT_CHANGE, function () {
             if (self.combo.isViewVisible()) {

src/widget/dynamicdate/dynamicdate.caculate.js

@@ -7,6 +7,57 @@
             return this.getCalculationByDate(date, obj);
         },
 
+        getDescription: function (obj) {
+            var value = "";
+            var endText = "";
+            if(BI.isNotNull(obj.year)) {
+                if(BI.parseInt(obj.year) !== 0) {
+                    value += Math.abs(obj.year) + BI.i18nText("BI-Basic_Year") + (obj.year < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
+                }
+                endText = getPositionText(BI.i18nText("BI-Basic_Year"), obj.position);
+            }
+            if(BI.isNotNull(obj.quarter)) {
+                if(BI.parseInt(obj.quarter) !== 0) {
+                    value += Math.abs(obj.quarter) + BI.i18nText("BI-Basic_Single_Quarter") + (obj.quarter < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
+                }
+                endText = getPositionText(BI.i18nText("BI-Basic_Single_Quarter"), obj.position);
+            }
+            if(BI.isNotNull(obj.month)) {
+                if(BI.parseInt(obj.month) !== 0) {
+                    value += Math.abs(obj.month) + BI.i18nText("BI-Basic_Month") + (obj.month < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
+                }
+                endText = getPositionText(BI.i18nText("BI-Basic_Month"), obj.position);
+            }
+            if(BI.isNotNull(obj.week)) {
+                if(BI.parseInt(obj.week) !== 0) {
+                    value += Math.abs(obj.week) + BI.i18nText("BI-Basic_Week") + (obj.week < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
+                }
+                endText = getPositionText(BI.i18nText("BI-Basic_Week"), obj.position);
+            }
+            if(BI.isNotNull(obj.day)) {
+                if(BI.parseInt(obj.day) !== 0) {
+                    value += Math.abs(obj.day) + BI.i18nText("BI-Basic_Day") + (obj.day < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
+                }
+                endText = BI.size(obj) === 1 ? getPositionText(BI.i18nText("BI-Basic_Month"), obj.position) : "";
+            }
+            if(BI.isNotNull(obj.workDay) && BI.parseInt(obj.workDay) !== 0) {
+                value += Math.abs(obj.workDay) + BI.i18nText("BI-Basic_Work_Day") + (obj.workDay < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
+            }
+            return value +  endText;
+
+            function getPositionText (baseText, position) {
+                switch (position) {
+                    case BI.DynamicDateCard.OFFSET.BEGIN:
+                        return baseText + BI.i18nText("BI-Basic_Begin_Start");
+                    case BI.DynamicDateCard.OFFSET.END:
+                        return baseText + BI.i18nText("BI-Basic_End_Stop");
+                    case BI.DynamicDateCard.OFFSET.CURRENT:
+                    default:
+                        return BI.i18nText("BI-Basic_Current_Day");
+                }
+            }
+        },
+
         getCalculationByDate: function (date, obj) {
             if (BI.isNotNull(obj.year)) {
                 date = BI.getDate((date.getFullYear() + BI.parseInt(obj.year)), date.getMonth(), date.getDate());

src/widget/dynamicdate/dynamicdate.trigger.js

@@ -240,54 +240,7 @@ BI.DynamicDateTrigger = BI.inherit(BI.Trigger, {
     },
 
     _getText: function (obj) {
-        var value = "";
-        var endText = "";
-        if(BI.isNotNull(obj.year)) {
-            if(BI.parseInt(obj.year) !== 0) {
-                value += Math.abs(obj.year) + BI.i18nText("BI-Basic_Year") + (obj.year < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
-            }
-            endText = getPositionText(BI.i18nText("BI-Basic_Year"), obj.position);
-        }
-        if(BI.isNotNull(obj.quarter)) {
-            if(BI.parseInt(obj.quarter) !== 0) {
-                value += Math.abs(obj.quarter) + BI.i18nText("BI-Basic_Single_Quarter") + (obj.quarter < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
-            }
-            endText = getPositionText(BI.i18nText("BI-Basic_Single_Quarter"), obj.position);
-        }
-        if(BI.isNotNull(obj.month)) {
-            if(BI.parseInt(obj.month) !== 0) {
-                value += Math.abs(obj.month) + BI.i18nText("BI-Basic_Month") + (obj.month < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
-            }
-            endText = getPositionText(BI.i18nText("BI-Basic_Month"), obj.position);
-        }
-        if(BI.isNotNull(obj.week)) {
-            if(BI.parseInt(obj.week) !== 0) {
-                value += Math.abs(obj.week) + BI.i18nText("BI-Basic_Week") + (obj.week < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
-            }
-            endText = getPositionText(BI.i18nText("BI-Basic_Week"), obj.position);
-        }
-        if(BI.isNotNull(obj.day)) {
-            if(BI.parseInt(obj.day) !== 0) {
-                value += Math.abs(obj.day) + BI.i18nText("BI-Basic_Day") + (obj.day < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
-            }
-            endText = BI.size(obj) === 1 ? getPositionText(BI.i18nText("BI-Basic_Month"), obj.position) : "";
-        }
-        if(BI.isNotNull(obj.workDay) && BI.parseInt(obj.workDay) !== 0) {
-            value += Math.abs(obj.workDay) + BI.i18nText("BI-Basic_Work_Day") + (obj.workDay < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
-        }
-        return value +  endText;
-
-        function getPositionText (baseText, position) {
-            switch (position) {
-                case BI.DynamicDateCard.OFFSET.BEGIN:
-                    return baseText + BI.i18nText("BI-Basic_Begin_Start");
-                case BI.DynamicDateCard.OFFSET.END:
-                    return baseText + BI.i18nText("BI-Basic_End_Stop");
-                case BI.DynamicDateCard.OFFSET.CURRENT:
-                default:
-                    return BI.i18nText("BI-Basic_Current_Day");
-            }
-        }
+        return BI.DynamicDateHelper.getDescription(obj);
     },
 
     setValue: function (v) {

src/widget/multilayerselecttree/multilayerselecttree.combo.js

@@ -199,11 +199,14 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
     },
 
     _getSyncConfig: function () {
-        var o = this.options;
+        var o = this.options, self = this;
         var baseConfig = this._getBaseConfig();
         return BI.extend(baseConfig, o.allowEdit ? this._getSearchConfig() : {
             el: {
                 type: "bi.single_tree_trigger",
+                ref: function(_ref) {
+                    self.textTrigger = _ref;
+                },
                 text: o.text,
                 height: o.height,
                 items: o.items,
@@ -226,6 +229,10 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
         return this.combo.getValue();
     },
 
+    getSearcher: function () {
+        return this.trigger ? this.trigger.getSearcher() : this.textTrigger.getTextor();
+    },
+
     populate: function (items) {
         this.combo.populate(items);
     }

src/widget/multilayersingletree/multilayersingletree.combo.js

@@ -202,11 +202,14 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
     },
 
     _getSyncConfig: function () {
-        var o = this.options;
+        var o = this.options, self = this;
         var baseConfig = this._getBaseConfig();
         return BI.extend(baseConfig, o.allowEdit ? this._getSearchConfig() : {
             el: {
                 type: "bi.single_tree_trigger",
+                ref: function(_ref) {
+                    self.textTrigger = _ref;
+                },
                 text: o.text,
                 height: o.height,
                 items: o.items,
@@ -220,6 +223,10 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
         return BI.extend(config, this._getSearchConfig());
     },
 
+    getSearcher: function () {
+        return this.trigger ? this.trigger.getSearcher() : this.textTrigger.getTextor();
+    },
+
     setValue: function (v) {
         v = BI.isArray(v) ? v : [v];
         this.combo.setValue(v);

src/widget/multiselect/multiselect.combo.js

@@ -395,7 +395,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
             var map = this._makeMap(this.storeValue.value);
             BI.each(res.value, function (i, v) {
                 if (!map[v]) {
-                    self.storeValue.value.push(v);
+                    BI.pushDistinct(self.storeValue.value, v);
                     BI.remove(self.storeValue.assist, v);
                     map[v] = v;
                 }

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

@@ -422,7 +422,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
             var map = this._makeMap(this.storeValue.value);
             BI.each(res.value, function (i, v) {
                 if (!map[v]) {
-                    self.storeValue.value.push(v);
+                    BI.pushDistinct(self.storeValue.value, v);
                     BI.remove(self.storeValue.assist, v);
                     map[v] = v;
                 }

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

@@ -407,7 +407,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
             var map = this._makeMap(this.storeValue.value);
             BI.each(res.value, function (i, v) {
                 if (!map[v]) {
-                    self.storeValue.value.push(v);
+                    BI.pushDistinct(self.storeValue.value, v);
                     // value更新的时候assist也需要更新
                     BI.remove(self.storeValue.assist, v);
                     map[v] = v;

src/widget/multiselectlist/multiselectlist.insert.js

@@ -281,7 +281,7 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
             var map = this._makeMap(this.storeValue.value);
             BI.each(res.value, function (i, v) {
                 if (!map[v]) {
-                    self.storeValue.value.push(v);
+                    BI.pushDistinct(self.storeValue.value, v);
                     map[v] = v;
                 }
             });

src/widget/multiselectlist/multiselectlist.insert.nobar.js

@@ -285,7 +285,7 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
             var map = this._makeMap(this.storeValue.value);
             BI.each(res.value, function (i, v) {
                 if (!map[v]) {
-                    self.storeValue.value.push(v);
+                    BI.pushDistinct(self.storeValue.value, v);
                     map[v] = v;
                 }
             });

src/widget/multiselectlist/multiselectlist.js

@@ -301,7 +301,7 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
             var map = this._makeMap(this.storeValue.value);
             BI.each(res.value, function (i, v) {
                 if (!map[v]) {
-                    self.storeValue.value.push(v);
+                    BI.pushDistinct(self.storeValue.value, v);
                     map[v] = v;
                 }
             });

src/widget/multitree/multi.tree.combo.js

@@ -334,6 +334,10 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
         });
     },
 
+    getSearcher: function () {
+        return this.trigger.getSearcher();
+    },
+
     getValue: function () {
         return BI.deepClone(this.storeValue.value);
     },

src/widget/multitree/multi.tree.insert.combo.js

@@ -331,6 +331,10 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
         this.combo.hideView();
     },
 
+    getSearcher: function () {
+        return this.trigger.getSearcher();
+    },
+
     showView: function () {
         this.combo.showView();
     },

src/widget/multitree/multi.tree.list.combo.js

@@ -363,6 +363,10 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
         this.combo.hideView();
     },
 
+    getSearcher: function () {
+        return this.trigger.getSearcher();
+    },
+
     setValue: function (v) {
         this.storeValue.value = v || [];
         this.combo.setValue({

src/widget/singleselect/trigger/searcher.singleselect.js

@@ -108,7 +108,7 @@ BI.SingleSelectSearcher = BI.inherit(BI.Widget, {
     },
 
     getKeyword: function () {
-        return this.editor.getValue();
+        return this.editor.getKeyword();
     },
 
     hasMatched: function () {

src/widget/singletree/singletree.trigger.js

@@ -51,6 +51,10 @@ BI.SingleTreeTrigger = BI.inherit(BI.Trigger, {
         return this.options.value || [];
     },
 
+    getTextor: function() {
+        return this.trigger.getTextor();
+    },
+
     populate: function (items) {
         this.trigger.populate(items);
     }

typescript/base/combination/combo.ts

@@ -12,6 +12,33 @@ export declare class Combo extends Widget {
     static EVENT_BEFORE_HIDEVIEW: string;
     static EVENT_AFTER_HIDEVIEW: string;
 
+    props: {
+        trigger: 'click' | 'hover' | 'click-hover' | '';
+        toggle: boolean;
+        direction: 'top' | 'bottom' | 'left' | 'right' | 'top,left' | 'top,right' | 'bottom,left' | 'bottom,right' | 'right,innerRight' | 'right,innerLeft' | 'innerRight' | 'innerLeft';
+        logic: {
+            dynamic: boolean;
+        },
+        container: any; // popupview放置的容器，默认为this.element
+        isDefaultInit: boolean;
+        destroyWhenHide: boolean;
+        hideWhenAnotherComboOpen: boolean;
+        isNeedAdjustHeight: boolean; // 是否需要高度调整
+        isNeedAdjustWidth: boolean;
+        stopEvent: boolean;
+        stopPropagation: boolean;
+        adjustLength: number; // 调整的距离
+        adjustXOffset: number;
+        adjustYOffset: number;
+        hideChecker: Function;
+        offsetStyle: 'left' | 'right' | 'center';
+        el: any;
+        popup: any;
+        comboClass: string;
+        hoverClass: string;
+        belowMouse: boolean;
+    }
+
     populate(...args: any[]): void;
 
     _setEnable(v: boolean): void;

typescript/case/layer/pane.list.ts

@@ -13,7 +13,7 @@ export declare class ListPane extends Pane {
 
     addItems<T>(items: T[]): void;
 
-    removeItemAt(indexes: number): void;
+    removeItemAt(indexes?: number | number[]): void;
 
     populate<T>(items?: T[]): void;
 

typescript/component/treevaluechooser/combo.listtreevaluechooser.ts

@@ -1,3 +1,5 @@
+
+import { Widget } from "../../core/widget";
 import { AbstractListTreeValueChooser } from "./abstract.treevaluechooser.list";
 
 export declare class ListTreeValueChooserInsertCombo extends AbstractListTreeValueChooser {
@@ -19,4 +21,6 @@ export declare class ListTreeValueChooserInsertCombo extends AbstractListTreeVal
     getValue<T>(): T;
 
     populate<T>(items: T[]): void;
+
+    getSearcher(): Widget;
 }

typescript/component/treevaluechooser/combo.treevaluechooser.insert.ts

@@ -1,3 +1,4 @@
+import { Widget } from "../../core/widget";
 import { AbstractTreeValueChooser } from "./abstract.treevaluechooser";
 
 export declare class TreeValueChooserInsertCombo extends AbstractTreeValueChooser {
@@ -19,4 +20,6 @@ export declare class TreeValueChooserInsertCombo extends AbstractTreeValueChoose
     getValue<T>(): T;
 
     populate<T>(items: T[]): void;
+
+    getSearcher(): Widget;
 }

typescript/component/treevaluechooser/combo.treevaluechooser.ts

@@ -1,3 +1,4 @@
+import { Widget } from "../../core/widget";
 import { AbstractTreeValueChooser } from "./abstract.treevaluechooser";
 
 export declare class TreeValueChooserCombo extends AbstractTreeValueChooser {
@@ -21,4 +22,6 @@ export declare class TreeValueChooserCombo extends AbstractTreeValueChooser {
     getAllValue<T>(): T;
 
     populate<T>(items: T[]): void;
+
+    getSearcher(): Widget;
 }

typescript/component/treevaluechooser/pane.treevaluechooser.ts

@@ -0,0 +1,17 @@
+import { TreeValue } from '../../base/tree/ztree/treeview';
+import { AbstractTreeValueChooser } from "./abstract.treevaluechooser";
+
+export declare class TreeValueChooserPane extends AbstractTreeValueChooser {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+
+    setSelectedValue(v: TreeValue): void;
+
+    setValue(v: TreeValue): void;
+
+    getValue(): TreeValue;
+
+    getAllValue(): TreeValue;
+
+    populate<T>(items?: T[]): void;
+}

typescript/index.ts

@@ -104,6 +104,7 @@ import { TreeValueChooserInsertCombo } from "./component/treevaluechooser/combo.
 import { Radio } from "./base/single/input/radio/radio";
 import { MultiLayerSelectTreePopup } from "./widget/multilayerselecttree/multilayerselecttree.popup";
 import { MultiLayerSingleTreePopup } from "./widget/multilayersingletree/multilayersingletree.popup";
+import { MultiLayerDownListPopup } from "./widget/multilayerdownlist/multilayerdownlist.popup";
 import { TreeView } from "./base/tree/ztree/treeview";
 import { MultiTreePopup } from "./widget/multitree/multi.tree.popup";
 import { SingleSelectRadioItem } from "./case/button/item.singleselect.radio";
@@ -117,6 +118,7 @@ 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 { MultiLayerDownListCombo } from "./widget/multilayerdownlist/multilayerdownlist.combo";
 import { MultiTreeListCombo } from "./widget/multitree/multi.tree.list.combo";
 import { MultiTreeInsertCombo } from "./widget/multitree/multi.tree.insert.combo";
 import { TextValueDownListCombo } from "./widget/textvaluedownlistcombo/combo.textvaluedownlist";
@@ -170,6 +172,7 @@ import { DynamicDateTimePane } from './widget/datetimepane/datetimepane';
 import { SingleSelectInsertList } from './widget/singleselect/singleselectlist.insert';
 import { MultiSelectTree } from './widget/multiselecttree/multiselecttree';
 import { HtmlLabel } from "./base/single/label/html.label";
+import { TreeValueChooserPane } from './component/treevaluechooser/pane.treevaluechooser';
 
 
 export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
@@ -223,12 +226,14 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     TreeValueChooserInsertCombo: typeof TreeValueChooserInsertCombo;
     MultiLayerSelectTreePopup: typeof MultiLayerSelectTreePopup;
     MultiLayerSingleTreePopup: typeof MultiLayerSingleTreePopup;
+    MultiLayerDownListPopup: typeof MultiLayerDownListPopup;
     TreeView: typeof TreeView;
     ListTreeView: typeof ListTreeView;
     ListAsyncTree: typeof ListAsyncTree;
     AsyncTree: typeof AsyncTree;
     MultiLayerSingleTreeCombo: typeof MultiLayerSingleTreeCombo;
     MultiLayerSelectTreeCombo: typeof MultiLayerSelectTreeCombo;
+    MultiLayerDownListCombo: typeof MultiLayerDownListCombo;
     MultiTreeListCombo: typeof MultiTreeListCombo;
     MultiTreeInsertCombo: typeof MultiTreeInsertCombo;
     Decorators: typeof decorator;
@@ -347,6 +352,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     SingleSelectInsertList: typeof SingleSelectInsertList;
     MultiSelectTree: typeof MultiSelectTree;
     HtmlLabel: typeof HtmlLabel;
+    TreeValueChooserPane: typeof TreeValueChooserPane;
 }
 
 export default {
@@ -427,12 +433,14 @@ export {
     TreeValueChooserInsertCombo,
     MultiLayerSelectTreePopup,
     MultiLayerSingleTreePopup,
+    MultiLayerDownListPopup,
     TreeView,
     ListTreeView,
     ListAsyncTree,
     AsyncTree,
     MultiLayerSingleTreeCombo,
     MultiLayerSelectTreeCombo,
+    MultiLayerDownListCombo,
     MultiTreeListCombo,
     MultiTreeInsertCombo,
     Combo,
@@ -524,4 +532,5 @@ export {
     SingleSelectInsertList,
     MultiSelectTree,
     HtmlLabel,
+    TreeValueChooserPane,
 };

typescript/widget/multilayerdownlist/multilayerdownlist.combo.ts

@@ -0,0 +1,32 @@
+import { Widget } from "../../core/widget";
+import { Combo } from "../../base/combination/combo";
+
+export declare class MultiLayerDownListCombo extends Widget {
+    static xtype: string;
+
+    static EVENT_CHANGE: string;
+    static EVENT_SON_VALUE_CHANGE: string;
+    static EVENT_BEFORE_POPUPVIEW: string;
+
+    props: {
+        adjustLength: Combo['props']['adjustLength'];
+        direction: Combo['props']['direction'];
+        trigger: Combo['props']['trigger'];
+        container: Combo['props']['container'];
+        stopPropagation: Combo['props']['stopPropagation'];
+        el: Combo['props']['el'];
+        chooseType: number;
+        value: any;
+        iconCls: string;
+    }
+
+    hideView(): void;
+
+    showView(e?: Event): void;
+
+    setValue(v: any): void;
+
+    getValue<T>(): T;
+
+    populate<T>(items: T[]): void;
+}

typescript/widget/multilayerdownlist/multilayerdownlist.popup.ts

@@ -0,0 +1,20 @@
+import { Widget } from "../../core/widget";
+
+export declare class MultiLayerDownListPopup extends Widget {
+    static xtype: string;
+
+    static EVENT_CHANGE: string;
+    static EVENT_SON_VALUE_CHANGE: string;
+
+    props: {
+        items: any[];
+        chooseType: number;
+        value: any;
+    }
+
+    getValue<T>(): T;
+
+    setValue(v: any): void;
+
+    populate<T>(items: T[]): void;
+}

typescript/widget/multilayerselecttree/multilayerselecttree.combo.ts

@@ -13,4 +13,6 @@ export declare class MultiLayerSelectTreeCombo extends Widget {
     getValue(): string[];
 
     populate<T>(items: T[]): void;
+
+    getSearcher(): Widget;
 }

typescript/widget/multilayersingletree/multilayersingletree.combo.ts

@@ -12,5 +12,7 @@ export declare class MultiLayerSingleTreeCombo extends Widget {
 
     getValue(): string[];
 
-    populate<T>(items: T[]): void
+    populate<T>(items: T[]): void;
+
+    getSearcher(): Widget;
 }

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

@@ -1,4 +1,5 @@
 import { Single } from "../../base/single/single";
+import { Widget } from "../../core/widget";
 
 export declare class MultiTreeCombo extends Single {
     static xtype: string;
@@ -12,4 +13,6 @@ export declare class MultiTreeCombo extends Single {
 
     showView(): void;
     hideView(): void;
+
+    getSearcher(): Widget;
 }

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

@@ -1,5 +1,6 @@
 import { Single } from "../../base/single/single";
 import { TreeValue } from "../../base/tree/ztree/treeview";
+import { Widget } from "../../core/widget";
 
 export declare class MultiTreeInsertCombo extends Single {
     static xtype: string;
@@ -20,4 +21,6 @@ export declare class MultiTreeInsertCombo extends Single {
     getValue(): TreeValue;
 
     populate(): void;
+
+    getSearcher(): Widget;
 }

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

@@ -1,4 +1,5 @@
 import { Single } from "../../base/single/single";
+import { Widget } from "../../core/widget";
 
 export declare class MultiTreeListCombo extends Single {
     static xtype: string;
@@ -19,4 +20,6 @@ export declare class MultiTreeListCombo extends Single {
     getValue(): string[];
 
     populate(): void;
+
+    getSearcher(): Widget;
 }