Merge branch 'dev' into release/1.0.0

pages/index/index.js

@@ -29,7 +29,7 @@ import create from "dd-store";
 let maxClickCount = 5;
 create.Page({
   data: {
-    sign: '',
+    sign: "",
     refresh: false,
     $data: null,
     iconDay: currentDate.getDate(),
@@ -62,7 +62,6 @@ create.Page({
   maxYear: maxYear,
   todayIndex: 0,
   onShow() {
-
     //如果是重复会议重新算
     if (this.$store.data.indexNeedUpdate) {
       dd.setNavigationBar({
@@ -88,19 +87,19 @@ create.Page({
     }
     //开启一个定时器
     this.timer = setInterval(() => {
-      this.getData()
-    }, 30000)
+      this.getData();
+    }, 30000);
   },
   onHide() {
     clearInterval(this.timer);
     this.timer = null;
   },
   refresh() {
-    this.onLoad()
+    this.onLoad();
   },
   onLoad(query) {
     console.log(query);
-    if (query && JSON.stringify(query) !== '{}') {
+    if (query && JSON.stringify(query) !== "{}") {
       this.setData({
         listLoading: false
       });
@@ -136,7 +135,8 @@ create.Page({
     getDynamicList({
       current,
       size: 10
-    }).then(res => {
+    })
+      .then(res => {
         if (!res.data.data) {
           this.setData({
             listLoading: false,
@@ -197,11 +197,12 @@ create.Page({
         if (callBack) {
           callBack();
         }
-    }).catch(err => {
+      })
+      .catch(err => {
         if (err && err.refresh) {
           this.setData({
             refresh: true
-        })
+          });
         }
       });
   },
@@ -302,7 +303,8 @@ create.Page({
     getHomeUserSchedule1({
       startTime: "2020-01-01 00:00:00",
       endTime: "2025-12-30 23:59:59"
-    }).then(res => {
+    })
+      .then(res => {
         //是否刷新页面
         if (this.data.sign && res.data.data.sign !== this.data.sign) {
           DateMap = getDateMap(this.minYear, this.maxYear);
@@ -313,12 +315,13 @@ create.Page({
         }
         this.setData({
           sign: res.data.data.sign
+        });
       })
-    }).catch(err => {
+      .catch(err => {
         if (err && err.refresh) {
           this.setData({
             refresh: true
-        })
+          });
         }
       });
   },
@@ -358,7 +361,6 @@ create.Page({
         }
       }
     }
-
     if (DateMap.has(toLocaleDateString(startTime))) {
       DateMap.get(toLocaleDateString(startTime)).push(pushItem);
     }
@@ -391,10 +393,12 @@ create.Page({
         const initialTimeList = item.initialTime.split("-");
         const startTimeList = item.startTime.split(":");
         const DTSTART = `${initialTimeList[0]}${initialTimeList[1]}${initialTimeList[2]}T${startTimeList[0]}${startTimeList[1]}00Z`;
-        const rule = RRule.fromString(
+        let rule = { all: () => [] };
+        if (item.recurrenceModel.recurrenceRule) {
+          rule = RRule.fromString(
             `${item.recurrenceModel.recurrenceRule};DTSTART=${DTSTART}`
           );
-
+        }
         const setDateMapValueAll = (startTime, endTime, item) => {
           //如果有日程会议则用日程会议替换
           let replaceItem = [];
@@ -415,6 +419,7 @@ create.Page({
         };
         // 需要剔除某一天
         if (item.excludePlanDates) {
+
           const excludeData = getExcludeDate(item.excludePlanDates.split(","));
           rule.all().forEach(startTime => {
             //修正时间（时间有8小时时差）
@@ -460,7 +465,7 @@ create.Page({
     }
     // 取出DateMap的value值平铺到DateList
     const DateList = [];
-    DateMap.forEach(function (value, key) {
+    DateMap.forEach(function(value, key) {
       const keyDate = new Date(key);
       const year = keyDate.getFullYear();
       const month = keyDate.getMonth();
@@ -499,7 +504,7 @@ create.Page({
       }
       // 有日程长度
       if (value.length !== 0) {
-        value.sort(function (a, b) {
+        value.sort(function(a, b) {
           return a.startTime.getTime() - b.startTime.getTime();
         });
         value.forEach((item, index) => {
@@ -727,7 +732,7 @@ create.Page({
   createMeeting() {
     dd.navigateTo({ url: "./../createMeeting/createMeeting" });
   },
-  nextDetail: throttle(function (e) {
+  nextDetail: throttle(function(e) {
     dd.navigateTo({
       url: `./../meetingDetail/meetingDetail?scheduleItem=${encodeURIComponent(
         JSON.stringify(e.target.dataset.item)
@@ -810,7 +815,7 @@ create.Page({
     maxClickCount--;
     if (maxClickCount == 0) {
       dd.alert({
-        content: "0.0.13"
+        content: "0.0.14"
       });
       maxClickCount = 5;
     }