* Try to fix bug 36782.

This commit is contained in:
songchenxuan
2023-07-24 15:09:31 +08:00
parent 33c28ac6a8
commit b087e806a9
3 changed files with 10 additions and 5 deletions
+4 -2
View File
@@ -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;}
+5 -3
View File
@@ -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');
+1
View File
@@ -49,6 +49,7 @@
<div class='queryBtn query-outside'><?php echo html::submitButton($lang->pivot->query, "", 'btn btn-primary btn-query');?></div>
<?php endif;?>
</div>
<div id="filterMargin" class='hidden'></div>
<div id='datagirdInfo' class='datagrid datagrid-padding'>
<?php $sql = $this->loadModel('chart')->parseSqlVars($pivot->sql, $pivot->filters);?>
<?php $this->pivot->buildPivotTable($data, $configs, json_decode(json_encode($pivot->fieldSettings), true), $sql);?>