Browse Source

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

* commit 'fa0713fe2a9a99d427b77492ea6ee3625a3a145f':
  auto upgrade version to 2.0.20230426103404
  BI-124907 fix: 下拉无选项
  auto upgrade version to 2.0.20230425185447
  无JIRA任务  bugfix
master
superman 2 years ago
parent
commit
2dfb1cf347
  1. 2
      package.json
  2. 1
      src/case/combo/textvaluecombo/combo.textvaluesmall.js
  3. 14
      src/case/combo/textvaluecombo/popup.textvalue.js

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "fineui", "name": "fineui",
"version": "2.0.20230418112647", "version": "2.0.20230426103404",
"description": "fineui", "description": "fineui",
"main": "dist/fineui_without_conflict.min.js", "main": "dist/fineui_without_conflict.min.js",
"types": "dist/lib/index.d.ts", "types": "dist/lib/index.d.ts",

1
src/case/combo/textvaluecombo/combo.textvaluesmall.js

@ -28,6 +28,7 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, {
type: "bi.small_select_text_trigger", type: "bi.small_select_text_trigger",
...o.el ...o.el
}, },
items: o.items,
text: o.text, text: o.text,
value: o.value, value: o.value,
defaultText: o.defaultText, defaultText: o.defaultText,

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

@ -1,4 +1,4 @@
BI.TextValueComboPopup = BI.inherit(BI.Pane, { BI.TextValueComboPopup = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.TextValueComboPopup.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.TextValueComboPopup.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-text-icon-popup", baseCls: "bi-text-icon-popup",
@ -15,17 +15,20 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
vgap: 5, vgap: 5,
items: [ items: [
{ {
type: "bi.button_group", type: "bi.list_pane",
ref: (_ref) => { ref: (_ref) => {
this.popup = _ref; this.popup = _ref;
}, },
items: this._formatItems(o.items), items: this._formatItems(o.items),
el: {
type: "bi.button_group",
chooseType: o.chooseType, chooseType: o.chooseType,
layouts: [ layouts: [
{ {
type: "bi.vertical" type: "bi.vertical"
} }
], ],
},
value: o.value, value: o.value,
listeners: [ listeners: [
{ {
@ -131,12 +134,6 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
}; };
}, },
beforeMount: function () {
if (this.options.chooseType !== BI.ButtonGroup.CHOOSE_TYPE_MULTI) {
this.check();
}
},
_formatItems: function (items) { _formatItems: function (items) {
var o = this.options; var o = this.options;
return BI.map(items, function (i, item) { return BI.map(items, function (i, item) {
@ -150,7 +147,6 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
}, },
populate: function (items) { populate: function (items) {
BI.TextValueComboPopup.superclass.populate.apply(this, arguments);
this.popup.populate(this._formatItems(items)); this.popup.populate(this._formatItems(items));
}, },

Loading…
Cancel
Save