Merge pull request #716 in VISUAL/fineui from ~GUY/fineui:master to master

* commit 'b05cca63caab344b4b10b827f6afa3c7cd9cfe97':
  update

dist/bundle.ie.js

@@ -30382,98 +30382,6 @@ BI.AbsoluteVerticalLayout = BI.inherit(BI.Layout, {
     }
 });
 BI.shortcut("bi.absolute_vertical_adapt", BI.AbsoluteVerticalLayout);/**
- * 内联布局
- * @class BI.InlineCenterAdaptLayout
- * @extends BI.Layout
- *
- * @cfg {JSON} options 配置属性
- * @cfg {Number} [hgap=0] 水平间隙
- * @cfg {Number} [vgap=0] 垂直间隙
- */
-BI.InlineVaerticalAdaptLayout = BI.inherit(BI.Layout, {
-
-    props: function () {
-        return BI.extend(BI.InlineLayout.superclass.props.apply(this, arguments), {
-            baseCls: "bi-inline-center-adapt-layout",
-            hgap: 0,
-            vgap: 0,
-            lgap: 0,
-            rgap: 0,
-            tgap: 0,
-            bgap: 0
-        });
-    },
-
-    render: function () {
-        BI.InlineVaerticalAdaptLayout.superclass.render.apply(this, arguments);
-        this.element.css({
-            whiteSpace: "nowrap",
-            "text-align": "left"
-        });
-        this.populate(this.options.items);
-    },
-
-    _addElement: function (i, item, length) {
-        var o = this.options;
-        if (!this.hasWidget(this.getName() + i)) {
-            var t = BI.createWidget(item);
-            this.addWidget(this.getName() + i, t);
-        } else {
-            var t = this.getWidgetByName(this.getName() + i);
-        }
-        t.element.css({
-            position: "relative",
-            display: "inline-block",
-            "vertical-align": "middle",
-            "*display": "inline",
-            "*zoom": 1
-        });
-        if (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0) !== 0) {
-            t.element.css({
-                "margin-top": (o.vgap || 0) + o.tgap + (item.tgap || 0) + (item.vgap || 0) + "px"
-            });
-        }
-        if (o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0) !== 0) {
-            t.element.css({
-                "margin-left": o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0) + "px"
-            });
-        }
-        if (o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0) !== 0) {
-            t.element.css({
-                "margin-right": o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0) + "px"
-            });
-        }
-        if (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0) !== 0) {
-            t.element.css({
-                "margin-bottom": o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0) + "px"
-            });
-        }
-        return t;
-    },
-
-    resize: function () {
-        this.stroke(this.options.items);
-    },
-
-    addItem: function (item) {
-        throw new Error("不能添加元素");
-    },
-
-    stroke: function (items) {
-        var self = this;
-        BI.each(items, function (i, item) {
-            if (item) {
-                self._addElement(i, item, items.length);
-            }
-        });
-    },
-
-    populate: function (items) {
-        BI.InlineVaerticalAdaptLayout.superclass.populate.apply(this, arguments);
-        this._mount();
-    }
-});
-BI.shortcut("bi.vertical_inline_adapt", BI.InlineVaerticalAdaptLayout);/**
  * 自适应水平和垂直方向都居中容器
  * @class BI.CenterAdaptLayout
  * @extends BI.Layout
@@ -53905,13 +53813,19 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
         });
 
         this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () {
-            self.setValue(self.combo.getValue()[0].value);
+            var currentVal = self.combo.getValue()[0].value;
+            if (currentVal !== self.value) {
+                self.setValue(currentVal);
                 self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
+            }
         });
 
         this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () {
-            self.setValue(self.combo.getValue()[0].childValue);
+            var currentVal = self.combo.getValue()[0].childValue;
+            if (currentVal !== self.value) {
+                self.setValue(currentVal);
                 self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
+            }
         });
     },
 
@@ -53930,6 +53844,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
     },
 
     _digest: function (v) {
+        this.value = v;
         return this.valueMap[v];
     },
 

dist/bundle.js

@@ -30382,98 +30382,6 @@ BI.AbsoluteVerticalLayout = BI.inherit(BI.Layout, {
     }
 });
 BI.shortcut("bi.absolute_vertical_adapt", BI.AbsoluteVerticalLayout);/**
- * 内联布局
- * @class BI.InlineCenterAdaptLayout
- * @extends BI.Layout
- *
- * @cfg {JSON} options 配置属性
- * @cfg {Number} [hgap=0] 水平间隙
- * @cfg {Number} [vgap=0] 垂直间隙
- */
-BI.InlineVaerticalAdaptLayout = BI.inherit(BI.Layout, {
-
-    props: function () {
-        return BI.extend(BI.InlineLayout.superclass.props.apply(this, arguments), {
-            baseCls: "bi-inline-center-adapt-layout",
-            hgap: 0,
-            vgap: 0,
-            lgap: 0,
-            rgap: 0,
-            tgap: 0,
-            bgap: 0
-        });
-    },
-
-    render: function () {
-        BI.InlineVaerticalAdaptLayout.superclass.render.apply(this, arguments);
-        this.element.css({
-            whiteSpace: "nowrap",
-            "text-align": "left"
-        });
-        this.populate(this.options.items);
-    },
-
-    _addElement: function (i, item, length) {
-        var o = this.options;
-        if (!this.hasWidget(this.getName() + i)) {
-            var t = BI.createWidget(item);
-            this.addWidget(this.getName() + i, t);
-        } else {
-            var t = this.getWidgetByName(this.getName() + i);
-        }
-        t.element.css({
-            position: "relative",
-            display: "inline-block",
-            "vertical-align": "middle",
-            "*display": "inline",
-            "*zoom": 1
-        });
-        if (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0) !== 0) {
-            t.element.css({
-                "margin-top": (o.vgap || 0) + o.tgap + (item.tgap || 0) + (item.vgap || 0) + "px"
-            });
-        }
-        if (o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0) !== 0) {
-            t.element.css({
-                "margin-left": o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0) + "px"
-            });
-        }
-        if (o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0) !== 0) {
-            t.element.css({
-                "margin-right": o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0) + "px"
-            });
-        }
-        if (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0) !== 0) {
-            t.element.css({
-                "margin-bottom": o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0) + "px"
-            });
-        }
-        return t;
-    },
-
-    resize: function () {
-        this.stroke(this.options.items);
-    },
-
-    addItem: function (item) {
-        throw new Error("不能添加元素");
-    },
-
-    stroke: function (items) {
-        var self = this;
-        BI.each(items, function (i, item) {
-            if (item) {
-                self._addElement(i, item, items.length);
-            }
-        });
-    },
-
-    populate: function (items) {
-        BI.InlineVaerticalAdaptLayout.superclass.populate.apply(this, arguments);
-        this._mount();
-    }
-});
-BI.shortcut("bi.vertical_inline_adapt", BI.InlineVaerticalAdaptLayout);/**
  * 自适应水平和垂直方向都居中容器
  * @class BI.CenterAdaptLayout
  * @extends BI.Layout
@@ -54444,13 +54352,19 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
         });
 
         this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () {
-            self.setValue(self.combo.getValue()[0].value);
+            var currentVal = self.combo.getValue()[0].value;
+            if (currentVal !== self.value) {
+                self.setValue(currentVal);
                 self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
+            }
         });
 
         this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () {
-            self.setValue(self.combo.getValue()[0].childValue);
+            var currentVal = self.combo.getValue()[0].childValue;
+            if (currentVal !== self.value) {
+                self.setValue(currentVal);
                 self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
+            }
         });
     },
 
@@ -54469,6 +54383,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
     },
 
     _digest: function (v) {
+        this.value = v;
         return this.valueMap[v];
     },
 

dist/case.js

@@ -5490,13 +5490,19 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
         });
 
         this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () {
-            self.setValue(self.combo.getValue()[0].value);
+            var currentVal = self.combo.getValue()[0].value;
+            if (currentVal !== self.value) {
+                self.setValue(currentVal);
                 self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
+            }
         });
 
         this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () {
-            self.setValue(self.combo.getValue()[0].childValue);
+            var currentVal = self.combo.getValue()[0].childValue;
+            if (currentVal !== self.value) {
+                self.setValue(currentVal);
                 self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
+            }
         });
     },
 
@@ -5515,6 +5521,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
     },
 
     _digest: function (v) {
+        this.value = v;
         return this.valueMap[v];
     },
 

dist/core.js

@@ -30382,98 +30382,6 @@ BI.AbsoluteVerticalLayout = BI.inherit(BI.Layout, {
     }
 });
 BI.shortcut("bi.absolute_vertical_adapt", BI.AbsoluteVerticalLayout);/**
- * 内联布局
- * @class BI.InlineCenterAdaptLayout
- * @extends BI.Layout
- *
- * @cfg {JSON} options 配置属性
- * @cfg {Number} [hgap=0] 水平间隙
- * @cfg {Number} [vgap=0] 垂直间隙
- */
-BI.InlineVaerticalAdaptLayout = BI.inherit(BI.Layout, {
-
-    props: function () {
-        return BI.extend(BI.InlineLayout.superclass.props.apply(this, arguments), {
-            baseCls: "bi-inline-center-adapt-layout",
-            hgap: 0,
-            vgap: 0,
-            lgap: 0,
-            rgap: 0,
-            tgap: 0,
-            bgap: 0
-        });
-    },
-
-    render: function () {
-        BI.InlineVaerticalAdaptLayout.superclass.render.apply(this, arguments);
-        this.element.css({
-            whiteSpace: "nowrap",
-            "text-align": "left"
-        });
-        this.populate(this.options.items);
-    },
-
-    _addElement: function (i, item, length) {
-        var o = this.options;
-        if (!this.hasWidget(this.getName() + i)) {
-            var t = BI.createWidget(item);
-            this.addWidget(this.getName() + i, t);
-        } else {
-            var t = this.getWidgetByName(this.getName() + i);
-        }
-        t.element.css({
-            position: "relative",
-            display: "inline-block",
-            "vertical-align": "middle",
-            "*display": "inline",
-            "*zoom": 1
-        });
-        if (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0) !== 0) {
-            t.element.css({
-                "margin-top": (o.vgap || 0) + o.tgap + (item.tgap || 0) + (item.vgap || 0) + "px"
-            });
-        }
-        if (o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0) !== 0) {
-            t.element.css({
-                "margin-left": o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0) + "px"
-            });
-        }
-        if (o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0) !== 0) {
-            t.element.css({
-                "margin-right": o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0) + "px"
-            });
-        }
-        if (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0) !== 0) {
-            t.element.css({
-                "margin-bottom": o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0) + "px"
-            });
-        }
-        return t;
-    },
-
-    resize: function () {
-        this.stroke(this.options.items);
-    },
-
-    addItem: function (item) {
-        throw new Error("不能添加元素");
-    },
-
-    stroke: function (items) {
-        var self = this;
-        BI.each(items, function (i, item) {
-            if (item) {
-                self._addElement(i, item, items.length);
-            }
-        });
-    },
-
-    populate: function (items) {
-        BI.InlineVaerticalAdaptLayout.superclass.populate.apply(this, arguments);
-        this._mount();
-    }
-});
-BI.shortcut("bi.vertical_inline_adapt", BI.InlineVaerticalAdaptLayout);/**
  * 自适应水平和垂直方向都居中容器
  * @class BI.CenterAdaptLayout
  * @extends BI.Layout

dist/fineui.ie.js

@@ -30624,98 +30624,6 @@ BI.AbsoluteVerticalLayout = BI.inherit(BI.Layout, {
     }
 });
 BI.shortcut("bi.absolute_vertical_adapt", BI.AbsoluteVerticalLayout);/**
- * 内联布局
- * @class BI.InlineCenterAdaptLayout
- * @extends BI.Layout
- *
- * @cfg {JSON} options 配置属性
- * @cfg {Number} [hgap=0] 水平间隙
- * @cfg {Number} [vgap=0] 垂直间隙
- */
-BI.InlineVaerticalAdaptLayout = BI.inherit(BI.Layout, {
-
-    props: function () {
-        return BI.extend(BI.InlineLayout.superclass.props.apply(this, arguments), {
-            baseCls: "bi-inline-center-adapt-layout",
-            hgap: 0,
-            vgap: 0,
-            lgap: 0,
-            rgap: 0,
-            tgap: 0,
-            bgap: 0
-        });
-    },
-
-    render: function () {
-        BI.InlineVaerticalAdaptLayout.superclass.render.apply(this, arguments);
-        this.element.css({
-            whiteSpace: "nowrap",
-            "text-align": "left"
-        });
-        this.populate(this.options.items);
-    },
-
-    _addElement: function (i, item, length) {
-        var o = this.options;
-        if (!this.hasWidget(this.getName() + i)) {
-            var t = BI.createWidget(item);
-            this.addWidget(this.getName() + i, t);
-        } else {
-            var t = this.getWidgetByName(this.getName() + i);
-        }
-        t.element.css({
-            position: "relative",
-            display: "inline-block",
-            "vertical-align": "middle",
-            "*display": "inline",
-            "*zoom": 1
-        });
-        if (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0) !== 0) {
-            t.element.css({
-                "margin-top": (o.vgap || 0) + o.tgap + (item.tgap || 0) + (item.vgap || 0) + "px"
-            });
-        }
-        if (o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0) !== 0) {
-            t.element.css({
-                "margin-left": o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0) + "px"
-            });
-        }
-        if (o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0) !== 0) {
-            t.element.css({
-                "margin-right": o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0) + "px"
-            });
-        }
-        if (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0) !== 0) {
-            t.element.css({
-                "margin-bottom": o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0) + "px"
-            });
-        }
-        return t;
-    },
-
-    resize: function () {
-        this.stroke(this.options.items);
-    },
-
-    addItem: function (item) {
-        throw new Error("不能添加元素");
-    },
-
-    stroke: function (items) {
-        var self = this;
-        BI.each(items, function (i, item) {
-            if (item) {
-                self._addElement(i, item, items.length);
-            }
-        });
-    },
-
-    populate: function (items) {
-        BI.InlineVaerticalAdaptLayout.superclass.populate.apply(this, arguments);
-        this._mount();
-    }
-});
-BI.shortcut("bi.vertical_inline_adapt", BI.InlineVaerticalAdaptLayout);/**
  * 自适应水平和垂直方向都居中容器
  * @class BI.CenterAdaptLayout
  * @extends BI.Layout
@@ -54147,13 +54055,19 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
         });
 
         this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () {
-            self.setValue(self.combo.getValue()[0].value);
+            var currentVal = self.combo.getValue()[0].value;
+            if (currentVal !== self.value) {
+                self.setValue(currentVal);
                 self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
+            }
         });
 
         this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () {
-            self.setValue(self.combo.getValue()[0].childValue);
+            var currentVal = self.combo.getValue()[0].childValue;
+            if (currentVal !== self.value) {
+                self.setValue(currentVal);
                 self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
+            }
         });
     },
 
@@ -54172,6 +54086,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
     },
 
     _digest: function (v) {
+        this.value = v;
         return this.valueMap[v];
     },
 

dist/fineui.js

@@ -30624,98 +30624,6 @@ BI.AbsoluteVerticalLayout = BI.inherit(BI.Layout, {
     }
 });
 BI.shortcut("bi.absolute_vertical_adapt", BI.AbsoluteVerticalLayout);/**
- * 内联布局
- * @class BI.InlineCenterAdaptLayout
- * @extends BI.Layout
- *
- * @cfg {JSON} options 配置属性
- * @cfg {Number} [hgap=0] 水平间隙
- * @cfg {Number} [vgap=0] 垂直间隙
- */
-BI.InlineVaerticalAdaptLayout = BI.inherit(BI.Layout, {
-
-    props: function () {
-        return BI.extend(BI.InlineLayout.superclass.props.apply(this, arguments), {
-            baseCls: "bi-inline-center-adapt-layout",
-            hgap: 0,
-            vgap: 0,
-            lgap: 0,
-            rgap: 0,
-            tgap: 0,
-            bgap: 0
-        });
-    },
-
-    render: function () {
-        BI.InlineVaerticalAdaptLayout.superclass.render.apply(this, arguments);
-        this.element.css({
-            whiteSpace: "nowrap",
-            "text-align": "left"
-        });
-        this.populate(this.options.items);
-    },
-
-    _addElement: function (i, item, length) {
-        var o = this.options;
-        if (!this.hasWidget(this.getName() + i)) {
-            var t = BI.createWidget(item);
-            this.addWidget(this.getName() + i, t);
-        } else {
-            var t = this.getWidgetByName(this.getName() + i);
-        }
-        t.element.css({
-            position: "relative",
-            display: "inline-block",
-            "vertical-align": "middle",
-            "*display": "inline",
-            "*zoom": 1
-        });
-        if (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0) !== 0) {
-            t.element.css({
-                "margin-top": (o.vgap || 0) + o.tgap + (item.tgap || 0) + (item.vgap || 0) + "px"
-            });
-        }
-        if (o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0) !== 0) {
-            t.element.css({
-                "margin-left": o.hgap + o.lgap + (item.lgap || 0) + (item.hgap || 0) + "px"
-            });
-        }
-        if (o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0) !== 0) {
-            t.element.css({
-                "margin-right": o.hgap + o.rgap + (item.rgap || 0) + (item.hgap || 0) + "px"
-            });
-        }
-        if (o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0) !== 0) {
-            t.element.css({
-                "margin-bottom": o.vgap + o.bgap + (item.bgap || 0) + (item.vgap || 0) + "px"
-            });
-        }
-        return t;
-    },
-
-    resize: function () {
-        this.stroke(this.options.items);
-    },
-
-    addItem: function (item) {
-        throw new Error("不能添加元素");
-    },
-
-    stroke: function (items) {
-        var self = this;
-        BI.each(items, function (i, item) {
-            if (item) {
-                self._addElement(i, item, items.length);
-            }
-        });
-    },
-
-    populate: function (items) {
-        BI.InlineVaerticalAdaptLayout.superclass.populate.apply(this, arguments);
-        this._mount();
-    }
-});
-BI.shortcut("bi.vertical_inline_adapt", BI.InlineVaerticalAdaptLayout);/**
  * 自适应水平和垂直方向都居中容器
  * @class BI.CenterAdaptLayout
  * @extends BI.Layout
@@ -54686,13 +54594,19 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
         });
 
         this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () {
-            self.setValue(self.combo.getValue()[0].value);
+            var currentVal = self.combo.getValue()[0].value;
+            if (currentVal !== self.value) {
+                self.setValue(currentVal);
                 self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
+            }
         });
 
         this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () {
-            self.setValue(self.combo.getValue()[0].childValue);
+            var currentVal = self.combo.getValue()[0].childValue;
+            if (currentVal !== self.value) {
+                self.setValue(currentVal);
                 self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
+            }
         });
     },
 
@@ -54711,6 +54625,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
     },
 
     _digest: function (v) {
+        this.value = v;
         return this.valueMap[v];
     },
 

dist/fineui_without_jquery_polyfill.js

@@ -37675,13 +37675,19 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
         });
 
         this.combo.on(BI.DownListCombo.EVENT_CHANGE, function () {
-            self.setValue(self.combo.getValue()[0].value);
+            var currentVal = self.combo.getValue()[0].value;
+            if (currentVal !== self.value) {
+                self.setValue(currentVal);
                 self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
+            }
         });
 
         this.combo.on(BI.DownListCombo.EVENT_SON_VALUE_CHANGE, function () {
-            self.setValue(self.combo.getValue()[0].childValue);
+            var currentVal = self.combo.getValue()[0].childValue;
+            if (currentVal !== self.value) {
+                self.setValue(currentVal);
                 self.fireEvent(BI.TextValueDownListCombo.EVENT_CHANGE);
+            }
         });
     },
 
@@ -37700,6 +37706,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
     },
 
     _digest: function (v) {
+        this.value = v;
         return this.valueMap[v];
     },
 
@@ -41189,7 +41196,7 @@ BI.LevelTree = BI.inherit(BI.Widget, {
                 node.id = BI.UUID();
             }
             extend.pNode = pNode;
-            if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
+            if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
                 extend.type = "bi.mid_plus_group_node";
                 if (i === nodes.length - 1) {
                     extend.type = "bi.last_plus_group_node";
@@ -48521,7 +48528,7 @@ BI.MultiLayerSelectLevelTree = BI.inherit(BI.Widget, {
                 node.id = BI.UUID();
             }
             extend.pNode = pNode;
-            if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
+            if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
                 extend.type = "bi.multilayer_select_tree_mid_plus_group_node";
                 if (i === nodes.length - 1) {
                     extend.type = "bi.multilayer_select_tree_last_plus_group_node";
@@ -49212,7 +49219,7 @@ BI.MultiLayerSingleLevelTree = BI.inherit(BI.Widget, {
                 node.id = BI.UUID();
             }
             extend.pNode = pNode;
-            if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
+            if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
                 extend.type = "bi.multilayer_single_tree_mid_plus_group_node";
                 if (i === nodes.length - 1) {
                     extend.type = "bi.multilayer_single_tree_last_plus_group_node";
@@ -57827,7 +57834,7 @@ BI.SelectTreePopup = BI.inherit(BI.Pane, {
             var extend = {layer: layer};
             node.id = node.id || BI.UUID();
             extend.pNode = pNode;
-            if (node.isParent === true || BI.isNotEmptyArray(node.children)) {
+            if (node.isParent === true || node.parent === true || BI.isNotEmptyArray(node.children)) {
                 extend.type = "bi.select_tree_mid_plus_group_node";
                 if (i === nodes.length - 1) {
                     extend.type = "bi.select_tree_last_plus_group_node";