From 0fe32001aecac9eea9ca8a3d81de3d121d168dab Mon Sep 17 00:00:00 2001 From: sunguangming Date: Tue, 17 Jun 2025 07:29:27 +0000 Subject: [PATCH] * [bug#63404,done,1h] fix bug. --- module/execution/control.php | 1 + module/execution/ui/ajaxgetdropmenu.html.php | 179 ++++++++++++------- 2 files changed, 111 insertions(+), 69 deletions(-) diff --git a/module/execution/control.php b/module/execution/control.php index e79042bddf..fa75430969 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -2785,6 +2785,7 @@ class execution extends control $this->view->projects = $projectPairs; /* 项目ID为索引，项目名称为值的数组 [projectID => projectName]。 */ $this->view->projectExecutions = $projectExecutions; /* 项目对应的执行列表 [projectID => execution]。*/ $this->view->executionID = $executionID; + $this->view->execution = $execution; $this->display(); } diff --git a/module/execution/ui/ajaxgetdropmenu.html.php b/module/execution/ui/ajaxgetdropmenu.html.php index 1c9ef66c9c..e44a50ff39 100644 --- a/module/execution/ui/ajaxgetdropmenu.html.php +++ b/module/execution/ui/ajaxgetdropmenu.html.php @@ -11,87 +11,128 @@ declare(strict_types=1); */ namespace zin; -/** - * 获取项目所属分组。 - * Get execution group. - * - * @param object $execution - * @return string - */ -$getExecutionGroup = function($execution): string +if(!empty($execution->isTpl)) { - global $app; - if($execution->status != 'done' and $execution->status != 'closed' and ($execution->PM == $app->user->account or isset($execution->teams[$app->user->account]))) return 'my'; - if($execution->status != 'done' and $execution->status != 'closed' and $execution->PM != $app->user->account and !isset($execution->teams[$app->user->account])) return 'other'; - if($execution->status == 'done' or $execution->status == 'closed') return 'closed'; -}; - -/** - * 定义每个分组下的选项数据列表。 - * Define the grouped data list. - */ -$data = array('my' => array(), 'other' => array(), 'closed' => array()); - -/** - * 定义执行所属分组。 - * Define the group of execution. - */ -$executionGroup = array(); - -/* 处理分组数据。Process grouped data. */ -foreach($projectExecutions as $projectID => $executions) -{ - $projectItem = array(); - $projectItem['id'] = $projectID; - $projectItem['type'] = 'project'; - $projectItem['text'] = zget($projects, $projectID); - $projectItem['items'] = array(); - - foreach($executions as $index => $execution) + /* 处理分组数据。Process grouped data. */ + foreach($projectExecutions as $projectID => $executions) { - $group = $executionGroup[$execution->id] = $getExecutionGroup($execution); + $projectItem = array(); + $projectItem['id'] = $projectID; + $projectItem['type'] = 'project'; + $projectItem['text'] = zget($projects, $projectID); + $projectItem['items'] = array(); - $item = array(); - $item['id'] = $execution->id; - $item['text'] = $execution->name; - $item['keys'] = zget(common::convert2Pinyin(array($execution->name)), $execution->name, ''); - $item['url'] = sprintf($link, $execution->id); + foreach($executions as $index => $execution) + { + $item = array(); + $item['id'] = $execution->id; + $item['text'] = $execution->name; + $item['keys'] = zget(common::convert2Pinyin(array($execution->name)), $execution->name, ''); + $item['url'] = sprintf($link, $execution->id); - if($execution->type == 'stage') $item['url'] = helper::createLink('execution', 'task', "executionID={$execution->id}"); - if($execution->type == 'kanban') $item['url'] = helper::createLink('execution', 'kanban', "execution={$execution->id}"); - if(strpos($link, 'ajaxSwitchBelong') !== false) $item['url'] = sprintf($link, $execution->id); + if($execution->type == 'stage') $item['url'] = helper::createLink('execution', 'task', "executionID={$execution->id}"); - if(!isset($data[$group][$projectID])) $data[$group][$projectID] = $projectItem; - $data[$group][$projectID]['items'][] = $item; + if(!isset($data[$projectID])) $data[$projectID] = $projectItem; + $data[$projectID]['items'][] = $item; + } } + + $data = array_values($data); + + /** + * 定义最终的 JSON 数据。 + * Define the final json data. + */ + $json = array(); + $json['data'] = $data; + $json['searchHint'] = $lang->searchAB; + $json['labelMap'] = array('project' => $lang->project->template); + $json['itemType'] = 'execution'; } +else +{ + /** + * 获取项目所属分组。 + * Get execution group. + * + * @param object $execution + * @return string + */ + $getExecutionGroup = function($execution): string + { + global $app; + if($execution->status != 'done' and $execution->status != 'closed' and ($execution->PM == $app->user->account or isset($execution->teams[$app->user->account]))) return 'my'; + if($execution->status != 'done' and $execution->status != 'closed' and $execution->PM != $app->user->account and !isset($execution->teams[$app->user->account])) return 'other'; + if($execution->status == 'done' or $execution->status == 'closed') return 'closed'; + }; -/* 将分组数据转换为索引数组。Format grouped data to indexed array. */ -foreach ($data as $key => $value) $data[$key] = array_values($value); + /** + * 定义每个分组下的选项数据列表。 + * Define the grouped data list. + */ + $data = array('my' => array(), 'other' => array(), 'closed' => array()); -/** - * 定义每个分组名称信息，包括可展开的已关闭分组。 - * Define every group name, include expanded group. - */ -$tabs = array(); -$tabs[] = array('name' => 'my', 'text' => $lang->execution->involved, 'active' => (isset($executionGroup[$executionID]) && $executionGroup[$executionID] === 'my')); -$tabs[] = array('name' => 'other', 'text' => $lang->execution->other, 'active' => (isset($executionGroup[$executionID]) && $executionGroup[$executionID] == 'other')); -$tabs[] = array('name' => 'closed', 'text' => $lang->execution->closedExecution); + /** + * 定义执行所属分组。 + * Define the group of execution. + */ + $executionGroup = array(); -/** - * 定义最终的 JSON 数据。 - * Define the final json data. - */ -$json = array(); -$json['data'] = $data; -$json['tabs'] = $tabs; -$json['searchHint'] = $lang->searchAB; -$json['labelMap'] = array('project' => $lang->project->common); -$json['expandName'] = 'closed'; -$json['itemType'] = 'execution'; + /* 处理分组数据。Process grouped data. */ + foreach($projectExecutions as $projectID => $executions) + { + $projectItem = array(); + $projectItem['id'] = $projectID; + $projectItem['type'] = 'project'; + $projectItem['text'] = zget($projects, $projectID); + $projectItem['items'] = array(); + + foreach($executions as $index => $execution) + { + $group = $executionGroup[$execution->id] = $getExecutionGroup($execution); + + $item = array(); + $item['id'] = $execution->id; + $item['text'] = $execution->name; + $item['keys'] = zget(common::convert2Pinyin(array($execution->name)), $execution->name, ''); + $item['url'] = sprintf($link, $execution->id); + + if($execution->type == 'stage') $item['url'] = helper::createLink('execution', 'task', "executionID={$execution->id}"); + if($execution->type == 'kanban') $item['url'] = helper::createLink('execution', 'kanban', "execution={$execution->id}"); + if(strpos($link, 'ajaxSwitchBelong') !== false) $item['url'] = sprintf($link, $execution->id); + + if(!isset($data[$group][$projectID])) $data[$group][$projectID] = $projectItem; + $data[$group][$projectID]['items'][] = $item; + } + } + + /* 将分组数据转换为索引数组。Format grouped data to indexed array. */ + foreach ($data as $key => $value) $data[$key] = array_values($value); + + /** + * 定义每个分组名称信息，包括可展开的已关闭分组。 + * Define every group name, include expanded group. + */ + $tabs = array(); + $tabs[] = array('name' => 'my', 'text' => $lang->execution->involved, 'active' => (isset($executionGroup[$executionID]) && $executionGroup[$executionID] === 'my')); + $tabs[] = array('name' => 'other', 'text' => $lang->execution->other, 'active' => (isset($executionGroup[$executionID]) && $executionGroup[$executionID] == 'other')); + $tabs[] = array('name' => 'closed', 'text' => $lang->execution->closedExecution); + + /** + * 定义最终的 JSON 数据。 + * Define the final json data. + */ + $json = array(); + $json['data'] = $data; + $json['tabs'] = $tabs; + $json['searchHint'] = $lang->searchAB; + $json['labelMap'] = array('project' => $lang->project->common); + $json['expandName'] = 'closed'; + $json['itemType'] = 'execution'; +} /** * 渲染 JSON 字符串并发送到客户端。 * Render json data to string and send to client. */ -renderJson($json); +renderJson($json); \ No newline at end of file