Final Custom Item API Changes: array in ICustomDataRow functions

DevExpress · Apr 28, 2017 · 0544102 · 0544102
1 parent 9494d0b
commit 0544102
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/dist/funnel.js b/dist/funnel.js
@@ -143,11 +143,12 @@ var funnelD3Item = (function(_base) {
         this.iterateData(function(dataRow) {
             var values = dataRow.getValue('Values');
             var valueStr = dataRow.getDisplayText('Values');
+            var color = dataRow.getColor('Values');
             if(_this._hasArguments()) {
-                var labelText = dataRow.getDisplayText('Arguments').join(' - ') + ': ' + valueStr, color = dataRow.getColor('Values', 0); //0 - 'layer' index
-                data.push([{ data: dataRow, text: labelText, color: color }].concat(values));
+                var labelText = dataRow.getDisplayText('Arguments').join(' - ') + ': ' + valueStr; 
+                data.push([{ data: dataRow, text: labelText, color: color[0] }].concat(values));//0 - 'layer' index for color value
             } else {
-                data = values.map(function (value, index) { return [{ text: bindingValues[index].displayName() + ': ' + valueStr[index], color: dataRow.getColor('Values', index) }, value]; });
+                data = values.map(function(value, index) { return [{ text: bindingValues[index].displayName() + ': ' + valueStr[index], color: color[index] }, value]; });
             }
         });
         return data.length > 0 ? data : undefined;

diff --git a/dist/funnel.min.js b/dist/funnel.min.js
diff --git a/src/funnel-d3-viewer.js b/src/funnel-d3-viewer.js
@@ -58,11 +58,12 @@ var funnelD3Item = (function(_base) {
         this.iterateData(function(dataRow) {
             var values = dataRow.getValue('Values');
             var valueStr = dataRow.getDisplayText('Values');
+            var color = dataRow.getColor('Values');
             if(_this._hasArguments()) {
-                var labelText = dataRow.getDisplayText('Arguments').join(' - ') + ': ' + valueStr, color = dataRow.getColor('Values', 0); //0 - 'layer' index
-                data.push([{ data: dataRow, text: labelText, color: color }].concat(values));
+                var labelText = dataRow.getDisplayText('Arguments').join(' - ') + ': ' + valueStr; 
+                data.push([{ data: dataRow, text: labelText, color: color[0] }].concat(values));//0 - 'layer' index for color value
             } else {
-                data = values.map(function (value, index) { return [{ text: bindingValues[index].displayName() + ': ' + valueStr[index], color: dataRow.getColor('Values', index) }, value]; });
+                data = values.map(function(value, index) { return [{ text: bindingValues[index].displayName() + ': ' + valueStr[index], color: color[index] }, value]; });
             }
         });
         return data.length > 0 ? data : undefined;