From 1100c81caeb6c3b7c6149fb94083c755c3758d60 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 28 Feb 2020 15:56:55 +0800 Subject: [PATCH] roojs-ui.js roojs-ui-debug.js roojs-all.js roojs-debug.js --- roojs-all.js | 4 ++-- roojs-debug.js | 1 + roojs-ui-debug.js | 1 + roojs-ui.js | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/roojs-all.js b/roojs-all.js index 77036007c4..9755d53a84 100644 --- a/roojs-all.js +++ b/roojs-all.js @@ -1774,8 +1774,8 @@ this.list.endUpdate();},onBeforeLoad:function(){if(!this.hasFocus){return;}this. }},onSelectChange:function(A,B,C){var ix=A.getSelectedIndexes();if(C.list>this.maxColumns-2){this.setFromData(ix.length?A.store.getAt(ix[0]).data:{});return;}if(!ix.length){this.setFromData({});var D=this.stores[C.list+1];D.removeAll();return;}var E=A.store.getAt(ix[0]); if(!this.isLoading){this.setFromData(E.data);}var lw=Math.floor(((this.listWidth*this.maxColumns||Math.max(this.wrap.getWidth(),this.minListWidth))-this.list.getFrameWidth('lr'))/this.maxColumns);this.stores[C.list+1].loadDataFromChildren(E);var dl=this.stores[C.list+1].getTotalCount(); this.views[C.list+1].getEl().setHeight(this.innerLists[0].getHeight());this.views[C.list+1].getEl().setStyle({display:dl?'block':'none'});this.innerLists[C.list+1].setHeight(this.innerLists[0].getHeight());this.list.setWidth(lw*(C.list+(dl?2:1)));if(this.isLoading){this.selectActive(C.list); -}},onDoubleClick:function(){this.collapse();},recordToStores:function(A,B,C,D){var E=new Roo.data.SimpleStore({reader:this.store.reader,data:[]});var F=this;var G=false;var H=false;if(A.getCount()<1){return false;}A.each(function(r){if(r.data[B]==C){G=r;return false; -}if(r.data.cn&&r.data.cn.length){E.loadDataFromChildren(r);var I=F.recordToStores(E,B,C,D);if(I!==false){G=I;H=r;return false;}}return true;});if(G==false){return false}D.unshift(H);return G;},selectActive:function(){var A=[];var B=this.findRecordInStore(this.store,this.hiddenName,this.getValue()); +}},onDoubleClick:function(){this.collapse();},recordToStores:function(A,B,C,D){var E=new Roo.data.SimpleStore({reader:this.store.reader,data:[]});var F=this;var G=false;var H=false;if(A.getCount()<1){return false;}A.each(function(r){if(r.data[B]==C){G=r;H=r; +return false;}if(r.data.cn&&r.data.cn.length){E.loadDataFromChildren(r);var I=F.recordToStores(E,B,C,D);if(I!==false){G=I;H=r;return false;}}return true;});if(G==false){return false}D.unshift(H);return G;},selectActive:function(){var A=[];var B=this.findRecordInStore(this.store,this.hiddenName,this.getValue()); }}); // Roo/form/Checkbox.js Roo.form.Checkbox=function(A){Roo.form.Checkbox.superclass.constructor.call(this,A);this.addEvents({check:true});};Roo.extend(Roo.form.Checkbox,Roo.form.Field,{focusClass:undefined,fieldClass:"x-form-field",checked:false,defaultAutoCreate:{tag:"input",type:'hidden',autocomplete:"off"} diff --git a/roojs-debug.js b/roojs-debug.js index d27ac0d799..5b95db81dc 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -43044,6 +43044,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { store.each(function(r){ if(r.data[prop] == value){ record = r; + srec = r; return false; } if (r.data.cn && r.data.cn.length) { diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index 78995ad0da..f670a5dd62 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -20560,6 +20560,7 @@ Roo.extend(Roo.form.ComboNested, Roo.form.ComboBox, { store.each(function(r){ if(r.data[prop] == value){ record = r; + srec = r; return false; } if (r.data.cn && r.data.cn.length) { diff --git a/roojs-ui.js b/roojs-ui.js index b10b70a591..f156390a49 100644 --- a/roojs-ui.js +++ b/roojs-ui.js @@ -904,8 +904,8 @@ this.list.endUpdate();},onBeforeLoad:function(){if(!this.hasFocus){return;}this. }},onSelectChange:function(A,B,C){var ix=A.getSelectedIndexes();if(C.list>this.maxColumns-2){this.setFromData(ix.length?A.store.getAt(ix[0]).data:{});return;}if(!ix.length){this.setFromData({});var D=this.stores[C.list+1];D.removeAll();return;}var E=A.store.getAt(ix[0]); if(!this.isLoading){this.setFromData(E.data);}var lw=Math.floor(((this.listWidth*this.maxColumns||Math.max(this.wrap.getWidth(),this.minListWidth))-this.list.getFrameWidth('lr'))/this.maxColumns);this.stores[C.list+1].loadDataFromChildren(E);var dl=this.stores[C.list+1].getTotalCount(); this.views[C.list+1].getEl().setHeight(this.innerLists[0].getHeight());this.views[C.list+1].getEl().setStyle({display:dl?'block':'none'});this.innerLists[C.list+1].setHeight(this.innerLists[0].getHeight());this.list.setWidth(lw*(C.list+(dl?2:1)));if(this.isLoading){this.selectActive(C.list); -}},onDoubleClick:function(){this.collapse();},recordToStores:function(A,B,C,D){var E=new Roo.data.SimpleStore({reader:this.store.reader,data:[]});var F=this;var G=false;var H=false;if(A.getCount()<1){return false;}A.each(function(r){if(r.data[B]==C){G=r;return false; -}if(r.data.cn&&r.data.cn.length){E.loadDataFromChildren(r);var I=F.recordToStores(E,B,C,D);if(I!==false){G=I;H=r;return false;}}return true;});if(G==false){return false}D.unshift(H);return G;},selectActive:function(){var A=[];var B=this.findRecordInStore(this.store,this.hiddenName,this.getValue()); +}},onDoubleClick:function(){this.collapse();},recordToStores:function(A,B,C,D){var E=new Roo.data.SimpleStore({reader:this.store.reader,data:[]});var F=this;var G=false;var H=false;if(A.getCount()<1){return false;}A.each(function(r){if(r.data[B]==C){G=r;H=r; +return false;}if(r.data.cn&&r.data.cn.length){E.loadDataFromChildren(r);var I=F.recordToStores(E,B,C,D);if(I!==false){G=I;H=r;return false;}}return true;});if(G==false){return false}D.unshift(H);return G;},selectActive:function(){var A=[];var B=this.findRecordInStore(this.store,this.hiddenName,this.getValue()); }}); // Roo/form/Checkbox.js Roo.form.Checkbox=function(A){Roo.form.Checkbox.superclass.constructor.call(this,A);this.addEvents({check:true});};Roo.extend(Roo.form.Checkbox,Roo.form.Field,{focusClass:undefined,fieldClass:"x-form-field",checked:false,defaultAutoCreate:{tag:"input",type:'hidden',autocomplete:"off"} -- 2.39.2