From 91c2422e1379b2c167c0f55d322e4ff8da494439 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Tue, 8 Aug 2023 16:58:03 +0800 Subject: [PATCH] * init form field on createprogram page. --- lib/zin/wg/formrowgroup/v1.php | 1 + module/upgrade/js/mergeprogram.ui.js | 1 - module/upgrade/ui/createprogram.html.php | 15 ++++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/zin/wg/formrowgroup/v1.php b/lib/zin/wg/formrowgroup/v1.php index ac312e415a..412d54a500 100644 --- a/lib/zin/wg/formrowgroup/v1.php +++ b/lib/zin/wg/formrowgroup/v1.php @@ -34,6 +34,7 @@ class formRowGroup extends formRow $this->prop('title'), $this->block('suffix'), ), + set($this->getRestProps()), $this->prop('items'), ); } diff --git a/module/upgrade/js/mergeprogram.ui.js b/module/upgrade/js/mergeprogram.ui.js index dbe98bb0c7..c91894e074 100644 --- a/module/upgrade/js/mergeprogram.ui.js +++ b/module/upgrade/js/mergeprogram.ui.js @@ -1,6 +1,5 @@ $(function() { - }); window.changeAllLines = function() diff --git a/module/upgrade/ui/createprogram.html.php b/module/upgrade/ui/createprogram.html.php index a686e54a2f..fab5410159 100644 --- a/module/upgrade/ui/createprogram.html.php +++ b/module/upgrade/ui/createprogram.html.php @@ -17,10 +17,10 @@ $createProgram = function($data) return div ( - formRowGroup(set::title($lang->upgrade->dataMethod), set::items('')), + formRowGroup(set::class('programParams hidden'), set::title($lang->upgrade->dataMethod), set::items('')), div ( - set::class('programParams py-4'), + set::class('programParams hidden py-4'), radioList(set::class('my-2'), set::name('projectType'), set::inline('true'), set::items($this->lang->upgrade->projectType), set::value($data->projectType)), div(set::class('createProjectTip text-gray ' . ($data->projectType == 'project' ? '' : 'hidden')), html($lang->upgrade->createProjectTip)), div(set::class('createExecutionTip text-gray ' . ($data->projectType == 'execution' ? '' : 'hidden')), html($lang->upgrade->createExecutionTip)) @@ -69,7 +69,7 @@ $createProgram = function($data) ), formGroup ( - set::class('hidden'), + set::class('projectName hidden'), set::label($lang->upgrade->existProject), inputGroup ( @@ -83,6 +83,7 @@ $createProgram = function($data) ), formGroup ( + set::class('projectName hidden'), set::label($lang->upgrade->projectName), inputGroup ( @@ -96,7 +97,7 @@ $createProgram = function($data) ), formGroup ( - set::class('programParams projectStatus'), + set::class('programParams hidden projectStatus'), set::label($lang->project->status), inputGroup ( @@ -132,7 +133,7 @@ $createProgram = function($data) ), formGroup ( - set::class('programParams'), + set::class('programParams hidden'), set::label($lang->project->PM), inputGroup ( @@ -141,7 +142,7 @@ $createProgram = function($data) ), formGroup ( - set::class('programParams'), + set::class('programParams hidden'), set::label($lang->project->dateRange), set::required(true), inputGroup @@ -154,7 +155,7 @@ $createProgram = function($data) ), formGroup ( - set::class('programParams'), + set::class('programParams hidden'), set::label($lang->project->acl), radioList(set::name('programAcl'), set::items($lang->program->aclList), set::value('open')), radioList(set::name('projectAcl'), set::class('hidden'), set::items($lang->project->subAclList), set::value('open')),