KYLIN-1786 extended column UI update
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/ab45614a Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/ab45614a Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/ab45614a Branch: refs/heads/kylin-1.5.4-HBase1.x-release Commit: ab45614abaa6c8d5bf736112a38d97d21f251c78 Parents: 5bc3830 Author: Jason <jiat...@163.com> Authored: Mon Jul 18 23:19:51 2016 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Wed Sep 14 17:22:07 2016 +0800 ---------------------------------------------------------------------- webapp/app/js/controllers/cubeEdit.js | 22 +++++++-------------- webapp/app/js/controllers/cubeMeasures.js | 11 +++++++++++ webapp/app/partials/cubeDesigner/measures.html | 2 +- 3 files changed, 19 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/ab45614a/webapp/app/js/controllers/cubeEdit.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js index dd18d64..59a7ad5 100755 --- a/webapp/app/js/controllers/cubeEdit.js +++ b/webapp/app/js/controllers/cubeEdit.js @@ -180,31 +180,23 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio me_columns.push(metric); }) } - angular.forEach($scope.metaModel.model.dimensions,function(dimension,index){ - if(dimension.columns){ - me_columns = me_columns.concat(dimension.columns); - } - }) return me_columns; - }; - $scope.getExtendedFactColumns = function (measure) { + $scope.getExtendedHostColumn = function(){ var me_columns = []; - angular.forEach($scope.metaModel.model.dimensions,function(dimension,index){ + //add cube dimension column for specific measure + angular.forEach($scope.cubeMetaFrame.dimensions,function(dimension,index){ if($scope.metaModel.model.fact_table !== dimension.table){ return; } - - if(dimension.columns){ - me_columns = me_columns.concat(dimension.columns); + if(dimension.column && dimension.derived == null){ + me_columns.push(dimension.column); } - }) - + }); return me_columns; - - }; + } $scope.getFactColumns = function () { http://git-wip-us.apache.org/repos/asf/kylin/blob/ab45614a/webapp/app/js/controllers/cubeMeasures.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/cubeMeasures.js b/webapp/app/js/controllers/cubeMeasures.js index e4e749d..4f2627e 100644 --- a/webapp/app/js/controllers/cubeMeasures.js +++ b/webapp/app/js/controllers/cubeMeasures.js @@ -30,6 +30,17 @@ KylinApp.controller('CubeMeasuresCtrl', function ($scope, $modal,MetaModel,cubes }; $scope.initUpdateMeasureStatus(); +<<<<<<< 5bc3830dbf3f6da0daebd05df8a24b735e40dd98 +======= + $scope.initUpdateMeasureStatus = function(){ + $scope.updateMeasureStatus = { + isEdit:false, + editIndex:-1 + } + }; + $scope.initUpdateMeasureStatus(); + +>>>>>>> KYLIN-1786 extended column UI update $scope.addNewMeasure = function (measure, index) { if(measure&&index>=0){ $scope.updateMeasureStatus.isEdit = true; http://git-wip-us.apache.org/repos/asf/kylin/blob/ab45614a/webapp/app/partials/cubeDesigner/measures.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/cubeDesigner/measures.html b/webapp/app/partials/cubeDesigner/measures.html index 7aba393..243ee8f 100755 --- a/webapp/app/partials/cubeDesigner/measures.html +++ b/webapp/app/partials/cubeDesigner/measures.html @@ -166,7 +166,7 @@ ng-if="newMeasure.function.expression == 'EXTENDED_COLUMN'" ng-model="newMeasure.function.parameter.value" ng-change="measureReturnTypeUpdate();" - ng-options="column as column for column in getFactColumns()" > + ng-options="column as column for column in getExtendedHostColumn()" > <option value="">-- Select a Column --</option> </select> </div>
