From: Alan Knowles Date: Mon, 10 Feb 2020 07:02:38 +0000 (+0800) Subject: Roo/form/ComboNested.js X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=9affe627d84d24aa70421c353870c36900fc42c1 Roo/form/ComboNested.js --- diff --git a/Roo/form/ComboNested.js b/Roo/form/ComboNested.js index c40b76d506..6549e8ef9d 100644 --- a/Roo/form/ComboNested.js +++ b/Roo/form/ComboNested.js @@ -294,7 +294,10 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { } var rec = view.store.getAt(ix[0]); - this.setFromData(rec.data); + if (!this.isLoading) { + this.setFromData(rec.data); + } + var lw = Math.floor( ((this.listWidth * this.maxColumns || Math.max(this.wrap.getWidth(), this.minListWidth)) - this.list.getFrameWidth('lr')) / this.maxColumns @@ -305,7 +308,13 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { this.views[opts.list+1].getEl().setHeight( this.innerLists[0].getHeight()); 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 + (dl ? 2 : 1))); + this.list.setWidth(lw * (opts.list + (dl ? 2 : 1))); + + if (this.isLoading) { + this.selectActive(opts.list); + } + + }, onDoubleClick : function() { @@ -348,7 +357,9 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { }); } return record; - } + }, + + function selectActive()