Merge branch release/21.7.3 of zentao/zentaopms (#10343)

module/testcase/control.php

@@ -1558,8 +1558,7 @@ class testcase extends control
             /* Record the ID of the parent scene, so that the parent scene will be selected by default when creating a scene next time. */
             helper::setcookie('lastCaseScene', $scene->parent);
 
-            $useSession = $this->app->tab != 'qa' && $this->session->caseList && strpos($this->session->caseList, 'dynamic') === false;
-            $locate     = $useSession ? $this->session->caseList : inlink('browse', "productID={$scene->product}&branch={$scene->branch}&browseType=all&param={$scene->module}");
+            $locate = $this->session->caseList ?: inlink('browse', "productID={$scene->product}&branch={$scene->branch}&browseType=all&param={$scene->module}");
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate));
         }
 

module/testcase/js/browse.ui.js

@@ -153,7 +153,7 @@ window.onRenderCell = function(result, {row, col})
             {
                 result.shift(); // 移除带链接的场景名称
                 result.push({html: data.title}); // 添加不带链接的场景名称
-                if(data.grade == 1 && module) result.unshift({html: '<span class="label gray-pale rounded-full nowrap">' + module + '</span>'}); // 顶级场景添加模块标签
+                if(module) result.unshift({html: '<span class="label gray-pale rounded-full nowrap">' + module + '</span>'}); // 添加模块标签
                 result.unshift({html: '<span class="label gray-300-outline text-gray rounded-full nowrap">' + scene + '</span>'}); // 添加场景标签
                 if(data.hasCase == false) result.push({html: '<span class="text-gray">(' + noCase + ')</span>'}); // 添加暂无用例标签
             }

module/testcase/js/browsescene.ui.js

@@ -105,7 +105,6 @@ window.onRenderCell = function(result, {row, col})
         const data   = row.data;
         const module = this.options.customData.modules[data.module];
         if(module) result.unshift({ html: '<span class="label gray-pale rounded-full nowrap">' + module + '</span>' }); // 顶级场景添加模块标签
-        result.unshift({ html: '<span class="label gray-300-outline text-gray rounded-full nowrap">' + scene + '</span>' }); // 添加场景标签
     }
 
     if(row.data.lastEditedDate == '0000-00-00 00:00:00') row.data.lastEditedDate = '';
@@ -135,4 +134,4 @@ window.clickChangeOrder = function()
 $('#dragModal').on('click', '[data-dismiss=modal]', function()
 {
     loadCurrentPage({cache: false});
-});
+});

module/testcase/ui/browsescene.html.php

@@ -10,8 +10,6 @@ declare(strict_types=1);
  */
 namespace zin;
 
-jsVar('modules', $modulePairs);
-
 include 'header.html.php';
 
 $footToolbar          = null;
@@ -77,4 +75,4 @@ modal
         btn(setClass('primary mr-2'), $lang->testcase->dragModalChangeOrder, set('data-on', 'click'), set('data-call', 'clickChangeOrder')),
         btn($lang->close, set('data-dismiss', 'modal'))
     )
-);
+);