From 56e806f6bf29687871179d75201d1c56e1aa977e Mon Sep 17 00:00:00 2001 From: Guyi Date: Wed, 21 Aug 2019 17:27:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BI-49178=20fix=EF=BC=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=A4=8D=E7=94=A8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=97=B4=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/button/node/node.icon.arrow.js | 7 ++++--- src/case/button/node/node.multilayer.icon.arrow.js | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/case/button/node/node.icon.arrow.js b/src/case/button/node/node.icon.arrow.js index 17fbd733a..62608d76f 100644 --- a/src/case/button/node/node.icon.arrow.js +++ b/src/case/button/node/node.icon.arrow.js @@ -62,16 +62,17 @@ BI.IconArrowNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 24, + width: 16, el: this.checkbox }, { - width: 24, + width: 16, el: icon }, this.text); BI.createWidget(BI.extend({ element: this }, BI.LogicFactory.createLogic(type, BI.extend(o.logic, { - items: items + items: items, + rgap: 5 })))); }, diff --git a/src/case/button/node/node.multilayer.icon.arrow.js b/src/case/button/node/node.multilayer.icon.arrow.js index 1559db2cf..0c15b0752 100644 --- a/src/case/button/node/node.multilayer.icon.arrow.js +++ b/src/case/button/node/node.multilayer.icon.arrow.js @@ -7,7 +7,7 @@ BI.MultiLayerIconArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 24, + height: 30, iconHeight: 16, iconWidth: 16, iconCls: "" @@ -40,7 +40,7 @@ BI.MultiLayerIconArrowNode = BI.inherit(BI.NodeButton, { BI.count(0, o.layer, function () { items.push({ type: "bi.layout", - width: 24, + width: 15, height: o.height }); }); @@ -48,7 +48,7 @@ BI.MultiLayerIconArrowNode = BI.inherit(BI.NodeButton, { BI.createWidget({ type: "bi.td", element: this, - columnSize: BI.makeArray(o.layer, 24), + columnSize: BI.makeArray(o.layer, 15), items: [items] }); }, From d8e64ae69cfb623f0ddd55644a52409b91276d8f Mon Sep 17 00:00:00 2001 From: Guyi Date: Thu, 22 Aug 2019 14:33:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?BI-49178=20fix=EF=BC=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=A4=8D=E7=94=A8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=97=B4=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/button/node/node.arrow.js | 2 +- src/case/button/node/node.multilayer.icon.arrow.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/case/button/node/node.arrow.js b/src/case/button/node/node.arrow.js index 1955eafd7..bc7b6d7e4 100644 --- a/src/case/button/node/node.arrow.js +++ b/src/case/button/node/node.arrow.js @@ -43,7 +43,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, { var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 24, + width: 16, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ diff --git a/src/case/button/node/node.multilayer.icon.arrow.js b/src/case/button/node/node.multilayer.icon.arrow.js index 0c15b0752..c77c0fc07 100644 --- a/src/case/button/node/node.multilayer.icon.arrow.js +++ b/src/case/button/node/node.multilayer.icon.arrow.js @@ -7,7 +7,7 @@ BI.MultiLayerIconArrowNode = BI.inherit(BI.NodeButton, { id: "", pId: "", open: false, - height: 30, + height: 24, iconHeight: 16, iconWidth: 16, iconCls: ""