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

Merge branch 'tsj_block' into 'master'

Browse Source 
Tsj block

See merge request easycorp/zentaopms!7428
This commit is contained in:
王怡栋
2023-04-14 09:31:50 +00:00
parent 9a79eb42e4 8fbab2b84f
commit d776871aca
8 changed files with 126 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/control.php
+10
View File
@@ -2119,6 +2119,11 @@ class block extends control
*/
public function printDocViewListBlock()
{
/* Load pager. */
$this->app->loadClass('pager', $static = true);
$pager = new pager(0, 6, 1);
$this->view->docList = $this->loadModel('doc')->getDocsByBrowseType('all', 0, 0,'views_desc', $pager);
}
/**
@@ -2129,6 +2134,11 @@ class block extends control
*/
public function printDocCollectListBlock()
{
/* Load pager. */
$this->app->loadClass('pager', $static = true);
$pager = new pager(0, 6, 1);
$this->view->docList = $this->loadModel('doc')->getDocsByBrowseType('all', 0, 0, 'collects_desc', $pager);
}
/**
module/block/view/doccollectlistblock.html.php
+51
View File
@@ -0,0 +1,51 @@
<?php
/**
* The doccollectlistblock view file of block module of ZenTaoPMS.
*
* @copyright Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.cnezsoft.com)
* @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
* @author Shujie Tian <tianshujie@easycorp.ltd>
* @package block
* @version $Id$
* @link https://www.zentao.net
*/
?>
<style>
.block-doccollectlist .panel-body {padding-top: 0px;}
.block-doccollectlist .doc-list > .doc-title {display: flex; overflow: hidden; text-overflow: clip; white-space: nowrap; padding: 8px 0;}
.block-doccollectlist .doc-list > .doc-title > .label-rank {margin-right: 10px; padding-top: 1px; border: unset; color: #2E7FFF; background-color: #D5E5FF;}
.block-doccollectlist .doc-list > .doc-title > .label-rank-1 {color: #FC5959; background-color: #FFE2D9;}
.block-doccollectlist .doc-list > .doc-title > .label-rank-2 {color: #FF8058; background-color: #FFE2D9;}
.block-doccollectlist .doc-list > .doc-title > .label-rank-3 {color: #FF9F46; background-color: #FFECDB;}
.block-doccollectlist .doc-list > .doc-title > a {overflow: hidden; max-width: calc(100% - 30px);}
.block-doccollectlist .doc-list > .doc-title > .label-collect-count {margin-left: 10px;}
.block-doccollectlist .doc-list > .doc-title > .label-collect-count > .view-text {color: #838A9D;}
</style>
<div class="panel-body">
<?php if(empty($docList)):?>
<div class='table-empty-tip'><p><span class='text-muted'><?php echo $lang->doc->noDoc;?></p></span></div>
<?php else:?>
<div class="doc-list">
<?php $rank = 1;?>
<?php foreach($docList as $doc):?>
<div class='doc-title'>
<span class="label-pri label-rank label-rank-<?php echo $rank;?>"><?php echo $rank;?></span>
<?php
if(common::hasPriv('doc', 'view'))
{
echo html::a($this->createLink('doc', 'view', "docID=$doc->id"), $doc->title, '', "title='{$doc->title}' class='doc-title' data-app='{$this->app->tab}'");
}
else
{
echo "<span class='doc-title'>$icon {$doc->title}</span>";
}
?>
<div class='label-collect-count'>
<span class='view-text'><?php echo sprintf($lang->doc->collectCount, $doc->collects);?></span>
</div>
</div>
<?php $rank ++;?>
<?php endforeach;?>
</div>
<?php endif;?>
</div>
module/block/view/docviewlistblock.html.php
+51
View File
@@ -0,0 +1,51 @@
<?php
/**
* The docviewlistblock view file of block module of ZenTaoPMS.
*
* @copyright Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.cnezsoft.com)
* @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
* @author Shujie Tian <tianshujie@easycorp.ltd>
* @package block
* @version $Id$
* @link https://www.zentao.net
*/
?>
<style>
.block-docviewlist .panel-body {padding-top: 0px;}
.block-docviewlist .doc-list > .doc-title {display: flex; overflow: hidden; text-overflow: clip; white-space: nowrap; padding: 8px 0;}
.block-docviewlist .doc-list > .doc-title > .label-rank {margin-right: 10px; padding-top: 1px; border: unset; color: #2E7FFF; background-color: #D5E5FF;}
.block-docviewlist .doc-list > .doc-title > .label-rank-1 {color: #FC5959; background-color: #FFE2D9;}
.block-docviewlist .doc-list > .doc-title > .label-rank-2 {color: #FF8058; background-color: #FFE2D9;}
.block-docviewlist .doc-list > .doc-title > .label-rank-3 {color: #FF9F46; background-color: #FFECDB;}
.block-docviewlist .doc-list > .doc-title > a {overflow: hidden; max-width: calc(100% - 30px);}
.block-docviewlist .doc-list > .doc-title > .label-view-count {margin-left: 10px;}
.block-docviewlist .doc-list > .doc-title > .label-view-count > .view-text {color: #838A9D;}
</style>
<div class="panel-body">
<?php if(empty($docList)):?>
<div class='table-empty-tip'><p><span class='text-muted'><?php echo $lang->doc->noDoc;?></p></span></div>
<?php else:?>
<div class="doc-list">
<?php $rank = 1;?>
<?php foreach($docList as $doc):?>
<div class='doc-title'>
<span class="label-pri label-rank label-rank-<?php echo $rank;?>"><?php echo $rank;?></span>
<?php
if(common::hasPriv('doc', 'view'))
{
echo html::a($this->createLink('doc', 'view', "docID=$doc->id"), $doc->title, '', "title='{$doc->title}' class='doc-title' data-app='{$this->app->tab}'");
}
else
{
echo "<span class='doc-title'>$icon {$doc->title}</span>";
}
?>
<div class='label-view-count'>
<span class='view-text'><?php echo sprintf($lang->doc->viewCount, $doc->views);?></span>
</div>
</div>
<?php $rank ++;?>
<?php endforeach;?>
</div>
<?php endif;?>
</div>
module/doc/lang/de.php
+2
View File
@@ -156,6 +156,8 @@ $lang->doc->todayUpdated = "Today's update";
$lang->doc->daysUpdated = 'Updated %s days ago';
$lang->doc->monthsUpdated = 'Updated %s months ago';
$lang->doc->yearsUpdated = 'Updated %s years ago';
$lang->doc->viewCount = '%s Visits';
$lang->doc->collectCount = '%s Collections';
/* Methods list */
$lang->doc->index = 'Dashboard';
module/doc/lang/en.php
+2
View File
@@ -156,6 +156,8 @@ $lang->doc->todayUpdated = "Today's update";
$lang->doc->daysUpdated = 'Updated %s days ago';
$lang->doc->monthsUpdated = 'Updated %s months ago';
$lang->doc->yearsUpdated = 'Updated %s years ago';
$lang->doc->viewCount = '%s Visits';
$lang->doc->collectCount = '%s Collections';
/* Methods list */
$lang->doc->index = 'Dashboard';
module/doc/lang/fr.php
+2
View File
@@ -156,6 +156,8 @@ $lang->doc->todayUpdated = "Today's update";
$lang->doc->daysUpdated = 'Updated %s days ago';
$lang->doc->monthsUpdated = 'Updated %s months ago';
$lang->doc->yearsUpdated = 'Updated %s years ago';
$lang->doc->viewCount = '%s Visits';
$lang->doc->collectCount = '%s Collections';
/* Methods list */
$lang->doc->index = 'Dashboard';
module/doc/lang/zh-cn.php
+2
View File
@@ -156,6 +156,8 @@ $lang->doc->todayUpdated = '今天更新';
$lang->doc->daysUpdated = '%s天前更新';
$lang->doc->monthsUpdated = '%s月前更新';
$lang->doc->yearsUpdated = '%s年前更新';
$lang->doc->viewCount = '%s次浏览';
$lang->doc->collectCount = '%s次收藏';
/* 方法列表。*/
$lang->doc->index = '仪表盘';
module/upgrade/model.php
+6 -5
View File
@@ -9075,8 +9075,12 @@ class upgradeModel extends model
$this->loadModel('doc');
$users = $this->dao->select('account')->from(TABLE_USER)->fetchPairs('account', 'account');
$stmt = $this->dao->select('id,collector')->from(TABLE_DOC)->where('collector')->ne('')->query();
while($doc = $stmt->fetch())
$docs = $this->dao->select('id,collector')->from(TABLE_DOC)->where('collector')->ne('')->fetchAll();
$this->dao->update(TABLE_DOC)->set('collector')->eq(0)->exec();
$this->dao->exec("ALTER TABLE " . TABLE_DOC . " CHANGE `collector` `collects` smallint unsigned NOT NULL DEFAULT '0'");
foreach($docs as $doc)
{
foreach(explode(',', $doc->collector) as $collector)
{
@@ -9087,9 +9091,6 @@ class upgradeModel extends model
}
}
$this->dao->update(TABLE_DOC)->set('collector')->eq(0)->where('collector')->eq('')->exec();
$this->dao->exec("ALTER TABLE " . TABLE_DOC . " CHANGE `collector` `collects` smallint unsigned NOT NULL DEFAULT '0'");
return true;
}
}