Merge branch release/22.0.beta of zentao/zentaopms (#13505)

Author: 刘刚

VERSION

@@ -1 +1 @@
-21.7.8
+22.0.beta

ci.json

@@ -6,13 +6,13 @@
     },
     "zentaoext": {
       "gitRepo": "zentao/zentaoext",
-      "gitVersion": "release/12.7"
+      "gitVersion": "release/13.0.beta"
     },
     "zentaomax": {
-      "gitVersion": "release/7.7"
+      "gitVersion": "release/8.0.beta"
     },
     "zentaoipd": {
-      "gitVersion": "release/4.7"
+      "gitVersion": "release/5.0.beta"
     },
     "devops": {
       "gitRepo": "zentao/devops"

config/config.php

@@ -16,7 +16,7 @@
 if(!function_exists('getWebRoot')){function getWebRoot(){}}
 
 /* 基本设置。Basic settings. */
-$config->version       = '21.7.8';             // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
+$config->version       = '22.0.beta';          // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it.
 $config->liteVersion   = '1.2';                // 迅捷版版本。      The version of Lite.
 $config->charset       = 'UTF-8';              // ZenTaoPHP的编码。 The encoding of ZenTaoPHP.
 $config->cookieLife    = time() + 2592000;     // Cookie的生存时间。The cookie life time.

config/filter.php

@@ -142,6 +142,7 @@
 $filter->project->task                  = new stdclass();
 $filter->project->execution             = new stdclass();
 $filter->project->testcase              = new stdclass();
+$filter->project->deliverable           = new stdclass();
 $filter->projectstory->story            = new stdclass();
 $filter->projectstory->export           = new stdclass();
 $filter->qa->default                    = new stdclass();
@@ -319,31 +320,32 @@
 $filter->program->export->cookie['checkedItem']           = 'reg::checked';
 $filter->program->ajaxgetdropmenu->cookie['showClosed']   = 'code';
 
-$filter->project->default->cookie['lastProject']         = 'int';
-$filter->project->default->cookie['lastPRJ']             = 'int';
-$filter->project->default->cookie['projectMode']         = 'code';
-$filter->project->default->cookie['kanbanview']          = 'code';
-$filter->project->browse->cookie['involved']             = 'code';
-$filter->project->browse->cookie['showProjectBatchEdit'] = 'int';
-$filter->project->export->cookie['involved']             = 'code';
-$filter->project->browse->cookie['projectType']          = 'code';
-$filter->project->story->cookie['storyModuleParam']      = 'int';
-$filter->project->story->cookie['storyPreProjectID']     = 'int';
-$filter->project->story->cookie['storyProductParam']     = 'int';
-$filter->project->story->cookie['storyBranchParam']      = 'reg::checked';
-$filter->project->story->cookie['projectStoryOrder']     = 'reg::orderBy';
-$filter->project->task->cookie['moduleBrowseParam']      = 'int';
-$filter->project->task->cookie['preProjectID']           = 'int';
-$filter->project->task->cookie['productBrowseParam']     = 'int';
-$filter->project->task->cookie['projectTaskOrder']       = 'reg::orderBy';
-$filter->project->task->cookie['windowWidth']            = 'int';
-$filter->project->export->cookie['checkedItem']          = 'reg::checked';
-$filter->project->execution->cookie['pagerExecutionAll'] = 'int';
-$filter->project->execution->cookie['showTask']          = 'code';
-$filter->project->execution->cookie['showStage']         = 'code';
-$filter->project->testcase->cookie['showAutoCase']       = 'int';
-$filter->project->testcase->cookie['onlyAutoCase']       = 'int';
-$filter->project->testcase->cookie['onlyScene']          = 'code';
+$filter->project->default->cookie['lastProject']           = 'int';
+$filter->project->default->cookie['lastPRJ']               = 'int';
+$filter->project->default->cookie['projectMode']           = 'code';
+$filter->project->default->cookie['kanbanview']            = 'code';
+$filter->project->browse->cookie['involved']               = 'code';
+$filter->project->browse->cookie['showProjectBatchEdit']   = 'int';
+$filter->project->export->cookie['involved']               = 'code';
+$filter->project->browse->cookie['projectType']            = 'code';
+$filter->project->story->cookie['storyModuleParam']        = 'int';
+$filter->project->story->cookie['storyPreProjectID']       = 'int';
+$filter->project->story->cookie['storyProductParam']       = 'int';
+$filter->project->story->cookie['storyBranchParam']        = 'reg::checked';
+$filter->project->story->cookie['projectStoryOrder']       = 'reg::orderBy';
+$filter->project->task->cookie['moduleBrowseParam']        = 'int';
+$filter->project->task->cookie['preProjectID']             = 'int';
+$filter->project->task->cookie['productBrowseParam']       = 'int';
+$filter->project->task->cookie['projectTaskOrder']         = 'reg::orderBy';
+$filter->project->task->cookie['windowWidth']              = 'int';
+$filter->project->export->cookie['checkedItem']            = 'reg::checked';
+$filter->project->execution->cookie['pagerExecutionAll']   = 'int';
+$filter->project->execution->cookie['showTask']            = 'code';
+$filter->project->execution->cookie['showStage']           = 'code';
+$filter->project->testcase->cookie['showAutoCase']         = 'int';
+$filter->project->testcase->cookie['onlyAutoCase']         = 'int';
+$filter->project->testcase->cookie['onlyScene']            = 'code';
+$filter->project->deliverable->cookie['deliverableModule'] = 'int';
 
 $filter->projectstory->story->cookie['storyModuleParam']   = 'int';
 $filter->projectstory->story->cookie['pagerProductBrowse'] = 'int';

config/zentaopms.php

@@ -368,6 +368,7 @@
 $config->logonMethods[] = 'screen.viewold';
 $config->logonMethods[] = 'system.backupview';
 $config->logonMethods[] = 'screen.staticdataold';
+$config->logonMethods[] = 'stage.updateorder';
 
 $config->openModules = array();
 $config->openModules[] = 'install';
@@ -417,34 +418,38 @@
 define('TABLE_RELEASE',        '`' . $config->db->prefix . 'release`');
 define('TABLE_RELEASERELATED', '`' . $config->db->prefix . 'releaserelated`');
 
-define('TABLE_PROGRAM',       '`' . $config->db->prefix . 'project`');
-define('TABLE_PROJECT',       '`' . $config->db->prefix . 'project`');
-define('TABLE_EXECUTION',     '`' . $config->db->prefix . 'project`');
-define('TABLE_TASK',          '`' . $config->db->prefix . 'task`');
-define('TABLE_TASKSPEC',      '`' . $config->db->prefix . 'taskspec`');
-define('TABLE_TASKTEAM',      '`' . $config->db->prefix . 'taskteam`');
-define('TABLE_TEAM',          '`' . $config->db->prefix . 'team`');
-define('TABLE_PROJECTADMIN',  '`' . $config->db->prefix . 'projectadmin`');
-define('TABLE_PROJECTPRODUCT','`' . $config->db->prefix . 'projectproduct`');
-define('TABLE_PROJECTSTORY',  '`' . $config->db->prefix . 'projectstory`');
-define('TABLE_PROJECTCASE',   '`' . $config->db->prefix . 'projectcase`');
-define('TABLE_TASKESTIMATE',  '`' . $config->db->prefix . 'taskestimate`');
-define('TABLE_EFFORT',        '`' . $config->db->prefix . 'effort`');
-define('TABLE_BURN',          '`' . $config->db->prefix . 'burn`');
-define('TABLE_CFD',           '`' . $config->db->prefix . 'cfd`');
-define('TABLE_BUILD',         '`' . $config->db->prefix . 'build`');
-define('TABLE_ACL',           '`' . $config->db->prefix . 'acl`');
+define('TABLE_PROGRAM',           '`' . $config->db->prefix . 'project`');
+define('TABLE_PROJECT',           '`' . $config->db->prefix . 'project`');
+define('TABLE_EXECUTION',         '`' . $config->db->prefix . 'project`');
+define('TABLE_TASK',              '`' . $config->db->prefix . 'task`');
+define('TABLE_TASKSPEC',          '`' . $config->db->prefix . 'taskspec`');
+define('TABLE_TASKTEAM',          '`' . $config->db->prefix . 'taskteam`');
+define('TABLE_TEAM',              '`' . $config->db->prefix . 'team`');
+define('TABLE_PROJECTADMIN',      '`' . $config->db->prefix . 'projectadmin`');
+define('TABLE_PROJECTPRODUCT',    '`' . $config->db->prefix . 'projectproduct`');
+define('TABLE_PROJECTDELIVERABLE','`' . $config->db->prefix . 'projectdeliverable`');
+define('TABLE_PROJECTSTORY',      '`' . $config->db->prefix . 'projectstory`');
+define('TABLE_PROJECTCASE',       '`' . $config->db->prefix . 'projectcase`');
+define('TABLE_PROJECTCHANGE',     '`' . $config->db->prefix . 'projectchange`');
+define('TABLE_TASKESTIMATE',      '`' . $config->db->prefix . 'taskestimate`');
+define('TABLE_EFFORT',            '`' . $config->db->prefix . 'effort`');
+define('TABLE_BURN',              '`' . $config->db->prefix . 'burn`');
+define('TABLE_CFD',               '`' . $config->db->prefix . 'cfd`');
+define('TABLE_BUILD',             '`' . $config->db->prefix . 'build`');
+define('TABLE_ACL',               '`' . $config->db->prefix . 'acl`');
 
 define('TABLE_DESIGN',          '`' . $config->db->prefix . 'design`');
 define('TABLE_DESIGNSPEC',      '`' . $config->db->prefix . 'designspec`');
 define('TABLE_DELIVERABLE',     '`' . $config->db->prefix . 'deliverable`');
+define('TABLE_DELIVERABLESTAGE','`' . $config->db->prefix . 'deliverablestage`');
 define('TABLE_DOCLIB',          '`' . $config->db->prefix . 'doclib`');
 define('TABLE_DOC',             '`' . $config->db->prefix . 'doc`');
 define('TABLE_DOCBLOCK',        '`' . $config->db->prefix . 'docblock`');
 define('TABLE_DEMANDPOOL',      '`' . $config->db->prefix . 'demandpool`');
 define('TABLE_DEMAND',          '`' . $config->db->prefix . 'demand`');
 define('TABLE_DEMANDSPEC',      '`' . $config->db->prefix . 'demandspec`');
 define('TABLE_DEMANDREVIEW',    '`' . $config->db->prefix . 'demandreview`');
+define('TABLE_DECISION',        '`' . $config->db->prefix . 'decision`');
 define('TABLE_API',             '`' . $config->db->prefix . 'api`');
 define('TABLE_API_SPEC',        '`' . $config->db->prefix . 'apispec`');
 define('TABLE_APISTRUCT',       '`' . $config->db->prefix . 'apistruct`');
@@ -623,9 +628,9 @@
 define('TABLE_INSTANCE',     '`' . $config->db->prefix . 'instance`');
 define('TABLE_ARTIFACTREPO', '`' . $config->db->prefix . 'artifactrepo`');
 
-define('TABLE_AI_PROMPT',           '`' . $config->db->prefix . 'ai_prompt`');
-define('TABLE_AI_PROMPTFIELD',      '`' . $config->db->prefix . 'ai_promptfield`');
-define('TABLE_AI_PROMPTROLE',       '`' . $config->db->prefix . 'ai_promptrole`');
+define('TABLE_AI_AGENT',            '`' . $config->db->prefix . 'ai_agent`');
+define('TABLE_AI_AGENTFIELD',       '`' . $config->db->prefix . 'ai_agentfield`');
+define('TABLE_AI_AGENTROLE',        '`' . $config->db->prefix . 'ai_agentrole`');
 define('TABLE_AI_MINIPROGRAM',      '`' . $config->db->prefix . 'ai_miniprogram`');
 define('TABLE_AI_MINIPROGRAMFIELD', '`' . $config->db->prefix . 'ai_miniprogramfield`');
 define('TABLE_AI_MINIPROGRAMSTAR',  '`' . $config->db->prefix . 'ai_miniprogramstar`');
@@ -729,7 +734,7 @@
 $config->objectTables['review']         = TABLE_REVIEW;
 $config->objectTables['effort']         = TABLE_EFFORT;
 $config->objectTables['design']         = TABLE_DESIGN;
-$config->objectTables['prompt']         = TABLE_AI_PROMPT;
+$config->objectTables['prompt']         = TABLE_AI_AGENT;
 $config->objectTables['aiapp']          = TABLE_AI_MINIPROGRAM;
 $config->objectTables['miniprogram']    = TABLE_AI_MINIPROGRAM;
 $config->objectTables['roadmap']        = TABLE_ROADMAP;
@@ -743,6 +748,9 @@
 $config->objectTables['repocommit']     = TABLE_REPOHISTORY;
 $config->objectTables['system']         = TABLE_SYSTEM;
 $config->objectTables['mark']           = TABLE_MARK;
+$config->objectTables['cm']             = TABLE_OBJECT;
+$config->objectTables['baseline']       = TABLE_OBJECT;
+$config->objectTables['projectchange']  = TABLE_PROJECTCHANGE;
 
 $config->newFeatures      = array('introduction', 'tutorial', 'youngBlueTheme', 'visions', 'aiPrompts', 'promptDesign', 'promptExec');
 $config->disabledFeatures = '';
@@ -754,9 +762,9 @@
 
 /* Program privs.*/
 $config->programPriv = new stdclass();
-$config->programPriv->noSprint      = array('task', 'story', 'requirement', 'epic', 'tree', 'project', 'execution', 'projectbuild', 'bug', 'testcase', 'testreport', 'doc', 'repo', 'stakeholder', 'projectrelease', 'issue', 'risk', 'opportunity', 'meeting', 'pssp', 'auditplan');
-$config->programPriv->scrum         = array('story', 'requirement', 'epic', 'productplan', 'tree', 'projectplan', 'projectstory', 'projectrelease', 'project', 'execution', 'projectbuild', 'bug', 'testcase', 'testreport', 'doc', 'repo', 'meeting', 'stakeholder', 'testtask', 'issue', 'risk', 'opportunity');
-$config->programPriv->waterfall     = array_merge($config->programPriv->scrum, array('workestimation', 'durationestimation', 'budget', 'programplan', 'review', 'reviewissue', 'weekly', 'cm', 'milestone', 'design', 'measrecord', 'auditplan', 'trainplan', 'gapanalysis', 'pssp', 'researchplan', 'researchreport'));
+$config->programPriv->noSprint      = array('task', 'story', 'requirement', 'epic', 'tree', 'project', 'execution', 'projectbuild', 'bug', 'testcase', 'testtask', 'testreport', 'doc', 'repo', 'stakeholder', 'projectrelease', 'issue', 'risk', 'opportunity', 'meeting', 'pssp', 'auditplan', 'nc', 'review', 'reviewissue', 'weekly');
+$config->programPriv->scrum         = array('story', 'requirement', 'epic', 'productplan', 'tree', 'projectplan', 'projectstory', 'projectrelease', 'project', 'execution', 'projectbuild', 'bug', 'testcase', 'testreport', 'doc', 'repo', 'meeting', 'stakeholder', 'testtask', 'issue', 'risk', 'opportunity', 'weekly', 'review', 'reviewissue', 'report', 'mr');
+$config->programPriv->waterfall     = array_merge($config->programPriv->scrum, array('workestimation', 'durationestimation', 'budget', 'programplan', 'cm', 'projectchange', 'milestone', 'design', 'measrecord', 'auditplan', 'nc', 'trainplan', 'gapanalysis', 'pssp', 'researchplan', 'researchreport', 'report', 'mr'));
 $config->programPriv->agileplus     = $config->programPriv->scrum;
 $config->programPriv->waterfallplus = $config->programPriv->waterfall;
 $config->programPriv->ipd           = $config->programPriv->waterfall;
@@ -773,18 +781,15 @@
 $config->dtable->colVars = array('width', 'minWidth', 'type', 'flex', 'fixed', 'sortType', 'checkbox', 'nestedToggle', 'statusMap', 'actionsMap', 'group');
 
 $config->featureGroup = new stdclass();
-$config->featureGroup->my            = array('score');
-$config->featureGroup->product       = array('roadmap', 'track', 'UR', 'ER');
-$config->featureGroup->scrum         = array();
-$config->featureGroup->waterfall     = array();
-$config->featureGroup->agileplus     = array();
-$config->featureGroup->waterfallplus = array();
-$config->featureGroup->assetlib      = array();
-$config->featureGroup->other         = array('devops', 'kanban', 'setCode');
+$config->featureGroup->my       = array('score');
+$config->featureGroup->product  = array('roadmap', 'track', 'UR', 'ER');
+$config->featureGroup->project  = array();
+$config->featureGroup->assetlib = array();
+$config->featureGroup->other    = array('devops', 'kanban', 'setCode');
 
 $config->db->sqliteBlacklist    = array('sqlite_queue', 'cron');
 $config->hasDropmenuApps        = array('program', 'project', 'product', 'execution', 'qa', 'admin', 'bi', 'feedback', 'demandpool');
-$config->hasBranchMenuModules   = array('product', 'story', 'release', 'bug', 'testcase', 'testtask', 'branch', 'tree');
+$config->hasBranchMenuModules   = array('product', 'story', 'release', 'bug', 'testcase', 'testtask', 'branch', 'tree', 'workflowgroup', 'deliverable', 'process', 'activity', 'review', 'reviewcl', 'stage', 'auditcl');
 $config->excludeBranchMenu      = array('product-dashboard', 'product-view', 'product-whitelist', 'product-addwhitelist', 'branch-manage', 'branch-batchedit');
 $config->excludeDropmenuList    = array('program-browse', 'program-productview', 'program-kanban', 'product-all', 'product-index', 'product-kanban', 'project-kanban', 'execution-all', 'execution-executionkanban', 'project-browse', 'project-template', 'project-createtemplate', 'project-batchedit', 'product-batchedit', 'admin-index', 'product-create', 'project-create', 'execution-create', 'program-create', 'execution-batchedit', 'metric-preview', 'metric-browse', 'metric-view', 'metriclib-browse', 'qa-index', 'caselib-create', 'feedback-batchedit', 'feedback-batchclose', 'feedback-showimport', 'dimension-browse', 'dataview-browse', 'dataview-create', 'dataview-query', 'ticket-batchedit', 'ticket-batchfinish', 'ticket-batchactivate', 'ticket-showimport', 'file-download');
 $config->excludeDropmenuModules = array('reporttemplate');