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

* [bug#52350,done,1h] set nested.

Browse Source
This commit is contained in:
liumengyi
2024-07-09 13:08:07 +08:00
committed by 田淑杰
parent dd6bd61161
commit 35d8b50af3
3 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/config/table.php
+8 -7
View File
@@ -1035,13 +1035,14 @@ $config->my->execution->dtable->fieldList['id']['title'] = $lang->idAB;
$config->my->execution->dtable->fieldList['id']['type'] = 'id';
$config->my->execution->dtable->fieldList['id']['group'] = '1';
$config->my->execution->dtable->fieldList['name']['name'] = 'name';
$config->my->execution->dtable->fieldList['name']['title'] = $lang->execution->name;
$config->my->execution->dtable->fieldList['name']['type'] = 'title';
$config->my->execution->dtable->fieldList['name']['link'] = 'RAWJS<function(info){ if(info.row.data.isParent) return false; else return \'' . helper::createLink('execution', 'browse', 'id={id}&from=my') . '\'; }>RAWJS';
$config->my->execution->dtable->fieldList['name']['fixed'] = 'left';
$config->my->execution->dtable->fieldList['name']['group'] = '1';
$config->my->execution->dtable->fieldList['name']['show'] = true;
$config->my->execution->dtable->fieldList['name']['name'] = 'name';
$config->my->execution->dtable->fieldList['name']['title'] = $lang->execution->name;
$config->my->execution->dtable->fieldList['name']['type'] = 'nestedTitle';
$config->my->execution->dtable->fieldList['name']['link'] = 'RAWJS<function(info){ if(info.row.data.isParent) return false; else return \'' . helper::createLink('execution', 'browse', 'id={id}&from=my') . '\'; }>RAWJS';
$config->my->execution->dtable->fieldList['name']['fixed'] = 'left';
$config->my->execution->dtable->fieldList['name']['group'] = '1';
$config->my->execution->dtable->fieldList['name']['nestedToggle'] = true;
$config->my->execution->dtable->fieldList['name']['show'] = true;
$config->my->execution->dtable->fieldList['code']['name'] = 'code';
$config->my->execution->dtable->fieldList['code']['title'] = $lang->execution->code;
module/my/js/execution.ui.js
+12 -9
View File
@@ -1,16 +1,19 @@
const today = zui.formatDate(new Date(), 'yyyy-MM-dd');
window.onRenderExecutionCell = function(result, info)
{
if(info.col.name === 'name' && systemMode == 'ALM')
{
if(typeof result[0] == 'string')
{
result[0] = {html: result[0], className: 'flex-1 w-0'};
}
else
{
result[0].props.className = 'flex-1 w-0';
}
result.push({html: '<span class="label size-sm circle ' + (info.row.data.type == 'stage' ? 'warning' : 'secondary') + '-pale">' + typeList[info.row.data.type] + '</span>'}, {className:'row-reverse'});
const executionLink = $.createLink('execution', 'task', `executionID=${info.id}`);
const executionType = typeList[info.row.data.type];
let executionName = `<span class='label secondary-pale flex-none'>${executionType}</span> `;
executionName += '<div class="ml-1 clip" style="width: max-content;">';
executionName += (!info.row.data.isParent && typeof result[0] != 'string') ? `<a href="${executionLink}" class="text-primary">${info.row.data.name}</a>` : info.row.data.name;
executionName += '</div>';
executionName += (!['done', 'closed', 'suspended'].includes(info.row.data.status) && today > info.row.data.end) ? `<span class="label danger-pale ml-1 flex-none">${delayed}</span>` : '';
result[0] = {html: executionName, className: 'w-full flex items-center'};
return result;
}
return result;
module/my/ui/execution.html.php
+1
View File
@@ -12,6 +12,7 @@ namespace zin;
jsVar('systemMode', $config->systemMode);
jsVar('typeList', $lang->execution->typeList);
jsVar('delayed', $lang->execution->delayed);
featurebar
(