Repository: kylin Updated Branches: refs/heads/1.x-staging 7ad2eeb3b -> 3f97e8013
KYLIN-1338, UI multiple select checkbox lose focus issue Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/3f97e801 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/3f97e801 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/3f97e801 Branch: refs/heads/1.x-staging Commit: 3f97e8013620689e36ee1ae7112c25b175f18437 Parents: 7ad2eeb Author: jian <zhongj...@apache.org> Authored: Tue Jan 19 22:13:25 2016 +0800 Committer: jian <zhongj...@apache.org> Committed: Tue Jan 19 22:13:39 2016 +0800 ---------------------------------------------------------------------- webapp/app/index.html | 3 +++ webapp/app/js/app.js | 2 +- .../partials/cubeDesigner/advanced_settings.html | 17 +++++++++++------ webapp/bower.json | 8 +++++--- webapp/grunt.json | 3 +++ 5 files changed, 23 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/3f97e801/webapp/app/index.html ---------------------------------------------------------------------- diff --git a/webapp/app/index.html b/webapp/app/index.html index e44170c..b94e0e6 100644 --- a/webapp/app/index.html +++ b/webapp/app/index.html @@ -43,6 +43,7 @@ <link rel="stylesheet" type="text/css" href="css/AdminLTE.css"> <link rel="stylesheet" type="text/css" href="components/bootstrap-sweetalert/lib/sweet-alert.css"> <link rel="stylesheet" type="text/css" href="components/angular-busy/dist/angular-busy.css"> + <link rel="stylesheet" type="text/css" href="components/angular-ui-select/dist/select.css"> <link rel="stylesheet/less" href="less/build.less"> @@ -101,6 +102,8 @@ <script src="components/jquery-ui/jquery-ui.min.js"></script> <script src="components/angular-ui-sortable/sortable.js"></script> <script src="components/angular-busy/dist/angular-busy.js"></script> +<script src="components/angular-ui-select/dist/select.js"></script> +<script src="components/angular-sanitize/angular-sanitize.js"></script> <script src="js/app.js"></script> <script src="js/config.js"></script> http://git-wip-us.apache.org/repos/asf/kylin/blob/3f97e801/webapp/app/js/app.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/app.js b/webapp/app/js/app.js index ba288cb..8cb925e 100644 --- a/webapp/app/js/app.js +++ b/webapp/app/js/app.js @@ -17,4 +17,4 @@ */ //Kylin Application Module -KylinApp = angular.module('kylin', ['ngRoute', 'ngResource', 'ngGrid', 'ui.bootstrap', 'ui.ace', 'base64', 'angularLocalStorage', 'localytics.directives', 'treeControl', 'nvd3ChartDirectives', 'ngLoadingRequest', 'oitozero.ngSweetAlert', 'ngCookies', 'angular-underscore', 'ngAnimate', 'ui.sortable',,'cgBusy']); +KylinApp = angular.module('kylin', ['ngRoute', 'ngResource', 'ngGrid', 'ui.bootstrap', 'ui.ace', 'base64', 'angularLocalStorage', 'localytics.directives', 'treeControl', 'nvd3ChartDirectives', 'ngLoadingRequest', 'oitozero.ngSweetAlert', 'ngCookies', 'angular-underscore', 'ngAnimate', 'ui.sortable','cgBusy','ngSanitize','ui.select']); http://git-wip-us.apache.org/repos/asf/kylin/blob/3f97e801/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 878e618..91d804c 100755 --- a/webapp/app/partials/cubeDesigner/advanced_settings.html +++ b/webapp/app/partials/cubeDesigner/advanced_settings.html @@ -138,12 +138,17 @@ </td> <td class="col-xs-11"> <!-- Dimensions --> - <select ng-if="state.mode=='edit'" style="width: 100%" - ng-model="aggregation_groups" required chosen multiple - ng-change="refreshAggregationGroup(cubeMetaFrame.rowkey.aggregation_groups, $index, aggregation_groups)" - ng-options="rowkey_column.column as rowkey_column.column for rowkey_column in cubeMetaFrame.rowkey.rowkey_columns"> - <option value=""></option> - </select> + <ui-select + autofocus="true" + 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"> + <ui-select-match placeholder="Select Column...">{{$item.column}}</ui-select-match> + <ui-select-choices + repeat="rowkey_column.column as rowkey_column in cubeMetaFrame.rowkey.rowkey_columns | filter:$select.search"> + {{rowkey_column.column}} + </ui-select-choices> + </ui-select> <p ng-if="state.mode=='view'" style="word-wrap: break-word; word-break: break-all;">{{aggregation_groups}}</p> </td> <td ng-if="state.mode=='edit'" class="col-xs-1"> http://git-wip-us.apache.org/repos/asf/kylin/blob/3f97e801/webapp/bower.json ---------------------------------------------------------------------- diff --git a/webapp/bower.json b/webapp/bower.json index f9d99fb..ff769b5 100755 --- a/webapp/bower.json +++ b/webapp/bower.json @@ -3,7 +3,7 @@ "version": "0.7.1", "dependencies": { "angular-bootstrap": "0.10.0", - "angular": "1.2.15", + "angular": "1.2.29", "angular-resource": "~1.3.12", "angular-route": "1.2.15", "ng-grid": "2.0.11", @@ -28,14 +28,16 @@ "fuelux": "~3.5.1", "angular-animate": "1.2", "angular-cookies": "1.2", - "angular-busy": "~4.0" + "angular-busy": "~4.0", + "angular-ui-select": "0.13.2", + "angular-sanitize": "1.2.18" }, "devDependencies": { "less.js": "~1.4.0", "angular-mocks-unstable": "~1.1.5" }, "resolutions": { - "angular": "1.2.15", + "angular": "1.2.29", "nvd3": "1.1.15-beta", "d3": "3.4.4", "moment": "2.4.0", http://git-wip-us.apache.org/repos/asf/kylin/blob/3f97e801/webapp/grunt.json ---------------------------------------------------------------------- diff --git a/webapp/grunt.json b/webapp/grunt.json index 3605504..b8bf06e 100755 --- a/webapp/grunt.json +++ b/webapp/grunt.json @@ -40,6 +40,8 @@ "app/components/jquery-ui/jquery-ui.min.js", "app/components/angular-ui-sortable/sortable.js", "app/components/angular-busy/dist/angular-busy.js", + "app/components/angular-ui-select/dist/select.js", + "app/components/angular-sanitize/angular-sanitize.js", "tmp/js/scripts.js" ], "dest": "tmp/js/scripts.min.js" @@ -60,6 +62,7 @@ "app/css/AdminLTE.css", "app/components/bootstrap-sweetalert/lib/sweet-alert.css", "app/components/angular-busy/dist/angular-busy.css", + "app/components/angular-ui-select/dist/select.css", "tmp/css/styles.css" ], "dest": "tmp/css/styles.min.css"
