From 5a053e72ce751a626459037c456e24b1dcf357b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=A0=E5=B1=8F=E5=B1=B1=E6=9C=80=E9=80=9F=E4=B8=8B?= =?UTF-8?q?=E5=B1=B1=E4=BC=A0=E8=AF=B4?= Date: Mon, 26 Aug 2024 11:36:32 +0800 Subject: [PATCH] Revert "Pull request #16: Feature/x" This reverts commit 50477a38e89f0ef27a87c3536c1a3638ad8d1bef, reversing changes made to deddfff869216fdbefb70753b547e201948d38bb. --- packages/fineui/package.json | 2 +- packages/fineui/src/base/combination/tab.js | 9 +-- .../src/base/single/input/radio/radio.js | 9 +++ .../src/case/toolbar/toolbar.multiselect.js | 1 - packages/fineui/src/case/ztree/asynctree.js | 4 ++ packages/fineui/src/core/utils/dom.js | 5 +- packages/fineui/src/less/base/tree/ztree.less | 7 --- .../src/widget/downlist/combo.downlist.js | 7 --- .../widget/dynamicdate/dynamicdate.combo.js | 24 +++----- .../dynamicdatetime/dynamicdatetime.combo.js | 28 ++++----- .../multiselect/multiselect.insert.combo.js | 28 +-------- .../multiselect/multiselect.insert.trigger.js | 2 +- .../widget/multiselect/multiselect.trigger.js | 2 +- .../trigger/searcher.multiselect.insert.js | 4 -- .../trigger/switcher.checkselected.js | 4 -- .../src/widget/multitree/multi.tree.combo.js | 57 ++++++++----------- .../src/widget/multitree/multi.tree.popup.js | 4 -- .../multitree/trigger/searcher.multi.tree.js | 4 -- .../singleselect/singleselect.insert.combo.js | 25 +------- .../trigger/searcher.singleselect.js | 4 -- .../combo.textvaluedownlist.js | 11 ---- .../src/widget/timeinterval/dateinterval.js | 18 ------ .../src/widget/timeinterval/timeinterval.js | 18 ------ packages/fineui/src/widget/year/combo.year.js | 24 +++----- .../src/widget/yearmonth/combo.yearmonth.js | 24 +++----- .../yearmonthinterval/yearmonthinterval.js | 18 ------ .../widget/yearquarter/combo.yearquarter.js | 24 +++----- packages/fineui/typescript/index.ts | 1 - .../widget/downlist/combo.downlist.ts | 3 - .../widget/dynamicdate/dynamicdate.combo.ts | 6 +- .../dynamicdatetime/dynamicdatetime.combo.ts | 4 -- .../multiselect/multiselect.insert.combo.ts | 10 ---- .../multiselect/switcher.checkselected.ts | 19 ------- .../widget/multitree/multi.tree.combo.ts | 12 ---- .../widget/multitree/multi.tree.popup.ts | 3 - .../singleselect/singleselect.insert.combo.ts | 5 -- .../combo.textvaluedownlist.ts | 9 --- .../widget/timeinterval/dateinterval.ts | 13 +---- .../widget/timeinterval/timeinterval.ts | 11 +--- .../typescript/widget/year/combo.year.ts | 7 --- .../widget/yearmonth/combo.yearmonth.ts | 7 --- .../yearmonthinterval/yearmonthinterval.ts | 11 +--- .../widget/yearquarter/combo.yearquarter.ts | 7 --- 43 files changed, 93 insertions(+), 402 deletions(-) delete mode 100644 packages/fineui/typescript/widget/multiselect/switcher.checkselected.ts diff --git a/packages/fineui/package.json b/packages/fineui/package.json index 17ef6a00a..509cc8077 100644 --- a/packages/fineui/package.json +++ b/packages/fineui/package.json @@ -60,4 +60,4 @@ "core-js": "^3.37.1", "cross-env": "^7.0.3" } -} +} \ No newline at end of file diff --git a/packages/fineui/src/base/combination/tab.js b/packages/fineui/src/base/combination/tab.js index 8c6da9f4d..c9f79278a 100644 --- a/packages/fineui/src/base/combination/tab.js +++ b/packages/fineui/src/base/combination/tab.js @@ -13,8 +13,7 @@ import { contains, any, isEqual, - LogicFactory, - Events, + LogicFactory } from "@/core"; /** @@ -107,11 +106,7 @@ export class Tab extends Widget { Widget.execWithContext(this, () => { this.cardMap[v] = cardCreator(v); }); - const card = this.layout.addCardByName(v, this.cardMap[v]); - card.on(Events.DESTROY, () => { - this.layout.deleteCardByName(v); - delete this.cardMap[v]; - }); + this.layout.addCardByName(v, this.cardMap[v]); } } diff --git a/packages/fineui/src/base/single/input/radio/radio.js b/packages/fineui/src/base/single/input/radio/radio.js index aa9eae19b..fa6a10401 100644 --- a/packages/fineui/src/base/single/input/radio/radio.js +++ b/packages/fineui/src/base/single/input/radio/radio.js @@ -56,4 +56,13 @@ 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"); + } + } } diff --git a/packages/fineui/src/case/toolbar/toolbar.multiselect.js b/packages/fineui/src/case/toolbar/toolbar.multiselect.js index 9ca7281de..f0df9ce78 100644 --- a/packages/fineui/src/case/toolbar/toolbar.multiselect.js +++ b/packages/fineui/src/case/toolbar/toolbar.multiselect.js @@ -126,7 +126,6 @@ export class MultiSelectBar extends BasicButton { } setSelected(v) { - super.setSelected(v); this.checkbox.setSelected(v); this.setHalfSelected(false); } diff --git a/packages/fineui/src/case/ztree/asynctree.js b/packages/fineui/src/case/ztree/asynctree.js index 7c6efe09c..7921ef821 100644 --- a/packages/fineui/src/case/ztree/asynctree.js +++ b/packages/fineui/src/case/ztree/asynctree.js @@ -221,11 +221,15 @@ 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, }, ], }); diff --git a/packages/fineui/src/core/utils/dom.js b/packages/fineui/src/core/utils/dom.js index 275aa3adf..1be70de14 100644 --- a/packages/fineui/src/core/utils/dom.js +++ b/packages/fineui/src/core/utils/dom.js @@ -743,13 +743,12 @@ 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) / scale, comboRect.top / scale, maxHeight)); + popup.resetHeight(Math.min(viewportBounds.height - positionTop, comboRect.top, maxHeight)); } else if (positionTop >= comboRect.bottom) { - popup.resetHeight(Math.min((viewportBounds.height - positionTop) / scale, (viewportBounds.height - comboRect.bottom) / scale, maxHeight)); + popup.resetHeight(Math.min(viewportBounds.height - positionTop, viewportBounds.height - comboRect.bottom, maxHeight)); } } diff --git a/packages/fineui/src/less/base/tree/ztree.less b/packages/fineui/src/less/base/tree/ztree.less index 4932e49ef..e7869baae 100644 --- a/packages/fineui/src/less/base/tree/ztree.less +++ b/packages/fineui/src/less/base/tree/ztree.less @@ -335,10 +335,3 @@ 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); -} \ No newline at end of file diff --git a/packages/fineui/src/widget/downlist/combo.downlist.js b/packages/fineui/src/widget/downlist/combo.downlist.js index eb65d8758..341372724 100644 --- a/packages/fineui/src/widget/downlist/combo.downlist.js +++ b/packages/fineui/src/widget/downlist/combo.downlist.js @@ -108,9 +108,6 @@ export class DownListCombo extends Widget { stopPropagation: o.stopPropagation, maxHeight: o.maxHeight, minWidth: o.minWidth, - ref: (ref) => { - this.popup = ref; - }, ...o.popup, }, }); @@ -128,10 +125,6 @@ export class DownListCombo extends Widget { this.downlistcombo.showView(e); } - getPopup() { - return this.popup; - } - populate(items) { this.popupView.populate(items); } diff --git a/packages/fineui/src/widget/dynamicdate/dynamicdate.combo.js b/packages/fineui/src/widget/dynamicdate/dynamicdate.combo.js index 27e0caae0..3fa097e55 100644 --- a/packages/fineui/src/widget/dynamicdate/dynamicdate.combo.js +++ b/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.popupEl = _ref; + this.popup = _ref; }, listeners: [ { @@ -238,7 +238,7 @@ export class DynamicDateCombo extends Single { { eventName: DynamicDatePopup.BUTTON_OK_EVENT_CHANGE, action: () => { - const value = this.popupEl.getValue(); + const value = this.popup.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.popupEl.getValue()); + this.setValue(this.popup.getValue()); this.combo.hideView(); this.fireEvent(DynamicDateCombo.EVENT_CONFIRM); }, @@ -262,10 +262,6 @@ export class DynamicDateCombo extends Single { } ], }, - ref: (ref) => { - this.popup = ref; - }, - ...opts.popup, }, // // DEC-4250 和复选下拉一样，点击triggerBtn不默认收起 // hideChecker: function (e) { @@ -275,9 +271,9 @@ export class DynamicDateCombo extends Single { { eventName: Combo.EVENT_BEFORE_POPUPVIEW, action: () => { - this.popupEl.setMinDate(opts.minDate); - this.popupEl.setMaxDate(opts.maxDate); - this.popupEl.setValue(this.storeValue); + this.popup.setMinDate(opts.minDate); + this.popup.setMaxDate(opts.maxDate); + this.popup.setValue(this.storeValue); this.fireEvent(DynamicDateCombo.EVENT_BEFORE_POPUPVIEW); }, } @@ -336,14 +332,14 @@ export class DynamicDateCombo extends Single { const o = this.options; o.minDate = minDate; this.trigger.setMinDate(minDate); - this.popupEl && this.popupEl.setMinDate(minDate); + this.popup && this.popup.setMinDate(minDate); } setMaxDate(maxDate) { const o = this.options; o.maxDate = maxDate; this.trigger.setMaxDate(maxDate); - this.popupEl && this.popupEl.setMaxDate(maxDate); + this.popup && this.popup.setMaxDate(maxDate); } setValue(v) { @@ -360,10 +356,6 @@ export class DynamicDateCombo extends Single { return this.trigger.getKey(); } - getPopup() { - return this.popup; - } - hidePopupView() { this.combo.hideView(); } diff --git a/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js index 3be733631..e65e12768 100644 --- a/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js +++ b/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.popupEl = _ref; + this.popup = _ref; }, listeners: [ { @@ -249,7 +249,7 @@ export class DynamicDateTimeCombo extends Single { { eventName: DynamicDateTimePopup.BUTTON_OK_EVENT_CHANGE, action: () => { - const value = this.popupEl.getValue(); + const value = this.popup.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.popupEl.getValue()); + this.setValue(this.popup.getValue()); this.combo.hideView(); this.fireEvent(DynamicDateTimeCombo.EVENT_CONFIRM); } @@ -271,20 +271,16 @@ 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.popupEl.setMinDate(opts.minDate); - this.popupEl.setMaxDate(opts.maxDate); - this.popupEl.setValue(this.storeValue); + this.popup.setMinDate(opts.minDate); + this.popup.setMaxDate(opts.maxDate); + this.popup.setValue(this.storeValue); this.fireEvent(DynamicDateTimeCombo.EVENT_BEFORE_POPUPVIEW); } } @@ -343,14 +339,14 @@ export class DynamicDateTimeCombo extends Single { const o = this.options; o.minDate = minDate; this.trigger.setMinDate(minDate); - this.popupEl && this.popupEl.setMinDate(minDate); + this.popup && this.popup.setMinDate(minDate); } setMaxDate(maxDate) { const o = this.options; o.maxDate = maxDate; this.trigger.setMaxDate(maxDate); - this.popupEl && this.popupEl.setMaxDate(maxDate); + this.popup && this.popup.setMaxDate(maxDate); } setValue(v) { @@ -367,10 +363,6 @@ export class DynamicDateTimeCombo extends Single { return this.trigger.getKey(); } - getPopup() { - return this.popup; - } - hidePopupView() { this.combo.hideView(); } diff --git a/packages/fineui/src/widget/multiselect/multiselect.insert.combo.js b/packages/fineui/src/widget/multiselect/multiselect.insert.combo.js index 4cf2d8dfd..61e9f125a 100644 --- a/packages/fineui/src/widget/multiselect/multiselect.insert.combo.js +++ b/packages/fineui/src/widget/multiselect/multiselect.insert.combo.js @@ -47,15 +47,12 @@ 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"; _defaultConfig() { return extend(super._defaultConfig(...arguments), { @@ -65,8 +62,6 @@ export class MultiSelectInsertCombo extends Single { height: 24, itemHeight: SIZE_CONSANTS.LIST_ITEM_HEIGHT, allowEdit: true, - popup: {}, - masker: {}, }); } @@ -102,8 +97,6 @@ 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, @@ -129,7 +122,6 @@ 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(""); @@ -249,14 +241,12 @@ export class MultiSelectInsertCombo extends Single { self.trigger.getSearcher().adjustView(); }); }, - ...o.popup, }, value: o.value, hideChecker(e) { return ( triggerBtn.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.numberCounter.element.find(e.target).length === 0 ); }, }); @@ -269,7 +259,6 @@ export class MultiSelectInsertCombo extends Single { nextTick(() => { self._populate(); }); - self.fireEvent(MultiSelectInsertCombo.EVENT_BEFORE_POPUPVIEW); }); // 当退出的时候如果还在处理请求，则等请求结束后再对外发确定事件 this.wants2Quit = false; @@ -301,8 +290,6 @@ 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()) { @@ -311,7 +298,6 @@ 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(Events.VIEW, b => { @@ -569,16 +555,4 @@ export class MultiSelectInsertCombo extends Single { this._populate(...arguments); this.numberCounter.populateSwitcher(...arguments); } - - getPopup() { - return this.popup; - } - - getNumberCounter() { - return this.numberCounter; - } - - getTrigger() { - return this.trigger; - } } diff --git a/packages/fineui/src/widget/multiselect/multiselect.insert.trigger.js b/packages/fineui/src/widget/multiselect/multiselect.insert.trigger.js index d292971c0..b7be3abf6 100644 --- a/packages/fineui/src/widget/multiselect/multiselect.insert.trigger.js +++ b/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: o.popup, + popup: {}, adapter: o.adapter, masker: o.masker, value: o.value, diff --git a/packages/fineui/src/widget/multiselect/multiselect.trigger.js b/packages/fineui/src/widget/multiselect/multiselect.trigger.js index 8bfcfb6f7..d0666731d 100644 --- a/packages/fineui/src/widget/multiselect/multiselect.trigger.js +++ b/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: o.popup, + popup: {}, adapter: o.adapter, masker: o.masker, value: o.value, diff --git a/packages/fineui/src/widget/multiselect/trigger/searcher.multiselect.insert.js b/packages/fineui/src/widget/multiselect/trigger/searcher.multiselect.insert.js index cb948a7ac..36d2cf184 100644 --- a/packages/fineui/src/widget/multiselect/trigger/searcher.multiselect.insert.js +++ b/packages/fineui/src/widget/multiselect/trigger/searcher.multiselect.insert.js @@ -132,10 +132,6 @@ export class MultiSelectInsertSearcher extends Widget { } } - getSearcher() { - return this.searcher; - } - adjustView() { this.searcher.adjustView(); } diff --git a/packages/fineui/src/widget/multiselect/trigger/switcher.checkselected.js b/packages/fineui/src/widget/multiselect/trigger/switcher.checkselected.js index c4773e549..4d5bab1da 100644 --- a/packages/fineui/src/widget/multiselect/trigger/switcher.checkselected.js +++ b/packages/fineui/src/widget/multiselect/trigger/switcher.checkselected.js @@ -80,10 +80,6 @@ export class MultiSelectCheckSelectedSwitcher extends Widget { this.switcher.adjustView(); } - getView() { - return this.switcher.getView(); - } - hideView() { this.switcher.empty(); this.switcher.hideView(); diff --git a/packages/fineui/src/widget/multitree/multi.tree.combo.js b/packages/fineui/src/widget/multitree/multi.tree.combo.js index 8edab4f41..7d61b6e9d 100644 --- a/packages/fineui/src/widget/multitree/multi.tree.combo.js +++ b/packages/fineui/src/widget/multitree/multi.tree.combo.js @@ -10,7 +10,7 @@ import { VerticalAdaptLayout, deepClone, Selection, - size + SIZE_CONSANTS } from "@/core"; import { Single, Combo } from "@/base"; import { MultiTreeSearcher } from "./trigger/searcher.multi.tree"; @@ -27,14 +27,12 @@ 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"; _defaultConfig() { return extend(super._defaultConfig(...arguments), { @@ -44,8 +42,6 @@ export class MultiTreeCombo extends Single { height: 24, allowEdit: true, isNeedAdjustWidth: true, - popup: {}, - masker: {}, }); } @@ -67,20 +63,23 @@ export class MultiTreeCombo extends Single { this.storeValue = { value: o.value || {} }; this.trigger = createWidget({ - type: MultiSelectTrigger.xtype, - popup: o.popup, - masker: o.masker, + type: "bi.multi_select_trigger", allowEdit: o.allowEdit, height: toPix(o.height, o.simple ? 1 : 2), valueFormatter: o.valueFormatter, text: o.text, defaultText: o.defaultText, watermark: o.watermark, - adapter: () => { - return this.popup.getView(); + masker: { + offset: { + left: 0, + top: 0, + right: 0, + bottom: SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1, + }, }, searcher: { - type: MultiTreeSearcher.xtype, + type: "bi.multi_tree_searcher", itemsCreator: o.itemsCreator, listeners: [ { @@ -105,6 +104,8 @@ export class MultiTreeCombo extends Single { type: MultiTreePopup.xtype, ref() { self.popup = this; + self.trigger.setAdapter(this); + self.numberCounter.setAdapter(this); }, listeners: [ { @@ -159,16 +160,13 @@ 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 && - 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 + self.numberCounter.element.find(e.target).length === 0 ); }, }); @@ -195,7 +193,6 @@ 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() }; @@ -298,18 +295,23 @@ export class MultiTreeCombo extends Single { }); this.numberCounter = createWidget({ - type: MultiSelectCheckSelectedSwitcher, + type: "bi.multi_select_check_selected_switcher", el: { + // type: "bi.multi_tree_check_selected_button", type: MultiTreeCheckSelectedButton.xtype, }, popup: { + // type: "bi.multi_tree_check_pane", type: MultiTreeCheckPane.xtype, - ...o.popup, }, - adapter: () => { - return this.popup.getView(); + masker: { + offset: { + left: 0, + top: 0, + right: 0, + bottom: SIZE_CONSANTS.LIST_ITEM_HEIGHT + 1, + }, }, - masker: o.masker, itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, value: { value: o.value || {} }, @@ -332,7 +334,6 @@ export class MultiTreeCombo extends Single { want2showCounter = null; showCounter(); } - this.fireEvent(MultiTreeCombo.EVENT_BEFORE_NUMBER_COUNTER_POPUPVIEW); } ); @@ -442,16 +443,4 @@ export class MultiTreeCombo extends Single { setWaterMark(v) { this.trigger.setWaterMark(v); } - - getPopup() { - return this.popup; - } - - getNumberCounter() { - return this.numberCounter; - } - - getTrigger() { - return this.trigger; - } } diff --git a/packages/fineui/src/widget/multitree/multi.tree.popup.js b/packages/fineui/src/widget/multitree/multi.tree.popup.js index 4bd078ab1..44c91a591 100644 --- a/packages/fineui/src/widget/multitree/multi.tree.popup.js +++ b/packages/fineui/src/widget/multitree/multi.tree.popup.js @@ -105,8 +105,4 @@ export class MultiTreePopup extends Pane { resetWidth(w) { this.popupView.resetWidth(w); } - - getView() { - return this.popupView.getView(); - } } diff --git a/packages/fineui/src/widget/multitree/trigger/searcher.multi.tree.js b/packages/fineui/src/widget/multitree/trigger/searcher.multi.tree.js index 972f8ac15..518dff408 100644 --- a/packages/fineui/src/widget/multitree/trigger/searcher.multi.tree.js +++ b/packages/fineui/src/widget/multitree/trigger/searcher.multi.tree.js @@ -220,10 +220,6 @@ export class MultiTreeSearcher extends Widget { return this.editor.getState(); } - getSearcher() { - return this.searcher; - } - setValue(ob) { this.setState(ob); this.searcher.setValue(ob); diff --git a/packages/fineui/src/widget/singleselect/singleselect.insert.combo.js b/packages/fineui/src/widget/singleselect/singleselect.insert.combo.js index 8b07ee6ec..eb528ec7a 100644 --- a/packages/fineui/src/widget/singleselect/singleselect.insert.combo.js +++ b/packages/fineui/src/widget/singleselect/singleselect.insert.combo.js @@ -10,8 +10,7 @@ import { isNotNull, nextTick, AbsoluteLayout, - makeObject, - size + makeObject } from "@/core"; import { Single, Combo } from "@/base"; import { SingleSelectTrigger } from "./singleselect.trigger"; @@ -26,12 +25,10 @@ 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), { @@ -43,8 +40,6 @@ export class SingleSelectInsertCombo extends Single { height: 24, allowEdit: true, watermark: i18nText("BI-Basic_Search_And_Patch_Paste"), - popup: {}, - masker: {}, }); } @@ -62,7 +57,6 @@ 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, @@ -83,7 +77,6 @@ export class SingleSelectInsertCombo extends Single { searcher: { popup: { type: SingleSelectSearchInsertPane.xtype, - ...o.popup, }, }, }); @@ -98,7 +91,6 @@ 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(); @@ -164,13 +156,9 @@ export class SingleSelectInsertCombo extends Single { self.trigger.getSearcher().adjustView(); }); }, - ...o.popup, }, hideChecker(e) { - return ( - triggerBtn.element.find(e.target).length === 0 && - size(self.trigger.getSearcher().getSearcher().getView()?.element.find(e.target)) === 0 - ); + return triggerBtn.element.find(e.target).length === 0; }, value: o.value, }); @@ -183,7 +171,6 @@ export class SingleSelectInsertCombo extends Single { nextTick(() => { self.populate(); }); - self.fireEvent(SingleSelectInsertCombo .EVENT_BEFORE_POPUPVIEW); }); // 当退出的时候如果还在处理请求，则等请求结束后再对外发确定事件 this.wants2Quit = false; @@ -274,12 +261,4 @@ export class SingleSelectInsertCombo extends Single { populate() { this.combo.populate(...arguments); } - - getPopup() { - return this.popup; - } - - getTrigger() { - return this.trigger; - } } diff --git a/packages/fineui/src/widget/singleselect/trigger/searcher.singleselect.js b/packages/fineui/src/widget/singleselect/trigger/searcher.singleselect.js index c9df1bde1..31ebc6f67 100644 --- a/packages/fineui/src/widget/singleselect/trigger/searcher.singleselect.js +++ b/packages/fineui/src/widget/singleselect/trigger/searcher.singleselect.js @@ -131,10 +131,6 @@ export class SingleSelectSearcher extends Widget { return this.searcher.getView() && this.searcher.getView().hasChecked(); } - getSearcher() { - return this.searcher; - } - setAdapter(adapter) { this.searcher.setAdapter(adapter); } diff --git a/packages/fineui/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js b/packages/fineui/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js index 617ce13f3..398888e25 100644 --- a/packages/fineui/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js +++ b/packages/fineui/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js @@ -20,7 +20,6 @@ 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), { @@ -43,7 +42,6 @@ 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), @@ -61,7 +59,6 @@ export class TextValueDownListCombo extends Widget { }, value: isNull(value) ? [] : [value], items: deepClone(o.items), - popup: o.popup, }); this.combo.on(DownListCombo.EVENT_CHANGE, () => { @@ -79,10 +76,6 @@ export class TextValueDownListCombo extends Widget { this.fireEvent(TextValueDownListCombo.EVENT_CHANGE); } }); - - this.combo.on(DownListCombo.EVENT_BEFORE_POPUPVIEW, () => { - this.fireEvent(TextValueDownListCombo.EVENT_BEFORE_POPUPVIEW); - }); } _createValueMap() { @@ -121,8 +114,4 @@ export class TextValueDownListCombo extends Widget { this.combo.populate(items); this._createValueMap(); } - - getPopup() { - return this.combo.getPopup(); - } } diff --git a/packages/fineui/src/widget/timeinterval/dateinterval.js b/packages/fineui/src/widget/timeinterval/dateinterval.js index d98510c7b..4c7f784da 100644 --- a/packages/fineui/src/widget/timeinterval/dateinterval.js +++ b/packages/fineui/src/widget/timeinterval/dateinterval.js @@ -30,8 +30,6 @@ 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); @@ -52,13 +50,6 @@ 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"], @@ -88,8 +79,6 @@ 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, minDate: o.minDate, @@ -254,11 +243,4 @@ export class DateInterval extends Single { end: this.right.getValue(), }; } - - getPopup() { - return { - start: this.left.getPopup(), - end: this.right.getPopup(), - }; - } } diff --git a/packages/fineui/src/widget/timeinterval/timeinterval.js b/packages/fineui/src/widget/timeinterval/timeinterval.js index 4ae530169..85deda173 100644 --- a/packages/fineui/src/widget/timeinterval/timeinterval.js +++ b/packages/fineui/src/widget/timeinterval/timeinterval.js @@ -29,8 +29,6 @@ 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"; _defaultConfig() { const conf = super._defaultConfig(...arguments); @@ -50,13 +48,6 @@ 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"], @@ -86,8 +77,6 @@ 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, simple: o.simple, @@ -261,11 +250,4 @@ export class TimeInterval extends Single { end: this.right.getValue(), }; } - - getPopup() { - return { - start: this.left.getPopup(), - end: this.right.getPopup(), - }; - } } diff --git a/packages/fineui/src/widget/year/combo.year.js b/packages/fineui/src/widget/year/combo.year.js index 1bf7e11e6..50056e22e 100644 --- a/packages/fineui/src/widget/year/combo.year.js +++ b/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.popupEl = _ref; + this.popup = _ref; }, listeners: [ { eventName: DynamicYearPopup.EVENT_CHANGE, action: () => { - this.setValue(this.popupEl.getValue()); + this.setValue(this.popup.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.popupEl.getValue()); + this.setValue(this.popup.getValue()); this.combo.hideView(); this.fireEvent(DynamicDateCombo.EVENT_CONFIRM); }, @@ -140,16 +140,12 @@ 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.popupEl.setMinDate(o.minDate); - this.popupEl.setMaxDate(o.maxDate); - this.popupEl.setValue(this.storeValue); + this.popup.setMinDate(o.minDate); + this.popup.setMaxDate(o.maxDate); + this.popup.setValue(this.storeValue); this.fireEvent(DynamicYearCombo.EVENT_BEFORE_POPUPVIEW); }); @@ -209,14 +205,14 @@ export class DynamicYearCombo extends Widget { const o = this.options; o.minDate = minDate; this.trigger.setMinDate(minDate); - this.popupEl && this.popupEl.setMinDate(minDate); + this.popup && this.popup.setMinDate(minDate); } setMaxDate(maxDate) { const o = this.options; o.maxDate = maxDate; this.trigger.setMaxDate(maxDate); - this.popupEl && this.popupEl.setMaxDate(maxDate); + this.popup && this.popup.setMaxDate(maxDate); } hideView() { @@ -244,10 +240,6 @@ export class DynamicYearCombo extends Widget { setWaterMark(v) { this.trigger.setWaterMark(v); } - - getPopup() { - return this.popup; - } } extend(DynamicYearCombo, { Static: 1, diff --git a/packages/fineui/src/widget/yearmonth/combo.yearmonth.js b/packages/fineui/src/widget/yearmonth/combo.yearmonth.js index de524f2b8..79dfa5da8 100644 --- a/packages/fineui/src/widget/yearmonth/combo.yearmonth.js +++ b/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.popupEl = _ref; + this.popup = _ref; }, listeners: [ { eventName: DynamicYearMonthPopup.EVENT_CHANGE, action: () => { - this.setValue(this.popupEl.getValue()); + this.setValue(this.popup.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.popupEl.getValue(); + const value = this.popup.getValue(); if (this._checkValue(value)) { this.setValue(value); } @@ -161,16 +161,12 @@ 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.popupEl.setMinDate(o.minDate); - this.popupEl.setMaxDate(o.maxDate); - this.popupEl.setValue(this.storeValue); + this.popup.setMinDate(o.minDate); + this.popup.setMaxDate(o.maxDate); + this.popup.setValue(this.storeValue); this.fireEvent(DynamicYearMonthCombo.EVENT_BEFORE_POPUPVIEW); }); @@ -245,18 +241,14 @@ export class DynamicYearMonthCombo extends Single { const o = this.options; o.minDate = minDate; this.trigger.setMinDate(minDate); - this.popupEl && this.popupEl.setMinDate(minDate); + this.popup && this.popup.setMinDate(minDate); } setMaxDate(maxDate) { const o = this.options; o.maxDate = maxDate; this.trigger.setMaxDate(maxDate); - this.popupEl && this.popupEl.setMaxDate(maxDate); - } - - getPopup() { - return this.popup; + this.popup && this.popup.setMaxDate(maxDate); } hideView() { diff --git a/packages/fineui/src/widget/yearmonthinterval/yearmonthinterval.js b/packages/fineui/src/widget/yearmonthinterval/yearmonthinterval.js index c7abfff4e..c6bc874bb 100644 --- a/packages/fineui/src/widget/yearmonthinterval/yearmonthinterval.js +++ b/packages/fineui/src/widget/yearmonthinterval/yearmonthinterval.js @@ -20,8 +20,6 @@ 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, @@ -45,13 +43,6 @@ 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"], @@ -81,8 +72,6 @@ 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, @@ -246,11 +235,4 @@ 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(), - }; - } } diff --git a/packages/fineui/src/widget/yearquarter/combo.yearquarter.js b/packages/fineui/src/widget/yearquarter/combo.yearquarter.js index 0f9c473c1..c14100a38 100644 --- a/packages/fineui/src/widget/yearquarter/combo.yearquarter.js +++ b/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.popupEl = _ref; + this.popup = _ref; }, listeners: [ { eventName: DynamicYearQuarterPopup.EVENT_CHANGE, action: () => { - this.setValue(this.popupEl.getValue()); + this.setValue(this.popup.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.popupEl.getValue(); + const value = this.popup.getValue(); if (this._checkValue(value)) { this.setValue(value); } @@ -164,16 +164,12 @@ 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.popupEl.setMinDate(o.minDate); - this.popupEl.setMaxDate(o.maxDate); - this.popupEl.setValue(this.storeValue); + this.popup.setMinDate(o.minDate); + this.popup.setMaxDate(o.maxDate); + this.popup.setValue(this.storeValue); this.fireEvent(DynamicYearQuarterCombo.EVENT_BEFORE_POPUPVIEW); }); @@ -248,18 +244,14 @@ export class DynamicYearQuarterCombo extends Widget { const o = this.options; o.minDate = minDate; this.trigger.setMinDate(minDate); - this.popupEl && this.popupEl.setMinDate(minDate); + this.popup && this.popup.setMinDate(minDate); } setMaxDate(maxDate) { const o = this.options; o.maxDate = maxDate; this.trigger.setMaxDate(maxDate); - this.popupEl && this.popupEl.setMaxDate(maxDate); - } - - getPopup() { - return this.popup; + this.popup && this.popup.setMaxDate(maxDate); } hideView() { diff --git a/packages/fineui/typescript/index.ts b/packages/fineui/typescript/index.ts index acb087f20..97de6153e 100644 --- a/packages/fineui/typescript/index.ts +++ b/packages/fineui/typescript/index.ts @@ -103,7 +103,6 @@ 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"; diff --git a/packages/fineui/typescript/widget/downlist/combo.downlist.ts b/packages/fineui/typescript/widget/downlist/combo.downlist.ts index 4eed3e1f7..6cc88db52 100644 --- a/packages/fineui/typescript/widget/downlist/combo.downlist.ts +++ b/packages/fineui/typescript/widget/downlist/combo.downlist.ts @@ -1,4 +1,3 @@ -import { PopupView } from "../../base/layer/layer.popup"; import { Widget } from "../../core/widget"; export declare class DownListCombo extends Widget { @@ -16,6 +15,4 @@ export declare class DownListCombo extends Widget { adjustWidth: (e?: MouseEvent) => void; adjustHeight: (e?: MouseEvent) => void; - - getPopup(): PopupView; } diff --git a/packages/fineui/typescript/widget/dynamicdate/dynamicdate.combo.ts b/packages/fineui/typescript/widget/dynamicdate/dynamicdate.combo.ts index a4f82a741..e9a54490a 100644 --- a/packages/fineui/typescript/widget/dynamicdate/dynamicdate.combo.ts +++ b/packages/fineui/typescript/widget/dynamicdate/dynamicdate.combo.ts @@ -1,5 +1,4 @@ -import { PopupView } from "../../base/layer/layer.popup"; -import { Single } from "../../base/single/single"; +import { Single } from '../../base/single/single'; export declare class DynamicDateCombo extends Single { static xtype: string; @@ -27,7 +26,6 @@ export declare class DynamicDateCombo extends Single { }; watermark?: string; simple?: boolean; - popup?: any; } & Single['props'] setMinDate(minDate: string): void; @@ -45,8 +43,6 @@ export declare class DynamicDateCombo extends Single { blur(): void; setWaterMark(v: string): void; - - getPopup(): PopupView; } export interface DynamicDataComboValue { diff --git a/packages/fineui/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts b/packages/fineui/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts index 7ef1abc68..120f38ef3 100644 --- a/packages/fineui/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts +++ b/packages/fineui/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts @@ -1,4 +1,3 @@ -import { PopupView } from '../../base/layer/layer.popup'; import { Single } from '../../base/single/single'; export declare class DynamicDateTimeCombo extends Single { @@ -24,7 +23,6 @@ export declare class DynamicDateTimeCombo extends Single { tabIndex?: number; }; watermark?: string; - popup?: any; } & Single['props']; getValue(): DynamicDateTimeComboValue; @@ -42,8 +40,6 @@ export declare class DynamicDateTimeCombo extends Single { blur(): void; setWaterMark(v: string): void - - getPopup(): PopupView; } export interface DynamicDateTimeComboValue { diff --git a/packages/fineui/typescript/widget/multiselect/multiselect.insert.combo.ts b/packages/fineui/typescript/widget/multiselect/multiselect.insert.combo.ts index 6aef0a5c5..bd0a75ece 100644 --- a/packages/fineui/typescript/widget/multiselect/multiselect.insert.combo.ts +++ b/packages/fineui/typescript/widget/multiselect/multiselect.insert.combo.ts @@ -1,6 +1,4 @@ -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; @@ -14,8 +12,6 @@ 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; @@ -25,8 +21,6 @@ export declare class MultiSelectInsertCombo extends Single { text?: string; watermark?: string; container?: any; - popup?: any; - masker?: any; } & Single["props"]; _itemsCreator4Trigger(op: any, callback: Function): void; @@ -73,9 +67,5 @@ export declare class MultiSelectInsertCombo extends Single { assist: string[]; }; - getPopup(): PopupView; - - getNumberCounter(): MultiSelectCheckSelectedSwitcher; - populate(...args: any[]): void; } diff --git a/packages/fineui/typescript/widget/multiselect/switcher.checkselected.ts b/packages/fineui/typescript/widget/multiselect/switcher.checkselected.ts deleted file mode 100644 index 8e6e83a6e..000000000 --- a/packages/fineui/typescript/widget/multiselect/switcher.checkselected.ts +++ /dev/null @@ -1,19 +0,0 @@ -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; -} diff --git a/packages/fineui/typescript/widget/multitree/multi.tree.combo.ts b/packages/fineui/typescript/widget/multitree/multi.tree.combo.ts index 944397695..3fe60ebed 100644 --- a/packages/fineui/typescript/widget/multitree/multi.tree.combo.ts +++ b/packages/fineui/typescript/widget/multitree/multi.tree.combo.ts @@ -1,7 +1,5 @@ -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; @@ -12,12 +10,6 @@ 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; @@ -29,8 +21,4 @@ export declare class MultiTreeCombo extends Single { blur(): void; setWaterMark(v: string): void; - - getPopup(): PopupView; - - getNumberCounter(): MultiSelectCheckSelectedSwitcher; } diff --git a/packages/fineui/typescript/widget/multitree/multi.tree.popup.ts b/packages/fineui/typescript/widget/multitree/multi.tree.popup.ts index 3c7506623..68f8f65a2 100644 --- a/packages/fineui/typescript/widget/multitree/multi.tree.popup.ts +++ b/packages/fineui/typescript/widget/multitree/multi.tree.popup.ts @@ -1,4 +1,3 @@ -import { ButtonGroup } from "../../base/combination/group.button"; import { Pane } from "../../base/pane"; export declare class MultiTreePopup extends Pane { @@ -13,6 +12,4 @@ export declare class MultiTreePopup extends Pane { resetHeight(h: number): void; resetWidth(w: number): void; - - getView(): ButtonGroup; } diff --git a/packages/fineui/typescript/widget/singleselect/singleselect.insert.combo.ts b/packages/fineui/typescript/widget/singleselect/singleselect.insert.combo.ts index d153b952a..5c9f5d934 100644 --- a/packages/fineui/typescript/widget/singleselect/singleselect.insert.combo.ts +++ b/packages/fineui/typescript/widget/singleselect/singleselect.insert.combo.ts @@ -1,4 +1,3 @@ -import { PopupView } from "../../base/layer/layer.popup"; import { Single } from "../../base/single/single"; export declare class SingleSelectInsertCombo extends Single { @@ -9,7 +8,6 @@ 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, @@ -18,8 +16,5 @@ export declare class SingleSelectInsertCombo extends Single { valueFormatter?: Function, allowEdit?: boolean, watermark?: string, - popup?: any; } & Single['props'] - - getPopup(): PopupView; } diff --git a/packages/fineui/typescript/widget/textvaluedownlistcombo/combo.textvaluedownlist.ts b/packages/fineui/typescript/widget/textvaluedownlistcombo/combo.textvaluedownlist.ts index d351e5f33..e3387f30d 100644 --- a/packages/fineui/typescript/widget/textvaluedownlistcombo/combo.textvaluedownlist.ts +++ b/packages/fineui/typescript/widget/textvaluedownlistcombo/combo.textvaluedownlist.ts @@ -1,17 +1,8 @@ -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]; - - getPopup(): PopupView; } diff --git a/packages/fineui/typescript/widget/timeinterval/dateinterval.ts b/packages/fineui/typescript/widget/timeinterval/dateinterval.ts index 27ca6f787..31001fe6a 100644 --- a/packages/fineui/typescript/widget/timeinterval/dateinterval.ts +++ b/packages/fineui/typescript/widget/timeinterval/dateinterval.ts @@ -1,5 +1,5 @@ import { Single } from "../../base/single/single"; -import { DynamicDataComboValue, DynamicDateCombo } from "../dynamicdate/dynamicdate.combo"; +import { DynamicDataComboValue } from "../dynamicdate/dynamicdate.combo"; export declare class DateInterval extends Single { static xtype: string; @@ -7,17 +7,13 @@ 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; - container?: string; - popup?: any; - } & Single["props"]; + } & Single['props'] getValue(): { start: DynamicDataComboValue; @@ -27,9 +23,4 @@ export declare class DateInterval extends Single { setMinDate(minDate: string): void; setMaxDate(minDate: string): void; - - getPopup(): { - start: DynamicDateCombo; - end: DynamicDateCombo; - }; } diff --git a/packages/fineui/typescript/widget/timeinterval/timeinterval.ts b/packages/fineui/typescript/widget/timeinterval/timeinterval.ts index e7a72f9af..87d4fd977 100644 --- a/packages/fineui/typescript/widget/timeinterval/timeinterval.ts +++ b/packages/fineui/typescript/widget/timeinterval/timeinterval.ts @@ -1,13 +1,11 @@ import { Single } from "../../base/single/single"; -import { DynamicDateTimeCombo, DynamicDateTimeComboValue } from "../dynamicdatetime/dynamicdatetime.combo"; +import { 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; @@ -15,8 +13,6 @@ export declare class TimeInterval extends Single { supportDynamic?: boolean; watermark?: string; simple?: boolean; - container?: string; - popup?: any; } & Single['props']; getValue(): { @@ -27,9 +23,4 @@ export declare class TimeInterval extends Single { setMinDate(minDate: string): void; setMaxDate(minDate: string): void; - - getPopup(): { - start: DynamicDateTimeCombo; - end: DynamicDateTimeCombo; - }; } diff --git a/packages/fineui/typescript/widget/year/combo.year.ts b/packages/fineui/typescript/widget/year/combo.year.ts index 78917340b..5b9b21acb 100644 --- a/packages/fineui/typescript/widget/year/combo.year.ts +++ b/packages/fineui/typescript/widget/year/combo.year.ts @@ -1,4 +1,3 @@ -import { PopupView } from "../../base/layer/layer.popup"; import { Widget } from "../../core/widget"; export declare class DynamicYearCombo extends Widget { @@ -8,17 +7,11 @@ 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 { diff --git a/packages/fineui/typescript/widget/yearmonth/combo.yearmonth.ts b/packages/fineui/typescript/widget/yearmonth/combo.yearmonth.ts index 36a75cbff..10f198e46 100644 --- a/packages/fineui/typescript/widget/yearmonth/combo.yearmonth.ts +++ b/packages/fineui/typescript/widget/yearmonth/combo.yearmonth.ts @@ -1,4 +1,3 @@ -import { PopupView } from "../../base/layer/layer.popup"; import { Single } from "../../base/single/single"; export declare class DynamicYearMonthCombo extends Single { @@ -9,10 +8,6 @@ export declare class DynamicYearMonthCombo extends Single { static EVENT_CONFIRM: string; static EVENT_BEFORE_POPUPVIEW: string; - props: { - popup?: any; - } & Single["props"]; - hideView(): void; getKey(): string; @@ -22,8 +17,6 @@ export declare class DynamicYearMonthCombo extends Single { setMinDate(minDate: string): void; setMaxDate(maxDate: string): void; - - getPopup(): PopupView; } export interface DynamicYearMonthComboValue { diff --git a/packages/fineui/typescript/widget/yearmonthinterval/yearmonthinterval.ts b/packages/fineui/typescript/widget/yearmonthinterval/yearmonthinterval.ts index a17c5d36e..9da536c22 100644 --- a/packages/fineui/typescript/widget/yearmonthinterval/yearmonthinterval.ts +++ b/packages/fineui/typescript/widget/yearmonthinterval/yearmonthinterval.ts @@ -1,5 +1,5 @@ import { Single } from '../../base/single/single'; -import { DynamicYearMonthCombo, DynamicYearMonthComboValue } from '../yearmonth/combo.yearmonth'; +import { DynamicYearMonthComboValue } from '../yearmonth/combo.yearmonth'; export declare class YearMonthInterval extends Single { static xtype: string; @@ -7,13 +7,9 @@ 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(): { @@ -24,9 +20,4 @@ export declare class YearMonthInterval extends Single { setMinDate(minDate: string): void; setMaxDate(maxDate: string): void; - - getPopup(): { - start: DynamicYearMonthCombo; - end: DynamicYearMonthCombo; - }; } diff --git a/packages/fineui/typescript/widget/yearquarter/combo.yearquarter.ts b/packages/fineui/typescript/widget/yearquarter/combo.yearquarter.ts index de9564b3e..f1a07770b 100644 --- a/packages/fineui/typescript/widget/yearquarter/combo.yearquarter.ts +++ b/packages/fineui/typescript/widget/yearquarter/combo.yearquarter.ts @@ -1,4 +1,3 @@ -import { PopupView } from "../../base/layer/layer.popup"; import { Widget } from "../../core/widget"; export declare class DynamicYearQuarterCombo extends Widget { @@ -6,17 +5,11 @@ 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 {