From ca3a61f60577a979e1be2ac301db6f76bf1cb058 Mon Sep 17 00:00:00 2001 From: wangzemei Date: Sun, 9 Oct 2022 09:42:29 +0800 Subject: [PATCH] * finish task 71896 --- module/execution/js/task.js | 2 +- module/execution/model.php | 2 +- module/my/view/story.html.php | 2 +- module/my/view/task.html.php | 2 +- module/productplan/view/browsebylist.html.php | 2 +- module/project/css/execution.css | 8 +++----- module/story/model.php | 2 +- www/theme/default/style.css | 7 ++++++- 8 files changed, 15 insertions(+), 12 deletions(-) diff --git a/module/execution/js/task.js b/module/execution/js/task.js index d66daf4a2f..ec899288f9 100644 --- a/module/execution/js/task.js +++ b/module/execution/js/task.js @@ -13,7 +13,7 @@ $(function() adjustTableFooter(); $('body').on('click', '#toggleFold', adjustTableFooter); - $('body').on('click', '.icon.icon-angle-double-right', adjustTableFooter); + $('body').on('click', '.icon.icon-angle-right', adjustTableFooter); /* The display of the adjusting sidebarHeader is synchronized with the sidebar. */ $(".sidebar-toggle").click(function() diff --git a/module/execution/model.php b/module/execution/model.php index c8eb61f0ed..2665ba03b1 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -4882,7 +4882,7 @@ class executionModel extends model if(isset($execution->delay)) echo "{$this->lang->execution->delayed} "; if(!empty($execution->children)) { - echo ""; + echo ""; } break; case 'code': diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index e9bb468757..4f79d72bdb 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -96,7 +96,7 @@ pri;?>' title='story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri);?> title, null, "style='color: $story->color' data-group='product'") : $story->title;?> - children)) echo '';;?> + children)) echo '';;?> productTitle;?> planTitle;?> diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php index 289ab3f422..7584cc3ade 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -120,7 +120,7 @@ echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', $onlybody, $task->project), $task->name, null, "class='$class' data-width='80%' style='color: $task->color'"); } ?> - children)) echo '';?> + children)) echo '';?> systemMode == 'new'):?> execution]->name) ? $projects[$task->execution]->name : '';?> diff --git a/module/productplan/view/browsebylist.html.php b/module/productplan/view/browsebylist.html.php index ff9dbbdff4..425f8bf0a4 100644 --- a/module/productplan/view/browsebylist.html.php +++ b/module/productplan/view/browsebylist.html.php @@ -138,7 +138,7 @@ if($plan->parent > 0) echo "{$this->lang->productplan->childrenAB}"; echo html::a(inlink('view', "id=$plan->id"), $plan->title); if(!empty($expired)) echo $expired; - if(isset($plan->children)) echo ''; + if(isset($plan->children)) echo ''; echo ''; ?> diff --git a/module/project/css/execution.css b/module/project/css/execution.css index da3af9736f..63419a4da2 100644 --- a/module/project/css/execution.css +++ b/module/project/css/execution.css @@ -1,4 +1,4 @@ -#executionList > thead > tr > th .table-nest-toggle-global {top: 0;} +#executionList > thead > tr > th .table-nest-toggle-global {top: 4px;} #executionList > thead > tr > th .table-nest-toggle-global:before {color: #a6aab8;} #executionsSummary {padding-left: 10px;} #mainMenu .pull-left .checkbox-primary {margin-top: 5px;} @@ -8,8 +8,6 @@ th.table-nest-title-edit {padding-left: 50px !important;} th.table-nest-title-edit .table-nest-toggle {left: 28px;} th.table-nest-title .check-all {position: absolute; left: 15px; top: 7px;} .c-date {text-align: center;} +#executionTableList > tr.has-nest-child .table-nest-toggle {vertical-align: middle;} #executionTableList > tr:not(.has-nest-child) .table-nest-toggle {display: none;} -#executionTableList > tr:not(.has-nest-child) .project-type-label {margin-left: 22px;} - -#executionTableList .table-nest-toggle:before, -#executionTableList .table-nest-toggle:after {top: 9px;} \ No newline at end of file +#executionTableList > tr:not(.has-nest-child) .project-type-label {margin-left: 22px;} \ No newline at end of file diff --git a/module/story/model.php b/module/story/model.php index 582808e2bf..1c478ff82e 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -4805,7 +4805,7 @@ class storyModel extends model if($story->module and isset($modulePairs[$story->module])) echo "{$modulePairs[$story->module]} "; if($story->parent > 0) echo '' . $this->lang->story->childrenAB . ' '; echo $canView ? html::a($storyLink, $story->title, '', "title='$story->title' style='color: $story->color' data-app='$tab'") : "{$story->title}"; - if(!empty($story->children)) echo ''; + if(!empty($story->children)) echo ''; break; case 'plan': echo isset($story->planTitle) ? $story->planTitle : ''; diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 02408d01c0..7a610a9341 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -136,7 +136,7 @@ body.xxc-embed.m-productplan-view,body.xxc-embed.m-bug-browse,body.xxc-embed.m-p #executionTableList .c-name .label-danger, .flex-between {display: flex;align-items: center;justify-content: space-between;} -#toggleFold > .icon {display: inline-block; transition: transform .2s; transform: rotate(-90deg);} +#toggleFold > .icon {display: inline-block; color: #838a9d; font-size: 16px; transition: transform .2s; transform: rotate(-90deg);} #toggleFold.collapsed > .icon {transform: rotate(90deg);} #programTableList .c-name .label-danger {position: absolute; right: 4px; padding: 2px 4px;} @@ -144,3 +144,8 @@ body.xxc-embed.m-productplan-view,body.xxc-embed.m-bug-browse,body.xxc-embed.m-p #projectForm .c-name, #executionTableList .c-name, #programTableList .c-name {padding-right: 64px;} + +.table .table-children, +.table .is-nest-child {background: #F8F8F8;} + +.table tbody td.has-child .icon-angle-right {color: #838a9d;} \ No newline at end of file