diff --git a/module/pivot/css/preview.css b/module/pivot/css/preview.css index 4f6589e19d..28cbd03b20 100644 --- a/module/pivot/css/preview.css +++ b/module/pivot/css/preview.css @@ -18,9 +18,11 @@ #filterItems .picker-selections {overflow: hidden; text-overflow: clip; white-space: nowrap;} #filterItems .picker .picker-selections {width: auto !important;} -.content-border {padding-top: 16px; padding-bottom: 16px; border-bottom: 1px solid #E4E6E8; border-top: 1px solid #E4E6E8;} +.content-border {padding-top: 16px; padding-bottom: 16px; border-bottom: 1px solid #F1F5F9;} .flex-between {display:flex; justify-content: space-between;} .query-after {position: relative; padding-right: 10px;} -.query-after::after {content: ""; position: absolute; top: 0; right: 0; bottom: 0; width: 1px; background-color: #E4E6E8;} +.query-after::after {content: ""; position: absolute; top: 0; right: 0; bottom: 0; width: 1px; background-color: #F1F5F9;} .query-color {color: #3785ff;} + +#filterMargin {padding-top: 8px; padding-bottom: 5px;} diff --git a/module/pivot/js/preview.js b/module/pivot/js/preview.js index 9807f4d701..ac74bd3af1 100644 --- a/module/pivot/js/preview.js +++ b/module/pivot/js/preview.js @@ -82,7 +82,7 @@ function initQueryBtn() $('.btn-query').click(function() { var pivotInfo = getQueryInfo(); - refreshReport(pivotInfo); + refreshPivot(pivotInfo); }); } @@ -98,11 +98,11 @@ function initOriginQueryBtn() { var pivotInfo = getQueryInfo(); pivotInfo.settings['summary'] = 'notuse'; - refreshReport(pivotInfo, true); + refreshPivot(pivotInfo, true); }); } -function refreshReport(pivotInfo, isOrigin = false) +function refreshPivot(pivotInfo, isOrigin = false) { $.post(createLink('pivot', 'ajaxGetPivot'), pivotInfo,function(resp) { @@ -113,6 +113,7 @@ function refreshReport(pivotInfo, isOrigin = false) if(isOrigin) { $('#filterItems').addClass('hidden'); + $('#filterMargin').removeClass('hidden'); $('#pivot-query').removeClass('hidden'); $('#origin-query').addClass('hidden'); @@ -120,6 +121,7 @@ function refreshReport(pivotInfo, isOrigin = false) else { $('#filterItems').removeClass('hidden'); + $('#filterMargin').addClass('hidden'); $('#pivot-query').addClass('hidden'); $('#origin-query').removeClass('hidden'); diff --git a/module/pivot/view/show.html.php b/module/pivot/view/show.html.php index 0692e3fb6c..391877be36 100644 --- a/module/pivot/view/show.html.php +++ b/module/pivot/view/show.html.php @@ -49,6 +49,7 @@
pivot->query, "", 'btn btn-primary btn-query');?>
+
loadModel('chart')->parseSqlVars($pivot->sql, $pivot->filters);?> pivot->buildPivotTable($data, $configs, json_decode(json_encode($pivot->fieldSettings), true), $sql);?>