Big-Data-Lab
/
CET-cmd-2.0
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

【#3225】常见案例-自定义组件-cron表达式显示错误

This commit is contained in:
zhangdaiscott 2021-12-10 11:19:29 +08:00
parent a39bb0ce5f
commit 5bfa15d628
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ant-design-vue-jeecg/src/components/jeecg/JEasyCron/EasyCron.vue
View File

@ -145,8 +145,8 @@ export default {
if (this.hideYear || this.hideSecond) return v if (this.hideYear || this.hideSecond) return v
const vs = v.split(' ') const vs = v.split(' ')
if (vs.length >= 6) { if (vs.length >= 6) {
// 转成 Quartz 的规则 // 将 Quartz 星期 的规则转换为 CronParser 的规则
vs[5] = this.convertWeekToQuartz(vs[5]) vs[5] = this.convertQuartzWeekToCParser(vs[5])
} }
return vs.slice(0, vs.length - 1).join(' ') return vs.slice(0, vs.length - 1).join(' ')
}, },
@ -230,9 +230,10 @@ export default {
if (values.length > i) this.year = values[i] if (values.length > i) this.year = values[i]
this.assignInput() this.assignInput()
}, },
// Quartz 的规则： // 将 Quartz 星期 的规则转换为 CronParser 的规则：
// 1 = 周日，2 = 周一，3 = 周二，4 = 周三，5 = 周四，6 = 周五，7 = 周六 // Quartz 的规则：1 = 周日，2 = 周一，3 = 周二，4 = 周三，5 = 周四，6 = 周五，7 = 周六
convertWeekToQuartz(week) { // CronParser 的规则： 0 = 周日，1 = 周一，2 = 周二，3 = 周三，4 = 周四，5 = 周五，6 = 周六，7 = 周日
convertQuartzWeekToCParser(week) {
let convert = (v) => { let convert = (v) => {
if (v === '0') { if (v === '0') {
return '1' return '1'

16
ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/const.js
View File

@ -1,11 +1,11 @@
export const WEEK_MAP_EN = { export const WEEK_MAP_EN = {
'SUN': '0', 'SUN': '1',
'MON': '1', 'MON': '2',
'TUE': '2', 'TUE': '3',
'WED': '3', 'WED': '4',
'THU': '4', 'THU': '5',
'FRI': '5', 'FRI': '6',
'SAT': '6' 'SAT': '7'
} }
export const replaceWeekName = (c) => { export const replaceWeekName = (c) => {
@ -14,7 +14,7 @@ export const replaceWeekName = (c) => {
Object.keys(WEEK_MAP_EN).forEach(k => { Object.keys(WEEK_MAP_EN).forEach(k => {
c = c.replace(new RegExp(k, 'g'), WEEK_MAP_EN[k]) c = c.replace(new RegExp(k, 'g'), WEEK_MAP_EN[k])
}) })
c = c.replace(new RegExp('7', 'g'), '0') // c = c.replace(new RegExp('7', 'g'), '0')
} }
// console.info('after: ' + c) // console.info('after: ' + c)
return c return c