From 307d2ddfd8789a4a9230659060e5ad76cccee784 Mon Sep 17 00:00:00 2001
From: chenzhx <346839943@qq.com>
Date: Sun, 30 Jul 2017 22:13:15 +0800
Subject: [PATCH] KYLIN-2768-wrong-UI-for-count-distinct-measure

---
 webapp/app/js/controllers/cubeMeasures.js      | 18 +++++++++++-------
 webapp/app/partials/cubeDesigner/measures.html |  6 +++---
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/webapp/app/js/controllers/cubeMeasures.js b/webapp/app/js/controllers/cubeMeasures.js
index 8b0271c1b..347f3b790 100644
--- a/webapp/app/js/controllers/cubeMeasures.js
+++ b/webapp/app/js/controllers/cubeMeasures.js
@@ -218,7 +218,7 @@ KylinApp.controller('CubeMeasuresCtrl', function ($scope, $modal,MetaModel,cubes
           $scope.newMeasure.function.configuration[versionKey]=version;
           });
     }
-    if ($scope.newMeasure.function.expression === 'COUNT_DISTINCT' ) {
+    if ($scope.newMeasure.function.expression === 'COUNT_DISTINCT' && $scope.newMeasure.function.returntype!=='bitmap') {
 
       var hasExisted = [];
 
@@ -344,16 +344,20 @@ KylinApp.controller('CubeMeasuresCtrl', function ($scope, $modal,MetaModel,cubes
   }
 
   //map right return type for param
-  $scope.measureReturnTypeUpdate = function(){
+  $scope.measureReturnTypeUpdate = function() {
 
-    if($scope.newMeasure.function.expression == 'TOP_N'){
-      if($scope.newMeasure.function.parameter.type==""||!$scope.newMeasure.function.parameter.type){
-        $scope.newMeasure.function.parameter.type= 'column';
+    if ($scope.newMeasure.function.expression == 'TOP_N') {
+      if ($scope.newMeasure.function.parameter.type == "" || !$scope.newMeasure.function.parameter.type) {
+        $scope.newMeasure.function.parameter.type = 'column';
       }
-      $scope.convertedColumns=[];
+      $scope.convertedColumns = [];
       $scope.newMeasure.function.returntype = "topn(100)";
       return;
-    }else if($scope.newMeasure.function.expression == 'EXTENDED_COLUMN'){
+    } else if ($scope.newMeasure.function.expression == 'COUNT_DISTINCT') {
+      $scope.newMeasure.function.parameter.type= 'column';
+      $scope.newMeasure.function.returntype = "hllc(10)";
+      $scope.convertedColumns = [];
+    } else if($scope.newMeasure.function.expression == 'EXTENDED_COLUMN'){
       $scope.newMeasure.function.parameter.type= 'column';
       $scope.newMeasure.function.returntype = "extendedcolumn(100)";
       return;
diff --git a/webapp/app/partials/cubeDesigner/measures.html b/webapp/app/partials/cubeDesigner/measures.html
index 89c71425c..aa7a096f7 100755
--- a/webapp/app/partials/cubeDesigner/measures.html
+++ b/webapp/app/partials/cubeDesigner/measures.html
@@ -69,7 +69,6 @@
               </table>
       </div>
   </ng-form>
-
   <!--Add Measures Button-->
   <div class="form-group">
       <button class="btn btn-sm btn-info" ng-click="addNewMeasure()" ng-show="state.mode=='edit' && !newMeasure" ng-disabled="instance.status=='READY'">
@@ -218,10 +217,11 @@
                       </div>
 
                       <!--Group by Column-->
-                      <div class="form-group" ng-if="newMeasure.function.expression === 'TOP_N'||newMeasure.function.expression === 'COUNT_DISTINCT'" >
+                      <div class="form-group" ng-if="newMeasure.function.expression === 'TOP_N'||(newMeasure.function.expression === 'COUNT_DISTINCT' && newMeasure.function.returntype!=='bitmap')" >
                         <div class="row">
                           <label class="col-xs-12 col-sm-3 control-label no-padding-right font-color-default">
-                            <b>Group by Column</b>
+                            <b ng-if="newMeasure.function.expression === 'TOP_N'">Group by Column:</b>
+                            <b ng-if="newMeasure.function.expression === 'COUNT_DISTINCT' && newMeasure.function.returntype!=='bitmap')">Additional distinct column in this measure:</b>
                           </label>
                           <div class="form-group large-popover" >
                               <div class="box-body">
-- 
2.11.0 (Apple Git-81)