Roo/bootstrap/Table.js
authorjohn <john@roojs.com>
Fri, 12 Oct 2018 03:18:48 +0000 (11:18 +0800)
committerjohn <john@roojs.com>
Fri, 12 Oct 2018 03:18:48 +0000 (11:18 +0800)
roojs-bootstrap.js
roojs-bootstrap-debug.js

Roo/bootstrap/Table.js
roojs-bootstrap-debug.js
roojs-bootstrap.js

index ef128cf..bb479c2 100644 (file)
@@ -1193,7 +1193,7 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component,  {
                     "col-"+size_cls[0]+"-"+size_cls[1]
                 );
                 
-                rows[i].classList.replace(
+                h_rows[i].classList.replace(
                     "col-"+size_cls[0]+"-"+this.colModel.config[col_index][size_cls[0]],
                     "col-"+size_cls[0]+"-"+size_cls[1]
                 );
index 405f795..fdfd2aa 100644 (file)
@@ -7112,6 +7112,12 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component,  {
         
         var rows = this.el.dom.getElementsByClassName("x-col-"+col_index);
         
+        var h_rows = this.el.dom.getElementsByClassName("x-hcol-"+col_index);
+        
+        if(rows.length != h_rows.length) {
+            return;
+        }
+        
         for(var i = 0; i < rows.length; i++) {
             
             for(var j = 0; w.length; j++) {
@@ -7131,6 +7137,11 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component,  {
                     "col-"+size_cls[0]+"-"+size_cls[1]
                 );
                 
+                h_rows[i].classList.replace(
+                    "col-"+size_cls[0]+"-"+this.colModel.config[col_index][size_cls[0]],
+                    "col-"+size_cls[0]+"-"+size_cls[1]
+                );
+                
                 this.colModel.config[col_index][size_cls[0]] = size_cls[1]
             }
         }
index bed9b66..ede353e 100644 (file)
@@ -281,8 +281,9 @@ var C=this.getGridEl().select('tbody',true).first();var D=this.getGridEl().selec
 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<D){this.footer.ds.load({params:{start:this.footer.cursor+this.footer.pageSize,limit:this.footer.pageSize}
 ,add:true});}}}},onHeaderChange:function(){var A=this.renderHeader();var B=this.el.select('table',true).first();this.mainHead.remove();this.mainHead=B.createChild(A,this.mainBody,false);},onHiddenChange:function(A,B,C){var D='#'+this.id+' .x-hcol-'+B;var E='#'+this.id+' .x-col-'+B;
 this.CSS.updateRule(D,"display","");this.CSS.updateRule(E,"display","");if(C){this.CSS.updateRule(D,"display","none");this.CSS.updateRule(E,"display","none");}this.onHeaderChange();this.onLoad();},setColumnWidth:function(A,B){if(!this.colModel.config[A]){return;
-}var w=B.split(" ");var C=this.el.dom.getElementsByClassName("x-col-"+A);for(var i=0;i<C.length;i++){for(var j=0;w.length;j++){var D=w[j].split("-");if(!Number.isInteger(D[1]*1)){continue;}if(!this.colModel.config[A][D[0]]){continue;}C[i].classList.replace("col-"+D[0]+"-"+this.colModel.config[A][D[0]],"col-"+D[0]+"-"+D[1]);
-this.colModel.config[A][D[0]]=D[1]}}}});
+}var w=B.split(" ");var C=this.el.dom.getElementsByClassName("x-col-"+A);var D=this.el.dom.getElementsByClassName("x-hcol-"+A);if(C.length!=D.length){return;}for(var i=0;i<C.length;i++){for(var j=0;w.length;j++){var E=w[j].split("-");if(!Number.isInteger(E[1]*1)){continue;
+}if(!this.colModel.config[A][E[0]]){continue;}C[i].classList.replace("col-"+E[0]+"-"+this.colModel.config[A][E[0]],"col-"+E[0]+"-"+E[1]);D[i].classList.replace("col-"+E[0]+"-"+this.colModel.config[A][E[0]],"col-"+E[0]+"-"+E[1]);this.colModel.config[A][E[0]]=E[1]}
+}}});
 // Roo/bootstrap/TableCell.js
 Roo.bootstrap.TableCell=function(A){Roo.bootstrap.TableCell.superclass.constructor.call(this,A);};Roo.extend(Roo.bootstrap.TableCell,Roo.bootstrap.Component,{html:false,cls:false,tag:false,abbr:false,align:false,axis:false,bgcolor:false,charoff:false,colspan:false,headers:false,height:false,nowrap:false,rowspan:false,scope:false,valign:false,width:false,getAutoCreate:function(){var A=Roo.apply({}
 ,Roo.bootstrap.TableCell.superclass.getAutoCreate.call(this));A={tag:'td'};if(this.tag){A.tag=this.tag;}if(this.html){A.html=this.html}if(this.cls){A.cls=this.cls}if(this.abbr){A.abbr=this.abbr}if(this.align){A.align=this.align}if(this.axis){A.axis=this.axis}