From 4bb2ff186278be5ffa65be69fd988588361ca088 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Tue, 10 May 2022 01:34:01 +0000
Subject: [PATCH 01/13] * Finish task #53670.

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

diff --git a/module/custom/config.php b/module/custom/config.php
index ff9462b546..9b42284642 100644
--- a/module/custom/config.php
+++ b/module/custom/config.php
@@ -48,8 +48,8 @@ $config->custom->fieldList['release']['create']      = 'desc';
 $config->custom->fieldList['release']['edit']        = 'desc';
 $config->custom->fieldList['execution']['create']    = 'days,desc,PO,PM,QD,RD';
 $config->custom->fieldList['execution']['edit']      = 'days,desc,PO,PM,QD,RD';
-$config->custom->fieldList['task']['create']         = 'story,pri,estimate,desc,estStarted,deadline';
-$config->custom->fieldList['task']['edit']           = 'pri,estimate,estStarted,deadline';
+$config->custom->fieldList['task']['create']         = 'module,story,pri,estimate,desc,estStarted,deadline';
+$config->custom->fieldList['task']['edit']           = 'module,pri,estimate,estStarted,deadline';
 $config->custom->fieldList['task']['finish']         = 'comment';
 $config->custom->fieldList['task']['activate']       = 'assignedTo,comment';
 $config->custom->fieldList['build']                  = 'scmPath,filePath,desc';

From bd25917679a80ee691d2ce9cd823d93371534134 Mon Sep 17 00:00:00 2001
From: unknown <zhangpeng>
Date: Tue, 10 May 2022 15:17:21 +0800
Subject: [PATCH 02/13] Add gitlab-ci and sonar properties files for ci

---
 .gitlab-ci.yml           | 13 +++++++++++++
 sonar-project.properties |  3 +++
 2 files changed, 16 insertions(+)
 create mode 100644 .gitlab-ci.yml
 create mode 100644 sonar-project.properties

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000..319fd640ef
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,13 @@
+sonarqube:
+  variables:
+    SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar"  # Defines the location of the analysis task cache
+    GIT_DEPTH: "0"  # Tells git to fetch all the branches of the project, required by the analysis task
+  cache:
+    key: "${CI_JOB_NAME}"
+    paths:
+      - .sonar/cache
+  script: 
+      - sonar-scanner -Dsonar.inclusions=$(git diff --name-only HEAD~1|tr '\n' ',')
+  allow_failure: true
+  only:
+    - master # or the name of your main branch
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 0000000000..53903424ea
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,3 @@
+sonar.projectKey=zentaopms
+sonar.qualitygate.wait=true
+sonar.coverage.exclusions=**/*.*

From c5ee9d98735288a1ac0b4c854ff587ab5444fb44 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 10 May 2022 15:35:32 +0800
Subject: [PATCH 03/13] * Finish task #53663.

---
 module/kanban/control.php                    |   8 +-
 module/kanban/css/view.css                   |   4 +-
 module/kanban/js/view.js                     | 158 ++++++++++---------
 module/kanban/model.php                      |   7 +-
 module/kanban/view/viewarchivedcard.html.php |  42 +++++
 5 files changed, 143 insertions(+), 76 deletions(-)

diff --git a/module/kanban/control.php b/module/kanban/control.php
index eeb922a87d..a18e14e40d 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -1320,8 +1320,14 @@ class kanban extends control
     {
         $region = $this->kanban->getRegionByID($regionID);
 
+        $cards = $this->kanban->getCardsByObject('region', $regionID, 1);
+        foreach($this->config->kanban->fromType as $fromType)
+        {
+            $cards = $this->kanban->getImportedCards($region->kanban, $cards, $fromType, 1);
+        }
+
         $this->view->kanban      = $this->kanban->getByID($region->kanban);
-        $this->view->cards       = $this->kanban->getCardsByObject('region', $regionID, 1);
+        $this->view->cards       = $cards;
         $this->view->users       = $this->loadModel('user')->getPairs('noletter|nodeleted');
         $this->view->userIdPairs = $this->user->getPairs('noletter|nodeleted|showid');
         $this->view->usersAvatar = $this->user->getAvatarPairs();
diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css
index 52ff8d0e5b..313bd267e2 100644
--- a/module/kanban/css/view.css
+++ b/module/kanban/css/view.css
@@ -121,13 +121,13 @@
 .label-closed, .label-terminate {background: #e5e5e5 !important; color: #b8b8b8;}
 .label-deleted {background: #ff5d5d !important; color: #fff;}
 .label-normal {background: #e1e8d9 !important; color: #9abe76;}
-.kanban-item > .kanban-card > .execInfo > .user, .kanban-item > .kanban-card > .releaseInfo > .user, .kanban-item > .kanban-card > .productplanInfo > .user {position: absolute; right: 13px; bottom: 1px}
+.kanban-item > .kanban-card > .execInfo > .user, .kanban-item > .kanban-card > .releaseInfo > .user, .kanban-item > .kanban-card > .productplanInfo > .user {float:right}
 .kanban-item > .kanban-card > .execInfo > .user > .avatar, .kanban-item > .kanban-card > .releaseInfo > .user > .avatar, .kanban-item > .kanban-card > .productplanInfo > .user > .avatar {display: inline-block; width: 24px; height: 24px; line-height: 24px; margin-right: 0px; margin-left: 2px}
 .kanban-card .releaseTitle .icon, .kanban-card .title .icon, .kanban-card .productplanTitle .icon, .kanban-card .title .icon, .kanban-card .buildTitle .icon{padding-right: 5px;}
 .kanban-card .label-finish {margin-right: 7px; margin-top: -1px; padding: 3px 5px; float: left; background-color:#2a5f29;}
 .kanban-card .releaseTitle, .kanban-card .productplanTitle {width: 100%; float: left;}
 
-.progress-box {display: flex; flex-direction: row; margin-top: 10px;}
+.progress-box {width:100%; display: flex; flex-direction: row; margin-top: 10px;}
 .progress {flex: auto; margin: 5px auto 5px;}
 .progress-number {padding-left: 5px;}
 
diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js
index 0d0b723b39..a7e66e4e40 100644
--- a/module/kanban/js/view.js
+++ b/module/kanban/js/view.js
@@ -278,6 +278,22 @@ function renderKanbanItem(item, $item)
     var whiteStyle = null;
     if(item.color == '#2a5f29' || item.color == '#b10b0b' || item.color == '#cfa227') whiteStyle = 'style="color:#FFFFFF"';
 
+    var privs        = item.actions;
+    var printMoreBtn = (privs.includes('editCard') || privs.includes('archiveCard') || privs.includes('copyCard') || privs.includes('deleteCard') || privs.includes('moveCard') || privs.includes('setCardColor'));
+    var $actions     = $item.children('.actions');
+    var $title       = $item.children('.title');
+    if(printMoreBtn && !$actions.length)
+    {
+        $(
+        [
+            '<div class="actions" title="' + kanbanLang.more + '">',
+              '<a data-contextmenu="card"' + whiteStyle + 'data-id="' + item.id + '">',
+                '<i class="icon icon-ellipsis-v"></i>',
+              '</a>',
+            '</div>'
+        ].join('')).appendTo($item);
+    }
+
     if(item.fromType == 'execution')
     {
         renderExecutionItem(item, $item);
@@ -296,53 +312,13 @@ function renderKanbanItem(item, $item)
     }
     else
     {
-        var $title       = $item.children('.title');
-        var privs        = item.actions;
-        var printMoreBtn = (privs.includes('editCard') || privs.includes('archiveCard') || privs.includes('copyCard') || privs.includes('deleteCard') || privs.includes('moveCard') || privs.includes('setCardColor'));
-
-        if(privs.includes('sortCard')) $item.parent().addClass('sort');
         if(!$title.length)
         {
-            $('<div class="label label-finish">' + kanbanLang.finished + '</div>').appendTo($item);
             if(privs.includes('viewCard')) $title = $('<a class="title iframe" data-toggle="modal" data-width="80%"></a>').appendTo($item).attr('href', createLink('kanban', 'viewCard', 'cardID=' + item.id, '', true));
             if(!privs.includes('viewCard')) $title = $('<p class="title"></p>').appendTo($item);
         }
         $title.text(item.name).attr('title', item.name);
 
-        if(kanban.performable == 1 && item.status == 'done' )
-        {
-            var finishColor = '#2a5f29';
-            if(item.color == '#2a5f29') finishColor  = '#FFFFFF';
-            $title.text(item.name).css('color', finishColor);
-            $item.children('.label-finish').show();
-            if(item.color == '#2a5f29')
-            {
-                $item.children('.label-finish').css({'background-color':'#FFFFFF','color':'#2a5f29'});
-            }
-            else
-            {
-                $item.children('.label-finish').css({'background-color':'','color':'#FFFFFF'});
-            }
-        }
-        else
-        {
-            $title.text(item.name).css('color', '');
-            $item.children('.label-finish').hide();
-        }
-
-        var $actions = $item.children('.actions');
-        if(printMoreBtn && !$actions.length)
-        {
-            $(
-            [
-                '<div class="actions" title="' + kanbanLang.more + '">',
-                  '<a data-contextmenu="card"' + whiteStyle + 'data-id="' + item.id + '">',
-                    '<i class="icon icon-ellipsis-v"></i>',
-                  '</a>',
-                '</div>'
-            ].join('')).appendTo($item);
-        }
-
         var $info = $item.children('.info');
         if(!$info.length) $info = $(
         [
@@ -353,11 +329,6 @@ function renderKanbanItem(item, $item)
                 '<div class="user"></div>',
             '</div>'
         ].join('')).appendTo($item);
-        if(kanban.performable == 1)
-        {
-            var $progress = $item.children('.progress-box');
-            if(!$progress.length) $progress = $('<div class="progress-box"><div class="progress"><div class="progress-bar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: ' + item.progress + '%;"></div></div><div class="progress-number">' + item.progress + '%</div></div>').appendTo($item);
-        }
 
         $item.data('card', item);
 
@@ -367,15 +338,6 @@ function renderKanbanItem(item, $item)
         $info.children('.pri')
             .attr('class', 'pri label-pri label-pri-' + item.pri)
             .text(item.pri);
-        if(kanban.performable == 1)
-        {
-            $progress.find('.progress-bar').css('width', item.progress + '%');
-            $progress.find('.progress-number').html(item.progress + '%');
-        }
-
-        $item.css('background-color', item.color);
-        $item.toggleClass('has-color', item.color != '#fff' && item.color != '');
-        $item.find('.info > .label-light').css('background-color', item.color);
 
         var $time = $info.children('.time');
         if(item.end == '0000-00-00' && item.begin == '0000-00-00')
@@ -413,6 +375,41 @@ function renderKanbanItem(item, $item)
         for(i = 0; i < assignedTo.length; i++) title.push(users[assignedTo[i]]);
         $user.html(renderUsersAvatar(assignedTo, item.id)).attr('title', title);
     }
+
+    if(kanban.performable == 1)
+    {
+        var $progress = $item.children('.progress-box');
+        if(!$progress.length) $progress = $('<div class="progress-box"><div class="progress"><div class="progress-bar" aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width: ' + item.progress + '%;"></div></div><div class="progress-number">' + item.progress + '%</div></div>').appendTo($item);
+        $progress.find('.progress-bar').css('width', item.progress + '%');
+        $progress.find('.progress-number').html(item.progress + '%');
+    }
+    $item.css('background-color', item.color);
+    $item.toggleClass('has-color', item.color != '#fff' && item.color != '');
+    $item.find('.info > .label-light').css('background-color', item.color);
+
+    $title = item.fromType == 'execution' ? $item.children('.header').children('.executionName').children('.title') : $item.children('.title');
+    if(!$title.children('.label-finish').length) $title.prepend('<div class="label label-finish">' + kanbanLang.finished + '</div>');
+    var name = item.title ? item.title : item.name;
+    if(kanban.performable == 1 && item.status == 'done' )
+    {
+        var finishColor = '#2a5f29';
+        if(item.color == '#2a5f29') finishColor  = '#FFFFFF';
+        $title.css('color', finishColor);
+        $title.children('.label-finish').show();
+        if(item.color == '#2a5f29')
+        {
+            $item.children('.label-finish').css({'background-color':'#FFFFFF','color':'#2a5f29'});
+        }
+        else
+        {
+            $item.children('.label-finish').css({'background-color':'','color':'#FFFFFF'});
+        }
+    }
+    else
+    {
+        $title.css('color', '');
+        $title.children('.label-finish').hide();
+    }
 }
 
 /**
@@ -445,14 +442,19 @@ function renderExecutionItem(item, $item)
 
     /* Print execution name. */
     var $title = $titleBox.children('.title');
+    var name   = item.title ? item.title : item.name;
     if(!$title.length)
     {
         var icon = mode == 'new' ? 'run' : 'project';
         var viewMethod = item.execType == 'kanban' ? 'kanban' : 'view';
-        if(privs.includes('viewExecution') && item.deleted == '0') $title = $('<a class="title"><i class="icon icon-' + icon + '"></i>' + item.name + '</a>').appendTo($titleBox).attr('href', createLink('execution', viewMethod, 'executionID=' + item.fromID));
-        if(!privs.includes('viewExecution') || item.deleted == '1') $title = $('<div class="title"><i class="icon icon-' + icon + '"></i>' + item.name + '</div>').appendTo($titleBox);
+        if(privs.includes('viewExecution') && item.deleted == '0') $title = $('<a class="title"><i class="icon icon-' + icon + '"></i>' + name + '</a>').appendTo($titleBox).attr('href', createLink('execution', viewMethod, 'executionID=' + item.fromID));
+        if(!privs.includes('viewExecution') || item.deleted == '1') $title = $('<div class="title"><i class="icon icon-' + icon + '"></i>' + name + '</div>').appendTo($titleBox);
     }
