Browse Source

Merge pull request #195635 in DEC/fineui from final/11.0 to release/11.0

* commit 'f577b8d563e8174be44c8852227480fbc708a66e':
  无JIRA fix: text_value_combo_popup 兼容性
research/test
superman 2 years ago
parent
commit
2712bb6032
  1. 8
      src/case/combo/textvaluecombo/popup.textvalue.js

8
src/case/combo/textvaluecombo/popup.textvalue.js

@ -8,7 +8,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
render () { render () {
var o = this.options, self = this; var o = this.options, self = this;
if (o.chooseType === BI.ButtonGroup.CHOOSE_TYPE_SINGLE) { if (o.chooseType !== BI.ButtonGroup.CHOOSE_TYPE_MULTI) {
return { return {
type: "bi.vertical", type: "bi.vertical",
vgap: 5, vgap: 5,
@ -99,7 +99,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
var o = this.options; var o = this.options;
return BI.map(items, function (i, item) { return BI.map(items, function (i, item) {
return BI.extend({ return BI.extend({
type: o.chooseType === BI.ButtonGroup.CHOOSE_TYPE_SINGLE ? "bi.single_select_item" : "bi.multi_select_item", type: o.chooseType !== BI.ButtonGroup.CHOOSE_TYPE_MULTI ? "bi.single_select_item" : "bi.multi_select_item",
iconWrapperWidth: 36, iconWrapperWidth: 36,
textAlign: o.textAlign, textAlign: o.textAlign,
title: item.title || item.text title: item.title || item.text
@ -113,7 +113,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
}, },
getValue: function () { getValue: function () {
if (this.options.chooseType === BI.ButtonGroup.CHOOSE_TYPE_SINGLE) { if (this.options.chooseType !== BI.ButtonGroup.CHOOSE_TYPE_MULTI) {
return this.popup.getValue(); return this.popup.getValue();
} }
var val = this.popup.getValue(); var val = this.popup.getValue();
@ -125,7 +125,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
}, },
setValue: function (v) { setValue: function (v) {
if (this.options.chooseType === BI.ButtonGroup.CHOOSE_TYPE_SINGLE) { if (this.options.chooseType !== BI.ButtonGroup.CHOOSE_TYPE_MULTI) {
return this.popup.setValue(v); return this.popup.setValue(v);
} }
this.popup.setValue({ this.popup.setValue({

Loading…
Cancel
Save