From 63a74370a9318da047c6bb0216f9aa67dcf59922 Mon Sep 17 00:00:00 2001 From: zsmj Date: Mon, 29 May 2023 10:31:50 +0800 Subject: [PATCH] update base-cls --- .../widget/multiselect/multiselect.loader.js | 23 ++++++++-------- .../multiselect/multiselect.loader.nobar.js | 27 ++++++++++--------- .../multitextvalue.loader.search.js | 20 +++++++------- 3 files changed, 36 insertions(+), 34 deletions(-) diff --git a/packages/fineui/src/widget/multiselect/multiselect.loader.js b/packages/fineui/src/widget/multiselect/multiselect.loader.js index f0546622f..ab234b3f9 100644 --- a/packages/fineui/src/widget/multiselect/multiselect.loader.js +++ b/packages/fineui/src/widget/multiselect/multiselect.loader.js @@ -76,12 +76,12 @@ export class MultiSelectLoader extends Widget { itemsCreator(op, callback) { const startValue = self._startValue; self.storeValue && - (op = extend(op || {}, { - selectedValues: - isKey(startValue) && self.storeValue.type === Selection.Multi - ? self.storeValue.value.concat(startValue) - : self.storeValue.value, - })); + (op = extend(op || {}, { + selectedValues: + isKey(startValue) && self.storeValue.type === Selection.Multi + ? self.storeValue.value.concat(startValue) + : self.storeValue.value, + })); opts.itemsCreator(op, ob => { hasNext = ob.hasNext; let firstItems = []; @@ -110,9 +110,9 @@ export class MultiSelectLoader extends Widget { callback(firstItems.concat(self._createItems(ob.items)), ob.keyword || ""); if (op.times === 1 && self.storeValue) { isKey(startValue) && - (self.storeValue.type === Selection.All - ? remove(self.storeValue.value, startValue) - : pushDistinct(self.storeValue.value, startValue)); + (self.storeValue.type === Selection.All + ? remove(self.storeValue.value, startValue) + : pushDistinct(self.storeValue.value, startValue)); self.setValue(self.storeValue); } op.times === 1 && self._scrollToTop(); @@ -124,6 +124,7 @@ export class MultiSelectLoader extends Widget { value: this.storeValue, }); + createWidget( extend( { @@ -144,10 +145,10 @@ export class MultiSelectLoader extends Widget { ) ) ); - this.button_group.on(Controller.EVENT_CHANGE, function () { + this.button_group.on(Controller.EVENT_CHANGE, function() { self.fireEvent(Controller.EVENT_CHANGE, arguments); }); - this.button_group.on(SelectList.EVENT_CHANGE, function () { + this.button_group.on(SelectList.EVENT_CHANGE, function() { self.fireEvent(MultiSelectLoader.EVENT_CHANGE, arguments); }); } diff --git a/packages/fineui/src/widget/multiselect/multiselect.loader.nobar.js b/packages/fineui/src/widget/multiselect/multiselect.loader.nobar.js index b278b42d9..825a7f6ac 100644 --- a/packages/fineui/src/widget/multiselect/multiselect.loader.nobar.js +++ b/packages/fineui/src/widget/multiselect/multiselect.loader.nobar.js @@ -30,7 +30,7 @@ export class MultiSelectNoBarLoader extends Widget { _defaultConfig() { return extend(super._defaultConfig(...arguments), { - baseCls: "bi-multi-select-loader", + baseCls: "bi-multi-select-loader-no-bar", logic: { dynamic: true, }, @@ -84,12 +84,12 @@ export class MultiSelectNoBarLoader extends Widget { itemsCreator(op, callback) { const startValue = self._startValue; self.storeValue && - (op = extend(op || {}, { - selectedValues: - isKey(startValue) && self.storeValue.type === Selection.Multi - ? self.storeValue.value.concat(startValue) - : self.storeValue.value, - })); + (op = extend(op || {}, { + selectedValues: + isKey(startValue) && self.storeValue.type === Selection.Multi + ? self.storeValue.value.concat(startValue) + : self.storeValue.value, + })); opts.itemsCreator(op, ob => { hasNext = ob.hasNext; let firstItems = []; @@ -118,9 +118,9 @@ export class MultiSelectNoBarLoader extends Widget { callback(firstItems.concat(self._createItems(ob.items)), ob.keyword || ""); if (op.times === 1 && self.storeValue) { isKey(startValue) && - (self.storeValue.type === Selection.All - ? remove(self.storeValue.value, startValue) - : pushDistinct(self.storeValue.value, startValue)); + (self.storeValue.type === Selection.All + ? remove(self.storeValue.value, startValue) + : pushDistinct(self.storeValue.value, startValue)); self.setValue(self.storeValue); } op.times === 1 && self._scrollToTop(); @@ -144,10 +144,10 @@ export class MultiSelectNoBarLoader extends Widget { items: LogicFactory.createLogicItemsByDirection(Direction.Top, this.button_group), })))); - this.button_group.on(Controller.EVENT_CHANGE, function () { + this.button_group.on(Controller.EVENT_CHANGE, function() { self.fireEvent(Controller.EVENT_CHANGE, arguments); }); - this.button_group.on(SelectList.EVENT_CHANGE, function () { + this.button_group.on(SelectList.EVENT_CHANGE, function() { self.fireEvent(MultiSelectNoBarLoader.EVENT_CHANGE, arguments); }); } @@ -215,5 +215,6 @@ export class MultiSelectNoBarLoader extends Widget { this.button_group.element.css({ "max-height": toPix(h) }); } - resetWidth() {} + resetWidth() { + } } diff --git a/packages/fineui/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js b/packages/fineui/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js index 42b9c12a3..965208bac 100644 --- a/packages/fineui/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js +++ b/packages/fineui/src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js @@ -28,7 +28,7 @@ export class SearchMultiSelectLoader extends Widget { _defaultConfig() { return extend(super._defaultConfig(...arguments), { - baseCls: "bi-multi-select-loader", + baseCls: "bi-search-multi-select-loader", logic: { dynamic: true, }, @@ -89,12 +89,12 @@ export class SearchMultiSelectLoader extends Widget { itemsCreator: (op, callback) => { const startValue = this._startValue; this.storeValue && - (op = extend(op || {}, { - selectedValues: - isKey(startValue) && this.storeValue.type === Selection.Multi - ? this.storeValue.value.concat(startValue) - : this.storeValue.value, - })); + (op = extend(op || {}, { + selectedValues: + isKey(startValue) && this.storeValue.type === Selection.Multi + ? this.storeValue.value.concat(startValue) + : this.storeValue.value, + })); opts.itemsCreator(op, ob => { hasNext = ob.hasNext; let firstItems = []; @@ -124,9 +124,9 @@ export class SearchMultiSelectLoader extends Widget { callback(firstItems.concat(this._createItems(ob.items)), ob.keyword || ""); if (op.times === 1 && this.storeValue) { isKey(startValue) && - (this.storeValue.type === Selection.All - ? remove(this.storeValue.value, startValue) - : pushDistinct(this.storeValue.value, startValue)); + (this.storeValue.type === Selection.All + ? remove(this.storeValue.value, startValue) + : pushDistinct(this.storeValue.value, startValue)); this.setValue(this.storeValue); } op.times === 1 && this._scrollToTop();