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

* [perf] don't load fields for built-in action which isn't extended by workflow.

Browse Source
This commit is contained in:
liugang
2024-10-18 14:29:14 +08:00
committed by 孙广明
parent e46ad67cf4
commit 4b46a81466
1 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/datatable/model.php
+21 -24
View File
@@ -478,36 +478,33 @@ class datatableModel extends model
$flow = $this->loadModel('workflow')->getByModule($module);
if(empty($flow)) return $fieldList;
$fields = $this->loadModel('workflowaction')->getFields($module, $method);
if($flow->buildin == 1)
{
$action = $this->workflowaction->getByModuleAndAction($module, $method);
$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
$fields = $this->loadModel('workflowaction')->getFields($module, $method);
if($flow->buildin == 1) return array_merge($fieldList, $this->loadModel('flow')->buildDtableCols($fields));
foreach($fields as $field)
{
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')
{
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;
}
$fieldList[$field->field]['fixed'] = 'left';
$fieldList[$field->field]['required'] = true;
}
elseif($field->field == 'actions')
{
$fieldList[$field->field]['fixed'] = 'right';
$fieldList[$field->field]['required'] = true;
}
}