KERNEL-18940 refactor: 类型补充

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.combo.js

@@ -208,7 +208,7 @@ export class DynamicDateCombo extends Single {
                                 min: opts.minDate,
                                 max: opts.maxDate,
                                 ref: _ref => {
-                                    this.popup = _ref;
+                                    this.popupEl = _ref;
                                 },
                                 listeners: [
                                     {
@@ -238,7 +238,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 +249,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);
                                         },
@@ -261,8 +261,11 @@ export class DynamicDateCombo extends Single {
                                         },
                                     }
                                 ],
-                                ...opts.popup,
                             },
+                            ref: (ref) => {
+                                this.popup = ref;
+                            },
+                            ...opts.popup,
                         },
                         // // DEC-4250 和复选下拉一样，点击triggerBtn不默认收起
                         // hideChecker: function (e) {
@@ -272,9 +275,9 @@ export class DynamicDateCombo extends Single {
                             {
                                 eventName: Combo.EVENT_BEFORE_POPUPVIEW,
                                 action: () => {
-                                    this.popup.setMinDate(opts.minDate);
+                                    this.popupEl.setMinDate(opts.minDate);
-                                    this.popup.setMaxDate(opts.maxDate);
+                                    this.popupEl.setMaxDate(opts.maxDate);
-                                    this.popup.setValue(this.storeValue);
+                                    this.popupEl.setValue(this.storeValue);
                                     this.fireEvent(DynamicDateCombo.EVENT_BEFORE_POPUPVIEW);
                                 },
                             }
@@ -333,14 +336,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) {

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

@@ -216,7 +216,7 @@ export class DynamicDateTimeCombo extends Single {
                                 min: opts.minDate,
                                 max: opts.maxDate,
                                 ref: _ref => {
-                                    this.popup = _ref;
+                                    this.popupEl = _ref;
                                 },
                                 listeners: [
                                     {
@@ -249,7 +249,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 +260,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);
                                         }
@@ -272,16 +272,19 @@ export class DynamicDateTimeCombo extends Single {
                                         }
                                     }
                                 ],
-                                ...opts.popup,
+                            },
-                            }
+                            ref: (ref) => {
+                                this.popup = ref;
+                            },
+                            ...opts.popup,
                         },
                         listeners: [
                             {
                                 eventName: Combo.EVENT_BEFORE_POPUPVIEW,
                                 action: () => {
-                                    this.popup.setMinDate(opts.minDate);
+                                    this.popupEl.setMinDate(opts.minDate);
-                                    this.popup.setMaxDate(opts.maxDate);
+                                    this.popupEl.setMaxDate(opts.maxDate);
-                                    this.popup.setValue(this.storeValue);
+                                    this.popupEl.setValue(this.storeValue);
                                     this.fireEvent(DynamicDateTimeCombo.EVENT_BEFORE_POPUPVIEW);
                                 }
                             }
@@ -340,14 +343,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) {

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/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);
                             },
@@ -138,15 +138,18 @@ export class DynamicYearCombo extends Widget {
                     behaviors: o.behaviors,
                     min: o.minDate,
                     max: o.maxDate,
-                    ...o.popup,
                 },
                 value: o.value || "",
+                ref: (ref) => {
+                    this.popup = ref;
+                },
+                ...o.popup,
             },
         });
         this.combo.on(Combo.EVENT_BEFORE_POPUPVIEW, () => {
-            this.popup.setMinDate(o.minDate);
+            this.popupEl.setMinDate(o.minDate);
-            this.popup.setMaxDate(o.maxDate);
+            this.popupEl.setMaxDate(o.maxDate);
-            this.popup.setValue(this.storeValue);
+            this.popupEl.setValue(this.storeValue);
             this.fireEvent(DynamicYearCombo.EVENT_BEFORE_POPUPVIEW);
         });
 
@@ -206,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() {

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);
                                 }
@@ -159,15 +159,18 @@ export class DynamicYearMonthCombo extends Single {
                     behaviors: o.behaviors,
                     min: o.minDate,
                     max: o.maxDate,
-                    ...o.popup,
                 },
                 value: o.value || "",
+                ref: (ref) => {
+                    this.popup = ref;
+                },
+                ...o.popup,
             },
         });
         this.combo.on(Combo.EVENT_BEFORE_POPUPVIEW, () => {
-            this.popup.setMinDate(o.minDate);
+            this.popupEl.setMinDate(o.minDate);
-            this.popup.setMaxDate(o.maxDate);
+            this.popupEl.setMaxDate(o.maxDate);
-            this.popup.setValue(this.storeValue);
+            this.popupEl.setValue(this.storeValue);
             this.fireEvent(DynamicYearMonthCombo.EVENT_BEFORE_POPUPVIEW);
         });
 
@@ -242,14 +245,14 @@ 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() {

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);
                                 }
@@ -162,15 +162,18 @@ export class DynamicYearQuarterCombo extends Widget {
                     behaviors: o.behaviors,
                     min: o.minDate,
                     max: o.maxDate,
-                    ...o.popup,
                 },
                 value: o.value || "",
+                ref: (ref) => {
+                    this.popup = ref;
+                },
+                ...o.popup,
             },
         });
         this.combo.on(Combo.EVENT_BEFORE_POPUPVIEW, () => {
-            this.popup.setMinDate(o.minDate);
+            this.popupEl.setMinDate(o.minDate);
-            this.popup.setMaxDate(o.maxDate);
+            this.popupEl.setMaxDate(o.maxDate);
-            this.popup.setValue(this.storeValue);
+            this.popupEl.setValue(this.storeValue);
             this.fireEvent(DynamicYearQuarterCombo.EVENT_BEFORE_POPUPVIEW);
         });
 
@@ -245,14 +248,14 @@ 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() {

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;
@@ -26,6 +27,7 @@ export declare class DynamicDateCombo extends Single {
         };
         watermark?: string;
         simple?: boolean;
+        popup?: any;
     } & Single['props']
 
     setMinDate(minDate: string): void;
@@ -43,6 +45,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 {
@@ -23,6 +24,7 @@ export declare class DynamicDateTimeCombo extends Single {
             tabIndex?: number;
         };
         watermark?: string;
+        popup?: any;
     } & Single['props'];
 
     getValue(): DynamicDateTimeComboValue;
@@ -40,6 +42,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,4 +1,6 @@
+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;
@@ -12,6 +14,8 @@ 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;
 
     props: {
         itemsCreator?: Function;
@@ -21,6 +25,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 +73,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,12 @@ 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;
+
+    props: {
+        popup?: any;
+        masker?: any;
+    } & Single["props"];
 
     showView(): void;
     hideView(): void;
@@ -21,4 +29,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/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,17 @@ 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;
         watermark?: string;
-    } & Single['props']
+        container?: string;
+        popup?: any;
+    } & Single["props"];
 
     getValue(): {
         start: DynamicDataComboValue;
@@ -23,4 +27,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,11 +1,13 @@
 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;
 
     props: {
         minDate?: string;
@@ -13,6 +15,8 @@ export declare class TimeInterval extends Single {
         supportDynamic?: boolean;
         watermark?: string;
         simple?: boolean;
+        container?: string;
+        popup?: any;
     } & Single['props'];
 
     getValue(): {
@@ -23,4 +27,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 {