From 117139a1d2d49ad3f3d3e986d1baad6746f8e68a Mon Sep 17 00:00:00 2001 From: zx chen <346839943@qq.com> Date: Thu, 1 Sep 2016 15:16:30 +0800 Subject: [PATCH] KYLIN-1767-WEB-UI-FOR-TOPN --- webapp/app/js/controllers/cubeEdit.js | 25 +++++ webapp/app/js/controllers/cubeMeasures.js | 130 ++++++++++++++++++++++++- webapp/app/js/directives/directives.js | 29 +++++- webapp/app/js/model/cubeDescModel.js | 6 +- webapp/app/partials/cubeDesigner/measures.html | 77 +++++++++++++-- 5 files changed, 250 insertions(+), 17 deletions(-) diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js index b620d7f..e2d0ab5 100755 --- a/webapp/app/js/controllers/cubeEdit.js +++ b/webapp/app/js/controllers/cubeEdit.js @@ -98,6 +98,31 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio return me_columns; }; + $scope.getGroupBYColumns = function () { + //metric from model + var me_columns = []; + var table_columns=[]; + var groupby_columns=[]; + var tableColumns = $scope.getColumnsByTable($scope.metaModel.model.fact_table); + if($scope.metaModel.model.metrics){ + angular.forEach($scope.metaModel.model.metrics,function(metric,index){ + me_columns.push(metric); + }); + } + angular.forEach($scope.cubeMetaFrame.dimensions,function(dimension){ + if(dimension.table==$scope.metaModel.model.fact_table) { + table_columns.push(dimension.column); + } + }); + angular.forEach(me_columns,function(column){ + if(table_columns.indexOf(column)==-1) { + groupby_columns.push(column); + } + }); + + return groupby_columns; + }; + $scope.getExtendedHostColumn = function(){ var me_columns = []; //add cube dimension column for specific measure diff --git a/webapp/app/js/controllers/cubeMeasures.js b/webapp/app/js/controllers/cubeMeasures.js index 8db1356..a5c5829 100644 --- a/webapp/app/js/controllers/cubeMeasures.js +++ b/webapp/app/js/controllers/cubeMeasures.js @@ -19,7 +19,9 @@ 'use strict'; KylinApp.controller('CubeMeasuresCtrl', function ($scope, $modal,MetaModel,cubesManager,CubeDescModel,SweetAlert) { - + $scope.num=0; + $scope.convertedColumns=[]; + $scope.groupby=[]; $scope.initUpdateMeasureStatus = function(){ $scope.updateMeasureStatus = { isEdit:false, @@ -38,6 +40,31 @@ KylinApp.controller('CubeMeasuresCtrl', function ($scope, $modal,MetaModel,cubes if(!!measure && measure.function.parameter.next_parameter){ $scope.nextPara.value = measure.function.parameter.next_parameter.value; } + if($scope.newMeasure.function.expression=="TOP_N"){ + $scope.convertedColumns=[]; + for(var configuration in $scope.newMeasure.function.configuration) { + var _name=configuration.slice(14); + var item=$scope.newMeasure.function.configuration[configuration]; + var _isFixedLength = item.substring(0,12) === "fixed_length"?"true":"false";//fixed_length:12 + var _isIntLength = item.substring(0,3) === "int"?"true":"false";//fixed_length:12 + var _encoding = item; + var _valueLength = 0 ; + if(_isFixedLength !=="false"){ + _valueLength = item.substring(13,item.length); + _encoding = "fixed_length"; + } + if(_isIntLength!="false"){ + _valueLength = item.substring(4,item.length); + _encoding = "int"; + } + $scope.GroupBy = { + name:_name, + encoding:_encoding, + valueLength:_valueLength, + } + $scope.convertedColumns.push($scope.GroupBy); + }; + } }; @@ -103,9 +130,52 @@ KylinApp.controller('CubeMeasuresCtrl', function ($scope, $modal,MetaModel,cubes $scope.saveNewMeasure = function () { - if ($scope.newMeasure.function.expression === 'TOP_N' && $scope.nextPara.value == "") { - SweetAlert.swal('', '[TOP_N] Group by Column is required', 'warning'); - return false; + if ($scope.newMeasure.function.expression === 'TOP_N' ) { + if($scope.newMeasure.function.parameter.value == ""){ + SweetAlert.swal('', '[TOP_N] ORDER|SUM by Column is required', 'warning'); + return false; + } + if($scope.convertedColumns.length<1){ + SweetAlert.swal('', '[TOP_N] Group by Column is required', 'warning'); + return false; + } + + var hasExisted = []; + + for (var column in $scope.convertedColumns){ + if(hasExisted.indexOf($scope.convertedColumns[column].name)==-1){ + hasExisted.push($scope.convertedColumns[column].name); + } + else{ + SweetAlert.swal('', 'The column named ['+$scope.convertedColumns[column].name+'] already exits.', 'warning'); + return false; + } + if ($scope.convertedColumns[column].encoding == 'int' && ($scope.convertedColumns[column].valueLength < 1 || $scope.convertedColumns[column].valueLength > 8)) { + SweetAlert.swal('', 'int encoding column length should between 1 and 8.', 'warning'); + return false; + } + } + $scope.nextPara.next_parameter={}; + $scope.newMeasure.function.configuration={}; + $scope.groupby($scope.nextPara); + angular.forEach($scope.convertedColumns,function(item){ + var a='topn.encoding.'+item.name; + var encoding=""; + if(item.encoding!=="dict" && item.encoding!=="date"&& item.encoding!=="time"){ + if(item.encoding=="fixed_length" && item.valueLength){ + encoding = "fixed_length:"+item.valueLength; + } + else if(item.encoding=="int" && item.valueLength){ + encoding = "int:"+item.valueLength; + }else{ + encoding = item.encoding; + } + }else{ + encoding = item.encoding; + item.valueLength=0; + } + $scope.newMeasure.function.configuration[a]=encoding; + }); } if($scope.nextPara.value!=="" && ($scope.newMeasure.function.expression == 'EXTENDED_COLUMN' || $scope.newMeasure.function.expression == 'TOP_N')){ $scope.newMeasure.function.parameter.next_parameter = jQuery.extend(true,{},$scope.nextPara); @@ -127,17 +197,67 @@ KylinApp.controller('CubeMeasuresCtrl', function ($scope, $modal,MetaModel,cubes $scope.nextPara = { "type":"column", "value":"", - "next_parameter":null + "next_parameter":{} } if($scope.newMeasure){ $scope.newMeasure.function.parameter.next_parameter = null; } } + $scope.addNewGroupByColumn = function () { + $scope.nextGroupBy = { + name:null, + encoding:"dict", + valueLength:0, + } + $scope.convertedColumns.push($scope.nextGroupBy); + + }; + + $scope.removeColumn = function(arr,index){ + if (index > -1) { + arr.splice(index, 1); + } + }; + $scope.refreshGroupBy=function (list,index,item) { + var encoding; + var name = item.name; + if(item.encoding=="dict" || item.encoding=="date"|| item.encoding=="time"){ + item.valueLength=0; + } + }; + + $scope.groupby= function (next_parameter){ + if($scope.num<$scope.convertedColumns.length-1){ + next_parameter.value=$scope.convertedColumns[$scope.num].name; + next_parameter.type="column"; + next_parameter.next_parameter={}; + $scope.num++; + $scope.groupby(next_parameter.next_parameter); + } + else{ + next_parameter.value=$scope.convertedColumns[$scope.num].name; + next_parameter.type="column"; + next_parameter.next_parameter=null; + $scope.num=0; + return false; + } + } + $scope.converted = function (next_parameter) { + if (next_parameter != null) { + $scope.groupby.push(next_parameter.value); + converted(next_parameter.next_parameter) + } + else { + $scope.groupby.push(next_parameter.value); + return false; + } + } //map right return type for param $scope.measureReturnTypeUpdate = function(){ if($scope.newMeasure.function.expression == 'TOP_N'){ + $scope.convertedColumns=[]; $scope.newMeasure.function.parameter.type= 'column'; $scope.newMeasure.function.returntype = "topn(100)"; return; diff --git a/webapp/app/js/directives/directives.js b/webapp/app/js/directives/directives.js index 4b83865..f5051e8 100644 --- a/webapp/app/js/directives/directives.js +++ b/webapp/app/js/directives/directives.js @@ -295,7 +295,30 @@ KylinApp.directive('kylinPagination', function ($parse, $q) { }, template: '
  • Value:{{nextpara.value}}, Type:{{ nextpara.type }}
    • ' + - '', + '', + compile: function(tElement, tAttr, transclude) { + var contents = tElement.contents().remove(); + var compiledContents; + return function(scope, iElement, iAttr) { + if(!compiledContents) { + compiledContents = $compile(contents, transclude); + } + compiledContents(scope, function(clone, scope) { + iElement.append(clone); + }); + }; + } + }; + }).directive("groupbytree", function($compile) { + return { + restrict: "E", + transclude: true, + scope: { + nextpara: '=', + }, + template: + '{{nextpara.value}},'+ + '', compile: function(tElement, tAttr, transclude) { var contents = tElement.contents().remove(); var compiledContents; @@ -318,7 +341,9 @@ KylinApp.directive('kylinPagination', function ($parse, $q) { }, template: '
  • SUM|ORDER BY:{{nextpara.value}}
    • ' + - '
  • GROUP BY:{{nextpara.next_parameter.value}}
    • ', + '
  • Group By:'+ + ''+ + '
    • ', compile: function(tElement, tAttr, transclude) { var contents = tElement.contents().remove(); var compiledContents; diff --git a/webapp/app/js/model/cubeDescModel.js b/webapp/app/js/model/cubeDescModel.js index 57d7e6e..c981249 100644 --- a/webapp/app/js/model/cubeDescModel.js +++ b/webapp/app/js/model/cubeDescModel.js @@ -37,7 +37,8 @@ KylinApp.service('CubeDescModel', function () { "type": "constant", "value": "1", "next_parameter":null - } + }, + "configuration":{} } } ], @@ -74,7 +75,8 @@ KylinApp.service('CubeDescModel', function () { "type": "", "value": "", "next_parameter":null - } + }, + "configuration":null } }; diff --git a/webapp/app/partials/cubeDesigner/measures.html b/webapp/app/partials/cubeDesigner/measures.html index 53806b4..065b735 100755 --- a/webapp/app/partials/cubeDesigner/measures.html +++ b/webapp/app/partials/cubeDesigner/measures.html @@ -218,19 +218,80 @@ - -
    + +
    -
    - +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    IDColumnEncodingLength
    + + {{($index + 1)}} + + + + + {{groupby_column.encoding}} + + + + + + int encoding column length should between 1 and 8 + {{groupby_column.valueLength}} + + +
    +
    +
    +
    -- 2.7.2.windows.1