Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge pull request 'sprint/scx_bug34583' (#5) from sprint/scx_bug34583 into 18.4

Browse Source 
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/5
This commit is contained in:
宋辰轩
2023-04-24 15:09:15 +08:00
parent 837cc4de56 3a0195009c
commit af2eff9197
3 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/chart/view/preview.html.php
+24 -22
View File
@@ -44,31 +44,33 @@
<div id="mainContent" class='main-row'>
<div class='side-col col-lg'>
<div class='panel'>
<div class='panel-heading'>
<div class='panel-title'><?php echo isset($group->name) ? $group->name : '';?></div>
</div>
<div class='panel-body'>
<?php if(!$chartTree):?>
<hr class="space">
<div class="text-center text-muted">
<?php echo $lang->chart->noChart;?>
<div class="cell">
<div class='panel'>
<div class='panel-heading text-ellipsis'>
<div class='panel-title'><?php echo isset($group->name) ? $group->name : '';?></div>
</div>
<hr class="space">
<?php elseif($chartTree):?>
<form method='post'>
<?php echo $chartTree;?>
<div class='btn-toolbar'>
<?php echo html::selectAll();?>
<?php echo html::submitButton($lang->chart->preview, '', 'btn btn-primary');?>
<div class='panel-body'>
<?php if(!$chartTree):?>
<hr class="space">
<div class="text-center text-muted">
<?php echo $lang->chart->noChart;?>
</div>
</form>
<?php endif;?>
<?php if($this->config->edition == 'open'):?>
<div class='text biz-version'>
<span class='text-important'><?php echo (!empty($config->isINT)) ? $lang->bizVersionINT : $lang->bizVersion;?></span>
<hr class="space">
<?php elseif($chartTree):?>
<form method='post'>
<?php echo $chartTree;?>
<div class='btn-toolbar'>
<?php echo html::selectAll();?>
<?php echo html::submitButton($lang->chart->preview, '', 'btn btn-primary');?>
</div>
</form>
<?php endif;?>
<?php if($this->config->edition == 'open'):?>
<div class='text biz-version'>
<span class='text-important'><?php echo (!empty($config->isINT)) ? $lang->bizVersionINT : $lang->bizVersion;?></span>
</div>
<?php endif;?>
</div>
<?php endif;?>
</div>
</div>
</div>
module/pivot/view/preview.html.php
+5 -5
View File
@@ -1,18 +1,18 @@
<?php include '../../common/view/header.html.php';?>
<script>
$('#subNavbar li').not('[data-id=<?php echo $group;?>]').removeClass('active');
$('#subNavbar li').not('[data-id=<?php echo $groupID;?>]').removeClass('active');
</script>
<?php if($this->config->edition != 'open'):?>
<style>#mainContent > .side-col.col-lg{width: 210px}</style>
<style>.hide-sidebar #sidebar{width: 0 !important}</style>
<?php endif;?>
<?php js::set('dimension', $dimension);?>
<?php js::set('group', $group);?>
<?php js::set('groupID', $groupID);?>
<div id='mainMenu' class='clearfix main-position'>
<div class="btn-toolbar pull-left parent-position">
<?php foreach($lang->pivot->featureBar['preview'] as $key => $label):?>
<?php $active = ($key == $group) ? ' btn-active-text' : '';?>
<?php $active = ($key == $groupID) ? ' btn-active-text' : '';?>
<?php echo html::a(inlink('preview', "dimension=$dimension&group=$key"), "<span class='text'>$label</span>", '', "class='btn btn-link {$active}'");?>
<?php endforeach;?>
</div>
@@ -37,8 +37,8 @@ $('#subNavbar li').not('[data-id=<?php echo $group;?>]').removeClass('active');
</div>
<div class="cell">
<div class='panel'>
<div class='panel-heading'>
<div class='panel-title'><?php echo $lang->pivot->list;?></div>
<div class='panel-heading text-ellipsis'>
<div class='panel-title'><?php echo isset($group->name) ? $group->name : '';?></div>
</div>
<div class='panel-body'>
<div class='list-group'>
module/pivot/zen.php
+10 -9
View File
@@ -5,27 +5,28 @@ class pivotZen extends pivot
* Prepare for preview a pivot.
*
* @param int $dimension
* @param string $group
* @param string $groupID
* @param string $module
* @param string $method
* @param string $params
* @access public
* @return void
*/
public function prepare4Preview($dimension, $group, $module, $method, $params)
public function prepare4Preview($dimension, $groupID, $module, $method, $params)
{
$params = helper::safe64Decode($params);
if(!$group) $group = $this->getDefaultGroup($dimension);
if(!$module || !$method) list($module, $method, $params) = $this->getDefaultPivotParams($dimension, $group);
if(!$groupID) $groupID = $this->getDefaultGroup($dimension);
if(!$module || !$method) list($module, $method, $params) = $this->getDefaultPivotParams($dimension, $groupID);
if(!empty($module) && !empty($method) && $method != 'show' && !common::hasPriv($module, $method)) $this->loadModel('common')->deny('pivot', $method);
$this->setFeatureBar($dimension);
$this->view->sidebar = $this->getSidebar($dimension, $group, $module, $method, $params);
$this->view->sidebar = $this->getSidebar($dimension, $groupID, $module, $method, $params);
$this->view->dimension = $dimension;
$this->view->group = $group;
$this->view->groupID = $groupID;
$this->view->group = $this->loadModel('tree')->getByID($groupID);
$this->view->module = $module;
$this->view->method = $method;
$this->view->params = $params;
@@ -199,19 +200,19 @@ class pivotZen extends pivot
foreach($pivots as $pivot)
{
$class = '';
$class = "pivot-{$pivot->id}";
$pivotName = $pivot->name;
$params = helper::safe64Encode("dimensionID=$pivot->dimension&groupID=$pivot->group&pivotID=$pivot->id");
if($module == 'pivot' && $method == 'show' && $pivotID == $pivot->id)
{
$class = "class='active'";
$class .= ' active';
$this->view->title = $pivotName;
}
$pivotLink = helper::createLink('pivot', 'preview', "dimension=$dimension&group=$currentGroup->id&module=pivot&method=show&params=$params");
$sidebar .= "<li $class>" . html::a($pivotLink, $pivotName, '', "title='$pivotName'") . '</li>';
$sidebar .= "<li class='$class'>" . html::a($pivotLink, $pivotName, '', "title='$pivotName'") . '</li>';
}
if($group->grade == 2) $sidebar .= '</ul></li>';