Merge branch release/21.7.3 of zentao/zentaopms (#10105)

module/block/js/dashboard.ui.js

@@ -1,6 +1,7 @@
 $(function()
 {
     if($('#expiredModal').length) zui.Modal.open({id: 'expiredModal'});
+    if($('#metriclibModal').length) zui.Modal.open({id: 'metriclibModal'});
     if($('#annualModal').length)  zui.Modal.open({id: 'annualModal'});
     if($('#upgradeModal').length)  zui.Modal.open({id: 'upgradeModal'});
 });

module/block/ui/dashboard.html.php

@@ -50,6 +50,13 @@ $remind ? modal
     html($remind)
 ) : null;
 
+$metriclibRemind = $this->misc->getMetriclibRemind();
+$metriclibRemind ? modal
+(
+    setID('metriclibModal'),
+    html($metriclibRemind)
+) : null;
+
 $upgradeRemind = $this->misc->getUpgradeRemind();
 if($upgradeRemind)
 {

module/misc/lang/en.php

@@ -78,6 +78,7 @@ $lang->misc->expiredCountTips    = 'There are <span class="expired-tips text-blu
 $lang->misc->expiredPluginTips   = 'Expired plugins are: %s. ';
 $lang->misc->expiringPluginTips  = 'The plug-ins that will expire are: %s.';
 $lang->misc->expiredTipsForAdmin = 'There are %s plug-ins in the current system that will expire soon. To avoid affecting the regular use of the function, please renew or uninstall them in the system background plug-in management as soon as possible.';
+$lang->misc->metriclibTips       = 'Added a new metric library indexing function, which can significantly improve the query speed of related metrics after updating the index. You can update it on the "Admin->System->Metric Library" page.';
 
 $lang->misc->noticeRepair = "<h5>If you are not Administrator, contact your ZenTao Administrator to repair tables.</h5>
     <h5>If you are the Administrator, login your ZenTao host and create a file named <span>%s</span>.</h5>

module/misc/lang/zh-cn.php

@@ -78,6 +78,7 @@ $lang->misc->expiredCountTips    = '系统中有<span class="expired-tips text-b
 $lang->misc->expiredPluginTips   = '已到期的插件为：%s。';
 $lang->misc->expiringPluginTips  = '即将到期的插件为：%s。';
 $lang->misc->expiredTipsForAdmin = '当前系统中有%s个插件即将到期，为避免影响功能的正常使用，请尽快到系统后台插件管理中进行续费或卸载处理。';
+$lang->misc->metriclibTips       = '新增更新度量库索引功能，更新索引后可大幅度提升相关度量项的查询速度，可以到『后台->系统设置->度量库』页面更新。';
 
 $lang->misc->noticeRepair = "<h5>普通用户请联系管理员进行修复</h5>
     <h5>管理员请登录禅道所在的服务器，创建<span>%s</span>文件。</h5>

module/misc/model.php

@@ -84,6 +84,28 @@ class miscModel extends model
         return $remind;
     }
 
+    /**
+     * 获取更新度量库表索引的通知。
+     * Get the notification information about updating metriclib table index.
+     *
+     * @access public
+     * @return string
+     */
+    public function getMetriclibRemind(): string
+    {
+        if(!$this->app->user->admin) return '';
+        if($this->config->edition == 'open') return '';
+
+        $remind = '';
+        if(empty($this->config->global->metriclibShowed))
+        {
+            $remind .= '<p>' . $this->lang->misc->metriclibTips . '</p>';
+            $remind .= "<p class='text-center mt-4'>" . html::a(helper::createLink('admin', 'metriclib'), $this->lang->misc->view, '', "id='metriclibButton' class='btn primary wide' data-app='admin'") . '</p>';
+            $this->loadModel('setting')->setItem("{$this->app->user->account}.common.global.metriclibShowed", 1);
+        }
+        return $remind;
+    }
+
     /**
      * 检查一键安装包的安全性。
      * Check one click package.