From ed5f5772368004d4548c2e28e97047a3989e8a5b Mon Sep 17 00:00:00 2001 From: john Date: Fri, 12 Oct 2018 11:39:38 +0800 Subject: [PATCH] Roo/bootstrap/Table.js roojs-bootstrap.js roojs-bootstrap-debug.js --- Roo/bootstrap/Table.js | 8 ++------ roojs-bootstrap-debug.js | 9 ++------- roojs-bootstrap.js | 6 +++--- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/Roo/bootstrap/Table.js b/Roo/bootstrap/Table.js index e14e1777af..03d9bc529f 100644 --- a/Roo/bootstrap/Table.js +++ b/Roo/bootstrap/Table.js @@ -1196,12 +1196,6 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component, { "col-"+size_cls[0]+"-"+size_cls[1] ); - } - - this.colModel.config[col_index][size_cls[0]] = size_cls[1]; - - for(var i = 0; i < rows.length; i++) { - for(var j = 0; j < w.length; j++) { var size_cls = w[j].split("-"); @@ -1223,6 +1217,8 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component, { "col-"+size_cls[0]+"-"+size_cls[1] ); } + + this.colModel.config[col_index][size_cls[0]] = size_cls[1]; } } }); diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 3e0ecd15cf..2a76d8566c 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -7140,11 +7140,6 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component, { "col-"+size_cls[0]+"-"+size_cls[1] ); - this.colModel.config[col_index][size_cls[0]] = size_cls[1]; - } - - for(var i = 0; i < rows.length; i++) { - for(var j = 0; j < w.length; j++) { var size_cls = w[j].split("-"); @@ -7157,8 +7152,6 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component, { continue; } - Roo.log('returning..'); - if(!rows[i].classList.contains("col-"+size_cls[0]+"-"+this.colModel.config[col_index][size_cls[0]])) { continue; } @@ -7168,6 +7161,8 @@ Roo.extend(Roo.bootstrap.Table, Roo.bootstrap.Component, { "col-"+size_cls[0]+"-"+size_cls[1] ); } + + this.colModel.config[col_index][size_cls[0]] = size_cls[1]; } } }); diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index b6ce996a24..b4f529c30d 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -282,9 +282,9 @@ var B=Math.ceil(this.mainBody.getScroll().top);var C=this.mainBody.getHeight();i ,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);var D=this.el.dom.getElementsByClassName("x-hcol-"+A);for(var j=0;j