From 8d0c6b2efc1b4f51aff8c39da5e22acc5e2dfb1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=95=AC=E5=B3=A5?= Date: Thu, 12 May 2022 10:22:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1,selecttree?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=B2=A1=E4=BC=A0iconWidth:o.height=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E5=85=A8=E5=B1=80=E9=85=8D=E7=BD=AE=E5=B0=BA=E5=AF=B8?= =?UTF-8?q?=E5=90=8Eicon=E5=A4=A7=E5=B0=8F=E6=B2=A1=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/button/node/node.plus.js | 2 +- src/case/checkbox/check.first.treenode.js | 4 ++-- src/case/checkbox/check.last.treenode.js | 4 ++-- src/case/checkbox/check.mid.treenode.js | 4 ++-- src/case/checkbox/check.treenode.js | 4 ++-- src/widget/selecttree/nodes/node.first.plus.js | 4 +++- src/widget/selecttree/nodes/node.last.plus.js | 4 +++- src/widget/selecttree/nodes/node.mid.plus.js | 4 +++- src/widget/selecttree/nodes/node.plus.js | 5 ++++- 9 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/case/button/node/node.plus.js b/src/case/button/node/node.plus.js index ec38ca0e0..0b4b3ee2d 100644 --- a/src/case/button/node/node.plus.js +++ b/src/case/button/node/node.plus.js @@ -14,8 +14,8 @@ BI.PlusGroupNode = BI.inherit(BI.NodeButton, { }, id: "", pId: "", - open: false, iconWrapperWidth: null, + open: false, height: 24 }); }, diff --git a/src/case/checkbox/check.first.treenode.js b/src/case/checkbox/check.first.treenode.js index 40568e700..aa808488f 100644 --- a/src/case/checkbox/check.first.treenode.js +++ b/src/case/checkbox/check.first.treenode.js @@ -7,8 +7,8 @@ BI.FirstTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.FirstTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type2" : "tree-collapse-icon-type2", - iconWidth: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, - iconHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + iconWidth: 24, + iconHeight: 24 }); }, diff --git a/src/case/checkbox/check.last.treenode.js b/src/case/checkbox/check.last.treenode.js index 653dd785d..cb536f8cc 100644 --- a/src/case/checkbox/check.last.treenode.js +++ b/src/case/checkbox/check.last.treenode.js @@ -7,8 +7,8 @@ BI.LastTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend(BI.LastTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type4" : "tree-collapse-icon-type4", - iconWidth: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, - iconHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + iconWidth: 24, + iconHeight: 24 }); }, diff --git a/src/case/checkbox/check.mid.treenode.js b/src/case/checkbox/check.mid.treenode.js index 716cb0142..7ec4e5230 100644 --- a/src/case/checkbox/check.mid.treenode.js +++ b/src/case/checkbox/check.mid.treenode.js @@ -7,8 +7,8 @@ BI.MidTreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.MidTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type3" : "tree-collapse-icon-type3", - iconWidth: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, - iconHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + iconWidth: 24, + iconHeight: 24 }); }, diff --git a/src/case/checkbox/check.treenode.js b/src/case/checkbox/check.treenode.js index ab186f4fb..128bb73c6 100644 --- a/src/case/checkbox/check.treenode.js +++ b/src/case/checkbox/check.treenode.js @@ -7,8 +7,8 @@ BI.TreeNodeCheckbox = BI.inherit(BI.IconButton, { _defaultConfig: function () { return BI.extend( BI.TreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), { extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type1" : "tree-collapse-icon-type1", - iconWidth: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, - iconHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + iconWidth: 24, + iconHeight: 24 }); }, diff --git a/src/widget/selecttree/nodes/node.first.plus.js b/src/widget/selecttree/nodes/node.first.plus.js index f8f23c2b5..378eac230 100644 --- a/src/widget/selecttree/nodes/node.first.plus.js +++ b/src/widget/selecttree/nodes/node.first.plus.js @@ -24,7 +24,9 @@ BI.SelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.checkbox = BI.createWidget({ type: "bi.first_tree_node_checkbox", - stopPropagation: true + stopPropagation: true, + iconHeight: o.height, + iconWidth: o.height }); this.text = BI.createWidget({ type: "bi.label", diff --git a/src/widget/selecttree/nodes/node.last.plus.js b/src/widget/selecttree/nodes/node.last.plus.js index 2c4cca80c..f8e764e10 100644 --- a/src/widget/selecttree/nodes/node.last.plus.js +++ b/src/widget/selecttree/nodes/node.last.plus.js @@ -24,7 +24,9 @@ BI.SelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.checkbox = BI.createWidget({ type: "bi.last_tree_node_checkbox", - stopPropagation: true + stopPropagation: true, + iconHeight: o.height, + iconWidth: o.height }); this.text = BI.createWidget({ type: "bi.label", diff --git a/src/widget/selecttree/nodes/node.mid.plus.js b/src/widget/selecttree/nodes/node.mid.plus.js index 289136242..ddafe5704 100644 --- a/src/widget/selecttree/nodes/node.mid.plus.js +++ b/src/widget/selecttree/nodes/node.mid.plus.js @@ -24,7 +24,9 @@ BI.SelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.checkbox = BI.createWidget({ type: "bi.mid_tree_node_checkbox", - stopPropagation: true + stopPropagation: true, + iconHeight: o.height, + iconWidth: o.height }); this.text = BI.createWidget({ type: "bi.label", diff --git a/src/widget/selecttree/nodes/node.plus.js b/src/widget/selecttree/nodes/node.plus.js index e0f8e8632..ebebfa314 100644 --- a/src/widget/selecttree/nodes/node.plus.js +++ b/src/widget/selecttree/nodes/node.plus.js @@ -14,6 +14,7 @@ BI.SelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { }, id: "", pId: "", + iconWrapperWidth: null, readonly: true, open: false, height: 24 @@ -24,7 +25,9 @@ BI.SelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { var self = this, o = this.options; this.checkbox = BI.createWidget({ type: "bi.tree_node_checkbox", - stopPropagation: true + stopPropagation: true, + iconHeight: o.height, + iconWidth: o.iconWrapperWidth || o.height }); this.text = BI.createWidget({ type: "bi.label", From 511ebb73abd53e54e484727441ee33af1f7f7aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=95=AC=E5=B3=A5?= Date: Thu, 12 May 2022 10:43:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=A0=91=E7=BB=84=E4=BB=B6iconWrapperWidth=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/button/node/node.plus.js | 1 - src/widget/selecttree/nodes/node.plus.js | 1 - 2 files changed, 2 deletions(-) diff --git a/src/case/button/node/node.plus.js b/src/case/button/node/node.plus.js index 0b4b3ee2d..708ad4300 100644 --- a/src/case/button/node/node.plus.js +++ b/src/case/button/node/node.plus.js @@ -14,7 +14,6 @@ BI.PlusGroupNode = BI.inherit(BI.NodeButton, { }, id: "", pId: "", - iconWrapperWidth: null, open: false, height: 24 }); diff --git a/src/widget/selecttree/nodes/node.plus.js b/src/widget/selecttree/nodes/node.plus.js index ebebfa314..d5cd39c66 100644 --- a/src/widget/selecttree/nodes/node.plus.js +++ b/src/widget/selecttree/nodes/node.plus.js @@ -14,7 +14,6 @@ BI.SelectTreePlusGroupNode = BI.inherit(BI.NodeButton, { }, id: "", pId: "", - iconWrapperWidth: null, readonly: true, open: false, height: 24