You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by zh...@apache.org on 2015/12/24 09:10:19 UTC
kylin git commit: KYLIN-1244 In query window,
enable fast copy&paste by double clicking tables/columns' names.
Repository: kylin
Updated Branches:
refs/heads/1.x-staging 7a41f44c5 -> 21810238c
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/21810238
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/21810238
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/21810238
Branch: refs/heads/1.x-staging
Commit: 21810238cb543d752759c6aad382a6a8d6d56d4b
Parents: 7a41f44
Author: jian <ji...@apache.org>
Authored: Thu Dec 24 16:09:41 2015 +0800
Committer: jian <ji...@apache.org>
Committed: Thu Dec 24 16:09:41 2015 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/projectMeta.js | 26 +++++++++++++++++++++-----
webapp/app/partials/query/query.html | 3 ++-
2 files changed, 23 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/21810238/webapp/app/js/controllers/projectMeta.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/projectMeta.js b/webapp/app/js/controllers/projectMeta.js
index 0cc5ac4..d34c414 100644
--- a/webapp/app/js/controllers/projectMeta.js
+++ b/webapp/app/js/controllers/projectMeta.js
@@ -35,13 +35,29 @@ KylinApp
labelSelected: "a8"
}
};
+ $scope.lastSelected = null;
$scope.showSelected = function (table) {
- if (table.uuid) {
- $scope.selectedSrcTable = table;
- }
- else {
- $scope.selectedSrcTable.selectedSrcColumn = table;
+ if (!angular.isUndefined(table.table_NAME)){
+ var selectColumn = true;
+ if (angular.isUndefined(table.column_NAME)) {
+ $scope.selectedSrcTable = table;
+ selectColumn = false;
+ } else {
+ $scope.selectedSrcTable.selectedSrcColumn = table;
+ }
+ if($scope.lastSelected == table){
+ $scope.lastSelected = null;
+ if(angular.isUndefined($scope.$parent.queryString)){
+ $scope.$parent.queryString='';
+ }
+ if(selectColumn)
+ $scope.$parent.queryString += (table.table_NAME + '.' + table.column_NAME + ' ');
+ else
+ $scope.$parent.queryString += (table.table_NAME + ' ');
+ } else {
+ $scope.lastSelected = table;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/21810238/webapp/app/partials/query/query.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/query/query.html b/webapp/app/partials/query/query.html
index 25dcf9f..0fe8ea5 100644
--- a/webapp/app/partials/query/query.html
+++ b/webapp/app/partials/query/query.html
@@ -68,7 +68,8 @@
</section>
<p class="blue">
- Tips: Ctrl+Shift+Space or Alt+Space(Windows), Command+Option+Space(Mac) to list tables/columns in query box.
+ Tips: Ctrl+Shift+Space or Alt+Space(Windows), Command+Option+Space(Mac) to list tables/columns in query box.<br>
+    Double click tables/columns' names on the left to fast copy&paste.
</p>
<div class="pull-left">
<h4>