Repository: kylin Updated Branches: refs/heads/2.0-rc d4bdc82eb -> 8936df133
KYLIN-1244 In query window, enable fast copy&paste by double clicking tables/columns' names. Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/8936df13 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/8936df13 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/8936df13 Branch: refs/heads/2.0-rc Commit: 8936df1334e4b7a906e12758ba5ddad3aaacd824 Parents: d4bdc82 Author: jian <[email protected]> Authored: Thu Dec 24 18:08:18 2015 +0800 Committer: jian <[email protected]> Committed: Thu Dec 24 18:09:52 2015 +0800 ---------------------------------------------------------------------- webapp/app/js/controllers/projectMeta.js | 21 ++++++++++++++++ .../js/directives/kylin_abn_tree_directive.js | 26 ++++++++++++++++++-- .../partials/projects/project_table_tree.html | 1 + 3 files changed, 46 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/8936df13/webapp/app/js/controllers/projectMeta.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/projectMeta.js b/webapp/app/js/controllers/projectMeta.js index 174597e..bf7b0bd 100644 --- a/webapp/app/js/controllers/projectMeta.js +++ b/webapp/app/js/controllers/projectMeta.js @@ -32,6 +32,27 @@ KylinApp } } + $scope.doubleClick = function (branch) { + if(!branch.parent_uid){ + return; + } + + var selectTable = false; + if(branch.data&&branch.data.table_TYPE=="TABLE"){ + selectTable = true; + } + + if(angular.isUndefined($scope.$parent.queryString)){ + $scope.$parent.queryString=''; + } + if(selectTable) + $scope.$parent.queryString += (branch.data.table_NAME+' '); + else + $scope.$parent.queryString += (branch.data.table_NAME+'.'+branch.data.column_NAME + ' '); + + + } + $scope.projectMetaLoad = function () { var defer = $q.defer(); $scope.selectedSrcDb = []; http://git-wip-us.apache.org/repos/asf/kylin/blob/8936df13/webapp/app/js/directives/kylin_abn_tree_directive.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/directives/kylin_abn_tree_directive.js b/webapp/app/js/directives/kylin_abn_tree_directive.js index 4ab76ec..b2b2bd0 100644 --- a/webapp/app/js/directives/kylin_abn_tree_directive.js +++ b/webapp/app/js/directives/kylin_abn_tree_directive.js @@ -26,16 +26,17 @@ '$timeout', function($timeout) { return { restrict: 'E', - template: "<ul class=\"nav nav-list nav-pills nav-stacked abn-tree\">\n <li ng-repeat=\"row in tree_rows | filter:{visible:true} track by row.branch.uid\" ng-animate=\"'abn-tree-animate'\" ng-class=\"'level-' + {{ row.level }} + (row.branch.selected ? ' active':'') + ' ' +row.classes.join(' ')\" class=\"abn-tree-row\"><a ng-click=\"user_clicks_branch(row.branch)\"><i ng-class=\"row.tree_icon\" ng-click=\"row.branch.expanded = !row.branch.expanded\" class=\"indented tree-icon\"> </i><span class=\"indented tree-label\">{{ row.label }} </span></a></li>\n</ul>", + template: "<ul class=\"nav nav-list nav-pills nav-stacked abn-tree\">\n <li ng-repeat=\"row in tree_rows | filter:{visible:true} track by row.branch.uid\" ng-animate=\"'abn-tree-animate'\" ng-class=\"'level-' + {{ row.level }} + (row.branch.selected ? ' active':'') + ' ' +row.classes.join(' ')\" class=\"abn-tree-row\"><a ng-click=\"user_clicks_branch(row.branch)\" ng-dblclick=\"user_dbClicks_branch(row.branch)\"><i ng-class=\"row.tree_icon\" ng-click=\"row.branch.expanded = !row.branch.expanded\" class=\"indented tree-icon\"> </i><span class=\"indented tree-label\">{{ row.label }} </span></a></li>\n</ul>", replace: true, scope: { treeData: '=', onSelect: '&', + onDblclick:'&', initialSelection: '@', treeControl: '=' }, link: function(scope, element, attrs) { - var error, expand_all_parents, expand_level, for_all_ancestors, for_each_branch, get_parent, n, on_treeData_change, select_branch, selected_branch, tree; + var error, expand_all_parents, expand_level, for_all_ancestors, for_each_branch, get_parent, n, on_treeData_change, select_branch, selected_branch, tree,dbClick_branch; error = function(s) { console.log('ERROR:' + s); debugger; @@ -125,6 +126,27 @@ return select_branch(branch); } }; + + dbClick_branch = function(branch) { + + + if (branch.onDblclick != null) { + return $timeout(function() { + return branch.onDblclick(branch); + }); + } else { + if (scope.onDblclick != null) { + return $timeout(function() { + return scope.onDblclick({ + branch: branch + }); + }); + } + } + }; + scope.user_dbClicks_branch = function(branch){ + return dbClick_branch(branch); + } get_parent = function(child) { var parent; parent = void 0; http://git-wip-us.apache.org/repos/asf/kylin/blob/8936df13/webapp/app/partials/projects/project_table_tree.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/projects/project_table_tree.html b/webapp/app/partials/projects/project_table_tree.html index b0c1e53..f65fe03 100644 --- a/webapp/app/partials/projects/project_table_tree.html +++ b/webapp/app/partials/projects/project_table_tree.html @@ -30,6 +30,7 @@ icon-leaf = "fa fa-columns" icon-expand = "fa fa-database" icon-collapse = "fa fa-database" + on-dblclick = "doubleClick(branch)" expand-level = "3"> </abn-tree>
