Merge pull request #34632 in DEC/fineui from master to feature/x

* commit '5d6b48046ecf575f287790fb2eb9eaba90413427':
  无jira任务 删除树组件iconWrapperWidth属性
  无jira任务,selecttree组件没传iconWidth:o.height导致全局配置尺寸后icon大小没变

src/case/button/node/node.plus.js

@@ -15,7 +15,6 @@ BI.PlusGroupNode = BI.inherit(BI.NodeButton, {
             id: "",
             pId: "",
             open: false,
-            iconWrapperWidth: null,
             height: 24
         });
     },

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
         });
     },
 

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
         });
     },
 

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
         });
     },
 

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
         });
     },
 

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",

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",

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",

src/widget/selecttree/nodes/node.plus.js

@@ -24,7 +24,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",