support distinct aggregation in calculate expression

Aavon · May 31, 2017 · c8ffc45 · c8ffc45
1 parent 5e8ef76
commit c8ffc45
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/webapp/org/cboard/service/data/dataService.js b/src/main/webapp/org/cboard/service/data/dataService.js
@@ -738,7 +738,7 @@ cBoard.service('dataService', function ($http, $q, updateService) {
         });
 
         var names = []; // expression text in aggreagtion function, could be a columnName or script
-        _.each(evalExp.match(/(sum|avg|count|max|min)\("?.*?"?\)/g), function (aggUnit) {
+        _.each(evalExp.match(/(sum|avg|count|max|min|distinct)\("?.*?"?\)/g), function (aggUnit) {
             var aggregate = aggUnit.substring(0, aggUnit.indexOf('('));
             var name = aggUnit.substring(aggUnit.indexOf('(') + 1, aggUnit.indexOf(')'));
             if (name.match("_#")) {