diff --git a/example/index.html b/example/index.html index fc72b4d..802e92e 100644 --- a/example/index.html +++ b/example/index.html @@ -90,7 +90,7 @@ MDX2JSONSource: "http://localhost:57772/SAMPLES", // MDX2JSON server address basicMDX: typeof req === "object" ? req.basicMDX : req } - //, caption: "My table" // if set, table basi caption will be replaced by this text + //, caption: "My table" // if set, table basic caption will be replaced by this text //, DrillDownExpression: "" // @deprecated drillDown expression split by "^" //, showSummary: true // show summary by columns //, formatNumbers: "#,###.##" // @deprecated diff --git a/source/css/LightPivot.css b/source/css/LightPivot.css index aba49c0..66ffaee 100644 --- a/source/css/LightPivot.css +++ b/source/css/LightPivot.css @@ -152,8 +152,6 @@ .lpt > .tableContainer > table { min-width: 100%; - min-height: 100%; - height: 100%; } .lpt > .tableContainer td, .lpt > .tableContainer th { diff --git a/source/js/DataController.js b/source/js/DataController.js index 5767617..ca8ba77 100644 --- a/source/js/DataController.js +++ b/source/js/DataController.js @@ -99,7 +99,8 @@ DataController.prototype.setData = function (data) { */ DataController.prototype.resetRawData = function () { - var data, summary, y, x; + var data, summary, y, x, + _ = this; if (!(data = this._dataStack[this._dataStack.length - 1].data)) { console.error("Unable to create raw data for given data set."); @@ -162,6 +163,49 @@ DataController.prototype.resetRawData = function () { }; + var parseColumnFormatting = function (rawData) { + if (!_.controller.CONFIG["pivotProperties"]) return rawData; + var x, y, i, xEnd = rawData[0].length, + colLevels = _.controller.getPivotProperty(["columnLevels"]), + formatColumn = { + // "": { style: "