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

* code for task #91381.

Browse Source
This commit is contained in:
wangyidong
2023-04-18 17:35:22 +08:00
parent a88eaaeace
commit dffb74c07d
8 changed files with 52 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/api/view/content.html.php
+3 -4
View File
@@ -27,8 +27,8 @@
<?php
if(!$isRelease)
{
if(common::hasPriv('api', 'edit')) echo html::a($this->createLink('api', 'edit', "apiID=$api->id"), '<i class="icon-edit"></i>', '', "title='{$lang->api->edit}' class='btn btn-link' data-app='{$this->app->tab}'");
if(common::hasPriv('api', 'delete')) echo html::a($this->createLink('api', 'delete', "apiID=$api->id"), '<i class="icon-trash"></i>', '', "title='{$lang->api->delete}' class='btn btn-link' target='hiddenwin'");
if(common::hasPriv('api', 'edit')) echo html::a($this->createLink('api', 'edit', "apiID=$api->id"), '<i class="icon-edit"></i>', '', "title='{$lang->api->edit}' class='btn btn-link' data-app='{$this->app->tab}'");
if(common::hasPriv('api', 'delete')) echo html::a($this->createLink('api', 'delete', "apiID=$api->id"), '<i class="icon-trash"></i>', '', "title='{$lang->api->delete}' class='btn btn-link' target='hiddenwin'");
}
?>
</div>
@@ -56,8 +56,7 @@
<td><?php echo $lang->api->boolList[$param['required']];?></td>
<td><?php echo $param['desc'];?></td>
<tr>
<?php endforeach;
;?>
<?php endforeach;?>
</tbody>
</table>
<?php endif;?>
module/block/control.php
+2 -2
View File
@@ -2166,7 +2166,7 @@ class block extends control
while($doc = $stmt->fetch())
{
if(!isset($docGroup[$doc->product])) $docGroup[$doc->product] = array();
if(count($docGroup[$doc->product]) > $count) break;
if(count($docGroup[$doc->product]) >= $count) continue;
if($this->doc->checkPrivDoc($doc)) $docGroup[$doc->product][$doc->id] = $doc;
}
@@ -2208,7 +2208,7 @@ class block extends control
while($doc = $stmt->fetch())
{
if(!isset($docGroup[$doc->project])) $docGroup[$doc->project] = array();
if(count($docGroup[$doc->project]) > $count) break;
if(count($docGroup[$doc->project]) >= $count) continue;
if($this->doc->checkPrivDoc($doc)) $docGroup[$doc->project][$doc->id] = $doc;
}
module/block/view/productdocblock.html.php
+22 -26
View File
@@ -1,14 +1,14 @@
<style>
.block-productdoc .nav-stacked {overflow:auto; height:220px; max-height:220px; }
.block-productdoc .panel-heading {border-bottom:1px solid #ddd;}
.block-productdoc .panel-body {padding-top: 0; height:240px; padding-right:0px; overflow-x:hidden !important;}
.block-productdoc .panel-body {padding-top: 0; height:240px; padding-right:0px; padding-bottom:0px;}
.block-productdoc .tab-content {padding-right:0px;}
.block-productdoc .tab-pane {max-height:220px; overflow:auto;}
.block-productdoc table.tablesorter th{border-bottom:0px !important;}
.block-productdoc .tile {margin-bottom: 30px;}
.block-productdoc .tile-title {font-size: 18px; color: #A6AAB8;}
.block-productdoc .tile-amount {font-size: 48px; margin-bottom: 10px;}
.block-productdoc .col-nav {border-right: 1px solid #EBF2FB; width: 210px; padding: 0;}
.block-productdoc .col-nav {border-right: 1px solid #EBF2FB; width: 210px; padding: 5px 0 0 0; }
.block-productdoc .nav-secondary > li {position: relative;}
.block-productdoc .nav-secondary > li > a {font-size: 14px; color: #838A9D; position: relative; box-shadow: none; padding-left: 20px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; transition: all .2s;}
.block-productdoc .nav-secondary > li > a:first-child {padding-right: 36px;}
@@ -22,13 +22,13 @@
.block-productdoc .nav-secondary > li.active > a.btn-view {box-shadow: none;}
.block-productdoc .nav-secondary > li.switch-icon {display: none;}
.block-productdoc.block-sm .nav-stacked {height:auto;}
.block-productdoc.block-sm .panel-body {padding-bottom: 10px; position: relative; padding-top: 45px; border-radius: 3px; height:275px;}
.block-productdoc.block-sm .panel-body {position: relative; border-radius: 3px; height:275px; padding: 45px 8px 10px 8px}
.block-productdoc.block-sm .panel-body > .table-row,
.block-productdoc.block-sm .panel-body > .table-row > .col {display: block; width: auto;}
.block-productdoc.block-sm .panel-body > .table-row > .tab-content {padding: 0; margin: 0 -5px;}
.block-productdoc.block-sm .tab-pane > .table-row > .col-5 {width: 125px;}
.block-productdoc.block-sm .tab-pane > .table-row > .col-5 > .table-row {padding: 5px 0;}
.block-productdoc.block-sm .col-nav {border-left: none; position: absolute; top: 0; left: 15px; right: 15px; background: #f5f5f5;}
.block-productdoc.block-sm .col-nav {border-left: none; position: absolute; top: 0; left: 15px; right: 15px; background: #f5f5f5; padding: 0px; margin-top:5px;}
.block-productdoc.block-sm .nav-secondary {display: table; width: 100%; padding: 0; table-layout: fixed;}
.block-productdoc.block-sm .nav-secondary > li {display: none;}
.block-productdoc.block-sm .nav-secondary > li.switch-icon,
@@ -58,12 +58,12 @@
.block-productdoc .table .c-name[data-status=draft] > .doc-title {max-width: calc(100% - 35px);}
.block-productdoc .table .c-name > .draft {background-color:rgba(129, 102, 238, 0.12); color:#8166EE;}
</style>
<script>
<?php $blockNavId = 'nav-' . uniqid(); ?>
<script>
$(function()
{
<?php if(!$longBlock):?>
$(document).on('click', '.col-nav .switch-icon', function(e)
$(document).on('click', '.block-productdoc<?php echo "#block{$block->id}";?> .col-nav .switch-icon', function(e)
{
var $nav = $(this).closest('.nav');
var isPrev = $(this).is('.prev');
@@ -75,44 +75,40 @@ $(function()
});
<?php endif;?>
if($('.block-productdoc #productType').length > 1);
if($('.block-productdoc<?php echo "#block{$block->id}";?> #productType').length > 1);
{
count = $('.block-productdoc #productType').length;
$('.block-productdoc #productType').each(function()
count = $('.block-productdoc<?php echo "#block{$block->id}";?> #productType').length;
$('.block-productdoc<?php echo "#block{$block->id}";?> #productType').each(function()
{
if(count == 1) return;
$(this).remove();
count --;
})
}
var $productList = $('#activeProduct');
if($productList.length)
{
var productList = $productList[0];
$(".col ul.nav").animate({scrollTop: productList.offsetTop}, "slow");
}
});
function changeProductType(type)
function change<?php echo "block{$block->id}";?>ProductType(type)
{
$('.nav.products').toggleClass('hidden', type != 'all');
$('.nav.involveds').toggleClass('hidden', type != 'involved');
$('#productType .btn').html($('#productType [data-type=' + type + ']').html() + " <span class='caret'></span>");
var name = type == 'all' ? '.products' : '.involveds';
$('.block-productdoc<?php echo "#block{$block->id}";?> .nav.products').toggleClass('hidden', type != 'all');
$('.block-productdoc<?php echo "#block{$block->id}";?> .nav.involveds').toggleClass('hidden', type != 'involved');
$('.block-productdoc<?php echo "#block{$block->id}";?> #productType .btn').html($('.block-productdoc<?php echo "#block{$block->id}";?> #productType [data-type=' + type + ']').html() + " <span class='caret'></span>");
var name = type == 'all' ? '.block-productdoc<?php echo "#block{$block->id}";?> .products' : '.block-productdoc<?php echo "#block{$block->id}";?> .involveds';
var $obj = $(name + ' li.active').length > 0 ? $(name + ' .active:first').find('a') : $(name + ' li:not(.switch-icon):first').find('a');
$(name + ' li').removeClass('active');
$obj.closest('li').addClass('active');
$('.block-productdoc .tab-pane').removeClass('active').removeClass('in');
$('.block-productdoc .tab-pane' + $obj.data('target')).addClass('active').addClass('in');
$('.block-productdoc<?php echo "#block{$block->id}";?> .tab-pane').removeClass('active').removeClass('in');
$('.block-productdoc<?php echo "#block{$block->id}";?> .tab-pane' + $obj.data('target')).addClass('active').addClass('in');
$('.block-productdoc<?php echo "#block{$block->id}";?> #productType .dropdown-menu li').removeClass('active');
$('.block-productdoc<?php echo "#block{$block->id}";?> #productType .dropdown-menu li a[data-type=' + type + ']').closest('li').addClass('active');
}
</script>
<div class="dropdown" id='productType'>
<button class="btn" type="button" data-toggle="dropdown"><?php echo $lang->product->involved;?> <span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="javascript:changeProductType('involved')" data-type='involved'><?php echo $lang->product->involved;?></a></li>
<li><a href="javascript:changeProductType('all')" data-type='all'><?php echo $lang->product->all;?></a></li>
<li class='active'><a href="javascript:change<?php echo "block{$block->id}";?>ProductType('involved')" data-type='involved'><?php echo $lang->product->involved;?></a></li>
<li><a href="javascript:change<?php echo "block{$block->id}";?>ProductType('all')" data-type='all'><?php echo $lang->product->all;?></a></li>
</ul>
</div>
<div class="panel-body">
@@ -172,7 +168,7 @@ function changeProductType(type)
}
else
{
echo "<span class='doc-title'>$icon {$doc->title}</span>";
echo "<span class='doc-title' title='{$doc->title}'>$icon {$doc->title}</span>";
}
if($doc->status == 'draft') echo "<span class='label label-badge draft'>{$lang->doc->draft}</span>";
?>
module/block/view/projectdocblock.html.php
+21 -25
View File
@@ -1,14 +1,14 @@
<style>
.block-projectdoc .nav-stacked {overflow:auto; height:220px; max-height:220px; }
.block-projectdoc .panel-heading {border-bottom:1px solid #ddd;}
.block-projectdoc .panel-body {padding-top: 0; height:240px; padding-right:0px; overflow-x:hidden !important;}
.block-projectdoc .panel-body {padding-top: 0; height:240px; padding-right:0px; padding-bottom:0px;}
.block-projectdoc .tab-content {padding-right:0px;}
.block-projectdoc .tab-pane {max-height:220px; overflow:auto;}
.block-projectdoc table.tablesorter th{border-bottom:0px !important;}
.block-projectdoc .tile {margin-bottom: 30px;}
.block-projectdoc .tile-title {font-size: 18px; color: #A6AAB8;}
.block-projectdoc .tile-amount {font-size: 48px; margin-bottom: 10px;}
.block-projectdoc .col-nav {border-right: 1px solid #EBF2FB; width: 210px; padding: 0;}
.block-projectdoc .col-nav {border-right: 1px solid #EBF2FB; width: 210px; padding: 8px 0 0 0;}
.block-projectdoc .nav-secondary > li {position: relative;}
.block-projectdoc .nav-secondary > li > a {font-size: 14px; color: #838A9D; position: relative; box-shadow: none; padding-left: 20px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; transition: all .2s;}
.block-projectdoc .nav-secondary > li > a:first-child {padding-right: 36px;}
@@ -22,13 +22,13 @@
.block-projectdoc .nav-secondary > li.active > a.btn-view {box-shadow: none;}
.block-projectdoc .nav-secondary > li.switch-icon {display: none;}
.block-projectdoc.block-sm .nav-stacked {height:auto;}
.block-projectdoc.block-sm .panel-body {padding-bottom: 10px; position: relative; padding-top: 45px; border-radius: 3px; height:275px;}
.block-projectdoc.block-sm .panel-body {padding: 45px 8px 10px 8px; position: relative; border-radius: 3px; height:275px;}
.block-projectdoc.block-sm .panel-body > .table-row,
.block-projectdoc.block-sm .panel-body > .table-row > .col {display: block; width: auto;}
.block-projectdoc.block-sm .panel-body > .table-row > .tab-content {padding: 0; margin: 0 -5px;}
.block-projectdoc.block-sm .tab-pane > .table-row > .col-5 {width: 125px;}
.block-projectdoc.block-sm .tab-pane > .table-row > .col-5 > .table-row {padding: 5px 0;}
.block-projectdoc.block-sm .col-nav {border-left: none; position: absolute; top: 0; left: 15px; right: 15px; background: #f5f5f5;}
.block-projectdoc.block-sm .col-nav {border-left: none; position: absolute; top: 0; left: 15px; right: 15px; background: #f5f5f5; padding:0px; margin-top:5px;}
.block-projectdoc.block-sm .nav-secondary {display: table; width: 100%; padding: 0; table-layout: fixed;}
.block-projectdoc.block-sm .nav-secondary > li {display: none;}
.block-projectdoc.block-sm .nav-secondary > li.switch-icon,
@@ -63,7 +63,7 @@
$(function()
{
<?php if(!$longBlock):?>
$(document).on('click', '.col-nav .switch-icon', function(e)
$(document).on('click', '.block-projectdoc<?php echo "#block{$block->id}";?> .col-nav .switch-icon', function(e)
{
var $nav = $(this).closest('.nav');
var isPrev = $(this).is('.prev');
@@ -75,44 +75,40 @@ $(function()
});
<?php endif;?>
if($('.block-projectdoc #projectType').length > 1);
if($('.block-projectdoc<?php echo "#block{$block->id}";?> #projectType').length > 1);
{
count = $('.block-projectdoc #projectType').length;
$('.block-projectdoc #projectType').each(function()
count = $('.block-projectdoc<?php echo "#block{$block->id}";?> #projectType').length;
$('.block-projectdoc<?php echo "#block{$block->id}";?> #projectType').each(function()
{
if(count == 1) return;
$(this).remove();
count --;
})
}
var $projectList = $('#activeProject');
if($projectList.length)
{
var projectList = $projectList[0];
$(".col ul.nav").animate({scrollTop: projectList.offsetTop}, "slow");
}
});
function changeProjectType(type)
function change<?php echo "block{$block->id}";?>ProjectType(type)
{
$('.block-projectdoc .nav.projects').toggleClass('hidden', type != 'all');
$('.block-projectdoc .nav.involveds').toggleClass('hidden', type != 'involved');
$('.block-projectdoc #projectType .btn').html($('.block-projectdoc #projectType [data-type=' + type + ']').html() + " <span class='caret'></span>");
var name = type == 'all' ? '.block-projectdoc .projects' : '.block-projectdoc .involveds';
$('.block-projectdoc<?php echo "#block{$block->id}";?> .nav.projects').toggleClass('hidden', type != 'all');
$('.block-projectdoc<?php echo "#block{$block->id}";?> .nav.involveds').toggleClass('hidden', type != 'involved');
$('.block-projectdoc<?php echo "#block{$block->id}";?> #projectType .btn').html($('.block-projectdoc<?php echo "#block{$block->id}";?> #projectType [data-type=' + type + ']').html() + " <span class='caret'></span>");
var name = type == 'all' ? '.block-projectdoc<?php echo "#block{$block->id}";?> .projects' : '.block-projectdoc<?php echo "#block{$block->id}";?> .involveds';
var $obj = $(name + ' li.active').length > 0 ? $(name + ' .active:first').find('a') : $(name + ' li:not(.switch-icon):first').find('a');
$(name + ' li').removeClass('active');
$obj.closest('li').addClass('active');
$('.block-projectdoc .tab-pane').removeClass('active').removeClass('in');
$('.block-projectdoc .tab-pane' + $obj.data('target')).addClass('active').addClass('in');
$('.block-projectdoc<?php echo "#block{$block->id}";?> .tab-pane').removeClass('active').removeClass('in');
$('.block-projectdoc<?php echo "#block{$block->id}";?> .tab-pane' + $obj.data('target')).addClass('active').addClass('in');
$('.block-projectdoc<?php echo "#block{$block->id}";?> #projectType .dropdown-menu li').removeClass('active');
$('.block-projectdoc<?php echo "#block{$block->id}";?> #projectType .dropdown-menu li a[data-type=' + type + ']').closest('li').addClass('active');
}
</script>
<div class="dropdown" id='projectType'>
<button class="btn" type="button" data-toggle="dropdown"><?php echo $lang->project->involved;?> <span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="javascript:changeProjectType('involved')" data-type='involved'><?php echo $lang->project->involved;?></a></li>
<li><a href="javascript:changeProjectType('all')" data-type='all'><?php echo $lang->project->all;?></a></li>
<li class='active'><a href="javascript:change<?php echo "block{$block->id}";?>ProjectType('involved')" data-type='involved'><?php echo $lang->project->involved;?></a></li>
<li><a href="javascript:change<?php echo "block{$block->id}";?>ProjectType('all')" data-type='all'><?php echo $lang->project->all;?></a></li>
</ul>
</div>
<div class="panel-body">
@@ -172,7 +168,7 @@ function changeProjectType(type)
}
else
{
echo "<span class='doc-title'>$icon {$doc->title}</span>";
echo "<span class='doc-title' title='{$doc->title}'>$icon {$doc->title}</span>";
}
if($doc->status == 'draft') echo "<span class='label label-badge draft'>{$lang->doc->draft}</span>";
?>
module/doc/lang/de.php
+1
View File
@@ -86,6 +86,7 @@ $lang->doc->addedByAB = 'CreatedBy';
$lang->doc->addedDate = 'CreatedDate';
$lang->doc->editedBy = 'Bearbeitet von';
$lang->doc->editedDate = 'UpdatedDate';
$lang->doc->editingDate = 'Editing user and time';
$lang->doc->lastEditedBy = 'Last Editor';
$lang->doc->version = 'Version';
$lang->doc->basicInfo = 'Basis Info';
module/doc/lang/en.php
+1
View File
@@ -86,6 +86,7 @@ $lang->doc->addedByAB = 'CreatedBy';
$lang->doc->addedDate = 'CreatedDate';
$lang->doc->editedBy = 'UpdatedBy';
$lang->doc->editedDate = 'UpdatedDate';
$lang->doc->editingDate = 'Editing user and time';
$lang->doc->lastEditedBy = 'Last Editor';
$lang->doc->version = 'Version';
$lang->doc->basicInfo = 'Basic Information';
module/doc/lang/fr.php
+1
View File
@@ -86,6 +86,7 @@ $lang->doc->addedByAB = 'CreatedBy';
$lang->doc->addedDate = 'CreatedDate';
$lang->doc->editedBy = 'Màj par';
$lang->doc->editedDate = 'UpdatedDate';
$lang->doc->editingDate = 'Editing user and time';
$lang->doc->lastEditedBy = 'Last Editor';
$lang->doc->version = 'Version';
$lang->doc->basicInfo = 'Infos de Base';
module/doc/lang/zh-cn.php
+1
View File
@@ -86,6 +86,7 @@ $lang->doc->addedByAB = '创建者';
$lang->doc->addedDate = '创建日期';
$lang->doc->editedBy = '修改者';
$lang->doc->editedDate = '修改日期';
$lang->doc->editingDate = '正在修改者和时间';
$lang->doc->lastEditedBy = '最后更新者';
$lang->doc->version = '版本号';
$lang->doc->basicInfo = '基本信息';