From c39b867fb66705e84404cc68f5876611f0099703 Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 25 Apr 2023 18:34:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=20bugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../combo/textvaluecombo/popup.textvalue.js | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/case/combo/textvaluecombo/popup.textvalue.js b/src/case/combo/textvaluecombo/popup.textvalue.js index aed1b0979..9d3e3d004 100644 --- a/src/case/combo/textvaluecombo/popup.textvalue.js +++ b/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 () { return BI.extend(BI.TextValueComboPopup.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-text-icon-popup", @@ -15,17 +15,20 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, { vgap: 5, items: [ { - type: "bi.button_group", + type: "bi.list_pane", ref: (_ref) => { this.popup = _ref; }, items: this._formatItems(o.items), - chooseType: o.chooseType, - layouts: [ - { - type: "bi.vertical" - } - ], + el: { + type: "bi.button_group", + chooseType: o.chooseType, + layouts: [ + { + type: "bi.vertical" + } + ], + }, value: o.value, 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) { var o = this.options; return BI.map(items, function (i, item) { @@ -150,7 +147,6 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, { }, populate: function (items) { - BI.TextValueComboPopup.superclass.populate.apply(this, arguments); this.popup.populate(this._formatItems(items)); }, From c33fff631bc180b2707b47147f59a624547a9bad Mon Sep 17 00:00:00 2001 From: data Date: Tue, 25 Apr 2023 18:54:54 +0800 Subject: [PATCH 2/4] auto upgrade version to 2.0.20230425185447 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 34f88f719..85f945477 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230418112647", + "version": "2.0.20230425185447", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 6e4b7e0a0c2e9e39d74e154acbc2bbe431f33845 Mon Sep 17 00:00:00 2001 From: jimmychai Date: Tue, 25 Apr 2023 20:41:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?BI-124907=20fix:=20=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=97=A0=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/combo/textvaluecombo/combo.textvaluesmall.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/case/combo/textvaluecombo/combo.textvaluesmall.js b/src/case/combo/textvaluecombo/combo.textvaluesmall.js index 155b124ce..96678c736 100644 --- a/src/case/combo/textvaluecombo/combo.textvaluesmall.js +++ b/src/case/combo/textvaluecombo/combo.textvaluesmall.js @@ -28,6 +28,7 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, { type: "bi.small_select_text_trigger", ...o.el }, + items: o.items, text: o.text, value: o.value, defaultText: o.defaultText, From fa0713fe2a9a99d427b77492ea6ee3625a3a145f Mon Sep 17 00:00:00 2001 From: data Date: Wed, 26 Apr 2023 10:34:13 +0800 Subject: [PATCH 4/4] auto upgrade version to 2.0.20230426103404 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 85f945477..8f89d32d6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230425185447", + "version": "2.0.20230426103404", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts",