Merge branch 'cyy_90779' into 'master'

Cyy 90779 See merge request easycorp/zentaopms!7377
2023-04-12 02:17:49 +00:00
parent 738df10b4c 021dbcc7eb
commit bda285d84b
7 changed files with 109 additions and 23 deletions
@@ -2079,6 +2079,18 @@ class block extends control
     */
    public function printDocRecentUpdateBlock()
    {
+        /* Load pager. */
+        $this->app->loadClass('pager', $static = true);
+        $pager = new pager(0, 6, 1);
+
+        $docList = $this->loadModel('doc')->getDocsByBrowseType('byediteddate', 0, 0, 'editedDate_desc', $pager);
+        foreach($docList as $doc)
+        {
+            $doc->editedDate   = substr($doc->editedDate, 0, 10);
+            $doc->editInterval = helper::getDateInterval($doc->editedDate);
+        }
+
+        $this->view->docList = $docList;
    }

    /**
@@ -0,0 +1,58 @@
+<?php
+/**
+ * The statistic 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      Yanyi Cao <caoyanyi@easycorp.ltd>
+ * @package     block
+ * @version     $Id$
+ * @link        http://www.zentao.net
+ */
+?>
+<style>
+.block-docrecentupdate .panel-body {padding: 0px 20px;}
+.block-docrecentupdate .doc-list {display: flex; flex-wrap: wrap; padding: 0 4px 4px 4px;}
+.block-docrecentupdate .doc-list > .doc-item {flex: 1 1 26%; padding: 8px 10px; border: 1px solid #EDEEF2; border-radius: 4px; margin-right: 10px; margin-bottom: 16px; width: 0px; cursor: pointer;}
+.block-docrecentupdate .doc-list > .doc-item .date-interval {float: right; padding: 8px 0px;}
+.block-docrecentupdate .doc-list > .doc-item .file-icon {float: left; padding: 8px 4px;}
+.block-docrecentupdate .doc-list > .doc-item > .plug-title {height: 16px; overflow: hidden;}
+.block-docrecentupdate .doc-list > .doc-item .edit-date {overflow: hidden; height: 16px;}
+
+.block-docrecentupdate.block-sm .doc-list > .doc-item {flex: 1 1 100%;}
+</style>
+<div class="panel-body">
+  <div class="plug">
+    <div class="doc-list">
+      <?php foreach($docList as $doc):?>
+      <a class="doc-item shadow-primary-hover" href='<?php echo $this->createLink("doc", "view", "docID=$doc->id");?>'>
+        <span class='date-interval text-muted'>
+          <?php
+          $interval = $doc->editInterval;
+          $editTip  = $lang->doc->todayUpdated;
+          if($interval->year)
+          {
+            $editTip = sprintf($lang->doc->yearsUpdated, $interval->year);
+          }
+          elseif($interval->month)
+          {
+            $editTip = sprintf($lang->doc->monthsUpdated, $interval->month);
+          }
+          elseif($interval->day)
+          {
+            $editTip = sprintf($lang->doc->daysUpdated, $interval->day);
+          }
+          echo $editTip;
+          ?>
+        </span>
+        <?php
+        $docType = $doc->type == 'text' ? 'wiki-file' : $doc->type;
+        echo html::image("static/svg/{$docType}.svg", "class='file-icon'");
+        ?>
+        <h4 class="plug-title" title="<?php echo $doc->title;?>"><?php echo $doc->title;?></h4>
+        <p class='edit-date text-muted'><?php echo $lang->doc->editedDate . (common::checkNotCN() ? ': ' : '：') . $doc->editedDate;?></p>
+      </a>
+      <?php endforeach;?>
+    </div>
+  </div>
+</div>
@@ -11,30 +11,30 @@
 */
 ?>
 <style>
-.block-statistic .flex {display: flex; flex-wrap: nowrap; flex-direction: row; justify-content: space-between; flex: auto;}
-.block-statistic .flex-column {flex-direction: column; padding-left: 10px;}
-.block-statistic .statistic {flex: 0 1 32%;}
-.block-statistic .created {flex: 0 1 48%;}
-.block-statistic .edited {flex: 0 1 16%; padding-left: 20px;}
-.block-statistic .divider {border-right: 1px solid #eee; padding-right: 12%;}
-.block-statistic .title-line {height: 32px;}
-.block-statistic .panel-title {display: none;}
-.block-statistic .panel-body {margin-top: -32px; padding: 30px;}
-.block-statistic .tile-title {white-space: nowrap;}
+.block-docstatistic .flex {display: flex; flex-wrap: nowrap; flex-direction: row; justify-content: space-between; flex: auto;}
+.block-docstatistic .flex-column {flex-direction: column; padding-left: 10px;}
+.block-docstatistic .statistic {flex: 0 1 32%;}
+.block-docstatistic .created {flex: 0 1 48%;}
+.block-docstatistic .edited {flex: 0 1 16%; padding-left: 20px;}
+.block-docstatistic .divider {border-right: 1px solid #eee; padding-right: 12%;}
+.block-docstatistic .title-line {height: 32px;}
+.block-docstatistic .panel-title {display: none;}
+.block-docstatistic .panel-body {margin-top: -32px; padding: 30px;}
+.block-docstatistic .tile-title {white-space: nowrap;}

-.block-statistic.block-sm .flex {justify-content: start;}
-.block-statistic.block-sm .panel-body.flex {flex-direction: column;}
-.block-statistic.block-sm .divider {border-right: none;}
-.block-statistic.block-sm .panel-title {display: block;}
-.block-statistic.block-sm .statistic .title-line {display: none;}
-.block-statistic.block-sm .statistic .flex {margin-top: -28px;}
-.block-statistic.block-sm .title-line {height: 0; padding-top: 10px;}
-.block-statistic.block-sm .tile {padding: 10px 32px 20px;}
-.block-statistic.block-sm .panel-body {margin-top: 0px; padding: 10px;}
-.block-statistic.block-sm .flex-column .flex .tile:nth-child(1) {padding-left: 0;}
-.block-statistic.block-sm .edited {padding-left: 10px;}
-.block-statistic.block-sm .flex-column {border-bottom: 1px solid #eee;}
-.block-statistic.block-sm .flex-column:last-child {border-bottom: none;}
+.block-docstatistic.block-sm .flex {justify-content: start;}
+.block-docstatistic.block-sm .panel-body.flex {flex-direction: column;}
+.block-docstatistic.block-sm .divider {border-right: none;}
+.block-docstatistic.block-sm .panel-title {display: block;}
+.block-docstatistic.block-sm .statistic .title-line {display: none;}
+.block-docstatistic.block-sm .statistic .flex {margin-top: -28px;}
+.block-docstatistic.block-sm .title-line {height: 0; padding-top: 10px;}
+.block-docstatistic.block-sm .tile {padding: 10px 32px 20px;}
+.block-docstatistic.block-sm .panel-body {margin-top: 0px; padding: 10px;}
+.block-docstatistic.block-sm .flex-column .flex .tile:nth-child(1) {padding-left: 0;}
+.block-docstatistic.block-sm .edited {padding-left: 10px;}
+.block-docstatistic.block-sm .flex-column {border-bottom: 1px solid #eee;}
+.block-docstatistic.block-sm .flex-column:last-child {border-bottom: none;}
 </style>
 <div class='panel-move-handler'></div>
 <div class="panel-body flex">
@@ -151,6 +151,10 @@ $lang->doc->docCreated    = 'Created Documents';
 $lang->doc->docEdited     = 'Edited Documents';
 $lang->doc->docViews      = 'Page Views';
 $lang->doc->docCollects   = 'Collection';
+$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';

 /* Methods list */
 $lang->doc->index            = 'Dashboard';
@@ -151,6 +151,10 @@ $lang->doc->docCreated    = 'Created Documents';
 $lang->doc->docEdited     = 'Edited Documents';
 $lang->doc->docViews      = 'Page Views';
 $lang->doc->docCollects   = 'Collection';
+$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';

 /* Methods list */
 $lang->doc->index            = 'Dashboard';
@@ -151,6 +151,10 @@ $lang->doc->docCreated    = 'Created Documents';
 $lang->doc->docEdited     = 'Edited Documents';
 $lang->doc->docViews      = 'Page Views';
 $lang->doc->docCollects   = 'Collection';
+$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';

 /* Methods list */
 $lang->doc->index            = 'Dashboard';
@@ -151,6 +151,10 @@ $lang->doc->docCreated    = '创建的文档';
 $lang->doc->docEdited     = '编辑的文档';
 $lang->doc->docViews      = '被浏览量';
 $lang->doc->docCollects   = '被收藏量';
+$lang->doc->todayUpdated  = '今天更新';
+$lang->doc->daysUpdated   = '%s天前更新';
+$lang->doc->monthsUpdated = '%s月前更新';
+$lang->doc->yearsUpdated  = '%s年前更新';

 /* 方法列表。*/
 $lang->doc->index            = '仪表盘';