custom DrillDown on higher levels support

nikitaeverywhere · Dec 3, 2014 · a17c0b5 · a17c0b5
1 parent 874e388
commit a17c0b5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/export/LightPivotTable.xml b/export/LightPivotTable.xml
@@ -11,7 +11,7 @@
 
     <Class name="DeepSee.LightPivotTable">
         <Super>%DeepSee.Component.Portlet.abstractPortlet</Super>
-        <TimeChanged>63524,69651.14693</TimeChanged>
+        <TimeChanged>63524,83748.41729</TimeChanged>
         <TimeCreated>63515,61322.546099</TimeCreated>
 
         <Parameter name="INCLUDEFILES">
@@ -187,8 +187,7 @@
                         //console.log(data);
                         if (data["rowAxisOptions"]) {
                             if (data["rowAxisOptions"]["drilldownSpec"]) {
-                                console.log(data["rowAxisOptions"]["drilldownSpec"]);
-                                setup.DrillDownExpression = data["rowAxisOptions"]["drilldownSpec"];
+                                setup.DrillDownExpression = data["rowAxisOptions"]["drilldownSpec"].split("^");
                             }
                             if (data["rowAxisOptions"]["levelFormat"] || data["columnAxisOptions"] && data["columnAxisOptions"]["levelFormat"]) {
                                 setup["formatNumbers"] = data["columnAxisOptions"]["levelFormat"] || data["rowAxisOptions"]["levelFormat"];

diff --git a/source/js/LightPivotTable.js b/source/js/LightPivotTable.js
@@ -12,6 +12,7 @@ var LightPivotTable = function (configuration) {
 
     this._dataSourcesStack = [];
 
+    this.DRILL_LEVEL = -1;
     this.CONFIG = configuration;
 
     this.mdxParser = new MDXParser();
@@ -84,6 +85,7 @@ LightPivotTable.prototype.pushDataSource = function (config) {
 
     var newDataSource;
 
+    this.DRILL_LEVEL++;
     this._dataSourcesStack.push(newDataSource = new DataSource(config));
     this.dataSource = newDataSource;
 
@@ -95,6 +97,7 @@ LightPivotTable.prototype.popDataSource = function () {
 
     if (this._dataSourcesStack.length < 2) return;
 
+    this.DRILL_LEVEL--;
     this._dataSourcesStack.pop();
     this.dataController.popData();
 
@@ -125,9 +128,13 @@ LightPivotTable.prototype.tryDrillDown = function (filter) {
     // clone dataSource config object
     for (var i in _.CONFIG.dataSource) { ds[i] = _.CONFIG.dataSource[i]; }
 
-    if (this.CONFIG.DrillDownExpression && this._dataSourcesStack.length < 2) {
+    if (this.CONFIG.DrillDownExpression && !(this.CONFIG.DrillDownExpression instanceof Array)) {
+        this.CONFIG.DrillDownExpression = [this.CONFIG.DrillDownExpression];
+    }
+
+    if ((this.CONFIG.DrillDownExpression || [])[this.DRILL_LEVEL]) {
         ds.basicMDX = this.mdxParser.drillDown(
-            this.dataSource.BASIC_MDX, filter, this.CONFIG.DrillDownExpression
+            this.dataSource.BASIC_MDX, filter, this.CONFIG.DrillDownExpression[this.DRILL_LEVEL]
         ) || this.dataSource.BASIC_MDX;
     } else {
         ds.basicMDX = this.mdxParser.drillDown(this.dataSource.BASIC_MDX, filter) || this.dataSource.BASIC_MDX;

diff --git a/source/js/PivotView.js b/source/js/PivotView.js
@@ -501,7 +501,7 @@ PivotView.prototype.renderRawData = function (data) {
                         td.className = "formatLeft";
                 }
                 if (data[y][x].style) {
-                    for (i in data[y][x].style) {
+                    for (var i in data[y][x].style) {
                         td.style[i] = data[y][x].style[i];
                     }
                 }