You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by nj...@apache.org on 2016/04/18 08:34:57 UTC
[15/50] kylin git commit: minor,
UI support close-on-select feature on ui-select
minor, UI support close-on-select feature on ui-select
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/43041af1
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/43041af1
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/43041af1
Branch: refs/heads/1.4-rc
Commit: 43041af1a68d3307d540540161779799c4faa221
Parents: 4656bd5
Author: janzhongi <ji...@ebay.com>
Authored: Fri Feb 19 18:50:13 2016 +0800
Committer: janzhongi <ji...@ebay.com>
Committed: Fri Feb 19 18:50:13 2016 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/cubeAdvanceSetting.js | 121 ++++++++++---------
.../cubeDesigner/advanced_settings.html | 1 +
.../modelDesigner/model_dimensions.html | 1 +
.../partials/modelDesigner/model_measures.html | 1 +
4 files changed, 65 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/43041af1/webapp/app/js/controllers/cubeAdvanceSetting.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeAdvanceSetting.js b/webapp/app/js/controllers/cubeAdvanceSetting.js
index 89712c9..bd4e783 100644
--- a/webapp/app/js/controllers/cubeAdvanceSetting.js
+++ b/webapp/app/js/controllers/cubeAdvanceSetting.js
@@ -14,86 +14,86 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
-*/
+ */
'use strict';
-KylinApp.controller('CubeAdvanceSettingCtrl', function ($scope, $modal,cubeConfig,MetaModel,cubesManager) {
- $scope.cubesManager = cubesManager;
-
- //convert some undefined or null value
- angular.forEach($scope.cubeMetaFrame.rowkey.rowkey_columns,function(rowkey){
- if(!rowkey.dictionary){
- rowkey.dictionary = "false";
- }
- }
- );
- //edit model
- if($scope.state.mode==="edit") {
- $scope.metaModel = MetaModel;
- if(!$scope.cubeMetaFrame.auto_merge_time_ranges){
- $scope.cubeMetaFrame.auto_merge_time_ranges = [];
+KylinApp.controller('CubeAdvanceSettingCtrl', function ($scope, $modal, cubeConfig, MetaModel, cubesManager) {
+ $scope.cubesManager = cubesManager;
+
+ //convert some undefined or null value
+ angular.forEach($scope.cubeMetaFrame.rowkey.rowkey_columns, function (rowkey) {
+ if (!rowkey.dictionary) {
+ rowkey.dictionary = "false";
}
- $scope._auto_merge_time_ranges = [];
- angular.forEach($scope.cubeMetaFrame.auto_merge_time_ranges,function(item){
- var _day = Math.floor(item/86400000);
- var _hour = (item%86400000)/3600000;
-
- var rangeObj = {
- type:'days',
- range:0,
- mills:0
- }
- if(_day==0){
- rangeObj.type = 'hours';
- rangeObj.range = _hour;
- rangeObj.mills = rangeObj.range*3600000;
- }else{
- rangeObj.type = 'days';
- rangeObj.range = _day;
- rangeObj.mills = rangeObj.range*86400000;
- }
- $scope._auto_merge_time_ranges.push(rangeObj);
- })
}
+ );
+ //edit model
+ if ($scope.state.mode === "edit") {
+ $scope.metaModel = MetaModel;
+ if (!$scope.cubeMetaFrame.auto_merge_time_ranges) {
+ $scope.cubeMetaFrame.auto_merge_time_ranges = [];
+ }
+ $scope._auto_merge_time_ranges = [];
+ angular.forEach($scope.cubeMetaFrame.auto_merge_time_ranges, function (item) {
+ var _day = Math.floor(item / 86400000);
+ var _hour = (item % 86400000) / 3600000;
+
+ var rangeObj = {
+ type: 'days',
+ range: 0,
+ mills: 0
+ }
+ if (_day == 0) {
+ rangeObj.type = 'hours';
+ rangeObj.range = _hour;
+ rangeObj.mills = rangeObj.range * 3600000;
+ } else {
+ rangeObj.type = 'days';
+ rangeObj.range = _day;
+ rangeObj.mills = rangeObj.range * 86400000;
+ }
+ $scope._auto_merge_time_ranges.push(rangeObj);
+ })
+ }
- $scope.dictionaryUpdated = function(rowkey_column){
- if(rowkey_column.dictionary==="true"){
- rowkey_column.length=0;
- }
-
+ $scope.dictionaryUpdated = function (rowkey_column) {
+ if (rowkey_column.dictionary === "true") {
+ rowkey_column.length = 0;
}
- $scope.addNewMergeTimeRange = function(){
+ }
+
+ $scope.addNewMergeTimeRange = function () {
$scope._auto_merge_time_ranges.push({
- type:'days',
- range:0,
- mills:0
+ type: 'days',
+ range: 0,
+ mills: 0
})
$scope.updateAutoMergeRange();
}
- $scope.removeTimeRange = function(arr,index,item){
+ $scope.removeTimeRange = function (arr, index, item) {
if (index > -1) {
arr.splice(index, 1);
}
- $scope.cubeMetaFrame.auto_merge_time_ranges.splice(index,1);
+ $scope.cubeMetaFrame.auto_merge_time_ranges.splice(index, 1);
}
- $scope.refreshAutoMergeTimeRanges = function(list,index,item){
- if(item.type=='hours'){
- item.mills = item.range*3600000;
- }else{
- item.mills = item.range*86400000;
+ $scope.refreshAutoMergeTimeRanges = function (list, index, item) {
+ if (item.type == 'hours') {
+ item.mills = item.range * 3600000;
+ } else {
+ item.mills = item.range * 86400000;
}
$scope.cubeMetaFrame.auto_merge_time_ranges[index] = item.mills;
}
- $scope.updateAutoMergeRange = function(){
+ $scope.updateAutoMergeRange = function () {
$scope.cubeMetaFrame.auto_merge_time_ranges = [];
- angular.forEach($scope._auto_merge_time_ranges,function(item){
+ angular.forEach($scope._auto_merge_time_ranges, function (item) {
$scope.cubeMetaFrame.auto_merge_time_ranges.push(item.mills);
})
}
@@ -112,11 +112,14 @@ KylinApp.controller('CubeAdvanceSettingCtrl', function ($scope, $modal,cubeConfi
$scope.cubeMetaFrame.rowkey.aggregation_groups.push([]);
};
- $scope.refreshAggregationGroup = function (list, index, aggregation_groups) {
- if (aggregation_groups) {
- list[index] = aggregation_groups;
+ $scope.refreshAggregationGroup = function (list, index, aggregation_group) {
+ if (aggregation_group) {
+ list[index].length = aggregation_group.length;
+ for (var i = 0; i < aggregation_group.length; i++) {
+ list[index][i] = aggregation_group[i];
+ }
}
- };
+ }
$scope.removeElement = function (arr, element) {
var index = arr.indexOf(element);
http://git-wip-us.apache.org/repos/asf/kylin/blob/43041af1/webapp/app/partials/cubeDesigner/advanced_settings.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/advanced_settings.html b/webapp/app/partials/cubeDesigner/advanced_settings.html
index 50b40ca..bb162e8 100755
--- a/webapp/app/partials/cubeDesigner/advanced_settings.html
+++ b/webapp/app/partials/cubeDesigner/advanced_settings.html
@@ -40,6 +40,7 @@
<ui-select
autofocus="true"
+ close-on-select="false"
on-select="refreshAggregationGroup(cubeMetaFrame.rowkey.aggregation_groups, $index, aggregation_groups)"
on-remove="refreshAggregationGroup(cubeMetaFrame.rowkey.aggregation_groups, $index, aggregation_groups)"
ng-if="state.mode=='edit'" style="width: 100%" multiple ng-model="aggregation_groups">
http://git-wip-us.apache.org/repos/asf/kylin/blob/43041af1/webapp/app/partials/modelDesigner/model_dimensions.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/modelDesigner/model_dimensions.html b/webapp/app/partials/modelDesigner/model_dimensions.html
index 9574d2b..641afb9 100644
--- a/webapp/app/partials/modelDesigner/model_dimensions.html
+++ b/webapp/app/partials/modelDesigner/model_dimensions.html
@@ -72,6 +72,7 @@
<ui-select
ng-if="state.mode=='edit'" style="width: 100%"
autofocus="true"
+ close-on-select="false"
ng-model="modelsManager.selectedModel.dimensions[$index].columns" multiple>
<ui-select-match placeholder="Select Column...">{{$item.name}}</ui-select-match>
<ui-select-choices
http://git-wip-us.apache.org/repos/asf/kylin/blob/43041af1/webapp/app/partials/modelDesigner/model_measures.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/modelDesigner/model_measures.html b/webapp/app/partials/modelDesigner/model_measures.html
index 2952bc7..13e9f21 100644
--- a/webapp/app/partials/modelDesigner/model_measures.html
+++ b/webapp/app/partials/modelDesigner/model_measures.html
@@ -46,6 +46,7 @@
ng-if="state.mode=='edit'"
style="width: 100%"
autofocus="true"
+ close-on-select="false"
ng-model="modelsManager.selectedModel.metrics" multiple>
<ui-select-match placeholder="Select Column...">{{$item.name}}</ui-select-match>
<ui-select-choices