From 1f047beec4fb9cd619b9aa6e1f44f8e19804b8dd Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 20 Dec 2024 14:18:11 +0800
Subject: [PATCH] * [task#50825,done,1h] update version in batchEdit.

---
 module/testcase/control.php           | 2 +-
 module/testcase/model.php             | 2 +-
 module/testcase/ui/batchedit.html.php | 1 +
 module/testcase/zen.php               | 9 ++++++---
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index 99eac933b7..4d267db4ed 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -569,7 +569,7 @@ class testcase extends control
                 if(!isset($case->files))    $case->files    = zget($caseFiles, $caseID, array());
                 if(!isset($oldCase->files)) $oldCase->files = zget($caseFiles, $caseID, array());
                 if(!isset($oldCase->steps)) $oldCase->steps = zget($oldSteps, $caseID, array());
-                $changes = $this->testcase->update($case, $cases[$caseID], zget($testtasks, $caseID, array()));
+                $changes = $this->testcase->update($case, $oldCase, zget($testtasks, $caseID, array()));
                 $this->executeHooks($caseID);
 
                 if(empty($changes)) continue;
diff --git a/module/testcase/model.php b/module/testcase/model.php
index e51d46f53d..e4dc4cd1bc 100755
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -628,7 +628,7 @@ class testcaseModel extends model
 
         $this->testcaseTao->updateCase2Project($oldCase, $case);
 
-        if(!empty($case->stepChanged)) $this->testcaseTao->updateStep($case, $oldCase);
+        if($oldCase->version != $case->version || !empty($case->stepChanged)) $this->testcaseTao->updateStep($case, $oldCase);
 
         if($oldCase->lib && empty($oldCase->product))
         {
diff --git a/module/testcase/ui/batchedit.html.php b/module/testcase/ui/batchedit.html.php
index dc94851559..ce5348e642 100644
--- a/module/testcase/ui/batchedit.html.php
+++ b/module/testcase/ui/batchedit.html.php
@@ -197,6 +197,7 @@ else
     formBatchPanel
     (
         set::title($lang->testcase->batchEdit),
+        set::customFields(array('list' => $customFields, 'show' => explode(',', $showFields), 'key' => 'batchEditFields')),
         on::change('[data-name="branch"]', 'onBranchChangedForBatch'),
         on::change('[data-name="module"]', 'onModuleChangedForBatch'),
         set::mode('edit'),
diff --git a/module/testcase/zen.php b/module/testcase/zen.php
index 6926a31bd8..987baddb7e 100755
--- a/module/testcase/zen.php
+++ b/module/testcase/zen.php
@@ -1520,10 +1520,11 @@ class testcaseZen extends testcase
             $oldStep     = zget($oldSteps, $caseID, array());
             $stepChanged = $this->testcase->processStepsChanged($case, $oldStep);
             if($stepChanged && !$forceNotReview) $case->status = 'wait';
+
+            if($stepChanged) $versionChanged = true;
+            $case->version     = $versionChanged ? (int)$oldCase->version + 1 : (int)$oldCase->version;
+            $case->stepChanged = $stepChanged;
         }
-        if($stepChanged) $versionChanged = true;
-        $case->version     = $versionChanged ? (int)$oldCase->version + 1 : (int)$oldCase->version;
-        $case->stepChanged = $stepChanged;
         return $cases;
     }
 
@@ -2919,6 +2920,8 @@ class testcaseZen extends testcase
             $case->real = $firstStep['real'];
         }
 
+        if(!isset($case->stepDesc))   $case->stepDesc  = '';
+        if(!isset($case->stepExpect)) $case->stepExpect = '';
         if(isset($relatedSteps[$case->id]))
         {
             $preGrade      = 1;