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

* Update from master branch.

Browse Source
This commit is contained in:
qixinzhi
2024-01-22 15:09:20 +08:00
parent aa5e5ac37f
commit bc8ac9a598
3 changed files with 105 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/metric/control.php
+11 -1
View File
@@ -271,6 +271,15 @@ class metric extends control
return $this->send($optionList);
}
/**
* 获取度量项的侧边栏。
* Get side tree widget by ajax.
*
* @param string $scope
* @param string $checkedList
* @access public
* @return string
*/
public function ajaxGetMetricSideTree($scope, $checkedList)
{
$checkedList = explode(',', $checkedList);
@@ -351,7 +360,8 @@ class metric extends control
* 获取数据表格的数据。
* Get data of datatable.
*
* @param int $metricID
* @param int $metricID
* @param string $chartType
* @access public
* @return string
*/
module/metric/dataset.php
+15 -2
View File
@@ -16,9 +16,10 @@ class dataset
* @access public
* @return void
*/
public function __construct($dao)
public function __construct($dao, $config)
{
$this->dao = $dao;
$this->config = $config;
}
/**
@@ -109,9 +110,11 @@ class dataset
*/
public function getReleases($fieldList)
{
$dbType = $this->config->metricDB->type;
return $this->dao->select($fieldList)
->from(TABLE_RELEASE)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on("(',' || t2.id || ',') LIKE ('%' || t1.project || '%')")
->beginIF($dbType == 'mysql')->leftJoin(TABLE_PROJECT)->alias('t2')->on("CONCAT(',', t2.id, ',') LIKE CONCAT('%', t1.project, '%')")->fi()
->beginIF($dbType == 'sqlite')->leftJoin(TABLE_PROJECT)->alias('t2')->on("(',' || t2.id || ',') LIKE ('%' || t1.project || '%')")->fi()
->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t1.product=t3.id')
->where('t1.deleted')->eq(0)
->andWhere('t3.deleted')->eq(0)
@@ -179,6 +182,16 @@ class dataset
->query();
}
public function getBugsWithShadowProduct($fieldList)
{
return $this->dao->select($fieldList)
->from(TABLE_BUG)->alias('t1')
->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
->where('t1.deleted')->eq(0)
->andWhere('t2.deleted')->eq(0)
->query();
}
/**
* 获取项目bug数据。
* Get project bug list.
module/metric/model.php
+79 -6
View File
@@ -20,9 +20,9 @@ class metricModel extends model
* 获取度量数据表的表头。
* Get header of result table in view.
*
* @param array $result
* @param object $metric
* @access public
* @return array|false
* @return array
*/
public function getViewTableHeader($metric)
{
@@ -134,6 +134,16 @@ class metricModel extends model
return array($header, $data);
}
/**
* 构建有时间属性的度量项的表格数据。
* Build table data for metric with time.
*
* @param array $data
* @param string $dateType
* @param bool $withCalcTime
* @access public
* @return array
*/
public function getTimeTable($data, $dateType = 'day', $withCalcTime = true)
{
$dateField = 'dateString';
@@ -186,6 +196,16 @@ class metricModel extends model
return array($groupHeader, $groupData);
}
/**
* 构建有对象属性的度量项的表格数据。
* Build table data for metric with object.
*
* @param array $data
* @param string $dateType
* @param bool $withCalcTime
* @access public
* @return array
*/
public function getObjectTable($header, $data, $dateType = 'day', $withCalcTime = true)
{
$groupHeader = array();
@@ -261,8 +281,10 @@ class metricModel extends model
}
/**
* 获取所有范围的键值对。
* Get scope pairs.
*
* @param bool $all
* @access public
* @return array
*/
@@ -334,6 +356,14 @@ class metricModel extends model
return $metrics;
}
/**
* 以对象为维度分组度量项。
* Group metrics by object.
*
* @param array $metrics
* @access public
* @return array
*/
public function groupMetricByObject($metrics)
{
$groupMetrics = array_fill_keys(array_keys($this->lang->metric->objectList), array());
@@ -366,6 +396,14 @@ class metricModel extends model
return $groupMetrics;
}
/**
* 根据id列表获取度量项列表。
* Get metrics by id list.
*
* @param array $metricIDList
* @access public
* @return array|false
*/
public function getMetricsByIDList($metricIDList)
{
return $this->metricTao->fetchMetricsByIDList($metricIDList);
@@ -384,11 +422,28 @@ class metricModel extends model
return $this->dao->select('*')->from(TABLE_BASICMEAS)->where('deleted')->eq(0)->orderby($orderBy)->fetchAll('id');
}
/**
* 通过筛选器筛选度量项。
* Get metric list by filters.
*
* @param array $filters
* @param string $stage
* @access public
* @return array|false
*/
public function getListByFilter($filters, $stage)
{
return $this->metricTao->fetchMetricsWithFilter($filters, $stage);
}
/**
* 通过我的收藏筛选度量项。
* Get metric list by collect.
*
* @param string $stage
* @access public
* @return array|false
*/
public function getListByCollect($stage)
{
return $this->metricTao->fetchMetricsByCollect($stage);
@@ -449,7 +504,7 @@ class metricModel extends model
$metric->collectConf = $oldMetric->collectConf;
$metric->execTime = $oldMetric->execTime;
}
if(empty($metric->dateType)) $metric->dateType = $this->getDateTypeByCode($metric->code);
if(empty($metric->dateType) and isset($metric->code)) $metric->dateType = $this->getDateTypeByCode($metric->code);
return $metric;
}
@@ -526,7 +581,7 @@ class metricModel extends model
{
include_once $this->getDatasetPath();
$dataset = new dataset($dao);
$dataset = new dataset($dao, $this->config);
$dataSource = $calculator->dataset;
$fieldList = implode(',', $calculator->fieldList);
@@ -867,7 +922,7 @@ class metricModel extends model
{
$datasetPath = $this->getDatasetPath();
include_once $datasetPath;
return new dataset($dao);
return new dataset($dao, $this->config);
}
/**
@@ -1108,6 +1163,14 @@ class metricModel extends model
return $row;
}
/**
* 检查度量项的计算文件是否存在。
* Check if metric's calculator exists.
*
* @param object $metric
* @access public
* @return bool
*/
public function checkCalcExists($metric)
{
$calcName = $this->getCalcRoot() . $metric->scope . DS . $metric->purpose . DS . $metric->code . '.php';
@@ -1263,7 +1326,7 @@ class metricModel extends model
*/
public function isOldMetric($metric)
{
return $metric->type == 'sql';
return isset($metric->type) && $metric->type == 'sql';
}
/**
@@ -1751,6 +1814,16 @@ class metricModel extends model
return $options;
}
/**
* 生成数据缩放的配置。
* Generate data zoom config.
*
* @param int $dataLength
* @param int $initZoom
* @param stirng $axis
* @access public
* @return array
*/
public function genDataZoom(int $dataLength, int $initZoom = 10, string $axis = 'x')
{
$percent = $initZoom / $dataLength * 100;