From ae1b3d1a1a2c2e093f914cfaaa5bbdc9fa04a8ab Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 25 Jul 2023 18:06:44 +0800
Subject: [PATCH] * Show multi-level steps in testcase::view, and modify style.

---
 module/testcase/css/view.ui.css  |  7 +++++--
 module/testcase/model.php        |  1 +
 module/testcase/ui/view.html.php | 29 +++++++----------------------
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/module/testcase/css/view.ui.css b/module/testcase/css/view.ui.css
index 4332e4789a..068c3ccbb2 100644
--- a/module/testcase/css/view.ui.css
+++ b/module/testcase/css/view.ui.css
@@ -1,3 +1,6 @@
-#steps .step-id {text-align: center; color: var(--color-slate-600);}
-#steps span.input-group {color: var(--color-slate-600);}
+#steps th {font-size:13px; color: var(--color-slate-700); padding: 8px; width: 50%;}
+#steps th.steps {padding-left: 32px;}
+#steps .step-id {font-size:13px; color: var(--color-slate-500);}
+#steps thead, #steps .step-item .disabled-color {background-color: rgba(var(--color-gray-100-rgb), 0.7);}
+#steps {font-size:13px; color: var(--color-slate-800);}
 .linkCaseTitles, .linkBugTitles {overflow: hidden; white-space: nowrap;}
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 5a53d36735..83881895d2 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -506,6 +506,7 @@ class testcaseModel extends model
             $data->desc   = $step->desc;
             $data->expect = $step->expect;
             $data->type   = $step->type;
+            $data->grade  = $grade;
 
             $case->steps[] = $data;
 
diff --git a/module/testcase/ui/view.html.php b/module/testcase/ui/view.html.php
index 2a007f5c77..ed70b3bca1 100644
--- a/module/testcase/ui/view.html.php
+++ b/module/testcase/ui/view.html.php
@@ -22,33 +22,23 @@ foreach($case->steps as $step)
         $childID = 0;
     }
     $stepClass  = $step->type == 'step' ? 'step-group' : "step-{$step->type}";
-    $stepItemID = $step->type == 'item' ? span(setClass('input-group pr-1'), "{$stepID}.{$childID}") : '';
 
     $steps[] = h::tr
     (
         setClass("step {$stepClass}"),
         h::td
         (
-            setClass('step-id text-center'),
+            setClass('text-left'),
             span
             (
-                setClass($step->type == 'item' ? 'hidden' : ''),
-                $stepID,
+                setClass('step-id pr-2 pl-' . (($step->grade- 1) * 2)),
+                $step->name,
             ),
+            nl2br(str_replace(' ', '&nbsp;', $step->desc)),
         ),
         h::td
         (
-            setClass('text-left'),
-            div
-            (
-                setClass('input-group'),
-                $stepItemID,
-                nl2br(str_replace(' ', '&nbsp;', $step->desc)),
-            ),
-        ),
-        h::td
-        (
-            setClass('text-left'),
+            setClass('text-left' . ($step->type == 'item' ? ' disabled-color' :'')),
             nl2br(str_replace(' ', '&nbsp;', $step->expect)),
         ),
     );
@@ -335,21 +325,16 @@ detailBody
             set::title($lang->testcase->steps),
             h::table
             (
-                setClass('table condensed bordered'),
+                setClass('table bordered'),
                 set::id('steps'),
                 h::thead
                 (
                     h::tr
                     (
-                        h::th
-                        (
-                            $lang->testcase->stepID,
-                            set::width('60px'),
-                        ),
                         h::th
                         (
                             $lang->testcase->stepDesc,
-                            setClass('text-left'),
+                            setClass('text-left steps'),
                         ),
                         h::th
                         (