Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jeecg-boot
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenjunxiong
jeecg-boot
Commits
5bfa15d6
Commit
5bfa15d6
authored
Dec 10, 2021
by
zhangdaiscott
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【#3225】常见案例-自定义组件-cron表达式显示错误
parent
a39bb0ce
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
13 deletions
+14
-13
ant-design-vue-jeecg/src/components/jeecg/JEasyCron/EasyCron.vue
+6
-5
ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/const.js
+8
-8
No files found.
ant-design-vue-jeecg/src/components/jeecg/JEasyCron/EasyCron.vue
View file @
5bfa15d6
...
@@ -145,8 +145,8 @@ export default {
...
@@ -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
.
convert
WeekToQuartz
(
vs
[
5
])
vs
[
5
]
=
this
.
convert
QuartzWeekToCParser
(
vs
[
5
])
}
}
return
vs
.
slice
(
0
,
vs
.
length
-
1
).
join
(
' '
)
return
vs
.
slice
(
0
,
vs
.
length
-
1
).
join
(
' '
)
},
},
...
@@ -230,9 +230,10 @@ export default {
...
@@ -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'
...
...
ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/const.js
View file @
5bfa15d6
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) => {
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment