Merge branch feature/workflowgroup of zentao/zentaopms (#12676)

This commit is contained in:
刘刚
2025-12-05 15:52:23 +08:00
committed by Gitfox
5 changed files with 28 additions and 19 deletions
+2 -1
View File
@@ -448,6 +448,7 @@ $lang->group->package->workflowRule = 'Workflow Rule';
$lang->group->package->workflowGroup = 'Workflow Group';
$lang->group->package->workflow = 'Workflow';
$lang->group->package->projectFlow = 'Project Flow';
$lang->group->package->flowReport = 'Flow Report';
$lang->group->package->rule = 'Rule';
$lang->group->package->downloadCode = 'Download Code';
$lang->group->package->dev = 'Dev';
@@ -496,7 +497,7 @@ $lang->group->package->deliverable = 'Deliverable Setting';
$lang->group->package->classify = 'Classify';
$lang->group->package->auditcl = 'Auditcl';
$lang->group->package->reviewcl = 'Reviewcl';
$lang->group->package->process = 'Process';
$lang->group->package->process = 'Process Setting';
$lang->group->package->activity = 'Activity';
$lang->group->package->zoutput = 'Zoutput';
$lang->group->package->custom = 'Custom';
+2 -1
View File
@@ -448,6 +448,7 @@ $lang->group->package->workflowRule = 'Workflow Rule';
$lang->group->package->workflowGroup = 'Workflow Group';
$lang->group->package->workflow = 'Workflow';
$lang->group->package->projectFlow = 'Project Flow';
$lang->group->package->flowReport = 'Flow Report';
$lang->group->package->rule = 'Rule';
$lang->group->package->downloadCode = 'Download Code';
$lang->group->package->dev = 'Dev';
@@ -496,7 +497,7 @@ $lang->group->package->deliverable = 'Deliverable Setting';
$lang->group->package->classify = 'Classify';
$lang->group->package->auditcl = 'Auditcl';
$lang->group->package->reviewcl = 'Reviewcl';
$lang->group->package->process = 'Process';
$lang->group->package->process = 'Process Setting';
$lang->group->package->activity = 'Activity';
$lang->group->package->zoutput = 'Zoutput';
$lang->group->package->custom = 'Custom';
+2 -1
View File
@@ -448,6 +448,7 @@ $lang->group->package->workflowRule = 'Workflow Rule';
$lang->group->package->workflowGroup = 'Workflow Group';
$lang->group->package->workflow = 'Workflow';
$lang->group->package->projectFlow = 'Project Flow';
$lang->group->package->flowReport = 'Flow Report';
$lang->group->package->rule = 'Rule';
$lang->group->package->downloadCode = 'Download Code';
$lang->group->package->dev = 'Dev';
@@ -496,7 +497,7 @@ $lang->group->package->deliverable = 'Deliverable Setting';
$lang->group->package->classify = 'Classify';
$lang->group->package->auditcl = 'Auditcl';
$lang->group->package->reviewcl = 'Reviewcl';
$lang->group->package->process = 'Process';
$lang->group->package->process = 'Process Setting';
$lang->group->package->activity = 'Activity';
$lang->group->package->zoutput = 'Zoutput';
$lang->group->package->custom = 'Custom';
+2 -1
View File
@@ -448,6 +448,7 @@ $lang->group->package->workflowRule = '工作流验证规则';
$lang->group->package->workflowGroup = '工作流流程管理';
$lang->group->package->workflow = '工作流';
$lang->group->package->projectFlow = '项目流程';
$lang->group->package->flowReport = '流程概览';
$lang->group->package->rule = '规则引擎';
$lang->group->package->downloadCode = '下载代码';
$lang->group->package->dev = '二次开发';
@@ -496,7 +497,7 @@ $lang->group->package->deliverable = '交付物设置';
$lang->group->package->classify = '分类项设置';
$lang->group->package->auditcl = 'QA检查项设置';
$lang->group->package->reviewcl = '评审设置';
$lang->group->package->process = '过程设置';
$lang->group->package->process = '过程配置';
$lang->group->package->activity = '活动设置';
$lang->group->package->zoutput = '文档设置';
$lang->group->package->custom = '自定义配置';
+20 -15
View File
@@ -2552,6 +2552,26 @@ $config->group->package->projectFlow->privs['workflowgroup-release'] = array(
$config->group->package->projectFlow->privs['workflowgroup-deactivate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 35, 'depend' => array('workflowgroup-project'), 'recommend' => array());
$config->group->package->projectFlow->privs['workflowgroup-delete'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 40, 'depend' => array('workflowgroup-project'), 'recommend' => array());
$config->group->package->flowReport = new stdclass();
$config->group->package->flowReport->order = 15;
$config->group->package->flowReport->subset = 'projectFlow';
$config->group->package->flowReport->privs = array();
$config->group->package->flowReport->privs['workflowgroup-report'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array(), 'recommend' => array());
$config->group->package->process = new stdclass();
$config->group->package->process->order = 20;
$config->group->package->process->subset = 'projectFlow';
$config->group->package->process->privs = array();
$config->group->package->process->privs['process-browse'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array(), 'recommend' => array());
$config->group->package->process->privs['process-create'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('process-browse'), 'recommend' => array('process-batchCreate', 'process-delete', 'process-edit', 'process-updateOrder', 'process-view'));
$config->group->package->process->privs['process-batchCreate'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 15, 'depend' => array('process-browse'), 'recommend' => array('process-create'));
$config->group->package->process->privs['process-view'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 20, 'depend' => array('process-browse'), 'recommend' => array());
$config->group->package->process->privs['process-edit'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 25, 'depend' => array('process-browse'), 'recommend' => array('process-create', 'process-delete', 'process-updateOrder', 'process-view'));
$config->group->package->process->privs['process-batchEdit'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 30, 'depend' => array('process-browse'), 'recommend' => array('process-create'));
$config->group->package->process->privs['process-delete'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 35, 'depend' => array('process-browse'), 'recommend' => array('process-create'));
$config->group->package->process->privs['process-manageModule'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 40, 'depend' => array('process-browse'), 'recommend' => array());
$config->group->package->process->privs['process-updateOrder'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 45, 'depend' => array('process-browse'), 'recommend' => array('process-create', 'process-edit'));
$config->group->package->workflowField = new stdclass();
$config->group->package->workflowField->order = 10;
$config->group->package->workflowField->subset = 'workflow';
@@ -2666,7 +2686,6 @@ $config->group->package->workflowGroup->subset = 'workflow';
$config->group->package->workflowGroup->privs = array();
$config->group->package->workflowGroup->privs['workflowgroup-product'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 5, 'depend' => array('workflow-browseFlow'), 'recommend' => array());
$config->group->package->workflowGroup->privs['workflowgroup-copy'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 18, 'depend' => array('workflow-browseFlow'), 'recommend' => array());
$config->group->package->workflowGroup->privs['workflowgroup-report'] = array('edition' => 'max,ipd', 'vision' => 'rnd,lite,or', 'order' => 30, 'depend' => array('workflow-browseFlow'), 'recommend' => array());
$config->group->package->workflowGroup->privs['workflowgroup-design'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 40, 'depend' => array('workflow-browseFlow'), 'recommend' => array());
$config->group->package->workflowGroup->privs['workflowgroup-setExclusive'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 55, 'depend' => array('workflow-browseFlow'), 'recommend' => array());
$config->group->package->workflowGroup->privs['workflowgroup-activateFlow'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 60, 'depend' => array('workflow-browseFlow'), 'recommend' => array());
@@ -3149,20 +3168,6 @@ $config->group->package->reviewcl->privs['reviewsetting-version'] =
$config->group->package->reviewcl->privs['reviewsetting-waterfallplusVersion'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 3, 'depend' => array(), 'recommend' => array());
$config->group->package->reviewcl->privs['reviewcl-setCategory'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 4, 'depend' => array(), 'recommend' => array());
$config->group->package->process = new stdclass();
$config->group->package->process->order = 25;
$config->group->package->process->subset = 'featureconfig';
$config->group->package->process->privs = array();
$config->group->package->process->privs['process-create'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('process-browse'), 'recommend' => array('process-batchCreate', 'process-delete', 'process-edit', 'process-updateOrder', 'process-view'));
$config->group->package->process->privs['process-batchCreate'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 6, 'depend' => array('process-browse'), 'recommend' => array('process-create'));
$config->group->package->process->privs['process-batchEdit'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 7, 'depend' => array('process-browse'), 'recommend' => array('process-create'));
$config->group->package->process->privs['process-delete'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 8, 'depend' => array('process-browse'), 'recommend' => array('process-create'));
$config->group->package->process->privs['process-edit'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 9, 'depend' => array('process-browse'), 'recommend' => array('process-create', 'process-delete', 'process-updateOrder', 'process-view'));
$config->group->package->process->privs['process-view'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('process-browse'), 'recommend' => array());
$config->group->package->process->privs['process-updateOrder'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 11, 'depend' => array('process-browse'), 'recommend' => array('process-create', 'process-edit'));
$config->group->package->process->privs['process-browse'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 12, 'depend' => array(), 'recommend' => array());
$config->group->package->process->privs['process-manageModule'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 13, 'depend' => array('process-browse'), 'recommend' => array());
$config->group->package->activity = new stdclass();
$config->group->package->activity->order = 35;
$config->group->package->activity->subset = 'featureconfig';