* Finish task #91131.
This commit is contained in:
@@ -5,3 +5,4 @@
|
||||
.header:hover .header-config {display: inline-block;}
|
||||
.label-outline.label-info {border: unset; line-height: 14px;}
|
||||
.border-bottom {border-bottom: 1px solid #f4f5f7;}
|
||||
.visibility-hidden{visibility: hidden;}
|
||||
|
||||
@@ -155,7 +155,7 @@ function calcPreviewGrowFilter(resize = false)
|
||||
var canGrowTotal = 0;
|
||||
|
||||
$filterBox.find('.query-inside').addClass('hidden');
|
||||
$filterBox.find('.query-outside').addClass('hidden');
|
||||
$filterBox.find('.query-outside').addClass('visibility-hidden');
|
||||
chart.filters.forEach(function(filter, index)
|
||||
{
|
||||
var nowItem = '.filter-item-' + index;
|
||||
@@ -191,8 +191,8 @@ function calcPreviewGrowFilter(resize = false)
|
||||
if(filter.type == 'select' && $nowDom.find('.picker').length) $nowDom.find('.picker').find('.picker-selections').css('width', WIDTH_INPUT);
|
||||
});
|
||||
|
||||
var queryType =(!lineWrap && nowWidth >= 60) ? '.query-inside' : '.query-outside';
|
||||
$filterBox.find(queryType).removeClass('hidden');
|
||||
if(!lineWrap && nowWidth >= 60) $filterBox.find('.query-inside').removeClass('hidden');
|
||||
else $filterBox.find('.query-outside').removeClass('visibility-hidden');
|
||||
|
||||
/* Set picker-selection width, default 128px. */
|
||||
waitForRepaint(function()
|
||||
|
||||
@@ -604,8 +604,9 @@ class chartModel extends model
|
||||
if($field)
|
||||
{
|
||||
$path = $this->app->getModuleRoot() . 'dataview' . DS . 'table' . DS . "$object.php";
|
||||
include $path;
|
||||
if(!is_file($path)) return;
|
||||
|
||||
include $path;
|
||||
$options = $schema->fields[$field]['options'];
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -22,9 +22,15 @@ class screen extends control
|
||||
{
|
||||
$dimensionID = $this->loadModel('dimension')->setSwitcherMenu($dimensionID);
|
||||
|
||||
$this->view->title = $this->lang->screen->common;
|
||||
$this->view->screens = $this->screen->getList($dimensionID);
|
||||
$this->view->dimension = $dimensionID;
|
||||
$this->loadModel('setting');
|
||||
$currentUser = $this->app->user->account;
|
||||
$firstGuide = $this->setting->getItem("owner={$currentUser}&module=bi&key=firstGuide");
|
||||
if(empty($firstGuide)) $this->setting->setItem("{$currentUser}.bi.firstGuide", 1);
|
||||
|
||||
$this->view->firstGuide = !empty($firstGuide);
|
||||
$this->view->title = $this->lang->screen->common;
|
||||
$this->view->screens = $this->screen->getList($dimensionID);
|
||||
$this->view->dimension = $dimensionID;
|
||||
$this->display();
|
||||
}
|
||||
|
||||
|
||||
@@ -32,3 +32,9 @@
|
||||
.main-col .row {margin:10px 0px; padding: 12px;}
|
||||
.main-col .row .col-md-3 {padding: 8px;}
|
||||
.main-col .row .col-md-3 a {min-width: 297px;}
|
||||
|
||||
#firstGuide .modal-dialog {width: 750px !important;}
|
||||
#firstGuide .modal-body {padding: 0 !important;}
|
||||
#firstGuide .background-img {height: 430px !important; background: url('static/images/bi_guide_zh.png') no-repeat; background-size: 100%;}
|
||||
#firstGuide .modal-footer {text-align: center !important; border-top: none !important; padding: 24px 0px !important;}
|
||||
#firstGuide .btn-wide {min-width: 90px !important;}
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
$(function()
|
||||
{
|
||||
if(!firstGuide) $('#firstGuide').modal();
|
||||
});
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
|
||||
<?php js::set('firstGuide', $firstGuide);?>
|
||||
<div id="mainContent">
|
||||
<?php if(empty($screens)):?>
|
||||
<div class="table-empty-tip">
|
||||
@@ -41,4 +42,17 @@
|
||||
</div>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="firstGuide">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
<div class="modal-body">
|
||||
<div class="background-img"></div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-wide btn-primary" data-dismiss="modal"><?php echo $lang->close;?></button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php include $app->getModuleRoot() . 'common/view/footer.html.php';?>
|
||||
|
||||
Reference in New Issue
Block a user