Pull request #1577: DEC-15889 fix: 多层级单选树选中效果异常

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit '99e5e2f1ca6b241d5d9f095a73717b9925c412e3':
  DEC-15889 fix: 多层级单选树选中效果异常

src/base/combination/searcher.js

@@ -101,18 +101,17 @@ BI.Searcher = BI.inherit(BI.Widget, {
                 if (type === BI.Events.CLICK) {
                     if (o.isAutoSync) {
                         var values = o.adapter && o.adapter.getValue();
-                        if (!obj.isSelected()) {
+                        switch (o.chooseType) {
-                            o.adapter && o.adapter.setValue(BI.deepWithout(values, obj.getValue()));
+                            case BI.ButtonGroup.CHOOSE_TYPE_SINGLE:
-                        } else {
+                                o.adapter && o.adapter.setValue([obj.getValue()]);
-                            switch (o.chooseType) {
+                                break;
-                                case BI.ButtonGroup.CHOOSE_TYPE_SINGLE:
+                            case BI.ButtonGroup.CHOOSE_TYPE_MULTI:
-                                    o.adapter && o.adapter.setValue([obj.getValue()]);
+                                if (!obj.isSelected()) {
-                                    break;
+                                    o.adapter && o.adapter.setValue(BI.deepWithout(values, obj.getValue()));
-                                case BI.ButtonGroup.CHOOSE_TYPE_MULTI:
+                                }
-                                    values.push(obj.getValue());
+                                values.push(obj.getValue());
-                                    o.adapter && o.adapter.setValue(values);
+                                o.adapter && o.adapter.setValue(values);
-                                    break;
+                                break;
-                            }
                         }
                     }
                     self.fireEvent(BI.Searcher.EVENT_CHANGE, value, obj);

src/case/tree/treeexpander/tree.expander.js

@@ -35,6 +35,7 @@
                     isFirstNode: o.isFirstNode || o.el.isFirstNode,
                     el: o.popup,
                 },
+                value: o.value,
                 listeners: [
                     {
                         eventName: BI.Controller.EVENT_CHANGE,

src/case/tree/treeexpander/tree.expander.popup.js

@@ -12,7 +12,9 @@
             var self = this;
             var o = this.options;
 
-            this.popupView = BI.createWidget(o.el, this);
+            this.popupView = BI.createWidget(BI.extend(o.el, {
+                value: o.value
+            }), this);
 
             this.popupView.on(BI.Controller.EVENT_CHANGE, function () {
                 self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);