From 4e71cb29a8a599c1830e666c8534271644d64a3f Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 2 Jun 2022 14:12:00 +0800
Subject: [PATCH] * Fix bug #23031.

---
 module/execution/css/all.css       | 12 +++++++-----
 module/execution/view/all.html.php |  8 ++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/module/execution/css/all.css b/module/execution/css/all.css
index 49211f1ddb..94fb295ae9 100644
--- a/module/execution/css/all.css
+++ b/module/execution/css/all.css
@@ -4,7 +4,7 @@
 .table tbody > tr.table-children.table-child-top {border-top: 2px solid #cbd0db;}
 .table tbody > tr.table-children.table-child-bottom {border-bottom: 2px solid #cbd0db;}
 .table td.has-child > a:not(.plan-toggle) {max-width: 90%; max-width: calc(100% - 30px); display: inline-block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
-.table td.has-child > .plan-toggle {color: #838a9d; position: relative; top: 1px;}
+.table td.has-child > .plan-toggle {color: #838a9d; position: relative; top: 1px;overflow: initial !important;}
 .table td.has-child > .plan-toggle:hover {color: #006af1; cursor: pointer;}
 .table td.has-child > .plan-toggle > .icon {font-size: 16px; display: inline-block; transition: transform .2s; -ms-transform:rotate(-90deg); -moz-transform:rotate(-90deg); -o-transform:rotate(-90deg); -webkit-transform:rotate(-90deg); transform: rotate(-90deg);}
 .table td.has-child > .plan-toggle > .icon:before {text-align: left;}
@@ -14,17 +14,19 @@
 td.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
 td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center;}
 td.flex span.label-badge {margin-left: 5px; min-width: 50px;}
+td.flex span.label-badge.label-light {min-width: 22px;}
 td.flex span.project-type-label {margin-left: 5px; min-width: 36px;}
 @-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;}}
 
-.c-status, .c-date, .c-percent, .c-attribute {width: 80px;}
+.c-status, .c-date, .c-percent, .c-attribute, .c-end, .c-begin {width: 80px;}
 .c-estimate, .c-consumed, .c-left, .c-pm {width: 70px;}
-.c-progress, .c-burn {width: 60px;}
-.c-code, .c-percent, .c-realBegan, .c-end, .c-begin, .c-realEnd{width: 100px;}
-.c-action {text-align: center;}
+.c-progress {width: 40px;}
+.c-burn {width: 60px;}
+.c-code, .c-percent, .c-realBegan, .c-realEnd{width: 90px;}
 .c-name > span {margin-right: 2px;}
 td.flex span.project-type-label {min-width: 40px;}
 
 .label-children {min-width:22px !important;}
 .c-name > a, .table-children .text-left > a {padding-left: 5px;}
 .has-child > span {margin-right: 5px;}
+.c-name > .text-ellipsis {text-overflow: clip}
diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php
index f3f06a59e8..a07ef4fd17 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -97,7 +97,7 @@
           <th class='c-end'><?php common::printOrderLink('end', $orderBy, $vars, $lang->execution->end);?></th>
           <th class='c-realBegan'><?php common::printOrderLink('realBegan', $orderBy, $vars, $lang->execution->realBegan);?></th>
           <th class='c-realEnd'><?php common::printOrderLink('realEnd', $orderBy, $vars, $lang->execution->realEnd);?></th>
-          <th class='c-action'><?php echo $lang->actions;?></th>
+          <th class='c-actions-6 text-center'><?php echo $lang->actions;?></th>
           <?php else:;?>
           <th class='c-begin'><?php common::printOrderLink('begin', $orderBy, $vars, $lang->execution->begin);?></th>
           <th class='c-end'><?php common::printOrderLink('end', $orderBy, $vars, $lang->execution->end);?></th>
@@ -139,7 +139,7 @@
             <?php
             $executionLink = $execution->projectModel == 'kanban' ? html::a($this->createLink('execution', 'kanban', 'executionID=' . $execution->id), $executionName, '', "class='text-ellipsis'") : html::a($this->createLink('execution', 'task', 'execution=' . $execution->id), $executionName, '', "class='text-ellipsis'");
             if($onlyChildStage) echo "<span class='label label-badge label-light label-children'>{$lang->programplan->childrenAB}</span> ";
-            echo !empty($execution->children) ? $execution->name :  $executionLink;
+            echo !empty($execution->children) ? "<span class='text-ellipsis'>$execution->name</span>" :  $executionLink;
             if(isset($execution->delay)) echo "<span class='label label-danger label-badge'>{$lang->execution->delayed}</span> ";
             ?>
             <?php if(!empty($execution->children)):?>
@@ -230,10 +230,10 @@
                <?php endif;?>
                <?php printf('%03d', $child->id);?>
              </td>
-             <td class='text-left' title='<?php echo $child->name?>'>
+             <td class='text-left c-name flex' title='<?php echo $child->name?>'>
                <?php
                echo "<span class='label label-badge label-light' title='{$lang->programplan->children}'>{$lang->programplan->childrenAB}</span>";
-               echo html::a($this->createLink('execution', 'task', 'execution=' . $child->id), $child->name);
+               echo html::a($this->createLink('execution', 'task', 'execution=' . $child->id), $child->name, '', "class='text-ellipsis'");
                if(isset($child->delay)) echo "<span class='label label-danger label-badge'>{$lang->execution->delayed}</span> ";
                ?>
              </td>