Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Merge code.

Browse Source
This commit is contained in:
sunguangming
2024-09-05 14:54:14 +08:00
committed by 刘刚
parent d04ee15cac
commit be29acbb7a
2 changed files with 68 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/datatable/model.php
+67 -36
View File
@@ -58,42 +58,7 @@ class datatableModel extends model
}
/* 加载工作流字段配置。 */
if($this->config->edition != 'open')
{
$flow = $this->loadModel('workflow')->getByModule($module);
if(empty($flow)) return $fieldList;
if($flow->buildin == 1)
{
$fields = $this->loadModel('workflowfield')->getList($module);
$workflowFieldList = $this->loadModel('flow')->buildDtableCols($fields);
$fieldList = array_merge($fieldList, $workflowFieldList);
}
else
{
$fields = $this->loadModel('workflowaction')->getFields($module, 'browse');
foreach($fields as $field)
{
if(!$field->show) continue;
$fieldList[$field->field]['name'] = $field->field;
$fieldList[$field->field]['title'] = $field->name;
$fieldList[$field->field]['show'] = true;
$fieldList[$field->field]['width'] = (empty($field->width) || $field->width == 'auto') ? '120' : $field->width;
if($field->field == 'id')
{
$fieldList[$field->field]['fixed'] = 'left';
$fieldList[$field->field]['required'] = true;
}
elseif($field->field == 'actions')
{
$fieldList[$field->field]['fixed'] = 'right';
$fieldList[$field->field]['required'] = true;
}
}
}
}
if($this->config->edition != 'open') $fieldList = $this->appendWorkflowFields($module, $method, $fieldList);
return $fieldList;
}
@@ -469,4 +434,70 @@ class datatableModel extends model
return $widths;
}
/**
* 加载工作流字段配置到数据表字段配置中。
* Load workflow fields.
*
* @param string $module
* @param string $method
* @param array $fieldList
* @access public
* @return array
*/
public function appendWorkflowFields(string $module, string $method, array $fieldList): array
{
$flow = $this->loadModel('workflow')->getByModule($module);
if(empty($flow)) return $fieldList;
if(in_array($module, array('epic', 'story', 'requirement')))
{
$module = 'product'; // 需求加载product-browse的layout配置。
}
elseif($module == 'build')
{
$module = 'execution';
$method = 'build'; // 版本加载execution-build的layout配置。
}
elseif($module == 'task')
{
$module = 'execution';
$method = 'task'; // 任务加载execution-task的layout配置。
}
$fields = $this->loadModel('workflowaction')->getFields($module, $method);
if($flow->buildin == 1)
{
$action = $this->loadModel('workflowaction')->getByModuleAndAction($module, $method);
if(!$action || (isset($action->extensionType) && $action->extensionType != 'extend')) return $fieldList; // 不扩展不追加字段。
$workflowFieldList = $this->loadModel('flow')->buildDtableCols($fields);
$fieldList = array_merge($fieldList, $workflowFieldList);
}
else
{
foreach($fields as $field)
{
if(!$field->show) continue;
$fieldList[$field->field]['name'] = $field->field;
$fieldList[$field->field]['title'] = $field->name;
$fieldList[$field->field]['show'] = true;
$fieldList[$field->field]['width'] = (empty($field->width) || $field->width == 'auto') ? '120' : $field->width;
if($field->field == 'id')
{
$fieldList[$field->field]['fixed'] = 'left';
$fieldList[$field->field]['required'] = true;
}
elseif($field->field == 'actions')
{
$fieldList[$field->field]['fixed'] = 'right';
$fieldList[$field->field]['required'] = true;
}
}
}
return $fieldList;
}
}