From 5e08a72f61622b750eacfd217cea6aec63428794 Mon Sep 17 00:00:00 2001
From: sunguangming <sunguangming@chandao.com>
Date: Wed, 5 Mar 2025 07:52:17 +0000
Subject: [PATCH]  * [ticket#1835,doing,0.5h] modify id to taskid.

---
 module/execution/config/dtable.php    | 12 ++++++------
 module/execution/js/testtask.ui.js    | 11 +++++------
 module/execution/ui/testtask.html.php |  1 +
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/module/execution/config/dtable.php b/module/execution/config/dtable.php
index d34f8ead24..ce16a0f20d 100644
--- a/module/execution/config/dtable.php
+++ b/module/execution/config/dtable.php
@@ -318,12 +318,12 @@ $config->execution->testtask->dtable->fieldList['product']['type']  = 'text';
 $config->execution->testtask->dtable->fieldList['product']['group'] = '1';
 $config->execution->testtask->dtable->fieldList['product']['fixed'] = 'left';
 
-$config->execution->testtask->dtable->fieldList['id']['name']     = 'id';
-$config->execution->testtask->dtable->fieldList['id']['title']    = $lang->idAB;
-$config->execution->testtask->dtable->fieldList['id']['type']     = 'checkID';
-$config->execution->testtask->dtable->fieldList['id']['checkbox'] = true;
-$config->execution->testtask->dtable->fieldList['id']['group']    = '2';
-$config->execution->testtask->dtable->fieldList['id']['fixed']    = 'left';
+$config->execution->testtask->dtable->fieldList['taskID']['name']     = 'taskID';
+$config->execution->testtask->dtable->fieldList['taskID']['title']    = $lang->idAB;
+$config->execution->testtask->dtable->fieldList['taskID']['type']     = 'checkID';
+$config->execution->testtask->dtable->fieldList['taskID']['checkbox'] = true;
+$config->execution->testtask->dtable->fieldList['taskID']['group']    = '2';
+$config->execution->testtask->dtable->fieldList['taskID']['fixed']    = 'left';
 
 $config->execution->testtask->dtable->fieldList['title']['name']     = 'name';
 $config->execution->testtask->dtable->fieldList['title']['title']    = $lang->testtask->name;
diff --git a/module/execution/js/testtask.ui.js b/module/execution/js/testtask.ui.js
index 37e8b27dd3..6cbd23d91b 100644
--- a/module/execution/js/testtask.ui.js
+++ b/module/execution/js/testtask.ui.js
@@ -110,7 +110,7 @@ window.onRenderCell = function(result, {row, col})
             result.push({outer: false, style: {alignItems: 'start', 'padding-top': '8px'}})
         }
     }
-    if(result && col.name == 'id' && row.data.hidden)
+    if(result && col.name == 'taskID' && row.data.hidden)
     {
         result.push({outer: false, style: {alignItems: 'center', justifyContent: 'start'}})
     }
@@ -132,7 +132,7 @@ window.getCellSpan = function(cell)
     {
         return {rowSpan: cell.row.data.rowspan};
     }
-    if(cell.col.name == 'id' && cell.row.data.colspan)
+    if(cell.col.name == 'taskID' && cell.row.data.colspan)
     {
         return {colSpan: cell.row.data.colspan};
     }
@@ -164,7 +164,7 @@ window.deformation = function(event)
             }
         });
         options.data = newData;
-        options.cols.forEach((col) => {if(col.name == 'id') col.checkbox = true});
+        options.cols.forEach((col) => {if(col.name == 'taskID') col.checkbox = true});
         $(event.target).closest('a').find('span').removeClass('is-collapsed').addClass('is-expanded');
         $('#taskTable').zui('dtable').render(options);
     }
@@ -178,13 +178,12 @@ window.deformation = function(event)
         {
             if(options.data[index] && options.data[index].product == product)
             {
-                options.data[index].id      = {html: '<span class="text-gray">' + allTasks + ' ' + '<strong>' + options.data[index].rowspan + '</strong></span>'};
+                options.data[index].taskID  = {html: '<span class="text-gray">' + allTasks + ' ' + '<strong>' + options.data[index].rowspan + '</strong></span>'};
                 options.data[index].rowspan = 1;
                 options.data[index].colspan = 10;
-                options.data[index].hidden  = 1;
             }
         });
-        options.cols.forEach((col) => {if(col.name == 'id') col.checkbox = false});
+        options.cols.forEach((col) => {if(col.name == 'taskID') col.checkbox = false});
         $(event.target).closest('a').find('span').removeClass('is-expanded').addClass('is-collapsed');
         $('#taskTable').zui('dtable').render();
     }
diff --git a/module/execution/ui/testtask.html.php b/module/execution/ui/testtask.html.php
index 9230998e92..063defd0fc 100644
--- a/module/execution/ui/testtask.html.php
+++ b/module/execution/ui/testtask.html.php
@@ -41,6 +41,7 @@ toolbar
     ) : null
 );
 
+foreach($tasks as $id => $task) $tasks[$id]->taskID = $task->id;
 $tasks = initTableData(array_values($tasks), $config->execution->testtask->dtable->fieldList, $this->testtask);
 
 $footToolbar = array();