Roo/form/ComboNested.js

[roojs1] / Roo / form / ComboNested.js

diff --git a/Roo/form/ComboNested.js b/Roo/form/ComboNested.js
index e8442ee..42cb6cc 100644 (file)
--- a/Roo/form/ComboNested.js
+++ b/Roo/form/ComboNested.js
@@ -47,6 +47,11 @@ Roo.form.ComboNested = function(config){
 
 Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
    
+    /*
+     * @config {Number} max Number of columns to show
+     */
+    
+    maxColumns : 3,
    
     list : null, // the outermost div..
     innerLists : null, // the
@@ -92,7 +97,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         this.innerLists = [];
         this.views = [];
         this.stores = [];
-        for (var i =0 ; i < 3; i++) {
+        for (var i =0 ; i < this.maxColumns; i++) {
             this.onRenderList( cls, i);
         }
         
@@ -131,7 +136,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
     {
         
         var lw = Math.floor(
-                ((this.listWidth * 3 || Math.max(this.wrap.getWidth(), this.minListWidth)) - this.list.getFrameWidth('lr')) / 3
+                ((this.listWidth * this.maxColumns || Math.max(this.wrap.getWidth(), this.minListWidth)) - this.list.getFrameWidth('lr')) / this.maxColumns
         );
         
         this.list.setWidth(lw); // default to '1'
@@ -146,7 +151,9 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
             this.tpl = new Roo.Template({
                 html :  '<div class="'+cls+'-item '+cls+'-item-{cn:this.isEmpty}">{' + this.displayField + '}</div>',
                 isEmpty: function (value, allValues) {
-                    return value && value.length ? 'has-children' : 'no-children'
+                    //Roo.log(value);
+                    var dl = typeof(value.data) != 'undefined' ? value.data.length : value.length; ///json is a nested response..
+                    return dl ? 'has-children' : 'no-children'
                 }
             });
         }
@@ -154,6 +161,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         var store  = this.store;
         if (i > 0) {
             store  = new Roo.data.SimpleStore({
+                //fields : this.store.reader.meta.fields,
                 reader : this.store.reader,
                 data : [ ]
             });
@@ -183,7 +191,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         //view.on('click', this.onViewClick, this, { list : i });
 
         store.on('beforeload', this.onBeforeLoad, this);
-        store.on('load',  this.onStoreLoad, this, { list  : i});
+        store.on('load',  this.onLoad, this, { list  : i});
         store.on('loadexception', this.onLoadException, this);
 
         // hide the other vies..
@@ -254,10 +262,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
     
         //this.el.focus();
     },
-    onStoreLoad : function ()
-    {
-        Roo.log(arguments);
-    },
+    
     
     // private
     onLoadException : function()
@@ -278,7 +283,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         var ix = view.getSelectedIndexes();
         
         
-        if (opts.list > 1) {
+        if (opts.list > this.maxColumns - 2) {
              
             this.setFromData(ix.length ? view.store.getAt(ix[0]).data : {});
             return;
@@ -286,7 +291,8 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         
         if (!ix.length) {
             this.setFromData({});
-            this.stores[opts.list+1].loadData( [] );
+            var str = this.stores[opts.list+1];
+            str.removeAll();
             return;
         }
         
@@ -294,14 +300,15 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         this.setFromData(rec.data);
         
         var lw = Math.floor(
-                ((this.listWidth * 3 || Math.max(this.wrap.getWidth(), this.minListWidth)) - this.list.getFrameWidth('lr')) / 3
+                ((this.listWidth * this.maxColumns || Math.max(this.wrap.getWidth(), this.minListWidth)) - this.list.getFrameWidth('lr')) / this.maxColumns
         );
         
-        this.stores[opts.list+1].loadData( typeof(rec.data.cn) == 'undefined' ? [] : rec.data.cn);
+        this.stores[opts.list+1].loadDataFromChildren( rec );
+        var dl = this.stores[opts.list+1]. getTotalCount();
         this.views[opts.list+1].getEl().setHeight( this.innerLists[0].getHeight());
-        this.views[opts.list+1].getEl().setStyle({ display : rec.data.cn.length ? 'block' : 'none' });
+        this.views[opts.list+1].getEl().setStyle({ display : dl ? 'block' : 'none' });
         this.innerLists[opts.list+1].setHeight( this.innerLists[0].getHeight());
-        this.list.setWidth(lw * (opts.list + (rec.data.cn.length ? 2 : 1))); 
+        this.list.setWidth(lw * (opts.list + (dl ? 2 : 1))); 
     },
     onDoubleClick : function()
     {
@@ -315,11 +322,12 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         return this.findRecordInStore(this.store, prop,value);
     },
     
-     // private
+    // private
     findRecordInStore : function(store, prop, value)
     {
         var cstore = new Roo.data.SimpleStore({
-            reader : this.store.reader,  // we need array reader.. for 
+            //fields : this.store.reader.meta.fields, // we need array reader.. for
+            reader : this.store.reader,
             data : [ ]
         });
         var _this = this;
@@ -331,7 +339,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
                     return false;
                 }
                 if (r.data.cn && r.data.cn.length) {
-                    cstore.loadData( r.data.cn);
+                    cstore.loadDataFromChildren( r);
                     var cret = _this.findRecordInStore(cstore, prop, value);
                     if (cret !== false) {
                         record = cret;
@@ -345,4 +353,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, {
         return record;
     }
     
+    
+    
+    
 });
\ No newline at end of file