From d6a78806fe449f82c26855228fe6d022d14df88a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 17 八月 2020 19:06:33 +0800
Subject: [PATCH] 2020-08-17
---
src/tabviews/zshare/calendar/index.jsx | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/zshare/calendar/index.jsx b/src/tabviews/zshare/calendar/index.jsx
index 0ebf288..9dec047 100644
--- a/src/tabviews/zshare/calendar/index.jsx
+++ b/src/tabviews/zshare/calendar/index.jsx
@@ -104,6 +104,8 @@
if (!endTime || !/^(1|2)\d{3}(-|\/)\d{2}(-|\/)\d{2}/.test(endTime)) return
if (!item[calendar.remarkfield]) return
+ let equal = endTime.substr(0, 4) === startTime.substr(0, 4)
+
datalist.push({
color: colors[color] || '',
level: color && levels[color] ? levels[color] : 100,
@@ -111,9 +113,9 @@
startMonth: startTime.substr(0, 4) + startTime.substr(5, 2),
endMonth: endTime.substr(0, 4) + endTime.substr(5, 2),
start: startTime.substr(0, 4) + startTime.substr(5, 2) + startTime.substr(8, 2),
- startTime: `${startTime.substr(5, 2)}-${startTime.substr(8, 2)}`,
+ startTime: equal ? `${startTime.substr(5, 2)}-${startTime.substr(8, 2)}` : `${startTime.substr(0, 4)}-${startTime.substr(5, 2)}-${startTime.substr(8, 2)}`,
end: endTime.substr(0, 4) + endTime.substr(5, 2) + endTime.substr(8, 2),
- endTime: `${endTime.substr(5, 2)}-${endTime.substr(8, 2)}`
+ endTime: equal ? `${endTime.substr(5, 2)}-${endTime.substr(8, 2)}` : `${endTime.substr(0, 4)}-${endTime.substr(5, 2)}-${endTime.substr(8, 2)}`
})
})
--
Gitblit v1.8.0