From 25bbff492ab53923ea907185b2c7cee99c8bc6de Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Mon, 26 Aug 2019 11:22:52 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-20994=20fix:=20selecttree.xpander?=
 =?UTF-8?q?=E6=8F=90=E4=BE=9BgetAllLeaves?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dist/2.0/fineui.ie.js                        | 17 +++++++++++------
 dist/2.0/fineui.js                           | 17 +++++++++++------
 dist/bundle.ie.js                            | 17 +++++++++++------
 dist/bundle.js                               | 17 +++++++++++------
 dist/case.js                                 | 13 +++++++------
 dist/fineui.ie.js                            | 17 +++++++++++------
 dist/fineui.js                               | 17 +++++++++++------
 dist/fineui_without_jquery_polyfill.js       | 17 +++++++++++------
 dist/widget.js                               |  4 ++++
 src/widget/selecttree/selecttree.expander.js |  4 ++++
 10 files changed, 92 insertions(+), 48 deletions(-)

diff --git a/dist/2.0/fineui.ie.js b/dist/2.0/fineui.ie.js
index c8a5590e9..07e9b96b5 100644
--- a/dist/2.0/fineui.ie.js
+++ b/dist/2.0/fineui.ie.js
@@ -52480,7 +52480,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({
@@ -52659,16 +52659,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
         }))));
     },
 
@@ -52897,7 +52898,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro
         BI.count(0, o.layer, function () {
             items.push({
                 type: "bi.layout",
-                width: 24,
+                width: 15,
                 height: o.height
             });
         });
@@ -52905,7 +52906,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro
         BI.createWidget({
             type: "bi.td",
             element: this,
-            columnSize: BI.makeArray(o.layer, 24),
+            columnSize: BI.makeArray(o.layer, 15),
             items: [items]
         });
     },
@@ -80092,6 +80093,10 @@ BI.SelectTreeExpander = BI.inherit(BI.Widget, {
         });
     },
 
+    getAllLeaves: function () {
+        return this.expander.getAllLeaves();
+    },
+
     setValue: function (v) {
         if (BI.contains(v, this.trigger.getValue())) {
             this.trigger.setSelected(true);
diff --git a/dist/2.0/fineui.js b/dist/2.0/fineui.js
index dac4eebbf..d5ca7830e 100644
--- a/dist/2.0/fineui.js
+++ b/dist/2.0/fineui.js
@@ -52884,7 +52884,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({
@@ -53063,16 +53063,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
         }))));
     },
 
@@ -53301,7 +53302,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro
         BI.count(0, o.layer, function () {
             items.push({
                 type: "bi.layout",
-                width: 24,
+                width: 15,
                 height: o.height
             });
         });
@@ -53309,7 +53310,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro
         BI.createWidget({
             type: "bi.td",
             element: this,
-            columnSize: BI.makeArray(o.layer, 24),
+            columnSize: BI.makeArray(o.layer, 15),
             items: [items]
         });
     },
@@ -80496,6 +80497,10 @@ BI.SelectTreeExpander = BI.inherit(BI.Widget, {
         });
     },
 
+    getAllLeaves: function () {
+        return this.expander.getAllLeaves();
+    },
+
     setValue: function (v) {
         if (BI.contains(v, this.trigger.getValue())) {
             this.trigger.setSelected(true);
diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js
index c8a5590e9..07e9b96b5 100644
--- a/dist/bundle.ie.js
+++ b/dist/bundle.ie.js
@@ -52480,7 +52480,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({
@@ -52659,16 +52659,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
         }))));
     },
 
@@ -52897,7 +52898,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro
         BI.count(0, o.layer, function () {
             items.push({
                 type: "bi.layout",
-                width: 24,
+                width: 15,
                 height: o.height
             });
         });
@@ -52905,7 +52906,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro
         BI.createWidget({
             type: "bi.td",
             element: this,
-            columnSize: BI.makeArray(o.layer, 24),
+            columnSize: BI.makeArray(o.layer, 15),
             items: [items]
         });
     },
@@ -80092,6 +80093,10 @@ BI.SelectTreeExpander = BI.inherit(BI.Widget, {
         });
     },
 
+    getAllLeaves: function () {
+        return this.expander.getAllLeaves();
+    },
+
     setValue: function (v) {
         if (BI.contains(v, this.trigger.getValue())) {
             this.trigger.setSelected(true);
diff --git a/dist/bundle.js b/dist/bundle.js
index dac4eebbf..d5ca7830e 100644
--- a/dist/bundle.js
+++ b/dist/bundle.js
@@ -52884,7 +52884,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({
@@ -53063,16 +53063,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
         }))));
     },
 
@@ -53301,7 +53302,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro
         BI.count(0, o.layer, function () {
             items.push({
                 type: "bi.layout",
-                width: 24,
+                width: 15,
                 height: o.height
             });
         });
@@ -53309,7 +53310,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro
         BI.createWidget({
             type: "bi.td",
             element: this,
-            columnSize: BI.makeArray(o.layer, 24),
+            columnSize: BI.makeArray(o.layer, 15),
             items: [items]
         });
     },
@@ -80496,6 +80497,10 @@ BI.SelectTreeExpander = BI.inherit(BI.Widget, {
         });
     },
 
