From 89f6fbdff9c1104b882c69a9f7ca88632e7caf5d Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 7 Feb 2020 16:32:28 +0800 Subject: [PATCH] roojs-ui.js roojs-ui-debug.js roojs-all.js roojs-debug.js --- roojs-all.js | 2 +- roojs-debug.js | 5 ++++- roojs-ui-debug.js | 5 ++++- roojs-ui.js | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/roojs-all.js b/roojs-all.js index 353c8b9de5..66ad43e260 100644 --- a/roojs-all.js +++ b/roojs-all.js @@ -1765,7 +1765,7 @@ Roo.form.ComboNested=function(A){Roo.form.ComboCheck.superclass.constructor.call }});if(this.allowBlank&&!this.disableClear){this.pageTb.add(new Roo.Toolbar.Fill(),{cls:'x-btn-icon x-btn-clear',text:' ',handler:function(){C.collapse();C.clearValue();C.onSelect(false,-1);}});}if(this.footer){this.assetHeight+=this.footer.getHeight(); }},onRenderList:function(A,i){var lw=Math.floor(((this.listWidth*3||Math.max(this.wrap.getWidth(),this.minListWidth))-this.list.getFrameWidth('lr'))/3);this.list.setWidth(lw);var il=this.innerLists[i]=this.list.createChild({cls:A+'-inner'});il.setWidth(lw); il.setStyle({'overflow-x':'hidden'});if(!this.tpl){this.tpl=new Roo.Template({html:'
{'+this.displayField+'}
',isEmpty:function(D,E){return D&&D.length?'has-children':'no-children'}});}var B=this.store; -if(i>0){B=new Roo.data.SimpleStore({reader:this.store.reader,data:[]});}this.stores[i]=B;var C=this.views[i]=new Roo.View(il,this.tpl,{singleSelect:true,store:B,selectedClass:this.selectedClass});C.getEl().setWidth(lw);C.getEl().setStyle({position:i<1?'relative':'absolute',top:0,left:(i*lw)+'px',display:i>0?'none':'block'} +if(i>0){B=new Roo.data.SimpleStore({fields:this.store.reader.meta.fields,data:[]});}this.stores[i]=B;var C=this.views[i]=new Roo.View(il,this.tpl,{singleSelect:true,store:B,selectedClass:this.selectedClass});C.getEl().setWidth(lw);C.getEl().setStyle({position:i<1?'relative':'absolute',top:0,left:(i*lw)+'px',display:i>0?'none':'block'} );C.on('selectionchange',this.onSelectChange,this,{list:i});C.on('dblclick',this.onDoubleClick,this,{list:i});B.on('beforeload',this.onBeforeLoad,this);B.on('load',this.onStoreLoad,this,{list:i});B.on('loadexception',this.onLoadException,this);},onResize:function(){} ,restrictHeight:function(){var mh=0;Roo.each(this.innerLists,function(il,i){var el=this.views[i].getEl();el.dom.style.height='';var A=el.dom;var h=Math.max(A.clientHeight,A.offsetHeight,A.scrollHeight);if(i<1){el.setHeight(h 0) { store = new Roo.data.SimpleStore({ - reader : this.store.reader, + fields : this.store.reader.meta.fields, data : [ ] }); } @@ -43014,6 +43014,9 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { return record; } + + + });/* * Based on: * Ext JS Library 1.1.1 diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index c7ffcc4f6c..791e2d56da 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -20339,7 +20339,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { var store = this.store; if (i > 0) { store = new Roo.data.SimpleStore({ - reader : this.store.reader, + fields : this.store.reader.meta.fields, data : [ ] }); } @@ -20530,6 +20530,9 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { return record; } + + + });/* * Based on: * Ext JS Library 1.1.1 diff --git a/roojs-ui.js b/roojs-ui.js index aa225130a3..0c079e0b99 100644 --- a/roojs-ui.js +++ b/roojs-ui.js @@ -895,7 +895,7 @@ Roo.form.ComboNested=function(A){Roo.form.ComboCheck.superclass.constructor.call }});if(this.allowBlank&&!this.disableClear){this.pageTb.add(new Roo.Toolbar.Fill(),{cls:'x-btn-icon x-btn-clear',text:' ',handler:function(){C.collapse();C.clearValue();C.onSelect(false,-1);}});}if(this.footer){this.assetHeight+=this.footer.getHeight(); }},onRenderList:function(A,i){var lw=Math.floor(((this.listWidth*3||Math.max(this.wrap.getWidth(),this.minListWidth))-this.list.getFrameWidth('lr'))/3);this.list.setWidth(lw);var il=this.innerLists[i]=this.list.createChild({cls:A+'-inner'});il.setWidth(lw); il.setStyle({'overflow-x':'hidden'});if(!this.tpl){this.tpl=new Roo.Template({html:'
{'+this.displayField+'}
',isEmpty:function(D,E){return D&&D.length?'has-children':'no-children'}});}var B=this.store; -if(i>0){B=new Roo.data.SimpleStore({reader:this.store.reader,data:[]});}this.stores[i]=B;var C=this.views[i]=new Roo.View(il,this.tpl,{singleSelect:true,store:B,selectedClass:this.selectedClass});C.getEl().setWidth(lw);C.getEl().setStyle({position:i<1?'relative':'absolute',top:0,left:(i*lw)+'px',display:i>0?'none':'block'} +if(i>0){B=new Roo.data.SimpleStore({fields:this.store.reader.meta.fields,data:[]});}this.stores[i]=B;var C=this.views[i]=new Roo.View(il,this.tpl,{singleSelect:true,store:B,selectedClass:this.selectedClass});C.getEl().setWidth(lw);C.getEl().setStyle({position:i<1?'relative':'absolute',top:0,left:(i*lw)+'px',display:i>0?'none':'block'} );C.on('selectionchange',this.onSelectChange,this,{list:i});C.on('dblclick',this.onDoubleClick,this,{list:i});B.on('beforeload',this.onBeforeLoad,this);B.on('load',this.onStoreLoad,this,{list:i});B.on('loadexception',this.onLoadException,this);},onResize:function(){} ,restrictHeight:function(){var mh=0;Roo.each(this.innerLists,function(il,i){var el=this.views[i].getEl();el.dom.style.height='';var A=el.dom;var h=Math.max(A.clientHeight,A.offsetHeight,A.scrollHeight);if(i<1){el.setHeight(h