diff --git a/dist/lib/datatable/zui.datatable.js b/dist/lib/datatable/zui.datatable.js index 510cc484770f49c7df6c1caf46e1fe8364e033b6..0c4cc076a90f9a13da0607b808486976f7b23706 100644 --- a/dist/lib/datatable/zui.datatable.js +++ b/dist/lib/datatable/zui.datatable.js @@ -945,11 +945,12 @@ var findMaxHeight = function($cells) { - var mx = 0; + var mx = 0, $cell; $cells.css('height', 'auto'); $cells.each(function() { - mx = Math.max(mx, $(this).height()); + $cell = $(this); + if(!$cell.attr('rowspan')) mx = Math.max(mx, $cell.height()); }); return mx; }, diff --git a/dist/lib/datatable/zui.datatable.min.js b/dist/lib/datatable/zui.datatable.min.js index 477598b1925acbc7ee0f332a0c628af454033296..54437216415171073361d08cc4287d93212622b5 100644 --- a/dist/lib/datatable/zui.datatable.min.js +++ b/dist/lib/datatable/zui.datatable.min.js @@ -5,4 +5,4 @@ * Copyright (c) 2014 cnezsoft.com; Licensed MIT */ -!function(a){"use strict";var b="zui.datatable",c=function(c,d){this.name=b,this.$=a(c),this.isTable="TABLE"===this.$[0].tagName,this.firstShow=!0,this.isTable?(this.$table=this.$,this.id="datatable-"+(this.$.attr("id")||a.uuid())):(this.$datatable=this.$.addClass("datatable"),this.$.attr("id")?this.id=this.$.attr("id"):(this.id="datatable-"+a.uuid(),this.$.attr("id",this.id))),this.getOptions(d),this.load(),this.callEvent("ready")};c.DEFAULTS={checkable:!1,checkByClickRow:!0,checkedClass:"active",checkboxName:null,sortable:!1,storage:!0,fixedHeader:!0,fixedHeaderOffset:0,fixedLeftWidth:"30%",fixedRightWidth:"30%",flexHeadDrag:!0,scrollPos:"in",rowHover:!0,colHover:!0,hoverClass:"hover",colHoverClass:"col-hover",mergeRows:!1,minColWidth:20,minFixedLeftWidth:200,minFixedRightWidth:200,minFlexAreaWidth:200},c.prototype.getOptions=function(b){var d=this.$;b=a.extend({},c.DEFAULTS,this.$.data(),b),b.tableClass=b.tableClass||"",b.tableClass=" "+b.tableClass+" table-datatable",a.each(["bordered","condensed","striped","condensed","fixed"],function(a,c){c="table-"+c,d.hasClass(c)&&(b.tableClass+=" "+c)}),(d.hasClass("table-hover")||b.rowHover)&&(b.tableClass+=" table-hover"),this.options=b},c.prototype.load=function(c){var d,e=this.options;if(a.isPlainObject(c))this.data=c;else if("string"==typeof c){var f=a(c);f.length&&(this.$table=f.first(),this.$table.data(b,this),this.isTable=!0),c=null}else c=e.data;if(!c){if(!this.isTable)throw new Error("No data avaliable!");c={cols:[],rows:[]},d=c.cols;var g,h,i,j,k=c.rows,l=this.$table;l.find("thead > tr:first").children("th").each(function(){g=a(this),d.push(a.extend({text:g.html(),flex:!1||g.hasClass("flex-col"),width:"auto",cssClass:g.attr("class"),css:g.attr("style"),type:"string",ignore:g.hasClass("ignore"),sort:!g.hasClass("sort-disabled"),mergeRows:g.attr("merge-rows")},g.data()))}),l.find("tbody > tr").each(function(){h=a(this),j=a.extend({data:[],checked:!1,cssClass:h.attr("class"),css:h.attr("style"),id:h.attr("id")},h.data()),h.children("td").each(function(){i=a(this),j.data.push(a.extend({cssClass:i.attr("class"),css:i.attr("style"),text:i.html()},i.data()))}),k.push(j)});var m=l.find("tfoot");m.length&&(c.footer=a('
').append(m))}c.flexStart=-1,c.flexEnd=-1,d=c.cols,c.colsLength=d.length;for(var n=0;n=0,c.fixedRight=c.flexEnd>=0&&c.flexEnd0,c.flexStart<0&&c.flexEnd<0&&(c.fixedLeft=!0,c.flexStart=c.colsLength,c.flexEnd=c.colsLength),this.data=c,this.callEvent("afterLoad",{data:c}),this.render()},c.prototype.render=function(){var c,d,e,f,g=this,h=g.$datatable||(g.isTable?a('
'):g.$datatable),i=g.options,j=g.data,k=g.data.cols,l=g.data.rows,m=i.checkable,n='
',o='
';h.children(".datatable-head, .datatable-rows, .scroll-wrapper").remove(),h.toggleClass("sortable",i.sortable);var p,q,r,s=a('
');for(c=a(""),e=a(""),f=a(""),d=0;d=j.flexStart&&d<=j.flexEnd?f:e,0===d&&m&&p.append(''),r.ignore||(q=a(""),q.toggleClass("sort-down","down"===r.sort).toggleClass("sort-up","up"===r.sort).toggleClass("sort-disabled",r.sort===!1),q.addClass(r.cssClass).addClass(r.colClass).html(r.text).attr({"data-index":d,"data-type":r.type,style:r.css}),p.append(q));var t;j.fixedLeft&&(t=a(o),t.addClass("fixed-left").find("table").addClass(i.tableClass).find("thead").append(c),s.append(t)),j.flexArea&&(t=a(o),t.addClass("flexarea").find(".datatable-wrapper").append('
').find("table").addClass(i.tableClass).find("thead").append(f),s.append(t)),j.fixedRight&&(t=a(o),t.addClass("fixed-right").find("table").addClass(i.tableClass).find("thead").append(e),s.append(t)),h.append(s);var u,v,w,x,y,z,A,B,C=a('
'),D=l.length;c=a(""),e=a(""),f=a("");for(var E=0;D>E;++E){for(z=l[E],"undefined"==typeof z.id&&(z.id=E),z.index=E,u=a(""),u.addClass(z.cssClass).toggleClass(i.checkedClass,z.checked).attr({"data-index":E,"data-id":z.id}),v=u.clone(),w=u.clone(),B=z.data.length,d=0;B>d;++d)A=z.data[d],p=d=j.flexStart&&d<=j.flexEnd?v:w,0===d&&m&&(y=a(''),i.checkboxName&&y.append(''),p.append(y)),k[d].ignore||(a.isPlainObject(A)||(A={text:A,row:E,index:d},z.data[d]=A),x=a(""),x.html(A.text).addClass(A.cssClass).addClass(k[d].colClass).attr({"data-row":E,"data-index":d,"data-flex":!1,"data-type":k[d].type,style:A.css}),p.append(x));c.append(u),f.append(v),e.append(w)}var F;j.fixedLeft&&(F=a(n),F.addClass("fixed-left").find("table").addClass(i.tableClass).append(c),C.append(F)),j.flexArea&&(F=a(n),F.addClass("flexarea").find(".datatable-wrapper").append('
').find("table").addClass(i.tableClass).append(f),C.append(F)),j.fixedRight&&(F=a(n),F.addClass("fixed-right").find("table").addClass(i.tableClass).append(e),C.append(F)),h.append(C),j.flexArea&&h.append('
');var G=h.children(".datatable-footer").detach();j.footer?(h.append(a('