From 19cf29597af8b436f933000a7fd6f42dbf2eff1f Mon Sep 17 00:00:00 2001 From: windy Date: Thu, 13 Oct 2022 19:11:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BI-115369=20=E5=90=8C=E6=AD=A5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/logic/logic.layout.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/logic/logic.layout.js b/src/core/logic/logic.layout.js index 8b4abc85a..babd2306c 100644 --- a/src/core/logic/logic.layout.js +++ b/src/core/logic/logic.layout.js @@ -50,7 +50,7 @@ BI.VerticalLayoutLogic = BI.inherit(BI.Logic, { verticalAlign: o.verticalAlign, columnSize: o.columnSize, rowSize: o.rowSize - }, BI._.identity); + }, BI.isNotNull); } }); @@ -107,7 +107,7 @@ BI.HorizontalLayoutLogic = BI.inherit(BI.Logic, { verticalAlign: o.verticalAlign, columnSize: o.columnSize, rowSize: o.rowSize - }, BI._.identity); + }, BI.isNotNull); } }); @@ -157,7 +157,7 @@ BI.TableLayoutLogic = BI.inherit(BI.Logic, { verticalAlign: o.verticalAlign, columnSize: o.columnSize, rowSize: o.rowSize - }, BI._.identity); + }, BI.isNotNull); } }); @@ -216,6 +216,6 @@ BI.HorizontalFillLayoutLogic = BI.inherit(BI.Logic, { verticalAlign: o.verticalAlign, columnSize: columnSize, rowSize: o.rowSize - }, BI._.identity); + }, BI.isNotNull); } }); From 5d392153d2dee7e8c70ad45cdc97d6b45d664902 Mon Sep 17 00:00:00 2001 From: zsmj Date: Wed, 12 Oct 2022 11:38:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0JIRA=20fix:=20text=5Fvalue=5Fcombo?= =?UTF-8?q?=5Fpopup=20=E5=85=BC=E5=AE=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit c8987ddf8fdffde039f4df173620ab049b553d4d) --- src/case/combo/textvaluecombo/popup.textvalue.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/case/combo/textvaluecombo/popup.textvalue.js b/src/case/combo/textvaluecombo/popup.textvalue.js index 9ea5eaa58..3f50089af 100644 --- a/src/case/combo/textvaluecombo/popup.textvalue.js +++ b/src/case/combo/textvaluecombo/popup.textvalue.js @@ -8,7 +8,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, { render () { var o = this.options, self = this; - if (o.chooseType === BI.ButtonGroup.CHOOSE_TYPE_SINGLE) { + if (o.chooseType !== BI.ButtonGroup.CHOOSE_TYPE_MULTI) { return { type: "bi.vertical", vgap: 5, @@ -99,7 +99,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, { var o = this.options; return BI.map(items, function (i, item) { 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, textAlign: o.textAlign, title: item.title || item.text @@ -113,7 +113,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, { }, getValue: function () { - if (this.options.chooseType === BI.ButtonGroup.CHOOSE_TYPE_SINGLE) { + if (this.options.chooseType !== BI.ButtonGroup.CHOOSE_TYPE_MULTI) { return this.popup.getValue(); } var val = this.popup.getValue(); @@ -125,7 +125,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, { }, 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); } this.popup.setValue({