From ca81c5afbabbdcebe03cedf1ed376c35a4b9508b Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 12 May 2022 09:09:41 +0800
Subject: [PATCH 01/13] * Fix bug #22370.

---
 module/tree/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/tree/model.php b/module/tree/model.php
index e7da456a9d..e9f0eb6be8 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -1573,7 +1573,7 @@ class treeModel extends model
 
         foreach($childs as $moduleID => $moduleName)
         {
-            if(preg_match('/(^\s+$)/', $moduleName)) return print(js::alert($this->lang->tree->shouldNotBlank));
+            if(preg_match('/(^\s+$)/', $moduleName)) helper::end(js::alert($this->lang->tree->shouldNotBlank));
         }
 
         $module         = new stdClass();
@@ -1581,7 +1581,7 @@ class treeModel extends model
         $module->type   = $type;
         $module->parent = $parentModuleID;
         $repeatName     = $this->checkUnique($module, $childs);
-        if($repeatName) return print(js::alert(sprintf($this->lang->tree->repeatName, $repeatName)));
+        if($repeatName) helper::end(js::alert(sprintf($this->lang->tree->repeatName, $repeatName)));
 
         $parentModule = $this->getByID($parentModuleID);
 

From c4b076c3d84d9907665387376295d98a66368685 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 12 May 2022 09:44:12 +0800
Subject: [PATCH 02/13] * Fix bug #22372.

---
 module/doc/css/objectlibs.css    | 1 +
 module/doc/css/tablecontents.css | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/module/doc/css/objectlibs.css b/module/doc/css/objectlibs.css
index 71a6036c15..01c2431ed2 100644
--- a/module/doc/css/objectlibs.css
+++ b/module/doc/css/objectlibs.css
@@ -48,3 +48,4 @@
 .tree-group:hover > .module-name {width: calc(100% - 20px);}
 .tree-group:hover .tree-actions {display: block}
 .tree li.has-list.open:before {left: 6px;}
+.sortable-sorting .tree-group:hover .tree-actions {display: none;}
diff --git a/module/doc/css/tablecontents.css b/module/doc/css/tablecontents.css
index 9cd6f9101e..c00c63eff2 100644
--- a/module/doc/css/tablecontents.css
+++ b/module/doc/css/tablecontents.css
@@ -23,10 +23,12 @@ span.dotted-line+a {display: block;}
 
 .sortable-sorting .module-name > a {cursor: move;}
 .sortable-sorting li >.tree-group {opacity: .5;}
