From bb6882939bbac891bdd83fabf1a49d05f99f127c Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Mon, 10 Feb 2020 15:07:31 +0800
Subject: [PATCH] Roo/form/ComboNested.js

---
 Roo/form/ComboNested.js | 64 ++++++++++++++++++++++++++++++-----------
 1 file changed, 47 insertions(+), 17 deletions(-)

diff --git a/Roo/form/ComboNested.js b/Roo/form/ComboNested.js
index 6549e8ef9d..db506672d6 100644
--- a/Roo/form/ComboNested.js
+++ b/Roo/form/ComboNested.js
@@ -338,28 +338,58 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         });
         var _this = this;
         var record  = false;
-        if(store.getCount() > 0){
-           store.each(function(r){
-                if(r.data[prop] == value){
-                    record = r;
+        if(store.getCount() < 1){
+            return false;
+        }
+        store.each(function(r){
+             if(r.data[prop] == value){
+                 record = r;
+                 return false;
+             }
+             if (r.data.cn && r.data.cn.length) {
+                cstore.loadDataFromChildren( r);
+                var cret = _this.findRecordInStore(cstore, prop, value);
+                if (cret !== false) {
+                    record = cret;
                     return false;
                 }
-                if (r.data.cn && r.data.cn.length) {
-                    cstore.loadDataFromChildren( r);
-                    var cret = _this.findRecordInStore(cstore, prop, value);
-                    if (cret !== false) {
-                        record = cret;
-                        return false;
-                    }
-                }
-                
-                return true;
-            });
-        }
+             }
+             
+             return true;
+        });
+        
         return record;
     },
     
-    function selectActive()
+    
+    
+    selectActive : function (lvl)
+    {
+        // just need to determine which of the current level is selected if any..
+        var value = this.getValue();
+        var prop = this.hiddenName;
+        var store = this.stores[lvl];
+        if(store.getCount() < 1){
+            return;
+        }
+        store.each(function(r){
+            if(r.data[prop] == value){
+                 record = r;
+                 return false;
+            }
+             if (r.data.cn && r.data.cn.length) {
+                 cstore.loadDataFromChildren( r);
+                 var cret = _this.findRecordInStore(cstore, prop, value);
+                 if (cret !== false) {
+                     record = cret;
+                     return false;
+                 }
+             }
+             
+             return true;
+        });
+        
+    }
     
     
     
-- 
2.39.2