Browse Source

Merge pull request #244599 in DEC/fineui from master to feature/x

* commit '477c65a6b2df00b34e322489f16be9270842309a':
  BI-130558 fix: 【6.0.13发散】预览布局和内容缩放,控件下拉搜索,全选和选项的缩放比例不一样
master
superman 1 year ago
parent
commit
26308f7bb4
  1. 2
      packages/fineui/src/base/combination/searcher.js
  2. 2
      packages/fineui/src/base/index.js
  3. 2
      packages/fineui/src/widget/multilayerdownlist/combo.downlist.js
  4. 20
      packages/fineui/src/widget/multiselect/search/multiselect.search.loader.js

2
packages/fineui/src/base/combination/searcher.js

@ -134,7 +134,7 @@ export class Searcher extends Widget {
this.popupView = createWidget(popup, { this.popupView = createWidget(popup, {
type: SearcherView.xtype, type: SearcherView.xtype,
chooseType, chooseType,
}); }, this);
this.popupView.on(Controller.EVENT_CHANGE, (type, value, obj, ...args) => { this.popupView.on(Controller.EVENT_CHANGE, (type, value, obj, ...args) => {
this.fireEvent(Controller.EVENT_CHANGE, type, value, obj, ...args); this.fireEvent(Controller.EVENT_CHANGE, type, value, obj, ...args);
if (type === Events.CLICK) { if (type === Events.CLICK) {

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

@ -11,4 +11,4 @@ export * from "./layer";
export * from "./list"; export * from "./list";
export * from "./single"; export * from "./single";
export * from "./el"; export * from "./el";
export * from "./context"; export * from "./context";

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

@ -33,7 +33,7 @@ export class MultiLayerDownListCombo extends Widget {
items: o.items, items: o.items,
chooseType: o.chooseType, chooseType: o.chooseType,
value: o.value, value: o.value,
}); }, this);
this.popupview.on(MultiLayerDownListPopup.EVENT_CHANGE, value => { this.popupview.on(MultiLayerDownListPopup.EVENT_CHANGE, value => {
this.fireEvent(MultiLayerDownListCombo.EVENT_CHANGE, value); this.fireEvent(MultiLayerDownListCombo.EVENT_CHANGE, value);

20
packages/fineui/src/widget/multiselect/search/multiselect.search.loader.js

@ -78,9 +78,9 @@ export class MultiSelectSearchLoader extends Widget {
}, },
itemsCreator(op, callback) { itemsCreator(op, callback) {
self.storeValue && self.storeValue &&
(op = extend(op || {}, { (op = extend(op || {}, {
selectedValues: self.storeValue.value, selectedValues: self.storeValue.value,
})); }));
opts.itemsCreator(op, ob => { opts.itemsCreator(op, ob => {
const keyword = (ob.keyword = opts.keywordGetter()); const keyword = (ob.keyword = opts.keywordGetter());
hasNext = ob.hasNext; hasNext = ob.hasNext;
@ -113,7 +113,7 @@ export class MultiSelectSearchLoader extends Widget {
el: { el: {
chooseType: BI.ButtonGroup.CHOOSE_TYPE_MULTI, chooseType: BI.ButtonGroup.CHOOSE_TYPE_MULTI,
behaviors: { behaviors: {
redmark () { redmark() {
return true; return true;
}, },
}, },
@ -123,7 +123,7 @@ export class MultiSelectSearchLoader extends Widget {
} }
], ],
}, },
itemsCreator (op, callback) { itemsCreator(op, callback) {
self.storeValue && (op = BI.extend(op || {}, { self.storeValue && (op = BI.extend(op || {}, {
selectedValues: self.storeValue.value, selectedValues: self.storeValue.value,
})); }));
@ -146,13 +146,13 @@ export class MultiSelectSearchLoader extends Widget {
}, },
value: opts.value, value: opts.value,
height: "fill", height: "fill",
}); }, this);
this.button_group.on(Controller.EVENT_CHANGE, function () { this.button_group.on(Controller.EVENT_CHANGE, function() {
self.fireEvent(Controller.EVENT_CHANGE, arguments); self.fireEvent(Controller.EVENT_CHANGE, arguments);
}); });
const searchLoaderEventChangeName = opts.allowSelectAll ? SelectList.EVENT_CHANGE : ListPane.EVENT_CHANGE; const searchLoaderEventChangeName = opts.allowSelectAll ? SelectList.EVENT_CHANGE : ListPane.EVENT_CHANGE;
this.button_group.on(searchLoaderEventChangeName, function () { this.button_group.on(searchLoaderEventChangeName, function() {
self.fireEvent(MultiSelectSearchLoader.EVENT_CHANGE, arguments); self.fireEvent(MultiSelectSearchLoader.EVENT_CHANGE, arguments);
}); });
} }
@ -179,7 +179,7 @@ export class MultiSelectSearchLoader extends Widget {
isAllSelected() { isAllSelected() {
const o = this.options; const o = this.options;
return o.allowSelectAll ? this.button_group.isAllSelected() : false; return o.allowSelectAll ? this.button_group.isAllSelected() : false;
} }
@ -222,7 +222,7 @@ export class MultiSelectSearchLoader extends Widget {
if (o.allowSelectAll) { if (o.allowSelectAll) {
return this.button_group.getValue(); return this.button_group.getValue();
} }
return { return {
type: ButtonGroup.CHOOSE_TYPE_MULTI, type: ButtonGroup.CHOOSE_TYPE_MULTI,
value: this.button_group.getValue(), value: this.button_group.getValue(),

Loading…
Cancel
Save