+.sortable-sorting li:before {opacity: .3;}
 .sortable-sorting .drop-here .tree-group {background-color: #fff3e0;}
 .sortable-sorting .drop-here .tree-group > * {opacity: .1;}
 .sortable-sorting .drag-shadow .tree-group {opacity: 1!important;}
 .sortable-sorting .drag-shadow .tree-actions {visibility: hidden;}
+.is-sorting > li:before {opacity: 1;}
 .is-sorting > li > .tree-group {opacity: 1; border-radius: 4px;}
 .is-sorting > li ul {display: none!important;}
 
@@ -36,5 +38,6 @@ span.dotted-line+a {display: block;}
 .tree-group:hover > .module-name {width: calc(100% - 20px);}
 .tree-group:hover .tree-actions {display: block}
 .tree li.has-list.open:before {left: 6px;}
+.sortable-sorting .tree-group:hover .tree-actions {display: none;}
 .sortDoc>.tail-info{right: 20px;}
 .sortDoc>.tree-actions{position: absolute; right: 0px; background: #fff;}

From 58c08b95a67ec0b06364c8d8715dde23618286e4 Mon Sep 17 00:00:00 2001
From: wangyuting2 <851424971@qq.com>
Date: Thu, 12 May 2022 14:10:10 +0800
Subject: [PATCH 03/13] * Fix print extend fields bug.

---
 framework/control.class.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/framework/control.class.php b/framework/control.class.php
index c153bb29f0..4b1d074eb7 100644
--- a/framework/control.class.php
+++ b/framework/control.class.php
@@ -373,7 +373,7 @@ class control extends baseControl
      * @access public
      * @return void
      */
-    public function printExtendFields($object, $type, $extras = '', $print = false)
+    public function printExtendFields($object, $type, $extras = '', $print = true)
     {
         if(!isset($this->config->bizVersion)) return false;
 
@@ -382,12 +382,13 @@ class control extends baseControl
         $fields     = $this->loadModel('flow')->printFields($moduleName, $methodName, $object, $type, $extras);
         if(!$print) return $fields;
 
-        $jsRoot = $this->config->webRoot . "js/";
-        $picker = file_get_contents($this->app->getBasePath() . 'app/sys/common/view/picker.html.php');
-        $picker = substr($picker, strpos($picker, '<style>'));
+        $picker = '';
+        //$jsRoot = $this->config->webRoot . "js/";
+        //$picker = file_get_contents($this->app->getBasePath() . 'app/sys/common/view/picker.html.php');
+        //$picker = substr($picker, strpos($picker, '<style>'));
 
-        js::import($jsRoot . 'picker/min.js');
-        css::import($jsRoot . 'picker/min.css');
+        //js::import($jsRoot . 'picker/min.js');
+        //css::import($jsRoot . 'picker/min.css');
 
         echo $picker . $fields;
     }

From 4be4e591c5509be3ec7c3855bccebb66d01d8e5d Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Thu, 12 May 2022 07:22:39 +0000
Subject: [PATCH 04/13] * Fix bug.

---
 db/update16.5.sql | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/db/update16.5.sql b/db/update16.5.sql
index a841fc8213..d7347a296c 100644
--- a/db/update16.5.sql
+++ b/db/update16.5.sql
@@ -96,7 +96,7 @@ UPDATE `zt_workflowfield` set `control` = 'date'     WHERE `module` = 'testtask'
 UPDATE `zt_workflowfield` set `control` = 'richtext' WHERE `module` = 'testtask' and `field` = 'desc';
 
 UPDATE `zt_workflowfield` set `control` = 'datetime' WHERE `module` IN ('testsuite','caselib') and `field` IN ('addedDate','lastEditedDate');
-UPDATE `zt_workflowfield` set `control` = 'richtext' WHERE `module` = 'testsuite' and `field` = 'desc';
+UPDATE `zt_workflowfield` set `control` = 'richtext' WHERE `module` IN ('testsuite','caselib') and `field` = 'desc';
 
 UPDATE `zt_workflowfield` set `control` = 'datetime' WHERE `module` = 'feedback' and `field` IN ('openedDate','reviewedDate','processedDate','closedDate','editedDate','assignedDate');
 
@@ -135,8 +135,6 @@ DELETE FROM `zt_workflowfield` WHERE `module`='project' AND `field`='stage';
 DELETE FROM `zt_workflowfield` WHERE `module`='bug' AND `field`='feedback';
 DELETE FROM `zt_workflowfield` WHERE `module`='task' AND `field`='feedback';
 
-ALTER TABLE `zt_workflowdatasource` ADD UNIQUE `code` (`code`);
-
 REPLACE INTO `zt_workflowdatasource` (`type`, `name`, `code`, `buildin`, `datasource`, `view`, `keyField`, `valueField`) VALUES
 ('lang', '项目模型', 'projectModel', '1', 'projectModel', '', '', ''),
 ('lang', '反馈类型', 'feedbackType', '1', 'feedbackType', '', '', ''),
@@ -415,3 +413,4 @@ UPDATE `zt_workflowaction` SET `type`='single', `position`='browseandview', `sho
 UPDATE `zt_workflowaction` SET `type`='single', `position`='browse', `show`='direct', `open`='normal', `layout`='side' WHERE `module`='task' AND `action`='view';
 UPDATE `zt_workflowaction` SET `type`='batch' WHERE `module`IN ('feedback','caselib','testsuite','testtask','testcase') AND `action` IN ('admin','browse','batchedit','batchcreate','import','showimport');
 UPDATE `zt_workflowaction` SET `position`='browse' WHERE `module`IN ('feedback','caselib','testsuite','testtask','testcase') AND `action` IN ('batchedit','batchcreate','import','showimport');
+UPDATE `zt_workflowaction` SET `position`='browse' WHERE `action` IN ('view','exporttemplate');

From 4c7619bcb98998f9e012ee1308cc63b56d838164 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Thu, 12 May 2022 15:46:49 +0800
Subject: [PATCH 05/13] * Fix bug #22429.

---
 module/action/config.php | 1 +
 module/story/control.php | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/module/action/config.php b/module/action/config.php
index f86dbe9e83..df19f560cc 100755
--- a/module/action/config.php
+++ b/module/action/config.php
@@ -1,6 +1,7 @@
 <?php
 $config->action->objectNameFields['product']      = 'name';
 $config->action->objectNameFields['story']        = 'title';
+$config->action->objectNameFields['requirement']  = 'title';
 $config->action->objectNameFields['productplan']  = 'title';
 $config->action->objectNameFields['release']      = 'name';
 $config->action->objectNameFields['program']      = 'name';
diff --git a/module/story/control.php b/module/story/control.php
index 70dcd47022..1fb8b8e976 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1187,7 +1187,9 @@ class story extends control
         }
         else
         {
-            $this->story->delete(TABLE_STORY, $storyID);
+            $this->dao->update(TABLE_STORY)->set('deleted')->eq(1)->where('id')->eq($storyID)->exec();
+            $this->loadModel('action')->create($story->type, $storyID, 'deleted', '', ACTIONMODEL::CAN_UNDELETED);
+
             if($story->parent > 0)
             {
                 $this->story->updateParentStatus($story->id);

From 10e48b66d9fc8c3056166a722577c2cc3e32bc84 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 12 May 2022 15:50:05 +0800
Subject: [PATCH 06/13] * Fix bug #22378.

---
 module/doc/css/tablecontents.css |  7 +------
 module/doc/model.php             | 20 +-------------------
 module/doc/view/side.html.php    |  1 +
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/module/doc/css/tablecontents.css b/module/doc/css/tablecontents.css
index c00c63eff2..8e12dc7d0f 100644
--- a/module/doc/css/tablecontents.css
+++ b/module/doc/css/tablecontents.css
@@ -31,13 +31,8 @@ span.dotted-line+a {display: block;}
 .is-sorting > li:before {opacity: 1;}
 .is-sorting > li > .tree-group {opacity: 1; border-radius: 4px;}
 .is-sorting > li ul {display: none!important;}
+li.drag-shadow ul {display: none!important;}
 
 .tree-group {position: relative;}
 .tree-group > .module-name {white-space: nowrap; overflow: hidden; text-overflow: ellipsis; width: 100%; display: block;}
-.tree-group .tree-actions {display: none; position: absolute; right: 0; top: 0; background-color: #fff; white-space: nowrap;}
-.tree-group:hover > .module-name {width: calc(100% - 20px);}
-.tree-group:hover .tree-actions {display: block}
 .tree li.has-list.open:before {left: 6px;}
-.sortable-sorting .tree-group:hover .tree-actions {display: none;}
-.sortDoc>.tail-info{right: 20px;}
-.sortDoc>.tree-actions{position: absolute; right: 0px; background: #fff;}
diff --git a/module/doc/model.php b/module/doc/model.php
index 87f9a94b0c..73acea6885 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -2417,12 +2417,6 @@ EOT;
                 if($currentMethod == 'tablecontents')
                 {
                     $treeMenu[0] .= '<div class="tree-group"><span class="tail-info">' . zget($users, $doc->editedBy) . ' &nbsp;' . $doc->editedDate . '</span>';
-                    if(common::hasPriv('doc', 'updateOrder'))
-                    {
-                        $treeMenu[0] .= "<div class='tree-actions'>";
-                        $treeMenu[0] .= html::a('javascript:;', "<i class='icon icon-move sortDoc'></i>", '', "title='{$this->lang->doc->updateOrder}' class='sortDoc'");
-                        $treeMenu[0] .= '</div>';
-                    }
                 }
                 if($currentMethod == 'objectlibs')
                 {
@@ -2495,12 +2489,6 @@ EOT;
                     if($currentMethod == 'tablecontents')
                     {
                         $treeMenu[$module->id] .= '<div class="tree-group"><span class="tail-info">' . zget($users, $doc->editedBy) . ' &nbsp;' . $doc->editedDate . '</span>';
-                        if(common::hasPriv('doc', 'updateOrder'))
-                        {
-                            $treeMenu[$module->id] .= "<div class='tree-actions'>";
-                            $treeMenu[$module->id] .= html::a('javascript:;', "<i class='icon icon-move sortDoc'></i>", '', "title='{$this->lang->doc->updateOrder}' class='sortDoc'");
-                            $treeMenu[$module->id] .= '</div>';
-                        }
                     }
 
                     if($currentMethod == 'objectlibs')
@@ -2535,13 +2523,7 @@ EOT;
         else
         {
             $li = "<div class='tree-group'><span class='module-name'><a class='sort-module' title='{$module->name}'>" . $module->name . '</a></span>';
-            if($currentMethod == 'tablecontents' and common::hasPriv('tree', 'updateOrder'))
-            {
-                $li .= "<div class='tree-actions'>";
-                $li .= html::a('javascript:;', "<i class='icon icon-move sortModule'></i>", '', "title='{$this->lang->doc->updateOrder}' class='sortModule'");
-                $li .= '</div>';
-            }
-            else
+            if($currentMethod != 'tablecontents')
             {
                 if(common::hasPriv('tree', 'edit') or common::hasPriv('tree', 'browse') or common::hasPriv('tree', 'browse') or common::hasPriv('tree', 'updateOrder'))
                 {
diff --git a/module/doc/view/side.html.php b/module/doc/view/side.html.php
index 701393f393..17ac0cbdf7 100644
--- a/module/doc/view/side.html.php
+++ b/module/doc/view/side.html.php
@@ -72,6 +72,7 @@ $sideWidth = common::checkNotCN() ? '270' : '238';
   .sortable-sorting .drag-shadow .tree-actions {visibility: hidden;}
   .is-sorting > li > .tree-group {opacity: 1; border-radius: 4px;}
   .is-sorting > li ul {display: none!important;}
+  li.drag-shadow ul {display: none!important;}
   </style>
   <script>
   $(function()

From a8ce3a757d65912f055ac0910ce26d61cdc9922b Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Thu, 12 May 2022 15:51:02 +0800
Subject: [PATCH 07/13] * Fix bug #22399.

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

diff --git a/module/action/config.php b/module/action/config.php
index f86dbe9e83..c97c30ae06 100755
--- a/module/action/config.php
+++ b/module/action/config.php
@@ -59,7 +59,7 @@ $config->action->majorList['execution'] = array('opened', 'edited');
 
 $config->action->needGetProjectType = 'build,task,bug,case,testcase,caselib,testtask,testsuite,testreport,doc,issue,release,risk,design,opportunity,trainplan,gapanalysis,researchplan,researchreport,';
 $config->action->needGetRelateField = ',story,productplan,release,task,build,bug,testcase,case,testtask,testreport,doc,doclib,issue,risk,opportunity,trainplan,gapanalysis,team,whitelist,researchplan,researchreport,meeting,kanbanlane,kanbancolumn,';
-$config->action->noLinkModules      = ',doclib,module,webhook,gitlab,sonarqube,pipeline,jenkins,kanban,kanbanspace,kanbancolumn,kanbanlane,kanbanregion,kanbancard,execution,project,traincategory,apistruct,program,product,user,';
+$config->action->noLinkModules      = ',doclib,module,webhook,gitlab,sonarqube,pipeline,jenkins,kanban,kanbanspace,kanbancolumn,kanbanlane,kanbanregion,kanbancard,execution,project,traincategory,apistruct,program,product,user,entry,';
 
 $config->action->preferredTypeNum = 10;
 

From 60f8ffd05ef0bc846a69b938c4d9a388cd43502e Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Thu, 12 May 2022 16:24:09 +0800
Subject: [PATCH 08/13] * Resolve issue #634.

---
 module/action/view/trash.html.php | 10 ----------
 module/backup/view/index.html.php | 10 ----------
 module/common/lang/en.php         |  2 ++
 module/common/lang/menu.php       |  3 ++-
 module/common/lang/zh-cn.php      |  2 ++
 5 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 16edede05c..a2d0f1b123 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -63,16 +63,6 @@
 </div>
 
 <div id='mainContent' class="main-row">
-  <div class='side-col' id='sidebar'>
-    <div class='cell'>
-      <div class='list-group'>
-        <?php
-        echo html::a($this->createLink('backup', 'index'), $lang->backup->common);
-        echo html::a($this->createLink('action', 'trash'), $lang->action->trash, '', "class='active'");
-        ?>
-      </div>
-    </div>
-  </div>
   <div class='main-table' data-ride='table'>
     <table class='table has-sort-head'>
       <?php $vars = "browseType=$currentObjectType&type=$type&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
diff --git a/module/backup/view/index.html.php b/module/backup/view/index.html.php
index 5572e7c853..8097a4e1b7 100644
--- a/module/backup/view/index.html.php
+++ b/module/backup/view/index.html.php
@@ -20,16 +20,6 @@
   <div class='btn-toolbar pull-left'><?php // common::printAdminSubMenu('system');?></div>
 </div>
 <div id='mainContent' class="main-row">
-  <div class='side-col' id='sidebar'>
-    <div class='cell'>
-      <div class='list-group'>
-        <?php
-        echo html::a($this->inLink('index'), $lang->backup->common, '', "class='active'");
-        echo html::a($this->createLink('action', 'trash'), $lang->action->trash);
-        ?>
-      </div>
-    </div>
-  </div>
   <div class="main-col main-content">
     <div class='main-header'>
       <h2>
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index c82def56a5..d6066eca60 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -192,6 +192,8 @@ $lang->stage->common      = 'Stage';
 $lang->stage->list        = 'Stage List';
 $lang->execution->list    = "{$lang->executionCommon} List";
 $lang->kanban->common     = 'Kanban';
+$lang->backup->common     = 'Backup';
+$lang->action->trash      = 'Recycle';
 
 $lang->personnel->common     = 'Member';
 $lang->personnel->invest     = 'Investment';
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 0dcb23fc53..6899c593d3 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -536,7 +536,8 @@ $lang->admin->menu->dev['menuOrder'][15] = 'editor';
 $lang->admin->menu->dev['menuOrder'][20] = 'entry';
 
 $lang->admin->menu->system['subMenu']              = new stdclass();
-$lang->admin->menu->system['subMenu']->data        = array('link' => "{$lang->admin->data}|backup|index", 'subModule' => 'action');
+$lang->admin->menu->system['subMenu']->backup      = array('link' => "{$lang->backup->common}|backup|index");
+$lang->admin->menu->system['subMenu']->trash       = array('link' => "{$lang->action->trash}|action|trash");
 $lang->admin->menu->system['subMenu']->safe        = array('link' => "$lang->security|admin|safe", 'alias' => 'checkweak');
 $lang->admin->menu->system['subMenu']->cron        = array('link' => "{$lang->admin->cron}|cron|index", 'subModule' => 'cron');
 $lang->admin->menu->system['subMenu']->timezone    = array('link' => "$lang->timezone|custom|timezone");
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 91c85e100e..07ffa94699 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -192,6 +192,8 @@ $lang->stage->common      = '阶段';
 $lang->stage->list        = '阶段列表';
 $lang->execution->list    = "{$lang->executionCommon}列表";
 $lang->kanban->common     = '看板';
+$lang->backup->common     = '备份';
+$lang->action->trash      = '回收站';
 
 $lang->personnel->common     = '人员';
 $lang->personnel->invest     = '投入人员';

From 85469bca874dc21f18e793b0747075998198e12a Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 12 May 2022 16:34:23 +0800
Subject: [PATCH 09/13] * Fix bug #22436.

---
 module/action/control.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/action/control.php b/module/action/control.php
index 604a4a8e8d..2df3d88288 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -49,6 +49,7 @@ class action extends control
         $this->session->set('researchplanList',   $uri, 'project');
         $this->session->set('researchreportList', $uri, 'project');
         $this->session->set('meetingList',        $uri, 'project');
+        $this->session->set('designList',         $uri, 'project');
         $this->session->set('storyLibList',       $uri, 'assetlib');
         $this->session->set('issueLibList',       $uri, 'assetlib');
         $this->session->set('riskLibList',        $uri, 'assetlib');

From 96b422d247f317ce6334acc870615d8246e637f0 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Thu, 12 May 2022 08:41:39 +0000
Subject: [PATCH 10/13] * Fix bug #22411.

---
 module/project/model.php    | 25 ++++++++-----------------
 module/testtask/control.php |  2 +-
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/module/project/model.php b/module/project/model.php
index b65d3d13af..b6151befc2 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -515,11 +515,7 @@ class projectModel extends model
             }
             elseif($module == 'story')
             {
-                if($method == 'create')
-                {
-                    $link = helper::createLink($module, $method);
-                }
-                elseif($method == 'change')
+                if($method == 'change' or $method == 'create')
                 {
                     $link = helper::createLink('projectstory', 'story', "projectID=%s");
                 }
@@ -528,26 +524,19 @@ class projectModel extends model
                     $link = helper::createLink('project', 'testcase', "projectID=%s");
                 }
             }
-            elseif($module == 'testcase' and $method == 'create')
+            elseif($module == 'testcase')
             {
-                if($method == 'create')
-                {
-                    $link = helper::createLink($module, $method);
-                }
-                elseif($method == 'edit')
-                {
-                    $link = helper::createLink('project', 'testcase', "projectID=%s");
-                }
+                $link = helper::createLink('project', 'testcase', "projectID=%s");
             }
             elseif($module == 'testtask')
             {
-                if($method == 'create')
+                if($method == 'browseunits')
                 {
-                    $link = helper::createLink($module, $method, "product=0&executionID=0&build=0&projectID=%s");
+                    $link = helper::createLink('project', 'testcase', "projectID=%s");
                 }
                 else
                 {
-                    $link = helper::createLink($module, 'browseunits');
+                    $link = helper::createLink('project', 'testtask', "projectID=%s");
                 }
             }
             elseif($module == 'testreport')
@@ -2476,6 +2465,8 @@ class projectModel extends model
 
         $this->lang->switcherMenu = $this->getSwitcher($objectID, $this->app->rawModule, $this->app->rawMethod);
 
+        $this->savestate($objectID);
+
         common::setMenuVars('project', $objectID);
     }
 
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 1b3f609a20..13b8418a7e 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -165,7 +165,7 @@ class testtask extends control
                 $this->lang->waterfall->menu->qa['subMenu']->testtask['subModule'] = '';
             }
 
-            $this->loadModel('project')->setMenu($this->session->project);
+            $this->loadModel('project')->setMenu($projectID);
             $this->lang->modulePageNav = $this->product->select($this->products, $productID, 'testtask', 'browseUnits', "projectID=$projectID", '', 0, '', false);
         }
         else

From 44783b57a57b2821f90b86f774b13837f55c7409 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Thu, 12 May 2022 08:52:17 +0000
Subject: [PATCH 11/13] * Optimize code.

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

diff --git a/module/project/model.php b/module/project/model.php
index b6151befc2..06b9aa0f71 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2465,7 +2465,7 @@ class projectModel extends model
 
         $this->lang->switcherMenu = $this->getSwitcher($objectID, $this->app->rawModule, $this->app->rawMethod);
 
-        $this->savestate($objectID);
+        $this->saveState($objectID, $this->project->getPairsByProgram());
 
         common::setMenuVars('project', $objectID);
     }

From 63bd7e6902b0845c78f69153a33a467eea04b99f Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Thu, 12 May 2022 17:04:55 +0800
Subject: [PATCH 12/13] * add sql

---
 db/update16.5.sql             | 46 ++++++++++++++++++++++++++++++++++-
 module/program/lang/en.php    | 14 +++++++++++
 module/program/lang/zh-cn.php | 14 +++++++++++
 3 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/db/update16.5.sql b/db/update16.5.sql
index 8a283ee669..15182f0f63 100644
--- a/db/update16.5.sql
+++ b/db/update16.5.sql
@@ -132,7 +132,7 @@ UPDATE `zt_workflowaction` SET `position` = 'browse' WHERE `module` = 'story' an
 UPDATE `zt_workflowaction` SET `position` = 'browse' WHERE `module` = 'story' and `action` = 'import' and `vision` = 'rnd';
 UPDATE `zt_workflowaction` SET `position` = 'browse' WHERE `module` = 'story' and `action` = 'view' and `vision` = 'rnd';
 UPDATE `zt_workflowaction` SET `show` = 'direct' WHERE `module` = 'story'  and `vision` = 'rnd' and action NOT IN ('exporttemplate', 'import');
-UPDATE `zt_workflowaction` SET `show` = 'direct' WHERE `module` = 'program'  and `vision` = 'rnd'
+UPDATE `zt_workflowaction` SET `show` = 'direct' WHERE `module` = 'program'  and `vision` = 'rnd';
 
 DELETE FROM `zt_workflowfield` WHERE `module`='execution' AND `field`='stage';
 DELETE FROM `zt_workflowfield` WHERE `module`='program' AND `field`='stage';
@@ -418,3 +418,47 @@ UPDATE `zt_workflowaction` SET `type`='single', `position`='browseandview', `sho
 UPDATE `zt_workflowaction` SET `type`='single', `position`='browse', `show`='direct', `open`='normal', `layout`='side' WHERE `module`='task' AND `action`='view';
 UPDATE `zt_workflowaction` SET `type`='batch' WHERE `module`IN ('feedback','caselib','testsuite','testtask','testcase') AND `action` IN ('admin','browse','batchedit','batchcreate','import','showimport');
 UPDATE `zt_workflowaction` SET `position`='browse' WHERE `module`IN ('feedback','caselib','testsuite','testtask','testcase') AND `action` IN ('batchedit','batchcreate','import','showimport');
+
+
+UPDATE `zt_workflowfield` SET `control` = 'radio' WHERE `module` = 'program' and `field` = 'deleted';
+UPDATE `zt_workflowfield` SET `type` = 'char', `length` => '30', `control` = 'radio' WHERE `module` = 'program' and `field` = 'type';
+UPDATE `zt_workflowfield` SET `control` = 'date' WHERE `module` = 'program' and `field` = 'begin';
+UPDATE `zt_workflowfield` SET `control` = 'date' WHERE `module` = 'program' and `field` = 'end';
+UPDATE `zt_workflowfield` SET `control` = 'integer' WHERE `module` = 'program' and `field` = 'days';
+UPDATE `zt_workflowfield` SET `control` = 'select', `options` = '[1,2,3,4]' WHERE `module` = 'program' and `field` = 'pri';
+UPDATE `zt_workflowfield` SET `control` = 'richtext' WHERE `module` = 'program' and `field` = 'desc';
+UPDATE `zt_workflowfield` SET `control` = 'datetime' WHERE `module` = 'program' and `field` = 'openedDate';
+UPDATE `zt_workflowfield` SET `control` = 'datetime' WHERE `module` = 'program' and `field` = 'closedDate';
+UPDATE `zt_workflowfield` SET `control` = 'datetime' WHERE `module` = 'program' and `field` = 'canceledDate';
+UPDATE `zt_workflowfield` SET `type` => 'char', `length` => '30' WHERE `module` = 'program' and `field` = 'acl';
+UPDATE `zt_workflowfield` SET `control` = 'multi-select', `options` = 'user' WHERE `module` = 'program' and `field` = 'whitelist';
+UPDATE `zt_workflowfield` SET `control` = 'radio' WHERE `module` = 'program' and `field` = 'deleted';
+UPDATE `zt_workflowfield` SET `control` = 'radio' WHERE `module` = 'program' and `field` = 'deleted';
+UPDATE `zt_workflowfield` SET `control` = 'radio' WHERE `module` = 'program' and `field` = 'deleted';
+UPDATE `zt_workflowfield` SET `control` = 'radio' WHERE `module` = 'program' and `field` = 'deleted';
+UPDATE `zt_workflowfield` SET `control` = 'radio' WHERE `module` = 'program' and `field` = 'deleted';
+UPDATE `zt_workflowfield` SET `control` = 'radio' WHERE `module` = 'program' and `field` = 'deleted';
+UPDATE `zt_workflowfield` SET `control` = 'radio' WHERE `module` = 'program' and `field` = 'deleted';
+
+
+
+REPLACE INTO `zt_workflowfield` (`module`, `field`, `type`, `length`, `name`, `control`, `expression`, `options`, `default`, `rules`, `placeholder`, `order`, `searchOrder`, `exportOrder`, `canExport`, `canSearch`, `isValue`, `readonly`, `buildin`, `desc`, `createdBy`, `createdDate`, `editedBy`, `editedDate`) VALUES
+('program', 'lifetime', 	'char', 	'30', 	'项目周期', 		'input', 	'', '',   	'',  '', '', 29, 0, 0, '0', '0', '0', '1', 1, '', '', '2022-04-19 10:14:25', '', '0000-00-00 00:00:00'),
+('program', 'output',   	'text', 	'',   	'输出',    		'textarea', '', '',   	'',  '', '', 30, 0, 0, '0', '0', '0', '1', 1, '', '', '2022-04-19 10:14:25', '', '0000-00-00 00:00:00'),
+('program', 'auth',     	'char', 	'30', 	'权限控制', 		'input', 	'', '',   	'',  '', '', 31, 0, 0, '0', '0', '0', '1', 1, '', '', '2022-04-19 10:14:25', '', '0000-00-00 00:00:00'),
+('program', 'path',     	'varchar', 	'255', 	'路径', 		'input', 	'', '',   	'',  '', '', 32, 0, 0, '0', '0', '0', '1', 1, '', '', '2022-04-19 10:14:25', '', '0000-00-00 00:00:00'),
+('program', 'grade',    	'tinyint', 	'3', 	'层级', 		'integer', 	'', '',   	'',  '', '', 33, 0, 0, '0', '0', '0', '1', 1, '', '', '2022-04-19 10:14:25', '', '0000-00-00 00:00:00'),
+('program', 'realBegan', 	'date', 	'', 	'实际开始日期', 	'date', 	'', '',   	'',  '', '', 34, 0, 0, '0', '0', '0', '1', 1, '', '', '2022-04-19 10:14:25', '', '0000-00-00 00:00:00'),
+('program', 'realEnd', 		'date', 	'', 	'实际完成日期', 	'date', 	'', '',   	'',  '', '', 35, 0, 0, '0', '0', '0', '1', 1, '', '', '2022-04-19 10:14:25', '', '0000-00-00 00:00:00'),
+('program', 'version', 		'smallint',     '6', 	'版本', 		'integer', 	'', '',   	'',  '', '', 36, 0, 0, '0', '0', '0', '1', 1, '', '', '2022-04-19 10:14:25', '', '0000-00-00 00:00:00'),
+('program', 'parentVersion',	'smallint',     '6', 	'父版本', 		'integer', 	'', '',   	'',  '', '', 37, 0, 0, '0', '0', '0', '1', 1, '', '', '2022-04-19 10:14:25', '', '0000-00-00 00:00:00'),
+('program', 'planDuration', 	'smallint',     '6', 	'计划周期天数', 	'integer', 	'', '',   	'',  '', '', 38, 0, 0, '0', '0', '0', '1', 1, '', '', '2022-04-19 10:14:25', '', '0000-00-00 00:00:00'),
+('program', 'realDuration', 	'smallint',     '6', 	'实际周期天数', 	'integer', 	'', '',   	'',  '', '', 39, 0, 0, '0', '0', '0', '1', 1, '', '', '2022-04-19 10:14:25', '', '0000-00-00 00:00:00'),
+('program', 'openedVersion', 	'smallint',     '6', 	'创建版本', 		'integer', 	'', '',   	'',  '', '', 40, 0, 0, '0', '0', '0', '1', 1, '', '', '2022-04-19 10:14:25', '', '0000-00-00 00:00:00'),
+('program', 'lastEditedBy', 	'varchar', 	'30', 	'最后编辑人', 		'select', 	'', 'user', '',  '', '', 41, 0, 0, '0', '0', '0', '1', 1, '', '', '2022-04-19 10:14:25', '', '0000-00-00 00:00:00'),
+('program', 'lastEditedDate', 	'datetime',     '', 	'最后编辑日期', 	'datetime', '', '',   	'',  	'', '', 42, 0, 0, '0', '0', '0', '1', 1, '', '', '2022-04-19 10:14:25', '', '0000-00-00 00:00:00'),
+('program', 'suspendedDate', 	'date', 	'', 	'suspendedDate',	'date', 	'', '',   	'',  	'', '', 43, 0, 0, '0', '0', '0', '1', 1, '', '', '2022-04-19 10:14:25', '', '0000-00-00 00:00:00'),
+('program', 'vision', 		'varchar', 	'10', 	'vision', 		'input', 	'', '',   	'rnd', 	'', '', 44, 0, 0, '0', '0', '0', '1', 1, '', '', '2022-04-19 10:14:25', '', '0000-00-00 00:00:00'),
+('program', 'displayCards', 	'enum', 	'', 	'displayCards', 	'radio', 	'', '[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',   '0',  '', '', 45, 0, 0, '0', '0', '0', '1', 1, '', '', '2022-04-19 10:14:25', '', '0000-00-00 00:00:00'),
+('program', 'fluidBoard', 	'enum', 	'', 	'fluidBoard', 		'radio', 	'', '[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',   '0',  '', '', 46, 0, 0, '0', '0', '0', '1', 1, '', '', '2022-04-19 10:14:25', '', '0000-00-00 00:00:00');
+
diff --git a/module/program/lang/en.php b/module/program/lang/en.php
index 754323b538..7f610919d4 100644
--- a/module/program/lang/en.php
+++ b/module/program/lang/en.php
@@ -31,6 +31,20 @@ $lang->program->days           = 'Days';
 $lang->program->acl            = 'Access Control';
 $lang->program->whitelist      = 'WhiteList';
 $lang->program->deleted        = 'Deleted';
+$lang->program->lifetime       = 'Lifetime';
+$lang->program->output         = 'Output';
+$lang->program->auth           = 'Auth';
+$lang->program->path           = 'Path';
+$lang->program->grade          = 'Grade';
+$lang->program->realBegan      = 'RealBegan';
+$lang->program->realEnd        = 'RealEnd';
+$lang->program->version        = 'Version';
+$lang->program->parentVersion  = 'ParentVersion';
+$lang->program->planDuration   = 'PlanDuration';
+$lang->program->realDuration   = 'RealDuration';
+$lang->program->openedVersion  = 'OpenedVersion';
+$lang->program->lastEditedBy   = 'LastEditedBy';
+$lang->program->lastEditedDate = 'LastEditedDate';
 
 /* Actions. */
 $lang->program->common                  = 'Program';
diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php
index f4279b673c..bdbc4f48b3 100644
--- a/module/program/lang/zh-cn.php
+++ b/module/program/lang/zh-cn.php
@@ -31,6 +31,20 @@ $lang->program->days           = '可用工作日';
 $lang->program->acl            = '访问控制';
 $lang->program->whitelist      = '白名单';
 $lang->program->deleted        = '已删除';
+$lang->program->lifetime       = '项目周期';
+$lang->program->output         = '输出';
+$lang->program->auth           = '权限控制';
+$lang->program->path           = '路径';
+$lang->program->grade          = '层级';
+$lang->program->realBegan      = '实际开始日期';
+$lang->program->realEnd        = '实际完成日期';
+$lang->program->version        = '版本';
+$lang->program->parentVersion  = '父版本';
+$lang->program->planDuration   = '计划周期天数';
+$lang->program->realDuration   = '实际周期天数';
+$lang->program->openedVersion  = '创建版本';
+$lang->program->lastEditedBy   = '最后编辑人';
+$lang->program->lastEditedDate = '最后编辑日期';
 
 /* Actions. */
 $lang->program->common                  = '项目集';

From 24a67405db7eb43720f6b3098b3c6979a9701283 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Thu, 12 May 2022 17:07:58 +0800
Subject: [PATCH 13/13] * add sql

---
 db/update16.5.sql | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/db/update16.5.sql b/db/update16.5.sql
index 15182f0f63..77b5fecc70 100644
--- a/db/update16.5.sql
+++ b/db/update16.5.sql
@@ -419,7 +419,6 @@ UPDATE `zt_workflowaction` SET `type`='single', `position`='browse', `show`='dir
 UPDATE `zt_workflowaction` SET `type`='batch' WHERE `module`IN ('feedback','caselib','testsuite','testtask','testcase') AND `action` IN ('admin','browse','batchedit','batchcreate','import','showimport');
 UPDATE `zt_workflowaction` SET `position`='browse' WHERE `module`IN ('feedback','caselib','testsuite','testtask','testcase') AND `action` IN ('batchedit','batchcreate','import','showimport');
 
-
 UPDATE `zt_workflowfield` SET `control` = 'radio' WHERE `module` = 'program' and `field` = 'deleted';
 UPDATE `zt_workflowfield` SET `type` = 'char', `length` => '30', `control` = 'radio' WHERE `module` = 'program' and `field` = 'type';
 UPDATE `zt_workflowfield` SET `control` = 'date' WHERE `module` = 'program' and `field` = 'begin';
@@ -432,15 +431,6 @@ UPDATE `zt_workflowfield` SET `control` = 'datetime' WHERE `module` = 'program'
 UPDATE `zt_workflowfield` SET `control` = 'datetime' WHERE `module` = 'program' and `field` = 'canceledDate';
 UPDATE `zt_workflowfield` SET `type` => 'char', `length` => '30' WHERE `module` = 'program' and `field` = 'acl';
 UPDATE `zt_workflowfield` SET `control` = 'multi-select', `options` = 'user' WHERE `module` = 'program' and `field` = 'whitelist';
-UPDATE `zt_workflowfield` SET `control` = 'radio' WHERE `module` = 'program' and `field` = 'deleted';
-UPDATE `zt_workflowfield` SET `control` = 'radio' WHERE `module` = 'program' and `field` = 'deleted';
-UPDATE `zt_workflowfield` SET `control` = 'radio' WHERE `module` = 'program' and `field` = 'deleted';
-UPDATE `zt_workflowfield` SET `control` = 'radio' WHERE `module` = 'program' and `field` = 'deleted';
-UPDATE `zt_workflowfield` SET `control` = 'radio' WHERE `module` = 'program' and `field` = 'deleted';
-UPDATE `zt_workflowfield` SET `control` = 'radio' WHERE `module` = 'program' and `field` = 'deleted';
-UPDATE `zt_workflowfield` SET `control` = 'radio' WHERE `module` = 'program' and `field` = 'deleted';
-
-
 
 REPLACE INTO `zt_workflowfield` (`module`, `field`, `type`, `length`, `name`, `control`, `expression`, `options`, `default`, `rules`, `placeholder`, `order`, `searchOrder`, `exportOrder`, `canExport`, `canSearch`, `isValue`, `readonly`, `buildin`, `desc`, `createdBy`, `createdDate`, `editedBy`, `editedDate`) VALUES
 ('program', 'lifetime', 	'char', 	'30', 	'项目周期', 		'input', 	'', '',   	'',  '', '', 29, 0, 0, '0', '0', '0', '1', 1, '', '', '2022-04-19 10:14:25', '', '0000-00-00 00:00:00'),