From 8de77be19907cc3791cfd4a1926541f494623ffc Mon Sep 17 00:00:00 2001 From: Yagami Date: Thu, 16 Feb 2023 08:40:26 +0800 Subject: [PATCH] * Adjust dtable style. --- module/execution/config.php | 8 +++--- module/execution/css/all.css | 48 +++--------------------------------- 2 files changed, 7 insertions(+), 49 deletions(-) diff --git a/module/execution/config.php b/module/execution/config.php index 539a500680..2cd16fb6ba 100644 --- a/module/execution/config.php +++ b/module/execution/config.php @@ -177,11 +177,11 @@ $config->execution->gantt->linkType['begin']['end'] = 3; $config->execution->datatable = new stdclass(); if(!isset($config->setCode) or $config->setCode == 1) { - $config->execution->datatable->defaultField = array('id', 'name', 'code', 'project', 'PM', 'status', 'progress', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn'); + $config->execution->datatable->defaultField = array('id', 'name', 'code', 'project', 'PM', 'status', 'progress', 'openedDate', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn'); } else { - $config->execution->datatable->defaultField = array('id', 'name', 'project', 'PM', 'status', 'progress', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn'); + $config->execution->datatable->defaultField = array('id', 'name', 'project', 'PM', 'status', 'progress', 'openedDate', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn'); } $config->execution->datatable->fieldList['id']['title'] = 'idAB'; @@ -203,13 +203,13 @@ $config->execution->datatable->fieldList['name']['required'] = 'yes'; if(!isset($config->setCode) or $config->setCode == 1) { $config->execution->datatable->fieldList['code']['title'] = 'execCode'; - $config->execution->datatable->fieldList['code']['width'] = '140'; + $config->execution->datatable->fieldList['code']['width'] = '180'; $config->execution->datatable->fieldList['code']['fixed'] = 'left'; $config->execution->datatable->fieldList['code']['required'] = 'no'; } $config->execution->datatable->fieldList['project']['title'] = 'project'; -$config->execution->datatable->fieldList['project']['width'] = '200'; +$config->execution->datatable->fieldList['project']['width'] = '220'; $config->execution->datatable->fieldList['project']['flex'] = 1; $config->execution->datatable->fieldList['project']['fixed'] = 'no'; $config->execution->datatable->fieldList['project']['required'] = 'no'; diff --git a/module/execution/css/all.css b/module/execution/css/all.css index e32de269f5..302fbd069d 100644 --- a/module/execution/css/all.css +++ b/module/execution/css/all.css @@ -1,50 +1,8 @@ body {margin-bottom: 25px;} -.main-table tbody>tr>td {border-bottom: 0px solid #eee;} -.table-responsive {overflow-y: hidden !important;} -#product_chosen .chosen-single {width: 180px;} -.table-children {border-left: 2px solid #cbd0db; border-right: 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;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;} -.table td.has-child > .plan-toggle.collapsed > .icon {-ms-transform:rotate(90deg); -moz-transform:rotate(90deg); -o-transform:rotate(90deg); -webkit-transform:rotate(90deg); transform: rotate(90deg);} -.table th.hours {padding-right: 8px !important;} -.main-table tbody > tr.table-children > td:first-child::before {width: 3px;} -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; margin-bottom: 0px;} -td.datatable-cell.flex {margin-bottom: -2px;} -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-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;} -.c-code, .c-project {overflow: hidden; white-space: nowrap; padding: 0 8px;} -th.c-status, .c-begin, .c-end, .c-realBegan, .c-realEnd {text-align: center;} - -.c-project{text-overflow: unset !important;} -canvas {height: 28px;} -.parent.has-child.c-name.flex, .table-child-bottom > .c-name.flex {border-bottom: 0px solid #cbd0db !important;} -#tableCustomBtn {padding-bottom: 5px;} -#datatable-executionList .table-child-bottom > .c-name.flex {border-bottom: 1px solid #cbd0db !important;} -#datatable-executionList .table-child-bottom.table-child-top > .c-name.flex {border-bottom: 2px solid #cbd0db !important;} -#datatable-executionList .parent.has-child.c-name.flex {border-bottom: 1px solid #cbd0db !important;} -#datatable-executionList tr:last-child .c-name.flex {margin-top: 1px !important;} - -.table thead .c-estimate.text-right, -.table thead .c-consumed.text-right, -.table thead .c-left.text-right {padding-right: 8px;} -#executionsForm td.c-name {padding-right: 5px;} -#executionsForm td.c-name.delay {padding-right: 55px;} #myTable .dtable-header, #executionsForm .dtable-rows {z-index: 4;} -#executionsForm .table-header .btn-toolbar {background: rgb(241, 245, 249); right: -3px;} +.table-header.fixed-right > .btn-toolbar {right: 0} + +#myTable input[type=checkbox] {margin: 0px} .table-footer .pager{z-index: 10}