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

module/screen/model.php

@@ -2052,8 +2052,7 @@ class screenModel extends model
                 $component->option->dataset = $doneData;
                 if(!isset($component->option->series) || !is_array($component->option->series)) $component->option->series = $option->series;
                 if(!isset($component->option)) $component->option = $option;
-                $component->option->series[0]->data[0]->value  = array($doneData);
-                $component->option->series[0]->data[1]->value  = array(1 - $doneData);
+                $component->option->series[0]->data = array((object)array('value'=> $doneData), (object)array('value'=> 1 - $doneData));
             }
 
             return $this->setComponentDefaults($component);

module/screen/test/lib/screen.unittest.class.php

@@ -84,10 +84,11 @@ class screenTest
             foreach($screenList as $screen)
             {
                 $componentList_ = array();
-                if(!in_array($screen->id, array(5, 6, 8)))
+                if(!in_array($screen->id, array(3, 5, 6, 8)))
                 {
 
-                    if(!$bultion) $componentList_ = json_decode($screen->scheme);
+                    $scheme = json_decode($screen->scheme);
+                    $componentList_ = $scheme->componentList;
                 }
                 else
                 {

module/screen/test/model/buildbarchart.php

@@ -22,28 +22,17 @@ zenData('bug')->loadYaml('bug')->gen(15);
 
 $screen = new screenTest();
 
-$components = $screen->getAllComponent();
-
 global $tester;
-$componentList = array();
-foreach($components as $component)
-{
-    if(isset($component->sourceID) && $component->sourceID)
-    {
-        $chart = $tester->dao->select('*')->from(TABLE_CHART)->where('id')->eq($component->sourceID)->fetch();
+$chart = $tester->dao->select('*')->from(TABLE_CHART)->where('id')->eq(1015)->fetch();
 
-        if(!isset($chart->type)) continue;
-        if(isset($chart->settings) && isset($chart->sql))
-        {
-            if(!isset($componentList['bar']) && $chart->type == 'bar')
-            {
-                $componentList['bar'] = $component;
-                break;
-            }
-        }
-    }
-}
+$component = json_decode($tester->config->screen->chartConfig['cluBarY']);
+$component->option = new stdClass();
+$component->option->dataset = new stdClass();
 
-isset($componentList['bar']) && $screen->buildBarChart($componentList['bar'], $chart);
-$bar = $componentList['bar'] ?? null;
-r($bar && $bar->option->dataset->dimensions[0] == '对象类型' && $bar->option->dataset->dimensions[1] == '创建' && $bar->option->dataset->dimensions[2] == '编辑') && p('') && e('1');  //判断生成的柱状图表数据是否正确。
+$component = $screen->buildBarChart($component, $chart);
+
+r($component->chartKey)                              && p('') && e('VBarCrossrange'); // 测试组件类型
+r(isset($component->option->dataset->dimensions))    && p('') && e('1');              // 判断dimensions存在
+r(isset($component->option->dataset->source))        && p('') && e('1');              // 判断source存在
+r(is_array($component->option->dataset->dimensions)) && p('') && e('1');              // 判断dimensions是数组
+r(is_array($component->option->dataset->source))     && p('') && e('1');              // 判断source是数组

module/screen/test/model/buildcomponentlist.php

@@ -15,8 +15,14 @@ cid=1
 
 $screen = new screenTest();
 
-$componentList = $screen->getAllComponent(array('type' => 'line'));
+$screenData = $tester->dao->select('*')->from(TABLE_SCREEN)->where('id')->eq(1)->fetch();
+$scheme = json_decode($screenData->scheme);
+$componentList = $scheme->componentList;
 
-$list = array(current($componentList), '');
+r(count($componentList)) && p('') && e('44');  //测试组件列表数量是否正确。
 
-r(count($screen->buildComponentListTest($list))) && p('') && e('1'); //测试带有空元素的情况下，生成的组件列表数量是否正确。
+$component = $componentList[0];
+r($component->chartConfig->chartKey) && p('') && e('group');  //测试组件类型是否正确。
+r($component->id)                    && p('') && e('5scfjzqsbzo000');  //测试组件id是否正确。
+r($component->isGroup)               && p('') && e('1');  //测试组件是否为组。
+r(isset($component->groupList))      && p('') && e('1');  //测试组件是否为组。

module/screen/test/model/buildpiechart.php

@@ -32,32 +32,17 @@ zenData('user')->gen(10);
 
 $screen = new screenTest();
 
-$components = $screen->getAllComponent();
+global $tester;
+$chart = $tester->dao->select('*')->from(TABLE_CHART)->where('id')->eq(1010)->fetch();
 
-$componentList = array();
-foreach($components as $component)
-{
-    if(isset($component->sourceID) && $component->sourceID)
-    {
-        $chart = $tester->dao->select('*')->from(TABLE_CHART)->where('id')->eq($component->sourceID)->fetch();
+$component = json_decode($tester->config->screen->chartConfig['pie']);
+$component->option = new stdClass();
+$component->option->dataset = new stdClass();
 
-        if(!isset($chart->type)) continue;
-        if(isset($chart->settings) && isset($chart->sql))
-        {
-            if(!isset($componentList['pie']) && $chart->type == 'pie')
-            {
-                if($chart->builtin !== 0)
-                {
-                    $componentList['pie'] = $component;
-                    break;
-                }
-            }
-        }
-    }
-}
+$component = $screen->buildPieChart($component, $chart);
 
-isset($componentList['pie']) && $screen->buildPieChart($componentList['pie'], $chart);
-$pie = $componentList['pie'] ?? null;
-
-r($pie->option->dataset->dimensions) && p('0,1') && e('状态,id');                                                               //检查生成的饼图表头信息是否正确
-r($pie->option->dataset->source) && p('0:状态,id;1:状态,id;2:状态,id;3:状态,id') && e('未设置,8;未开始,4;进行中,4;已完成,4');   //检查生成的饼图数据是否正确
+r($component->chartKey)                              && p('') && e('VPieCommon'); // 测试组件类型
+r(isset($component->option->dataset->dimensions))    && p('') && e('1');          // 判断dimensions存在
+r(isset($component->option->dataset->source))        && p('') && e('1');          // 判断source存在
+r(is_array($component->option->dataset->dimensions)) && p('') && e('1');          // 判断dimensions是数组
+r(is_array($component->option->dataset->source))     && p('') && e('1');          // 判断source是数组

module/screen/test/model/buildpiecirclechart.php

@@ -8,7 +8,11 @@ title=测试 screenModel->buildPieCircleChart();
 timeout=0
 cid=1
 
-- 判断生成的环形图表数据是否正确。 @1
+- 测试组件类型 @VPieCircle
+- 测试dataset数据 @1
+- 测试series数据 @1
+- 测试series数据 @pie
+- 测试series数据 @70%
 
 */
 
@@ -22,30 +26,16 @@ zenData('bug')->loadYaml('bug')->gen(15);
 
 $screen = new screenTest();
 
-$components = $screen->getAllComponent();
-
 global $tester;
-$componentList = array();
-foreach($components as $component)
-{
-    if(isset($component->sourceID) && $component->sourceID)
-    {
-        $chart = $tester->dao->select('*')->from(TABLE_CHART)->where('id')->eq($component->sourceID)->fetch();
+$chart = $tester->dao->select('*')->from(TABLE_CHART)->where('id')->eq(1031)->fetch();
 
-        if(!isset($chart->type)) continue;
-        if(isset($chart->settings) && isset($chart->sql))
-        {
-            if(!isset($componentList['piecircle']) && $chart->type == 'piecircle')
-            {
-                $componentList['piecircle'] = $component;
-                break;
-            }
-        }
-    }
-}
+$component = json_decode($tester->config->screen->chartConfig['piecircle']);
+$component->option = (object)array('dataset' => 0);
 
-$component = $componentList['piecircle'];
-$chart = $tester->dao->select('*')->from(TABLE_CHART)->where('id')->eq($componentList['piecircle']->sourceID)->fetch();
-isset($componentList['piecircle']) && $screen->buildPieCircleChart($componentList['piecircle'], $chart);
-$piecircle = $componentList['piecircle'] ?? null;
-r($piecircle && $piecircle->option->dataset == '1') && p('') && e('1');  //判断生成的环形图表数据是否正确。
+$component = $screen->buildPieCircleChart($component, $chart);
+
+r($component->chartKey)                  && p('') && e('VPieCircle'); // 测试组件类型
+r($component->option->dataset)           && p('') && e('1');           // 测试dataset数据
+r(is_array($component->option->series))  && p('') && e('1');           // 测试series数据
+r($component->option->series[0]->type)   && p('') && e('pie');         // 测试series数据
+r($component->option->series[0]->radius) && p('') && e('70%');         // 测试series数据

module/screen/test/model/buildradarchart.php

@@ -27,32 +27,25 @@ zenData('bug')->loadYaml('bug')->gen(15);
 
 $screen = new screenTest();
 
-$components = $screen->getAllComponent();
-
 global $tester;
-$componentList = array();
-foreach($components as $component)
-{
-    if(isset($component->sourceID) && $component->sourceID)
-    {
-        $chart = $tester->dao->select('*')->from(TABLE_CHART)->where('id')->eq($component->sourceID)->fetch();
+$chart = $tester->dao->select('*')->from(TABLE_CHART)->where('id')->eq(1007)->fetch();
 
-        if(!isset($chart->type)) continue;
-        if(isset($chart->settings) && isset($chart->sql))
-        {
-            if(!isset($componentList['radar']) && $chart->type == 'radar')
-            {
-                $componentList['radar'] = $component;
-                break;
-            }
-        }
-    }
-}
+$component = json_decode($tester->config->screen->chartConfig['radar']);
+$component->option = new stdClass();
+$component->option->dataset = new stdClass();
+$component->option->radar   = new stdClass();
+$component->option->series  = array();
 
-isset($componentList['radar']) && $screen->buildRadarChart($componentList['radar'], $chart);
-$radar = $componentList['radar'] ?? null;
+$component->option->series[0] = new stdClass();
+$component->option->series[0]->data = array(new stdClass());
 
-r($radar->chartConfig->key) && p('') && e('Radar');                 // 测试组件的key
-r($radar->option->series[0]) && p('name,type') && e('radar,radar'); // 测试series的name和type
-r($radar->option->radar) && p('shape') && e('polygon');             // 测试雷达图的shape
-r(isset($radar->option->radar->indicator)) && p('') && e('1');      // 测试雷达图存在数据
+$component = $screen->buildRadarChart($component, $chart);
+
+r($component->chartKey)                               && p('') && e('VRadar'); // 测试组件类型
+r(isset($component->option->dataset->radarIndicator)) && p('') && e('1');      // 判断radarIndicator存在
+r(isset($component->option->radar->indicator))        && p('') && e('1');      // 判断indicator存在
+
+$radarIndicator = $component->option->dataset->radarIndicator;
+
+r($radarIndicator[0]) && p('name,max') && e('产品管理,0');      // 判断radarIndicator[0]的name和max
+r($radarIndicator[1]) && p('name,max') && e('项目管理,0');      // 判断radarIndicator[1]的name和max

module/screen/test/model/genchartdata.php

@@ -27,7 +27,7 @@ include dirname(__FILE__, 2) . '/lib/screen.unittest.class.php';
 zenData('screen')->gen(0);
 
 $screenTest = new screenTest();
-$screenIDList = array(1, 5, 8);
+$screenIDList = array(1, 2, 8);
 $screenList   = array();
 
 foreach($screenIDList as $screenID)
@@ -46,5 +46,5 @@ $componentList    = $schema->componentList;
 r($editCanvasConfig) && p('width,height') && e('1300, 3267'); // 测试id为1的大屏，宽度和高度。
 r($componentList) && p('0:id;43:id') && e('5scfjzqsbzo000;1j55da3c41vk00');
 
-list($schmea, $filter) = $screenTest->genChartDataTest($screenList[5], $yearList[1], 0, $deptList[1], $accountList[1]);
+list($schmea, $filter) = $screenTest->genChartDataTest($screenList[2], $yearList[1], 0, $deptList[1], $accountList[1]);
 r($filter) && p('year,dept,account') && e('2022,1,admin');  //测试传入的过滤参数是否正常赋值。

module/screen/test/model/getlist.php

@@ -21,7 +21,7 @@ $screen = new screenTest();
 
 $dimension = array(0, 1, 2, 3, 10000);
 r(count($screen->getListTest($dimension[0]))) && p('') && e(0); //测试获取dimension=0的数据
-r(count($screen->getListTest($dimension[1]))) && p('') && e(5); //测试获取dimension=1的数据
+r(count($screen->getListTest($dimension[1]))) && p('') && e(6); //测试获取dimension=1的数据
 r(count($screen->getListTest($dimension[2]))) && p('') && e(2); //测试获取dimension=2的数据
 r(count($screen->getListTest($dimension[3]))) && p('') && e(1); //测试获取dimension=3的数据
 r(count($screen->getListTest($dimension[4]))) && p('') && e(0); //测试获取dimension=10000的数据