This is an automated email from the ASF dual-hosted git repository.
chenxingchun pushed a commit to branch 1.3.4-prepare
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/1.3.4-prepare by this push:
new b99d246 [Feature-3878][UI]Repair the last Sunday of each month
new e0963a7 Merge pull request #4213 from
lgcareer/1.3.4-prepare-feature-3878
b99d246 is described below
commit b99d2468b6dad299dd5ca17c8cb2ceaa0d57f60c
Author: lgcareer <[email protected]>
AuthorDate: Fri Dec 11 18:54:10 2020 +0800
[Feature-3878][UI]Repair the last Sunday of each month
---
.../src/js/module/components/crontab/source/_times/day.vue | 4 ++--
.../src/js/module/components/crontab/source/util/index.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/dolphinscheduler-ui/src/js/module/components/crontab/source/_times/day.vue
b/dolphinscheduler-ui/src/js/module/components/crontab/source/_times/day.vue
index 4e65b1c..83303b7 100755
--- a/dolphinscheduler-ui/src/js/module/components/crontab/source/_times/day.vue
+++ b/dolphinscheduler-ui/src/js/module/components/crontab/source/_times/day.vue
@@ -161,7 +161,7 @@
selectSpecificDayList: selectList['day'],
monthLastDaysVal: 'L',
monthLastWorkingDays: 'LW',
- monthLastWeeksVal: '1L',
+ monthLastWeeksVal: '?',
monthLastWeeksList: _.map(_.cloneDeep(selectList['lastWeeks']), v => {
return {
value: v.value,
@@ -313,7 +313,7 @@
this.monthLastWorkingDaysReset()
break
case 'monthLastWeeks':
- this.weekValue = '?'
+ this.weekValue = '1L'
this.monthLastWeeksReset()
break
case 'monthTailBefore':
diff --git
a/dolphinscheduler-ui/src/js/module/components/crontab/source/util/index.js
b/dolphinscheduler-ui/src/js/module/components/crontab/source/util/index.js
index 47f5e34..000b1d4 100755
--- a/dolphinscheduler-ui/src/js/module/components/crontab/source/util/index.js
+++ b/dolphinscheduler-ui/src/js/module/components/crontab/source/util/index.js
@@ -121,7 +121,7 @@ const selectList = {
}),
lastWeeks: [
{
- value: '1L',
+ value: '?',
label: '星期天'
},
{
