From cbf4c7647a25c79cfc8d64320960a85de6bcafba Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 1 Nov 2023 14:40:17 +0800
Subject: [PATCH] * Add dtable sort to testcase::zerocase.

---
 module/testcase/config/table.php     |  1 +
 module/testcase/control.php          |  1 +
 module/testcase/ui/zerocase.html.php | 10 ++++++++++
 3 files changed, 12 insertions(+)

diff --git a/module/testcase/config/table.php b/module/testcase/config/table.php
index 49bc3afdfa..da8b58d0dd 100644
--- a/module/testcase/config/table.php
+++ b/module/testcase/config/table.php
@@ -228,6 +228,7 @@ $config->testcase->zerocase->dtable->fieldList['actions']['list']     = $config-
 $config->testcase->zerocase->dtable->fieldList['actions']['menu']     = array('change', 'review', 'close', 'edit', 'createcase');
 $config->testcase->zerocase->dtable->fieldList['actions']['required'] = true;
 $config->testcase->zerocase->dtable->fieldList['actions']['group']    = '7';
+$config->testcase->zerocase->dtable->fieldList['actions']['sortType'] = false;
 
 $config->testcase->importfromlib = new stdclass();
 $config->testcase->importfromlib->dtable = new stdclass();
diff --git a/module/testcase/control.php b/module/testcase/control.php
index f4bd64f3a6..c69ee571de 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -203,6 +203,7 @@ class testcase extends control
         /* 追加二次排序条件。*/
         /* Append id for second sort. */
         $sort = common::appendOrder(empty($orderBy) ? 'id_desc' : $orderBy);
+        if(strpos($sort, 'planTitle') !== false) $sort = str_replace('planTitle', 'plan', $sort);
 
         $this->lang->testcase->featureBar['zerocase'] = $this->lang->testcase->featureBar['browse'];
 
diff --git a/module/testcase/ui/zerocase.html.php b/module/testcase/ui/zerocase.html.php
index 88acd29138..41fadb7e87 100644
--- a/module/testcase/ui/zerocase.html.php
+++ b/module/testcase/ui/zerocase.html.php
@@ -62,11 +62,21 @@ menu
 
 $stories = initTableData($stories, $config->testcase->zerocase->dtable->fieldList, $this->story);
 
+foreach($config->testcase->zerocase->dtable->fieldList as $colName => $col)
+{
+    if(!isset($col['sortType'])) $config->testcase->zerocase->dtable->fieldList[$colName]['sortType'] = true;
+}
+
+$linkParams = '';
+foreach($app->rawParams as $key => $value) $linkParams = $key != 'orderBy' ? "{$linkParams}&{$key}={$value}" : "{$linkParams}&orderBy={name}_{sortType}";
+
 dtable
 (
     set::cols($config->testcase->zerocase->dtable->fieldList),
     set::data(array_values($stories)),
     set::userMap($users),
+    set::orderBy($orderBy),
+    set::sortLink(createLink($app->rawModule, $app->rawMethod, $linkParams)),
     set::footPager(usePager()),
     set::footToolbar($footToolbar),
     set::checkable($canBatchAction),