+    getAllLeaves: function () {
+        return this.expander.getAllLeaves();
+    },
+
     setValue: function (v) {
         if (BI.contains(v, this.trigger.getValue())) {
             this.trigger.setSelected(true);
diff --git a/dist/case.js b/dist/case.js
index ec5125ae1..76304cf00 100644
--- a/dist/case.js
+++ b/dist/case.js
@@ -456,7 +456,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({
@@ -635,16 +635,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
         }))));
     },
 
@@ -873,7 +874,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro
         BI.count(0, o.layer, function () {
             items.push({
                 type: "bi.layout",
-                width: 24,
+                width: 15,
                 height: o.height
             });
         });
@@ -881,7 +882,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro
         BI.createWidget({
             type: "bi.td",
             element: this,
-            columnSize: BI.makeArray(o.layer, 24),
+            columnSize: BI.makeArray(o.layer, 15),
             items: [items]
         });
     },
diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js
index 810e9f77f..883a770ce 100644
--- a/dist/fineui.ie.js
+++ b/dist/fineui.ie.js
@@ -52725,7 +52725,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({
@@ -52904,16 +52904,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
         }))));
     },
 
@@ -53142,7 +53143,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro
         BI.count(0, o.layer, function () {
             items.push({
                 type: "bi.layout",
-                width: 24,
+                width: 15,
                 height: o.height
             });
         });
@@ -53150,7 +53151,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro
         BI.createWidget({
             type: "bi.td",
             element: this,
-            columnSize: BI.makeArray(o.layer, 24),
+            columnSize: BI.makeArray(o.layer, 15),
             items: [items]
         });
     },
@@ -80337,6 +80338,10 @@ BI.SelectTreeExpander = BI.inherit(BI.Widget, {
         });
     },
 
+    getAllLeaves: function () {
+        return this.expander.getAllLeaves();
+    },
+
     setValue: function (v) {
         if (BI.contains(v, this.trigger.getValue())) {
             this.trigger.setSelected(true);
diff --git a/dist/fineui.js b/dist/fineui.js
index 6bfa83752..8b660952d 100644
--- a/dist/fineui.js
+++ b/dist/fineui.js
@@ -53129,7 +53129,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({
@@ -53308,16 +53308,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
         }))));
     },
 
@@ -53546,7 +53547,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro
         BI.count(0, o.layer, function () {
             items.push({
                 type: "bi.layout",
-                width: 24,
+                width: 15,
                 height: o.height
             });
         });
@@ -53554,7 +53555,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro
         BI.createWidget({
             type: "bi.td",
             element: this,
-            columnSize: BI.makeArray(o.layer, 24),
+            columnSize: BI.makeArray(o.layer, 15),
             items: [items]
         });
     },
@@ -80741,6 +80742,10 @@ BI.SelectTreeExpander = BI.inherit(BI.Widget, {
         });
     },
 
+    getAllLeaves: function () {
+        return this.expander.getAllLeaves();
+    },
+
     setValue: function (v) {
         if (BI.contains(v, this.trigger.getValue())) {
             this.trigger.setSelected(true);
diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js
index 0230ac131..7cbd1d7ea 100644
--- a/dist/fineui_without_jquery_polyfill.js
+++ b/dist/fineui_without_jquery_polyfill.js
@@ -37258,7 +37258,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({
@@ -37437,16 +37437,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
         }))));
     },
 
@@ -37675,7 +37676,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro
         BI.count(0, o.layer, function () {
             items.push({
                 type: "bi.layout",
-                width: 24,
+                width: 15,
                 height: o.height
             });
         });
@@ -37683,7 +37684,7 @@ BI.shortcut("bi.mid_plus_group_node", BI.MidPlusGroupNode);BI.MultiLayerIconArro
         BI.createWidget({
             type: "bi.td",
             element: this,
-            columnSize: BI.makeArray(o.layer, 24),
+            columnSize: BI.makeArray(o.layer, 15),
             items: [items]
         });
     },
@@ -63041,6 +63042,10 @@ BI.SelectTreeExpander = BI.inherit(BI.Widget, {
         });
     },
 
+    getAllLeaves: function () {
+        return this.expander.getAllLeaves();
+    },
+
     setValue: function (v) {
         if (BI.contains(v, this.trigger.getValue())) {
             this.trigger.setSelected(true);
diff --git a/dist/widget.js b/dist/widget.js
index 3775bf873..df4cae545 100644
--- a/dist/widget.js
+++ b/dist/widget.js
@@ -18153,6 +18153,10 @@ BI.SelectTreeExpander = BI.inherit(BI.Widget, {
         });
     },
 
+    getAllLeaves: function () {
+        return this.expander.getAllLeaves();
+    },
+
     setValue: function (v) {
         if (BI.contains(v, this.trigger.getValue())) {
             this.trigger.setSelected(true);
diff --git a/src/widget/selecttree/selecttree.expander.js b/src/widget/selecttree/selecttree.expander.js
index 142f3c8ef..b708e4bb9 100644
--- a/src/widget/selecttree/selecttree.expander.js
+++ b/src/widget/selecttree/selecttree.expander.js
@@ -48,6 +48,10 @@ BI.SelectTreeExpander = BI.inherit(BI.Widget, {
         });
     },
 
+    getAllLeaves: function () {
+        return this.expander.getAllLeaves();
+    },
+
     setValue: function (v) {
         if (BI.contains(v, this.trigger.getValue())) {
             this.trigger.setSelected(true);