From 9dbc8c54a35192c23ece5cba8885b96d00e5cc3d Mon Sep 17 00:00:00 2001 From: NiChunen Date: Mon, 21 Dec 2015 18:29:24 +0800 Subject: [PATCH] In query window,enable fast copy&paste by double clicking tables/columns' names. In query window,enable fast copy&paste by double clicking tables/columns' names. --- webapp/app/js/controllers/projectMeta.js | 23 ++++++++++++++++++----- webapp/app/partials/query/query.html | 3 ++- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/webapp/app/js/controllers/projectMeta.js b/webapp/app/js/controllers/projectMeta.js index 0cc5ac4..ae02116 100644 --- a/webapp/app/js/controllers/projectMeta.js +++ b/webapp/app/js/controllers/projectMeta.js @@ -35,13 +35,26 @@ 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(selectColumn) + $scope.$parent.queryString += (table.table_NAME + '.' + table.column_NAME + ' '); + else + $scope.$parent.queryString += (table.table_NAME + ' '); + } else { + $scope.lastSelected = table; + } } } 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 @@

- 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.
+    Double click tables/columns' names on the left to fast copy&paste.

-- 2.4.9 (Apple Git-60)