From f5056eb8027de786c6fcc5335dcc7693987d0d60 Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Tue, 21 Feb 2023 09:50:19 +0000
Subject: [PATCH 01/23] * Adjust code for feedback #2274.

---
 module/build/model.php     | 10 ++++++----
 module/company/control.php |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/module/build/model.php b/module/build/model.php
index 7422b98a30..13e6563603 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -478,11 +478,13 @@ class buildModel extends model
      */
     public function update($buildID)
     {
-        $buildID  = (int)$buildID;
-        $oldBuild = $this->dao->select('*')->from(TABLE_BUILD)->where('id')->eq($buildID)->fetch();
-        $build    = fixer::input('post')->stripTags($this->config->build->editor->edit['id'], $this->config->allowedTags)
+        $buildID    = (int)$buildID;
+        $oldBuild   = $this->dao->select('*')->from(TABLE_BUILD)->where('id')->eq($buildID)->fetch();
+        $newProduct = $this->dao->select('id,type')->from(TABLE_PRODUCT)->where('id')->eq($_POST['product'])->fetchPairs();
+        $branch     = (!isset($_POST['branch']) or $newProduct == 'normal') ? 0 : $oldBuild->branch;
+        $build      = fixer::input('post')->stripTags($this->config->build->editor->edit['id'], $this->config->allowedTags)
             ->add('id', $buildID)
-            ->setIF(!isset($_POST['branch']), 'branch', $oldBuild->branch)
+            ->setDefault('branch', $branch)
             ->setDefault('product', $oldBuild->product)
             ->setDefault('builds', '')
             ->cleanInt('product,execution')
diff --git a/module/company/control.php b/module/company/control.php
index b978bff34f..16500a0984 100755
--- a/module/company/control.php
+++ b/module/company/control.php
@@ -226,7 +226,7 @@ class company extends control
         $executionList = $this->execution->getByIdList(array_keys($executions));
         foreach($executionList as $executionID => $execution)
         {
-            if(isset($projects[$execution->project])) $executions[$execution->id] = $projects[$execution->project] . $executions[$execution->id]; 
+            if(isset($projects[$execution->project])) $executions[$execution->id] = $projects[$execution->project] . $executions[$execution->id];
         }
 
         $executions = array($this->lang->execution->common) + $executions;

From fe93b22b6839e8ee712e5ab57440139c8b12b9d8 Mon Sep 17 00:00:00 2001
From: Yagami <sunguangming@easycorp.ltd>
Date: Wed, 22 Feb 2023 11:22:29 +0800
Subject: [PATCH 02/23] * Code for program browse icon.

---
 module/program/css/browse.css             | 2 +-
 module/program/view/browsebylist.html.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 module/program/css/browse.css
 mode change 100644 => 100755 module/program/view/browsebylist.html.php

diff --git a/module/program/css/browse.css b/module/program/css/browse.css
old mode 100644
new mode 100755
index fae35ad361..d3e93a49dc
--- a/module/program/css/browse.css
+++ b/module/program/css/browse.css
@@ -20,4 +20,4 @@ div.checkbox-primary + span.table-nest-icon {margin-left: 0px !important;}
 #checkAll + label.hover:after {border-width: 0px;}
 .c-budget {width:100px; text-align: right; padding-right:16px !important;}
 .c-status {width: 65px !important;}
-.icon-scrum.table-nest-toggle:after, .icon-waterfall.table-nest-toggle:after, .icon-kanban.table-nest-toggle:after {content: ''; border: 0;}
+.icon-scrum.table-nest-toggle:after, .icon-waterfall.table-nest-toggle:after, .icon-kanban.table-nest-toggle:after, .icon-waterfallplus.table-nest-toggle:after, .icon-aglieplus.table-nest-toggle:after {content: ''; border: 0;}
diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php
old mode 100644
new mode 100755
index f0dac233f4..46a69e5651
--- a/module/program/view/browsebylist.html.php
+++ b/module/program/view/browsebylist.html.php
@@ -122,6 +122,8 @@ th.table-nest-title > .table-nest-toggle-global:before {width: 100%; left: 0 !im
 #programTableList .icon-scrum:before {content: '\e9a2';}
 #programTableList .icon-waterfall:before {content: '\e9a4';}
 #programTableList .icon-kanban:before {content: '\e983';}
+#programTableList .icon-waterfallplus:before {content: '\e9ed';}
+#programTableList .icon-agileplus:before {content: '\e9ee';}
 #programTableList > tr[data-type="program"] > .c-name > a {color: #0b0f18;}
 #programTableList > tr[data-nest-parent] {background: #f8f8f8;}
 </style>

From e9ef9029b6b7c203fa79f985507f4d5f1b4463e6 Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Wed, 22 Feb 2023 11:39:36 +0800
Subject: [PATCH 03/23] * Code for task #84594.

---
 module/custom/model.php                   |  3 +++
 module/execution/control.php              |  5 +++++
 module/execution/view/grouptask.html.php  | 11 +++++++----
 module/execution/view/taskkanban.html.php | 17 +++++++++++------
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/module/custom/model.php b/module/custom/model.php
index edcadec2f5..84e64c72c6 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -204,6 +204,9 @@ class customModel extends model
                 ksort($menuOrder);
                 foreach($menuOrder as $name)
                 {
+                    /* If menu is removed, delete the menuOrder. */
+                    if(!isset($allMenu->$name)) continue;
+
                     $item = new stdclass();
                     $item->name   = $name;
                     $item->hidden = false;
diff --git a/module/execution/control.php b/module/execution/control.php
index b97958c31b..de1faad15c 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2732,12 +2732,17 @@ class execution extends control
 
         if($groupBy == 'story' and $browseType == 'task' and !isset($this->lang->kanban->orderList[$orderBy])) $orderBy = 'id_asc';
         $kanbanGroup = $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy, '', $orderBy);
+
         if(empty($kanbanGroup))
         {
             $this->kanban->createExecutionLane($executionID, $browseType);
             $kanbanGroup = $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy, '', $orderBy);
         }
 
+        /* Show lanes of the attribute: no story&bug in request, no bug in design. */
+        if(!isset($this->lang->execution->menu->story)) unset($kanbanGroup['story']);
+        if(!isset($this->lang->execution->menu->qa)) unset($kanbanGroup['bug']);
+
         /* Determines whether an object is editable. */
         $canBeChanged = common::canModify('execution', $execution);
 
diff --git a/module/execution/view/grouptask.html.php b/module/execution/view/grouptask.html.php
index 4dccd0971f..5633b05d66 100644
--- a/module/execution/view/grouptask.html.php
+++ b/module/execution/view/grouptask.html.php
@@ -63,10 +63,13 @@
         $link  = common::hasPriv('execution', 'importTask') ? $this->createLink('execution', 'importTask', "execution=$execution->id") : '#';
         echo "<li $class>" . html::a($link, $lang->execution->importTask, '', $misc) . "</li>";
 
-        $class = common::hasPriv('execution', 'importBug') ? '' : "class=disabled";
-        $misc  = common::hasPriv('execution', 'importBug') ? "class='import'" : "class=disabled";
-        $link  = common::hasPriv('execution', 'importBug') ? $this->createLink('execution', 'importBug', "execution=$execution->id") : '#';
-        echo "<li $class id='importBug'>" . html::a($link, $lang->execution->importBug, '', $misc) . "</li>";
+        if(isset($this->lang->execution->menu->qa))
+        {
+            $class = common::hasPriv('execution', 'importBug') ? '' : "class=disabled";
+            $misc  = common::hasPriv('execution', 'importBug') ? "class='import'" : "class=disabled";
+            $link  = common::hasPriv('execution', 'importBug') ? $this->createLink('execution', 'importBug', "execution=$execution->id") : '#';
+            echo "<li $class id='importBug'>" . html::a($link, $lang->execution->importBug, '', $misc) . "</li>";
+        }
         ?>
       </ul>
     </div>
diff --git a/module/execution/view/taskkanban.html.php b/module/execution/view/taskkanban.html.php
index b1446f0498..2c87281cd1 100644
--- a/module/execution/view/taskkanban.html.php
+++ b/module/execution/view/taskkanban.html.php
@@ -17,7 +17,7 @@
 <?php endif;?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <?php if($execution->lifetime != 'ops' and !in_array($execution->attribute, array('request', 'review'))):?>
+    <?php if(isset($lang->execution->menu->qa)):?>
     <div class="input-control space c-type">
       <?php echo html::select('type', $lang->kanban->type, $browseType, 'class="form-control chosen" data-max_drop_width="215"');?>
     </div>
@@ -62,7 +62,7 @@
         $link = common::hasPriv('execution', 'importTask') ?  $this->createLink('execution', 'importTask', "execution=$execution->id") : '#';
         echo "<li $misc>" . html::a($link, $lang->execution->importTask, '', $misc) . "</li>";
 
-        if($execution->lifetime != 'ops' and !in_array($execution->attribute, array('request', 'review')))
+        if(isset($lang->execution->menu->qa))
         {
             $misc = common::hasPriv('execution', 'importBug') ? '' : "class=disabled";
             $link = common::hasPriv('execution', 'importBug') ?  $this->createLink('execution', 'importBug', "execution=$execution->id") : '#';
@@ -102,12 +102,16 @@
     <div class='dropdown' id='createDropdown'>
       <button class='btn btn-primary' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i> <?php echo $this->lang->create;?> <span class='caret'></span></button>
       <ul class='dropdown-menu pull-right'>
-        <?php if($execution->lifetime != 'ops' and !in_array($execution->attribute, array('request', 'review'))):?>
+        <?php $showDivider = false;?>
+        <?php if(isset($lang->execution->menu->story)):?>
         <?php if($canCreateStory) echo '<li>' . html::a(helper::createLink('story', 'create', "productID=$productID&branch=0&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->createStory, '', "class='iframe' data-width='80%'") . '</li>';?>
         <?php if($canBatchCreateStory) echo '<li>' . html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStory, '', "class='iframe' data-width='90%'") . '</li>';?>
         <?php if($canLinkStory) echo '<li>' . html::a(helper::createLink('execution', 'linkStory', "execution=$execution->id", '', true), $lang->execution->linkStory, '', "class='iframe' data-width='90%'") . '</li>';?>
         <?php if($canLinkStoryByPlan) echo '<li>' . html::a('#linkStoryByPlan', $lang->execution->linkStoryByPlan, '', 'data-toggle="modal"') . '</li>';?>
-        <?php if($hasStoryButton and $hasBugButton) echo '<li class="divider"></li>';?>
+        <?php $showDivider = true;?>
+        <?php endif;?>
+        <?php if(isset($lang->execution->menu->qa)):?>
+        <?php if($showDivider) echo '<li class="divider"></li>';?>
         <?php if($canCreateBug) echo '<li>' . html::a(helper::createLink('bug', 'create', "productID=$productID&branch=0&extra=executionID=$execution->id", '', true), $lang->bug->create, '', "class='iframe'") . '</li>';?>
         <?php if($canBatchCreateBug)
         {
@@ -115,9 +119,9 @@
             if($productNum > 1) $batchCreateBugLink = '<li>' . html::a('#batchCreateBug', $lang->bug->batchCreate, '', "data-toggle='modal'") . '</li>';
             echo $batchCreateBugLink;
         }?>
-        <?php if(($hasStoryButton or $hasBugButton) and $hasTaskButton) echo '<li class="divider"></li>';?>
         <?php if($canImportBug) echo '<li>' . html::a(helper::createLink('execution', 'importBug', "execution=$execution->id", '', true), $lang->execution->importBug, '', "class='iframe' data-width='90%'") . '</li>';?>
         <?php endif;?>
+        <?php if($showDivider) echo '<li class="divider"></li>';?>
         <?php if($canCreateTask) echo '<li>' . html::a(helper::createLink('task', 'create', "execution=$execution->id", '', true), $lang->task->create, '', "class='iframe' data-width='80%'") . '</li>';?>
         <?php if($canBatchCreateTask) echo '<li>' . html::a(helper::createLink('task', 'batchCreate', "execution=$execution->id", '', true), $lang->execution->batchCreateTask, '', "class='iframe' data-width=90%") . '</li>';?>
       </ul>
@@ -234,5 +238,6 @@ js::set('priv',
 <?php js::set('defaultMinColWidth', $this->config->minColWidth);?>
 <?php js::set('defaultMaxColWidth', $this->config->maxColWidth);?>
 <?php js::set('teamWords', $lang->execution->teamWords);?>
-<?php js::set('canImportBug', ($execution->lifetime != 'ops' and !in_array($execution->attribute, array('request', 'review'))))?>
+<?php js::set('canImportBug', isset($lang->execution->menu->qa));?>
+
 <?php include '../../common/view/footer.html.php';?>

From 769e0d2913fdfdadaf877813d6e47087e422eb08 Mon Sep 17 00:00:00 2001
From: liuyongkai <liuyongkai@easycorp.ltd>
Date: Wed, 22 Feb 2023 13:20:44 +0800
Subject: [PATCH 04/23] * Fix bug #32376.

---
 module/file/view/export.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php
index 124be88913..4c8bb3b24e 100644
--- a/module/file/view/export.html.php
+++ b/module/file/view/export.html.php
@@ -279,7 +279,7 @@ if($isCustomExport)
             </tr>
             <tr>
               <th><?php echo $lang->file->extension;?></th>
-              <td><?php echo html::select('fileType', $lang->exportFileTypeList, '', 'onchange=switchEncode(this.value) class="form-control chosen"');?></td>
+              <td><?php echo html::select('fileType', $lang->exportFileTypeList, '', 'onchange=switchEncode(this.value) class="form-control chosen" data-drop_direction="down"');?></td>
             </tr>
             <tr>
               <th><?php echo $lang->file->encoding;?></th>

From c93d138a83bdb536613619ff82a7329a52153ce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=B2=81=E9=A3=9E?= <lufei@easycorp.ltd>
Date: Wed, 22 Feb 2023 06:20:00 +0000
Subject: [PATCH 05/23] + Support Apcu and Yac cache driver.

---
 lib/cache/cache.class.php                     |  53 +++++
 lib/cache/driver/ApcuDriver.php               | 173 +++++++++++++++
 lib/cache/driver/YacDriver.php                | 197 ++++++++++++++++++
 lib/cache/simple-cache/CacheException.php     |   7 +
 lib/cache/simple-cache/CacheInterface.php     | 114 ++++++++++
 .../simple-cache/InvalidArgumentException.php |   7 +
 6 files changed, 551 insertions(+)
 create mode 100644 lib/cache/cache.class.php
 create mode 100644 lib/cache/driver/ApcuDriver.php
 create mode 100644 lib/cache/driver/YacDriver.php
 create mode 100644 lib/cache/simple-cache/CacheException.php
 create mode 100644 lib/cache/simple-cache/CacheInterface.php
 create mode 100644 lib/cache/simple-cache/InvalidArgumentException.php

diff --git a/lib/cache/cache.class.php b/lib/cache/cache.class.php
new file mode 100644
index 0000000000..7d17873b08
--- /dev/null
+++ b/lib/cache/cache.class.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * The cache library of zentaopms.
+ *
+ * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) 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      Lu Fei <lufei@easycorp.ltd>
+ * @package     cache
+ * @link        http://www.zentao.net
+ */
+
+helper::import(dirname(__FILE__) . DS . 'simple-cache' . DS . 'CacheInterface.php');
+helper::import(dirname(__FILE__) . DS . 'simple-cache' . DS . 'CacheException.php');
+helper::import(dirname(__FILE__) . DS . 'simple-cache' . DS . 'InvalidArgumentException.php');
+helper::import(dirname(__FILE__) . DS . 'driver' . DS . 'ApcuDriver.php');
+helper::import(dirname(__FILE__) . DS . 'driver' . DS . 'YacDriver.php');
+
+use ZenTao\Cache\SimpleCache\InvalidArgumentException;
+
+class cache
+{
+    /**
+     * @var ZenTao\Cache\SimpleCache\CacheInterface
+     */
+    protected $client;
+
+    public function __construct($driver = 'Apcu', $namespace = '', $defaultLifetime = 0)
+    {
+        $driver = ucfirst(strtolower($driver));
+        switch($driver)
+        {
+            case 'Apcu':
+                $className = 'ZenTao\Cache\Driver\ApcuDriver';
+                break;
+            case 'Yac':
+                $className = 'ZenTao\Cache\Driver\YacDriver';
+                break;
+            default:
+                throw new InvalidArgumentException("Driver {$driver} is not supported.");
+        }
+
+        if(!extension_loaded($driver)) throw new InvalidArgumentException("Driver ext-{$driver} is not loaded.");
+
+        $this->client = new $className($namespace, $defaultLifetime);
+    }
+
+    public function __call($name, $arguments)
+    {
+        if(!method_exists($this->client, $name)) throw new InvalidArgumentException("Method {$name} does not exist.");
+
+        return call_user_func_array(array($this->client, $name), $arguments);
+    }
+}
diff --git a/lib/cache/driver/ApcuDriver.php b/lib/cache/driver/ApcuDriver.php
new file mode 100644
index 0000000000..7c2def717a
--- /dev/null
+++ b/lib/cache/driver/ApcuDriver.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * The cache library of zentaopms.
+ *
+ * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) 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      Lu Fei <lufei@easycorp.ltd>
+ * @package     cache
+ * @link        http://www.zentao.net
+ */
+
+namespace ZenTao\Cache\Driver;
+
+use ZenTao\Cache\SimpleCache\CacheInterface;
+use ZenTao\Cache\SimpleCache\InvalidArgumentException;
+
+class ApcuDriver implements CacheInterface
+{
+    /**
+     * @var string
+     */
+    private $namespace;
+
+    /**
+     * @var int
+     */
+    private $defaultLifetime;
+
+    public function __construct($namespace = '', $defaultLifetime = 0)
+    {
+        $this->namespace = $namespace;
+        $this->defaultLifetime = $defaultLifetime;
+    }
+
+    public function get($key, $default = null)
+    {
+        $this->assertKeyName($key);
+        $key = $this->buildKeyName($key);
+
+        $value = apcu_fetch($key, $success);
+
+        return $success === false ? $default : $value;
+    }
+
+    public function set($key, $value, $ttl = null)
+    {
+        $this->assertKeyName($key);
+        $key = $this->buildKeyName($key);
+
+        $ttl = is_null($ttl) ? $this->defaultLifetime : $ttl;
+
+        return apcu_store($key, $value, (int) $ttl);
+    }
+
+    public function delete($key)
+    {
+        $this->assertKeyName($key);
+        $key = $this->buildKeyName($key);
+
+        return apcu_delete($key);
+    }
+
+    public function clear()
+    {
+        return apcu_clear_cache();
+    }
+
+    public function getMultiple($keys, $default = null)
+    {
+        $this->assertKeyNames($keys);
+        $keys = $this->buildKeyNames($keys);
+
+        $result = apcu_fetch($keys);
+
+        if(!is_null($default) && is_array($result) && count($keys) > count($result))
+        {
+            $notFoundKeys = array_diff($keys, array_keys($result));
+            $result       = array_merge($result, array_fill_keys($notFoundKeys, $default));
+        }
+
+        $mappedResult = array();
+
+        foreach($result as $key => $value)
+        {
+            $key = preg_replace("/^$this->namespace/", '', $key);
+
+            $mappedResult[$key] = $value;
+        }
+
+        return $mappedResult;
+    }
+
+    public function setMultiple($values, $ttl = null)
+    {
+        $this->assertKeyNames(array_keys($values));
+
+        $mappedByNamespaceValues = array();
+
+        foreach($values as $key => $value)
+        {
+            $mappedByNamespaceValues[$this->buildKeyName($key)] = $value;
+        }
+
+        $ttl = is_null($ttl) ? $this->defaultLifetime : $ttl;
+
+        $result = apcu_store($mappedByNamespaceValues, (int) $ttl);
+
+        return $result === true ? true : (is_array($result) && count($result) == 0 ? true : false);
+    }
+
+    public function deleteMultiple($keys)
+    {
+        $this->assertKeyNames($keys);
+        $keys = $this->buildKeyNames($keys);
+
+        $result = apcu_delete($keys);
+
+        return count($result) === count($keys) ? false : true;
+    }
+
+    public function has($key)
+    {
+        $this->assertKeyName($key);
+        $key = $this->buildKeyName($key);
+
+        return (bool) apcu_exists($key);
+    }
+
+    /**
+     * @param string $key
+     *
+     * @return string
+     */
+    private function buildKeyName($key)
+    {
+        return $this->namespace . $key;
+    }
+
+    /**
+     * @param string[] $keys
+     *
+     * @return string[]
+     */
+    private function buildKeyNames(array $keys)
+    {
+        return array_map(function($key) {
+            return $this->buildKeyName($key);
+        }, $keys);
+
+    }
+
+    /**
+     * @param mixed $key
+     *
+     * @throws InvalidArgumentException
+     */
+    private function assertKeyName($key)
+    {
+        if(!is_scalar($key) || is_bool($key)) throw new InvalidArgumentException();
+    }
+
+    /**
+     * @param string[] $keys
+     *
+     * @throws InvalidArgumentException
+     */
+    private function assertKeyNames(array $keys)
+    {
+        array_map(function ($value) {
+            $this->assertKeyName($value);
+        }, $keys);
+    }
+}
diff --git a/lib/cache/driver/YacDriver.php b/lib/cache/driver/YacDriver.php
new file mode 100644
index 0000000000..739582c2fa
--- /dev/null
+++ b/lib/cache/driver/YacDriver.php
@@ -0,0 +1,197 @@
+<?php
+/**
+ * The cache library of zentaopms.
+ *
+ * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) 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      Lu Fei <lufei@easycorp.ltd>
+ * @package     cache
+ * @link        http://www.zentao.net
+ */
+
+namespace ZenTao\Cache\Driver;
+
+use ZenTao\Cache\SimpleCache\CacheInterface;
+use ZenTao\Cache\SimpleCache\InvalidArgumentException;
+
+class YacDriver implements CacheInterface
+{
+    /**
+     * @var string
+     */
+    private $namespace;
+
+    /**
+     * @var int
+     */
+    private $defaultLifetime;
+
+    /**
+     * yac client
+     *
+     * @var \Yac
+     */
+    protected $yac;
+
+    /**
+     * if your key is longer than this, maybe you can use md5 result as the key
+     */
+    const KEY_MAX_LEN = 48;
+
+    public function __construct($namespace = '', $defaultLifetime = 0)
+    {
+        $this->namespace = $namespace;
+        $this->defaultLifetime = $defaultLifetime;
+        $this->yac = new \Yac($namespace);
+    }
+
+    public function get($key, $default = null)
+    {
+        $this->assertKeyName($key);
+        $key = $this->buildKeyName($key);
+
+        return $this->yac->get($key) ?: $default;
+    }
+
+    public function set($key, $value, $ttl = null)
+    {
+        $this->assertKeyName($key);
+        $key = $this->buildKeyName($key);
+
+        $ttl = is_null($ttl) ? $this->defaultLifetime : $ttl;
+
+        return $this->yac->set($key, $value, (int)$ttl);
+    }
+
+    public function delete($key)
+    {
+        $this->assertKeyName($key);
+        $key = $this->buildKeyName($key);
+
+        return $this->yac->delete($key);
+    }
+
+    public function clear()
+    {
+        return $this->yac->flush();
+    }
+
+    public function getMultiple($keys, $default = null)
+    {
+        if(!is_array($keys)) {
+            return array();
+        }
+
+        $hashKeyMap = array();
+        foreach($keys as $index => $key)
+        {
+            $this->assertKeyName($key);
+            if(strlen($key) > self::KEY_MAX_LEN)
+            {
+                $keys[$index] = $this->buildKeyName($key);
+                $hashKeyMap[$keys[$index]] = $key;
+            }
+        }
+
+        $results = $this->yac->get($keys);
+        if($results !== false)
+        {
+            foreach($results as $key => $value)
+            {
+                if(isset($hashKeyMap[$key]))
+                {
+                    $results[$hashKeyMap[$key]] = $value;
+                    unset($results[$key]);
+                }
+            }
+            return $results;
+        }
+
+        $results = array();
+        foreach($keys as $key)
+        {
+            $results[$key] = $default;
+        }
+        return $results;
+    }
+
+    public function setMultiple($values, $ttl = null)
+    {
+        if(!is_array($values)) return false;
+
+        foreach($values as $key => $value)
+        {
+            if(strlen($key) > self::KEY_MAX_LEN)
+            {
+                $values[$this->buildKeyName($key)] = $value;
+                unset($values[$key]);
+            }
+        }
+
+        $ttl = is_null($ttl) ? $this->defaultLifetime : $ttl;
+
+        return $this->yac->set($values, $ttl);
+    }
+
+    public function deleteMultiple($keys)
+    {
+        foreach($keys as $index => $key)
+        {
+            $keys[$index] = $this->buildKeyName($key);
+        }
+        return $this->yac->delete($keys);
+    }
+
+    public function has($key)
+    {
+        return $this->get($key) !== null;
+    }
+
+    /**
+     * @param string $key
+     *
+     * @return string
+     */
+    private function buildKeyName($key)
+    {
+        if(strlen($key) > self::KEY_MAX_LEN)
+        {
+            $key = md5($key);
+        }
+        return $key;
+    }
+
+    /**
+     * @param string[] $keys
+     *
+     * @return string[]
+     */
+    private function buildKeyNames(array $keys)
+    {
+        return array_map(function ($key) {
+            return $this->buildKeyName($key);
+        }, $keys);
+    }
+
+    /**
+     * @param mixed $key
+     *
+     * @throws InvalidArgumentException
+     */
+    private function assertKeyName($key)
+    {
+        if(!is_scalar($key) || is_bool($key)) throw new InvalidArgumentException();
+    }
+
+    /**
+     * @param string[] $keys
+     *
+     * @throws InvalidArgumentException
+     */
+    private function assertKeyNames(array $keys)
+    {
+        array_map(function ($value) {
+            $this->assertKeyName($value);
+        }, $keys);
+    }
+}
diff --git a/lib/cache/simple-cache/CacheException.php b/lib/cache/simple-cache/CacheException.php
new file mode 100644
index 0000000000..330b06084b
--- /dev/null
+++ b/lib/cache/simple-cache/CacheException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace ZenTao\Cache\SimpleCache;
+
+class CacheException extends \RuntimeException
+{
+}
diff --git a/lib/cache/simple-cache/CacheInterface.php b/lib/cache/simple-cache/CacheInterface.php
new file mode 100644
index 0000000000..e818e7da08
--- /dev/null
+++ b/lib/cache/simple-cache/CacheInterface.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace ZenTao\Cache\SimpleCache;
+
+interface CacheInterface
+{
+    /**
+     * Fetches a value from the cache.
+     *
+     * @param string $key     The unique key of this item in the cache.
+     * @param mixed  $default Default value to return if the key does not exist.
+     *
+     * @return mixed The value of the item from the cache, or $default in case of cache miss.
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if the $key string is not a legal value.
+     */
+    public function get($key, $default = null);
+
+    /**
+     * Persists data in the cache, uniquely referenced by a key with an optional expiration TTL time.
+     *
+     * @param string                 $key   The key of the item to store.
+     * @param mixed                  $value The value of the item to store, must be serializable.
+     * @param null|int|\DateInterval $ttl   Optional. The TTL value of this item. If no value is sent and
+     *                                      the driver supports TTL then the library may set a default value
+     *                                      for it or let the driver take care of that.
+     *
+     * @return bool True on success and false on failure.
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if the $key string is not a legal value.
+     */
+    public function set($key, $value, $ttl = null);
+
+    /**
+     * Delete an item from the cache by its unique key.
+     *
+     * @param string $key The unique cache key of the item to delete.
+     *
+     * @return bool True if the item was successfully removed. False if there was an error.
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if the $key string is not a legal value.
+     */
+    public function delete($key);
+
+    /**
+     * Wipes clean the entire cache's keys.
+     *
+     * @return bool True on success and false on failure.
+     */
+    public function clear();
+
+    /**
+     * Obtains multiple cache items by their unique keys.
+     *
+     * @param iterable<string> $keys    A list of keys that can be obtained in a single operation.
+     * @param mixed            $default Default value to return for keys that do not exist.
+     *
+     * @return iterable<string, mixed> A list of key => value pairs. Cache keys that do not exist or are stale will have $default as value.
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if $keys is neither an array nor a Traversable,
+     *   or if any of the $keys are not a legal value.
+     */
+    public function getMultiple($keys, $default = null);
+
+    /**
+     * Persists a set of key => value pairs in the cache, with an optional TTL.
+     *
+     * @param iterable               $values A list of key => value pairs for a multiple-set operation.
+     * @param null|int|\DateInterval $ttl    Optional. The TTL value of this item. If no value is sent and
+     *                                       the driver supports TTL then the library may set a default value
+     *                                       for it or let the driver take care of that.
+     *
+     * @return bool True on success and false on failure.
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if $values is neither an array nor a Traversable,
+     *   or if any of the $values are not a legal value.
+     */
+    public function setMultiple($values, $ttl = null);
+
+    /**
+     * Deletes multiple cache items in a single operation.
+     *
+     * @param iterable<string> $keys A list of string-based keys to be deleted.
+     *
+     * @return bool True if the items were successfully removed. False if there was an error.
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if $keys is neither an array nor a Traversable,
+     *   or if any of the $keys are not a legal value.
+     */
+    public function deleteMultiple($keys);
+
+    /**
+     * Determines whether an item is present in the cache.
+     *
+     * NOTE: It is recommended that has() is only to be used for cache warming type purposes
+     * and not to be used within your live applications operations for get/set, as this method
+     * is subject to a race condition where your has() will return true and immediately after,
+     * another script can remove it making the state of your app out of date.
+     *
+     * @param string $key The cache item key.
+     *
+     * @return bool
+     *
+     * @throws InvalidArgumentException
+     *   MUST be thrown if the $key string is not a legal value.
+     */
+    public function has($key);
+}
diff --git a/lib/cache/simple-cache/InvalidArgumentException.php b/lib/cache/simple-cache/InvalidArgumentException.php
new file mode 100644
index 0000000000..825bcdf380
--- /dev/null
+++ b/lib/cache/simple-cache/InvalidArgumentException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace ZenTao\Cache\SimpleCache;
+
+class InvalidArgumentException extends CacheException
+{
+}

From af76befb02946921193a0a773e1d5ec59e7ace31 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 22 Feb 2023 15:15:34 +0800
Subject: [PATCH 06/23] * Resolve issue #756.

---
 module/custom/view/code.html.php         |  2 +-
 module/execution/config.php              |  4 ++--
 module/execution/model.php               |  4 ++--
 module/execution/view/batchedit.html.php |  4 ++--
 module/execution/view/create.html.php    |  2 +-
 module/execution/view/edit.html.php      |  2 +-
 module/execution/view/view.html.php      |  2 +-
 module/product/config.php                |  4 ++--
 module/product/view/create.html.php      |  2 +-
 module/product/view/edit.html.php        |  2 +-
 module/product/view/view.html.php        |  2 +-
 module/programplan/model.php             |  4 ++--
 module/programplan/view/create.html.php  | 10 +++++-----
 module/programplan/view/edit.html.php    |  2 +-
 module/project/config.php                |  2 +-
 module/project/control.php               |  2 +-
 module/project/model.php                 |  4 ++--
 module/project/view/batchedit.html.php   |  4 ++--
 module/project/view/create.html.php      |  2 +-
 module/project/view/edit.html.php        |  2 +-
 module/project/view/view.html.php        |  2 +-
 21 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/module/custom/view/code.html.php b/module/custom/view/code.html.php
index 65a80730d4..643aeb940b 100644
--- a/module/custom/view/code.html.php
+++ b/module/custom/view/code.html.php
@@ -16,7 +16,7 @@
       <tr>
         <th class='c-setCode'><?php echo $lang->custom->setCode;?></th>
         <td class='c-code text-left'>
-          <?php $checkedKey = isset($config->setCode) ? $config->setCode : 1;?>
+          <?php $checkedKey = isset($config->setCode) ? $config->setCode : 0;?>
           <?php foreach($lang->custom->conceptOptions->URAndSR as $key => $value):?>
           <label class="radio-inline"><input type="radio" name="code" value="<?php echo $key?>"<?php echo $key == $checkedKey ? " checked='checked'" : ''?> id="code<?php echo $key;?>"><?php echo $value;?></label>
           <?php endforeach;?>
diff --git a/module/execution/config.php b/module/execution/config.php
index 216136c250..89311d721e 100644
--- a/module/execution/config.php
+++ b/module/execution/config.php
@@ -176,7 +176,7 @@ $config->execution->gantt->linkType['end']['end']     = 2;
 $config->execution->gantt->linkType['begin']['end']   = 3;
 
 $config->execution->datatable = new stdclass();
-if(!isset($config->setCode) or $config->setCode == 1)
+if(isset($config->setCode) and $config->setCode == 1)
 {
     $config->execution->datatable->defaultField = array('id', 'name', 'code', 'project', 'PM', 'status', 'progress', 'openedDate', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn');
 }
@@ -201,7 +201,7 @@ $config->execution->datatable->fieldList['name']['nestedToggle'] = true;
 $config->execution->datatable->fieldList['name']['iconRender']   = true;
 $config->execution->datatable->fieldList['name']['required']     = 'yes';
 
-if(!isset($config->setCode) or $config->setCode == 1)
+if(isset($config->setCode) and $config->setCode == 1)
 {
     $config->execution->datatable->fieldList['code']['title']    = 'execCode';
     $config->execution->datatable->fieldList['code']['width']    = '180';
diff --git a/module/execution/model.php b/module/execution/model.php
index 76f9b07418..f7e28ab9b7 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -533,7 +533,7 @@ class executionModel extends model
         $oldExecution = $this->dao->findById($executionID)->from(TABLE_EXECUTION)->fetch();
 
         /* Judgment of required items. */
-        if($oldExecution->type != 'stage' and $this->post->code == '' and (!isset($this->config->setCode) or $this->config->setCode == 1))
+        if($oldExecution->type != 'stage' and $this->post->code == '' and (isset($this->config->setCode) and $this->config->setCode == 1))
         {
             dao::$errors['code'] = sprintf($this->lang->error->notempty, $this->lang->execution->code);
             return false;
@@ -5789,7 +5789,7 @@ class executionModel extends model
         $_POST['status']    = $project->status;
         $_POST['acl']       = 'open';
 
-        if(!isset($this->config->setCode) or $this->config->setCode == 1) $_POST['code'] = $project->code;
+        if(isset($this->config->setCode) and $this->config->setCode == 1) $_POST['code'] = $project->code;
 
         $projectProducts = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($projectID)->fetchAll();
         foreach($projectProducts as $projectProduct)
diff --git a/module/execution/view/batchedit.html.php b/module/execution/view/batchedit.html.php
index d78ab1d11f..7f75310b9d 100755
--- a/module/execution/view/batchedit.html.php
+++ b/module/execution/view/batchedit.html.php
@@ -55,7 +55,7 @@
             <th class='c-method'><?php echo $lang->execution->method;?></th>
             <?php endif;?>
             <th class='required <?php echo $minWidth?>' style="width:100%"><?php echo $lang->execution->$name;?></th>
-            <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+            <?php if(isset($config->setCode) and $config->setCode == 1):?>
             <th class='c-code required'><?php echo $lang->execution->$code;?></th>
             <?php endif;?>
             <th class='c-user<?php echo zget($visibleFields, 'PM',       ' hidden') . zget($requiredFields, 'PM',     '', ' required');?>'><?php echo $lang->execution->$PM;?></th>
@@ -94,7 +94,7 @@
             <td title='<?php echo zget($lang->execution->typeList, $executions[$executionID]->type);?>'><?php echo zget($lang->execution->typeList, $executions[$executionID]->type);?></td>
             <?php endif;?>
             <td title='<?php echo $executions[$executionID]->name?>'><?php echo html::input("names[$executionID]", $executions[$executionID]->name, "class='form-control' id='names{$executionID}'");?></td>
-            <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+            <?php if(isset($config->setCode) and $config->setCode == 1):?>
             <td><?php echo html::input("codes[$executionID]", $executions[$executionID]->code, "id='codes{$executionID}' class='form-control'");?></td>
             <?php endif;?>
             <td class='text-left<?php echo zget($visibleFields, 'PM', ' hidden')?>' style='overflow:visible'><?php echo html::select("PMs[$executionID]", $pmUsers, $executions[$executionID]->PM, "class='form-control picker-select'");?></td>
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index f8e6f80772..7f3cc53419 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -77,7 +77,7 @@
           <td class="col-main"><?php echo html::input('name', $name, "class='form-control' required");?></td>
           <td colspan='2'></td>
         </tr>
-        <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+        <?php if(isset($config->setCode) and $config->setCode == 1):?>
         <tr>
           <th><?php echo $showExecutionExec ? $lang->execution->execCode : $lang->execution->code;?></th>
           <td><?php echo html::input('code', $code, "class='form-control' required");?></td><td></td><td></td>
diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php
index d5d43fe019..3eb89bfe7e 100644
--- a/module/execution/view/edit.html.php
+++ b/module/execution/view/edit.html.php
@@ -50,7 +50,7 @@
           <th class='w-120px'><?php echo $lang->execution->name;?></th>
           <td><?php echo html::input('name', $execution->name, "class='form-control' required");?></td><td></td>
         </tr>
-        <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+        <?php if(isset($config->setCode) and $config->setCode == 1):?>
         <tr>
           <th><?php echo $lang->execution->code;?></th>
           <td><?php echo html::input('code', $execution->code, "class='form-control' required");?></td>
diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php
index 8c059a24d5..1e1232132c 100644
--- a/module/execution/view/view.html.php
+++ b/module/execution/view/view.html.php
@@ -269,7 +269,7 @@
         <div class="col-sm-12">
           <div class="cell">
             <div class="detail">
-              <?php $hiddenCode = (isset($config->setCode) and $config->setCode == 0) ? 'hidden' : '';?>
+              <?php $hiddenCode = (!isset($config->setCode) or $config->setCode == 0) ? 'hidden' : '';?>
               <h2 class="detail-title"><span class="label-id"><?php echo $execution->id;?></span> <span class="label label-light label-outline <?php echo $hiddenCode;?>"><?php echo $execution->code;?></span> <?php echo $execution->name;?></h2>
               <div class="detail-content article-content">
                 <div><span class="text-limit hidden" data-limit-size="40"><?php echo $execution->desc;?></span><a class="text-primary text-limit-toggle small" data-text-expand="<?php echo $lang->expand;?>"  data-text-collapse="<?php echo $lang->collapse;?>"></a></div>
diff --git a/module/product/config.php b/module/product/config.php
index 2982a63191..93a32df9cf 100644
--- a/module/product/config.php
+++ b/module/product/config.php
@@ -96,7 +96,7 @@ $app->loadLang('product');
 $config->product->all = new stdclass();
 $config->product->all->search['module']                = 'product';
 $config->product->all->search['fields']['name']        = $lang->product->name;
-if(!isset($config->setCode) or $config->setCode == 1) $config->product->all->search['fields']['code'] = $lang->product->code;
+if(isset($config->setCode) and $config->setCode == 1) $config->product->all->search['fields']['code'] = $lang->product->code;
 $config->product->all->search['fields']['id']          = $lang->product->id;
 if($config->systemMode == 'ALM')
 {
@@ -113,7 +113,7 @@ $config->product->all->search['fields']['createdDate'] = $lang->product->created
 $config->product->all->search['fields']['createdBy']   = $lang->product->createdBy;
 
 $config->product->all->search['params']['name']        = array('operator' => 'include', 'control' => 'input',  'values' => '');
-if(!isset($config->setCode) or $config->setCode == 1) $config->product->all->search['params']['code'] = array('operator' => 'include', 'control' => 'input',  'values' => '');
+if(isset($config->setCode) and $config->setCode == 1) $config->product->all->search['params']['code'] = array('operator' => 'include', 'control' => 'input',  'values' => '');
 $config->product->all->search['params']['id']          = array('operator' => '=',       'control' => 'input',  'values' => '');
 if($config->systemMode == 'ALM')
 {
diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php
index c8dfe3c96c..5e67b93b56 100644
--- a/module/product/view/create.html.php
+++ b/module/product/view/create.html.php
@@ -56,7 +56,7 @@
             <th><?php echo $lang->product->name;?></th>
             <td><?php echo html::input('name', '', "class='form-control input-product-title' required");?></td><td></td>
           </tr>
-          <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+          <?php if(isset($config->setCode) and $config->setCode == 1):?>
           <tr>
             <th><?php echo $lang->product->code;?></th>
             <td><?php echo html::input('code', '', "class='form-control' required");?></td>
diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php
index 785a0c3873..69ae505779 100644
--- a/module/product/view/edit.html.php
+++ b/module/product/view/edit.html.php
@@ -47,7 +47,7 @@
             <th class='w-140px'><?php echo $lang->product->name;?></th>
             <td class='w-p40-f'><?php echo html::input('name', $product->name, "class='form-control' required");?></td><td></td>
           </tr>
-          <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+          <?php if(isset($config->setCode) and $config->setCode == 1):?>
           <tr>
             <th><?php echo $lang->product->code;?></th>
             <td><?php echo html::input('code', $product->code, "class='form-control' required");?></td><td></td>
diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php
index ba870e1d4b..4f7edfedd0 100644
--- a/module/product/view/view.html.php
+++ b/module/product/view/view.html.php
@@ -19,7 +19,7 @@
       <div class="col-sm-12">
         <div class="cell">
           <div class="detail">
-            <?php $hiddenCode = (isset($config->setCode) and $config->setCode == 0) ? 'hidden' : '';?>
+            <?php $hiddenCode = (!isset($config->setCode) or $config->setCode == 0) ? 'hidden' : '';?>
             <h2 class="detail-title"><span class="label-id"><?php echo $product->id;?></span> <span class="label label-light label-outline <?php echo $hiddenCode;?>"><?php echo $product->code;?></span> <?php echo $product->name;?></h2>
             <div class="detail-content article-content">
               <p><?php echo $product->desc;?></p>
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 3afbc2b94d..42c004d51b 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -714,7 +714,7 @@ class programplanModel extends model
         $sameNames = array_diff_assoc($names, array_unique($names));
 
         $project   = $this->loadModel('project')->getByID($projectID);
-        $setCode   = (!isset($this->config->setCode) or $this->config->setCode == 1) ? true : false;
+        $setCode   = (isset($this->config->setCode) and $this->config->setCode == 1) ? true : false;
         $sameCodes = $this->checkCodeUnique($codes, isset($planIDList) ? $planIDList : '');
 
         $datas = array();
@@ -1075,7 +1075,7 @@ class programplanModel extends model
         if($projectID) $this->loadModel('execution')->checkBeginAndEndDate($projectID, $plan->begin, $plan->end);
         if(dao::isError()) return false;
 
-        $setCode = (!isset($this->config->setCode) or $this->config->setCode == 1) ? true : false;
+        $setCode = (isset($this->config->setCode) and $this->config->setCode == 1) ? true : false;
         if($setCode and empty($plan->code))
         {
             dao::$errors['code'][] = sprintf($this->lang->error->notempty, $this->lang->execution->code);
diff --git a/module/programplan/view/create.html.php b/module/programplan/view/create.html.php
index 58082983e3..eaea0d735b 100644
--- a/module/programplan/view/create.html.php
+++ b/module/programplan/view/create.html.php
@@ -78,7 +78,7 @@
           <tr class='text-center'>
             <th class='c-type<?php echo $typeClass;?> required'><?php echo $lang->execution->method;?></th>
             <th class='c-name required'><?php echo $executionType == 'stage' ? $name : $lang->nameAB;?></th>
-            <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+            <?php if(isset($config->setCode) and $config->setCode == 1):?>
             <th class='c-code required'><?php echo $executionType == 'stage' ? $lang->execution->code : $lang->code;?></th>
             <?php endif;?>
             <th class='c-pm <?php echo zget($visibleFields, 'PM', ' hidden') . zget($requiredFields, 'PM', '', ' required');?>'><?php echo $executionType == 'stage' ? $lang->programplan->PM : $lang->programplan->PMAB;?></th>
@@ -108,7 +108,7 @@
             <?php foreach($stages as $stage):?>
             <tr>
               <td><input type='text' name='names[<?php echo $i;?>]' id='names<?php echo $i;?>' value='<?php echo $stage->name;?>' class='form-control' /></td>
-              <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+              <?php if(isset($config->setCode) and $config->setCode == 1):?>
               <td><?php echo html::input("codes[$i]", isset($stage->code) ? $stage->code : '', "class='form-control'");?></td>
               <?php endif;?>
               <td <?php echo zget($visibleFields, 'PM', ' hidden') . zget($requiredFields, 'PM', '', ' required');?>><?php echo html::select("PM[$i]", $PMUsers, '', "class='form-control picker-select'");?></td>
@@ -144,7 +144,7 @@
             <tr>
               <td class='<?php echo $typeClass . ' text-center ' .zget($lang->execution->typeList, $plan->type);?>'><?php echo zget($lang->execution->typeList, $plan->type);?></td>
               <td><input type='text' name="names[<?php echo $i;?>]" id='names<?php echo $i;?>' value='<?php echo $plan->name;?>' class='form-control' /></td>
-              <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+              <?php if(isset($config->setCode) and $config->setCode == 1):?>
               <td><?php echo html::input("codes[$i]", $plan->code, "class='form-control'");?></td>
               <?php endif;?>
               <td <?php echo zget($visibleFields, 'PM', ' hidden') . zget($requiredFields, 'PM', '', ' required');?>><?php echo html::select("PM[$i]", $PMUsers, $plan->PM, "class='form-control picker-select'");?></td>
@@ -180,7 +180,7 @@
           <tr class='addedItem'>
             <td class='<?php echo $typeClass;?>'><?php echo html::select("type[$i]", $lang->execution->typeList, '', "class='form-control chosen'");?></td>
             <td><input type='text' name='names[<?php echo $i;?>]' id='names<?php echo $i;?>' value='' class='form-control' /></td>
-            <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+            <?php if(isset($config->setCode) and $config->setCode == 1):?>
             <td><?php echo html::input("codes[$i]", '', "class='form-control'");?></td>
             <?php endif;?>
             <td <?php echo zget($visibleFields, 'PM', ' hidden') . zget($requiredFields, 'PM', '', ' required');?>><?php echo html::select("PM[$i]", $PMUsers, '', "class='form-control picker-select'");?></td>
@@ -227,7 +227,7 @@
     <tr id='addItem' class='hidden'>
       <td class='<?php echo $typeClass;?>'><?php echo html::select("type[$i]", $lang->execution->typeList, '', "class='form-control chosen'");?></td>
       <td><input type='text' name='<?php echo "names[$i]";?>' id='names<?php echo $i;?>' class='form-control' /></td>
-      <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+      <?php if(isset($config->setCode) and $config->setCode == 1):?>
       <td><?php echo html::input("codes[$i]", '', "class='form-control'");?></td>
       <?php endif;?>
       <td <?php echo zget($visibleFields, 'PM', ' hidden') . zget($requiredFields, 'PM', '', ' required');?>><?php echo html::select("PM[$i]", $PMUsers, '', "class='form-control' id='PM$i'");?></td>
diff --git a/module/programplan/view/edit.html.php b/module/programplan/view/edit.html.php
index 634d17b3d4..73ae92b6c7 100644
--- a/module/programplan/view/edit.html.php
+++ b/module/programplan/view/edit.html.php
@@ -36,7 +36,7 @@
             <th class='w-100px'><?php echo $lang->programplan->name;?> </th>
             <td colspan='2'><?php echo html::input('name', $plan->name, "class='form-control'");?></td>
           </tr>
-          <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+          <?php if(isset($config->setCode) and $config->setCode == 1):?>
           <tr>
             <th class='w-100px'><?php echo $lang->execution->code;?> </th>
             <td class='required' colspan='2'><?php echo html::input('code', $plan->code, "class='form-control'");?></td>
diff --git a/module/project/config.php b/module/project/config.php
index 6e526e769b..bb8ff5e92d 100644
--- a/module/project/config.php
+++ b/module/project/config.php
@@ -136,7 +136,7 @@ $config->project->datatable->fieldList['actions']['width']    = '165';
 $config->project->datatable->fieldList['actions']['required'] = 'yes';
 $config->project->datatable->fieldList['actions']['pri']      = '1';
 
-if(isset($config->setCode) and $config->setCode == 0) unset($config->project->datatable->fieldList['code']);
+if(!isset($config->setCode) or $config->setCode == 0) unset($config->project->datatable->fieldList['code']);
 
 $config->project->checkList = new stdclass();
 $config->project->checkList->scrum         = array('bug', 'execution', 'build', 'doc', 'release', 'testtask', 'case');
diff --git a/module/project/control.php b/module/project/control.php
index c6d9d53c0a..ba8e5bf44e 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -68,7 +68,7 @@ class project extends control
                 $fields[$fieldName] = zget($projectLang, $fieldName);
                 unset($fields[$key]);
             }
-            if(isset($this->config->setCode) and empty($this->config->setCode)) unset($fields['code']);
+            if(!isset($this->config->setCode) or empty($this->config->setCode)) unset($fields['code']);
 
             if(isset($fields['hasProduct'])) $fields['hasProduct'] = $projectLang->type;
 
diff --git a/module/project/model.php b/module/project/model.php
index cd23ccc3d0..78a943fbe9 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1023,7 +1023,7 @@ class projectModel extends model
         $programPairs += $this->loadModel('program')->getPairs();
         $this->config->project->search['params']['parent']['values'] = $programPairs;
 
-        if(isset($this->config->setCode) and $this->config->setCode == 0) unset($this->config->project->search['fields']['code'], $this->config->project->search['params']['code']);
+        if(!isset($this->config->setCode) or $this->config->setCode == 0) unset($this->config->project->search['fields']['code'], $this->config->project->search['params']['code']);
         if($this->config->systemMode == 'light') unset($this->config->project->search['fields']['parent'], $this->config->project->search['params']['parent']);
 
         $this->loadModel('search')->setSearchParams($this->config->project->search);
@@ -1250,7 +1250,7 @@ class projectModel extends model
             ->stripTags($this->config->project->editor->create['id'], $this->config->allowedTags)
             ->remove('products,branch,plans,delta,newProduct,productName,future,contactListMenu,teamMembers')
             ->get();
-        if(isset($this->config->setCode) and $this->config->setCode == 0) unset($project->code);
+        if(!isset($this->config->setCode) or $this->config->setCode == 0) unset($project->code);
 
         /* Lean mode relation defaultProgram. */
         if($this->config->systemMode == 'light') $project->parent = $this->config->global->defaultProgram;
diff --git a/module/project/view/batchedit.html.php b/module/project/view/batchedit.html.php
index 0c32848914..796850275a 100644
--- a/module/project/view/batchedit.html.php
+++ b/module/project/view/batchedit.html.php
@@ -34,7 +34,7 @@
           <th class='c-parent'><?php echo $lang->project->parent;?></th>
           <?php endif;?>
           <th class='c-name required'><?php echo $lang->project->name;?></th>
-          <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+          <?php if(isset($config->setCode) and $config->setCode == 1):?>
           <th class='c-name required'><?php echo $lang->project->code;?></th>
           <?php endif?>
           <th class="c-user-box <?php echo strpos($requiredFields, 'PM') !== false ?  'required' : '';?>"> <?php echo $lang->project->PM;?></th>
@@ -63,7 +63,7 @@
           <?php endif;?>
           <?php endif;?>
           <td title='<?php echo $project->name;?>'><?php echo html::input("names[$projectID]", $project->name, "class='form-control'");?></td>
-          <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+          <?php if(isset($config->setCode) and $config->setCode == 1):?>
           <td title='<?php echo $project->code;?>'><?php echo html::input("codes[$projectID]", $project->code, "class='form-control'");?></td>
           <?php endif;?>
           <td><?php echo html::select("PMs[$projectID]", $PMUsers, $project->PM, "class='form-control chosen'");?></td>
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 5fa5aff2a4..86aaf07843 100755
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -73,7 +73,7 @@
           <td class="col-main"><?php echo html::input('name', $name, "class='form-control' required");?></td>
           <td></td>
         </tr>
-        <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+        <?php if(isset($config->setCode) and $config->setCode == 1):?>
         <tr>
           <th><?php echo $lang->project->code;?></th>
           <td><?php echo html::input('code', $code, "class='form-control' required");?></td>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index a0d792571d..a97248f3e5 100755
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -75,7 +75,7 @@
           <td class="col-main"><?php echo html::input('name', $project->name, "class='form-control' required");?></td>
           <td colspan='2'></td>
         </tr>
-        <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+        <?php if(isset($config->setCode) and $config->setCode == 1):?>
         <tr>
           <th><?php echo $lang->project->code;?></th>
           <td><?php echo html::input('code', $project->code, "class='form-control' required");?></td>
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index f10d9f4121..2a2cf76587 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -114,7 +114,7 @@
       <div class="col-sm-12">
         <div class="cell">
           <div class="detail">
-            <?php $hiddenCode = (isset($config->setCode) and $config->setCode == 0) ? 'hidden' : '';?>
+            <?php $hiddenCode = (!isset($config->setCode) or $config->setCode == 0) ? 'hidden' : '';?>
             <h2 class="detail-title"><span class="label-id"><?php echo $project->id;?></span> <span class="label label-light label-outline <?php echo $hiddenCode;?>"><?php echo $project->code;?></span> <?php echo $project->name;?></h2>
             <div class="detail-content article-content">
               <div><span class="text-limit hidden" data-limit-size="40"><?php echo $project->desc;?></span><a class="text-primary text-limit-toggle small" data-text-expand="<?php echo $lang->expand;?>"  data-text-collapse="<?php echo $lang->collapse;?>"></a></div>

From 7c257b5e1e9ba5e5132ffb8b9080f636db3bf071 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 22 Feb 2023 15:16:48 +0800
Subject: [PATCH 07/23] * Code for issue #762.

---
 module/admin/lang/menu.php   | 7 ++-----
 module/common/lang/de.php    | 5 +++--
 module/common/lang/en.php    | 5 +++--
 module/common/lang/fr.php    | 5 +++--
 module/common/lang/zh-cn.php | 5 +++--
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index 33b05eeafc..5e09e80592 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -11,6 +11,7 @@ $lang->admin->menuList->user['order'] = 2;
 
 $lang->admin->menuList->switch['name']  = $lang->admin->menuSetting['switch']['name'];
 $lang->admin->menuList->switch['desc']  = $lang->admin->menuSetting['switch']['desc'];
+$lang->admin->menuList->switch['link']  = 'admin|setmodule';
 $lang->admin->menuList->switch['order'] = 3;
 
 $lang->admin->menuList->model['name']  = $lang->admin->menuSetting['model']['name'];
@@ -71,10 +72,6 @@ $lang->admin->menuList->user['menuOrder']['5']  = 'dept';
 $lang->admin->menuList->user['menuOrder']['10'] = 'user';
 $lang->admin->menuList->user['menuOrder']['15'] = 'group';
 
-$lang->admin->menuList->switch['subMenu']['setmodule'] = array('link' => "{$lang->admin->module}|admin|setmodule|");
-
-$lang->admin->menuList->switch['menuOrder']['5'] = 'setmodule';
-
 $lang->admin->menuList->model['subMenu']['common']        = array('link' => "{$lang->globalSetting}|custom|required|module=project", 'subModule' => 'custom,subject,holiday,stage', 'exclude' => 'stage-browse,stage-plusbrowse,stage-create,stage-edit,stage-batchcreate');
 $lang->admin->menuList->model['subMenu']['scrum']         = array('link' => "{$lang->scrumModel}|auditcl|scrumbrowse|", 'subModule' => 'auditcl');
 $lang->admin->menuList->model['subMenu']['waterfall']     = array('link' => "{$lang->waterfallModel}|stage|browse|", 'subModule' => 'stage', 'exclude' => 'stage-settype,stage-plusbrowse');
@@ -165,7 +162,7 @@ $lang->admin->menuList->message['menuOrder']['10'] = 'webhook';
 $lang->admin->menuList->message['menuOrder']['20'] = 'browser';
 $lang->admin->menuList->message['menuOrder']['25'] = 'setting';
 
-$lang->admin->menuList->dev['subMenu']['api']    = array('link' => "API|dev|api|module=index");
+$lang->admin->menuList->dev['subMenu']['api']    = array('link' => "{$lang->api}|dev|api|module=index");
 $lang->admin->menuList->dev['subMenu']['db']     = array('link' => "{$lang->database}|dev|db|table=" . trim(TABLE_EFFORT, '`'));
 $lang->admin->menuList->dev['subMenu']['editor'] = array('link' => "{$lang->editor}|dev|editor|");
 $lang->admin->menuList->dev['subMenu']['entry']  = array('link' => "{$lang->admin->entry}|entry|browse|", 'subModule' => 'entry');
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 4a789e9048..e9c596f4de 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -253,7 +253,8 @@ $lang->indexPage       = 'Index';
 $lang->model           = 'Model';
 $lang->redev           = 'Develop';
 $lang->browser         = 'Browser';
-$lang->database        = 'Database';
+$lang->api             = 'API Document';
+$lang->database        = 'Data Dictionary';
 $lang->editor          = 'Editor';
 $lang->timezone        = 'Timezone';
 $lang->security        = 'Security';
@@ -303,7 +304,7 @@ $lang->devops->set      = 'Set';
 
 $lang->admin->module      = 'Module';
 $lang->admin->system      = 'System';
-$lang->admin->entry       = 'Application';
+$lang->admin->entry       = 'Access ZenTao';
 $lang->admin->data        = 'Data';
 $lang->admin->cron        = 'Cron';
 $lang->admin->buildIndex  = 'Full Text Search';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index 841d43be23..faa72599f3 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -253,7 +253,8 @@ $lang->indexPage       = 'Index';
 $lang->model           = 'Model';
 $lang->redev           = 'Develop';
 $lang->browser         = 'Browser';
-$lang->database        = 'Database';
+$lang->api             = 'API Document';
+$lang->database        = 'Data Dictionary';
 $lang->editor          = 'Editor';
 $lang->timezone        = 'Timezone';
 $lang->security        = 'Security';
@@ -303,7 +304,7 @@ $lang->devops->set      = 'Set';
 
 $lang->admin->module      = 'Module';
 $lang->admin->system      = 'System';
-$lang->admin->entry       = 'Application';
+$lang->admin->entry       = 'Access ZenTao';
 $lang->admin->data        = 'Data';
 $lang->admin->cron        = 'Cron';
 $lang->admin->buildIndex  = 'Full Text Search';
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index 3154e31753..e160ac7054 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -253,7 +253,8 @@ $lang->indexPage       = 'Index';
 $lang->model           = 'Model';
 $lang->redev           = 'Develop';
 $lang->browser         = 'Browser';
-$lang->database        = 'Database';
+$lang->api             = 'API Document';
+$lang->database        = 'Data Dictionary';
 $lang->editor          = 'Editor';
 $lang->timezone        = 'Timezone';
 $lang->security        = 'Security';
@@ -303,7 +304,7 @@ $lang->devops->set      = 'Set';
 
 $lang->admin->module      = 'Module';
 $lang->admin->system      = 'System';
-$lang->admin->entry       = 'Application';
+$lang->admin->entry       = 'Access ZenTao';
 $lang->admin->data        = 'Data';
 $lang->admin->cron        = 'Cron';
 $lang->admin->buildIndex  = 'Full Text Search';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 27c1acac06..c3d6b8feab 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -253,7 +253,8 @@ $lang->indexPage       = '首页';
 $lang->model           = '模型';
 $lang->redev           = '二次开发';
 $lang->browser         = '浏览器';
-$lang->database        = '数据库';
+$lang->api             = '接口文档';
+$lang->database        = '数据字典';
 $lang->editor          = '编辑器';
 $lang->timezone        = '时区';
 $lang->security        = '安全';
@@ -303,7 +304,7 @@ $lang->devops->set      = '设置';
 
 $lang->admin->module      = '功能配置';
 $lang->admin->system      = '系统';
-$lang->admin->entry       = '应用';
+$lang->admin->entry       = '接入禅道';
 $lang->admin->data        = '数据';
 $lang->admin->cron        = '定时';
 $lang->admin->buildIndex  = '重建索引';

From b126b69130ac127a0e245a6c8ac512c0672de632 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 22 Feb 2023 15:19:07 +0800
Subject: [PATCH 08/23] * Resolve issue #756.

---
 extension/lite/project/ext/view/create.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/lite/project/ext/view/create.html.php b/extension/lite/project/ext/view/create.html.php
index ce3e1f1454..0308b9d310 100644
--- a/extension/lite/project/ext/view/create.html.php
+++ b/extension/lite/project/ext/view/create.html.php
@@ -40,7 +40,7 @@
           <th><?php echo $lang->project->name;?></th>
           <td class="col-main"><?php echo html::input('name', $name, "class='form-control' required");?></td>
         </tr>
-        <?php if(!isset($config->setCode) or $config->setCode == 1):?>
+        <?php if(isset($config->setCode) and $config->setCode == 1):?>
         <tr>
           <th><?php echo $lang->project->code;?></th>
           <td><?php echo html::input('code', '', "class='form-control' required");?></td>

From d753f6ebb6c840f563f15a3850567c90f4a753b8 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 22 Feb 2023 15:31:45 +0800
Subject: [PATCH 09/23] * Resolve issue #761.

---
 module/custom/view/mode.html.php       | 2 +-
 module/install/view/step4.html.php     | 2 +-
 module/upgrade/view/to18guide.html.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/custom/view/mode.html.php b/module/custom/view/mode.html.php
index 5376929d50..7e7dcfc8e8 100644
--- a/module/custom/view/mode.html.php
+++ b/module/custom/view/mode.html.php
@@ -39,7 +39,7 @@
           <?php if(is_array($feature) and empty($disabledScrumFeatures)) continue;?>
           <tr class='text-center'>
             <td class='text-left'><?php echo (is_array($feature) and !empty($disabledScrumFeatures)) ? sprintf($this->lang->custom->scrum->common, implode($lang->comma, $disabledScrumFeatures)) : $this->lang->custom->features[$feature];?></td>
-            <td><i class='icon text-red icon-close'></i></td>
+            <td><i class='icon text-red icon-ban-circle'></i></td>
             <td><i class='icon text-success icon-check'></i></td>
           </tr>
           <?php endforeach;?>
diff --git a/module/install/view/step4.html.php b/module/install/view/step4.html.php
index bd1b9d3a3f..3fa192bff8 100644
--- a/module/install/view/step4.html.php
+++ b/module/install/view/step4.html.php
@@ -51,7 +51,7 @@
               <?php if(is_array($feature) && empty($disabledScrumFeatures)) continue;?>
               <tr class='text-center'>
                 <td class='text-left'><?php echo (is_array($feature) && !empty($disabledScrumFeatures)) ? sprintf($this->lang->custom->scrum->common, implode($lang->comma, $disabledScrumFeatures)) : $this->lang->custom->features[$feature];?></td>
-                <td><i class='icon text-red icon-close'></i></td>
+                <td><i class='icon text-red icon-ban-circle'></i></td>
                 <td><i class='icon text-success icon-check'></i></td>
               </tr>
               <?php endforeach;?>
diff --git a/module/upgrade/view/to18guide.html.php b/module/upgrade/view/to18guide.html.php
index 88ba4b613d..d8397efac8 100644
--- a/module/upgrade/view/to18guide.html.php
+++ b/module/upgrade/view/to18guide.html.php
@@ -36,7 +36,7 @@
                 <?php if(is_array($feature) && empty($disabledScrumFeatures)) continue;?>
                 <tr class='text-center'>
                   <td class='text-left'><?php echo (is_array($feature) && !empty($disabledScrumFeatures)) ? sprintf($this->lang->custom->scrum->common, implode($lang->comma, $disabledScrumFeatures)) : $this->lang->custom->features[$feature];?></td>
-                  <td><i class='icon text-red icon-close'></i></td>
+                  <td><i class='icon text-red icon-ban-circle'></i></td>
                   <td><i class='icon text-success icon-check'></i></td>
                 </tr>
                 <?php endforeach;?>

From 2668c3040e6b8f5c6b05abc328d5353192e302bf Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 22 Feb 2023 15:36:15 +0800
Subject: [PATCH 10/23] * Refactor.

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

diff --git a/module/execution/model.php b/module/execution/model.php
index f7e28ab9b7..ea425e1b3b 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -533,7 +533,7 @@ class executionModel extends model
         $oldExecution = $this->dao->findById($executionID)->from(TABLE_EXECUTION)->fetch();
 
         /* Judgment of required items. */
-        if($oldExecution->type != 'stage' and $this->post->code == '' and (isset($this->config->setCode) and $this->config->setCode == 1))
+        if($oldExecution->type != 'stage' and $this->post->code == '' and isset($this->config->setCode) and $this->config->setCode == 1)
         {
             dao::$errors['code'] = sprintf($this->lang->error->notempty, $this->lang->execution->code);
             return false;

From 746860335b3a5878a3a2489363739629f9421fdd Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Wed, 22 Feb 2023 15:39:38 +0800
Subject: [PATCH 11/23] * admin: view refactors.

---
 module/admin/css/index.css       | 10 +++++++---
 module/admin/view/index.html.php |  9 +++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/module/admin/css/index.css b/module/admin/css/index.css
index 72321537fa..3f62faeb22 100755
--- a/module/admin/css/index.css
+++ b/module/admin/css/index.css
@@ -20,6 +20,8 @@
 .font-20 {font-size: 20px;}
 .font-24 {font-size: 24px;}
 .radius-4 {border-radius: 4px;}
+.white-nowrap {white-space: nowrap;}
+.w-full {width: 100%;}
 
 #notice {margin: -20px -20px 20px; padding: 20px;}
 #zentaoLinks {margin-top: 20px;}
@@ -40,8 +42,10 @@
 .settings-list > .setting-box > .btn:hover {background: unset;}
 .settings-list > .setting-box > .btn[disabled] {cursor: not-allowed; pointer-events: unset;}
 .settings-list > .setting-box > .btn[disabled] > a {pointer-events: none;}
+.settings-list > .setting-box > .btn > h4 {padding-right: 5px;}
+.settings-list > .setting-box > .btn > h4  > div {gap: 3px;}
 .settings-list > .setting-box > .btn > h4 > img {padding-right: 8px; padding-bottom: 3px; width: 32px; height: 27px;}
-.settings-list > .setting-box > .btn > .setting-desc {padding-bottom: 16px; color: #5E626D; line-height: 25px; height: 50px;}
+.settings-list > .setting-box > .btn > .setting-desc {padding-bottom: 16px; color: #5E626D; line-height: 25px; height: 50px; overflow: hidden;}
 .settings-list.lite-setting > .setting-box {flex: 1 1 30%;}
 
 .plugin-list {display: flex; flex-wrap: wrap; padding: 12px 4px 4px 4px;}
@@ -71,7 +75,7 @@
 .panel.publicClass {padding: 0 10px;}
 .icon.follow-us {font-size: 20px; padding-left: 10px;}
 
-.setting-help {width: 45px; color: #9EA3B0; padding-top: 15px;}
+.setting-help {color: #9EA3B0;}
 [lang^='zh'] .setting-help {padding-top: 0;}
 .pointer-none {pointer-events: none;}
 
@@ -86,7 +90,7 @@
 .time-block {background: #EDEEF2; padding:2px 4px; border-radius: 4px; color: #0B0F18; font-size: 15px; margin: 0 4px;}
 .dynamic-block {height: 74px; padding: 12px 16px; display: flex; justify-content: space-between; position: relative; line-height: 20px; border-top: 1px solid #E3E4E9;}
 .dynamic-content {height: 50px; line-height: 25px; overflow: hidden;}
-.dynamic-time {white-space: nowrap; position: absolute; right: 12px; bottom: 10px; padding-right: 12px; background: white; color: #5E626D;}
+.dynamic-time {white-space: nowrap; position: absolute; right: 12px; bottom: 12px; padding-left: 5px; padding-right: 12px; background: white; color: #5E626D;}
 .time-count {letter-spacing: 1px;}
 
 .patch-block {padding: 10px 16px 12px; line-height: 20px; border-top: 1px solid #E3E4E9;}
diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php
index f695d67c5f..0786657a6c 100755
--- a/module/admin/view/index.html.php
+++ b/module/admin/view/index.html.php
@@ -21,9 +21,14 @@
         <?php if($config->vision == 'lite' and !in_array($menuKey, $config->admin->liteMenuList)) continue;?>
         <div class="setting-box">
           <button class="btn shadow-primary-hover" <?php if($menu['disabled']) echo 'disabled';?> data-link='<?php echo $menu['link'];?>'>
-            <h4><img src="/static/svg/admin-<?php echo $menuKey;?>.svg"/><?php echo $menu['name'];?></h4>
+            <h4 class="flex align-center justify-between w-full">
+              <div class="flex align-center">
+                <img src="/static/svg/admin-<?php echo $menuKey;?>.svg"/>
+                <?php echo $menu['name'];?>
+              </div>
+              <?php echo html::a($config->admin->helpURL[$menuKey], "<i class='icon icon-help'></i> ", '_blank', 'class="text-muted setting-help"');?>
+            </h4>
             <p class="text-muted setting-desc" title="<?php echo $menu['desc'];?>"><?php echo $menu['desc'];?></p>
-            <?php echo html::a($config->admin->helpURL[$menuKey], "<i class='icon icon-help'></i> {$lang->help}", '_blank', 'class="text-muted setting-help"');?>
           </button>
         </div>
         <?php endforeach;?>

From 740afc7a0c76941f556c8b65f007380aef6a121d Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 22 Feb 2023 07:48:23 +0000
Subject: [PATCH 12/23] * Fix bug.

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

diff --git a/module/productplan/model.php b/module/productplan/model.php
index 2c31845d58..54a8f40caf 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -141,7 +141,7 @@ class productplanModel extends model
                 $planProjects[$planID] = $this->dao->select('t1.project,t2.name')->from(TABLE_PROJECTPRODUCT)->alias('t1')
                     ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
                     ->where('1=1')
-                    ->beginIF(strpos($param, 'noproduct') === false or !empty($product))->andWhere('product')->eq($product)->fi()
+                    ->beginIF(strpos($param, 'noproduct') === false or !empty($product))->andWhere('t1.product')->eq($product)->fi()
                     ->andWhere('t2.deleted')->eq(0)
                     ->andWhere('t1.plan')->like(",$planID,")
                     ->andWhere('t2.type')->in('sprint,stage,kanban')

From 5ed64060412df961b86a58220160b215cec88252 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 22 Feb 2023 07:50:21 +0000
Subject: [PATCH 13/23] * Fix issue #754, #751, and adjust width of create
 project guide.

---
 module/execution/css/batchedit.css       | 1 +
 module/execution/model.php               | 3 +--
 module/project/view/createguide.html.php | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/execution/css/batchedit.css b/module/execution/css/batchedit.css
index 5fb6ae17e4..604452605e 100644
--- a/module/execution/css/batchedit.css
+++ b/module/execution/css/batchedit.css
@@ -4,3 +4,4 @@
 .c-method {width: 45px;}
 .c-type > .icon-help {vertical-align: text-top;}
 .c-type > .popover .popover-content {font-weight: 400;}
+#executionForm tbody td {vertical-align: top;}
diff --git a/module/execution/model.php b/module/execution/model.php
index 76f9b07418..d91eeea2b0 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -5229,12 +5229,11 @@ class executionModel extends model
         $class = !empty($execution->children) ? 'disabled' : '';
         common::printIcon('task', 'create', "executionID={$execution->id}", '', 'list', '', '', $class, false, "data-app='execution'");
 
-        if($execution->type == 'stage' or $this->app->tab == 'project')
+        if($execution->type == 'stage')
         {
             $isCreateTask = $this->loadModel('programplan')->isCreateTask($execution->id);
             $disabled     = ($isCreateTask and $execution->type == 'stage') ? '' : ' disabled';
             $title        = !$isCreateTask ? $this->lang->programplan->error->createdTask : $this->lang->programplan->createSubPlan;
-            $title        = (!empty($disabled) and $execution->type != 'stage') ? $this->lang->programplan->error->notStage : $title;
             common::printIcon('programplan', 'create', "program={$execution->project}&productID=$productID&planID=$execution->id", $execution, 'list', 'split', '', $disabled, '', '', $title);
         }
 
diff --git a/module/project/view/createguide.html.php b/module/project/view/createguide.html.php
index 83a4e2912a..af2ca0be3b 100644
--- a/module/project/view/createguide.html.php
+++ b/module/project/view/createguide.html.php
@@ -5,7 +5,7 @@
 <?php endif;?>
 <div class='modal-dialog' id='guideDialog'>
   <style>
-  #guideDialog {width: 600px}
+  #guideDialog {width: 900px}
   #guideDialog .row {margin-left: 0px;margin-right: 0px;}
   #guideDialog h2 {margin: 0px 0 20px 0; font-size: 16px; font-weight: normal}
   #guideDialog h3 {margin: 5px 0; font-size: 15px;}
@@ -15,10 +15,11 @@
   #guideDialog .project-type {padding: 0 5px}
   #guideDialog .project-type-img {width: 280px; border: 1px solid #CBD0DB; border-radius: 4px; margin-bottom: 10px; cursor: pointer; margin-top: 1px}
   #guideDialog .project-type-img:hover {border-color: #006AF1; box-shadow: 0 0 10px 0 rgba(0,0,0,.25);}
-  #guideDialog .project-type-img.more-type {width: 154px; height: 98px; vertical-align: middle; display: table-cell; cursor:default; font-size: 12px;}
+  #guideDialog .project-type-img.more-type {height: 165px; vertical-align: middle; display: table-cell; cursor:default; font-size: 12px;}
   #guideDialog .project-type-img.more-type:hover {border-color: #CBD0DB; box-shadow:unset;}
   #guideDialog .project-type.active img {border-color: #006AF1; border-width: 2px; margin-top: 0}
   #guideDialog .col:nth-child(-n+3) {margin-bottom: 15px;}
+  @media screen and (max-width: 1366px){#guideDialog {width: 640px} #guideDialog .project-type-img.more-type {height: 108px;}}
   </style>
   <div class='modal-content'>
     <div class='modal-body'>

From 1e39b3727870f314ea7e37d6c08fd4d7d8a98f7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@easycorp.ltd>
Date: Wed, 22 Feb 2023 15:52:27 +0800
Subject: [PATCH 14/23] * Add unit test.

---
 test/model/execution/generatecol.php | 19 ++++++++++++++++++
 test/model/execution/generaterow.php | 30 ++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100755 test/model/execution/generatecol.php
 create mode 100755 test/model/execution/generaterow.php

diff --git a/test/model/execution/generatecol.php b/test/model/execution/generatecol.php
new file mode 100755
index 0000000000..9c8187d973
--- /dev/null
+++ b/test/model/execution/generatecol.php
@@ -0,0 +1,19 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/execution.class.php';
+su('admin');
+
+/**
+
+title=测试 executionModel->generateCol();
+cid=1
+pid=1
+
+*/
+
+$executionTester = new executionTest();
+
+r($executionTester->generateColTest('id_desc')) && p("0:sortType")     && e('down'); // 按ID倒序排，查看获取到的sortType 
+r($executionTester->generateColTest('id_asc'))  && p("0:sortType")     && e('up'); // 按ID正序排，查看获取到的sortType 
+r($executionTester->generateColTest('id_desc')) && p("2:name;2:title") && e('code;执行代号'); // 查看获取到的第三个字段的name和title 
diff --git a/test/model/execution/generaterow.php b/test/model/execution/generaterow.php
new file mode 100755
index 0000000000..c77148a205
--- /dev/null
+++ b/test/model/execution/generaterow.php
@@ -0,0 +1,30 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/execution.class.php';
+su('admin');
+
+$execution = zdTable('project');
+$execution->id->range('1-5');
+$execution->name->range('1-5')->prefix('执行');
+$execution->type->range('sprint,stage,kanban');
+$execution->status->range('wait{3},suspended,closed,doing');
+$execution->openedBy->range('admin,user1');
+$execution->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
+$execution->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
+$execution->gen(5);
+
+/**
+
+title=测试 executionModel->generateCol();
+cid=1
+pid=1
+
+*/
+
+$executionTester = new executionTest();
+$executions = $executionTester->generateRowTest();
+
+r(count($executions)) && p('')              && e('5');      // 判断执行数量 
+r($executions)        && p("0:status")      && e('已关闭'); // 判断第一个执行的状态 
+r($executions)        && p("2:begin;2:end") && e('2022-01-12;2022-02-12'); // 查看获取到的第三个执行的开始日期和结束日期 

From 7198c095e5f84a9de0bc86a9152872b65b90ca0c Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 22 Feb 2023 07:58:41 +0000
Subject: [PATCH 15/23] * Only get system classify value.

---
 db/update18.1.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/db/update18.1.sql b/db/update18.1.sql
index ef6ffc263f..0f4b3dd000 100644
--- a/db/update18.1.sql
+++ b/db/update18.1.sql
@@ -2,9 +2,9 @@ DELETE FROM `zt_config` WHERE module = 'datatable' AND section = 'executionAll';
 
 update `zt_task` set `assignedTo` = '' where `mode` = 'multi' and `status` != 'done' and `status` != 'closed';
 
-REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`, `vision`) SELECT `lang`, `module`, 'scrumClassify', `key`, `value`, `system`, `vision` FROM `zt_lang` WHERE `module` = 'process' and `section` = 'classify' ORDER BY id ASC;
-REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`, `vision`) SELECT `lang`, `module`, 'agileplusClassify', `key`, `value`, `system`, `vision` FROM `zt_lang` WHERE `module` = 'process' and `section` = 'classify' ORDER BY id ASC;
-REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`, `vision`) SELECT `lang`, `module`, 'waterfallplusClassify', `key`, `value`, `system`, `vision` FROM `zt_lang` WHERE `module` = 'process' and `section` = 'classify' ORDER BY id ASC;
+REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`, `vision`) SELECT `lang`, `module`, 'scrumClassify', `key`, `value`, `system`, `vision` FROM `zt_lang` WHERE `module` = 'process' and `section` = 'classify' and `system` = '1' ORDER BY id ASC;
+REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`, `vision`) SELECT `lang`, `module`, 'agileplusClassify', `key`, `value`, `system`, `vision` FROM `zt_lang` WHERE `module` = 'process' and `section` = 'classify' and `system` = '1' ORDER BY id ASC;
+REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`, `vision`) SELECT `lang`, `module`, 'waterfallplusClassify', `key`, `value`, `system`, `vision` FROM `zt_lang` WHERE `module` = 'process' and `section` = 'classify' and `system` = '1' ORDER BY id ASC;
 
 UPDATE `zt_project` AS parent INNER JOIN (select `id`,`parent`,`attribute` from `zt_project` where `parent` != 0 and `type` = 'stage') AS child ON parent.`id` = child.`parent` SET parent.`attribute`='mix' where parent.`grade`=1 and parent.`type`='stage' and parent.`attribute` != child.`attribute`;
 

From 12cdb2f6d78fbd4805a2db5bca066c00f5c9c084 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 22 Feb 2023 16:11:21 +0800
Subject: [PATCH 16/23] * Modify menu param.

---
 module/admin/lang/menu.php   | 2 +-
 module/common/lang/de.php    | 2 +-
 module/common/lang/en.php    | 2 +-
 module/common/lang/fr.php    | 2 +-
 module/common/lang/zh-cn.php | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index 5e09e80592..e07e6c8403 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -162,7 +162,7 @@ $lang->admin->menuList->message['menuOrder']['10'] = 'webhook';
 $lang->admin->menuList->message['menuOrder']['20'] = 'browser';
 $lang->admin->menuList->message['menuOrder']['25'] = 'setting';
 
-$lang->admin->menuList->dev['subMenu']['api']    = array('link' => "{$lang->api}|dev|api|module=index");
+$lang->admin->menuList->dev['subMenu']['api']    = array('link' => "{$lang->api->doc}|dev|api|module=index");
 $lang->admin->menuList->dev['subMenu']['db']     = array('link' => "{$lang->database}|dev|db|table=" . trim(TABLE_EFFORT, '`'));
 $lang->admin->menuList->dev['subMenu']['editor'] = array('link' => "{$lang->editor}|dev|editor|");
 $lang->admin->menuList->dev['subMenu']['entry']  = array('link' => "{$lang->admin->entry}|entry|browse|", 'subModule' => 'entry');
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index e9c596f4de..4810af6d36 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -253,7 +253,7 @@ $lang->indexPage       = 'Index';
 $lang->model           = 'Model';
 $lang->redev           = 'Develop';
 $lang->browser         = 'Browser';
-$lang->api             = 'API Document';
+$lang->api->doc        = 'API Document';
 $lang->database        = 'Data Dictionary';
 $lang->editor          = 'Editor';
 $lang->timezone        = 'Timezone';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index faa72599f3..7e772786e2 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -253,7 +253,7 @@ $lang->indexPage       = 'Index';
 $lang->model           = 'Model';
 $lang->redev           = 'Develop';
 $lang->browser         = 'Browser';
-$lang->api             = 'API Document';
+$lang->api->doc        = 'API Document';
 $lang->database        = 'Data Dictionary';
 $lang->editor          = 'Editor';
 $lang->timezone        = 'Timezone';
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index e160ac7054..f366dd685b 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -253,7 +253,7 @@ $lang->indexPage       = 'Index';
 $lang->model           = 'Model';
 $lang->redev           = 'Develop';
 $lang->browser         = 'Browser';
-$lang->api             = 'API Document';
+$lang->api->doc        = 'API Document';
 $lang->database        = 'Data Dictionary';
 $lang->editor          = 'Editor';
 $lang->timezone        = 'Timezone';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index c3d6b8feab..5cd8b557c0 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -253,7 +253,7 @@ $lang->indexPage       = '首页';
 $lang->model           = '模型';
 $lang->redev           = '二次开发';
 $lang->browser         = '浏览器';
-$lang->api             = '接口文档';
+$lang->api->doc        = '接口文档';
 $lang->database        = '数据字典';
 $lang->editor          = '编辑器';
 $lang->timezone        = '时区';

From 16109dc94b2d2ae606288496d6ce7b0e33bba33b Mon Sep 17 00:00:00 2001
From: wangxuepeng <wangxuepeng@easycorp.ltd>
Date: Wed, 22 Feb 2023 08:12:54 +0000
Subject: [PATCH 17/23] * Fix bug #32375.

---
 module/execution/model.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 76f9b07418..1aa0575584 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -450,7 +450,6 @@ class executionModel extends model
             ->checkIF($sprint->end != '', 'end', 'ge', $sprint->begin)
             ->checkFlow()
             ->exec();
-
         /* Add the creater to the team. */
         if(!dao::isError())
         {
@@ -5729,12 +5728,13 @@ class executionModel extends model
         $_POST['status']      = 'wait';
         $_POST['days']        = $project->days;
         $_POST['team']        = $project->team;
+        $_POST['desc']        = $project->desc;
         $_POST['teamMembers'] = array($this->app->user->account);
         $_POST['acl']         = 'open';
-        $_POST['PO']          = '';
-        $_POST['QD']          = '';
-        $_POST['PM']          = '';
-        $_POST['RD']          = '';
+        $_POST['PO']          = $this->app->user->account;
+        $_POST['QD']          = $this->app->user->account;
+        $_POST['PM']          = $this->app->user->account;
+        $_POST['RD']          = $this->app->user->account;
         $_POST['multiple']    = '0';
         $_POST['hasProduct']  = $project->hasProduct;
         if($project->code) $_POST['code'] = $project->code;

From d20c27d18d8b979c8ce4bd2735efec7be90fc5b1 Mon Sep 17 00:00:00 2001
From: wangxuepeng <wangxuepeng@easycorp.ltd>
Date: Wed, 22 Feb 2023 08:24:23 +0000
Subject: [PATCH 18/23] * Fix bug #32375.

---
 module/execution/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/execution/model.php b/module/execution/model.php
index 0750f50f27..0c03e019a4 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -450,6 +450,7 @@ class executionModel extends model
             ->checkIF($sprint->end != '', 'end', 'ge', $sprint->begin)
             ->checkFlow()
             ->exec();
+        
         /* Add the creater to the team. */
         if(!dao::isError())
         {

From 7ce34db406268e71e178b85269ea90bc7084e520 Mon Sep 17 00:00:00 2001
From: wangxuepeng <wangxuepeng@easycorp.ltd>
Date: Wed, 22 Feb 2023 08:51:42 +0000
Subject: [PATCH 19/23] * Fix bug #32388.

---
 module/execution/view/edit.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php
index 3eb89bfe7e..18e031e559 100644
--- a/module/execution/view/edit.html.php
+++ b/module/execution/view/edit.html.php
@@ -36,7 +36,7 @@
         <?php echo html::hidden('project', $project->id);?>
         <?php elseif($project->model == 'agileplus'):?>
         <tr>
-          <th><?php echo $lang->execution->method;?></th>
+          <th class='w-120px'><?php echo $lang->execution->method;?></th>
           <td><?php echo zget($lang->execution->typeList, $execution->type);?></td><td></td>
         </tr>
         <?php elseif($app->tab == 'project' and $project->model == 'waterfallplus'):?>

From bcae665178c87d6c68f4b84c05d7f12869d756f7 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 22 Feb 2023 08:56:31 +0000
Subject: [PATCH 20/23] * Fix bug #32337.

---
 module/group/lang/resource.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 3e3614f5b5..c70d06f828 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -240,6 +240,7 @@ $lang->project->methodOrder[190] = 'manageRepo';
 
 $lang->resource->projectbuild = new stdclass();
 $lang->resource->projectbuild->browse           = 'browse';
+$lang->resource->projectbuild->create           = 'create';
 $lang->resource->projectbuild->edit             = 'edit';
 $lang->resource->projectbuild->view             = 'view';
 $lang->resource->projectbuild->delete           = 'delete';
@@ -251,6 +252,7 @@ $lang->resource->projectbuild->unlinkBug        = 'unlinkBug';
 $lang->resource->projectbuild->batchUnlinkBug   = 'batchUnlinkBug';
 
 $lang->projectbuild->methodOrder[5]  = 'browse';
+$lang->projectbuild->methodOrder[10] = 'create';
 $lang->projectbuild->methodOrder[15] = 'edit';
 $lang->projectbuild->methodOrder[20] = 'view';
 $lang->projectbuild->methodOrder[25] = 'delete';

From 553d78a8b30bd91aa00b3b4c3648c062250caafb Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Wed, 22 Feb 2023 09:05:53 +0000
Subject: [PATCH 21/23] * Fix bug #32372, #32373.

---
 module/execution/control.php          |  2 ++
 module/execution/js/common.js         | 29 +++++++++++++++++++++++++++
 module/execution/js/create.js         |  9 +--------
 module/execution/js/edit.js           | 11 ++++++++++
 module/execution/view/create.html.php | 12 ++++++-----
 module/execution/view/edit.html.php   | 21 ++++++++++---------
 6 files changed, 62 insertions(+), 22 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index de1faad15c..9881cf4be7 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1930,6 +1930,7 @@ class execution extends control
         $this->app->loadLang('programplan');
         $browseExecutionLink = $this->createLink('execution', 'browse', "executionID=$executionID");
         $execution           = $this->execution->getById($executionID);
+        $project             = $this->project->getById($execution->project);
         $branches            = $this->project->getBranchesByProject($executionID);
         $linkedProductIdList = empty($branches) ? '' : array_keys($branches);
 
@@ -2103,6 +2104,7 @@ class execution extends control
         $this->view->position             = $position;
         $this->view->executions           = $executions;
         $this->view->execution            = $execution;
+        $this->view->project              = $project;
         $this->view->poUsers              = $poUsers;
         $this->view->pmUsers              = $pmUsers;
         $this->view->qdUsers              = $qdUsers;
diff --git a/module/execution/js/common.js b/module/execution/js/common.js
index 92ca8e7134..db31593818 100644
--- a/module/execution/js/common.js
+++ b/module/execution/js/common.js
@@ -285,3 +285,32 @@ function setCardCount(heightType)
 {
     heightType != 'custom' ? $('#cardBox').addClass('hidden') : $('#cardBox').removeClass('hidden');
 }
+
+/**
+ * Hide plan box by stage's attribute.
+ *
+ * @param  string    attribute
+ * @access public
+ * @return void
+ */
+function hidePlanBox(attribute)
+{
+    if(attribute == 'request' || attribute == 'review')
+    {
+        $('.productsBox .planBox').addClass('hide');
+        $('.productsBox .planBox select').attr('disabled', 'disabled');
+        $('#productTitle').text(manageProductsLang);
+
+        $('#plansBox').closest('tr').addClass('hide');
+        $('#plansBox').attr('disabled', 'disabled');
+    }
+    else
+    {
+        $('.productsBox .planBox').removeClass('hide');
+        $('.productsBox .planBox select').attr('disabled', '');
+        $('#productTitle').text(manageProductPlanLang);
+
+        $('#plansBox').closest('tr').removeClass('hide');
+        $('#plansBox').attr('disabled', '');
+    }
+}
diff --git a/module/execution/js/create.js b/module/execution/js/create.js
index 56ac637410..cb0c0e1091 100644
--- a/module/execution/js/create.js
+++ b/module/execution/js/create.js
@@ -82,14 +82,7 @@ $(function()
         $('#attribute').change(function()
         {
             var attribute = $(this).val();
-            if(attribute == 'request' || attribute == 'design' || attribute == 'review')
-            {
-                $('#plansBox').closest('tr').addClass('hide');
-            }
-            else
-            {
-                $('#plansBox').closest('tr').removeClass('hide');
-            }
+            hidePlanBox(attribute);
         })
 
         $('#attribute').change();
diff --git a/module/execution/js/edit.js b/module/execution/js/edit.js
index 58f5d31712..05d613bebd 100644
--- a/module/execution/js/edit.js
+++ b/module/execution/js/edit.js
@@ -114,6 +114,17 @@ $(function()
     }
 
     $('[data-toggle="popover"]').popover();
+
+    if(isStage)
+    {
+        $('#attribute').change(function()
+        {
+            var attribute = $(this).val();
+            hidePlanBox(attribute);
+        })
+
+        $('#attribute').change();
+    }
 })
 var lastProjectID = $("#project").val();
 
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index 7f3cc53419..429ecf2cb4 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -46,6 +46,8 @@
 <?php js::set('cancelCopy', $lang->execution->cancelCopy);?>
 <?php js::set('copyNoExecution', $lang->execution->copyNoExecution);?>
 <?php js::set('model', isset($project->model) ? $project->model : '');?>
+<?php js::set('manageProductsLang', $lang->project->manageProducts);?>
+<?php js::set('manageProductPlanLang', $lang->project->manageProductPlan);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
@@ -148,7 +150,7 @@
           <th><?php if($i == 0) echo $lang->project->manageProductPlan;?></th>
           <td class='text-left productsBox' colspan="3">
             <div class='row'>
-              <div class="col-sm-6">
+              <div class="col-sm-6 productBox">
                 <div class='table-row'>
                   <div class='table-col'>
                     <?php $hasBranch = $product->type != 'normal' and isset($branchGroups[$product->id]);?>
@@ -168,7 +170,7 @@
                   </div>
                 </div>
               </div>
-              <div class="col-sm-6">
+              <div class="col-sm-6 planBox">
                 <div class='input-group' <?php echo "id='plan$i'";?>>
                   <span class='input-group-addon'><?php echo $lang->product->plan;?></span>
                   <?php echo html::select("plans[$product->id][]", isset($productPlans[$product->id]) ? $productPlans[$product->id] : array(), isset($product->plans) ? $product->plans : '', "class='form-control chosen' multiple");?>
@@ -185,7 +187,7 @@
         </tr>
         <?php $i ++;?>
         <?php endforeach;?>
-        <?php elseif(!empty($project) and empty($project->hasProduct)):?>
+        <?php elseif(!empty($project) and empty($project->hasProduct) and strpos($project->model, 'waterfall') === false):?>
         <tr>
           <th><?php echo $lang->execution->linkPlan;?></th>
           <td id="plansBox">
@@ -200,7 +202,7 @@
           <th id='productTitle'><?php echo $lang->project->manageProductPlan;?></th>
           <td class='text-left productsBox' colspan='3'>
             <div class='row'>
-              <div class="col-sm-6">
+              <div class="col-sm-6 productBox">
                 <div class='table-row'>
                   <div class='table-col'>
                     <div class='input-group'>
@@ -216,7 +218,7 @@
                   </div>
                 </div>
               </div>
-              <div class="col-sm-6">
+              <div class="col-sm-6 planBox">
                 <div class='input-group' id='plan0'>
                   <span class='input-group-addon'><?php echo $lang->product->plan;?></span>
                   <?php echo html::select("plans[][]", $productPlan, '', "class='form-control chosen' multiple");?>
diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php
index 3eb89bfe7e..4a01b82a84 100644
--- a/module/execution/view/edit.html.php
+++ b/module/execution/view/edit.html.php
@@ -14,6 +14,9 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::import($jsRoot . 'misc/date.js');?>
+<?php js::set('isStage', $execution->type == 'stage');?>
+<?php js::set('manageProductsLang', $lang->project->manageProducts);?>
+<?php js::set('manageProductPlanLang', $lang->project->manageProductPlan);?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
@@ -161,7 +164,7 @@
           <th><?php if($i == 0) echo $lang->project->manageProductPlan;?></th>
           <td class='text-left productsBox' colspan="3">
             <div class='row'>
-              <div class="col-sm-6">
+              <div class="col-sm-6 productBox">
                 <div class='table-row'>
                   <div class='table-col'>
                     <?php $hasBranch = $product->type != 'normal' and isset($branchGroups[$product->id]);?>
@@ -181,7 +184,7 @@
                   </div>
                 </div>
               </div>
-              <div class="col-sm-6">
+              <div class="col-sm-6 planBox">
                 <div class='input-group' <?php echo "id='plan$i'";?>>
                   <span class='input-group-addon'><?php echo $lang->product->plan;?></span>
                   <?php echo html::select("plans[$product->id][]", isset($productPlans[$product->id]) ? $productPlans[$product->id] : array(), $product->plans, "class='form-control chosen' multiple");?>
@@ -213,7 +216,7 @@
           <th id='productTitle'><?php echo $lang->project->manageProductPlan;?></th>
           <td class='text-left productsBox' colspan='3'>
             <div class='row'>
-              <div class="col-sm-6">
+              <div class="col-sm-6 productBox">
                 <div class='table-row'>
                   <div class='table-col'>
                     <div class='input-group'>
@@ -229,7 +232,7 @@
                   </div>
                 </div>
               </div>
-              <div class="col-sm-6">
+              <div class="col-sm-6 planBox">
                 <div class='input-group' id='plan0'>
                   <span class='input-group-addon'><?php echo $lang->product->plan;?></span>
                   <?php echo html::select("plans[][]", '', '', "class='form-control chosen' multiple");?>
@@ -243,7 +246,7 @@
           </td>
         </tr>
         <?php endif; ?>
-        <?php elseif(($execution->type == 'stage' and !in_array($execution->attribute, array('request', 'design', 'review'))) or $execution->type != 'stage'): ?>
+        <?php elseif(!empty($project) and !empty($project->hasProduct)):?>
         <?php echo html::hidden("products[]", key($linkedProducts));?>
         <?php echo html::hidden("branch", json_encode(array_values($linkedBranches)));?>
         <?php $i = 0;?>
@@ -252,7 +255,7 @@
           <th><?php if($i == 0) echo $lang->project->manageProductPlan;?></th>
           <td class='text-left productsBox' colspan="3">
             <div class='row'>
-              <div class="col-sm-6">
+              <div class="col-sm-6 productBox">
                 <div class='table-row'>
                   <div class='table-col'>
                     <?php $hasBranch = $product->type != 'normal' and isset($branchGroups[$product->id]);?>
@@ -272,7 +275,7 @@
                   </div>
                 </div>
               </div>
-              <div class="col-sm-6">
+              <div class="col-sm-6 planBox">
                 <div class='input-group' <?php echo "id='plan$i'";?>>
                   <span class='input-group-addon'><?php echo $lang->product->plan;?></span>
                   <?php echo html::select("plans[$product->id][]", isset($productPlans[$product->id]) ? $productPlans[$product->id] : array(), isset($product->plans) ? $product->plans : '', "class='form-control chosen' multiple");?>
@@ -283,10 +286,10 @@
         </tr>
         <?php $i ++;?>
         <?php endforeach;?>
-        <?php else: ?>
+        <?php else:?>
         <?php echo html::hidden("products[]", key($linkedProducts));?>
         <?php echo html::hidden("branch", json_encode(array_values($linkedBranches)));?>
-        <?php endif; ?>
+        <?php endif;?>
         <tr>
           <th><?php echo $lang->execution->team;?></th>
           <td colspan='2'><?php echo html::select('teamMembers[]', $users, array_keys($teamMembers), "class='form-control picker-select' multiple"); ?></td>

From 966511dc89baa178563f4758a59769c6deb20c45 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Wed, 22 Feb 2023 17:08:49 +0800
Subject: [PATCH 22/23] * Code for admin view refactors.

---
 module/admin/css/index.css       | 4 ++--
 module/admin/view/index.html.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/admin/css/index.css b/module/admin/css/index.css
index 3f62faeb22..e2f526481e 100755
--- a/module/admin/css/index.css
+++ b/module/admin/css/index.css
@@ -75,7 +75,7 @@
 .panel.publicClass {padding: 0 10px;}
 .icon.follow-us {font-size: 20px; padding-left: 10px;}
 
-.setting-help {color: #9EA3B0;}
+.setting-help {color: #9EA3B0; padding-left: 5px;}
 [lang^='zh'] .setting-help {padding-top: 0;}
 .pointer-none {pointer-events: none;}
 
@@ -90,7 +90,7 @@
 .time-block {background: #EDEEF2; padding:2px 4px; border-radius: 4px; color: #0B0F18; font-size: 15px; margin: 0 4px;}
 .dynamic-block {height: 74px; padding: 12px 16px; display: flex; justify-content: space-between; position: relative; line-height: 20px; border-top: 1px solid #E3E4E9;}
 .dynamic-content {height: 50px; line-height: 25px; overflow: hidden;}
-.dynamic-time {white-space: nowrap; position: absolute; right: 12px; bottom: 12px; padding-left: 5px; padding-right: 12px; background: white; color: #5E626D;}
+.dynamic-time {white-space: nowrap; position: absolute; right: 12px; bottom: 12px; padding-left: 10px; padding-right: 12px; background: white; color: #5E626D;}
 .time-count {letter-spacing: 1px;}
 
 .patch-block {padding: 10px 16px 12px; line-height: 20px; border-top: 1px solid #E3E4E9;}
diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php
index 0786657a6c..f2b812c35d 100755
--- a/module/admin/view/index.html.php
+++ b/module/admin/view/index.html.php
@@ -21,7 +21,7 @@
         <?php if($config->vision == 'lite' and !in_array($menuKey, $config->admin->liteMenuList)) continue;?>
         <div class="setting-box">
           <button class="btn shadow-primary-hover" <?php if($menu['disabled']) echo 'disabled';?> data-link='<?php echo $menu['link'];?>'>
-            <h4 class="flex align-center justify-between w-full">
+            <h4 class="flex align-center w-full">
               <div class="flex align-center">
                 <img src="/static/svg/admin-<?php echo $menuKey;?>.svg"/>
                 <?php echo $menu['name'];?>
@@ -118,7 +118,7 @@
       </div>
       <?php foreach($dynamics as $dynamic):?>
       <div class="dynamic-block">
-        <div class="dynamic-content"><i class="icon icon-horn text-primary pr-4 font-20"></i><?php echo html::a($dynamic->link, $dynamic->title, '_blank');?></div>
+        <div class="dynamic-content" title=<?php echo $dynamic->title ?>><i class="icon icon-horn text-primary pr-4 font-20"></i><?php echo html::a($dynamic->link, $dynamic->title, '_blank');?></div>
         <div class="dynamic-time"><?php echo substr($dynamic->addedDate, 0, 10);?></div>
       </div>
       <?php endforeach;?>

From a08e498530c428c62e2a3182d9a26aa01182b9c9 Mon Sep 17 00:00:00 2001
From: guofeilong <guofeilong@easycorp.ltd>
Date: Wed, 22 Feb 2023 17:17:01 +0800
Subject: [PATCH 23/23] * Code for admin view refactors.

---
 module/admin/css/index.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/admin/css/index.css b/module/admin/css/index.css
index e2f526481e..6ccc630b09 100755
--- a/module/admin/css/index.css
+++ b/module/admin/css/index.css
@@ -76,6 +76,7 @@
 .icon.follow-us {font-size: 20px; padding-left: 10px;}
 
 .setting-help {color: #9EA3B0; padding-left: 5px;}
+.setting-help > a {font-size: 15px;}
 [lang^='zh'] .setting-help {padding-top: 0;}
 .pointer-none {pointer-events: none;}