Repository: kylin Updated Branches: refs/heads/master 006a5aab0 -> d4b63d3de
KYLIN-3026 Can not see full cube names on insight page Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/fa482cc7 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/fa482cc7 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/fa482cc7 Branch: refs/heads/master Commit: fa482cc703484b8dad63c6acb41aff78dcec605a Parents: 006a5aa Author: liapan <lia...@ebay.com> Authored: Fri Dec 8 14:33:27 2017 +0800 Committer: chenzhx <c...@apache.org> Committed: Fri Dec 22 16:33:22 2017 +0800 ---------------------------------------------------------------------- webapp/app/js/filters/filter.js | 12 ++++++++++++ webapp/app/less/app.less | 5 +++++ webapp/app/partials/query/query_detail.html | 6 +++--- 3 files changed, 20 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/fa482cc7/webapp/app/js/filters/filter.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/filters/filter.js b/webapp/app/js/filters/filter.js index 0d7eb5b..72bb502 100755 --- a/webapp/app/js/filters/filter.js +++ b/webapp/app/js/filters/filter.js @@ -251,5 +251,17 @@ KylinApp }) return formatWord.slice(1); }; + }).filter('formatCubeName', function($filter) { + return function(item) { + var cubeArr = item.split(','); + var formatCubeName = ''; + angular.forEach(cubeArr, function(cubeName, ind) { + if (ind != 0) { + formatCubeName += ' '; + } + formatCubeName += cubeName.split('[name=')[1].match(/[^&]*.(?=])/); + }); + return formatCubeName; + } }); http://git-wip-us.apache.org/repos/asf/kylin/blob/fa482cc7/webapp/app/less/app.less ---------------------------------------------------------------------- diff --git a/webapp/app/less/app.less b/webapp/app/less/app.less index 7a23acc..eca76ff 100644 --- a/webapp/app/less/app.less +++ b/webapp/app/less/app.less @@ -924,4 +924,9 @@ pre { } } } +} +/*query page cube popover*/ +div[title="Cube Info Detail"].popover { + max-width: 1024px; + with: min-content; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/fa482cc7/webapp/app/partials/query/query_detail.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/query/query_detail.html b/webapp/app/partials/query/query_detail.html index 0532b19..2c5fe17 100644 --- a/webapp/app/partials/query/query_detail.html +++ b/webapp/app/partials/query/query_detail.html @@ -52,7 +52,7 @@ <div class="form-group"> <ul class="row"> - <li class="col-md-3" style="display: inline"> + <li class="col-md-2" style="display: inline"> <label>Status: </label> <span class="label label-lg label-danger arrowed" ng-if="curQuery.status=='failed'">Failed</span> <span class="label label-lg label-success arrowed" ng-if="curQuery.status=='success'">Success</span> @@ -63,9 +63,9 @@ <label>Project: </label> <span>{{curQuery.project}}</span> </li> - <li class="col-md-4 " style="display: inline"> + <li class="col-md-5 " style="display: inline"> <label>Cubes: </label> - <span>{{curQuery.result.cube}}</span> + <span>{{curQuery.result.cube | limitTo:30}}<span ng-if="curQuery.result.cube.length > 30">... <i class="fa fa-list text-aqua" style="cursor: pointer;" popover-placement="left" popover="{{curQuery.result.cube | formatCubeName}}" popover-title="Cube Info Details"></i></span></span> </li> </ul> </div>
