From ebe39ef940a58d204566bb3db0e3fe3242f7effd Mon Sep 17 00:00:00 2001
From: wangyuting <wangyuting@easycorp.ltd>
Date: Mon, 29 Jan 2024 14:05:43 +0800
Subject: [PATCH] * Fix merge data bug. bug #45403.

---
 module/upgrade/js/mergeprogram.ui.js     | 10 ++++++++--
 module/upgrade/ui/createprogram.html.php |  8 ++++----
 module/upgrade/ui/mergebysprint.html.php |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/module/upgrade/js/mergeprogram.ui.js b/module/upgrade/js/mergeprogram.ui.js
index b086fa9c61..1eb2d1bc23 100644
--- a/module/upgrade/js/mergeprogram.ui.js
+++ b/module/upgrade/js/mergeprogram.ui.js
@@ -84,7 +84,7 @@ window.changeProjectType = function()
 {
     const projectType = $('input[name=projectType]:checked').val();
 
-    $('.programForm').toggleClass('hidden', projectType == 'project' && mode == 'light');
+    $('.programForm, .formTitle').toggleClass('hidden', projectType == 'project' && mode == 'light');
     $('.createProjectTip').toggleClass('hidden', projectType == 'project');
     $('.createExecutionTip').toggleClass('hidden', projectType == 'execution');
     $('[name=projectAcl]').closest('.check-list').toggleClass('hidden', projectType == 'project');
@@ -386,7 +386,7 @@ window.setProgramStatus = function(projectStatus)
 
 window.initFormData = function()
 {
-    $('#programBox').toggleClass('hidden', mode == 'light');
+    $('#programBox').toggleClass('hidden', $('[name^=sprints]:checked').length == 0 && mode == 'light');
     $('.programParams').toggleClass('hidden', $('[name^=sprints]:checked').length == 0);
     $('.programForm').toggleClass('hidden', $('[name^=sprints]:checked').length != 0 && projectType == 'project' && mode == 'light');
 
@@ -407,6 +407,12 @@ window.initFormData = function()
         $(".projectName .picker-field").zui('picker').render({disabled: false});
 
         changeProjectType();
+
+        if(mode == 'light')
+        {
+            $('.programName').find('input[name=newProgram]').prop('checked', false);
+            changeNewProgram();
+        }
     }
 }
 
diff --git a/module/upgrade/ui/createprogram.html.php b/module/upgrade/ui/createprogram.html.php
index 3977978685..c6185396ff 100644
--- a/module/upgrade/ui/createprogram.html.php
+++ b/module/upgrade/ui/createprogram.html.php
@@ -25,18 +25,18 @@ $createProgram = function($data)
             div(setClass('createProjectTip text-gray ' . ($data->projectType == 'project' ? '' : 'hidden')), html($lang->upgrade->createProjectTip)),
             div(setClass('createExecutionTip text-gray ' . ($data->projectType == 'execution' ? '' : 'hidden')), html($lang->upgrade->createExecutionTip))
         ),
-        formRowGroup(set::title($data->systemMode == 'light' ? $lang->upgrade->setProject : $lang->upgrade->setProgram), set::items(array())),
+        formRowGroup(set::class('formTitle'), set::title($data->systemMode == 'light' ? $lang->upgrade->setProject : $lang->upgrade->setProgram), set::items(array())),
         div
         (
             setClass('programForm mt-4 form-horz'),
             formGroup
             (
-                setClass('programName my-2'),
+                setClass('programName my-2 ' . ($data->systemMode == 'light' ? 'hidden' : '')),
                 set::label($lang->upgrade->programName),
                 set::required(true),
                 inputGroup
                 (
-                    picker(setID('programs'), set::name('programs'), set::items($data->programs), set::value($data->programID), setData(array('on' => 'change', 'call' => 'changePrograms')), setClass('hidden')),
+                    picker(set::required(true), setID('programs'), set::name('programs'), set::items($data->programs), set::value($data->programID), setData(array('on' => 'change', 'call' => 'changePrograms')), setClass('hidden')),
                     input(set::name('programName')),
                     span
                     (
@@ -81,7 +81,7 @@ $createProgram = function($data)
             ),
             formGroup
             (
-                setClass('lineName my-2'),
+                setClass('lineName my-2 ' . ($data->systemMode == 'light' ? 'hidden' : '')),
                 set::label($lang->upgrade->line),
                 inputGroup
                 (
diff --git a/module/upgrade/ui/mergebysprint.html.php b/module/upgrade/ui/mergebysprint.html.php
index 93ef3ab729..fe2819faa9 100644
--- a/module/upgrade/ui/mergebysprint.html.php
+++ b/module/upgrade/ui/mergebysprint.html.php
@@ -24,7 +24,7 @@ $getMergeData = function($data)
             div
             (
                 setClass('sprintItem px-4'),
-                checkbox(set::name("sprints[]"), set::text($sprint->name), set::value($sprint->id), set('data-on', 'change'), set('data-call', 'changeSprints'), set('data-params', 'event'))
+                checkbox(set::name("sprints[]"), set::text($sprint->name), set::value($sprint->id), set('data-on', 'change'), set('data-call', 'changeSprints'), set('data-params', 'event'), set('data-begin', $sprint->begin), set('data-end', $sprint->end), set('data-status', $sprint->status), set('data-pm', $sprint->PM))
             )
         );
     }