Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
schedule
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fengzhaoyu
schedule
Commits
f2b11c05
Commit
f2b11c05
authored
Apr 26, 2020
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: rrule生成出错处理
parent
19646474
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
index.js
pages/index/index.js
+7
-5
No files found.
pages/index/index.js
View file @
f2b11c05
...
@@ -358,7 +358,6 @@ create.Page({
...
@@ -358,7 +358,6 @@ create.Page({
}
}
}
}
}
}
if
(
DateMap
.
has
(
toLocaleDateString
(
startTime
)))
{
if
(
DateMap
.
has
(
toLocaleDateString
(
startTime
)))
{
DateMap
.
get
(
toLocaleDateString
(
startTime
)).
push
(
pushItem
);
DateMap
.
get
(
toLocaleDateString
(
startTime
)).
push
(
pushItem
);
}
}
...
@@ -391,10 +390,12 @@ create.Page({
...
@@ -391,10 +390,12 @@ create.Page({
const
initialTimeList
=
item
.
initialTime
.
split
(
"-"
);
const
initialTimeList
=
item
.
initialTime
.
split
(
"-"
);
const
startTimeList
=
item
.
startTime
.
split
(
":"
);
const
startTimeList
=
item
.
startTime
.
split
(
":"
);
const
DTSTART
=
`
${
initialTimeList
[
0
]}${
initialTimeList
[
1
]}${
initialTimeList
[
2
]}
T
${
startTimeList
[
0
]}${
startTimeList
[
1
]}
00Z`
;
const
DTSTART
=
`
${
initialTimeList
[
0
]}${
initialTimeList
[
1
]}${
initialTimeList
[
2
]}
T
${
startTimeList
[
0
]}${
startTimeList
[
1
]}
00Z`
;
const
rule
=
RRule
.
fromString
(
let
rule
=
{
all
:
()
=>
[]
};
`
${
item
.
recurrenceModel
.
recurrenceRule
}
;DTSTART=
${
DTSTART
}
`
if
(
item
.
recurrenceModel
.
recurrenceRule
)
{
);
rule
=
RRule
.
fromString
(
`
${
item
.
recurrenceModel
.
recurrenceRule
}
;DTSTART=
${
DTSTART
}
`
);
}
const
setDateMapValueAll
=
(
startTime
,
endTime
,
item
)
=>
{
const
setDateMapValueAll
=
(
startTime
,
endTime
,
item
)
=>
{
//如果有日程会议则用日程会议替换
//如果有日程会议则用日程会议替换
let
replaceItem
=
[];
let
replaceItem
=
[];
...
@@ -415,6 +416,7 @@ create.Page({
...
@@ -415,6 +416,7 @@ create.Page({
};
};
// 需要剔除某一天
// 需要剔除某一天
if
(
item
.
excludePlanDates
)
{
if
(
item
.
excludePlanDates
)
{
const
excludeData
=
getExcludeDate
(
item
.
excludePlanDates
.
split
(
","
));
const
excludeData
=
getExcludeDate
(
item
.
excludePlanDates
.
split
(
","
));
rule
.
all
().
forEach
(
startTime
=>
{
rule
.
all
().
forEach
(
startTime
=>
{
//修正时间(时间有8小时时差)
//修正时间(时间有8小时时差)
...
...
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