Merge pull request #3773 in VISUAL/fineui from DEC/fineui:release/11.0 to master

* commit 'e54a6eaf0e3d437c31649ed9ca67a1de2d34295c':
  BI-163235 fix: 需要加个判空, 没有fmt不需要走到里面去

packages/demo/src/demo/widget/yearmonthinterval/demo.year_month_interval.js

@@ -20,6 +20,7 @@ export class YearMonthIntervalDemo extends Widget {
                     ref(_ref) {
                         self.interval = _ref;
                     },
+                    format: "%Y/%X",
                     value: {
                         start: {
                             type: 2,

packages/fineui/package.json

@@ -57,7 +57,7 @@
     "jquery": "3.6.3"
   },
   "devDependencies": {
-    "core-js": "^3.30.2",
+    "core-js": "^3.37.1",
     "cross-env": "^7.0.3"
   }
 }

packages/fineui/src/base/combination/tab.js

@@ -13,7 +13,8 @@ import {
     contains,
     any,
     isEqual,
-    LogicFactory
+    LogicFactory,
+    Events,
 } from "@/core";
 
 /**
@@ -106,7 +107,11 @@ export class Tab extends Widget {
             Widget.execWithContext(this, () => {
                 this.cardMap[v] = cardCreator(v);
             });
-            this.layout.addCardByName(v, this.cardMap[v]);
+            const card = this.layout.addCardByName(v, this.cardMap[v]);
+            card.on(Events.DESTROY, () => {
+                this.layout.deleteCardByName(v);
+                delete this.cardMap[v];
+            });
         }
     }
 

packages/fineui/src/base/single/input/radio/radio.js

@@ -56,13 +56,4 @@ export class Radio extends BasicButton {
             this.fireEvent(Radio.EVENT_CHANGE);
         }
     }
-
-    setSelected(b) {
-        super.setSelected(b);
-        if (b) {
-            this.radio.element.addClass("bi-high-light-background");
-        } else {
-            this.radio.element.removeClass("bi-high-light-background");
-        }
-    }
 }

packages/fineui/src/case/combo/iconcombo/combo.icon.js

@@ -8,6 +8,7 @@ export class IconCombo extends Widget {
     static xtype = "bi.icon_combo";
 
     static EVENT_CHANGE = "EVENT_CHANGE";
+    static EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
 
     _defaultConfig() {
         return extend(super._defaultConfig(...arguments), {
@@ -55,18 +56,18 @@ export class IconCombo extends Widget {
             value: o.value,
             isShowDown: o.isShowDown,
         });
-        this.popup = createWidget(o.popup, {
+        this.popupEl = createWidget(o.popup, {
             type: IconComboPopup.xtype,
             chooseType: o.chooseType,
             items: o.items,
             value: o.value,
         });
-        this.popup.on(IconComboPopup.EVENT_CHANGE, () => {
-            this.setValue(this.popup.getValue());
+        this.popupEl.on(IconComboPopup.EVENT_CHANGE, () => {
+            this.setValue(this.popupEl.getValue());
             this.iconCombo.hideView();
             this.fireEvent(IconCombo.EVENT_CHANGE);
         });
-        this.popup.on(Controller.EVENT_CHANGE, (...args) => {
+        this.popupEl.on(Controller.EVENT_CHANGE, (...args) => {
             this.fireEvent(Controller.EVENT_CHANGE, ...args);
         });
         this.iconCombo = createWidget({
@@ -82,11 +83,20 @@ export class IconCombo extends Widget {
             el: this.trigger,
             hideWhenAnotherComboOpen: o.hideWhenAnotherComboOpen,
             popup: {
-                el: this.popup,
+                el: this.popupEl,
                 maxWidth: o.maxWidth,
                 maxHeight: o.maxHeight,
                 minWidth: o.minWidth,
+                ref: (ref) => {
+                    this.popup = ref;
+                },
             },
+            listeners: [{
+                eventName: Combo.EVENT_BEFORE_POPUPVIEW,
+                action: () => {
+                    this.fireEvent(IconCombo.EVENT_BEFORE_POPUPVIEW);
+                },
+            }],
         });
     }
 
@@ -100,15 +110,19 @@ export class IconCombo extends Widget {
 
     setValue(v) {
         this.trigger.setValue(v);
-        this.popup.setValue(v);
+        this.popupEl.setValue(v);
     }
 
     getValue() {
-        const value = this.popup.getValue();
+        const value = this.popupEl.getValue();
 
         return isNull(value) ? [] : isArray(value) ? value : [value];
     }
 
+    getPopup() {
+        return this.popup;
+    }
+
     populate(items) {
         this.options.items = items;
         this.iconCombo.populate(items);

packages/fineui/src/case/toolbar/toolbar.multiselect.js

@@ -126,6 +126,7 @@ export class MultiSelectBar extends BasicButton {
     }
 
     setSelected(v) {
+        super.setSelected(v);
         this.checkbox.setSelected(v);
         this.setHalfSelected(false);
     }

packages/fineui/src/case/ztree/asynctree.js

@@ -221,15 +221,11 @@ export class AsyncTree extends TreeView {
                     {
                         el: {
                             type: IconLabel.xtype,
-                            width: 20,
-                            height: 20,
                             cls: "button-loading-font anim-rotate bi-card",
                             ref: ref => {
                                 loadingIcon = ref;
                             },
                         },
-                        left: 5,
-                        top: 5,
                     },
                 ],
             });

packages/fineui/src/core/1.lodash.js

@@ -6845,6 +6845,46 @@
         }
     });
 
+    /**
+     * Creates an array of elements split into two groups, the first of which
+     * contains elements `predicate` returns truthy for, the second of which
+     * contains elements `predicate` returns falsey for. The predicate is
+     * invoked with one argument: (value).
+     *
+     * @static
+     * @memberOf _
+     * @since 3.0.0
+     * @category Collection
+     * @param {Array|Object} collection The collection to iterate over.
+     * @param {Function} [predicate=_.identity] The function invoked per iteration.
+     * @returns {Array} Returns the array of grouped elements.
+     * @example
+     *
+     * var users = [
+     *   { 'user': 'barney',  'age': 36, 'active': false },
+     *   { 'user': 'fred',    'age': 40, 'active': true },
+     *   { 'user': 'pebbles', 'age': 1,  'active': false }
+     * ];
+     *
+     * _.partition(users, function(o) { return o.active; });
+     * // => objects for [['fred'], ['barney', 'pebbles']]
+     *
+     * // The `_.matches` iteratee shorthand.
+     * _.partition(users, { 'age': 1, 'active': false });
+     * // => objects for [['pebbles'], ['barney', 'fred']]
+     *
+     * // The `_.matchesProperty` iteratee shorthand.
+     * _.partition(users, ['active', false]);
+     * // => objects for [['barney', 'pebbles'], ['fred']]
+     *
+     * // The `_.property` iteratee shorthand.
+     * _.partition(users, 'active');
+     * // => objects for [['fred'], ['barney', 'pebbles']]
+     */
+    var partition = createAggregator(function(result, value, key) {
+      result[key ? 0 : 1].push(value);
+    }, function() { return [[], []]; });
+
     /**
      * Creates an array of values by running each element in `collection` thru
      * `iteratee`. The iteratee is invoked with three arguments:
@@ -10052,6 +10092,7 @@
     lodash.omit = omit;
     lodash.omitBy = omitBy;
     lodash.once = once;
+    lodash.partition = partition;
     lodash.pick = pick;
     lodash.pickBy = pickBy;
     lodash.range = range;

packages/fineui/src/core/2.base.js

@@ -1518,7 +1518,7 @@ export function getTime() {
     }
     if (isNotNull(BI.timeZone)) {
         // BI-33791 1901年以前的东8区标准是GMT+0805, 统一无论是什么时间，都以整的0800这样的为基准
-        return dt.getTime() + BI.timeZone + new Date().getTimezoneOffset() * 60000;
+        return dt.getTime() - BI.timeZone - new Date().getTimezoneOffset() * 60000;
     }
 
     return dt.getTime();

packages/fineui/src/core/5.inject.js

@@ -62,7 +62,7 @@ const constantInjection = {};
 
 export function constant(xtype, cls) {
     if (isNotNull(constantInjection[xtype])) {
-        _global.console && console.error(`constant: [${xtype}]already registered`);
+        _global.console && console.warn(`constant: [${xtype}]already registered`);
     } else {
         constantInjection[xtype] = cls;
     }

packages/fineui/src/core/controller/controller.broadcast.js

@@ -22,7 +22,7 @@ export class BroadcastController extends Controller {
 
     send(name) {
         const args = [].slice.call(arguments, 1);
-        each(this._broadcasts[name], (i, fn) => fn(...args));
+        each(this._broadcasts[name]?.slice?.(), (i, fn) => fn(...args));
     }
 
     remove(name, fn) {

packages/fineui/src/core/utils/dom.js

@@ -2,7 +2,7 @@
  * 对DOM操作的通用函数
  */
 import $ from "jquery";
-import { each, isEmpty, isNotNull, isNull } from "../2.base";
+import { each, isEmpty, isNotEmptyObject } from "../2.base";
 import { Widget } from "../4.widget";
 import { isIE } from "./../platform";
 
@@ -102,23 +102,37 @@ export function getTextSizeHeight(text, fontSize = 12) {
 }
 
 // 获取滚动条的宽度，页面display: none时候获取到的为0
-let _scrollWidth = null;
+const _scrollWidthMap = {};
 
 export function getScrollWidth(css) {
-    if (isNull(_scrollWidth) || isNotNull(css) || _scrollWidth === 0) {
-        const ul = Widget._renderEngine.createElement("<div>").width(50).height(50)
+    /**
+     * 指定 scrollbar-width: none;
+     * 支持的浏览器版本结果肯定为 0，无需重复计算
+     */
+    const supportScrollWidth = 'scrollbarWidth' in document.documentElement.style;
+    const hasNoneScrollWidth =
+        supportScrollWidth && isNotEmptyObject(css) && [css["scrollbar-width"], css["scrollbarWidth"]].includes("none");
+    const key = JSON.stringify(css) || "default";
+
+    if (hasNoneScrollWidth) {
+        return 0;
+    } else if (!_scrollWidthMap[key]) {
+        const ul = Widget._renderEngine
+            .createElement("<div>")
+            .width(50)
+            .height(50)
             .css({
                 position: "absolute",
                 top: "-9999px",
                 overflow: "scroll",
-                ...css
+                ...css,
             })
             .appendTo("body");
-        _scrollWidth = ul[0].offsetWidth - ul[0].clientWidth;
+        _scrollWidthMap[key] = ul[0].offsetWidth - ul[0].clientWidth;
         ul.destroy();
     }
 
-    return _scrollWidth;
+    return _scrollWidthMap[key];
 }
 
 export function getImage(param, fillStyle, backgroundColor) {
@@ -743,12 +757,13 @@ export function getComboPosition(combo, popup, extraWidth, extraHeight, needAdap
     }
     if (needAdaptHeight === true && popup.resetHeight) {
         const comboRect = combo.element[0].getBoundingClientRect();
+        const scale = comboRect.height === 0 ? 1 : comboRect.height / combo.element.height();
         const relativeOffset = positionRelativeElement ? positionRelativeElement.getBoundingClientRect().top : 0;
         const positionTop = position.top + relativeOffset;
         if (positionTop < comboRect.top) {
-            popup.resetHeight(Math.min(viewportBounds.height - positionTop, comboRect.top, maxHeight));
+            popup.resetHeight(Math.min((viewportBounds.height - positionTop) / scale, comboRect.top / scale, maxHeight));
         } else if (positionTop >= comboRect.bottom) {
-            popup.resetHeight(Math.min(viewportBounds.height - positionTop, viewportBounds.height - comboRect.bottom, maxHeight));
+            popup.resetHeight(Math.min((viewportBounds.height - positionTop) / scale, (viewportBounds.height - comboRect.bottom) / scale, maxHeight));
         }
     }
 

packages/fineui/src/less/base/single/button/button.less

@@ -580,6 +580,10 @@ body .bi-button, #body .bi-button {
   .bi-button {
     background-color: @color-bi-background-button-theme-dark;
 
+    &.clear {
+      background-color: transparent;
+    }
+
     &.button-ignore {
       background-color: @color-bi-background-ignore-button-theme-dark;
 

packages/fineui/src/less/base/tree/ztree.less

@@ -335,3 +335,10 @@
   margin-right: 2px;
   vertical-align: top;
 }
+
+.ztree .button-loading-font {
+  .use-scale(width, 20px);
+  .use-scale(height, 20px);
+  .use-scale(left, 5px);
+  .use-scale(top, 5px);
+}

packages/fineui/src/widget/downlist/combo.downlist.js

@@ -108,6 +108,9 @@ export class DownListCombo extends Widget {
                 stopPropagation: o.stopPropagation,
                 maxHeight: o.maxHeight,
                 minWidth: o.minWidth,
+                ref: (ref) => {
+                    this.popup = ref;
+                },
                 ...o.popup,
             },
         });
@@ -125,6 +128,10 @@ export class DownListCombo extends Widget {
         this.downlistcombo.showView(e);
     }
 
+    getPopup() {
+        return this.popup;
+    }
+
     populate(items) {
         this.popupView.populate(items);
     }

packages/fineui/src/widget/dynamicdate/dynamicdate.card.js

@@ -45,6 +45,7 @@ export class DynamicDateCard extends Widget {
 
     props = {
         baseCls: "bi-dynamic-date-card",
+        supportWorkDay: true,
     };
 
     render() {
@@ -162,6 +163,7 @@ export class DynamicDateCard extends Widget {
                                 logic: {
                                     dynamic: true,
                                 },
+                                invisible: !this.options.supportWorkDay,
                                 text: i18nText("BI-Basic_Work_Day"),
                                 value: DynamicDateCard.TYPE.WORK_DAY,
                                 listeners: [

packages/fineui/src/widget/dynamicdate/dynamicdate.combo.js

@@ -51,6 +51,7 @@ export class DynamicDateCombo extends Single {
         attributes: {
             tabIndex: -1,
         },
+        supportWorkDay: true,
         isNeedAdjustHeight: false,
         isNeedAdjustWidth: false,
         isPreview: false, // 是否是预览状态
@@ -204,11 +205,12 @@ export class DynamicDateCombo extends Single {
                                 isPreview: opts.isPreview,
                                 width: opts.isNeedAdjustWidth ? opts.width : undefined,
                                 supportDynamic: opts.supportDynamic,
+                                supportWorkDay: opts.supportWorkDay,
                                 behaviors: opts.behaviors,
                                 min: opts.minDate,
                                 max: opts.maxDate,
                                 ref: _ref => {
-                                    this.popup = _ref;
+                                    this.popupEl = _ref;
                                 },
                                 listeners: [
                                     {
@@ -238,7 +240,7 @@ export class DynamicDateCombo extends Single {
                                     {
                                         eventName: DynamicDatePopup.BUTTON_OK_EVENT_CHANGE,
                                         action: () => {
-                                            const value = this.popup.getValue();
+                                            const value = this.popupEl.getValue();
                                             if (this._checkValue(value)) {
                                                 this.setValue(value);
                                             }
@@ -249,7 +251,7 @@ export class DynamicDateCombo extends Single {
                                     {
                                         eventName: DynamicDatePopup.EVENT_CHANGE,
                                         action: () => {
-                                            this.setValue(this.popup.getValue());
+                                            this.setValue(this.popupEl.getValue());
                                             this.combo.hideView();
                                             this.fireEvent(DynamicDateCombo.EVENT_CONFIRM);
                                         },
@@ -262,6 +264,10 @@ export class DynamicDateCombo extends Single {
                                     }
                                 ],
                             },
+                            ref: (ref) => {
+                                this.popup = ref;
+                            },
+                            ...opts.popup,
                         },
                         // // DEC-4250 和复选下拉一样，点击triggerBtn不默认收起
                         // hideChecker: function (e) {
@@ -271,9 +277,9 @@ export class DynamicDateCombo extends Single {
                             {
                                 eventName: Combo.EVENT_BEFORE_POPUPVIEW,
                                 action: () => {
-                                    this.popup.setMinDate(opts.minDate);
-                                    this.popup.setMaxDate(opts.maxDate);
-                                    this.popup.setValue(this.storeValue);
+                                    this.popupEl.setMinDate(opts.minDate);
+                                    this.popupEl.setMaxDate(opts.maxDate);
+                                    this.popupEl.setValue(this.storeValue);
                                     this.fireEvent(DynamicDateCombo.EVENT_BEFORE_POPUPVIEW);
                                 },
                             }
@@ -332,14 +338,14 @@ export class DynamicDateCombo extends Single {
         const o = this.options;
         o.minDate = minDate;
         this.trigger.setMinDate(minDate);
-        this.popup && this.popup.setMinDate(minDate);
+        this.popupEl && this.popupEl.setMinDate(minDate);
     }
 
     setMaxDate(maxDate) {
         const o = this.options;
         o.maxDate = maxDate;
         this.trigger.setMaxDate(maxDate);
-        this.popup && this.popup.setMaxDate(maxDate);
+        this.popupEl && this.popupEl.setMaxDate(maxDate);
     }
 
     setValue(v) {
@@ -356,6 +362,10 @@ export class DynamicDateCombo extends Single {
         return this.trigger.getKey();
     }
 
+    getPopup() {
+        return this.popup;
+    }
+
     hidePopupView() {
         this.combo.hideView();
     }

packages/fineui/src/widget/dynamicdate/dynamicdate.param.item.js

@@ -79,7 +79,7 @@ export class DynamicDateParamItem extends Widget {
                             value: 0,
                         },
                         {
-                            text: i18nText("BI-Basic_Behind"),
+                            text: i18nText("BI-Basic_Later"),
                             value: 1,
                         }
                     ],

packages/fineui/src/widget/dynamicdate/dynamicdate.popup.js

@@ -34,6 +34,7 @@ export class DynamicDatePopup extends Widget {
         baseCls: "bi-dynamic-date-popup",
         width: 272,
         supportDynamic: true,
+        supportWorkDay: true,
         isPreview: false, // 是否是预览状态
     };
 
@@ -164,6 +165,7 @@ export class DynamicDatePopup extends Widget {
                     return {
                         type: DynamicDateCard.xtype,
                         cls: "dynamic-date-pane",
+                        supportWorkDay: this.options.supportWorkDay,
                         listeners: [
                             {
                                 eventName: "EVENT_CHANGE",

packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js

@@ -39,6 +39,7 @@ export class DynamicDateTimeCombo extends Single {
         format: "",
         allowEdit: true,
         supportDynamic: true,
+        supportWorkDay: true,
         attributes: {
             tabIndex: -1,
         },
@@ -212,11 +213,12 @@ export class DynamicDateTimeCombo extends Single {
                                 timeSelectTypes: opts.timeSelectTypes,
                                 width: opts.isNeedAdjustWidth ? opts.width : undefined,
                                 supportDynamic: opts.supportDynamic,
+                                supportWorkDay: opts.supportWorkDay,
                                 behaviors: opts.behaviors,
                                 min: opts.minDate,
                                 max: opts.maxDate,
                                 ref: _ref => {
-                                    this.popup = _ref;
+                                    this.popupEl = _ref;
                                 },
                                 listeners: [
                                     {
@@ -249,7 +251,7 @@ export class DynamicDateTimeCombo extends Single {
                                     {
                                         eventName: DynamicDateTimePopup.BUTTON_OK_EVENT_CHANGE,
                                         action: () => {
-                                            const value = this.popup.getValue();
+                                            const value = this.popupEl.getValue();
                                             if (this._checkValue(value)) {
                                                 this.setValue(value);
                                             }
@@ -260,7 +262,7 @@ export class DynamicDateTimeCombo extends Single {
                                     {
                                         eventName: DynamicDateTimePopup.EVENT_CHANGE,
                                         action: () => {
-                                            this.setValue(this.popup.getValue());
+                                            this.setValue(this.popupEl.getValue());
                                             this.combo.hideView();
                                             this.fireEvent(DynamicDateTimeCombo.EVENT_CONFIRM);
                                         }
@@ -271,16 +273,20 @@ export class DynamicDateTimeCombo extends Single {
                                             this.fireEvent(DynamicDateTimeCombo.EVENT_BEFORE_YEAR_MONTH_POPUPVIEW);
                                         }
                                     }
-                                ]
-                            }
+                                ],
+                            },
+                            ref: (ref) => {
+                                this.popup = ref;
+                            },
+                            ...opts.popup,
                         },
                         listeners: [
                             {
                                 eventName: Combo.EVENT_BEFORE_POPUPVIEW,
                                 action: () => {
-                                    this.popup.setMinDate(opts.minDate);
-                                    this.popup.setMaxDate(opts.maxDate);
-                                    this.popup.setValue(this.storeValue);
+                                    this.popupEl.setMinDate(opts.minDate);
+                                    this.popupEl.setMaxDate(opts.maxDate);
+                                    this.popupEl.setValue(this.storeValue);
                                     this.fireEvent(DynamicDateTimeCombo.EVENT_BEFORE_POPUPVIEW);
                                 }
                             }
@@ -339,14 +345,14 @@ export class DynamicDateTimeCombo extends Single {
         const o = this.options;
         o.minDate = minDate;
         this.trigger.setMinDate(minDate);
-        this.popup && this.popup.setMinDate(minDate);
+        this.popupEl && this.popupEl.setMinDate(minDate);
     }
 
     setMaxDate(maxDate) {
         const o = this.options;
         o.maxDate = maxDate;
         this.trigger.setMaxDate(maxDate);
-        this.popup && this.popup.setMaxDate(maxDate);
+        this.popupEl && this.popupEl.setMaxDate(maxDate);
     }
 
     setValue(v) {
@@ -363,6 +369,10 @@ export class DynamicDateTimeCombo extends Single {
         return this.trigger.getKey();
     }
 
+    getPopup() {
+        return this.popup;
+    }
+
     hidePopupView() {
         this.combo.hideView();
     }

packages/fineui/src/widget/multilayerdownlist/combo.downlist.js

@@ -23,6 +23,7 @@ export class MultiLayerDownListCombo extends Widget {
             container: null,
             stopPropagation: false,
             el: {},
+            popup: {},
         });
     }
 
@@ -65,6 +66,7 @@ export class MultiLayerDownListCombo extends Widget {
                 el: this.popupview,
                 stopPropagation: o.stopPropagation,
                 maxHeight: 1000,
+                ...o.popup,
             },
         });
 

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

@@ -47,12 +47,16 @@ export class MultiSelectInsertCombo extends Single {
     static REQ_GET_ALL_DATA = "-1";
     static EVENT_FOCUS = "EVENT_FOCUS";
     static EVENT_BLUR = "EVENT_BLUR";
+    static EVENT_START = "EVENT_START";
     static EVENT_STOP = "EVENT_STOP";
     static EVENT_SEARCHING = "EVENT_SEARCHING";
     static EVENT_CLICK_ITEM = "EVENT_CLICK_ITEM";
     static EVENT_CONFIRM = "EVENT_CONFIRM";
     static EVENT_ADD_ITEM = "EVENT_ADD_ITEM";
     static EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW";
+    static EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
+    static EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW = "EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW";
+    static EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW = "EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW";
 
     _defaultConfig() {
         return extend(super._defaultConfig(...arguments), {
@@ -62,6 +66,8 @@ export class MultiSelectInsertCombo extends Single {
             height: 24,
             itemHeight: SIZE_CONSANTS.LIST_ITEM_HEIGHT,
             allowEdit: true,
+            popup: {},
+            masker: {},
         });
     }
 
@@ -97,6 +103,8 @@ export class MultiSelectInsertCombo extends Single {
 
         this.trigger = createWidget({
             type: MultiSelectInsertTrigger.xtype,
+            popup: o.popup,
+            masker: o.masker,
             allowEdit: o.allowEdit,
             height: toPix(o.height, o.simple ? 1 : 2),
             text: o.text,
@@ -122,6 +130,7 @@ export class MultiSelectInsertCombo extends Single {
         this.trigger.on(MultiSelectInsertTrigger.EVENT_START, function() {
             self._setStartValue("");
             this.getSearcher().setValue(self.storeValue);
+            self.fireEvent(MultiSelectInsertCombo.EVENT_START);
         });
         this.trigger.on(MultiSelectInsertTrigger.EVENT_STOP, () => {
             self._setStartValue("");
@@ -241,12 +250,14 @@ export class MultiSelectInsertCombo extends Single {
                         self.trigger.getSearcher().adjustView();
                     });
                 },
+                ...o.popup,
             },
             value: o.value,
             hideChecker(e) {
                 return (
                     triggerBtn.element.find(e.target).length === 0 &&
-                    self.numberCounter.element.find(e.target).length === 0
+                    size(self.numberCounter.getView()?.element.find(e.target)) === 0 &&
+                    size(self.trigger.getSearcher().getSearcher().getView()?.element.find(e.target)) === 0
                 );
             },
         });
@@ -259,6 +270,7 @@ export class MultiSelectInsertCombo extends Single {
             nextTick(() => {
                 self._populate();
             });
+            self.fireEvent(MultiSelectInsertCombo.EVENT_BEFORE_POPUPVIEW);
         });
         // 当退出的时候如果还在处理请求，则等请求结束后再对外发确定事件
         this.wants2Quit = false;
@@ -290,6 +302,8 @@ export class MultiSelectInsertCombo extends Single {
             valueFormatter: o.valueFormatter,
             itemsCreator: bind(this._itemsCreator4Trigger, this),
             value: o.value,
+            masker: o.masker,
+            popup: o.popup,
         });
         this.numberCounter.on(MultiSelectCheckSelectedSwitcher.EVENT_TRIGGER_CHANGE, () => {
             if (!self.combo.isViewVisible()) {
@@ -298,6 +312,10 @@ export class MultiSelectInsertCombo extends Single {
         });
         this.numberCounter.on(MultiSelectCheckSelectedSwitcher.EVENT_BEFORE_POPUPVIEW, function() {
             this.updateSelectedValue(self.storeValue);
+            self.fireEvent(MultiSelectInsertCombo.EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW);
+        });
+        this.numberCounter.on(MultiSelectCheckSelectedSwitcher.EVENT_AFTER_POPUPVIEW, function() {
+            self.fireEvent(MultiSelectInsertCombo.EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW);
         });
 
         this.numberCounter.on(Events.VIEW, b => {
@@ -555,4 +573,16 @@ export class MultiSelectInsertCombo extends Single {
         this._populate(...arguments);
         this.numberCounter.populateSwitcher(...arguments);
     }
+
+    getPopup() {
+        return this.popup;
+    }
+
+    getNumberCounter() {
+        return this.numberCounter;
+    }
+
+    getTrigger() {
+        return this.trigger;
+    }
 }

packages/fineui/src/widget/multiselect/multiselect.insert.trigger.js

@@ -50,7 +50,7 @@ export class MultiSelectInsertTrigger extends Trigger {
             itemFormatter: o.itemFormatter,
             itemHeight: o.itemHeight,
             watermark: o.watermark,
-            popup: {},
+            popup: o.popup,
             adapter: o.adapter,
             masker: o.masker,
             value: o.value,

packages/fineui/src/widget/multiselect/multiselect.trigger.js

@@ -50,7 +50,7 @@ export class MultiSelectTrigger extends Trigger {
             valueFormatter: o.valueFormatter,
             itemFormatter: o.itemFormatter,
             watermark: o.watermark,
-            popup: {},
+            popup: o.popup,
             adapter: o.adapter,
             masker: o.masker,
             value: o.value,

packages/fineui/src/widget/multiselect/trigger/searcher.multiselect.insert.js

@@ -132,6 +132,10 @@ export class MultiSelectInsertSearcher extends Widget {
         }
     }
 
+    getSearcher() {
+        return this.searcher;
+    }
+
     adjustView() {
         this.searcher.adjustView();
     }

packages/fineui/src/widget/multiselect/trigger/switcher.checkselected.js

@@ -9,8 +9,8 @@ export class MultiSelectCheckSelectedSwitcher extends Widget {
 
     static EVENT_TRIGGER_CHANGE = "EVENT_TRIGGER_CHANGE";
     static EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
+    static EVENT_AFTER_POPUPVIEW = "EVENT_AFTER_POPUPVIEW";
     static EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW";
-    static EVENT_TRIGGER_COMBO = "EVENT_TRIGGER_COMBO";
 
     _defaultConfig() {
         return extend(super._defaultConfig(...arguments), {
@@ -49,7 +49,6 @@ export class MultiSelectCheckSelectedSwitcher extends Widget {
                     itemsCreator: o.itemsCreator,
                     onClickContinueSelect() {
                         self.switcher.hideView();
-                        self.fireEvent(MultiSelectCheckSelectedSwitcher.EVENT_TRIGGER_COMBO);
                     },
                     ref(_ref) {
                         self.checkPane = _ref;
@@ -74,6 +73,7 @@ export class MultiSelectCheckSelectedSwitcher extends Widget {
             const me = this;
             nextTick(() => {
                 me._populate();
+                self.fireEvent(MultiSelectCheckSelectedSwitcher.EVENT_AFTER_POPUPVIEW);
             });
         });
     }
@@ -82,6 +82,10 @@ export class MultiSelectCheckSelectedSwitcher extends Widget {
         this.switcher.adjustView();
     }
 
+    getView() {
+        return this.switcher.getView();
+    }
+
     hideView() {
         this.switcher.empty();
         this.switcher.hideView();

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

@@ -10,7 +10,7 @@ import {
     VerticalAdaptLayout,
     deepClone,
     Selection,
-    SIZE_CONSANTS
+    size
 } from "@/core";
 import { Single, Combo } from "@/base";
 import { MultiTreeSearcher } from "./trigger/searcher.multi.tree";
@@ -27,12 +27,15 @@ export class MultiTreeCombo extends Single {
 
     static EVENT_FOCUS = "EVENT_FOCUS";
     static EVENT_BLUR = "EVENT_BLUR";
+    static EVENT_START = "EVENT_START";
     static EVENT_STOP = "EVENT_STOP";
     static EVENT_SEARCHING = "EVENT_SEARCHING";
     static EVENT_CLICK_ITEM = "EVENT_CLICK_ITEM";
     static EVENT_CONFIRM = "EVENT_CONFIRM";
     static EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
     static EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW";
+    static EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW = "EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW";
+    static EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW = "EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW";
 
     _defaultConfig() {
         return extend(super._defaultConfig(...arguments), {
@@ -42,6 +45,8 @@ export class MultiTreeCombo extends Single {
             height: 24,
             allowEdit: true,
             isNeedAdjustWidth: true,
+            popup: {},
+            masker: {},
         });
     }
 
@@ -63,23 +68,20 @@ export class MultiTreeCombo extends Single {
         this.storeValue = { value: o.value || {} };
 
         this.trigger = createWidget({
-            type: "bi.multi_select_trigger",
+            type: MultiSelectTrigger.xtype,
+            popup: o.popup,
+            masker: o.masker,
             allowEdit: o.allowEdit,
             height: toPix(o.height, o.simple ? 1 : 2),
             valueFormatter: o.valueFormatter,
             text: o.text,
             defaultText: o.defaultText,
             watermark: o.watermark,
-            masker: {
-                offset: {
-                    left: 0,
-                    top: 0,
-                    right: 0,
-                    bottom: SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1,
-                },
+            adapter: () => {
+                return this.popup.getView();
             },
             searcher: {
-                type: "bi.multi_tree_searcher",
+                type: MultiTreeSearcher.xtype,
                 itemsCreator: o.itemsCreator,
                 listeners: [
                     {
@@ -104,8 +106,6 @@ export class MultiTreeCombo extends Single {
                 type: MultiTreePopup.xtype,
                 ref() {
                     self.popup = this;
-                    self.trigger.setAdapter(this);
-                    self.numberCounter.setAdapter(this);
                 },
                 listeners: [
                     {
@@ -160,13 +160,16 @@ export class MultiTreeCombo extends Single {
                     });
                 },
                 maxWidth: o.isNeedAdjustWidth ? "auto" : 500,
+                ...o.popup,
             },
             isNeedAdjustWidth: o.isNeedAdjustWidth,
             value: { value: o.value || {} },
             hideChecker(e) {
                 return (
                     triggerBtn.element.find(e.target).length === 0 &&
-                    self.numberCounter.element.find(e.target).length === 0
+                    size(self.numberCounter.getView()?.element.find(e.target)) === 0 &&
+                    size(self.trigger.getSearcher().getSearcher().getView()?.element.find(e.target)) === 0 &&
+                    self.trigger.getSearcher().getSearcher().getView()?.element[0] !== e.target
                 );
             },
         });
@@ -182,7 +185,6 @@ export class MultiTreeCombo extends Single {
             return self.combo.isViewVisible();
         }
 
-        let shouldComboPopulate = true;
         this.trigger.on(MultiSelectTrigger.EVENT_FOCUS, () => {
             self.fireEvent(MultiTreeCombo.EVENT_FOCUS);
         });
@@ -194,6 +196,7 @@ export class MultiTreeCombo extends Single {
             self.storeValue = { value: self.combo.getValue() };
             this.setValue(self.storeValue);
             self.numberCounter.setValue(self.storeValue);
+            self.fireEvent(MultiTreeCombo.EVENT_START);
         });
         this.trigger.on(MultiSelectTrigger.EVENT_STOP, function () {
             self.storeValue = { value: this.getValue() };
@@ -260,14 +263,14 @@ export class MultiTreeCombo extends Single {
             }
             self.combo.setValue(self.storeValue);
             self.numberCounter.setValue(self.storeValue);
-            shouldComboPopulate && self.populate();
+            self.populate();
             self.fireEvent(MultiTreeCombo.EVENT_BEFORE_POPUPVIEW);
         });
         this.combo.on(Combo.EVENT_BEFORE_HIDEVIEW, () => {
             if (isSearching()) {
                 self._stopEditing();
                 self._dataChange &&
-                    self.fireEvent(MultiTreeCombo.EVENT_CONFIRM);
+                self.fireEvent(MultiTreeCombo.EVENT_CONFIRM);
             } else {
                 if (isPopupView()) {
                     self._stopEditing();
@@ -276,7 +279,7 @@ export class MultiTreeCombo extends Single {
                         self.storeValue = { value: {} };
                     }
                     self._dataChange &&
-                        self.fireEvent(MultiTreeCombo.EVENT_CONFIRM);
+                    self.fireEvent(MultiTreeCombo.EVENT_CONFIRM);
                 }
             }
             clear = false;
@@ -296,39 +299,26 @@ export class MultiTreeCombo extends Single {
         });
 
         this.numberCounter = createWidget({
-            type: "bi.multi_select_check_selected_switcher",
+            type: MultiSelectCheckSelectedSwitcher,
             el: {
-                // type: "bi.multi_tree_check_selected_button",
                 type: MultiTreeCheckSelectedButton.xtype,
             },
             popup: {
-                // type: "bi.multi_tree_check_pane",
                 type: MultiTreeCheckPane.xtype,
+                ...o.popup,
             },
-            masker: {
-                offset: {
-                    left: 0,
-                    top: 0,
-                    right: 0,
-                    bottom: SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1,
-                },
+            adapter: () => {
+                return this.popup.getView();
             },
+            masker: o.masker,
             itemsCreator: o.itemsCreator,
             valueFormatter: o.valueFormatter,
             value: { value: o.value || {} },
         });
-        this.numberCounter.on(
-            MultiSelectCheckSelectedSwitcher.EVENT_TRIGGER_COMBO,
-            () => {
-                self.populate();
-                shouldComboPopulate = true;
-            }
-        );
         this.numberCounter.on(
             MultiSelectCheckSelectedSwitcher.EVENT_TRIGGER_CHANGE,
             () => {
                 if (!self.combo.isViewVisible()) {
-                    shouldComboPopulate = false;
                     self.combo.showView();
                 }
             }
@@ -343,8 +333,12 @@ export class MultiTreeCombo extends Single {
                     want2showCounter = null;
                     showCounter();
                 }
+                this.fireEvent(MultiTreeCombo.EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW);
             }
         );
+        this.numberCounter.on(MultiSelectCheckSelectedSwitcher.EVENT_AFTER_POPUPVIEW, function() {
+            self.fireEvent(MultiTreeCombo.EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW);
+        });
 
         this.numberCounter.on(Events.VIEW, b => {
             nextTick(() => {
@@ -452,4 +446,16 @@ export class MultiTreeCombo extends Single {
     setWaterMark(v) {
         this.trigger.setWaterMark(v);
     }
+
+    getPopup() {
+        return this.popup;
+    }
+
+    getNumberCounter() {
+        return this.numberCounter;
+    }
+
+    getTrigger() {
+        return this.trigger;
+    }
 }

packages/fineui/src/widget/multitree/multi.tree.popup.js

@@ -105,4 +105,8 @@ export class MultiTreePopup extends Pane {
     resetWidth(w) {
         this.popupView.resetWidth(w);
     }
+
+    getView() {
+        return this.popupView.getView();
+    }
 }

packages/fineui/src/widget/multitree/trigger/searcher.multi.tree.js

@@ -220,6 +220,10 @@ export class MultiTreeSearcher extends Widget {
         return this.editor.getState();
     }
 
+    getSearcher() {
+        return this.searcher;
+    }
+
     setValue(ob) {
         this.setState(ob);
         this.searcher.setValue(ob);

packages/fineui/src/widget/numberinterval/numberinterval.js

@@ -41,6 +41,8 @@ export class NumberInterval extends Single {
     static EVENT_CONFIRM = "EVENT_CONFIRM";
     static EVENT_VALID = "EVENT_VALID";
     static EVENT_ERROR = "EVENT_ERROR";
+    static EVENT_BEFORE_LEFT_POPUPVIEW = "EVENT_BEFORE_LEFT_POPUPVIEW";
+    static EVENT_BEFORE_RIGHT_POPUPVIEW = "EVENT_BEFORE_RIGHT_POPUPVIEW";
 
     _defaultConfig() {
         const conf = super._defaultConfig(...arguments);
@@ -151,6 +153,8 @@ export class NumberInterval extends Single {
         });
         this.smallCombo = createWidget({
             type: IconCombo.xtype,
+            container: o.container,
+            popup: o.popup,
             cls: `number-interval-small-combo${
                 o.simple ? "" : " bi-border-top bi-border-bottom bi-border-right bi-border-corner-right-radius"
             }`,
@@ -168,6 +172,12 @@ export class NumberInterval extends Single {
                     iconCls: "less-equal-font",
                 },
             ],
+            listeners: [{
+                eventName: IconCombo.EVENT_BEFORE_POPUPVIEW,
+                action: () => {
+                    this.fireEvent(NumberInterval.EVENT_BEFORE_LEFT_POPUPVIEW);
+                },
+            }],
         });
         if (o.closeMin === true) {
             this.smallCombo.setValue(1);
@@ -176,6 +186,8 @@ export class NumberInterval extends Single {
         }
         this.bigCombo = createWidget({
             type: IconCombo.xtype,
+            container: o.container,
+            popup: o.popup,
             cls: `number-interval-big-combo${
                 o.simple ? "" : " bi-border-top bi-border-bottom bi-border-left bi-border-corner-left-radius"
             }`,
@@ -193,6 +205,12 @@ export class NumberInterval extends Single {
                     iconCls: "less-equal-font",
                 },
             ],
+            listeners: [{
+                eventName: IconCombo.EVENT_BEFORE_POPUPVIEW,
+                action: () => {
+                    this.fireEvent(NumberInterval.EVENT_BEFORE_RIGHT_POPUPVIEW);
+                },
+            }],
         });
         if (o.closeMax === true) {
             this.bigCombo.setValue(1);
@@ -621,6 +639,14 @@ export class NumberInterval extends Single {
         this.bigEditor.focus();
     }
 
+    getLeftCombo() {
+        return this.smallCombo;
+    }
+
+    getRightCombo() {
+        return this.bigCombo;
+    }
+
     destroyed() {
         const c = this.constants;
         Bubbles.remove(c.typeError);

packages/fineui/src/widget/singleselect/search/singleselect.search.loader.js

@@ -12,7 +12,7 @@ import {
     isArray,
     isKey,
     Func,
-    SIZE_CONSANTS
+    SIZE_CONSANTS,
 } from "@/core";
 import { ButtonGroup, Loader } from "@/base";
 import { SingleSelectList } from "../singleselect.list";
@@ -71,7 +71,7 @@ export class SingleSelectSearchLoader extends Widget {
                         layouts: [
                             {
                                 type: VerticalLayout.xtype,
-                            }
+                            },
                         ],
                     },
                 },
@@ -122,11 +122,11 @@ export class SingleSelectSearchLoader extends Widget {
                     height: SIZE_CONSANTS.LIST_ITEM_HEIGHT,
                     selected: false,
                     iconWrapperWidth: 26,
-                    hgap: o.allowNoSelect ? 10 : 0,
+                    textHgap: o.allowNoSelect ? 10 : 0,
                     title: item.title || item.text,
                 },
-                item
-            )
+                item,
+            ),
         );
     }
 

packages/fineui/src/widget/singleselect/singleselect.insert.combo.js

@@ -10,7 +10,8 @@ import {
     isNotNull,
     nextTick,
     AbsoluteLayout,
-    makeObject
+    makeObject,
+    size
 } from "@/core";
 import { Single, Combo } from "@/base";
 import { SingleSelectTrigger } from "./singleselect.trigger";
@@ -25,10 +26,12 @@ export class SingleSelectInsertCombo extends Single {
     static REQ_GET_ALL_DATA = -1;
     static EVENT_FOCUS = "EVENT_FOCUS";
     static EVENT_BLUR = "EVENT_BLUR";
+    static EVENT_START = "EVENT_START";
     static EVENT_STOP = "EVENT_STOP";
     static EVENT_SEARCHING = "EVENT_SEARCHING";
     static EVENT_CLICK_ITEM = "EVENT_CLICK_ITEM";
     static EVENT_CONFIRM = "EVENT_CONFIRM";
+    static EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW"
 
     _defaultConfig() {
         return extend(super._defaultConfig(...arguments), {
@@ -40,6 +43,8 @@ export class SingleSelectInsertCombo extends Single {
             height: 24,
             allowEdit: true,
             watermark: i18nText("BI-Basic_Search_And_Patch_Paste"),
+            popup: {},
+            masker: {},
         });
     }
 
@@ -57,6 +62,7 @@ export class SingleSelectInsertCombo extends Single {
 
         this.trigger = createWidget({
             type: SingleSelectTrigger.xtype,
+            masker: o.masker,
             watermark: o.watermark,
             height: toPix(o.height, o.simple ? 1 : 2),
             allowNoSelect: o.allowNoSelect,
@@ -77,6 +83,7 @@ export class SingleSelectInsertCombo extends Single {
             searcher: {
                 popup: {
                     type: SingleSelectSearchInsertPane.xtype,
+                    ...o.popup,
                 },
             },
         });
@@ -91,6 +98,7 @@ export class SingleSelectInsertCombo extends Single {
         this.trigger.on(SingleSelectTrigger.EVENT_START, function () {
             self._setStartValue();
             this.getSearcher().setValue(self.storeValue);
+            self.fireEvent(SingleSelectInsertCombo.EVENT_START);
         });
         this.trigger.on(SingleSelectTrigger.EVENT_STOP, () => {
             self._setStartValue();
@@ -156,9 +164,13 @@ export class SingleSelectInsertCombo extends Single {
                         self.trigger.getSearcher().adjustView();
                     });
                 },
+                ...o.popup,
             },
             hideChecker(e) {
-                return triggerBtn.element.find(e.target).length === 0;
+                return (
+                    triggerBtn.element.find(e.target).length === 0 &&
+                    size(self.trigger.getSearcher().getSearcher().getView()?.element.find(e.target)) === 0
+                );
             },
             value: o.value,
         });
@@ -171,6 +183,7 @@ export class SingleSelectInsertCombo extends Single {
             nextTick(() => {
                 self.populate();
             });
+            self.fireEvent(SingleSelectInsertCombo .EVENT_BEFORE_POPUPVIEW);
         });
         // 当退出的时候如果还在处理请求，则等请求结束后再对外发确定事件
         this.wants2Quit = false;
@@ -261,4 +274,12 @@ export class SingleSelectInsertCombo extends Single {
     populate() {
         this.combo.populate(...arguments);
     }
+
+    getPopup() {
+        return this.popup;
+    }
+
+    getTrigger() {
+        return this.trigger;
+    }
 }

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

@@ -131,6 +131,10 @@ export class SingleSelectSearcher extends Widget {
         return this.searcher.getView() && this.searcher.getView().hasChecked();
     }
 
+    getSearcher() {
+        return this.searcher;
+    }
+
     setAdapter(adapter) {
         this.searcher.setAdapter(adapter);
     }

packages/fineui/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js

@@ -20,6 +20,7 @@ export class TextValueDownListCombo extends Widget {
     static xtype = "bi.text_value_down_list_combo";
 
     static EVENT_CHANGE = "EVENT_CHANGE";
+    static EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
 
     _defaultConfig(config) {
         return extend(super._defaultConfig(...arguments), {
@@ -42,6 +43,7 @@ export class TextValueDownListCombo extends Widget {
         this.combo = createWidget({
             type: DownListCombo.xtype,
             element: this,
+            container: o.container,
             chooseType: Selection.Single,
             adjustLength: 2,
             width: toPix(o.width, 2),
@@ -59,6 +61,7 @@ export class TextValueDownListCombo extends Widget {
             },
             value: isNull(value) ? [] : [value],
             items: deepClone(o.items),
+            popup: o.popup,
         });
 
         this.combo.on(DownListCombo.EVENT_CHANGE, () => {
@@ -76,6 +79,10 @@ export class TextValueDownListCombo extends Widget {
                 this.fireEvent(TextValueDownListCombo.EVENT_CHANGE);
             }
         });
+
+        this.combo.on(DownListCombo.EVENT_BEFORE_POPUPVIEW, () => {
+            this.fireEvent(TextValueDownListCombo.EVENT_BEFORE_POPUPVIEW);
+        });
     }
 
     _createValueMap() {
@@ -114,4 +121,8 @@ export class TextValueDownListCombo extends Widget {
         this.combo.populate(items);
         this._createValueMap();
     }
+
+    getPopup() {
+        return this.combo.getPopup();
+    }
 }

packages/fineui/src/widget/timeinterval/dateinterval.js

@@ -30,6 +30,8 @@ export class DateInterval extends Single {
     static EVENT_ERROR = "EVENT_ERROR";
     static EVENT_CHANGE = "EVENT_CHANGE";
     static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW = "EVENT_BEFORE_YEAR_MONTH_POPUPVIEW";
+    static EVENT_BEFORE_START_POPUPVIEW = "EVENT_BEFORE_START_POPUPVIEW";
+    static EVENT_BEFORE_END_POPUPVIEW = "EVENT_BEFORE_END_POPUPVIEW";
 
     _defaultConfig() {
         const conf = super._defaultConfig(...arguments);
@@ -39,7 +41,9 @@ export class DateInterval extends Single {
             minDate: "1900-01-01",
             maxDate: "2099-12-31",
             height: 24,
+            format: "",
             supportDynamic: true,
+            supportWorkDay: true,
             simple: false,
         });
     }
@@ -50,6 +54,13 @@ export class DateInterval extends Single {
         this.left = this._createCombo(o.value.start, o.watermark?.start);
         this.right = this._createCombo(o.value.end, o.watermark?.end);
 
+        this.left.on(DynamicDateCombo.EVENT_BEFORE_POPUPVIEW, () => {
+            this.fireEvent(DateInterval.EVENT_BEFORE_START_POPUPVIEW);
+        })
+        this.right.on(DynamicDateCombo.EVENT_BEFORE_POPUPVIEW, () => {
+            this.fireEvent(DateInterval.EVENT_BEFORE_END_POPUPVIEW);
+        })
+
         return {
             type: HorizontalFillLayout.xtype,
             columnSize: ["fill", "", "fill"],
@@ -79,12 +90,16 @@ export class DateInterval extends Single {
         const o = this.options;
         const combo = createWidget({
             type: DynamicDateCombo.xtype,
+            container: o.container,
+            popup: o.popup,
             isPreview: o.isPreview,
             supportDynamic: o.supportDynamic,
+            supportWorkDay: o.supportWorkDay,
             minDate: o.minDate,
             maxDate: o.maxDate,
             simple: o.simple,
             behaviors: o.behaviors,
+            format: o.format,
             watermark,
             value: v,
             height: o.height,
@@ -166,7 +181,8 @@ export class DateInterval extends Single {
             print(parseDateTime(date, "%Y-%x-%d"), "%Y-%x-%d") === date ||
             print(parseDateTime(date, "%Y-%X-%d"), "%Y-%X-%d") === date ||
             print(parseDateTime(date, "%Y-%x-%e"), "%Y-%x-%e") === date ||
-            print(parseDateTime(date, "%Y-%X-%e"), "%Y-%X-%e") === date
+            print(parseDateTime(date, "%Y-%X-%e"), "%Y-%X-%e") === date ||
+            this.options.format !== '' && print(parseDateTime(date, this.options.format), this.options.format) === date
         );
     }
 
@@ -177,19 +193,22 @@ export class DateInterval extends Single {
     }
 
     _check(smallDate, bigDate) {
-        const smallObj = smallDate.match(/\d+/g),
-            bigObj = bigDate.match(/\d+/g);
-
+        // 现在有自定义样式,所以有["%X", "%d", "%Y"]这种不是[year, month, day]的情况,下面取对应的ymd就出错
+        // 所以先把这个string转成date,再转成默认格式string,只对自定义格式的date做处理
+        const newSmallDate = this.options.format ? print(parseDateTime(smallDate, this.options.format), "%Y-%X-%d") : smallDate;
+        const newBigDate = this.options.format ? print(parseDateTime(bigDate, this.options.format), "%Y-%X-%d") : bigDate;
+        const smallObj = newSmallDate.match(/\d+/g),
+            bigObj = newBigDate.match(/\d+/g);
         return (
-            this._dateCheck(smallDate) &&
-            checkDateLegal(smallDate) &&
+            this._dateCheck(newSmallDate) &&
+            checkDateLegal(newSmallDate) &&
             this._checkVoid({
                 year: smallObj[0],
                 month: smallObj[1],
                 day: smallObj[2],
             }) &&
-            this._dateCheck(bigDate) &&
-            checkDateLegal(bigDate) &&
+            this._dateCheck(newBigDate) &&
+            checkDateLegal(newBigDate) &&
             this._checkVoid({
                 year: bigObj[0],
                 month: bigObj[1],
@@ -243,4 +262,11 @@ export class DateInterval extends Single {
             end: this.right.getValue(),
         };
     }
+
+    getPopup() {
+        return {
+            start: this.left.getPopup(),
+            end: this.right.getPopup(),
+        };
+    }
 }

packages/fineui/src/widget/timeinterval/timeinterval.js

@@ -29,6 +29,9 @@ export class TimeInterval extends Single {
     static EVENT_VALID = "EVENT_VALID";
     static EVENT_ERROR = "EVENT_ERROR";
     static EVENT_CHANGE = "EVENT_CHANGE";
+    static EVENT_BEFORE_START_POPUPVIEW = "EVENT_BEFORE_START_POPUPVIEW";
+    static EVENT_BEFORE_END_POPUPVIEW = "EVENT_BEFORE_END_POPUPVIEW";
+    static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW = "EVENT_BEFORE_YEAR_MONTH_POPUPVIEW";
 
     _defaultConfig() {
         const conf = super._defaultConfig(...arguments);
@@ -38,7 +41,9 @@ export class TimeInterval extends Single {
             minDate: "1900-01-01",
             maxDate: "2099-12-31",
             height: 24,
+            format: "",
             supportDynamic: true,
+            supportWorkDay: true,
         });
     }
 
@@ -48,6 +53,13 @@ export class TimeInterval extends Single {
         this.left = this._createCombo(o.value.start, o.watermark?.start);
         this.right = this._createCombo(o.value.end, o.watermark?.end);
 
+        this.left.on(DynamicDateTimeCombo.EVENT_BEFORE_POPUPVIEW, () => {
+            this.fireEvent(TimeInterval.EVENT_BEFORE_START_POPUPVIEW);
+        })
+        this.right.on(DynamicDateTimeCombo.EVENT_BEFORE_POPUPVIEW, () => {
+            this.fireEvent(TimeInterval.EVENT_BEFORE_END_POPUPVIEW);
+        })
+
         return {
             type: HorizontalFillLayout.xtype,
             columnSize: ["fill", "", "fill"],
@@ -77,16 +89,28 @@ export class TimeInterval extends Single {
         const o = this.options;
         const combo = createWidget({
             type: DynamicDateTimeCombo.xtype,
+            container: o.container,
+            popup: o.popup,
             isPreview: o.isPreview,
             timeSelectTypes: o.timeSelectTypes,
+            supportWorkDay: o.supportWorkDay,
             simple: o.simple,
             supportDynamic: o.supportDynamic,
             minDate: o.minDate,
             maxDate: o.maxDate,
+            format: o.format,
             behaviors: o.behaviors,
             watermark,
             value: v,
             height: o.height,
+            listeners: [
+                {
+                    eventName: DynamicDateTimeCombo.EVENT_BEFORE_YEAR_MONTH_POPUPVIEW,
+                    action: () => {
+                        this.fireEvent(TimeInterval.EVENT_BEFORE_YEAR_MONTH_POPUPVIEW);
+                    },
+                },
+            ],
         });
         combo.on(DynamicDateTimeCombo.EVENT_ERROR, () => {
             this._clearTitle();
@@ -173,7 +197,8 @@ export class TimeInterval extends Single {
             print(parseDateTime(date, "%Y-%x-%d %H:%M:%S"), "%Y-%x-%d %H:%M:%S") === date ||
             print(parseDateTime(date, "%Y-%X-%d %H:%M:%S"), "%Y-%X-%d %H:%M:%S") === date ||
             print(parseDateTime(date, "%Y-%x-%e %H:%M:%S"), "%Y-%x-%e %H:%M:%S") === date ||
-            print(parseDateTime(date, "%Y-%X-%e %H:%M:%S"), "%Y-%X-%e %H:%M:%S") === date
+            print(parseDateTime(date, "%Y-%X-%e %H:%M:%S"), "%Y-%X-%e %H:%M:%S") === date ||
+            this.options.format !== '' && print(parseDateTime(date, this.options.format), this.options.format) === date
         );
     }
 
@@ -184,19 +209,22 @@ export class TimeInterval extends Single {
     }
 
     _check(smallDate, bigDate) {
-        const smallObj = smallDate.match(/\d+/g),
-            bigObj = bigDate.match(/\d+/g);
-
+        // 现在有自定义样式,所以有["%X", "%d", "%Y"]这种不是[year, month, day]的情况,下面取对应的ymd就出错
+        // 所以先把这个string转成date,再转成默认格式string,只对自定义格式的date做处理
+        const newSmallDate = this.options.format ? print(parseDateTime(smallDate, this.options.format), "%Y-%X-%d %H:%M:%S") : smallDate;
+        const newBigDate = this.options.format ? print(parseDateTime(bigDate, this.options.format), "%Y-%X-%d %H:%M:%S") : bigDate;
+        const smallObj = newSmallDate.match(/\d+/g),
+            bigObj = newBigDate.match(/\d+/g);
         return (
-            this._dateCheck(smallDate) &&
-            checkDateLegal(smallDate) &&
+            this._dateCheck(newSmallDate) &&
+            checkDateLegal(newSmallDate) &&
             this._checkVoid({
                 year: smallObj[0],
                 month: smallObj[1],
                 day: smallObj[2],
             }) &&
-            this._dateCheck(bigDate) &&
-            checkDateLegal(bigDate) &&
+            this._dateCheck(newBigDate) &&
+            checkDateLegal(newBigDate) &&
             this._checkVoid({
                 year: bigObj[0],
                 month: bigObj[1],
@@ -250,4 +278,11 @@ export class TimeInterval extends Single {
             end: this.right.getValue(),
         };
     }
+
+    getPopup() {
+        return {
+            start: this.left.getPopup(),
+            end: this.right.getPopup(),
+        };
+    }
 }

packages/fineui/src/widget/year/combo.year.js

@@ -98,13 +98,13 @@ export class DynamicYearCombo extends Widget {
                     supportDynamic: o.supportDynamic,
                     isPreview: o.isPreview,
                     ref: _ref => {
-                        this.popup = _ref;
+                        this.popupEl = _ref;
                     },
                     listeners: [
                         {
                             eventName: DynamicYearPopup.EVENT_CHANGE,
                             action: () => {
-                                this.setValue(this.popup.getValue());
+                                this.setValue(this.popupEl.getValue());
                                 this.combo.hideView();
                                 this.fireEvent(DynamicYearCombo.EVENT_CONFIRM);
                             },
@@ -129,7 +129,7 @@ export class DynamicYearCombo extends Widget {
                         {
                             eventName: DynamicYearPopup.BUTTON_OK_EVENT_CHANGE,
                             action: () => {
-                                this.setValue(this.popup.getValue());
+                                this.setValue(this.popupEl.getValue());
                                 this.combo.hideView();
                                 this.fireEvent(DynamicDateCombo.EVENT_CONFIRM);
                             },
@@ -140,12 +140,16 @@ export class DynamicYearCombo extends Widget {
                     max: o.maxDate,
                 },
                 value: o.value || "",
+                ref: (ref) => {
+                    this.popup = ref;
+                },
+                ...o.popup,
             },
         });
         this.combo.on(Combo.EVENT_BEFORE_POPUPVIEW, () => {
-            this.popup.setMinDate(o.minDate);
-            this.popup.setMaxDate(o.maxDate);
-            this.popup.setValue(this.storeValue);
+            this.popupEl.setMinDate(o.minDate);
+            this.popupEl.setMaxDate(o.maxDate);
+            this.popupEl.setValue(this.storeValue);
             this.fireEvent(DynamicYearCombo.EVENT_BEFORE_POPUPVIEW);
         });
 
@@ -205,14 +209,14 @@ export class DynamicYearCombo extends Widget {
         const o = this.options;
         o.minDate = minDate;
         this.trigger.setMinDate(minDate);
-        this.popup && this.popup.setMinDate(minDate);
+        this.popupEl && this.popupEl.setMinDate(minDate);
     }
 
     setMaxDate(maxDate) {
         const o = this.options;
         o.maxDate = maxDate;
         this.trigger.setMaxDate(maxDate);
-        this.popup && this.popup.setMaxDate(maxDate);
+        this.popupEl && this.popupEl.setMaxDate(maxDate);
     }
 
     hideView() {
@@ -240,6 +244,10 @@ export class DynamicYearCombo extends Widget {
     setWaterMark(v) {
         this.trigger.setWaterMark(v);
     }
+
+    getPopup() {
+        return this.popup;
+    }
 }
 extend(DynamicYearCombo, {
     Static: 1,

packages/fineui/src/widget/yearmonth/combo.yearmonth.js

@@ -109,13 +109,13 @@ export class DynamicYearMonthCombo extends Single {
                     supportDynamic: o.supportDynamic,
                     isPreview: o.isPreview,
                     ref: _ref => {
-                        this.popup = _ref;
+                        this.popupEl = _ref;
                     },
                     listeners: [
                         {
                             eventName: DynamicYearMonthPopup.EVENT_CHANGE,
                             action: () => {
-                                this.setValue(this.popup.getValue());
+                                this.setValue(this.popupEl.getValue());
                                 this.combo.hideView();
                                 this.fireEvent(DynamicYearMonthCombo.EVENT_CONFIRM);
                             },
@@ -147,7 +147,7 @@ export class DynamicYearMonthCombo extends Single {
                         {
                             eventName: DynamicYearMonthPopup.BUTTON_OK_EVENT_CHANGE,
                             action: () => {
-                                const value = this.popup.getValue();
+                                const value = this.popupEl.getValue();
                                 if (this._checkValue(value)) {
                                     this.setValue(value);
                                 }
@@ -161,12 +161,16 @@ export class DynamicYearMonthCombo extends Single {
                     max: o.maxDate,
                 },
                 value: o.value || "",
+                ref: (ref) => {
+                    this.popup = ref;
+                },
+                ...o.popup,
             },
         });
         this.combo.on(Combo.EVENT_BEFORE_POPUPVIEW, () => {
-            this.popup.setMinDate(o.minDate);
-            this.popup.setMaxDate(o.maxDate);
-            this.popup.setValue(this.storeValue);
+            this.popupEl.setMinDate(o.minDate);
+            this.popupEl.setMaxDate(o.maxDate);
+            this.popupEl.setValue(this.storeValue);
             this.fireEvent(DynamicYearMonthCombo.EVENT_BEFORE_POPUPVIEW);
         });
 
@@ -241,14 +245,18 @@ export class DynamicYearMonthCombo extends Single {
         const o = this.options;
         o.minDate = minDate;
         this.trigger.setMinDate(minDate);
-        this.popup && this.popup.setMinDate(minDate);
+        this.popupEl && this.popupEl.setMinDate(minDate);
     }
 
     setMaxDate(maxDate) {
         const o = this.options;
         o.maxDate = maxDate;
         this.trigger.setMaxDate(maxDate);
-        this.popup && this.popup.setMaxDate(maxDate);
+        this.popupEl && this.popupEl.setMaxDate(maxDate);
+    }
+
+    getPopup() {
+        return this.popup;
     }
 
     hideView() {

packages/fineui/src/widget/yearmonthinterval/yearmonthinterval.js

@@ -20,6 +20,8 @@ export class YearMonthInterval extends Single {
     static EVENT_ERROR = "EVENT_ERROR";
     static EVENT_CHANGE = "EVENT_CHANGE";
     static EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
+    static EVENT_BEFORE_START_POPUPVIEW = "EVENT_BEFORE_START_POPUPVIEW";
+    static EVENT_BEFORE_END_POPUPVIEW = "EVENT_BEFORE_END_POPUPVIEW";
 
     constants = {
         width: 25,
@@ -43,6 +45,13 @@ export class YearMonthInterval extends Single {
         this.left = this._createCombo(o.value.start, o.watermark?.start);
         this.right = this._createCombo(o.value.end, o.watermark?.end);
 
+        this.left.on(DynamicYearMonthCombo.EVENT_BEFORE_POPUPVIEW, () => {
+            this.fireEvent(YearMonthInterval.EVENT_BEFORE_START_POPUPVIEW);
+        })
+        this.right.on(DynamicYearMonthCombo.EVENT_BEFORE_POPUPVIEW, () => {
+            this.fireEvent(YearMonthInterval.EVENT_BEFORE_END_POPUPVIEW);
+        })
+
         return {
             type: HorizontalFillLayout.xtype,
             columnSize: ["fill", "", "fill"],
@@ -72,6 +81,8 @@ export class YearMonthInterval extends Single {
         const o = this.options;
         const combo = createWidget({
             type: DynamicYearMonthCombo.xtype,
+            container: o.container,
+            popup: o.popup,
             isPreview: o.isPreview,
             simple: o.simple,
             supportDynamic: o.supportDynamic,
@@ -235,4 +246,11 @@ export class YearMonthInterval extends Single {
     getValue() {
         return { start: this.left.getValue(), end: this.right.getValue() };
     }
+
+    getPopup() {
+        return {
+            start: this.left.getPopup(),
+            end: this.right.getPopup(),
+        };
+    }
 }

packages/fineui/src/widget/yearquarter/combo.yearquarter.js

@@ -112,13 +112,13 @@ export class DynamicYearQuarterCombo extends Widget {
                     supportDynamic: o.supportDynamic,
                     isPreview: o.isPreview,
                     ref: _ref => {
-                        this.popup = _ref;
+                        this.popupEl = _ref;
                     },
                     listeners: [
                         {
                             eventName: DynamicYearQuarterPopup.EVENT_CHANGE,
                             action: () => {
-                                this.setValue(this.popup.getValue());
+                                this.setValue(this.popupEl.getValue());
                                 this.combo.hideView();
                                 this.fireEvent(DynamicYearQuarterCombo.EVENT_CONFIRM);
                             },
@@ -150,7 +150,7 @@ export class DynamicYearQuarterCombo extends Widget {
                         {
                             eventName: DynamicYearQuarterPopup.BUTTON_OK_EVENT_CHANGE,
                             action: () => {
-                                const value = this.popup.getValue();
+                                const value = this.popupEl.getValue();
                                 if (this._checkValue(value)) {
                                     this.setValue(value);
                                 }
@@ -164,12 +164,16 @@ export class DynamicYearQuarterCombo extends Widget {
                     max: o.maxDate,
                 },
                 value: o.value || "",
+                ref: (ref) => {
+                    this.popup = ref;
+                },
+                ...o.popup,
             },
         });
         this.combo.on(Combo.EVENT_BEFORE_POPUPVIEW, () => {
-            this.popup.setMinDate(o.minDate);
-            this.popup.setMaxDate(o.maxDate);
-            this.popup.setValue(this.storeValue);
+            this.popupEl.setMinDate(o.minDate);
+            this.popupEl.setMaxDate(o.maxDate);
+            this.popupEl.setValue(this.storeValue);
             this.fireEvent(DynamicYearQuarterCombo.EVENT_BEFORE_POPUPVIEW);
         });
 
@@ -244,14 +248,18 @@ export class DynamicYearQuarterCombo extends Widget {
         const o = this.options;
         o.minDate = minDate;
         this.trigger.setMinDate(minDate);
-        this.popup && this.popup.setMinDate(minDate);
+        this.popupEl && this.popupEl.setMinDate(minDate);
     }
 
     setMaxDate(maxDate) {
         const o = this.options;
         o.maxDate = maxDate;
         this.trigger.setMaxDate(maxDate);
-        this.popup && this.popup.setMaxDate(maxDate);
+        this.popupEl && this.popupEl.setMaxDate(maxDate);
+    }
+
+    getPopup() {
+        return this.popup;
     }
 
     hideView() {

packages/fineui/typescript/case/combo/iconcombo/combo.icon.ts

@@ -1,13 +1,17 @@
+import { PopupView } from "../../../base/layer/layer.popup";
 import { Widget } from '../../../core/widget';
 
 export declare class IconCombo extends Widget {
     static xtype: string;
 
     static EVENT_CHANGE: string;
+    static EVENT_BEFORE_POPUPVIEW: string;
 
     showView(): void;
 
     hideView(): void;
 
     populate(items: any[]): void;
+
+    getPopup(): PopupView;
 }

packages/fineui/typescript/index.ts

@@ -103,6 +103,7 @@ export { CenterAdaptLayout } from "./core/wrapper/layout/adapt/adapt.center";
 export { VerticalAdaptLayout } from "./core/wrapper/layout/adapt/adapt.vertical";
 export { MultiSelectInsertCombo } from "./widget/multiselect/multiselect.insert.combo";
 export { MultiSelectCombo } from "./widget/multiselect/multiselect.combo";
+export { MultiSelectCheckSelectedSwitcher } from "./widget/multiselect/switcher.checkselected";
 export { SearchEditor } from "./widget/editor/editor.search";
 export { MultiLayerSingleLevelTree } from "./widget/multilayersingletree/multilayersingletree.leveltree";
 export { SimpleColorChooser } from "./case/colorchooser/colorchooser.simple";

packages/fineui/typescript/widget/downlist/combo.downlist.ts

@@ -1,3 +1,4 @@
+import { PopupView } from "../../base/layer/layer.popup";
 import { Widget } from "../../core/widget";
 
 export declare class DownListCombo extends Widget {
@@ -15,4 +16,6 @@ export declare class DownListCombo extends Widget {
     adjustWidth: (e?: MouseEvent) => void;
 
     adjustHeight: (e?: MouseEvent) => void;
+
+    getPopup(): PopupView;
 }

packages/fineui/typescript/widget/dynamicdate/dynamicdate.combo.ts

@@ -1,4 +1,5 @@
-import { Single } from '../../base/single/single';
+import { PopupView } from "../../base/layer/layer.popup";
+import { Single } from "../../base/single/single";
 
 export declare class DynamicDateCombo extends Single {
     static xtype: string;
@@ -21,11 +22,13 @@ export declare class DynamicDateCombo extends Single {
         format?: string;
         allowEdit?: boolean;
         supportDynamic?: boolean;
+        supportWorkDay?: boolean;
         attributes?: {
             tabIndex?: number;
         };
         watermark?: string;
         simple?: boolean;
+        popup?: any;
     } & Single['props']
 
     setMinDate(minDate: string): void;
@@ -43,6 +46,8 @@ export declare class DynamicDateCombo extends Single {
     blur(): void;
 
     setWaterMark(v: string): void;
+
+    getPopup(): PopupView;
 }
 
 export interface DynamicDataComboValue {

packages/fineui/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts

@@ -1,3 +1,4 @@
+import { PopupView } from '../../base/layer/layer.popup';
 import { Single } from '../../base/single/single';
 
 export declare class DynamicDateTimeCombo extends Single {
@@ -19,10 +20,12 @@ export declare class DynamicDateTimeCombo extends Single {
         format?: string;
         allowEdit?: boolean;
         supportDynamic?: boolean;
+        supportWorkDay?: boolean;
         attributes?: {
             tabIndex?: number;
         };
         watermark?: string;
+        popup?: any;
     } & Single['props'];
 
     getValue(): DynamicDateTimeComboValue;
@@ -40,6 +43,8 @@ export declare class DynamicDateTimeCombo extends Single {
     blur(): void;
 
     setWaterMark(v: string): void
+
+    getPopup(): PopupView;
 }
 
 export interface DynamicDateTimeComboValue {

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

@@ -1,9 +1,12 @@
+import { PopupView } from "../../base/layer/layer.popup";
 import { Single } from "../../base/single/single";
+import { MultiSelectCheckSelectedSwitcher } from "./switcher.checkselected";
 
 export declare class MultiSelectInsertCombo extends Single {
     static xtype: string;
     static EVENT_FOCUS: string;
     static EVENT_BLUR: string;
+    static EVENT_START: string;
     static EVENT_STOP: string;
     static EVENT_SEARCHING: string;
     static EVENT_CLICK_ITEM: string;
@@ -12,6 +15,9 @@ export declare class MultiSelectInsertCombo extends Single {
     static REQ_GET_DATA_LENGTH: 1;
     static REQ_GET_ALL_DATA: -1;
     static EVENT_AFTER_HIDEVIEW: string;
+    static EVENT_BEFORE_POPUPVIEW: string;
+    static EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW: string;
+    static EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW: string;
 
     props: {
         itemsCreator?: Function;
@@ -21,6 +27,8 @@ export declare class MultiSelectInsertCombo extends Single {
         text?: string;
         watermark?: string;
         container?: any;
+        popup?: any;
+        masker?: any;
     } & Single["props"];
 
     _itemsCreator4Trigger(op: any, callback: Function): void;
@@ -67,5 +75,9 @@ export declare class MultiSelectInsertCombo extends Single {
         assist: string[];
     };
 
+    getPopup(): PopupView;
+
+    getNumberCounter(): MultiSelectCheckSelectedSwitcher;
+
     populate(...args: any[]): void;
 }

packages/fineui/typescript/widget/multiselect/switcher.checkselected.ts

@@ -0,0 +1,19 @@
+import { Widget } from '../../core/widget';
+
+export declare class MultiSelectCheckSelectedSwitcher extends Widget {
+    static xtype: string;
+    static EVENT_TRIGGER_CHANGE: string;
+    static EVENT_BEFORE_POPUPVIEW: string;
+    static EVENT_AFTER_HIDEVIEW: string;
+
+    props: {
+        itemsCreator?: Function;
+        valueFormatter?: Function;
+    };
+
+    adjustView(): void;
+
+    hideView(): void;
+
+    getView(): Widget;
+}

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

@@ -1,5 +1,7 @@
+import { PopupView } from "../../base/layer/layer.popup";
 import { Single } from "../../base/single/single";
 import { Widget } from "../../core/widget";
+import { MultiSelectCheckSelectedSwitcher } from "../multiselect/switcher.checkselected";
 
 export declare class MultiTreeCombo extends Single {
     static xtype: string;
@@ -10,6 +12,13 @@ export declare class MultiTreeCombo extends Single {
     static EVENT_CLICK_ITEM: string;
     static EVENT_CONFIRM: string;
     static EVENT_BEFORE_POPUPVIEW: string;
+    static EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW: string;
+    static EVENT_AFTER_NUMBER_COUNTER_POPUPVIEW: string;
+
+    props: {
+        popup?: any;
+        masker?: any;
+    } & Single["props"];
 
     showView(): void;
     hideView(): void;
@@ -21,4 +30,8 @@ export declare class MultiTreeCombo extends Single {
     blur(): void;
 
     setWaterMark(v: string): void;
+
+    getPopup(): PopupView;
+
+    getNumberCounter(): MultiSelectCheckSelectedSwitcher;
 }

packages/fineui/typescript/widget/multitree/multi.tree.popup.ts

@@ -1,3 +1,4 @@
+import { ButtonGroup } from "../../base/combination/group.button";
 import { Pane } from "../../base/pane";
 
 export declare class MultiTreePopup extends Pane {
@@ -12,4 +13,6 @@ export declare class MultiTreePopup extends Pane {
     resetHeight(h: number): void;
 
     resetWidth(w: number): void;
+
+    getView(): ButtonGroup;
 }

packages/fineui/typescript/widget/numberinterval/numberinterval.ts

@@ -1,3 +1,4 @@
+import { Combo } from '../../base/combination/combo';
 import { Single } from '../../base/single/single';
 
 export declare class NumberInterval extends Single {
@@ -6,6 +7,8 @@ export declare class NumberInterval extends Single {
     static EVENT_CONFIRM: string;
     static EVENT_VALID: string;
     static EVENT_ERROR: string;
+    static EVENT_BEFORE_LEFT_POPUPVIEW: string;
+    static EVENT_BEFORE_RIGHT_POPUPVIEW: string;
 
     props: {
         watermark?: string;
@@ -40,4 +43,8 @@ export declare class NumberInterval extends Single {
     focusMinEditor(): void;
 
     focusMaxEditor(): void;
+
+    getLeftCombo(): Combo;
+
+    getRightCombo(): Combo;
 }

packages/fineui/typescript/widget/singleselect/singleselect.insert.combo.ts

@@ -1,3 +1,4 @@
+import { PopupView } from "../../base/layer/layer.popup";
 import { Single } from "../../base/single/single";
 
 export declare class SingleSelectInsertCombo extends Single {
@@ -8,6 +9,7 @@ export declare class SingleSelectInsertCombo extends Single {
     static EVENT_SEARCHING: string;
     static EVENT_CLICK_ITEM: string;
     static EVENT_CONFIRM: string;
+    static EVENT_BEFORE_POPUPVIEW: string;
 
     props: {
         text?: string,
@@ -16,5 +18,8 @@ export declare class SingleSelectInsertCombo extends Single {
         valueFormatter?: Function,
         allowEdit?: boolean,
         watermark?: string,
+        popup?: any;
     } & Single['props']
+
+    getPopup(): PopupView;
 }

packages/fineui/typescript/widget/textvaluedownlistcombo/combo.textvaluedownlist.ts

@@ -1,8 +1,17 @@
+import { PopupView } from "../../base/layer/layer.popup";
 import { Widget } from "../../core/widget";
 
 export declare class TextValueDownListCombo extends Widget {
     static xtype: string;
     static EVENT_CHANGE: string;
+    static EVENT_BEFORE_POPUPVIEW: string;
+
+    props: {
+        container?: string;
+        popup?: any;
+    };
 
     getValue<T>(): [T];
+
+    getPopup(): PopupView;
 }

packages/fineui/typescript/widget/timeinterval/dateinterval.ts

@@ -1,5 +1,5 @@
 import { Single } from "../../base/single/single";
-import { DynamicDataComboValue } from "../dynamicdate/dynamicdate.combo";
+import { DynamicDataComboValue, DynamicDateCombo } from "../dynamicdate/dynamicdate.combo";
 
 export declare class DateInterval extends Single {
     static xtype: string;
@@ -7,13 +7,18 @@ export declare class DateInterval extends Single {
     static EVENT_VALID: string;
     static EVENT_ERROR: string;
     static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW: string;
+    static EVENT_BEFORE_START_POPUPVIEW: string;
+    static EVENT_BEFORE_END_POPUPVIEW: string;
 
     props: {
         minDate?: string;
         maxDate?: string;
         supportDynamic?: boolean;
+        supportWorkDay?: boolean;
         watermark?: string;
-    } & Single['props']
+        container?: string;
+        popup?: any;
+    } & Single["props"];
 
     getValue(): {
         start: DynamicDataComboValue;
@@ -23,4 +28,9 @@ export declare class DateInterval extends Single {
     setMinDate(minDate: string): void;
 
     setMaxDate(minDate: string): void;
+
+    getPopup(): {
+        start: DynamicDateCombo;
+        end: DynamicDateCombo;
+    };
 }

packages/fineui/typescript/widget/timeinterval/timeinterval.ts

@@ -1,18 +1,24 @@
 import { Single } from "../../base/single/single";
-import { DynamicDateTimeComboValue } from "../dynamicdatetime/dynamicdatetime.combo";
+import { DynamicDateTimeCombo, DynamicDateTimeComboValue } from "../dynamicdatetime/dynamicdatetime.combo";
 
 export declare class TimeInterval extends Single {
     static xtype: string;
     static EVENT_CHANGE: string;
     static EVENT_VALID: string;
     static EVENT_ERROR: string;
+    static EVENT_BEFORE_START_POPUPVIEW: string;
+    static EVENT_BEFORE_END_POPUPVIEW: string;
+    static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW: string;
 
     props: {
         minDate?: string;
         maxDate?: string;
         supportDynamic?: boolean;
+        supportWorkDay?: boolean;
         watermark?: string;
         simple?: boolean;
+        container?: string;
+        popup?: any;
     } & Single['props'];
 
     getValue(): {
@@ -23,4 +29,9 @@ export declare class TimeInterval extends Single {
     setMinDate(minDate: string): void;
 
     setMaxDate(minDate: string): void;
+
+    getPopup(): {
+        start: DynamicDateTimeCombo;
+        end: DynamicDateTimeCombo;
+    };
 }

packages/fineui/typescript/widget/year/combo.year.ts

@@ -1,3 +1,4 @@
+import { PopupView } from "../../base/layer/layer.popup";
 import { Widget } from "../../core/widget";
 
 export declare class DynamicYearCombo extends Widget {
@@ -7,11 +8,17 @@ export declare class DynamicYearCombo extends Widget {
     static EVENT_CONFIRM: string;
     static EVENT_BEFORE_POPUPVIEW: string;
 
+    props: {
+        popup?: any;
+    };
+
     getValue(): DynamicYearComboValue;
 
     setMinDate(minDate: string): void;
 
     setMaxDate(maxDate: string): void;
+
+    getPopup(): PopupView;
 }
 
 export interface DynamicYearComboValue {

packages/fineui/typescript/widget/yearmonth/combo.yearmonth.ts

@@ -1,3 +1,4 @@
+import { PopupView } from "../../base/layer/layer.popup";
 import { Single } from "../../base/single/single";
 
 export declare class DynamicYearMonthCombo extends Single {
@@ -8,6 +9,10 @@ export declare class DynamicYearMonthCombo extends Single {
     static EVENT_CONFIRM: string;
     static EVENT_BEFORE_POPUPVIEW: string;
 
+    props: {
+        popup?: any;
+    } & Single["props"];
+
     hideView(): void;
 
     getKey(): string;
@@ -17,6 +22,8 @@ export declare class DynamicYearMonthCombo extends Single {
     setMinDate(minDate: string): void;
 
     setMaxDate(maxDate: string): void;
+
+    getPopup(): PopupView;
 }
 
 export interface DynamicYearMonthComboValue {

packages/fineui/typescript/widget/yearmonthinterval/yearmonthinterval.ts

@@ -1,5 +1,5 @@
 import { Single } from '../../base/single/single';
-import { DynamicYearMonthComboValue } from '../yearmonth/combo.yearmonth';
+import { DynamicYearMonthCombo, DynamicYearMonthComboValue } from '../yearmonth/combo.yearmonth';
 
 export declare class YearMonthInterval extends Single {
     static xtype: string;
@@ -7,9 +7,13 @@ export declare class YearMonthInterval extends Single {
     static EVENT_ERROR: string;
     static EVENT_CHANGE: string;
     static EVENT_BEFORE_POPUPVIEW: string;
+    static EVENT_BEFORE_START_POPUPVIEW: string;
+    static EVENT_BEFORE_END_POPUPVIEW: string;
 
     props: {
         simple?: boolean;
+        container?: string;
+        popup?: any;
     } & Single['props'];
 
     getValue(): {
@@ -20,4 +24,9 @@ export declare class YearMonthInterval extends Single {
     setMinDate(minDate: string): void;
 
     setMaxDate(maxDate: string): void;
+
+    getPopup(): {
+        start: DynamicYearMonthCombo;
+        end: DynamicYearMonthCombo;
+    };
 }

packages/fineui/typescript/widget/yearquarter/combo.yearquarter.ts

@@ -1,3 +1,4 @@
+import { PopupView } from "../../base/layer/layer.popup";
 import { Widget } from "../../core/widget";
 
 export declare class DynamicYearQuarterCombo extends Widget {
@@ -5,11 +6,17 @@ export declare class DynamicYearQuarterCombo extends Widget {
     static EVENT_CONFIRM: string;
     static EVENT_BEFORE_POPUPVIEW: string;
 
+    props: {
+        popup?: any;
+    };
+
     getValue(): DynamicYearQuarterComboValue;
 
     setMinDate(minDate: string): void;
 
     setMaxDate(maxDate: string): void;
+
+    getPopup(): PopupView;
 }
 
 export interface DynamicYearQuarterComboValue {