From c3fce40f30a9f0de4d76537640622b0ddcf2c819 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Fri, 13 Sep 2024 15:46:01 +0800
Subject: [PATCH] * [bug#55196,done,1.5h] Change the form configuration item to
 'picker'.

---
 module/testtask/config/table.php     |  9 +++++----
 module/testtask/js/linkcase.ui.js    | 23 +++++++++++------------
 module/testtask/ui/linkcase.html.php |  1 +
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/module/testtask/config/table.php b/module/testtask/config/table.php
index d7aaccfc8e..05caaa06c3 100644
--- a/module/testtask/config/table.php
+++ b/module/testtask/config/table.php
@@ -102,10 +102,11 @@ $config->testtask->linkcase->dtable->fieldList['pri']    = $config->testcase->dt
 $config->testtask->linkcase->dtable->fieldList['type']   = $config->testcase->dtable->fieldList['type'];
 $config->testtask->linkcase->dtable->fieldList['status'] = $config->testcase->dtable->fieldList['status'];
 
-$config->testtask->linkcase->dtable->fieldList['version']['name']  = 'version';
-$config->testtask->linkcase->dtable->fieldList['version']['title'] = $lang->testcase->version;
-$config->testtask->linkcase->dtable->fieldList['version']['type']  = 'text';
-$config->testtask->linkcase->dtable->fieldList['version']['group'] = 'version';
+$config->testtask->linkcase->dtable->fieldList['version']['name']    = 'version';
+$config->testtask->linkcase->dtable->fieldList['version']['title']   = $lang->testcase->version;
+$config->testtask->linkcase->dtable->fieldList['version']['type']    = 'control';
+$config->testtask->linkcase->dtable->fieldList['version']['control'] = 'picker';
+$config->testtask->linkcase->dtable->fieldList['version']['group']   = 'version';
 
 $config->testtask->linkcase->dtable->fieldList['openedBy']      = $config->testcase->dtable->fieldList['openedBy'];
 $config->testtask->linkcase->dtable->fieldList['lastRunner']    = $config->testcase->dtable->fieldList['lastRunner'];
diff --git a/module/testtask/js/linkcase.ui.js b/module/testtask/js/linkcase.ui.js
index 6922b708c1..b3c620a2ff 100644
--- a/module/testtask/js/linkcase.ui.js
+++ b/module/testtask/js/linkcase.ui.js
@@ -4,12 +4,15 @@ $(document).off('click', '.batch-btn').on('click', '.batch-btn', function()
     const checkedList = dtable.$.getChecks();
     if(!checkedList.length) return;
 
-    const url  = $(this).data('url');
-    const form = new FormData();
+    const formData = dtable.$.getFormData();
+    const url      = $(this).data('url');
+    const form     = new FormData();
     checkedList.forEach((id) =>
     {
-        form.append('case[]', id);
-        form.append('version[]', $('#version' + id).val());
+        form.append('case[' + id + ']', id);
+
+        let key = 'version[' + id + ']';
+        form.append(key, formData[key]);
     });
 
     if($(this).hasClass('ajax-btn'))
@@ -47,14 +50,10 @@ window.renderCell = function(result, info)
     }
     if(info.col.name == 'version' && result[0])
     {
-        const testcase = info.row.data;
-        let html = "<select name='version[" + testcase.id + "]' id='version" + testcase.id + "' class='form-control' style='width:60px'>";
-        for(i = testcase.version; i >= 1; i --)
-        {
-            html += "<option value='" + i + "'>#" + i + "</option>";
-        }
-        html += "</select>";
-        result[0] = {html};
+        result[0].children.props.required = true;
+        let versions = [];
+        for(i = 1; i <= info.row.data.version; i++) versions.push({'text': '#' + i, 'value': i});
+        result[0].children.props.items = versions;
     }
     if(info.col.name == 'lastRunDate' && result[0] && result[0].substring(0, 4) == '0000') result.shift();
     return result;
diff --git a/module/testtask/ui/linkcase.html.php b/module/testtask/ui/linkcase.html.php
index 2722b1aa25..07aad47e7b 100644
--- a/module/testtask/ui/linkcase.html.php
+++ b/module/testtask/ui/linkcase.html.php
@@ -95,6 +95,7 @@ dtable
     set::data(array_values($cases)),
     set::cols($config->testtask->linkcase->dtable->fieldList),
     set::fixedLeftWidth('33%'),
+    set::plugins(array('form')),
     set::checkable(true),
     set::footToolbar($footToolbar),
     set::onRenderCell(jsRaw('window.renderCell')),