From 0ffa6823d39dbb7bf316a36dcdb4283cf5bd6def Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Mon, 4 Mar 2024 15:40:01 +0800
Subject: [PATCH] * Finish task #112811.

---
 module/metric/config/form.php    | 21 ++++++++++++---------
 module/metric/control.php        |  2 +-
 module/metric/lang/de.php        |  2 ++
 module/metric/lang/en.php        |  2 ++
 module/metric/lang/fr.php        |  2 ++
 module/metric/lang/zh-cn.php     |  2 ++
 module/metric/ui/create.html.php |  7 +++++++
 module/metric/ui/edit.html.php   |  8 ++++++++
 module/metric/zen.php            |  3 ++-
 9 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/module/metric/config/form.php b/module/metric/config/form.php
index 1d348c3976..4b0554df93 100755
--- a/module/metric/config/form.php
+++ b/module/metric/config/form.php
@@ -11,19 +11,22 @@ $config->metric->form->create['purpose']    = array('required' => true,  'type'
 $config->metric->form->create['scope']      = array('required' => true,  'type' => 'string');
 $config->metric->form->create['object']     = array('required' => true,  'type' => 'string');
 $config->metric->form->create['dateType']   = array('required' => true,  'type' => 'string');
+$config->metric->form->create['alias']      = array('required' => false,  'type' => 'string');
 $config->metric->form->create['desc']       = array('required' => false,  'type' => 'string', 'filter' => 'trim');
 $config->metric->form->create['definition'] = array('required' => false,  'type' => 'string', 'filter' => 'trim');
 
 $config->metric->form->edit = array();
-$config->metric->form->edit['name']       = array('required' => true,  'type' => 'string', 'filter' => 'trim');
-$config->metric->form->edit['code']       = array('required' => true,  'type' => 'string', 'filter' => 'trim');
-$config->metric->form->edit['status']     = array('required' => true,  'type' => 'string');
-$config->metric->form->edit['confirm']    = array('required' => true,  'type' => 'string');
-$config->metric->form->edit['purpose']    = array('required' => true,  'type' => 'string');
-$config->metric->form->edit['scope']      = array('required' => true,  'type' => 'string');
-$config->metric->form->edit['object']     = array('required' => true,  'type' => 'string');
-$config->metric->form->edit['desc']       = array('required' => false,  'type' => 'string', 'filter' => 'trim');
-$config->metric->form->edit['definition'] = array('required' => false,  'type' => 'string', 'filter' => 'trim');
+$config->metric->form->edit['name']       = array('required' => true, 'type' => 'string', 'filter' => 'trim');
+$config->metric->form->edit['code']       = array('required' => true, 'type' => 'string', 'filter' => 'trim');
+$config->metric->form->edit['status']     = array('required' => true, 'type' => 'string');
+$config->metric->form->edit['confirm']    = array('required' => true, 'type' => 'string');
+$config->metric->form->edit['purpose']    = array('required' => true, 'type' => 'string');
+$config->metric->form->edit['scope']      = array('required' => true, 'type' => 'string');
+$config->metric->form->edit['object']     = array('required' => true, 'type' => 'string');
+$config->metric->form->edit['dateType']   = array('required' => true, 'type' => 'string');
+$config->metric->form->edit['alias']      = array('required' => false, 'type' => 'string');
+$config->metric->form->edit['desc']       = array('required' => false, 'type' => 'string', 'filter' => 'trim');
+$config->metric->form->edit['definition'] = array('required' => false, 'type' => 'string', 'filter' => 'trim');
 
 $config->metric->form->change = array();
 $config->metric->form->change['name']       = array('required' => true,  'type' => 'string', 'filter' => 'trim');
diff --git a/module/metric/control.php b/module/metric/control.php
index 6c0459f15f..38ff6b80e4 100755
--- a/module/metric/control.php
+++ b/module/metric/control.php
@@ -152,7 +152,7 @@ class metric extends control
         $metric = $this->metric->getByID($metricID);
 
         $this->view->metric         = $metric;
-        $this->view->legendBasic    = $this->metricZen->getBasicInfo($this->view,'scope,object,purpose,dateType,name,code,unit,desc,definition');
+        $this->view->legendBasic    = $this->metricZen->getBasicInfo($this->view,'scope,object,purpose,dateType,name,alias,code,unit,desc,definition');
         $this->view->createEditInfo = $this->metricZen->getCreateEditInfo($this->view, 'createdBy,implementedBy,lastEdited');
 
         $this->display();
diff --git a/module/metric/lang/de.php b/module/metric/lang/de.php
index 0c585468eb..21874e0b2e 100755
--- a/module/metric/lang/de.php
+++ b/module/metric/lang/de.php
@@ -7,6 +7,7 @@ $lang->metric->object        = "Object";
 $lang->metric->purpose       = "Purpose";
 $lang->metric->dateType      = "Date Type";
 $lang->metric->unit          = "Unit";
+$lang->metric->alias         = "Abbreviation";
 $lang->metric->code          = "Metric Code";
 $lang->metric->desc          = "Description";
 $lang->metric->formula       = "Formula";
@@ -114,6 +115,7 @@ $lang->metric->viewType->multiple = 'Multiple view';
 
 $lang->metric->descTip            = 'Enter the meaning, purpose, and impact of the metric';
 $lang->metric->definitionTip      = 'Enter the calculation rules and filtering conditions of the metric';
+$lang->metric->aliasTip           = 'This metric will be displayed with its abbreviation on the metric library';
 $lang->metric->collectConfText    = "%s %s %s";
 $lang->metric->emptyCollect       = 'There are no collect metrics at this time.';
 $lang->metric->moveFailTip        = 'Move metric file failed';
diff --git a/module/metric/lang/en.php b/module/metric/lang/en.php
index 0c5f970b29..75675ce16a 100755
--- a/module/metric/lang/en.php
+++ b/module/metric/lang/en.php
@@ -7,6 +7,7 @@ $lang->metric->object        = "Object";
 $lang->metric->purpose       = "Purpose";
 $lang->metric->dateType      = "Date Type";
 $lang->metric->unit          = "Unit";
+$lang->metric->alias         = "Abbreviation";
 $lang->metric->code          = "Metric Code";
 $lang->metric->desc          = "Description";
 $lang->metric->formula       = "Formula";
@@ -114,6 +115,7 @@ $lang->metric->viewType->multiple = 'Multiple view';
 
 $lang->metric->descTip            = 'Enter the meaning, purpose, and impact of the metric';
 $lang->metric->definitionTip      = 'Enter the calculation rules and filtering conditions of the metric';
+$lang->metric->aliasTip           = 'This metric will be displayed with its abbreviation on the metric library';
 $lang->metric->collectConfText    = "%s %s %s";
 $lang->metric->emptyCollect       = 'There are no collect metrics at this time.';
 $lang->metric->moveFailTip        = 'Move metric file failed';
diff --git a/module/metric/lang/fr.php b/module/metric/lang/fr.php
index 0c585468eb..21874e0b2e 100755
--- a/module/metric/lang/fr.php
+++ b/module/metric/lang/fr.php
@@ -7,6 +7,7 @@ $lang->metric->object        = "Object";
 $lang->metric->purpose       = "Purpose";
 $lang->metric->dateType      = "Date Type";
 $lang->metric->unit          = "Unit";
+$lang->metric->alias         = "Abbreviation";
 $lang->metric->code          = "Metric Code";
 $lang->metric->desc          = "Description";
 $lang->metric->formula       = "Formula";
@@ -114,6 +115,7 @@ $lang->metric->viewType->multiple = 'Multiple view';
 
 $lang->metric->descTip            = 'Enter the meaning, purpose, and impact of the metric';
 $lang->metric->definitionTip      = 'Enter the calculation rules and filtering conditions of the metric';
+$lang->metric->aliasTip           = 'This metric will be displayed with its abbreviation on the metric library';
 $lang->metric->collectConfText    = "%s %s %s";
 $lang->metric->emptyCollect       = 'There are no collect metrics at this time.';
 $lang->metric->moveFailTip        = 'Move metric file failed';
diff --git a/module/metric/lang/zh-cn.php b/module/metric/lang/zh-cn.php
index a73fd2c344..a8b7d05656 100755
--- a/module/metric/lang/zh-cn.php
+++ b/module/metric/lang/zh-cn.php
@@ -7,6 +7,7 @@ $lang->metric->object        = "对象";
 $lang->metric->purpose       = "目的";
 $lang->metric->dateType      = "时间属性";
 $lang->metric->unit          = "单位";
+$lang->metric->alias         = "度量项简称";
 $lang->metric->code          = "代号";
 $lang->metric->desc          = "描述";
 $lang->metric->formula       = "计算规则";
@@ -114,6 +115,7 @@ $lang->metric->viewType->multiple = '组合查看';
 
 $lang->metric->descTip            = '请输入度量项含义、目的和作用等';
 $lang->metric->definitionTip      = '请输入度量项的计算规则及过滤条件等';
+$lang->metric->aliasTip           = '在度量库页面会用简称展示此度量项';
 $lang->metric->collectConfText    = "每%s的%s的%s";
 $lang->metric->emptyCollect       = '暂时没有收藏度量项。';
 $lang->metric->moveFailTip        = '移动度量项文件失败。';
diff --git a/module/metric/ui/create.html.php b/module/metric/ui/create.html.php
index 4ccabb51a7..3fb4a04cea 100644
--- a/module/metric/ui/create.html.php
+++ b/module/metric/ui/create.html.php
@@ -80,6 +80,13 @@ formPanel
         set::required(true)
     ),
     formGroup
