Browse Source

Pull request #3238: KERNEL-13662 feat: text_value_combo 复选,支持不带全选 - from Richie

Merge in VISUAL/fineui from ~DAILER/fineui:master to master

* commit 'd16e447b8ea532f285251f12d0906d822bfaa503':
  KERNEL-13662 feat: text_value_combo 复选,支持不带全选 - from Richie
es6
Dailer-刘荣歆 2 years ago
parent
commit
966ae89d3b
  1. 23
      demo/js/case/combo/demo.text_value_combo.js
  2. 60
      src/case/combo/textvaluecombo/popup.textvalue.js

23
demo/js/case/combo/demo.text_value_combo.js

@ -209,6 +209,29 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
] ]
} }
] ]
}),
this.createCombo("支持复选,不要全选功能", {
type: "bi.vertical",
items: [
{
type: "bi.text_value_combo",
width: 300,
items: items,
allowClear: true,
defaultText: "请选择",
chooseType: BI.Selection.Multi,
value: [1],
allowSelectAll: false,
listeners: [
{
eventName: BI.TextValueCombo.EVENT_CHANGE,
action: function () {
console.log(this.getValue());
}
}
]
}
]
}) })
] ]
}; };

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

@ -45,10 +45,8 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
return { return {
type: "bi.vertical", type: "bi.vertical",
verticalAlign: BI.VerticalAlign.Stretch, verticalAlign: BI.VerticalAlign.Stretch,
rowSize: ["fill", ""], items: o.allowSelectAll ? [
items: [
{ {
el: o.allowSelectAll ? {
type: "bi.select_list", type: "bi.select_list",
logic: { logic: {
dynamic: true, dynamic: true,
@ -69,6 +67,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
type: BI.ButtonGroup.CHOOSE_TYPE_MULTI, type: BI.ButtonGroup.CHOOSE_TYPE_MULTI,
value: o.value value: o.value
}, },
height: "fill",
listeners: [ listeners: [
{ {
eventName: BI.SelectList.EVENT_CHANGE, eventName: BI.SelectList.EVENT_CHANGE,
@ -77,33 +76,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
} }
} }
] ]
} : { }, {
type: "bi.list_pane",
logic: {
dynamic: true,
innerVgap: 5,
rowSize: ["", "fill"],
verticalAlign: BI.VerticalAlign.Stretch
},
ref: (_ref) => {
this.popup = _ref;
},
el: {
chooseType: o.chooseType,
},
items: this._formatItems(o.items),
value: o.value,
listeners: [
{
eventName: BI.ListPane.EVENT_CHANGE,
action: function (val) {
self.fireEvent(BI.TextValueComboPopup.EVENT_CHANGE, val);
}
}
]
}
},
{
type: "bi.center", type: "bi.center",
cls: "list-view-toolbar bi-high-light bi-split-top", cls: "list-view-toolbar bi-high-light bi-split-top",
height: 24, height: 24,
@ -127,7 +100,34 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
isShadowShowingOnSelected: true isShadowShowingOnSelected: true
}) })
} }
] : [
{
type: "bi.list_pane",
logic: {
dynamic: true,
innerVgap: 5,
rowSize: ["", "fill"],
verticalAlign: BI.VerticalAlign.Stretch
},
ref: (_ref) => {
this.popup = _ref;
},
el: {
chooseType: o.chooseType,
},
items: this._formatItems(o.items),
value: o.value,
height: "fill",
listeners: [
{
eventName: BI.ListPane.EVENT_CHANGE,
action: function (val) {
self.fireEvent(BI.TextValueComboPopup.EVENT_CHANGE, val);
}
}
] ]
}
],
}; };
}, },

Loading…
Cancel
Save