diff --git a/module/job/js/trigger.ui.js b/module/job/js/trigger.ui.js
index ab768da947..6723d8af9d 100644
--- a/module/job/js/trigger.ui.js
+++ b/module/job/js/trigger.ui.js
@@ -86,7 +86,7 @@ window.changeTriggerType = function(event)
     }
 
     if(type != 'tag' || repo.SCM == 'Subversion') $parentDom.append(eval(`${type}Field`).replace(/%s/g, window.triggerCount));
-    if(type != 'commit') eval(`window.${type}BlockInit()`);
+    if(window[`${type}BlockInit`]) eval(`window.${type}BlockInit()`);
 
     $parentDom.find('.hidden').removeClass('hidden');
 }
@@ -155,7 +155,7 @@ window.tagBlockInit = function()
         items:         options,
         name:         `svnDir[]`,
         required:     true,
-        defaultValue: options.length ? options[0].value : ''
+        defaultValue: job.svnDir
     });
 }
 
@@ -163,6 +163,7 @@ window.scheduleBlockInit = function()
 {
     $('#scheduleTime' + window.triggerCount).addClass('form-group-wrapper picker-box');
     new zui.TimePicker('#scheduleTime' + window.triggerCount, {
-        name: 'atTime'
+        name:         'atTime',
+        defaultValue: job.atTime
     })
 }
diff --git a/module/job/ui/trigger.html.php b/module/job/ui/trigger.html.php
index d33b912182..14f4179503 100644
--- a/module/job/ui/trigger.html.php
+++ b/module/job/ui/trigger.html.php
@@ -9,6 +9,7 @@ declare(strict_types=1);
  * @link        https://www.zentao.net
  */
 namespace zin;
+jsVar('job', $job);
 jsVar('repo', $repo);
 jsVar('dirs', !empty($dirs) ? $dirs : '');
 jsVar('triggerRepeat', $lang->job->triggerRepeat);
@@ -53,7 +54,8 @@ jsVar('scheduleField', div
             set::label(''),
             set::name('atDay[]'),
             set::control('checkListInline'),
-            set::items($lang->datepicker->dayNames)
+            set::items($lang->datepicker->dayNames),
+            set::value($job->atDay)
         )
     ),
     formRow