From d4ed8bc18a425850372bd09299bace964caf3e31 Mon Sep 17 00:00:00 2001
From: liyuchun <563917701@qq.com>
Date: Tue, 26 Jul 2022 08:41:13 +0000
Subject: [PATCH 1/7]  * Code for task #62414.

---
 module/testcase/control.php              |  7 +++--
 module/testcase/js/browse.js             |  7 +++++
 module/testcase/lang/de.php              |  4 +++
 module/testcase/lang/en.php              |  4 +++
 module/testcase/lang/fr.php              |  4 +++
 module/testcase/lang/vi.php              |  4 +++
 module/testcase/lang/zh-cn.php           |  4 +++
 module/testcase/model.php                | 34 ++++++++++++++++++++++++
 module/testcase/view/caseheader.html.php | 28 +++++++++++++++++--
 9 files changed, 92 insertions(+), 4 deletions(-)

diff --git a/module/testcase/control.php b/module/testcase/control.php
index 3af8e4fe59..873b29ebd1 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -110,6 +110,7 @@ class testcase extends control
 
         $moduleID = ($browseType == 'bymodule') ? (int)$param : ($browseType == 'bysearch' ? 0 : ($this->cookie->caseModule ? $this->cookie->caseModule : 0));
         $suiteID  = ($browseType == 'bysuite') ? (int)$param : ($browseType == 'bymodule' ? ($this->cookie->caseSuite ? $this->cookie->caseSuite : 0) : 0);
+        $caseType = ($browseType == 'bytype') ? $param : '';
         $queryID  = ($browseType == 'bysearch') ? (int)$param : 0;
 
         /* Set menu, save session. */
@@ -142,11 +143,12 @@ class testcase extends control
         $sort  = common::appendOrder($orderBy);
 
         /* Get test cases. */
-        $cases = $this->testcase->getTestCases($productID, $branch, $browseType, $browseType == 'bysearch' ? $queryID : $suiteID, $moduleID, $sort, $pager);
+        $browseParam = $browseType == 'bysearch' ? $queryID : ($browseType == 'bysuite' ? $suiteID : $caseType);
+        $cases       = $this->testcase->getTestCases($productID, $branch, $browseType, $browseParam, $moduleID, $sort, $pager);
         if(empty($cases) and $pageID > 1)
         {
             $pager = pager::init(0, $recPerPage, 1);
-            $cases = $this->testcase->getTestCases($productID, $branch, $browseType, $browseType == 'bysearch' ? $queryID : $suiteID, $moduleID, $sort, $pager);
+            $cases = $this->testcase->getTestCases($productID, $branch, $browseType, $browseParam, $moduleID, $sort, $pager);
         }
 
         /* save session .*/
@@ -216,6 +218,7 @@ class testcase extends control
         $this->view->orderBy         = $orderBy;
         $this->view->browseType      = $browseType;
         $this->view->param           = $param;
+        $this->view->caseType        = $caseType;
         $this->view->cases           = $cases;
         $this->view->branch          = (!empty($product) and $product->type != 'normal') ? $branch : 0;
         $this->view->branchOption    = $branchOption;
diff --git a/module/testcase/js/browse.js b/module/testcase/js/browse.js
index 22c7a22f5b..adb0de6b26 100644
--- a/module/testcase/js/browse.js
+++ b/module/testcase/js/browse.js
@@ -31,5 +31,12 @@ $(function()
             $('#caseIdList').val(storyIdList);
         });
     });
+
+    $('input[name^="showAutoCase"]').click(function()
+    {
+        var showAutoCase = $(this).is(':checked') ? 1 : 0;
+        $.cookie('showAutoCase', showAutoCase, {expires:config.cookieLife, path:config.webRoot});
+        window.location.reload();
+    });
 });
 
diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php
index 20888cd3c8..a287737ed6 100644
--- a/module/testcase/lang/de.php
+++ b/module/testcase/lang/de.php
@@ -95,6 +95,9 @@ $lang->testcase->deleted          = 'Deleted';
 $lang->testcase->browseUnits      = 'Unit Test';
 $lang->testcase->suite            = 'Test Suite';
 $lang->testcase->executionStatus  = 'executionStatus';
+$lang->testcase->caseType         = 'Case Type';
+$lang->testcase->allType          = 'All Types';
+$lang->testcase->showAutoCase     = 'Show Automated Test Cases';
 
 $lang->case = $lang->testcase;  // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
 
