From 16d055bf8d2ce709a1c883697a20351a93044adb Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 14 Nov 2022 13:49:28 +0800 Subject: [PATCH] * Finish task #76108. --- config/zentaopms.php | 2 +- module/program/config.php | 19 ++++++++++--------- zin/wg/dtable/v1.php | 13 +++++++++++++ 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/config/zentaopms.php b/config/zentaopms.php index 66359f54a2..fe553ba793 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -415,7 +415,7 @@ $config->maxPriValue = '256'; $config->importWhiteList = array('user', 'task', 'story', 'bug', 'testcase', 'feedback', 'ticket'); $config->dtable = new stdclass(); -$config->dtable->colVars = array('width', 'type', 'flex', 'fixed', 'sortType', 'checkbox', 'nestedToggle', 'statusMap', 'actionsMap'); +$config->dtable->colVars = array('width', 'minWidth', 'type', 'flex', 'fixed', 'sortType', 'checkbox', 'nestedToggle', 'statusMap', 'actionsMap'); $config->featureGroup = new stdclass(); $config->featureGroup->product = array('roadmap', 'track', 'UR'); diff --git a/module/program/config.php b/module/program/config.php index 55fcd14d01..5f32422d76 100644 --- a/module/program/config.php +++ b/module/program/config.php @@ -58,6 +58,7 @@ $config->program->dtable = new stdclass(); $config->program->dtable->fieldList['name']['name'] = 'name'; $config->program->dtable->fieldList['name']['title'] = $lang->nameAB; +$config->program->dtable->fieldList['name']['width'] = 356; $config->program->dtable->fieldList['name']['type'] = 'html'; $config->program->dtable->fieldList['name']['flex'] = 1; $config->program->dtable->fieldList['name']['nestedToggle'] = true; @@ -67,39 +68,39 @@ $config->program->dtable->fieldList['name']['sortType'] = false; $config->program->dtable->fieldList['status']['name'] = 'status'; $config->program->dtable->fieldList['status']['title'] = $lang->program->status; -$config->program->dtable->fieldList['status']['width'] = 65; +$config->program->dtable->fieldList['status']['minWidth'] = 60; $config->program->dtable->fieldList['status']['type'] = 'status'; $config->program->dtable->fieldList['status']['sortType'] = true; $config->program->dtable->fieldList['status']['statusMap'] = $lang->program->statusList; $config->program->dtable->fieldList['PM']['name'] = 'PM'; $config->program->dtable->fieldList['PM']['title'] = $lang->program->PM; -$config->program->dtable->fieldList['PM']['width'] = 100; +$config->program->dtable->fieldList['PM']['minWidth'] = 100; $config->program->dtable->fieldList['PM']['type'] = 'avatarBtn'; $config->program->dtable->fieldList['PM']['sortType'] = true; $config->program->dtable->fieldList['budget']['name'] = 'budget'; $config->program->dtable->fieldList['budget']['title'] = $lang->program->budget; -$config->program->dtable->fieldList['budget']['width'] = 100; +$config->program->dtable->fieldList['budget']['minWidth'] = 70; $config->program->dtable->fieldList['budget']['type'] = 'format'; $config->program->dtable->fieldList['budget']['sortType'] = true; $config->program->dtable->fieldList['begin']['name'] = 'begin'; $config->program->dtable->fieldList['begin']['title'] = $lang->program->begin; -$config->program->dtable->fieldList['begin']['width'] = 100; +$config->program->dtable->fieldList['begin']['minWidth'] = 90; $config->program->dtable->fieldList['begin']['type'] = 'datetime'; $config->program->dtable->fieldList['begin']['sortType'] = true; $config->program->dtable->fieldList['end']['name'] = 'end'; $config->program->dtable->fieldList['end']['title'] = $lang->program->end; -$config->program->dtable->fieldList['end']['width'] = 100; +$config->program->dtable->fieldList['end']['minWidth'] = 90; $config->program->dtable->fieldList['end']['type'] = 'datetime'; $config->program->dtable->fieldList['end']['sortType'] = true; -$config->program->dtable->fieldList['progress']['name'] = 'progress'; -$config->program->dtable->fieldList['progress']['title'] = $lang->program->progressAB; -$config->program->dtable->fieldList['progress']['width'] = 100; -$config->program->dtable->fieldList['progress']['type'] = 'circleProgress'; +$config->program->dtable->fieldList['progress']['name'] = 'progress'; +$config->program->dtable->fieldList['progress']['title'] = $lang->program->progressAB; +$config->program->dtable->fieldList['progress']['minWidth'] = 100; +$config->program->dtable->fieldList['progress']['type'] = 'circleProgress'; $config->program->dtable->fieldList['actions']['name'] = 'actions'; $config->program->dtable->fieldList['actions']['title'] = $lang->actions; diff --git a/zin/wg/dtable/v1.php b/zin/wg/dtable/v1.php index 84e30309d0..b927d4d872 100644 --- a/zin/wg/dtable/v1.php +++ b/zin/wg/dtable/v1.php @@ -38,6 +38,19 @@ class column extends wg return $this; } + /** + * Set column min width. + * + * @param int $width + * @access public + * @return object + */ + public function minWidth($width) + { + $this->minWidth = $width; + return $this; + } + /** * Set the column output type. *