+    (
+        set::label($lang->metric->alias),
+        set::name('alias'),
+        set::required(false),
+        set::placeholder($lang->metric->aliasTip)
+    ),
+    formGroup
     (
         set::label($lang->metric->code),
         set::name('code'),
diff --git a/module/metric/ui/edit.html.php b/module/metric/ui/edit.html.php
index 3ec7b29c81..a2ca7f21ea 100644
--- a/module/metric/ui/edit.html.php
+++ b/module/metric/ui/edit.html.php
@@ -98,6 +98,14 @@ formPanel
         set::required(true)
     ),
     formGroup
+    (
+        set::label($lang->metric->alias),
+        set::name('alias'),
+        set::value($metric->alias),
+        set::required(false),
+        set::placeholder($lang->metric->aliasTip)
+    ),
+    formGroup
     (
         set::label($lang->metric->code),
         set::name('code'),
diff --git a/module/metric/zen.php b/module/metric/zen.php
index 15da2d0d43..21a4c3948c 100644
--- a/module/metric/zen.php
+++ b/module/metric/zen.php
@@ -371,7 +371,7 @@ class metricZen extends metric
      * @access protected
      * @return array
      */
-    protected function getBasicInfo(object $view, string $fields = 'scope,object,purpose,dateType,code,unit,stage')
+    protected function getBasicInfo(object $view, string $fields = 'scope,object,purpose,dateType,name,alias,code,unit,stage')
     {
         extract((array)$view);
 
@@ -384,6 +384,7 @@ class metricZen extends metric
         if(strpos($fields, 'purpose') !== false)    $legendBasic['purpose']     = array('name' => $this->lang->metric->purpose, 'text' => zget($this->lang->metric->purposeList, $metric->purpose));
         if(strpos($fields, 'dateType') !== false)   $legendBasic['dateType']    = array('name' => $this->lang->metric->dateType, 'text' => zget($this->lang->metric->dateTypeList, $metric->dateType));
         if(strpos($fields, 'name') !== false)       $legendBasic['name']        = array('name' => $this->lang->metric->name, 'text' => $metric->name);
+        if(strpos($fields, 'alias') !== false)      $legendBasic['alias']       = array('name' => $this->lang->metric->alias, 'text' => $metric->alias);
         if(strpos($fields, 'code') !== false)       $legendBasic['code']        = array('name' => $this->lang->metric->code, 'text' => $metric->code);
         if(strpos($fields, 'unit') !== false)       $legendBasic['unit']        = array('name' => $this->lang->metric->unit, 'text' => $unit);
         if($isOldMetric)