From: Alan Knowles Date: Mon, 4 Jan 2021 06:42:18 +0000 (+0800) Subject: roojs-bootstrap.js X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=f0dcde697f81dafa7a3ec6d68970ffe3efe05154 roojs-bootstrap.js roojs-bootstrap-debug.js --- diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index c8919dcad7..51d2866982 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -8589,6 +8589,7 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component, { var tfd = this.getGridEl().select('tfoot', true).first(); var cw = ctr.getWidth(); + this.getGridEl().select('tfoot tr, tfoot td',true).setWidth(cw); if (tbd) { @@ -8603,7 +8604,7 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component, { } cw = Math.max(cw, this.totalWidth); this.getGridEl().select('tbody tr',true).setWidth(cw); - this.getGridEl().select('tfoot tr, tfoot td',true).setWidth(cw); + // resize 'expandable coloumn? return; // we doe not have a view in this design.. diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 3a70f00caf..d53f395650 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -352,7 +352,7 @@ for(var i=0,D=cm.getColumnCount();i tr',true).elements,function(el,C){if(el!=A){return; }B=C;});return B;},getGridEl:function(){return this.el;},autoSize:function(){var A=Roo.get(this.el.dom);var B=this.getGridEl().select('thead',true).first();var C=this.getGridEl().select('tbody',true).first();var D=this.getGridEl().select('tfoot',true).first(); -var cw=A.getWidth();if(C){C.setWidth(A.getWidth());var E=(C.dom.offsetWidth-C.dom.clientWidth);cw-=E;}cw=Math.max(cw,this.totalWidth);this.getGridEl().select('tbody tr',true).setWidth(cw);this.getGridEl().select('tfoot tr, tfoot td',true).setWidth(cw);return; +var cw=A.getWidth();this.getGridEl().select('tfoot tr, tfoot td',true).setWidth(cw);if(C){C.setWidth(A.getWidth());var E=(C.dom.offsetWidth-C.dom.clientWidth);cw-=E;}cw=Math.max(cw,this.totalWidth);this.getGridEl().select('tbody tr',true).setWidth(cw);return; },onBodyScroll:function(){if(this.mainHead){this.mainHead.setStyle({'position':'relative','left':(-1*this.mainBody.dom.scrollLeft)+'px'});}if(this.lazyLoad){var A=this.mainBody.dom.scrollHeight;var B=Math.ceil(this.mainBody.getScroll().top);var C=this.mainBody.getHeight(); if(A-C==B){var D=this.ds.getTotalCount();if(this.footer.cursor+this.footer.pageSize