From 85fd3c78fdf07a5b552121b062a480a6d4b56ff5 Mon Sep 17 00:00:00 2001
From: qixinzhi <qixinzhi@easycorp.ltd>
Date: Mon, 8 Apr 2024 01:22:36 +0000
Subject: [PATCH] * Fix realtime field list.

---
 module/metric/model.php | 9 +++++----
 module/metric/tao.php   | 2 +-
 module/metric/zen.php   | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/module/metric/model.php b/module/metric/model.php
index fe2c1e2ed0..2b0c75f3ed 100755
--- a/module/metric/model.php
+++ b/module/metric/model.php
@@ -79,9 +79,8 @@ class metricModel extends model
             }
             $row->value = is_numeric($record['value']) ? round((float)$record['value'], 2) : $record['value'];
 
-            $calcInfo = $this->getRecordCalcInfo($record['id']);
-            $row->calcType     = $calcInfo->calcType;
-            $row->calculatedBy = !empty($calcInfo->calculatedBy) ? $calcInfo->calculatedBy : 'system';
+            $row->calcType     = $record['calcType'];
+            $row->calculatedBy = $record['calculatedBy'];
 
             $tableData[] = $row;
         }
@@ -723,7 +722,9 @@ class metricModel extends model
         $time = helper::now();
         foreach($records as $index => $record)
         {
-            $records[$index]['calcTime'] = $time;
+            $records[$index]['date']         = $time;
+            $records[$index]['calcType']     = 'cron';
+            $records[$index]['calculatedBy'] = 'system';
         }
 
         return $records;
diff --git a/module/metric/tao.php b/module/metric/tao.php
index ab0cb7d756..69f4132ba0 100644
--- a/module/metric/tao.php
+++ b/module/metric/tao.php
@@ -292,7 +292,7 @@ class metricTao extends metricModel
         $scopeKey    = $metric->scope;
         $objectList  = $this->getObjectsWithPager($code, $scopeKey, $pager, $scopeValue);
 
-        $fieldList = array_merge($fieldList, array('id', 'value', 'date'));
+        $fieldList = array_merge($fieldList, array('id', 'value', 'date', 'calcType', 'calculatedBy'));
         $wrapFields = array_map(fn($value) => "`$value`", $fieldList);
         $dataFieldStr = implode(',', $wrapFields);
 
diff --git a/module/metric/zen.php b/module/metric/zen.php
index 7d4decf357..718dc6b579 100644
--- a/module/metric/zen.php
+++ b/module/metric/zen.php
@@ -587,13 +587,14 @@ class metricZen extends metric
      */
     protected function prepareActionPriv(array $metrics): array
     {
+        $this->loadModel('screen');
         foreach($metrics as $metric)
         {
             $metric->canEdit        = $metric->stage == 'wait';
             $metric->canImplement   = ($metric->stage == 'wait' && !$this->metric->isOldMetric($metric) && $metric->builtin === '0');
             $metric->canDelist      = $metric->stage == 'released' && $metric->builtin === '0';
             $metric->canRecalculate = $metric->stage == 'released' && !empty($metric->dateType) && $metric->dateType != 'nodate';
-            $metric->isUsed         = $this->loadModel('screen')->checkIFChartInUse($metric->id, 'metric');
+            $metric->isUsed         = $this->screen->checkIFChartInUse($metric->id, 'metric');
         }
         return $metrics;
     }