-    $title.attr('title', item.name);
+    if(!$title.children('i').length)
+    {
+        $title.append('<i class="icon icon-run"></i>' + item.title);
+    }
+    $title.attr('title', name);
 
     if(item.delay)
     {
@@ -477,7 +479,7 @@ function renderExecutionItem(item, $item)
     {
         if(item.deleted == '0')
         {
-            $statusBox = $('<span class="execStatus label label-' + item.status + '">' + executionLang.statusList[item.status] + '</span>').appendTo($info);
+            $statusBox = $('<span class="execStatus label label-' + item.objectStatus + '">' + executionLang.statusList[item.objectStatus] + '</span>').appendTo($info);
         }
         else
         {
@@ -519,12 +521,17 @@ function renderReleaseItem(item, $item)
 
     /* Print name. */
     var $title = $item.children('.releaseTitle');
+    var name   = item.title ? item.title : item.name;
     if(!$title.length)
     {
-        if(privs.includes('viewRelease') && item.deleted == '0') $title = $('<a class="releaseTitle title"><i class="icon icon-publish"></i>' + item.name + '</a>').appendTo($item).attr('href', createLink('release', 'view', 'releaseID=' + item.fromID));
-        if(!privs.includes('viewRelease') || item.deleted == '1') $title = $('<div class="releaseTitle"><i class="icon icon-publish"></i>' + item.name + '</div>').appendTo($item);
+        if(privs.includes('viewRelease') && item.deleted == '0') $title = $('<a class="releaseTitle title"><i class="icon icon-publish"></i>' + name + '</a>').appendTo($item).attr('href', createLink('release', 'view', 'releaseID=' + item.fromID));
+        if(!privs.includes('viewRelease') || item.deleted == '1') $title = $('<div class="releaseTitle"><i class="icon icon-publish"></i>' + name + '</div>').appendTo($item);
     }
-    $title.attr('title', item.name);
+    if(!$title.children('i').length)
+    {
+        $title.prepend('<i class="icon icon-publish"></i>');
+    }
+    $title.attr('title', name);
 
     var $info = $item.children('.releaseInfo');
     if(!$info.length) $info = $(
@@ -538,7 +545,7 @@ function renderReleaseItem(item, $item)
     {
         if(item.deleted == '0')
         {
-            $statusBox = $('<span class="releaseStatus label label-' + item.status + '">' + releaseLang.statusList[item.status] + '</span>').appendTo($info);
+            $statusBox = $('<span class="releaseStatus label label-' + item.objectStatus + '">' + releaseLang.statusList[item.objectStatus] + '</span>').appendTo($info);
         }
         else
         {
@@ -578,10 +585,15 @@ function renderProductplanItem(item, $item)
 
     /* Print name. */
     var $title = $item.children('.productplanTitle');
+    var name   = item.title ? item.title : item.name;
     if(!$title.length)
     {
-        if(privs.includes('viewPlan') && item.deleted == '0') $title = $('<a class="productplanTitle title"><i class="icon icon-delay"></i>' + item.title + '</a>').appendTo($item).attr('href', createLink('productplan', 'view', 'productplanID=' + item.fromID));
-        if(!privs.includes('viewPlan') || item.deleted == '1') $title = $('<div class="productplanTitle"><i class="icon icon-delay"></i>' + item.title + '</div>').appendTo($item);
+        if(privs.includes('viewPlan') && item.deleted == '0') $title = $('<a class="productplanTitle title"><i class="icon icon-delay"></i>' + name + '</a>').appendTo($item).attr('href', createLink('productplan', 'view', 'productplanID=' + item.fromID));
+        if(!privs.includes('viewPlan') || item.deleted == '1') $title = $('<div class="productplanTitle"><i class="icon icon-delay"></i>' + name + '</div>').appendTo($item);
+    }
+    if(!$title.children('i').length)
+    {
+        $title.append('<i class="icon icon-delay"></i>' + name);
     }
     $title.attr('title', item.title);
 
@@ -597,7 +609,7 @@ function renderProductplanItem(item, $item)
     {
         if(item.deleted == '0')
         {
-            $statusBox = $('<span class="productplanStatus label label-' + item.status + '">' + productplanLang.statusList[item.status] + '</span>').appendTo($info);
+            $statusBox = $('<span class="productplanStatus label label-' + item.objectStatus + '">' + productplanLang.statusList[item.objectStatus] + '</span>').appendTo($info);
         }
         else
         {
@@ -646,12 +658,17 @@ function renderBuildItem(item, $item)
 
     /* Print name. */
     var $title = $item.children('.buildTitle');
+    var name   = item.title ? item.title : item.name;
     if(!$title.length)
     {
-        if(privs.includes('viewBuild') && item.deleted == '0') $title = $('<a class="buildTitle" data-app="project"><i class="icon icon-ver"></i>' + item.name + '</a>').appendTo($item).attr('href', createLink('build', 'view', 'buildID=' + item.fromID));
-        if(!privs.includes('viewBuild') || item.deleted == '1') $title = $('<div class="buildTitle"><i class="icon icon-ver"></i>' + item.name + '</div>').appendTo($item);
+        if(privs.includes('viewBuild') && item.deleted == '0') $title = $('<a class="buildTitle title" data-app="project"><i class="icon icon-ver"></i>' + name + '</a>').appendTo($item).attr('href', createLink('build', 'view', 'buildID=' + item.fromID));
+        if(!privs.includes('viewBuild') || item.deleted == '1') $title = $('<div class="buildTitle title"><i class="icon icon-ver"></i>' + name + '</div>').appendTo($item);
     }
-    $title.attr('title', item.name);
+    if(!$title.children('i').length)
+    {
+        $title.append('<i class="icon icon-ver"></i>' + item.title);
+    }
+    $title.attr('title', name);
 
     var $info = $item.children('.info');
     if(!$info.length) $info = $(
@@ -1081,9 +1098,6 @@ function createCardMenu(options)
             items.push({label: kanbanLang.finishCard, icon: 'checked', onClick: function(){finishCard(card.id, card.kanban, card.region);}});
         }
     }
-    if(privs.includes('archiveCard') && kanban.archived == '1') items.push({label: kanbanLang.archiveCard, icon: 'card-archive', url: createLink('kanban', 'archiveCard', 'cardID=' + card.id), attrs: {'target': 'hiddenwin'}});
-    if(privs.includes('copyCard')) items.push({label: kanbanLang.copyCard, icon: 'copy', url: createLink('kanban', 'copyCard', 'cardID=' + card.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal'}});
-    if(privs.includes('deleteCard')) items.push({label: kanbanLang.deleteCard, icon: 'trash', url: createLink('kanban', 'deleteCard', 'cardID=' + card.id), attrs: {'target': 'hiddenwin'}});
     if(privs.includes('moveCard'))
     {
         var moveCardItems = [];
@@ -1107,6 +1121,7 @@ function createCardMenu(options)
         moveCardItems = moveCardItems.reverse();
         items.push({label: kanbanLang.moveCard, icon: 'move', items: moveCardItems});
     }
+    if(privs.includes('archiveCard') && kanban.archived == '1') items.push({label: kanbanLang.archiveCard, icon: 'card-archive', url: createLink('kanban', 'archiveCard', 'cardID=' + card.id), attrs: {'target': 'hiddenwin'}});
     if(privs.includes('setCardColor'))
     {
         var cardColoritems = [];
@@ -1120,6 +1135,7 @@ function createCardMenu(options)
         };
         items.push({label: kanbanLang.cardColor, icon: 'color', items: cardColoritems});
     }
+    if(privs.includes('deleteCard')) items.push({label: kanbanLang.deleteCard, icon: 'trash', url: createLink('kanban', 'deleteCard', 'cardID=' + card.id), attrs: {'target': 'hiddenwin'}});
 
     var bounds = options.$trigger[0].getBoundingClientRect();
     items.$options = {x: bounds.right, y: bounds.top};
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 78ad667080..b3f439b886 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1113,16 +1113,17 @@ class kanbanModel extends model
      * @param  int    $kanbanID
      * @param  object $cards
      * @param  string $fromType
+     * @param  int    $archived
      * @access public
      * @return array
      */
-    public function getImportedCards($kanbanID, $cards, $fromType)
+    public function getImportedCards($kanbanID, $cards, $fromType, $archived = 0)
     {
         /* Get imported cards based on imported object type. */
         $objectCards = $this->dao->select('*')->from(TABLE_KANBANCARD)
             ->where('deleted')->eq(0)
             ->andWhere('kanban')->eq($kanbanID)
-            ->andWhere('archived')->eq(0)
+            ->andWhere('archived')->eq($archived)
             ->andWhere('fromType')->eq($fromType)
             ->fetchGroup('fromID', 'id');
 
@@ -1168,6 +1169,8 @@ class kanbanModel extends model
                         $objectCard->execType = $object->type;
                     }
 
+                    $objectCard->objectStatus = $objectCard->status;
+                    $objectCard->status       = $objectCard->progress == 100 ? 'done' : 'doing';
                     $cards[$cardID] = $objectCard;
                 }
             }
diff --git a/module/kanban/view/viewarchivedcard.html.php b/module/kanban/view/viewarchivedcard.html.php
index 551ca80854..107abd4988 100644
--- a/module/kanban/view/viewarchivedcard.html.php
+++ b/module/kanban/view/viewarchivedcard.html.php
@@ -31,6 +31,7 @@
 #archivedCards .info > .users > span:after {right: -4px; content: ''; display: block; position: absolute; width: 2px; height: 2px; background-color: #8990a2; top: 0px; border-radius: 50%;}
 #archivedCards .info > .users .avatar {display: inline-block; position: relative; border-radius: 50%; top: -5px; margin:  5px; right: -7px; margin-left: -4px;}
 #archivedCards .cardName {word-wrap: break-word;}
+#archivedCards .card-item .icon {margin-right:2px;}
 #archivedCards .card-item .red {background-color: #b10b0b;}
 #archivedCards .card-item .yellow {background-color: #cfa227;}
 #archivedCards .card-item .green {background-color: #2a5f29;}
@@ -44,6 +45,12 @@
 #archivedCards .progress-box {width: 97%;}
 #performable {padding: 25px 10px !important;}
 </style>
+<?php
+$app->loadLang('execution');
+$app->loadLang('release');
+$app->loadLang('build');
+$app->loadLang('productplan');
+?>
 <div class='panel'>
   <div class='panel-heading text-center'>
     <strong><?php echo $lang->kanban->archivedCard;?></strong>
@@ -76,10 +83,33 @@
         <?php if($card->status == 'done'):?>
         <div class="label" style="<?php echo $labelColor;?>"><?php echo $lang->kanban->finished;?></div>
         <?php endif;?>
+        <?php if(empty($card->fromType)):?>
           <?php echo html::a($this->createLink('kanban', 'viewCard', "cardID=$card->id", '', true), $card->name, '', "class='cardName iframe' data-toggle='modal' data-width='80%' title='$card->name'");?>
           <div class="info">
             <span class="pri label-pri label-pri-<?php echo $card->pri;?>"><?php echo $card->pri;?></span>
             <?php if($card->estimate and $card->estimate != 0) echo "<span class='text-gray'>{$card->estimate}h</span>";?>
+        <?php elseif($card->fromType == 'productplan'):?>
+          <?php echo html::a($this->createLink('productplan', 'view', "id=$card->fromID"), $card->title, '', "class='cardName' title='$card->title'");?>
+          <div class="info productplan">
+            <span class="label label-<?php echo $card->objectStatus?>" ><?php echo $lang->{$card->fromType}->statusList[$card->objectStatus];?></span>
+        <?php elseif($card->fromType == 'release'):?>
+          <?php echo html::a($this->createLink('release', 'view', "id=$card->fromID"), $card->name, '', "class='cardName' title='$card->name'");?>
+          <div class="info release">
+            <span class="label label-<?php echo $card->objectStatus?>" ><?php echo $lang->{$card->fromType}->statusList[$card->objectStatus];?></span>
+            <?php if(!helper::isZeroDate($card->date)):?>
+            <span class="time label label-light"><?php echo date("m/d", strtotime($card->date));?></span>
+            <?php endif;?>
+        <?php elseif($card->fromType == 'execution'):?>
+          <?php echo html::a($this->createLink('execution', 'view', "id=$card->fromID"), $card->name, '', "class='cardName' title='$card->name'");?>
+          <div class="info execution">
+            <span class="label label-<?php echo $card->objectStatus?>" ><?php echo $lang->{$card->fromType}->statusList[$card->objectStatus];?></span>
+        <?php elseif($card->fromType == 'build'):?>
+          <?php echo html::a($this->createLink('build', 'view', "id=$card->fromID"), $card->name, '', "class='cardName' title='$card->name'");?>
+          <div class="info build">
+            <?php if(!helper::isZeroDate($card->date)):?>
+            <span class="time label label-light"><?php echo date("m/d", strtotime($card->date));?></span>
+            <?php endif;?>
+        <?php endif;?>
             <?php if(helper::isZeroDate($card->end) and !helper::isZeroDate($card->begin)):?>
             <span class="time label label-light"><?php echo date("m/d", strtotime($card->begin)) . $lang->kanbancard->beginAB;?></span>
             <?php endif;?>
@@ -152,5 +182,17 @@ $(function()
     {
         $('#archivedCards').animate({right: -400}, 500);
     });
+    $('.card-item').each(function()
+    {
+        var $item = $(this).children('.col-xs-10').children('.kanban-item');
+        var icon  = '';
+
+        if($item.children('.build').length)       icon = '<i class="icon icon-ver">';
+        if($item.children('.execution').length)   icon = '<i class="icon icon-run">';
+        if($item.children('.productplan').length) icon = '<i class="icon icon-delay">';
+        if($item.children('.release').length)     icon = '<i class="icon icon-publish">';
+
+        $item.children('a').prepend(icon);
+    });
 })
 </script>

From 987edcc3cf0e5aadcb217e861d694063f658a16e Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 10 May 2022 16:29:56 +0800
Subject: [PATCH 04/13] * Finish task #53663.

---
 module/kanban/control.php                    | 11 +++++++++--
 module/kanban/js/view.js                     |  6 +++---
 module/kanban/lang/en.php                    |  2 ++
 module/kanban/lang/zh-cn.php                 |  2 ++
 module/kanban/view/viewarchivedcard.html.php |  4 ++--
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/module/kanban/control.php b/module/kanban/control.php
index a18e14e40d..158625aa88 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -1380,13 +1380,20 @@ class kanban extends control
 	 */
     public function deleteCard($cardID, $confirm = 'no')
     {
+        $card = $this->kanban->getCardByID($cardID);
         if($confirm == 'no')
         {
-            return print(js::confirm($this->lang->kanbancard->confirmDelete, $this->createLink('kanban', 'deleteCard', "cardID=$cardID&confirm=yes")));
+            $confirmTip = $card->fromType == '' ? $this->lang->kanbancard->confirmDelete : $this->lang->kanbancard->confirmRemove;
+            return print(js::confirm($confirmTip, $this->createLink('kanban', 'deleteCard', "cardID=$cardID&confirm=yes")));
         }
         else
         {
-            $this->kanban->delete(TABLE_KANBANCARD, $cardID);
+            if($card->fromType == '') $this->kanban->delete(TABLE_KANBANCARD, $cardID);
+            if($card->fromType != '')
+            {
+                $this->dao->delete()->from(TABLE_KANBANCARD)->where('id')->eq($cardID)->exec();
+                $this->loadModel('action')->create('kanbancard', $cardID, 'Deleted', '', $cardID);
+            }
 
             if(isonlybody()) return print(js::reload('parent.parent'));
             return print(js::reload('parent'));
diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js
index a7e66e4e40..1ba790454f 100644
--- a/module/kanban/js/view.js
+++ b/module/kanban/js/view.js
@@ -1086,7 +1086,7 @@ function createCardMenu(options)
     if(!privs.length) return [];
 
     var items = [];
-    if(privs.includes('editCard')) items.push({label: kanbanLang.editCard, icon: 'edit', url: createLink('kanban', 'editCard', 'cardID=' + card.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
+    if(privs.includes('editCard') && card.fromType == '') items.push({label: kanbanLang.editCard, icon: 'edit', url: createLink('kanban', 'editCard', 'cardID=' + card.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
     if(privs.includes('performable') && kanban.performable == 1)
     {
         if(card.status == 'done')
@@ -1125,7 +1125,7 @@ function createCardMenu(options)
     if(privs.includes('setCardColor'))
     {
         var cardColoritems = [];
-        if(!card.color) color = "#fff";
+        if(!card.color) card.color = "#fff";
         for(let i = 0 ; i < colorList.length ; i ++ )
         {
             var attr   = card.color == colorList[i] ? '<i class="icon icon-check" style="margin-left: 5px"></i>' : '';
@@ -1135,7 +1135,7 @@ function createCardMenu(options)
         };
         items.push({label: kanbanLang.cardColor, icon: 'color', items: cardColoritems});
     }
-    if(privs.includes('deleteCard')) items.push({label: kanbanLang.deleteCard, icon: 'trash', url: createLink('kanban', 'deleteCard', 'cardID=' + card.id), attrs: {'target': 'hiddenwin'}});
+    if(privs.includes('deleteCard')) items.push({label: card.fromType == '' ? kanbanLang.deleteCard : kanbanLang.removeCard, icon: card.fromType == '' ? 'trash' : 'unlink', url: createLink('kanban', 'deleteCard', 'cardID=' + card.id), attrs: {'target': 'hiddenwin'}});
 
     var bounds = options.$trigger[0].getBoundingClientRect();
     items.$options = {x: bounds.right, y: bounds.top};
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index b6d8efb4a2..cce018447c 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -40,6 +40,7 @@ $lang->kanban->moveCard            = 'Move Card';
 $lang->kanban->cardColor           = 'Card Color';
 $lang->kanban->setCardColor        = 'Set Card Color';
 $lang->kanban->deleteCard          = 'Delete Card';
+$lang->kanban->removeCard          = 'Remove Card';
 $lang->kanban->assigntoCard        = 'Assign';
 $lang->kanban->setting             = 'Setting';
 $lang->kanban->enableArchived      = 'Enable Archived';
@@ -365,6 +366,7 @@ $lang->kanbancard->confirmArchive    = 'Are you sure to archive this card? After
 $lang->kanbancard->confirmDelete     = 'Are you sure to delete this card? After deleting the card, it will be deleted from the Kanban. You can only view it in the system recycle bin.';
 $lang->kanbancard->confirmRestore    = "Are you sure you want to restore this card? After the card is restored, the card will be restored to the '%s' Kanban column.";
 $lang->kanbancard->confirmRestoreTip = "The card's column has been archived or deleted, please restore '%s' column first.";
+$lang->kanbancard->confirmRemove     = 'Are you sure to remove this card? After removing the card, the original data would not be affected.The card would be removed from the Kanban and counld not be restored.';
 
 $lang->kanbancard->priList[1] = 1;
 $lang->kanbancard->priList[2] = 2;
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index 3b30ccdcdf..00a8305975 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -40,6 +40,7 @@ $lang->kanban->moveCard            = '移动卡片';
 $lang->kanban->cardColor           = '卡片颜色';
 $lang->kanban->setCardColor        = '设置卡片颜色';
 $lang->kanban->deleteCard          = '删除卡片';
+$lang->kanban->removeCard          = '移除卡片';
 $lang->kanban->assigntoCard        = '指派';
 $lang->kanban->setting             = '设置';
 $lang->kanban->enableArchived      = '设置归档功能';
@@ -365,6 +366,7 @@ $lang->kanbancard->confirmArchive    = '您确认归档该卡片吗？归档卡
 $lang->kanbancard->confirmDelete     = '您确认删除该卡片吗？删除卡片后，该卡片将从看板中删除，您只能通过系统回收站查看。';
 $lang->kanbancard->confirmRestore    = '您确定要还原该卡片吗？还原卡片后，该卡片将还原到“%s”看板列中。';
 $lang->kanbancard->confirmRestoreTip = '该卡片所属的看板列已被归档或删除，请先还原“%s”看板列。';
+$lang->kanbancard->confirmRemove     = '您确认移除该卡片吗？移除卡片后，源数据不会受到影响，卡片将从看板中移除且无法恢复。';
 
 $lang->kanbancard->priList[1] = 1;
 $lang->kanbancard->priList[2] = 2;
diff --git a/module/kanban/view/viewarchivedcard.html.php b/module/kanban/view/viewarchivedcard.html.php
index 107abd4988..e5fd50c1f5 100644
--- a/module/kanban/view/viewarchivedcard.html.php
+++ b/module/kanban/view/viewarchivedcard.html.php
@@ -104,7 +104,7 @@ $app->loadLang('productplan');
           <div class="info execution">
             <span class="label label-<?php echo $card->objectStatus?>" ><?php echo $lang->{$card->fromType}->statusList[$card->objectStatus];?></span>
         <?php elseif($card->fromType == 'build'):?>
-          <?php echo html::a($this->createLink('build', 'view', "id=$card->fromID"), $card->name, '', "class='cardName' title='$card->name'");?>
+          <?php echo html::a($this->createLink('build', 'view', "id=$card->fromID"), $card->name, '', "class='cardName' title='$card->name' data-app='project'");?>
           <div class="info build">
             <?php if(!helper::isZeroDate($card->date)):?>
             <span class="time label label-light"><?php echo date("m/d", strtotime($card->date));?></span>
@@ -167,7 +167,7 @@ $app->loadLang('productplan');
 
         if($canRestore) echo html::a(inlink('restoreCard', "cardID={$card->id}"), $lang->kanban->restore, '', "class='btn btn-xs btn-primary' target='hiddenwin'");
 
-        if($canDelete) echo html::a($this->createLink('kanban', 'deleteCard', "cardID=$card->id"), $lang->delete, '', "class='btn btn-xs delete-card' target='hiddenwin'");
+        if($canDelete) echo html::a($this->createLink('kanban', 'deleteCard', "cardID=$card->id"), $card->fromType == '' ? $lang->delete : $lang->unlink, '', "class='btn btn-xs delete-card' target='hiddenwin'");
         ?>
       </div>
     </div>

From 92f20d091474bfd032363cbdf57a9a23dfc1c4c0 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 10 May 2022 17:19:48 +0800
Subject: [PATCH 05/13] * Finish task #53663, code format.

---
 module/kanban/view/viewarchivedcard.html.php | 32 ++++++--------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/module/kanban/view/viewarchivedcard.html.php b/module/kanban/view/viewarchivedcard.html.php
index e5fd50c1f5..9c19a7d81b 100644
--- a/module/kanban/view/viewarchivedcard.html.php
+++ b/module/kanban/view/viewarchivedcard.html.php
@@ -88,27 +88,15 @@ $app->loadLang('productplan');
           <div class="info">
             <span class="pri label-pri label-pri-<?php echo $card->pri;?>"><?php echo $card->pri;?></span>
             <?php if($card->estimate and $card->estimate != 0) echo "<span class='text-gray'>{$card->estimate}h</span>";?>
-        <?php elseif($card->fromType == 'productplan'):?>
-          <?php echo html::a($this->createLink('productplan', 'view', "id=$card->fromID"), $card->title, '', "class='cardName' title='$card->title'");?>
-          <div class="info productplan">
-            <span class="label label-<?php echo $card->objectStatus?>" ><?php echo $lang->{$card->fromType}->statusList[$card->objectStatus];?></span>
-        <?php elseif($card->fromType == 'release'):?>
-          <?php echo html::a($this->createLink('release', 'view', "id=$card->fromID"), $card->name, '', "class='cardName' title='$card->name'");?>
-          <div class="info release">
-            <span class="label label-<?php echo $card->objectStatus?>" ><?php echo $lang->{$card->fromType}->statusList[$card->objectStatus];?></span>
-            <?php if(!helper::isZeroDate($card->date)):?>
-            <span class="time label label-light"><?php echo date("m/d", strtotime($card->date));?></span>
-            <?php endif;?>
-        <?php elseif($card->fromType == 'execution'):?>
-          <?php echo html::a($this->createLink('execution', 'view', "id=$card->fromID"), $card->name, '', "class='cardName' title='$card->name'");?>
-          <div class="info execution">
-            <span class="label label-<?php echo $card->objectStatus?>" ><?php echo $lang->{$card->fromType}->statusList[$card->objectStatus];?></span>
-        <?php elseif($card->fromType == 'build'):?>
-          <?php echo html::a($this->createLink('build', 'view', "id=$card->fromID"), $card->name, '', "class='cardName' title='$card->name' data-app='project'");?>
-          <div class="info build">
-            <?php if(!helper::isZeroDate($card->date)):?>
-            <span class="time label label-light"><?php echo date("m/d", strtotime($card->date));?></span>
-            <?php endif;?>
+        <?php else:?>
+        <?php
+        $name = isset($card->title) ? $card->title : $card->name;
+        if(!common::hasPriv($card->fromType, 'view')) echo html::a($this->createLink('productplan', 'view', "id=$card->fromID"), $name, '', "class='cardName' title='$name'");
+        if(common::hasPriv($card->fromType, 'view')) echo "<div class='cardName' title='$name'>$name</div>";
+        echo "<div class='info $card->fromType'>";
+        if($card->fromType != 'release' and isset($lang->{$card->fromType}->statusList[$card->objectStatus])) echo "<span class='label label-$card->objectStatus'>" . $lang->{$card->fromType}->statusList[$card->objectStatus] . '</span>';
+        if(isset($card->date) and !helper::isZeroDate($card->date)) echo "<span class='time label label-light'>" . date("m/d", strtotime($card->date)) . "</span>"
+        ?>
         <?php endif;?>
             <?php if(helper::isZeroDate($card->end) and !helper::isZeroDate($card->begin)):?>
             <span class="time label label-light"><?php echo date("m/d", strtotime($card->begin)) . $lang->kanbancard->beginAB;?></span>
@@ -192,7 +180,7 @@ $(function()
         if($item.children('.productplan').length) icon = '<i class="icon icon-delay">';
         if($item.children('.release').length)     icon = '<i class="icon icon-publish">';
 
-        $item.children('a').prepend(icon);
+        $item.children('.cardName').prepend(icon);
     });
 })
 </script>

From b4eda681c6b8bbae2a1c4ae7bb8f5c49e93518ed Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 10 May 2022 17:22:29 +0800
Subject: [PATCH 06/13] * Code for task #53663.

---
 module/kanban/view/viewarchivedcard.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/kanban/view/viewarchivedcard.html.php b/module/kanban/view/viewarchivedcard.html.php
index 9c19a7d81b..09da6b4a0f 100644
--- a/module/kanban/view/viewarchivedcard.html.php
+++ b/module/kanban/view/viewarchivedcard.html.php
@@ -91,8 +91,8 @@ $app->loadLang('productplan');
         <?php else:?>
         <?php
         $name = isset($card->title) ? $card->title : $card->name;
-        if(!common::hasPriv($card->fromType, 'view')) echo html::a($this->createLink('productplan', 'view', "id=$card->fromID"), $name, '', "class='cardName' title='$name'");
-        if(common::hasPriv($card->fromType, 'view')) echo "<div class='cardName' title='$name'>$name</div>";
+        if(common::hasPriv($card->fromType, 'view')) echo html::a($this->createLink('productplan', 'view', "id=$card->fromID"), $name, '', "class='cardName' title='$name'");
+        if(!common::hasPriv($card->fromType, 'view')) echo "<div class='cardName' title='$name'>$name</div>";
         echo "<div class='info $card->fromType'>";
         if($card->fromType != 'release' and isset($lang->{$card->fromType}->statusList[$card->objectStatus])) echo "<span class='label label-$card->objectStatus'>" . $lang->{$card->fromType}->statusList[$card->objectStatus] . '</span>';
         if(isset($card->date) and !helper::isZeroDate($card->date)) echo "<span class='time label label-light'>" . date("m/d", strtotime($card->date)) . "</span>"

From 0fba3427afc991bdbd0c09a9362fe71edf4faef0 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Wed, 11 May 2022 01:39:53 +0000
Subject: [PATCH 07/13]  * Build operate menu for productplan module.

---
 framework/control.class.php                   |   2 +-
 module/productplan/model.php                  | 101 +++++++++++++++++-
 module/productplan/view/browsebylist.html.php |  62 +----------
 module/productplan/view/view.html.php         |  26 +----
 4 files changed, 102 insertions(+), 89 deletions(-)

diff --git a/framework/control.class.php b/framework/control.class.php
index 3677e1e7dc..326c9f9c20 100644
--- a/framework/control.class.php
+++ b/framework/control.class.php
@@ -326,7 +326,7 @@ class control extends baseControl
         if(!isset($this->config->bizVersion)) return false;
 
         $moduleName = $this->moduleName;
-        if(strpos(',bug,feedback,caselib,testsuite,testtask,testcase,product,', ",{$moduleName},") !== false) return $this->$moduleName->buildOperateMenu($object, $type);
+        if(strpos(',bug,feedback,caselib,testsuite,testtask,testcase,product,productplan,', ",{$moduleName},") !== false) return $this->$moduleName->buildOperateMenu($object, $type);
 
         $flow = $this->loadModel('workflow')->getByModule($moduleName);
         return $this->loadModel('flow')->buildOperateMenu($flow, $object, $type);
diff --git a/module/productplan/model.php b/module/productplan/model.php
index ad2d763bec..d388bce67f 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -1002,17 +1002,21 @@ class productplanModel extends model
      *
      * @param  object $plan
      * @param  string $action
+     * @param  string $module
      * @access public
      * @return void
      */
-    public static function isClickable($plan, $action)
+    public static function isClickable($plan, $action, $module = 'productplan')
     {
         $action    = strtolower($action);
-        $clickable = commonModel::hasPriv('productplan', $action);
+        $clickable = commonModel::hasPriv($module, $action);
         if(!$clickable) return false;
 
         switch($action)
         {
+            case 'create' :
+                if($plan->parent > 0 or strpos('done,closed', $plan->status) !== false) return false;
+                break;
             case 'start' :
                 if($plan->status != 'wait' or $plan->parent < 0) return false;
                 break;
@@ -1025,8 +1029,101 @@ class productplanModel extends model
             case 'activate' :
                 if($plan->status == 'wait' or $plan->status == 'doing' or $plan->parent < 0) return false;
                 break;
+            case 'delete' :
+                if($plan->parent < 0) return false;
+                break;
+        }
+
+        if($module == 'execution' && $action == 'create')
+        {
+            if($plan->parent < 0 || $plan->expired || in_array($plan->status, array('done', 'closed'))) return false;
+
+            $product     = $this->loadModel('product')->getById($plan->product);
+            $branchList  = $this->loadModel('branch')->getList($plan->product, 0, 'all');
+
+            $branchStatusList = array();
+            foreach($branchList as $productBranch) $branchStatusList[$productBranch->id] = $productBranch->status;
+
+            if($product->type != 'normal')
+            {
+                $branchStatus = isset($branchStatusList[$plan->branch]) ? $branchStatusList[$plan->branch] : '';
+                if($branchStatus == 'closed') return false;
+            }
         }
 
         return true;
     }
+
+    /**
+     * Build operate menu.
+     *
+     * @param  object $plan
+     * @param  string $type
+     * @access public
+     * @return string
+     */
+    public function buildOperateMenu($plan, $type = 'view')
+    {
+        $params = "planID=$plan->id";
+
+        $menu  = '';
+        $menu .= $this->buildMenu('productplan', 'start', $params, $plan, $type, 'play', 'hiddenwin', '', false, '', $this->lang->productplan->startAB);
+        $menu .= $this->buildMenu('productplan', 'finish', $params, $plan, $type, 'checked', 'hiddenwin', '', false, '', $this->lang->productplan->finishAB);
+        $menu .= $this->buildMenu('productplan', 'close', $params, $plan, $type, 'off', 'hiddenwin', 'iframe', true, '', $this->lang->productplan->closeAB);
+
+        if($type == 'view') $menu .= $this->buildMenu('productplan', 'activate', $params, $plan, $type, 'magic', 'hiddenwin', '', false, '', $this->lang->productplan->activateAB);
+
+        if($type == 'browse')
+        {
+            if($this->isClickable($plan, 'create', 'execution'))
+            {
+                $executionLink = $this->config->systemMode == 'new' ? '#projects' : helper::createLink('execution', 'create', "projectID=0&executionID=0&copyExecutionID=0&plan=$plan->id&confirm=no&productID=$plan->product");
+                if($this->config->systemMode == 'new')
+                {
+                    $menu .= html::a($executionLink, '<i class="icon-plus"></i>', '', "data-toggle='modal' data-id='$plan->id' onclick='getPlanID(this, $plan->branch)' class='btn' title='{$this->lang->productplan->createExecution}'");
+                }
+                else
+                {
+                    $menu .= html::a($executionLink, '<i class="icon-plus"></i>', '', "class='btn' title='{$this->lang->productplan->createExecution}'");
+                }
+            }
+            else
+            {
+                $menu .= "<button type='button' class='btn disabled'><i class='icon-plus' title='{$this->lang->productplan->createExecution}'></i></button>";
+            }
+
+            if(common::hasPriv('productplan', 'linkStory', $plan) and $plan->parent >= 0)
+            {
+                $menu .= $this->buildMenu('productplan', 'view', "{$params}&type=story&orderBy=id_desc&link=true", $plan, $type, 'link', '', '', '', '', $this->lang->productplan->linkStory);
+            }
+            else
+            {
+                $menu .= "<button type='button' class='disabled btn'><i class='icon-link' title='{$this->lang->productplan->linkStory}'></i></button>";
+            }
+
+            if(common::hasPriv('productplan', 'linkBug', $plan) and $plan->parent >= 0)
+            {
+                $menu .= $this->buildMenu('productplan', 'view', "{$params}&type=bug&orderBy=id_desc&link=true", $plan, $type, 'bug', '', '', '', '',  $this->lang->productplan->linkBug);
+            }
+            else
+            {
+                $menu .= "<button type='button' class='disabled btn'><i class='icon-bug' title='{$this->lang->productplan->linkBug}'></i></button>";
+            }
+
+            $menu .= $this->buildMenu('productplan', 'edit', $params, $plan, $type);
+        }
+
+        $menu .= $this->buildMenu('productplan', 'create', "product={$plan->product}&branch={$plan->branch}&parent={$plan->id}", $plan, $type, 'split', '', '', '', '', $this->lang->productplan->children);
+
+        if($type == 'browse') $menu .= $this->buildMenu('productplan', 'delete', "{$params}&confirm=no", $plan, $type, 'trash', 'hiddenwin', '', '', $this->lang->productplan->delete);
+
+        if($type == 'view')
+        {
+            if(common::hasPriv('productplan', 'edit', $plan)) $menu .= html::a(helper::createLink('productplan', 'edit', $params), "<i class='icon-common-edit icon-edit'></i> " . $this->lang->edit, '', "class='btn btn-link' title='{$this->lang->edit}'");
+            if($plan->parent >= 0 && common::hasPriv('productplan', 'delete', $plan)) $menu .= html::a(helper::createLink('productplan', 'delete', $params), "<i class='icon-common-delete icon-trash'></i> " . $this->lang->delete, '', "class='btn btn-link' title='{$this->lang->delete}' target='hiddenwin'");
+        }
+
+
+        return $menu;
+    }
 }
diff --git a/module/productplan/view/browsebylist.html.php b/module/productplan/view/browsebylist.html.php
index 776abaaf9a..db0c2e0b73 100644
--- a/module/productplan/view/browsebylist.html.php
+++ b/module/productplan/view/browsebylist.html.php
@@ -144,67 +144,7 @@
           <div title='<?php echo $desc;?>'><?php echo nl2br($desc);?></div>
         </td>
         <?php foreach($extendFields as $extendField) echo "<td>" . $this->loadModel('flow')->getFieldValue($extendField, $plan) . "</td>";?>
-        <td class='c-actions'>
-          <?php
-          if($plan->parent >= 0 )
-          {
-              $attr = "target='hiddenwin'";
-              common::printIcon('productplan', 'start', "planID=$plan->id", $plan, 'list', 'play', '', '', false, $attr);
-              common::printIcon('productplan', 'finish', "planID=$plan->id", $plan, 'list', 'checked', '', '', false, $attr);
-              common::printIcon('productplan', 'close', "planID=$plan->id", $plan, 'list', 'off', '', 'iframe', true);
-          }
-
-          $attr  = $plan->expired ? "disabled='disabled'" : '';
-          $class = '';
-          if($product->type != 'normal')
-          {
-              $branchStatus = isset($branchStatusList[$plan->branch]) ? $branchStatusList[$plan->branch] : '';
-              if($branchStatus == 'closed') $class = 'disabled';
-          }
-          if(common::hasPriv('execution', 'create', $plan) and $plan->parent >= 0)
-          {
-              $disabled      = '';
-              $executionLink = $config->systemMode == 'new' ? '#projects' : $this->createLink('execution', 'create', "projectID=0&executionID=0&copyExecutionID=0&plan=$plan->id&confirm=no&productID=$productID");
-
-              if(in_array($plan->status, array('done', 'closed'))) $disabled = 'disabled';
-
-              if($config->systemMode == 'new')
-              {
-                  echo html::a($executionLink, '<i class="icon-plus"></i>', '', "data-toggle='modal' data-id='$plan->id' onclick='getPlanID(this, $plan->branch)' class='btn {$disabled} {$class}' title='{$lang->productplan->createExecution}' $attr");
-              }
-              else
-              {
-                  echo html::a($executionLink, '<i class="icon-plus"></i>', '', "class='btn {$disabled}' title='{$lang->productplan->createExecution}' $attr");
-              }
-          }
-          if(common::hasPriv('productplan', 'linkStory', $plan) and $plan->parent >= 0) echo html::a(inlink('view', "planID=$plan->id&type=story&orderBy=id_desc&link=true"), '<i class="icon-link"></i>', '', "class='btn' title='{$lang->productplan->linkStory}'");
-          if(common::hasPriv('productplan', 'linkBug', $plan) and $plan->parent >= 0) echo html::a(inlink('view', "planID=$plan->id&type=bug&orderBy=id_desc&link=true"), '<i class="icon-bug"></i>', '', "class='btn' title='{$lang->productplan->linkBug}'");
-          common::printIcon('productplan', 'edit', "planID=$plan->id", $plan, 'list');
-          if(common::hasPriv('productplan', 'create', $plan))
-          {
-              if($plan->parent > 0 or strpos('done,closed', $plan->status) !== false)
-              {
-                  echo "<button type='button' class='disabled btn'><i class='disabled icon-split' title='{$this->lang->productplan->children}'></i></button> ";
-              }
-              else
-              {
-                  echo html::a($this->createLink('productplan', 'create', "product=$productID&branch=$branch&parent={$plan->id}"), "<i class='icon-split'></i>", '', "class='btn {$class}' title='{$this->lang->productplan->children}'");
-              }
-          }
-
-          if(common::hasPriv('productplan', 'delete', $plan))
-          {
-              $deleteURL = '###';
-              $disabled  = 'disabled';
-              if($plan->parent >= 0)
-              {
-                  $deleteURL = $this->createLink('productplan', 'delete', "planID=$plan->id&confirm=no");
-                  $disabled  = '';
-              }
-              echo html::a($deleteURL, '<i class="icon-trash"></i>', 'hiddenwin', "class='btn {$disabled}' title='{$lang->productplan->delete}'");
-          }
-          ?>
-        </td>
+        <td class='c-actions'><?php echo $this->buildOperateMenu($plan, 'browse'); ?></td>
       </tr>
       <?php endforeach;?>
       </tbody>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 0ffd20a298..cff6af86a6 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -38,31 +38,7 @@
     </div>
   </div>
   <div class='btn-toolbar pull-right' id='actionsBox'>
-    <?php
-    if(!$plan->deleted && !isonlybody())
-    {
-        echo $this->buildOperateMenu($plan, 'view');
-
-        if($plan->parent >= 0)
-        {
-            $attr  = "target='hiddenwin'";
-            $class = $plan->status == 'wait' ? '' : 'disabled';
-
-            common::printLink('productplan', 'start', "planID=$plan->id", "<i class='icon-play'></i>{$lang->productplan->startAB}", '', "class='btn btn-link {$class}'{$attr} title='{$lang->productplan->start}'", '', false, $plan);
-            $class = $plan->status == 'doing' ? '' : 'disabled';
-            common::printLink('productplan', 'finish', "planID=$plan->id", "<i class='icon-checked'></i>{$lang->productplan->finishAB}", '', "class='btn btn-link {$class}' target='hiddenwin' title='{$lang->productplan->finish}'", '', false, $plan);
-            $class = $plan->status !== 'closed' ? 'iframe' : 'disabled';
-            common::printLink('productplan', 'close', "planID=$plan->id", "<i class='icon-off'></i>{$lang->productplan->closeAB}", '', "class='btn btn-link {$class}' title='{$lang->productplan->close}'", '', true, $plan);
-            $class = in_array($plan->status, array('closed', 'done')) ? '' : 'disabled';
-            common::printLink('productplan', 'activate', "planID=$plan->id", "<i class='icon-magic'></i>{$lang->productplan->activateAB}", '', "class='btn btn-link {$class}' target='hiddenwin' title='{$lang->productplan->activate}'", '', false, $plan);
-        }
-
-        $class = (isset($branchStatus) and $branchStatus == 'closed') ? 'disabled' : '';
-        if(common::hasPriv('productplan', 'create', $plan) and $plan->parent <= 0 and strpos('wait,doing', $plan->status) !== false) echo html::a($this->createLink('productplan', 'create', "product={$plan->product}&branch={$plan->branch}&parent={$plan->id}"), "<i class='icon-split'></i> " . $this->lang->productplan->children , '', "class='btn btn-link {$class}' title='{$this->lang->productplan->children}'");
-        if(common::hasPriv('productplan', 'edit', $plan)) echo html::a($this->createLink('productplan', 'edit', "planID=$plan->id"), "<i class='icon-common-edit icon-edit'></i> " . $this->lang->edit, '', "class='btn btn-link' title='{$this->lang->edit}'");
-        if(common::hasPriv('productplan', 'delete', $plan) and $plan->parent >= 0) echo html::a($this->createLink('productplan', 'delete', "planID=$plan->id"), "<i class='icon-common-delete icon-trash'></i> " . $this->lang->delete, '', "class='btn btn-link' title='{$this->lang->delete}' target='hiddenwin'");
-    }
-    ?>
+    <?php if(!$plan->deleted && !isonlybody()) echo $this->buildOperateMenu($plan, 'view'); ?>
   </div>
 </div>
 <div id='mainContent' class='main-content'>

From 8243e4c175a56799351d88f41f71fd4b5bb6b580 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Wed, 11 May 2022 01:47:55 +0000
Subject: [PATCH 08/13]  * Remove empty line.

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

diff --git a/module/productplan/model.php b/module/productplan/model.php
index d388bce67f..7ec779299b 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -1123,7 +1123,6 @@ class productplanModel extends model
             if($plan->parent >= 0 && common::hasPriv('productplan', 'delete', $plan)) $menu .= html::a(helper::createLink('productplan', 'delete', $params), "<i class='icon-common-delete icon-trash'></i> " . $this->lang->delete, '', "class='btn btn-link' title='{$this->lang->delete}' target='hiddenwin'");
         }
 
-
         return $menu;
     }
 }

From 977e100d042985b946a29844f28f5ce059e21e2d Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 11 May 2022 09:48:08 +0800
Subject: [PATCH 09/13] * Finish task #53647.

---
 module/bug/config.php |  2 ++
 module/bug/model.php  | 25 ++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/module/bug/config.php b/module/bug/config.php
index 23ccd42efb..a2a00b49c6 100644
--- a/module/bug/config.php
+++ b/module/bug/config.php
@@ -71,6 +71,7 @@ $config->bug->search['fields']['resolvedBy']     = $lang->bug->resolvedBy;
 
 $config->bug->search['fields']['status']         = $lang->bug->status;
 $config->bug->search['fields']['confirmed']      = $lang->bug->confirmed;
+$config->bug->search['fields']['story']          = $lang->bug->story;
 
 if($config->systemMode == 'new') $config->bug->search['fields']['project'] = $lang->bug->project;
 $config->bug->search['fields']['product']        = $lang->bug->product;
@@ -116,6 +117,7 @@ $config->bug->search['params']['resolvedBy']    = array('operator' => '=',
 
 $config->bug->search['params']['status']        = array('operator' => '=',       'control' => 'select', 'values' => $lang->bug->statusList);
 $config->bug->search['params']['confirmed']     = array('operator' => '=',       'control' => 'select', 'values' => $lang->bug->confirmedList);
+$config->bug->search['params']['story']         = array('operator' => 'include', 'control' => 'input',  'values' => '');
 
 if($config->systemMode == 'new') $config->bug->search['params']['project'] = array('operator' => '=', 'control' => 'select', 'values' => '');
 $config->bug->search['params']['product']       = array('operator' => '=',       'control' => 'select', 'values' => '');
diff --git a/module/bug/model.php b/module/bug/model.php
index a534aded89..4dd3da215f 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -2730,6 +2730,25 @@ class bugModel extends model
         /* Fix bug #2878. */
         if(strpos($bugQuery, ' `resolvedDate` ') !== false) $bugQuery = str_replace(' `resolvedDate` ', " `resolvedDate` != '0000-00-00 00:00:00' AND `resolvedDate` ", $bugQuery);
         if(strpos($bugQuery, ' `closedDate` ') !== false)   $bugQuery = str_replace(' `closedDate` ', " `closedDate` != '0000-00-00 00:00:00' AND `closedDate` ", $bugQuery);
+        if(strpos($bugQuery, ' `story` ') !== false)
+        {
+            preg_match_all("/`story`[ ]+(NOT *)?LIKE[ ]+'%([^%]*)%'/Ui", $bugQuery, $out);
+            if(!empty($out[2]))
+            {
+                foreach($out[2] as $searchValue)
+                {
+                    $story = $this->dao->select('id')->from(TABLE_STORY)->alias('t1')
+                        ->leftJoin(TABLE_STORYSPEC)->alias('t2')->on('t1.id=t2.story')
+                        ->where('t1.title')->like("%$searchValue%")
+                        ->orWhere('t1.keywords')->like("%$searchValue%")
+                        ->orWhere('t2.spec')->like("%$searchValue%")
+                        ->orWhere('t2.verify')->like("%$searchValue%")
+                        ->fetchPairs('id');
+
+                    $bugQuery = preg_replace("/`story`[ ]+(NOT[ ]*)?LIKE[ ]+'%$searchValue%'/Ui", '`story` $1 IN (' . implode($story, ',') .')', $bugQuery);
+                }
+            }
+        }
 
         $bugs = $this->dao->select('*')->from(TABLE_BUG)->where($bugQuery)
             ->beginIF(!$this->app->user->admin)->andWhere('execution')->in('0,' . $this->app->user->view->sprints)->fi()
@@ -3234,9 +3253,9 @@ class bugModel extends model
 
     /**
      * Build bug menu.
-     * 
-     * @param  object $bug 
-     * @param  string $type 
+     *
+     * @param  object $bug
+     * @param  string $type
      * @access public
      * @return string
      */

From 8c6c09d699cb2abcabab70379cc675eea34984cb Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 11 May 2022 10:02:02 +0800
Subject: [PATCH 10/13] * Finish task #53647.

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

diff --git a/module/bug/model.php b/module/bug/model.php
index 4dd3da215f..0837b78f38 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -2747,6 +2747,7 @@ class bugModel extends model
 
                     $bugQuery = preg_replace("/`story`[ ]+(NOT[ ]*)?LIKE[ ]+'%$searchValue%'/Ui", '`story` $1 IN (' . implode($story, ',') .')', $bugQuery);
                 }
+                $bugQuery .= ' AND `story` != 0';
             }
         }
 

From 460f597c60e44d1ba1c1941e9aebdca01d93fd67 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 11 May 2022 10:46:40 +0800
Subject: [PATCH 11/13] * Fix bug for #task 53647.

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

diff --git a/module/bug/model.php b/module/bug/model.php
index 0837b78f38..2f445064f5 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -2747,8 +2747,8 @@ class bugModel extends model
 
                     $bugQuery = preg_replace("/`story`[ ]+(NOT[ ]*)?LIKE[ ]+'%$searchValue%'/Ui", '`story` $1 IN (' . implode($story, ',') .')', $bugQuery);
                 }
-                $bugQuery .= ' AND `story` != 0';
             }
+            $bugQuery .= ' AND `story` != 0';
         }
 
         $bugs = $this->dao->select('*')->from(TABLE_BUG)->where($bugQuery)

From fc369416472e88eb3d53184bd0e3c177c3bb6b55 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Wed, 11 May 2022 10:58:57 +0800
Subject: [PATCH 12/13] * fix task #53588

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

diff --git a/db/update16.5.sql b/db/update16.5.sql
index 37934ad6c2..88aa763af1 100644
--- a/db/update16.5.sql
+++ b/db/update16.5.sql
@@ -103,3 +103,19 @@ UPDATE `zt_workflowfield` SET `control` = 'datetime' WHERE `module` = 'story' an
 UPDATE `zt_workflowfield` SET `control` = 'date' WHERE `module` = 'story' and `field` = 'reviewedDate';
 UPDATE `zt_workflowfield` SET `control` = 'datetime' WHERE `module` = 'story' and `field` = 'closedDate';
 UPDATE `zt_workflowfield` SET `control` = 'radio' WHERE `module` = 'story' and `field` = 'deleted';
+
+UPDATE `zt_workflowaction` SET `position` = 'browse' WHERE `module` = 'product' and `action` = 'all' and `vision` = 'rnd';
+UPDATE `zt_workflowaction` SET `type` = 'batch', `position` = 'browse' WHERE `module` = 'product' and `action` = 'batchedit' and `vision` = 'rnd';
+UPDATE `zt_workflowaction` SET `position` = 'browse' WHERE `module` = 'product' and `action` = 'browse' and `vision` = 'rnd';
+UPDATE `zt_workflowaction` SET `show` = 'direct' WHERE `module` = 'product'  and `vision` = 'rnd';
+UPDATE `zt_workflowaction` SET `type` = 'batch', `position` = 'browse' WHERE `module` = 'productplan' and `action` = 'batchedit' and `vision` = 'rnd';
+UPDATE `zt_workflowaction` SET `position` = 'browse' WHERE `module` = 'productplan' and `action` = 'browse' and `vision` = 'rnd';
+UPDATE `zt_workflowaction` SET `show` = 'direct' WHERE `module` = 'productplan' and `vision` = 'rnd';
+UPDATE `zt_workflowaction` SET `position` = 'browse' WHERE `module` = 'release' and `action` = 'browse' and `vision` = 'rnd';
+UPDATE `zt_workflowaction` SET `show` = 'direct' WHERE `module` = 'release' and `vision` = 'rnd';
+UPDATE `zt_workflowaction` SET `type` = 'batch' WHERE `module` = 'story' and `action` = 'batchcreate' and `vision` = 'rnd';
+UPDATE `zt_workflowaction` SET `type` = 'batch' WHERE `module` = 'story' and `action` = 'batchedit' and `vision` = 'rnd';
+UPDATE `zt_workflowaction` SET `position` = 'browse' WHERE `module` = 'story' and `action` = 'browse' and `vision` = 'rnd';
+UPDATE `zt_workflowaction` SET `position` = 'browse' WHERE `module` = 'story' and `action` = 'exporttemplate' and `vision` = 'rnd';
+UPDATE `zt_workflowaction` SET `position` = 'browse' WHERE `module` = 'story' and `action` = 'import' and `vision` = 'rnd';
+UPDATE `zt_workflowaction` SET `position` = 'view' WHERE `module` = 'story' and `action` = 'view' and `vision` = 'rnd';

From f3f0dd5647edc74022cebd4e5fc2a724320db90f Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Wed, 11 May 2022 03:16:41 +0000
Subject: [PATCH 13/13] * Code for task #53591.

---
 db/update16.5.sql             | 343 ++++++++++++++++++----------------
 module/caselib/lang/zh-cn.php |   3 +-
 2 files changed, 186 insertions(+), 160 deletions(-)

diff --git a/db/update16.5.sql b/db/update16.5.sql
index 73162f6d57..18177f60ba 100644
--- a/db/update16.5.sql
+++ b/db/update16.5.sql
@@ -119,163 +119,188 @@ DELETE FROM `zt_workflowfield` WHERE `module`='program' AND `field`='stage';
 DELETE FROM `zt_workflowfield` WHERE `module`='project' AND `field`='stage';
 DELETE FROM `zt_workflowfield` WHERE `module`='bug' AND `field`='feedback';
 DELETE FROM `zt_workflowfield` WHERE `module`='task' AND `field`='feedback';
-INSERT INTO `zt_workflowdatasource` (`type`, `name`, `code`, `buildin`, `datasource`, `view`, `keyField`, `valueField`) VALUES('lang', '项目模型', 'projectModel', '1', 'projectModel', '', '', '');
+
+ALTER TABLE `zt_workflowdatasource` ADD UNIQUE `code` (`code`);
+
+REPLACE INTO `zt_workflowdatasource` (`type`, `name`, `code`, `buildin`, `datasource`, `view`, `keyField`, `valueField`) VALUES
+('lang', '项目模型', 'projectModel', '1', 'projectModel', '', '', ''),
+('lang', '反馈类型', 'feedbackType', '1', 'feedbackType', '', '', ''),
+('lang', '反馈处理方案', 'feedbackSolution', '1', 'feedbackSolution', '', '', '');
+
 REPLACE INTO `zt_workflowfield` (`module`, `field`, `type`, `length`, `name`, `control`, `expression`, `options`, `default`, `rules`, `placeholder`, `order`, `searchOrder`, `exportOrder`, `canExport`, `canSearch`, `isValue`, `readonly`, `buildin`, `desc`, `createdBy`, `createdDate`, `editedBy`, `editedDate`) VALUES
-('execution',	'type',	'char',	'30',	'迭代类型',	'select',	'',	'16',	'sprint',	'',	'',	3,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'begin',	'date',	'',	'计划开始',	'date',	'',	'',	'',	'',	'',	14,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'end',	'date',	'',	'计划完成',	'date',	'',	'',	'',	'',	'',	15,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'days',	'smallint',	'5',	'可用工作日',	'integer',	'',	'',	'',	'',	'',	18,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'pri',	'enum',	'',	'优先级',	'select',	'',	'[1,2,3,4]',	'1',	'',	'',	20,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'desc',	'text',	'',	'迭代描述',	'richtext',	'',	'',	'',	'',	'',	21,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'openedDate',	'datetime',	'',	'创建日期',	'datetime',	'',	'',	'',	'',	'',	27,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'closedDate',	'datetime',	'',	'关闭日期',	'datetime',	'',	'',	'',	'',	'',	32,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'canceledDate',	'datetime',	'',	'取消日期',	'datetime',	'',	'',	'',	'',	'',	34,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'acl',	'char',	'30',	'访问控制',	'select',	'',	'18',	'open',	'',	'',	41,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'whitelist',	'text',	'',	'白名单',	'multi-select',	'',	'user',	'',	'',	'',	42,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'deleted',	'enum',	'',	'已删除',	'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	47,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'type',	'char',	'30',	'类型',	'select',	'',	'16',	'sprint',	'',	'',	2,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'begin',	'date',	'',	'计划开始',	'date',	'',	'',	'',	'',	'',	15,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'end',	'date',	'',	'计划完成',	'date',	'',	'',	'',	'',	'',	16,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'days',	'smallint',	'5',	'可用工作日',	'integer',	'',	'',	'',	'',	'',	19,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'pri',	'enum',	'',	'优先级',	'select',	'',	'[1,2,3,4]',	'1',	'',	'',	21,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'desc',	'text',	'',	'项目集描述',	'richtext',	'',	'',	'',	'',	'',	22,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'openedDate',	'datetime',	'',	'创建日期',	'datetime',	'',	'',	'',	'',	'',	28,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'closedDate',	'datetime',	'',	'关闭日期',	'datetime',	'',	'',	'',	'',	'',	33,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'canceledDate',	'datetime',	'',	'取消日期',	'datetime',	'',	'',	'',	'',	'',	35,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'whitelist',	'text',	'',	'白名单',	'multi-select',	'',	'user',	'',	'',	'',	43,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'deleted',	'enum',	'',	'已删除',	'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	48,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'type',	'char',	'30',	'项目类型',	'select',	'',	'16',	'sprint',	'',	'',	3,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'model',	'char',	'30',	'项目管理方式',	'input',	'',	'45',	'',	'',	'',	2,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'name',	'varchar',	'90',	'项目名称',	'input',	'',	'',	'',	'',	'',	15,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'begin',	'date',	'',	'计划开始',	'date',	'',	'',	'',	'',	'',	16,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'end',	'date',	'',	'计划完成',	'date',	'',	'',	'',	'',	'',	17,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'days',	'smallint',	'5',	'可用工作日',	'integer',	'',	'',	'',	'',	'',	20,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'pri',	'enum',	'',	'优先级',	'select',	'',	'[1,2,3,4]',	'1',	'',	'',	22,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'desc',	'text',	'',	'项目描述',	'richtext',	'',	'',	'',	'',	'',	23,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'openedDate',	'datetime',	'',	'创建日期',	'datetime',	'',	'',	'',	'',	'',	29,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'closedDate',	'datetime',	'',	'关闭日期',	'datetime',	'',	'',	'',	'',	'',	34,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'canceledDate',	'datetime',	'',	'取消日期',	'datetime',	'',	'',	'',	'',	'',	36,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'acl',	'char',	'30',	'访问控制',	'select',	'',	'18',	'open',	'',	'',	43,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'whitelist',	'text',	'',	'项目白名单',	'multi-select',	'',	'user',	'',	'',	'',	44,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'deleted',	'enum',	'',	'已删除',	'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	49,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('build',	'project',	'mediumint',	'8',	'所属项目',	'select',	'',	'2',	'0',	'',	'',	4,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('build',	'date',	'date',	'',	'打包日期',	'date',	'',	'',	'',	'',	'',	9,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('build',	'desc',	'text',	'',	'描述',	'richtext',	'',	'',	'',	'',	'',	13,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('build',	'deleted',	'enum',	'',	'已删除',	'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	14,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'project',	'mediumint',	'8',	'所属项目',	'select',	'',	'2',	'0',	'',	'',	2,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'storyVersion',	'smallint',	'6',	'研发需求版本',	'integer',	'',	'',	'1',	'',	'',	9,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'toTask',	'mediumint',	'8',	'转任务',	'select',	'',	'5',	'0',	'',	'',	11,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'toStory',	'mediumint',	'8',	'转研发需求',	'select',	'',	'4',	'0',	'',	'',	12,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'steps',	'mediumtext',	'',	'重现步骤',	'richtext',	'',	'',	'',	'',	'',	22,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'activatedDate',	'datetime',	'',	'激活日期',	'datetime',	'',	'',	'',	'',	'',	27,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'openedDate',	'datetime',	'',	'创建日期',	'datetime',	'',	'',	'',	'',	'',	32,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'openedBuild',	'varchar',	'255',	'影响版本',	'multi-select',	'',	'10',	'',	'',	'',	33,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'assignedDate',	'datetime',	'',	'指派日期',	'datetime',	'',	'',	'',	'',	'',	35,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'deadline',	'date',	'',	'截止日期',	'date',	'',	'',	'',	'',	'',	36,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'resolvedDate',	'datetime',	'30',	'解决日期',	'datetime',	'',	'',	'',	'',	'',	40,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'closedDate',	'datetime',	'',	'关闭日期',	'datetime',	'',	'',	'',	'',	'',	42,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'case',	'mediumint',	'8',	'相关用例',	'select',	'',	'41',	'',	'',	'',	45,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'caseVersion',	'smallint',	'6',	'用例版本',	'integer',	'',	'',	'',	'',	'',	46,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'lastEditedDate',	'datetime',	'30',	'修改日期',	'datetime',	'',	'',	'',	'',	'',	58,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'deleted',	'enum',	'',	'已删除',	'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	59,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'project',	'mediumint',	'8',	'所属项目',	'select',	'',	'2',	'0',	'',	'',	2,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'storyVersion',	'smallint',	'6',	'研发需求版本',	'integer',	'',	'',	'1',	'',	'',	7,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'estimate',	'float ',	'',	'最初预计',	'decimal',	'',	'',	'',	'',	'',	13,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'consumed',	'float ',	'',	'总计消耗',	'decimal',	'',	'',	'',	'',	'',	14,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'left',	'float ',	'',	'预计剩余',	'decimal',	'',	'',	'',	'',	'',	15,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'deadline',	'date',	'',	'截止日期',	'date',	'',	'',	'',	'',	'',	16,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'desc',	'text',	'',	'任务描述',	'richtext',	'',	'',	'',	'',	'',	20,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'openedDate',	'datetime',	'',	'创建日期',	'datetime',	'',	'',	'',	'',	'',	23,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'assignedDate',	'datetime',	'30',	'指派日期',	'datetime',	'',	'',	'',	'',	'',	25,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'estStarted',	'date',	'',	'预计开始',	'date',	'',	'',	'',	'',	'',	26,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'realStarted',	'date',	'',	'实际开始',	'date',	'',	'',	'',	'',	'',	27,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'finishedDate',	'datetime',	'',	'实际完成',	'datetime',	'',	'',	'',	'',	'',	29,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'canceledDate',	'datetime',	'',	'取消时间',	'datetime',	'',	'',	'',	'',	'',	32,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'closedDate',	'datetime',	'',	'关闭时间',	'datetime',	'',	'',	'',	'',	'',	34,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'lastEditedDate',	'datetime',	'',	'最后修改日期',	'datetime',	'',	'',	'',	'',	'',	39,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'deleted',	'enum',	'',	'已删除',	'select',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	48,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'lifetime',	'char',	'30',	'lifetime',	'input',	'',	'',	'',	'',	'',	4,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'lifetime',	'char',	'30',	'lifetime',	'input',	'',	'',	'',	'',	'',	3,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'designVersion',	'smallint',	'6',	'设计版本',	'integer',	'',	'',	'',	'',	'',	8,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'attribute',	'varchar',	'30',	'attribute',	'input',	'',	'',	'0',	'',	'',	5,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'percent',	'float',	'',	'percent',	'input',	'',	'',	'0',	'',	'',	6,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'milestone',	'enum',	'',	'milestone',	'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	7,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'output',	'text',	'',	'output',	'textarea',	'',	'',	'',	'',	'',	8,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'auth',	'char',	'30',	'auth',	'input',	'',	'',	'',	'',	'',	9,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'path',	'varchar',	'255',	'path',	'input',	'',	'',	'0',	'',	'',	10,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'grade',	'tinyint',	'3',	'grade',	'integer',	'',	'',	'0',	'',	'',	11,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'realBegan',	'date',	'',	'实际开始日期',	'date',	'',	'',	'',	'',	'',	16,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'realEnd',	'date',	'',	'实际完成日期',	'date',	'',	'',	'',	'',	'',	17,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'version',	'smallint',	'6',	'version',	'integer',	'',	'',	'',	'',	'',	22,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'parentVersion',	'smallint',	'6',	'parentVersion',	'integer',	'',	'',	'',	'',	'',	23,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'planDuration',	'int',	'11',	'planDuration',	'integer',	'',	'',	'',	'',	'',	24,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'realDuration',	'int',	'11',	'realDuration',	'integer',	'',	'',	'',	'',	'',	25,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'openedVersion',	'varchar',	'20',	'openedVersion',	'input',	'',	'',	'',	'',	'',	28,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'lastEditedBy',	'varchar',	'30',	'lastEditedBy',	'select',	'',	'user',	'',	'',	'',	29,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'lastEditedDate',	'datetime',	'',	'lastEditedDate',	'datetime',	'',	'',	'',	'',	'',	30,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'suspendedDate',	'date',	'',	'suspendedDate',	'date',	'',	'',	'',	'',	'',	35,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'vision',	'varchar',	'10',	'vision',	'input',	'',	'',	'rnd',	'',	'',	44,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'displayCards',	'enum',	'',	'displayCards',	'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	45,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('execution',	'fluidBoard',	'enum',	'',	'fluidBoard',	'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	46,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'output',	'text',	'',	'output',	'textarea',	'',	'',	'',	'',	'',	9,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'auth',	'char',	'30',	'auth',	'input',	'',	'',	'',	'',	'',	10,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'path',	'varchar',	'255',	'path',	'input',	'',	'',	'0',	'',	'',	12,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'grade',	'tinyint',	'3',	'grade',	'integer',	'',	'',	'0',	'',	'',	13,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'realBegan',	'date',	'',	'realBegan',	'date',	'',	'',	'',	'',	'',	17,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'realEnd',	'date',	'',	'realEnd',	'date',	'',	'',	'',	'',	'',	18,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'version',	'smallint',	'6',	'version',	'integer',	'',	'',	'',	'',	'',	23,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'parentVersion',	'smallint',	'6',	'parentVersion',	'integer',	'',	'',	'',	'',	'',	24,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'planDuration',	'int',	'11',	'planDuration',	'integer',	'',	'',	'',	'',	'',	25,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'realDuration',	'int',	'11',	'realDuration',	'integer',	'',	'',	'',	'',	'',	26,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'openedVersion',	'varchar',	'20',	'openedVersion',	'input',	'',	'',	'',	'',	'',	29,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'lastEditedBy',	'varchar',	'30',	'lastEditedBy',	'select',	'',	'user',	'',	'',	'',	30,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'lastEditedDate',	'datetime',	'',	'lastEditedDate',	'datetime',	'',	'',	'',	'',	'',	31,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'suspendedDate',	'date',	'',	'suspendedDate',	'date',	'',	'',	'',	'',	'',	36,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'vision',	'varchar',	'10',	'vision',	'input',	'',	'',	'rnd',	'',	'',	45,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'displayCards',	'enum',	'',	'displayCards',	'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	46,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('program',	'fluidBoard',	'enum',	'',	'fluidBoard',	'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	47,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'lifetime',	'char',	'30',	'项目周期',	'input',	'',	'',	'',	'',	'',	4,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'attribute',	'varchar',	'30',	'阶段类型',	'input',	'',	'',	'0',	'',	'',	7,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'percent',	'float',	'',	'工作量占比',	'input',	'',	'',	'0',	'',	'',	8,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'milestone',	'enum',	'',	'里程碑',	'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	9,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'output',	'text',	'',	'输出',	'textarea',	'',	'',	'',	'',	'',	10,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'auth',	'char',	'30',	'权限控制',	'input',	'',	'',	'',	'',	'',	11,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'path',	'varchar',	'255',	'路径',	'input',	'',	'',	'0',	'',	'',	13,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'grade',	'tinyint',	'3',	'层级',	'integer',	'',	'',	'0',	'',	'',	14,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'realBegan',	'date',	'',	'实际开始日期',	'date',	'',	'',	'',	'',	'',	18,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'realEnd',	'date',	'',	'实际完成日期',	'date',	'',	'',	'',	'',	'',	19,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'version',	'smallint',	'6',	'版本',	'integer',	'',	'',	'',	'',	'',	24,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'parentVersion',	'smallint',	'6',	'父版本',	'integer',	'',	'',	'',	'',	'',	25,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'planDuration',	'int',	'11',	'计划周期天数',	'integer',	'',	'',	'',	'',	'',	26,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'realDuration',	'int',	'11',	'实际周期天数',	'integer',	'',	'',	'',	'',	'',	27,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'openedVersion',	'varchar',	'20',	'创建版本',	'input',	'',	'',	'',	'',	'',	30,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'lastEditedBy',	'varchar',	'30',	'最后编辑人',	'select',	'',	'user',	'',	'',	'',	31,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'lastEditedDate',	'datetime',	'',	'最后编辑日期',	'datetime',	'',	'',	'',	'',	'',	32,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'suspendedDate',	'date',	'',	'suspendedDate',	'date',	'',	'',	'',	'',	'',	37,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'vision',	'varchar',	'10',	'vision',	'input',	'',	'',	'rnd',	'',	'',	46,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'displayCards',	'enum',	'',	'displayCards',	'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	47,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('project',	'fluidBoard',	'enum',	'',	'fluidBoard',	'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	48,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'hardware',	'varchar',	'30',	'硬件',	'input',	'',	'',	'',	'',	'',	20,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'feedbackBy',	'varchar',	'100',	'反馈者',	'input',	'',	'',	'',	'',	'',	28,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'notifyEmail',	'varchar',	'100',	'通知邮箱',	'input',	'',	'',	'',	'',	'',	29,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'result',	'mediumint',	'8',	'结果',	'input',	'',	'',	'',	'',	'',	47,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'repo',	'mediumint',	'8',	'所属版本库',	'input',	'',	'',	'',	'',	'',	48,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'mr',	'mediumint',	'8',	'mr',	'input',	'',	'',	'',	'',	'',	49,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'entry',	'text',	'',	'entry',	'input',	'',	'',	'',	'',	'',	50,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'lines',	'varchar',	'10',	'代码行',	'input',	'',	'',	'',	'',	'',	51,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'v1',	'varchar',	'40',	'版本1',	'input',	'',	'',	'',	'',	'',	52,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'v2',	'varchar',	'40',	'版本2',	'input',	'',	'',	'',	'',	'',	53,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'repoType',	'varchar',	'30',	'版本库类型',	'input',	'',	'',	'',	'',	'',	54,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('bug',	'issueKey',	'varchar',	'50',	'issueKey',	'input',	'',	'',	'',	'',	'',	55,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'version',	'smallint',	'6',	'版本',	'integer',	'',	'',	'',	'',	'',	21,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'planDuration',	'int',	'11',	'计划持续天数',	'integer',	'',	'',	'',	'',	'',	35,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'realDuration',	'int',	'11',	'实际持续天数',	'integer',	'',	'',	'',	'',	'',	36,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'activatedDate',	'datetime',	'',	'激活日期',	'datetime',	'',	'',	'',	'',	'',	40,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'repo',	'mediumint',	'8',	'repo',	'input',	'',	'',	'',	'',	'',	41,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'mr',	'mediumint',	'8',	'mr',	'input',	'',	'',	'',	'',	'',	42,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'entry',	'text',	'',	'entry',	'input',	'',	'',	'',	'',	'',	43,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'lines',	'varchar',	'10',	'lines',	'input',	'',	'',	'',	'',	'',	44,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'v1',	'varchar',	'40',	'v1',	'input',	'',	'',	'',	'',	'',	45,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'v2',	'varchar',	'40',	'v2',	'input',	'',	'',	'',	'',	'',	46,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
-('task',	'vision',	'varchar',	'10',	'vision',	'input',	'',	'',	'rnd',	'',	'',	47,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00');
-UPDATE `zt_workflowfield` SET `options`=(SELECT id FROM `zt_workflowdatasource` WHERE `code`='projectModel' LIMIT 1) WHERE `module`='project' AND `field`='model';
\ No newline at end of file
+('execution',	'type', 	        'char', 	'30',	'迭代类型',	        'select',	'',	'16',	'sprint',	'',	'',	3,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'begin',	        'date', 	'',	'计划开始',	        'date',	'',	'',	'',	'',	'',	14,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'end',  	        'date', 	'',	'计划完成',	        'date',	'',	'',	'',	'',	'',	15,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'days', 	        'smallint',	'5',	'可用工作日',	        'integer',	'',	'',	'',	'',	'',	18,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'pri',  	        'enum', 	'',	'优先级',	        'select',	'',	'[1,2,3,4]',	'1',	'',	'',	20,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'desc', 	        'text', 	'',	'迭代描述',	        'richtext',	'',	'',	'',	'',	'',	21,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'openedDate',	        'datetime',	'',	'创建日期',	        'datetime',	'',	'',	'',	'',	'',	27,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'closedDate',	        'datetime',	'',	'关闭日期',	        'datetime',	'',	'',	'',	'',	'',	32,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'canceledDate',	        'datetime',	'',	'取消日期',	        'datetime',	'',	'',	'',	'',	'',	34,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'acl',  	        'char', 	'30',	'访问控制',	        'select',	'',	'18',	'open',	'',	'',	41,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'whitelist',	        'text', 	'',	'白名单',	        'multi-select',	'',	'user',	'',	'',	'',	42,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'deleted',	        'enum', 	'',	'已删除',	        'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	47,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'type', 	        'char', 	'30',	'类型', 	        'select',	'',	'16',	'sprint',	'',	'',	2,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'begin',	        'date', 	'',	'计划开始',	        'date',	'',	'',	'',	'',	'',	15,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'end',  	        'date', 	'',	'计划完成',	        'date',	'',	'',	'',	'',	'',	16,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'days', 	        'smallint',	'5',	'可用工作日',	        'integer',	'',	'',	'',	'',	'',	19,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'pri',  	        'enum', 	'',	'优先级',	        'select',	'',	'[1,2,3,4]',	'1',	'',	'',	21,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'desc', 	        'text', 	'',	'项目集描述',	        'richtext',	'',	'',	'',	'',	'',	22,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'openedDate',	        'datetime',	'',	'创建日期',	        'datetime',	'',	'',	'',	'',	'',	28,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'closedDate',	        'datetime',	'',	'关闭日期',	        'datetime',	'',	'',	'',	'',	'',	33,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'canceledDate',	        'datetime',	'',	'取消日期',	        'datetime',	'',	'',	'',	'',	'',	35,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'whitelist',	        'text', 	'',	'白名单',	        'multi-select',	'',	'user',	'',	'',	'',	43,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'deleted',	        'enum', 	'',	'已删除',	        'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	48,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'type', 	        'char', 	'30',	'项目类型',	        'select',	'',	'16',	'sprint',	'',	'',	3,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'model',	        'char', 	'30',	'项目管理方式',	        'input',	'',	'45',	'',	'',	'',	2,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'name', 	        'varchar',	'90',	'项目名称',	        'input',	'',	'',	'',	'',	'',	15,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'begin',	        'date', 	'',	'计划开始',	        'date',	'',	'',	'',	'',	'',	16,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'end',  	        'date', 	'',	'计划完成',	        'date',	'',	'',	'',	'',	'',	17,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'days', 	        'smallint',	'5',	'可用工作日',	        'integer',	'',	'',	'',	'',	'',	20,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'pri',  	        'enum', 	'',	'优先级',	        'select',	'',	'[1,2,3,4]',	'1',	'',	'',	22,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'desc', 	        'text', 	'',	'项目描述',	        'richtext',	'',	'',	'',	'',	'',	23,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'openedDate',	        'datetime',	'',	'创建日期',	        'datetime',	'',	'',	'',	'',	'',	29,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'closedDate',	        'datetime',	'',	'关闭日期',	        'datetime',	'',	'',	'',	'',	'',	34,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'canceledDate',	        'datetime',	'',	'取消日期',	        'datetime',	'',	'',	'',	'',	'',	36,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'acl',  	        'char', 	'30',	'访问控制',	        'select',	'',	'18',	'open',	'',	'',	43,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'whitelist',	        'text', 	'',	'项目白名单',	        'multi-select',	'',	'user',	'',	'',	'',	44,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'deleted',	        'enum', 	'',	'已删除',	        'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	49,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('build',	'project',	        'mediumint',	'8',	'所属项目',	        'select',	'',	'2',	'0',	'',	'',	4,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('build',	'date', 	        'date', 	'',	'打包日期',	        'date',	'',	'',	'',	'',	'',	9,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('build',	'desc', 	        'text', 	'',	'描述', 	        'richtext',	'',	'',	'',	'',	'',	13,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('build',	'deleted',	        'enum', 	'',	'已删除',	        'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	14,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'project',	        'mediumint',	'8',	'所属项目',	        'select',	'',	'2',	'0',	'',	'',	2,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'storyVersion',	        'smallint',	'6',	'研发需求版本',	        'integer',	'',	'',	'1',	'',	'',	9,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'toTask',	        'mediumint',	'8',	'转任务',	        'select',	'',	'5',	'0',	'',	'',	11,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'toStory',	        'mediumint',	'8',	'转研发需求',	        'select',	'',	'4',	'0',	'',	'',	12,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'steps',	        'mediumtext',	'',	'重现步骤',	        'richtext',	'',	'',	'',	'',	'',	22,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'activatedDate',	'datetime',	'',	'激活日期',	        'datetime',	'',	'',	'',	'',	'',	27,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'openedDate',   	'datetime',	'',	'创建日期',	        'datetime',	'',	'',	'',	'',	'',	32,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'openedBuild',  	'varchar',	'255',	'影响版本',	        'multi-select',	'',	'10',	'',	'',	'',	33,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'assignedDate', 	'datetime',	'',	'指派日期',	        'datetime',	'',	'',	'',	'',	'',	35,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'deadline',     	'date', 	'',	'截止日期',	        'date',	'',	'',	'',	'',	'',	36,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'resolvedDate', 	'datetime',	'30',	'解决日期',	        'datetime',	'',	'',	'',	'',	'',	40,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'closedDate',   	'datetime',	'',	'关闭日期',	        'datetime',	'',	'',	'',	'',	'',	42,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'case',         	'mediumint',	'8',	'相关用例',	        'select',	'',	'41',	'',	'',	'',	45,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'caseVersion',  	'smallint',	'6',	'用例版本',	        'integer',	'',	'',	'',	'',	'',	46,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'lastEditedDate',	'datetime',	'30',	'修改日期',	        'datetime',	'',	'',	'',	'',	'',	58,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'deleted',      	'enum', 	'',	'已删除',	        'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	59,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'project',      	'mediumint',	'8',	'所属项目',	        'select',	'',	'2',	'0',	'',	'',	2,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'storyVersion', 	'smallint',	'6',	'研发需求版本',	        'integer',	'',	'',	'1',	'',	'',	7,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'estimate',     	'float',	'',	'最初预计',	        'decimal',	'',	'',	'',	'',	'',	13,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'consumed',     	'float',	'',	'总计消耗',	        'decimal',	'',	'',	'',	'',	'',	14,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'left',         	'float',	'',	'预计剩余',	        'decimal',	'',	'',	'',	'',	'',	15,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'deadline',     	'date', 	'',	'截止日期',	        'date',	'',	'',	'',	'',	'',	16,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'desc',         	'text', 	'',	'任务描述',	        'richtext',	'',	'',	'',	'',	'',	20,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'openedDate',   	'datetime',	'',	'创建日期',	        'datetime',	'',	'',	'',	'',	'',	23,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'assignedDate', 	'datetime',	'30',	'指派日期',	        'datetime',	'',	'',	'',	'',	'',	25,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'estStarted',   	'date', 	'',	'预计开始',	        'date',	'',	'',	'',	'',	'',	26,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'realStarted',  	'date', 	'',	'实际开始',	        'date',	'',	'',	'',	'',	'',	27,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'finishedDate', 	'datetime',	'',	'实际完成',	        'datetime',	'',	'',	'',	'',	'',	29,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'canceledDate', 	'datetime',	'',	'取消时间',	        'datetime',	'',	'',	'',	'',	'',	32,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'closedDate',   	'datetime',	'',	'关闭时间',	        'datetime',	'',	'',	'',	'',	'',	34,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'lastEditedDate',	'datetime',	'',	'最后修改日期',	        'datetime',	'',	'',	'',	'',	'',	39,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'deleted',      	'enum', 	'',	'已删除',	        'select',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	48,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'lifetime',     	'char', 	'30',	'lifetime',	        'input',	'',	'',	'',	'',	'',	4,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'lifetime',     	'char', 	'30',	'lifetime',	        'input',	'',	'',	'',	'',	'',	3,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'designVersion',	'smallint',	'6',	'设计版本',	        'integer',	'',	'',	'',	'',	'',	8,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'attribute',    	'varchar',	'30',	'attribute',	        'input',	'',	'',	'0',	'',	'',	5,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'percent',		'float',	'',	'percent',	        'input',	'',	'',	'0',	'',	'',	6,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'milestone',		'enum', 	'',	'milestone',	        'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	7,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'output',		'text', 	'',	'output',	        'textarea',	'',	'',	'',	'',	'',	8,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'auth',         	'char', 	'30',	'auth', 	        'input',	'',	'',	'',	'',	'',	9,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'path',         	'varchar',	'255',	'path', 	        'input',	'',	'',	'0',	'',	'',	10,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'grade',	        'tinyint',	'3',	'grade',	        'integer',	'',	'',	'0',	'',	'',	11,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'realBegan',	        'date', 	'',	'实际开始日期',	        'date',	'',	'',	'',	'',	'',	16,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'realEnd',	        'date', 	'',	'实际完成日期',	        'date',	'',	'',	'',	'',	'',	17,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'version',	        'smallint',	'6',	'version',	        'integer',	'',	'',	'',	'',	'',	22,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'parentVersion',	'smallint',	'6',	'parentVersion',        'integer',	'',	'',	'',	'',	'',	23,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'planDuration', 	'int',  	'11',	'planDuration',	        'integer',	'',	'',	'',	'',	'',	24,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'realDuration', 	'int',  	'11',	'realDuration',	        'integer',	'',	'',	'',	'',	'',	25,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'openedVersion',	'varchar',	'20',	'openedVersion',        'input',	'',	'',	'',	'',	'',	28,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'lastEditedBy', 	'varchar',	'30',	'lastEditedBy',	        'select',	'',	'user',	'',	'',	'',	29,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'lastEditedDate',	'datetime',	'',	'lastEditedDate',       'datetime',	'',	'',	'',	'',	'',	30,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'suspendedDate',	'date', 	'',	'suspendedDate',        'date',	'',	'',	'',	'',	'',	35,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'vision',	        'varchar',	'10',	'vision',	        'input',	'',	'',	'rnd',	'',	'',	44,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'displayCards',	        'enum', 	'',	'displayCards',	        'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	45,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('execution',	'fluidBoard',	        'enum', 	'',	'fluidBoard',	        'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	46,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'output',	        'text', 	'',	'output',	        'textarea',	'',	'',	'',	'',	'',	9,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'auth',         	'char', 	'30',	'auth', 	        'input',	'',	'',	'',	'',	'',	10,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'path', 	        'varchar',	'255',	'path', 	        'input',	'',	'',	'0',	'',	'',	12,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'grade',	        'tinyint',	'3',	'grade',	        'integer',	'',	'',	'0',	'',	'',	13,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'realBegan',	        'date', 	'',	'realBegan',	        'date',	'',	'',	'',	'',	'',	17,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'realEnd',	        'date', 	'',	'realEnd',	        'date',	'',	'',	'',	'',	'',	18,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'version',	        'smallint',	'6',	'version',	        'integer',	'',	'',	'',	'',	'',	23,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'parentVersion',	'smallint',	'6',	'parentVersion',        'integer',	'',	'',	'',	'',	'',	24,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'planDuration', 	'int',  	'11',	'planDuration',	        'integer',	'',	'',	'',	'',	'',	25,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'realDuration', 	'int',  	'11',	'realDuration',	        'integer',	'',	'',	'',	'',	'',	26,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'openedVersion',	'varchar',	'20',	'openedVersion',        'input',	'',	'',	'',	'',	'',	29,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'lastEditedBy', 	'varchar',	'30',	'lastEditedBy',	        'select',	'',	'user',	'',	'',	'',	30,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'lastEditedDate',	'datetime',	'',	'lastEditedDate',       'datetime',	'',	'',	'',	'',	'',	31,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'suspendedDate',	'date', 	'',	'suspendedDate',        'date',	'',	'',	'',	'',	'',	36,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'vision',	        'varchar',	'10',	'vision',	        'input',	'',	'',	'rnd',	'',	'',	45,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'displayCards',	        'enum', 	'',	'displayCards',	        'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	46,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('program',	'fluidBoard',	        'enum', 	'',	'fluidBoard',	        'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	47,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'lifetime',	        'char', 	'30',	'项目周期',	        'input',	'',	'',	'',	'',	'',	4,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'attribute',	        'varchar',	'30',	'阶段类型',	        'input',	'',	'',	'0',	'',	'',	7,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'percent',	        'float',	'',	'工作量占比',	        'input',	'',	'',	'0',	'',	'',	8,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'milestone',	        'enum', 	'',	'里程碑',	        'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	9,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'output',	        'text', 	'',	'输出', 	        'textarea',	'',	'',	'',	'',	'',	10,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'auth',         	'char', 	'30',	'权限控制',	        'input',	'',	'',	'',	'',	'',	11,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'path',         	'varchar',	'255',	'路径', 	        'input',	'',	'',	'0',	'',	'',	13,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'grade',	        'tinyint',	'3',	'层级', 	        'integer',	'',	'',	'0',	'',	'',	14,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'realBegan',	        'date', 	'',	'实际开始日期',	        'date',	'',	'',	'',	'',	'',	18,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'realEnd',	        'date', 	'',	'实际完成日期',	        'date',	'',	'',	'',	'',	'',	19,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'version',	        'smallint',	'6',	'版本',	                'integer',	'',	'',	'',	'',	'',	24,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'parentVersion',	'smallint',	'6',	'父版本',	        'integer',	'',	'',	'',	'',	'',	25,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'planDuration', 	'int',  	'11',	'计划周期天数',	        'integer',	'',	'',	'',	'',	'',	26,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'realDuration', 	'int',  	'11',	'实际周期天数',	        'integer',	'',	'',	'',	'',	'',	27,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'openedVersion',	'varchar',	'20',	'创建版本',	        'input',	'',	'',	'',	'',	'',	30,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'lastEditedBy', 	'varchar',	'30',	'最后编辑人',	        'select',	'',	'user',	'',	'',	'',	31,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'lastEditedDate',	'datetime',	'',	'最后编辑日期',	        'datetime',	'',	'',	'',	'',	'',	32,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'suspendedDate',	'date', 	'',	'suspendedDate',        'date',	'',	'',	'',	'',	'',	37,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'vision',	        'varchar',	'10',	'vision',	        'input',	'',	'',	'rnd',	'',	'',	46,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'displayCards',	        'enum', 	'',	'displayCards',	        'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	47,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('project',	'fluidBoard',	        'enum', 	'',	'fluidBoard',	        'radio',	'',	'[\"\\u672a\\u5220\\u9664\",\"\\u5df2\\u5220\\u9664\"]',	'0',	'',	'',	48,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'hardware',	        'varchar',	'30',	'硬件', 	        'input',	'',	'',	'',	'',	'',	20,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'feedbackBy',	        'varchar',	'100',	'反馈者',	        'input',	'',	'',	'',	'',	'',	28,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'notifyEmail',	        'varchar',	'100',	'通知邮箱',	        'input',	'',	'',	'',	'',	'',	29,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'result',	        'mediumint',	'8',	'结果', 	        'input',	'',	'',	'',	'',	'',	47,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'repo',         	'mediumint',	'8',	'所属版本库',	        'input',	'',	'',	'',	'',	'',	48,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'mr',           	'mediumint',	'8',	'mr',   	        'input',	'',	'',	'',	'',	'',	49,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'entry',        	'text', 	'',	'entry',	        'input',	'',	'',	'',	'',	'',	50,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'lines',        	'varchar',	'10',	'代码行',	        'input',	'',	'',	'',	'',	'',	51,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'v1',           	'varchar',	'40',	'版本1',	        'input',	'',	'',	'',	'',	'',	52,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'v2',           	'varchar',	'40',	'版本2',	        'input',	'',	'',	'',	'',	'',	53,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'repoType',     	'varchar',	'30',	'版本库类型',	        'input',	'',	'',	'',	'',	'',	54,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('bug',	        'issueKey',     	'varchar',	'50',	'issueKey',	        'input',	'',	'',	'',	'',	'',	55,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'version',      	'smallint',	'6',	'版本',	                'integer',	'',	'',	'',	'',	'',	21,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'planDuration', 	'int',  	'11',	'计划持续天数',	        'integer',	'',	'',	'',	'',	'',	35,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'realDuration', 	'int',  	'11',	'实际持续天数',	        'integer',	'',	'',	'',	'',	'',	36,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'activatedDate',	'datetime',	'',	'激活日期',	        'datetime',	'',	'',	'',	'',	'',	40,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'repo',         	'mediumint',	'8',	'repo',	                'input',	'',	'',	'',	'',	'',	41,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'mr',           	'mediumint',	'8',	'mr',	                'input',	'',	'',	'',	'',	'',	42,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'entry',        	'text', 	'',	'entry',	        'input',	'',	'',	'',	'',	'',	43,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'lines',        	'varchar',	'10',	'lines',	        'input',	'',	'',	'',	'',	'',	44,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'v1',           	'varchar',	'40',	'v1',   	        'input',	'',     	'',	'',	'',	'',	45,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'v2',           	'varchar',	'40',	'v2',   	        'input',	'',     	'',	'',	'',	'',	46,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('task',	'vision',	        'varchar',	'10',	'vision',	        'input',	'',	'',	'',	'',	'',	47,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('feedback',	'type',	                'char',	        '30',	'反馈类型',	        'select',	'',	'',	'',	'',	'',	4,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('feedback',	'notifyEmail',	        'varchar',	'100',	'通知邮箱',	        'input',	'',	'',	'',	'',	'',	9,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('feedback',	'faq',  	        'mediumint',	'8',	'FAQ',  	        'input',	'',	'',	'',	'',	'',	11,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('feedback',	'feedbackBy',	        'varchar',	'100',	'反馈者',	        'select',	'',	'user',	'',	'',	'',	25,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('feedback',	'solution',	        'char', 	'30',	'反馈处理方案',	        'select',	'',	'',	'',	'',	'',	5,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('testcase',	'auto', 	        'varchar', 	'10',	'自动化测试用例',       'input',	'',	'',	'',	'',	'',	15,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('testcase',	'frame',	        'varchar', 	'10',	'自动化测试框架',       'input',	'',	'',	'',	'',	'',	16,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('testcase',	'howRun',	        'char', 	'30',	'测试方式',	        'input',	'',	'',	'',	'',	'',	18,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('testcase',	'scriptedBy',	        'char', 	'30',	'脚本由谁创建',	        'select',	'',	'user',	'',	'',	'',	18,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('testcase',	'scriptedDate',	        'char', 	'30',	'脚本创建日期',	        'date',	        '',	'',	'',	'',	'',	18,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('testcase',	'scriptStatus',	        'char', 	'30',	'脚本状态',	        'input',	'',	'',	'',	'',	'',	18,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('testcase',	'scriptLocation',	'char', 	'30',	'脚本地址',	        'input',	'',	'',	'',	'',	'',	18,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('testcase',	'frequency',	        'char', 	'30',	'使用频率',	        'input',	'',	'',	'',	'',	'',	28,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('testcase',	'fromCaseID',	        'char', 	'30',	'用例来源ID',	        'input',	'',	'',	'',	'',	'',	28,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('testcase',	'fromCaseVersion',	'char', 	'30',	'用例来源版本',	        'input',	'',	'',	'',	'',	'',	5,	0,	0,	'0',	'0',	'0',	'1',	1,	'',	'',	'0000-00-00 00:00:00',	'',	'0000-00-00 00:00:00'),
+('testcase',    'subStatus',            'varchar',      '30',   '子状态', 		'select',       '',     '',     '',     '',     '',     17,     0,      0,      '0',    '0',    '0',    '0',    1,      '',     '',     '0000-00-00 00:00:00',  '',     '0000-00-00 00:00:00');
+UPDATE `zt_workflowfield` SET `options`=(SELECT id FROM `zt_workflowdatasource` WHERE `code`='projectModel' LIMIT 1)     WHERE `module`='project'  AND `field`='model';
+UPDATE `zt_workflowfield` SET `options`=(SELECT id FROM `zt_workflowdatasource` WHERE `code`='feedbackType' LIMIT 1)     WHERE `module`='feedback' AND `field`='type';
+UPDATE `zt_workflowfield` SET `options`=(SELECT id FROM `zt_workflowdatasource` WHERE `code`='feedbackSolution' LIMIT 1) WHERE `module`='feedback' AND `field`='solution';
diff --git a/module/caselib/lang/zh-cn.php b/module/caselib/lang/zh-cn.php
index 90cc8b069e..114092a784 100644
--- a/module/caselib/lang/zh-cn.php
+++ b/module/caselib/lang/zh-cn.php
@@ -25,7 +25,8 @@ $lang->caselib->exportTemplet    = '导出模板';
 $lang->caselib->batchCreateCase  = '批量创建用例';
 $lang->caselib->import           = '导入';
 $lang->caselib->showImport       = '显示导入数据';
-
+$lang->caselib->type             = '类型';
+$lang->caselib->product          = '所属' . $lang->productCommon;
 $lang->caselib->browseAction     = '用例库列表';
 $lang->caselib->deleteAction     = "删除用例库";
 $lang->caselib->importAction     = '导入用例';