From 49f79ebad1f93b45234d7a59ca19f32e7c3a067e Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 7 Dec 2021 15:52:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?virtual-group=E6=94=AF=E6=8C=81layouts?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/combination/group.virtual.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/base/combination/group.virtual.js b/src/base/combination/group.virtual.js index cccddd14e..f7f5a894f 100644 --- a/src/base/combination/group.virtual.js +++ b/src/base/combination/group.virtual.js @@ -44,8 +44,8 @@ BI.VirtualGroup = BI.inherit(BI.Widget, { }, _packageLayout: function (items) { - var o = this.options, layout = BI.deepClone(o.layouts[0]); - + var o = this.options, layouts = BI.isArray(o.layouts) ? o.layouts : [o.layouts]; + var layout = BI.deepClone(layouts[0]); var lay = BI.formatEL(layout).el; while (lay && lay.items && !BI.isEmpty(lay.items)) { lay = BI.formatEL(lay.items[0]).el; @@ -113,4 +113,4 @@ BI.VirtualGroup = BI.inherit(BI.Widget, { }); BI.VirtualGroup.EVENT_CHANGE = "EVENT_CHANGE"; -BI.shortcut("bi.virtual_group", BI.VirtualGroup); \ No newline at end of file +BI.shortcut("bi.virtual_group", BI.VirtualGroup); From 8387f936ce4149066aebeec52c1b40c9e9ccf007 Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 7 Dec 2021 16:18:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?message=E6=94=AF=E6=8C=81=E4=BC=A0json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/combination/group.virtual.js | 4 ++-- src/base/foundation/message.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/base/combination/group.virtual.js b/src/base/combination/group.virtual.js index f7f5a894f..af5b4f525 100644 --- a/src/base/combination/group.virtual.js +++ b/src/base/combination/group.virtual.js @@ -44,8 +44,8 @@ BI.VirtualGroup = BI.inherit(BI.Widget, { }, _packageLayout: function (items) { - var o = this.options, layouts = BI.isArray(o.layouts) ? o.layouts : [o.layouts]; - var layout = BI.deepClone(layouts[0]); + var o = this.options, layout = BI.deepClone(o.layouts[0]); + var lay = BI.formatEL(layout).el; while (lay && lay.items && !BI.isEmpty(lay.items)) { lay = BI.formatEL(lay.items[0]).el; diff --git a/src/base/foundation/message.js b/src/base/foundation/message.js index 0b9b174ce..54d66c8d7 100644 --- a/src/base/foundation/message.js +++ b/src/base/foundation/message.js @@ -164,7 +164,7 @@ BI.Msg = function () { height: 40 }, center: { - el: { + el: BI.isPlainObject(message) ? message : { type: "bi.label", vgap: 10, hgap: 20, From 0c087e403de3ae7a2116c0020ba188526ff23bd6 Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 7 Dec 2021 16:20:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?message=E6=94=AF=E6=8C=81=E4=BC=A0json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index a00c12798..38b9c7fcd 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,6 @@ # 更新日志 2.0(2021-12) +- BI.Msg.alert支持message传json格式 - 支持BI.config(function(){})进行系统配置 2.0(2021-11)