@@ -249,6 +252,7 @@ $lang->testcase->action->unlinkedfromproject   = array('main' => '$date, 由 <st
 $lang->testcase->action->linked2execution      = array('main' => '$date, 由 <strong>$actor</strong> 关联到' . $lang->executionCommon . ' <strong>$extra</strong>。');
 $lang->testcase->action->unlinkedfromexecution = array('main' => '$date, 由 <strong>$actor</strong> 从' . $lang->executionCommon . ' <strong>$extra</strong> 移除。');
 
+$lang->testcase->featureBar['browse']['casetype']    = $lang->testcase->caseType;
 $lang->testcase->featureBar['browse']['all']         = $lang->testcase->allCases;
 $lang->testcase->featureBar['browse']['wait']        = 'Wartend';
 $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index 98f7e19313..0fce9fedeb 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -95,6 +95,9 @@ $lang->testcase->deleted          = 'Deleted';
 $lang->testcase->browseUnits      = 'Unit Test';
 $lang->testcase->suite            = 'Test Suite';
 $lang->testcase->executionStatus  = 'executionStatus';
+$lang->testcase->caseType         = 'Case Type';
+$lang->testcase->allType          = 'All Types';
+$lang->testcase->showAutoCase     = 'Show Automated Test Cases';
 
 $lang->case = $lang->testcase;  // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
 
@@ -249,6 +252,7 @@ $lang->testcase->action->unlinkedfromproject   = array('main' => '$date, 由 <st
 $lang->testcase->action->linked2execution      = array('main' => '$date, 由 <strong>$actor</strong> 关联到' . $lang->executionCommon . ' <strong>$extra</strong>。');
 $lang->testcase->action->unlinkedfromexecution = array('main' => '$date, 由 <strong>$actor</strong> 从' . $lang->executionCommon . ' <strong>$extra</strong> 移除。');
 
+$lang->testcase->featureBar['browse']['casetype']    = $lang->testcase->caseType;
 $lang->testcase->featureBar['browse']['all']         = $lang->testcase->allCases;
 $lang->testcase->featureBar['browse']['wait']        = 'Waiting';
 $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php
index 52d72910af..88ae60d147 100644
--- a/module/testcase/lang/fr.php
+++ b/module/testcase/lang/fr.php
@@ -95,6 +95,9 @@ $lang->testcase->deleted          = 'Deleted';
 $lang->testcase->browseUnits      = 'Unit Test';
 $lang->testcase->suite            = 'Test Suite';
 $lang->testcase->executionStatus  = 'executionStatus';
+$lang->testcase->caseType         = 'Case Type';
+$lang->testcase->allType          = 'All Types';
+$lang->testcase->showAutoCase     = 'Show Automated Test Cases';
 
 $lang->case = $lang->testcase;  // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
 
@@ -249,6 +252,7 @@ $lang->testcase->action->unlinkedfromproject   = array('main' => '$date, 由 <st
 $lang->testcase->action->linked2execution      = array('main' => '$date, 由 <strong>$actor</strong> 关联到' . $lang->executionCommon . ' <strong>$extra</strong>。');
 $lang->testcase->action->unlinkedfromexecution = array('main' => '$date, 由 <strong>$actor</strong> 从' . $lang->executionCommon . ' <strong>$extra</strong> 移除。');
 
+$lang->testcase->featureBar['browse']['casetype']    = $lang->testcase->caseType;
 $lang->testcase->featureBar['browse']['all']         = $lang->testcase->allCases;
 $lang->testcase->featureBar['browse']['wait']        = 'En Attente';
 $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
diff --git a/module/testcase/lang/vi.php b/module/testcase/lang/vi.php
index c94f2630af..530ce56766 100644
--- a/module/testcase/lang/vi.php
+++ b/module/testcase/lang/vi.php
@@ -75,6 +75,9 @@ $lang->testcase->fromTesttask     = 'Từ Yêu cầu Test';
 $lang->testcase->fromCaselib      = 'Từ thư viện tình huống';
 $lang->testcase->deleted          = 'Đã xóa';
 $lang->testcase->browseUnits      = 'Unit Test';
+$lang->testcase->caseType         = 'Case Type';
+$lang->testcase->allType          = 'All Types';
+$lang->testcase->showAutoCase     = 'Show Automated Test Cases';
 
 $lang->case = $lang->testcase;  // For dao checking using. Because 'case' is a php keywords, so the module name is testcase, table name is still case.
 
@@ -222,6 +225,7 @@ $lang->testcase->action->unlinkedfromproject   = array('main' => '$date, 由 <st
 $lang->testcase->action->linked2execution      = array('main' => '$date, 由 <strong>$actor</strong> 关联到' . $lang->executionCommon . ' <strong>$extra</strong>。');
 $lang->testcase->action->unlinkedfromexecution = array('main' => '$date, 由 <strong>$actor</strong> 从' . $lang->executionCommon . ' <strong>$extra</strong> 移除。');
 
+$lang->testcase->featureBar['browse']['casetype']    = $lang->testcase->caseType;
 $lang->testcase->featureBar['browse']['all']         = $lang->testcase->allCases;
 $lang->testcase->featureBar['browse']['wait']        = 'Đang đợi';
 $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index 5496e40098..a1e811ed05 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -95,6 +95,9 @@ $lang->testcase->deleted          = '是否删除';
 $lang->testcase->browseUnits      = '单元测试';
 $lang->testcase->suite            = '套件';
 $lang->testcase->executionStatus  = '执行状态';
+$lang->testcase->caseType         = '用例类型';
+$lang->testcase->allType          = '所有类型';
+$lang->testcase->showAutoCase     = '显示自动化用例';
 
 $lang->case = $lang->testcase;  // 用于DAO检查时使用。因为case是系统关键字，所以无法定义该模块为case，只能使用testcase，但表还是使用的case。
 
@@ -249,6 +252,7 @@ $lang->testcase->action->unlinkedfromproject   = array('main' => '$date, 由 <st
 $lang->testcase->action->linked2execution      = array('main' => '$date, 由 <strong>$actor</strong> 关联到' . $lang->executionCommon . ' <strong>$extra</strong>。');
 $lang->testcase->action->unlinkedfromexecution = array('main' => '$date, 由 <strong>$actor</strong> 从' . $lang->executionCommon . ' <strong>$extra</strong> 移除。');
 
+$lang->testcase->featureBar['browse']['casetype']    = $lang->testcase->caseType;
 $lang->testcase->featureBar['browse']['all']         = $lang->testcase->allCases;
 $lang->testcase->featureBar['browse']['wait']        = '待评审';
 $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm;
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 2130aa43ea..fe3523a3e5 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -394,6 +394,35 @@ class testcaseModel extends model
             ->orderBy($orderBy)->page($pager)->fetchAll('id');
     }
 
+    /**
+     * Get cases by type.
+     *
+     * @param  int         $productID
+     * @param  int|string  $branch
+     * @param  int         $suiteID
+     * @param  array       $moduleIdList
+     * @param  string      $orderBy
+     * @param  object      $pager
+     * @param  string      $auto    no|unit
+     * @access public
+     * @return array
+     */
+    public function getByType($productID, $branch = 0, $type = '', $moduleIdList = 0, $orderBy = 'id_desc', $pager = null, $auto = 'no')
+    {
+        return $this->dao->select('t1.*, t2.title as storyTitle')->from(TABLE_CASE)->alias('t1')
+            ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story=t2.id')
+            ->where('t1.product')->eq((int)$productID)
+            ->beginIF($this->app->tab == 'project')->andWhere('t1.project')->eq($this->session->project)->fi()
+            ->beginIF($type)->andWhere('t1.type')->eq($type)->fi()
+            ->beginIF($branch !== 'all')->andWhere('t1.branch')->eq($branch)->fi()
+            ->beginIF($moduleIdList)->andWhere('t1.module')->in($moduleIdList)->fi()
+            ->beginIF($auto == 'unit')->andWhere('t1.auto')->eq('unit')->fi()
+            ->beginIF($auto != 'unit')->andWhere('t1.auto')->ne('unit')->fi()
+            ->andWhere('t1.deleted')->eq('0')
+            ->orderBy($orderBy)->page($pager)
+            ->fetchAll('id');
+    }
+
     /**
      * Get case info by ID.
      *
@@ -495,6 +524,7 @@ class testcaseModel extends model
         $modules    = $moduleID ? $this->loadModel('tree')->getAllChildId($moduleID) : '0';
         $browseType = ($browseType == 'bymodule' and $this->session->caseBrowseType and $this->session->caseBrowseType != 'bysearch') ? $this->session->caseBrowseType : $browseType;
         $group      = $this->lang->navGroup->testcase;
+        $auto       = $this->cookie->showAutoCase ? 'auto' : $auto;
 
         /* By module or all cases. */
         $cases = array();
@@ -532,6 +562,10 @@ class testcaseModel extends model
         {
             $cases = $this->getBySuite($productID, $branch, $queryID, $modules, $sort, $pager, $auto);
         }
+        elseif($browseType == 'bytype')
+        {
+            $cases = $this->getByType($productID, $branch, $queryID, $modules, $sort, $pager, $auto);
+        }
         /* By search. */
         elseif($browseType == 'bysearch')
         {
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index 98f2357687..0f79571b46 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -13,6 +13,7 @@
 .btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);}
 .btn-group button.dropdown-toggle.btn-primary {padding:6px;}
 .body-modal #mainMenu>.btn-toolbar {width: auto;}
+#mainMenu .pull-left .checkbox-primary {margin-top: 5px;}
 </style>
 <div id='mainMenu' class='clearfix'>
   <?php if(!($this->app->rawMethod == 'groupcase')):?>
@@ -54,6 +55,29 @@
         $isBySearch       = $browseType == 'bysearch';
         include '../../common/view/querymenu.html.php';
     }
+    elseif($hasBrowsePriv and $menuType == 'casetype')
+    {
+        $lang->testcase->typeList[''] = $lang->testcase->allType;
+
+        $currentType     = isset($caseType) ? $caseType : '';
+        $currentTypeName = zget($lang->testcase->typeList, $currentType, '');
+        $currentLable    = empty($currentTypeName) ? $lang->testcase->allType : $currentTypeName;
+
+        echo "<div id='byTypeTab' class='btn-group'>";
+        echo html::a('javascript:;', "<span class='text'>{$currentLable}</span>" . " <span class='caret'></span>", '', "class='btn btn-link' data-toggle='dropdown'");
+        echo "<ul class='dropdown-menu' style='max-height:240px; overflow-y:auto'>";
+
+        foreach($lang->testcase->typeList as $type => $typeName)
+        {
+            echo '<li' . ($type == $currentType ? " class='active'" : '') . '>';
+            echo html::a($this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=byType&param=$type"), $typeName);
+            echo "</li>";
+        }
+
+        echo '</ul>';
+        if($browseType != 'bysearch') echo html::checkbox('showAutoCase', array('1' => $lang->testcase->showAutoCase), '', $this->cookie->showAutoCase ? 'checked=checked' : '');
+        echo '</div>';
+    }
     elseif($hasBrowsePriv and ($menuType == 'all' or $menuType == 'needconfirm' or $menuType == 'wait'))
     {
         echo html::a($this->createLink($currentModule, $currentMethod, $projectParam . "productID=$productID&branch=$branch&browseType=$menuType"), "<span class='text'>{$menuItem->text}</span>", '', "class='btn btn-link' id='{$menuType}Tab' data-app='{$this->app->tab}'");
@@ -66,10 +90,10 @@
 
         echo "<div id='bysuiteTab' class='btn-group'>";
         echo html::a('javascript:;', "<span class='text'>{$currentLable}</span>" . " <span class='caret'></span>", '', "class='btn btn-link' data-toggle='dropdown'");
+        echo "<ul class='dropdown-menu' style='max-height:240px; overflow-y:auto'>";
+
         if(empty($productID) or common::canModify('product', $product))
         {
-            echo "<ul class='dropdown-menu' style='max-height:240px; overflow-y:auto'>";
-
             if(empty($suiteList))
             {
                 echo '<li>';

From b87c8e18aaa6aeea16bf4e2475a8e32ca82545bf Mon Sep 17 00:00:00 2001
From: liyuchun <563917701@qq.com>
Date: Tue, 26 Jul 2022 08:42:02 +0000
Subject: [PATCH 2/7]  * Code for task #62414.

---
 config/filter.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/filter.php b/config/filter.php
index 95c366a47d..71f7de8ed7 100755
--- a/config/filter.php
+++ b/config/filter.php
@@ -302,6 +302,7 @@ $filter->execution->export->cookie['checkedItem']        = 'reg::checked';
 $filter->testcase->browse->cookie['caseModule']     = 'int';
 $filter->testcase->browse->cookie['caseSuite']      = 'int';
 $filter->testcase->browse->cookie['preBranch']      = 'reg::word';
+$filter->testcase->browse->cookie['showAutoCase']   = 'int';
 $filter->testcase->create->cookie['lastCaseModule'] = 'int';
 $filter->testcase->default->cookie['lastProduct']   = 'int';
 $filter->testcase->default->cookie['preProductID']  = 'int';

From 586959a752045834bd565385b57ee62e27cb299c Mon Sep 17 00:00:00 2001
From: liyuchun <563917701@qq.com>
Date: Wed, 27 Jul 2022 00:32:20 +0000
Subject: [PATCH 3/7]  * Update api for edit testcase.

---
 api/v1/entries/testcase.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/api/v1/entries/testcase.php b/api/v1/entries/testcase.php
index e880ad7b8c..8b4ba6414f 100644
--- a/api/v1/entries/testcase.php
+++ b/api/v1/entries/testcase.php
@@ -46,26 +46,28 @@ class testcaseEntry extends entry
         $oldCase = $this->loadModel('testcase')->getByID($caseID);
 
         /* Set $_POST variables. */
-        $fields = 'title,pri,story,type,stage,product,module,branch,precondition';
+        $fields = 'title,pri,story,type,stage,product,module,branch,precondition,script';
         $this->batchSetPost($fields, $oldCase);
+        if(isset($this->requestBody->script)) $this->setPost('auto', 'auto');
 
         /* Set steps and expects. */
+        $steps    = array();
+        $expects  = array();
+        $stepType = array();
         if(isset($this->requestBody->steps))
         {
-            $steps    = array();
-            $expects  = array();
-            $stepType = array();
             foreach($this->requestBody->steps as $step)
             {
                 $steps[]    = $step->desc;
                 $expects[]  = $step->expect;
                 $stepType[] = 'item';
             }
-            $this->setPost('steps',    $steps);
-            $this->setPost('expects',  $expects);
-            $this->setPost('stepType', $stepType);
         }
 
+        $this->setPost('steps',    $steps);
+        $this->setPost('expects',  $expects);
+        $this->setPost('stepType', $stepType);
+
         $control = $this->loadController('testcase', 'edit');
         $control->edit($caseID);
 

From 37171588700f1cfa25f40506126dd6caa736ee2c Mon Sep 17 00:00:00 2001
From: liyuchun <563917701@qq.com>
Date: Thu, 28 Jul 2022 00:09:26 +0000
Subject: [PATCH 4/7]  * Finish task #62415.

---
 db/update17.4.sql         | 1 +
 module/testcase/model.php | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 db/update17.4.sql

diff --git a/db/update17.4.sql b/db/update17.4.sql
new file mode 100644
index 0000000000..af13185d8a
--- /dev/null
+++ b/db/update17.4.sql
@@ -0,0 +1 @@
+ALTER TABLE `zt_case` ADD `script` longtext NOT NULL AFTER `howRun`;
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 2130aa43ea..cd1ef4f203 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1998,9 +1998,11 @@ class testcaseModel extends model
                 {
                     $showBranch = isset($this->config->testcase->browse->showBranch) ? $this->config->testcase->browse->showBranch : 1;
                 }
+
+                $autoIcon = $case->auto == 'auto' ? " <i class='icon icon-ZTF'></i>" : '';
                 if(isset($branches[$case->branch]) and $showBranch) echo "<span class='label label-outline label-badge'>{$branches[$case->branch]}</span> ";
                 if($modulePairs and $case->module and isset($modulePairs[$case->module])) echo "<span class='label label-gray label-badge'>{$modulePairs[$case->module]}</span> ";
-                echo $canView ? ($fromCaseID ? html::a($caseLink, $case->title, null, "style='color: $case->color' data-app='{$this->app->tab}'") . html::a(helper::createLink('testcase', 'view', "caseID=$fromCaseID"), "[<i class='icon icon-share' title='{$this->lang->testcase->fromCaselib}'></i>#$fromCaseID]", '', "data-app='{$this->app->tab}'") : html::a($caseLink, $case->title, null, "style='color: $case->color' data-app='{$this->app->tab}'")) : "<span style='color: $case->color'>$case->title</span>";
+                echo $canView ? ($fromCaseID ? html::a($caseLink, $case->title, null, "style='color: $case->color' data-app='{$this->app->tab}'") . html::a(helper::createLink('testcase', 'view', "caseID=$fromCaseID"), "[<i class='icon icon-share' title='{$this->lang->testcase->fromCaselib}'></i>#$fromCaseID]" . $autoIcon, '', "data-app='{$this->app->tab}'") : html::a($caseLink, $case->title . $autoIcon, null, "style='color: $case->color' data-app='{$this->app->tab}'")) : "<span style='color: $case->color'>$case->title</span>";
                 break;
             case 'branch':
                 echo $branches[$case->branch];

From adac1d8ad0ab7b88fe8bf4045d8bb1007d5f7c55 Mon Sep 17 00:00:00 2001
From: liyuchun <563917701@qq.com>
Date: Thu, 28 Jul 2022 02:27:16 +0000
Subject: [PATCH 5/7]  * Finish task #62416,#62417.

---
 module/group/lang/resource.php           | 40 +++++++++++++-----------
 module/testcase/config.php               |  2 +-
 module/testcase/control.php              | 13 ++++++++
 module/testcase/css/showscript.css       |  3 ++
 module/testcase/js/showscript.js         | 20 ++++++++++++
 module/testcase/lang/de.php              |  1 +
 module/testcase/lang/en.php              |  1 +
 module/testcase/lang/fr.php              |  1 +
 module/testcase/lang/vi.php              |  1 +
 module/testcase/lang/zh-cn.php           |  3 +-
 module/testcase/model.php                |  1 +
 module/testcase/view/showscript.html.php | 31 ++++++++++++++++++
 12 files changed, 96 insertions(+), 21 deletions(-)
 create mode 100644 module/testcase/css/showscript.css
 create mode 100644 module/testcase/js/showscript.js
 create mode 100644 module/testcase/view/showscript.html.php

diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 30e63d973e..828441838c 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -968,6 +968,7 @@ $lang->resource->testcase->batchCreate             = 'batchCreate';
 $lang->resource->testcase->createBug               = 'createBug';
 $lang->resource->testcase->view                    = 'view';
 $lang->resource->testcase->edit                    = 'edit';
+$lang->resource->testcase->showScript              = 'showScript';
 $lang->resource->testcase->linkCases               = 'linkCases';
 $lang->resource->testcase->linkBugs                = 'linkBugs';
 $lang->resource->testcase->batchEdit               = 'batchEdit';
@@ -1000,25 +1001,26 @@ $lang->testcase->methodOrder[25]  = 'createBug';
 $lang->testcase->methodOrder[30]  = 'view';
 $lang->testcase->methodOrder[35]  = 'edit';
 $lang->testcase->methodOrder[40]  = 'delete';
-$lang->testcase->methodOrder[45]  = 'export';
-$lang->testcase->methodOrder[50]  = 'confirmChange';
-$lang->testcase->methodOrder[55]  = 'confirmStoryChange';
-$lang->testcase->methodOrder[60]  = 'batchEdit';
-$lang->testcase->methodOrder[65]  = 'batchDelete';
-$lang->testcase->methodOrder[70]  = 'batchChangeModule';
-$lang->testcase->methodOrder[75]  = 'batchChangeBranch';
-$lang->testcase->methodOrder[80]  = 'linkCases';
-$lang->testcase->methodOrder[82]  = 'linkBugs';
-$lang->testcase->methodOrder[90]  = 'bugs';
-$lang->testcase->methodOrder[95]  = 'review';
-$lang->testcase->methodOrder[100] = 'batchReview';
-$lang->testcase->methodOrder[105] = 'batchConfirmStoryChange';
-$lang->testcase->methodOrder[110] = 'importFromLib';
-$lang->testcase->methodOrder[115] = 'batchCaseTypeChange';
-$lang->testcase->methodOrder[120] = 'confirmLibcaseChange';
-$lang->testcase->methodOrder[125] = 'ignoreLibcaseChange';
-$lang->testcase->methodOrder[130] = 'batchConfirmStoryChange';
-$lang->testcase->methodOrder[135] = 'importToLib';
+$lang->testcase->methodOrder[45]  = 'showScript';
+$lang->testcase->methodOrder[50]  = 'export';
+$lang->testcase->methodOrder[55]  = 'confirmChange';
+$lang->testcase->methodOrder[60]  = 'confirmStoryChange';
+$lang->testcase->methodOrder[65]  = 'batchEdit';
+$lang->testcase->methodOrder[70]  = 'batchDelete';
+$lang->testcase->methodOrder[75]  = 'batchChangeModule';
+$lang->testcase->methodOrder[80]  = 'batchChangeBranch';
+$lang->testcase->methodOrder[85]  = 'linkCases';
+$lang->testcase->methodOrder[90]  = 'linkBugs';
+$lang->testcase->methodOrder[95]  = 'bugs';
+$lang->testcase->methodOrder[100]  = 'review';
+$lang->testcase->methodOrder[105] = 'batchReview';
+$lang->testcase->methodOrder[110] = 'batchConfirmStoryChange';
+$lang->testcase->methodOrder[115] = 'importFromLib';
+$lang->testcase->methodOrder[120] = 'batchCaseTypeChange';
+$lang->testcase->methodOrder[125] = 'confirmLibcaseChange';
+$lang->testcase->methodOrder[130] = 'ignoreLibcaseChange';
+$lang->testcase->methodOrder[135] = 'batchConfirmStoryChange';
+$lang->testcase->methodOrder[140] = 'importToLib';
 
 /* Test task. */
 $lang->resource->testtask = new stdclass();
diff --git a/module/testcase/config.php b/module/testcase/config.php
index 937d67af4a..1c8748d277 100644
--- a/module/testcase/config.php
+++ b/module/testcase/config.php
@@ -216,6 +216,6 @@ $config->testcase->datatable->fieldList['stepNumber']['name']     = $lang->testc
 
 $config->testcase->datatable->fieldList['actions']['title']    = 'actions';
 $config->testcase->datatable->fieldList['actions']['fixed']    = 'right';
-$config->testcase->datatable->fieldList['actions']['width']    = '150';
+$config->testcase->datatable->fieldList['actions']['width']    = '180';
 $config->testcase->datatable->fieldList['actions']['required'] = 'yes';
 $config->testcase->datatable->fieldList['actions']['sort']     = 'no';
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 3af8e4fe59..05d7dff9dd 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -2231,6 +2231,19 @@ class testcase extends control
         $this->display();
     }
 
+    /**
+     * Show script.
+     *
+     * @param  int    $caseID
+     * @access public
+     * @return void
+     */
+    public function showScript($caseID)
+    {
+        $this->view->case = $this->testcase->getByID($caseID);
+        $this->display();
+    }
+
     /**
      * Export case getModuleByStory
      *
diff --git a/module/testcase/css/showscript.css b/module/testcase/css/showscript.css
new file mode 100644
index 0000000000..3d4f16e6b9
--- /dev/null
+++ b/module/testcase/css/showscript.css
@@ -0,0 +1,3 @@
+.repoCode pre {margin: 0; padding: 0; background: white; border: none;}
+.repoCode pre > table > tbody > tr > th, .repoCode pre > table > tbody > tr > td {padding: 1px 3px;}
+.repoCode pre > table > tbody > tr > th {border-right: 1px solid #E4E4E4; background: #fafafa; color: #999; width: 40px; text-align: right; vertical-align: top;}
diff --git a/module/testcase/js/showscript.js b/module/testcase/js/showscript.js
new file mode 100644
index 0000000000..1280979a67
--- /dev/null
+++ b/module/testcase/js/showscript.js
@@ -0,0 +1,20 @@
+$(document).ready(function()
+{
+    var $pre = $('.repoCode .content pre');
+    var rowTip = '';
+    if($('#rowTip').length > 0) rowTip = $('#rowTip').html();
+
+    if($pre.length)
+    {
+        hljs.initHighlightingOnLoad();
+        var content = hljs.highlight($pre.attr('class'), $pre.text());
+        var code = '', line;
+        var arr = content.value.split(/\r\n|[\n\v\f\r\x85\u2028\u2029]/);
+        for(var i = 0 ; i < arr.length ; i++)
+        {
+            line = i + 1;
+            code += "<tr data-line='" + line +"'><th id='L" + line + "'><div class='comment-btn view'></div>" + line + "</th><td>" + (arr[i] || '&nbsp;') + rowTip +  "</td></tr>";
+        }
+        $pre.html("<table><tbody>" + code + "</tbody></table>");
+    }
+});
diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php
index 20888cd3c8..73d4ed613b 100644
--- a/module/testcase/lang/de.php
+++ b/module/testcase/lang/de.php
@@ -144,6 +144,7 @@ $lang->testcase->step                    = 'Schritt';
 $lang->testcase->stepChild               = 'Teilschritt';
 $lang->testcase->viewAll                 = 'Alle anziegen';
 $lang->testcase->importToLib             = "Import To Library";
+$lang->testcase->showScript              = 'Show Script';
 
 $lang->testcase->new = 'Neu';
 
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index 98f7e19313..5afd4111f5 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -144,6 +144,7 @@ $lang->testcase->step                    = 'Steps';
 $lang->testcase->stepChild               = 'Child Steps';
 $lang->testcase->viewAll                 = 'All Cases';
 $lang->testcase->importToLib             = "Import To Library";
+$lang->testcase->showScript              = 'Show Script';
 
 $lang->testcase->new = 'New';
 
diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php
index 52d72910af..cd303845d2 100644
--- a/module/testcase/lang/fr.php
+++ b/module/testcase/lang/fr.php
@@ -144,6 +144,7 @@ $lang->testcase->step                    = 'Etapes';
 $lang->testcase->stepChild               = 'Sous-Etapes';
 $lang->testcase->viewAll                 = 'Tous les CasTests';
 $lang->testcase->importToLib             = "Import To Library";
+$lang->testcase->showScript              = 'Show Script';
 
 $lang->testcase->new = 'Nouveau';
 
diff --git a/module/testcase/lang/vi.php b/module/testcase/lang/vi.php
index c94f2630af..4667adca5b 100644
--- a/module/testcase/lang/vi.php
+++ b/module/testcase/lang/vi.php
@@ -123,6 +123,7 @@ $lang->testcase->groupName               = 'Tên nhóm';
 $lang->testcase->step                    = 'Các bước';
 $lang->testcase->stepChild               = 'Các bước con';
 $lang->testcase->viewAll                 = 'Tất cả tình huống';
+$lang->testcase->showScript              = 'Show Script';
 
 $lang->testcase->new = 'Mới';
 
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index 5496e40098..4669465098 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -143,7 +143,8 @@ $lang->testcase->groupName               = '分组名称';
 $lang->testcase->step                    = '步骤';
 $lang->testcase->stepChild               = '子步骤';
 $lang->testcase->viewAll                 = '查看所有';
-$lang->testcase->importToLib             = "导入用例库";
+$lang->testcase->importToLib             = '导入用例库';
+$lang->testcase->showScript              = '查看自动化脚本';
 
 $lang->testcase->new = '新增';
 
diff --git a/module/testcase/model.php b/module/testcase/model.php
index cd1ef4f203..9df6651746 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -2484,6 +2484,7 @@ class testcaseModel extends model
 
         $menu .= $this->buildMenu('testtask', 'results', "runID=0&$params", $case, 'browse', '', '', 'iframe', true, "data-width='95%'");
         $menu .= $this->buildMenu('testtask', 'runCase', "runID=0&$params&version=$case->version", $case, 'browse', 'play', '', 'runCase iframe', false, "data-width='95%'");
+        if($case->auto == 'auto') $menu .= $this->buildMenu('testcase', 'showScript', $params, $case, 'browse', 'file-code', '', 'runCase iframe', false);
 
         $editParams = $params;
         if($this->app->tab == 'project')   $editParams .= "&comment=false&projectID={$this->session->project}";
diff --git a/module/testcase/view/showscript.html.php b/module/testcase/view/showscript.html.php
new file mode 100644
index 0000000000..8a99581506
--- /dev/null
+++ b/module/testcase/view/showscript.html.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * The show script view file of testcase of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @author      Yuchun Li <liyuchun@easycorp.ltd>
+ * @package     testcase
+ * @version     $Id: showscript.html.php 4723 2022-07-28 08:47:29Z chencongzhi520@gmail.com $
+ * @link        http://www.zentao.net
+ */
+?>
+<?php
+include '../../common/view/header.lite.html.php';
+css::import($jsRoot . 'misc/highlight/styles/code.css');
+js::import($jsRoot  . 'misc/highlight/highlight.pack.js');
+?>
+<div id='mainContent' class='main-content'>
+  <div class='main-header'>
+    <h2>
+      <span class='label label-id'><?php echo $case->id;?></span>
+      <span title='<?php echo $case->title?>'><?php echo $case->title;?></span>
+    </h2>
+  </div>
+  <div class="main-col repoCode main">
+    <div class="content panel">
+      <pre class="cpp"><?php echo trim(htmlSpecialString($case->script, defined('ENT_SUBSTITUTE') ? ENT_QUOTES | ENT_SUBSTITUTE : ENT_QUOTES));?></pre>
+    </div>
+  </div>
+</div>
+<?php include '../../common/view/footer.lite.html.php';?>

From 1ce5a195c73faf5a1ff4a4c9ee74d9dc91319686 Mon Sep 17 00:00:00 2001
From: liyuchun <563917701@qq.com>
Date: Mon, 1 Aug 2022 00:18:02 +0000
Subject: [PATCH 6/7]  * Finish task #62414.

---
 config/filter.php                        | 19 ++++++------
 module/project/control.php               |  2 +-
 module/testcase/control.php              | 19 +++++++-----
 module/testcase/js/groupcase.js          |  9 ++++++
 module/testcase/lang/de.php              |  1 +
 module/testcase/lang/en.php              |  1 +
 module/testcase/lang/fr.php              |  1 +
 module/testcase/lang/vi.php              |  1 +
 module/testcase/lang/zh-cn.php           |  1 +
 module/testcase/model.php                | 31 +++++++++++---------
 module/testcase/view/caseheader.html.php | 37 ++++++++++++++++++------
 test/class/testcase.class.php            | 32 ++++++++++----------
 12 files changed, 99 insertions(+), 55 deletions(-)

diff --git a/config/filter.php b/config/filter.php
index 71f7de8ed7..f30b2fe2f1 100755
--- a/config/filter.php
+++ b/config/filter.php
@@ -299,15 +299,16 @@ $filter->execution->story->cookie['storyBranchParam']    = 'int';
 $filter->execution->story->cookie['executionStoryOrder'] = 'code';
 $filter->execution->export->cookie['checkedItem']        = 'reg::checked';
 
-$filter->testcase->browse->cookie['caseModule']     = 'int';
-$filter->testcase->browse->cookie['caseSuite']      = 'int';
-$filter->testcase->browse->cookie['preBranch']      = 'reg::word';
-$filter->testcase->browse->cookie['showAutoCase']   = 'int';
-$filter->testcase->create->cookie['lastCaseModule'] = 'int';
-$filter->testcase->default->cookie['lastProduct']   = 'int';
-$filter->testcase->default->cookie['preProductID']  = 'int';
-$filter->testcase->export->cookie['checkedItem']    = 'reg::checked';
-$filter->testcase->groupcase->cookie['preBranch']   = 'reg::word';
+$filter->testcase->browse->cookie['caseModule']      = 'int';
+$filter->testcase->browse->cookie['caseSuite']       = 'int';
+$filter->testcase->browse->cookie['preBranch']       = 'reg::word';
+$filter->testcase->browse->cookie['showAutoCase']    = 'int';
+$filter->testcase->create->cookie['lastCaseModule']  = 'int';
+$filter->testcase->default->cookie['lastProduct']    = 'int';
+$filter->testcase->default->cookie['preProductID']   = 'int';
+$filter->testcase->export->cookie['checkedItem']     = 'reg::checked';
+$filter->testcase->groupcase->cookie['preBranch']    = 'reg::word';
+$filter->testcase->groupcase->cookie['showAutoCase'] = 'int';
 
 $filter->testreport->default->cookie['lastProduct']  = 'int';
 $filter->testreport->default->cookie['lastProject']  = 'int';
diff --git a/module/project/control.php b/module/project/control.php
index 2863a233cd..ae3111885d 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1186,7 +1186,7 @@ class project extends control
         $extra = "$projectID,$browseType";
         $this->lang->modulePageNav = $this->product->select($products, $productID, 'project', 'testcase', $extra, $branch);
 
-        echo $this->fetch('testcase', 'browse', "productID=$productID&branch=$branch&browseType=$browseType&param=$param&orderBy=$orderBy&recTotal=$orderBy&recPerPage=$recPerPage&pageID=$pageID&projectID=$projectID");
+        echo $this->fetch('testcase', 'browse', "productID=$productID&branch=$branch&browseType=$browseType&param=$param&caseType=&orderBy=$orderBy&recTotal=$orderBy&recPerPage=$recPerPage&pageID=$pageID&projectID=$projectID");
     }
 
     /**
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 873b29ebd1..a2ec633cd5 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -78,6 +78,7 @@ class testcase extends control
      * @param  int|string $branch
      * @param  string     $browseType
      * @param  int        $param
+     * @param  string     $caseType
      * @param  string     $orderBy
      * @param  int        $recTotal
      * @param  int        $recPerPage
@@ -86,7 +87,7 @@ class testcase extends control
      * @access public
      * @return void
      */
-    public function browse($productID = 0, $branch = '', $browseType = 'all', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1, $projectID = 0)
+    public function browse($productID = 0, $branch = '', $browseType = 'all', $param = 0, $caseType = '', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1, $projectID = 0)
     {
         $this->loadModel('datatable');
 
@@ -110,7 +111,6 @@ class testcase extends control
 
         $moduleID = ($browseType == 'bymodule') ? (int)$param : ($browseType == 'bysearch' ? 0 : ($this->cookie->caseModule ? $this->cookie->caseModule : 0));
         $suiteID  = ($browseType == 'bysuite') ? (int)$param : ($browseType == 'bymodule' ? ($this->cookie->caseSuite ? $this->cookie->caseSuite : 0) : 0);
-        $caseType = ($browseType == 'bytype') ? $param : '';
         $queryID  = ($browseType == 'bysearch') ? (int)$param : 0;
 
         /* Set menu, save session. */
@@ -143,12 +143,11 @@ class testcase extends control
         $sort  = common::appendOrder($orderBy);
 
         /* Get test cases. */
-        $browseParam = $browseType == 'bysearch' ? $queryID : ($browseType == 'bysuite' ? $suiteID : $caseType);
-        $cases       = $this->testcase->getTestCases($productID, $branch, $browseType, $browseParam, $moduleID, $sort, $pager);
+        $cases = $this->testcase->getTestCases($productID, $branch, $browseType, $browseType == 'bysearch' ? $queryID : $suiteID, $moduleID, $caseType, $sort, $pager);
         if(empty($cases) and $pageID > 1)
         {
             $pager = pager::init(0, $recPerPage, 1);
-            $cases = $this->testcase->getTestCases($productID, $branch, $browseType, $browseParam, $moduleID, $sort, $pager);
+            $cases = $this->testcase->getTestCases($productID, $branch, $browseType, $browseType == 'bysearch' ? $queryID : $suiteID, $moduleID, $caseType, $sort, $pager);
         }
 
         /* save session .*/
@@ -237,11 +236,14 @@ class testcase extends control
      * Group case.
      *
      * @param  int    $productID
+     * @param  string $branch
      * @param  string $groupBy
+     * @param  int    $projectID
+     * @param  string $caseType
      * @access public
      * @return void
      */
-    public function groupCase($productID = 0, $branch = '', $groupBy = 'story', $projectID = 0)
+    public function groupCase($productID = 0, $branch = '', $groupBy = 'story', $projectID = 0, $caseType = '')
     {
         $groupBy   = empty($groupBy) ? 'story' : $groupBy;
         $productID = $this->product->saveState($productID, $this->products);
@@ -258,7 +260,7 @@ class testcase extends control
 
         $this->session->set('caseList', $this->app->getURI(true), $this->app->tab);
 
-        $cases = $this->testcase->getModuleCases($productID, $branch, 0, $groupBy);
+        $cases = $this->testcase->getModuleCases($productID, $branch, 0, '', 'no', $caseType, $groupBy);
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', false);
         $cases = $this->loadModel('story')->checkNeedConfirm($cases);
         $cases = $this->testcase->appendData($cases);
@@ -295,6 +297,7 @@ class testcase extends control
         $this->view->moduleID    = 0;
         $this->view->branch      = $branch;
         $this->view->product     = $this->product->getByID($productID);
+        $this->view->caseType    = $caseType;
         $this->display();
     }
 
@@ -551,7 +554,7 @@ class testcase extends control
             $currentModule = $this->app->tab == 'project' ? 'project'  : 'testcase';
             $currentMethod = $this->app->tab == 'project' ? 'testcase' : 'browse';
             $projectParam  = $this->app->tab == 'project' ? "projectID={$this->session->project}&" : '';
-            return print(js::locate($this->createLink($currentModule, $currentMethod, $projectParam . "productID=$productID&branch=$branch&browseType=all&param=0&orderBy=id_desc"), 'parent'));
+            return print(js::locate($this->createLink($currentModule, $currentMethod, $projectParam . "productID=$productID&branch=$branch&browseType=all&param=0&caseType=&orderBy=id_desc"), 'parent'));
         }
         if(empty($this->products)) $this->locate($this->createLink('product', 'create'));
 
diff --git a/module/testcase/js/groupcase.js b/module/testcase/js/groupcase.js
index e69de29bb2..4eb3535d5b 100644
--- a/module/testcase/js/groupcase.js
+++ b/module/testcase/js/groupcase.js
@@ -0,0 +1,9 @@
+$(function()
+{
+    $('input[name^="showAutoCase"]').click(function()
+    {
+        var showAutoCase = $(this).is(':checked') ? 1 : 0;
+        $.cookie('showAutoCase', showAutoCase, {expires:config.cookieLife, path:config.webRoot});
+        window.location.reload();
+    });
+})
diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php
index a287737ed6..d3ff0fa8af 100644
--- a/module/testcase/lang/de.php
+++ b/module/testcase/lang/de.php
@@ -260,4 +260,5 @@ $lang->testcase->featureBar['browse']['group']       = 'Group View';
 $lang->testcase->featureBar['browse']['suite']       = 'Suite';
 $lang->testcase->featureBar['browse']['zerocase']    = 'Zero Case Story';
 $lang->testcase->featureBar['browse']['browseunits'] = 'Unit Test';
+$lang->testcase->featureBar['browse']['autocase']    = $lang->testcase->showAutoCase;
 $lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php
index 0fce9fedeb..4d617e792c 100644
--- a/module/testcase/lang/en.php
+++ b/module/testcase/lang/en.php
@@ -260,4 +260,5 @@ $lang->testcase->featureBar['browse']['group']       = 'Group View';
 $lang->testcase->featureBar['browse']['suite']       = 'Suite';
 $lang->testcase->featureBar['browse']['zerocase']    = 'Zero Case Story';
 $lang->testcase->featureBar['browse']['browseunits'] = 'Unit Test';
+$lang->testcase->featureBar['browse']['autocase']    = $lang->testcase->showAutoCase;
 $lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php
index 88ae60d147..d614a1c973 100644
--- a/module/testcase/lang/fr.php
+++ b/module/testcase/lang/fr.php
@@ -260,4 +260,5 @@ $lang->testcase->featureBar['browse']['group']       = 'Group View';
 $lang->testcase->featureBar['browse']['suite']       = 'Suite';
 $lang->testcase->featureBar['browse']['zerocase']    = 'Zero Case Story';
 $lang->testcase->featureBar['browse']['browseunits'] = 'Unit Test';
+$lang->testcase->featureBar['browse']['autocase']    = $lang->testcase->showAutoCase;
 $lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/lang/vi.php b/module/testcase/lang/vi.php
index 530ce56766..a4cfc7b1b2 100644
--- a/module/testcase/lang/vi.php
+++ b/module/testcase/lang/vi.php
@@ -233,4 +233,5 @@ $lang->testcase->featureBar['browse']['group']       = 'Group View';
 $lang->testcase->featureBar['browse']['suite']       = 'Suite';
 $lang->testcase->featureBar['browse']['zerocase']    = 'Zero Case Story';
 $lang->testcase->featureBar['browse']['browseunits'] = 'Unit Test';
+$lang->testcase->featureBar['browse']['autocase']    = $lang->testcase->showAutoCase;
 $lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php
index a1e811ed05..8314fe9fc0 100644
--- a/module/testcase/lang/zh-cn.php
+++ b/module/testcase/lang/zh-cn.php
@@ -260,4 +260,5 @@ $lang->testcase->featureBar['browse']['group']       = '分组查看';
 $lang->testcase->featureBar['browse']['suite']       = '套件';
 $lang->testcase->featureBar['browse']['zerocase']    = "零用例{$lang->SRCommon}";
 $lang->testcase->featureBar['browse']['browseunits'] = '单元测试';
+$lang->testcase->featureBar['browse']['autocase']    = $lang->testcase->showAutoCase;
 $lang->testcase->featureBar['groupcase']             = $lang->testcase->featureBar['browse'];
diff --git a/module/testcase/model.php b/module/testcase/model.php
index fe3523a3e5..79b4c0f5d1 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -234,14 +234,15 @@ class testcaseModel extends model
      * @param  int         $productID
      * @param  int|string  $branch
      * @param  int         $moduleIdList
-     * @param  string      $orderBy
-     * @param  object      $pager
      * @param  string      $browseType
      * @param  string      $auto   no|unit
+     * @param  string      $caseType
+     * @param  string      $orderBy
+     * @param  object      $pager
      * @access public
      * @return array
      */
-    public function getModuleCases($productID, $branch = 0, $moduleIdList = 0, $orderBy = 'id_desc', $pager = null, $browseType = '', $auto = 'no')
+    public function getModuleCases($productID, $branch = 0, $moduleIdList = 0, $browseType = '', $auto = 'no', $caseType = '', $orderBy = 'id_desc', $pager = null)
     {
         $stmt = $this->dao->select('t1.*, t2.title as storyTitle, t2.deleted as storyDeleted')->from(TABLE_CASE)->alias('t1')
             ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story=t2.id');
@@ -255,6 +256,8 @@ class testcaseModel extends model
             ->beginIF($browseType == 'wait')->andWhere('t1.status')->eq($browseType)->fi()
             ->beginIF($auto == 'unit')->andWhere('t1.auto')->eq('unit')->fi()
             ->beginIF($auto != 'unit')->andWhere('t1.auto')->ne('unit')->fi()
+            ->beginIF(!$this->cookie->showAutoCase)->andWhere('t1.auto')->ne('auto')->fi()
+            ->beginIF($caseType)->andWhere('t1.type')->eq($caseType)->fi()
             ->andWhere('t1.deleted')->eq('0')
             ->orderBy($orderBy)
             ->page($pager)
@@ -267,14 +270,15 @@ class testcaseModel extends model
      * @param  int        $productID
      * @param  int|string $branch
      * @param  int        $moduleIdList
-     * @param  string     $orderBy
-     * @param  object     $pager
      * @param  string     $browseType
      * @param  string     $auto   no|unit
+     * @param  string     $caseType
+     * @param  string     $orderBy
+     * @param  object     $pager
      * @access public
      * @return array
      */
-    public function getModuleProjectCases($productID, $branch = 0, $moduleIdList = 0, $orderBy = 'id_desc', $pager = null, $browseType = '', $auto = 'no')
+    public function getModuleProjectCases($productID, $branch = 0, $moduleIdList = 0, $browseType = '', $auto = 'no', $caseType = '', $orderBy = 'id_desc', $pager = null)
     {
         $executions = $this->loadModel('execution')->getIdList($this->session->project);
         array_push($executions, $this->session->project);
@@ -290,6 +294,8 @@ class testcaseModel extends model
             ->beginIF($browseType == 'wait')->andWhere('t2.status')->eq($browseType)->fi()
             ->beginIF($auto == 'unit')->andWhere('t2.auto')->eq('unit')->fi()
             ->beginIF($auto != 'unit')->andWhere('t2.auto')->ne('unit')->fi()
+            ->beginIF(!$this->cookie->showAutoCase)->andWhere('t2.auto')->ne('auto')->fi()
+            ->beginIF($caseType)->andWhere('t2.type')->eq($caseType)->fi()
             ->andWhere('t2.deleted')->eq('0')
             ->orderBy($orderBy)
             ->page($pager, 't1.case')
@@ -512,13 +518,14 @@ class testcaseModel extends model
      * @param  string     $browseType
      * @param  int        $queryID
      * @param  int        $moduleID
+     * @param  string     $caseType
      * @param  string     $sort
      * @param  object     $pager
      * @param  string     $auto   no|unit
      * @access public
      * @return array
      */
-    public function getTestCases($productID, $branch, $browseType, $queryID, $moduleID, $sort, $pager, $auto = 'no')
+    public function getTestCases($productID, $branch, $browseType, $queryID, $moduleID, $caseType = '', $sort = 'id_desc', $pager = null, $auto = 'no')
     {
         /* Set modules and browse type. */
         $modules    = $moduleID ? $this->loadModel('tree')->getAllChildId($moduleID) : '0';
@@ -532,11 +539,11 @@ class testcaseModel extends model
         {
             if($this->app->tab == 'project')
             {
-                $cases = $this->getModuleProjectCases($productID, $branch, $modules, $sort, $pager, $browseType, $auto);
+                $cases = $this->getModuleProjectCases($productID, $branch, $modules, $browseType, $auto, $caseType, $sort, $pager);
             }
             else
             {
-                $cases = $this->getModuleCases($productID, $branch, $modules, $sort, $pager, $browseType, $auto);
+                $cases = $this->getModuleCases($productID, $branch, $modules, $browseType, $auto, $caseType, $sort, $pager);
             }
         }
         /* Cases need confirmed. */
@@ -554,6 +561,8 @@ class testcaseModel extends model
                 ->beginIF($modules)->andWhere('t1.module')->in($modules)->fi()
                 ->beginIF($auto != 'unit')->andWhere('t1.auto')->ne('unit')->fi()
                 ->beginIF($auto == 'unit')->andWhere('t1.auto')->eq('unit')->fi()
+                ->beginIF(!$this->cookie->showAutoCase)->andWhere('t1.auto')->ne('auto')->fi()
+                ->beginIF($caseType)->andWhere('t1.type')->eq($caseType)->fi()
                 ->orderBy($sort)
                 ->page($pager, 't1.id')
                 ->fetchAll();
@@ -562,10 +571,6 @@ class testcaseModel extends model
         {
             $cases = $this->getBySuite($productID, $branch, $queryID, $modules, $sort, $pager, $auto);
         }
-        elseif($browseType == 'bytype')
-        {
-            $cases = $this->getByType($productID, $branch, $queryID, $modules, $sort, $pager, $auto);
-        }
         /* By search. */
         elseif($browseType == 'bysearch')
         {
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index 0f79571b46..a6084031c5 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -48,6 +48,7 @@
     <?php
     if(isset($menuItem->hidden)) continue;
     $menuType = $menuItem->name;
+    $caseType = isset($caseType) ? $caseType : '';
     if(!$config->testcase->needReview and empty($config->testcase->forceReview) and $menuType == 'wait') continue;
     if($hasBrowsePriv and $menuType == 'QUERY' and in_array($browseType, array('all', 'needconfirm', 'bysuite')))
     {
@@ -57,11 +58,15 @@
     }
     elseif($hasBrowsePriv and $menuType == 'casetype')
     {
+        if($this->moduleName == 'testtask' and $this->methodName == 'browseunits') continue;
+        if($this->moduleName == 'story' and $this->methodName == 'zerocase') continue;
+        if($browseType == 'bysuite') continue;
+
         $lang->testcase->typeList[''] = $lang->testcase->allType;
 
-        $currentType     = isset($caseType) ? $caseType : '';
-        $currentTypeName = zget($lang->testcase->typeList, $currentType, '');
+        $currentTypeName = zget($lang->testcase->typeList, $caseType, '');
         $currentLable    = empty($currentTypeName) ? $lang->testcase->allType : $currentTypeName;
+        if(!isset($param)) $param = 0;
 
         echo "<div id='byTypeTab' class='btn-group'>";
         echo html::a('javascript:;', "<span class='text'>{$currentLable}</span>" . " <span class='caret'></span>", '', "class='btn btn-link' data-toggle='dropdown'");
@@ -69,18 +74,32 @@
 
         foreach($lang->testcase->typeList as $type => $typeName)
         {
-            echo '<li' . ($type == $currentType ? " class='active'" : '') . '>';
-            echo html::a($this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=byType&param=$type"), $typeName);
+            echo '<li' . ($type == $caseType ? " class='active'" : '') . '>';
+            if(isset($groupBy))
+            {
+                echo html::a($this->createLink('testcase', 'groupCase', "productID=$productID&branch=$branch&groupBy=story&projectID=$projectID&caseType=$type"), $typeName);
+
+            }
+            else
+            {
+                echo html::a($this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=$browseType&param=$param&caseType=$type"), $typeName);
+            }
             echo "</li>";
         }
 
-        echo '</ul>';
-        if($browseType != 'bysearch') echo html::checkbox('showAutoCase', array('1' => $lang->testcase->showAutoCase), '', $this->cookie->showAutoCase ? 'checked=checked' : '');
-        echo '</div>';
+        echo '</ul></div>';
+    }
+    elseif($hasBrowsePriv and $menuType == 'autocase')
+    {
+        if($this->moduleName == 'testtask' and $this->methodName == 'browseunits') continue;
+        if($this->moduleName == 'story' and $this->methodName == 'zerocase') continue;
+        if($browseType == 'bysuite' or $browseType == 'bysearch') continue;
+
+        echo html::checkbox('showAutoCase', array('1' => $lang->testcase->showAutoCase), '', $this->cookie->showAutoCase ? 'checked=checked' : '');
     }
     elseif($hasBrowsePriv and ($menuType == 'all' or $menuType == 'needconfirm' or $menuType == 'wait'))
     {
-        echo html::a($this->createLink($currentModule, $currentMethod, $projectParam . "productID=$productID&branch=$branch&browseType=$menuType"), "<span class='text'>{$menuItem->text}</span>", '', "class='btn btn-link' id='{$menuType}Tab' data-app='{$this->app->tab}'");
+        echo html::a($this->createLink($currentModule, $currentMethod, $projectParam . "productID=$productID&branch=$branch&browseType=$menuType&param=0&caseType=$caseType"), "<span class='text'>{$menuItem->text}</span>", '', "class='btn btn-link' id='{$menuType}Tab' data-app='{$this->app->tab}'");
     }
     elseif($hasBrowsePriv and $menuType == 'suite' and $this->app->tab == 'qa')
     {
@@ -126,7 +145,7 @@
         $projectID = $isProjectApp ? $this->session->project : 0;
         echo html::a($this->createLink('story', 'zeroCase', "productID=$productID&branch=$branch&orderBy=id_desc&projectID=$projectID"), "<span class='text'>{$lang->story->zeroCase}</span>", '', "class='btn btn-link' id='zerocaseTab' data-app='{$this->app->tab}'");
     }
-    elseif($hasUnitPriv and $menuType == 'browseunits')
+    elseif($hasUnitPriv and $menuType == 'browseunits' and !$caseType)
     {
         echo html::a($this->createLink('testtask', 'browseUnits', "productID=$productID&browseType=newest&orderBy=id_desc&recTotal=0&recPerPage=20&pageID=1&projectID=$projectID"), "<span class='text'>{$lang->testcase->browseUnits}</span>", '', "class='btn btn-link' id='browseunitsTab' data-app='{$this->app->tab}'");
     }
diff --git a/test/class/testcase.class.php b/test/class/testcase.class.php
index 5642b59f97..1ec4634ab4 100644
--- a/test/class/testcase.class.php
+++ b/test/class/testcase.class.php
@@ -94,19 +94,20 @@ class testcaseTest
     /**
      * Test get cases of a module.
      *
-     * @param  int   $productID
-     * @param  int   $branch
-     * @param  int   $moduleIdList
-     * @param  string $orderBy
-     * @param  object $pager
+     * @param  int    $productID
+     * @param  int    $branch
+     * @param  int    $moduleIdList
      * @param  string $browseType
      * @param  string $auto
+     * @param  string $caseType
+     * @param  string $orderBy
+     * @param  object $pager
      * @access public
      * @return array
      */
-    public function getModuleCasesTest($productID, $branch = 0, $moduleIdList = 0, $orderBy = 'id_desc', $pager = null, $browseType = '', $auto = 'no')
+    public function getModuleCasesTest($productID, $branch = 0, $moduleIdList = 0, $browseType = '', $auto = 'no', $caseType = '', $orderBy = 'id_desc', $pager = null)
     {
-        $objects = $this->objectModel->getModuleCases($productID, $branch, $moduleIdList, $orderBy, $pager, $browseType, $auto);
+        $objects = $this->objectModel->getModuleCases($productID, $branch, $moduleIdList, $browseType, $auto, $caseType, $orderBy, $pager);
 
         if(dao::isError()) return dao::getError();
 
@@ -116,19 +117,20 @@ class testcaseTest
     /**
      * Test get project cases of a module.
      *
-     * @param  int   $productID
-     * @param  int   $branch
-     * @param  int   $moduleIdList
-     * @param  string $orderBy
-     * @param  object $pager
+     * @param  int    $productID
+     * @param  int    $branch
+     * @param  int    $moduleIdList
      * @param  string $browseType
      * @param  string $auto
+     * @param  string $caseType
+     * @param  string $orderBy
+     * @param  object $pager
      * @access public
      * @return array
      */
-    public function getModuleProjectCasesTest($productID, $branch = 0, $moduleIdList = 0, $orderBy = 'id_desc', $pager = null, $browseType = '', $auto = 'no')
+    public function getModuleProjectCasesTest($productID, $branch = 0, $moduleIdList = 0, $browseType = '', $auto = 'no', $caseType = '', $orderBy = 'id_desc', $pager = null)
     {
-        $objects = $this->objectModel->getModuleProjectCases($productID, $branch, $moduleIdList, $orderBy, $pager, $browseType, $auto);
+        $objects = $this->objectModel->getModuleProjectCases($productID, $branch, $moduleIdList, $browseType, $auto, $caseType, $orderBy, $pager);
 
         if(dao::isError()) return dao::getError();
 
@@ -221,7 +223,7 @@ class testcaseTest
      */
     public function getTestCasesTest($productID, $browseType, $queryID, $auto = 'no')
     {
-        $objects = $this->objectModel->getTestCases($productID, 0, $browseType, $queryID, $moduleID, 'id_desc', null, $auto);
+        $objects = $this->objectModel->getTestCases($productID, 0, $browseType, $queryID, $moduleID, '', 'id_desc', null, $auto);
 
         if(dao::isError()) return dao::getError();
 

From d4f9faa6b98772038d8a724f06cd372b2015842f Mon Sep 17 00:00:00 2001
From: liyuchun <563917701@qq.com>
Date: Mon, 1 Aug 2022 02:28:09 +0000
Subject: [PATCH 7/7]  * Adjust ztf icon.

---
 module/testcase/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/testcase/model.php b/module/testcase/model.php
index 9df6651746..20fde88df7 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1999,7 +1999,7 @@ class testcaseModel extends model
                     $showBranch = isset($this->config->testcase->browse->showBranch) ? $this->config->testcase->browse->showBranch : 1;
                 }
 
-                $autoIcon = $case->auto == 'auto' ? " <i class='icon icon-ZTF'></i>" : '';
+                $autoIcon = $case->auto == 'auto' ? " <i class='icon icon-ztf'></i>" : '';
                 if(isset($branches[$case->branch]) and $showBranch) echo "<span class='label label-outline label-badge'>{$branches[$case->branch]}</span> ";
                 if($modulePairs and $case->module and isset($modulePairs[$case->module])) echo "<span class='label label-gray label-badge'>{$modulePairs[$case->module]}</span> ";
                 echo $canView ? ($fromCaseID ? html::a($caseLink, $case->title, null, "style='color: $case->color' data-app='{$this->app->tab}'") . html::a(helper::createLink('testcase', 'view', "caseID=$fromCaseID"), "[<i class='icon icon-share' title='{$this->lang->testcase->fromCaselib}'></i>#$fromCaseID]" . $autoIcon, '', "data-app='{$this->app->tab}'") : html::a($caseLink, $case->title . $autoIcon, null, "style='color: $case->color' data-app='{$this->app->tab}'")) : "<span style='color: $case->color'>$case->title</span>";