feat: update time tooltip.
Some checks failed
Build and Push Docker Image / buildx (push) Has been cancelled
Some checks failed
Build and Push Docker Image / buildx (push) Has been cancelled
This commit is contained in:
@@ -13,6 +13,7 @@ export default class CalendarView {
|
|||||||
this.monthNames = ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'];
|
this.monthNames = ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'];
|
||||||
this.onUnauthorized = onUnauthorized;
|
this.onUnauthorized = onUnauthorized;
|
||||||
this.saveDelay = 500;
|
this.saveDelay = 500;
|
||||||
|
this.pendingTooltipDate = null; // Track date that needs tooltip after render
|
||||||
}
|
}
|
||||||
|
|
||||||
init() {
|
init() {
|
||||||
@@ -51,7 +52,20 @@ export default class CalendarView {
|
|||||||
try {
|
try {
|
||||||
showToast('正在加载...', 'info');
|
showToast('正在加载...', 'info');
|
||||||
const result = await fetchCalendar(state.currentServer, state.token);
|
const result = await fetchCalendar(state.currentServer, state.token);
|
||||||
state.markedDates = result.markedDates || {};
|
// Convert the new data structure to the old one for backward compatibility
|
||||||
|
const markedDates = {};
|
||||||
|
for (const [date, data] of Object.entries(result.markedDates || {})) {
|
||||||
|
if (typeof data === 'string') {
|
||||||
|
// Old format - just status
|
||||||
|
markedDates[date] = data;
|
||||||
|
} else if (data && typeof data === 'object') {
|
||||||
|
// New format - object with status and updatedAt
|
||||||
|
markedDates[date] = data.status;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
state.markedDates = markedDates;
|
||||||
|
// Store the full data including timestamps
|
||||||
|
state.markedDatesWithTimestamps = result.markedDates || {};
|
||||||
this.renderCalendar();
|
this.renderCalendar();
|
||||||
showToast('数据加载成功', 'success');
|
showToast('数据加载成功', 'success');
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -68,6 +82,7 @@ export default class CalendarView {
|
|||||||
|
|
||||||
clearData() {
|
clearData() {
|
||||||
state.markedDates = {};
|
state.markedDates = {};
|
||||||
|
state.markedDatesWithTimestamps = {};
|
||||||
this.renderCalendar();
|
this.renderCalendar();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -149,7 +164,34 @@ export default class CalendarView {
|
|||||||
dayEl.appendChild(markEl);
|
dayEl.appendChild(markEl);
|
||||||
}
|
}
|
||||||
|
|
||||||
dayEl.addEventListener('click', () => {
|
// Add timestamp tooltip functionality
|
||||||
|
const timestamp = this.getDateTimestamp(date);
|
||||||
|
if (timestamp) {
|
||||||
|
// Store the ISO timestamp
|
||||||
|
dayEl.dataset.modificationTime = timestamp;
|
||||||
|
|
||||||
|
// Add hover events for custom tooltip
|
||||||
|
dayEl.addEventListener('mouseenter', (e) => {
|
||||||
|
const isoTime = e.currentTarget.dataset.modificationTime;
|
||||||
|
// Convert to user's local timezone
|
||||||
|
const localTime = new Date(isoTime).toLocaleString('zh-CN', {
|
||||||
|
year: 'numeric',
|
||||||
|
month: '2-digit',
|
||||||
|
day: '2-digit',
|
||||||
|
hour: '2-digit',
|
||||||
|
minute: '2-digit',
|
||||||
|
second: '2-digit',
|
||||||
|
hour12: false
|
||||||
|
});
|
||||||
|
this.showTooltip(e, `修改时间: ${localTime}`);
|
||||||
|
});
|
||||||
|
|
||||||
|
dayEl.addEventListener('mouseleave', () => {
|
||||||
|
this.hideTooltip();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
dayEl.addEventListener('click', (e) => {
|
||||||
if (!isOtherMonth) {
|
if (!isOtherMonth) {
|
||||||
this.toggleDateStatus(date);
|
this.toggleDateStatus(date);
|
||||||
}
|
}
|
||||||
@@ -158,6 +200,106 @@ export default class CalendarView {
|
|||||||
return dayEl;
|
return dayEl;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Tooltip methods
|
||||||
|
showTooltip(event, content) {
|
||||||
|
// Remove any existing tooltips completely
|
||||||
|
const existingTooltips = document.querySelectorAll('.tooltip');
|
||||||
|
existingTooltips.forEach(tip => {
|
||||||
|
if (tip.parentNode) {
|
||||||
|
tip.parentNode.removeChild(tip);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Create new tooltip element with unique ID
|
||||||
|
const tooltip = document.createElement('div');
|
||||||
|
const uniqueId = 'tooltip-' + Date.now();
|
||||||
|
tooltip.id = uniqueId;
|
||||||
|
tooltip.className = 'tooltip';
|
||||||
|
tooltip.textContent = content;
|
||||||
|
document.body.appendChild(tooltip);
|
||||||
|
|
||||||
|
// Position tooltip relative to the target element
|
||||||
|
const rect = event.currentTarget.getBoundingClientRect();
|
||||||
|
tooltip.style.left = (rect.left + rect.width / 2) + 'px';
|
||||||
|
tooltip.style.top = (rect.top - 10) + 'px';
|
||||||
|
tooltip.style.transform = 'translate(-50%, -100%)';
|
||||||
|
|
||||||
|
// Show tooltip with a slight delay to ensure position is set
|
||||||
|
requestAnimationFrame(() => {
|
||||||
|
tooltip.classList.add('show');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
hideTooltip() {
|
||||||
|
const tooltips = document.querySelectorAll('.tooltip');
|
||||||
|
tooltips.forEach(tooltip => {
|
||||||
|
tooltip.classList.remove('show');
|
||||||
|
// Remove tooltip element after transition
|
||||||
|
setTimeout(() => {
|
||||||
|
if (tooltip.parentNode) {
|
||||||
|
tooltip.parentNode.removeChild(tooltip);
|
||||||
|
}
|
||||||
|
}, 200);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
refreshTooltip(event, element) {
|
||||||
|
// Check if element has timestamp data
|
||||||
|
const isoTime = element.dataset.modificationTime;
|
||||||
|
if (isoTime) {
|
||||||
|
// Convert to user's local timezone
|
||||||
|
const localTime = new Date(isoTime).toLocaleString('zh-CN', {
|
||||||
|
year: 'numeric',
|
||||||
|
month: '2-digit',
|
||||||
|
day: '2-digit',
|
||||||
|
hour: '2-digit',
|
||||||
|
minute: '2-digit',
|
||||||
|
second: '2-digit',
|
||||||
|
hour12: false
|
||||||
|
});
|
||||||
|
this.showTooltip(event, `修改时间: ${localTime}`);
|
||||||
|
} else {
|
||||||
|
// No timestamp, hide tooltip
|
||||||
|
this.hideTooltip();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
showTooltipForDate(dateKey) {
|
||||||
|
// Find the day element for this date
|
||||||
|
const dayElements = this.calendarEl.querySelectorAll('.day:not(.other-month)');
|
||||||
|
for (const dayEl of dayElements) {
|
||||||
|
if (dayEl.dataset.modificationTime) {
|
||||||
|
// Extract date from the element's position
|
||||||
|
const dayNumber = dayEl.querySelector('.day-number')?.textContent;
|
||||||
|
if (dayNumber) {
|
||||||
|
const year = state.currentDate.getFullYear();
|
||||||
|
const month = state.currentDate.getMonth();
|
||||||
|
const testDate = new Date(year, month, parseInt(dayNumber));
|
||||||
|
if (this.formatDate(testDate) === dateKey) {
|
||||||
|
// Found the element, show tooltip
|
||||||
|
const isoTime = dayEl.dataset.modificationTime;
|
||||||
|
const localTime = new Date(isoTime).toLocaleString('zh-CN', {
|
||||||
|
year: 'numeric',
|
||||||
|
month: '2-digit',
|
||||||
|
day: '2-digit',
|
||||||
|
hour: '2-digit',
|
||||||
|
minute: '2-digit',
|
||||||
|
second: '2-digit',
|
||||||
|
hour12: false
|
||||||
|
});
|
||||||
|
// Create a synthetic event for positioning
|
||||||
|
const rect = dayEl.getBoundingClientRect();
|
||||||
|
const syntheticEvent = {
|
||||||
|
currentTarget: dayEl
|
||||||
|
};
|
||||||
|
this.showTooltip(syntheticEvent, `修改时间: ${localTime}`);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
toggleDateStatus(date) {
|
toggleDateStatus(date) {
|
||||||
if (!state.currentServer || !state.token) {
|
if (!state.currentServer || !state.token) {
|
||||||
showToast('请先选择服务器并登录', 'error');
|
showToast('请先选择服务器并登录', 'error');
|
||||||
@@ -183,8 +325,13 @@ export default class CalendarView {
|
|||||||
|
|
||||||
if (nextStatus === 'none') {
|
if (nextStatus === 'none') {
|
||||||
delete state.markedDates[dateKey];
|
delete state.markedDates[dateKey];
|
||||||
|
// Clear pending tooltip for removed marks
|
||||||
|
this.pendingTooltipDate = null;
|
||||||
|
this.hideTooltip();
|
||||||
} else {
|
} else {
|
||||||
state.markedDates[dateKey] = nextStatus;
|
state.markedDates[dateKey] = nextStatus;
|
||||||
|
// Store the date for tooltip after save completes
|
||||||
|
this.pendingTooltipDate = dateKey;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.renderCalendar();
|
this.renderCalendar();
|
||||||
@@ -208,6 +355,13 @@ export default class CalendarView {
|
|||||||
try {
|
try {
|
||||||
await saveCalendar(state.currentServer, state.token, state.markedDates);
|
await saveCalendar(state.currentServer, state.token, state.markedDates);
|
||||||
showToast('数据已保存', 'success');
|
showToast('数据已保存', 'success');
|
||||||
|
// Reload data to get updated timestamps
|
||||||
|
await this.loadData();
|
||||||
|
// Show tooltip for the pending date after data is loaded
|
||||||
|
if (this.pendingTooltipDate) {
|
||||||
|
this.showTooltipForDate(this.pendingTooltipDate);
|
||||||
|
this.pendingTooltipDate = null;
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof ApiError && (error.status === 401 || error.status === 403)) {
|
if (error instanceof ApiError && (error.status === 401 || error.status === 403)) {
|
||||||
showToast('认证已过期,请重新登录', 'error');
|
showToast('认证已过期,请重新登录', 'error');
|
||||||
@@ -233,6 +387,15 @@ export default class CalendarView {
|
|||||||
return state.markedDates[dateKey] || 'none';
|
return state.markedDates[dateKey] || 'none';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getDateTimestamp(date) {
|
||||||
|
const dateKey = this.formatDate(date);
|
||||||
|
const dateData = state.markedDatesWithTimestamps[dateKey];
|
||||||
|
if (dateData && typeof dateData === 'object' && dateData.updatedAt) {
|
||||||
|
return dateData.updatedAt;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
isToday(date) {
|
isToday(date) {
|
||||||
const today = new Date();
|
const today = new Date();
|
||||||
return date.getFullYear() === today.getFullYear() &&
|
return date.getFullYear() === today.getFullYear() &&
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
const state = {
|
const state = {
|
||||||
currentDate: new Date(),
|
currentDate: new Date(),
|
||||||
markedDates: {},
|
markedDates: {},
|
||||||
|
markedDatesWithTimestamps: {},
|
||||||
currentServer: '',
|
currentServer: '',
|
||||||
token: '',
|
token: '',
|
||||||
user: null,
|
user: null,
|
||||||
|
|||||||
@@ -575,6 +575,37 @@ header h1 {
|
|||||||
color: white;
|
color: white;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Custom tooltip for modification time */
|
||||||
|
.tooltip {
|
||||||
|
position: fixed;
|
||||||
|
background: #333;
|
||||||
|
color: white;
|
||||||
|
padding: 8px 12px;
|
||||||
|
border-radius: 6px;
|
||||||
|
font-size: 12px;
|
||||||
|
z-index: 10001;
|
||||||
|
white-space: nowrap;
|
||||||
|
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
|
||||||
|
pointer-events: none;
|
||||||
|
opacity: 0;
|
||||||
|
transition: opacity 0.2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tooltip.show {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tooltip::after {
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
top: 100%;
|
||||||
|
left: 50%;
|
||||||
|
margin-left: -6px;
|
||||||
|
border-width: 6px;
|
||||||
|
border-style: solid;
|
||||||
|
border-color: #333 transparent transparent transparent;
|
||||||
|
}
|
||||||
|
|
||||||
@media (max-width: 768px) {
|
@media (max-width: 768px) {
|
||||||
.container {
|
.container {
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ router.get('/', (req, res) => {
|
|||||||
const userId = req.user.userId;
|
const userId = req.user.userId;
|
||||||
|
|
||||||
db.all(
|
db.all(
|
||||||
'SELECT date, status FROM calendar_marks WHERE user_id = ?',
|
'SELECT date, status, updated_at FROM calendar_marks WHERE user_id = ?',
|
||||||
[userId],
|
[userId],
|
||||||
(err, rows) => {
|
(err, rows) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
@@ -16,7 +16,10 @@ router.get('/', (req, res) => {
|
|||||||
|
|
||||||
const markedDates = {};
|
const markedDates = {};
|
||||||
rows.forEach((row) => {
|
rows.forEach((row) => {
|
||||||
markedDates[row.date] = row.status;
|
markedDates[row.date] = {
|
||||||
|
status: row.status,
|
||||||
|
updatedAt: row.updated_at
|
||||||
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
res.json({ success: true, markedDates });
|
res.json({ success: true, markedDates });
|
||||||
@@ -32,18 +35,54 @@ router.post('/', (req, res) => {
|
|||||||
return res.status(400).json({ success: false, error: '无效的数据格式' });
|
return res.status(400).json({ success: false, error: '无效的数据格式' });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Helper function to get current timestamp in ISO format (UTC)
|
||||||
|
const getLocalTimestamp = () => {
|
||||||
|
return new Date().toISOString();
|
||||||
|
};
|
||||||
|
|
||||||
const dbOperations = Object.entries(markedDates).map(([date, status]) => {
|
const dbOperations = Object.entries(markedDates).map(([date, status]) => {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
db.run(
|
// First check if this date exists and if status has changed
|
||||||
`INSERT INTO calendar_marks (user_id, date, status, updated_at)
|
db.get(
|
||||||
VALUES (?, ?, ?, CURRENT_TIMESTAMP)
|
'SELECT status FROM calendar_marks WHERE user_id = ? AND date = ?',
|
||||||
ON CONFLICT(user_id, date) DO UPDATE SET
|
[userId, date],
|
||||||
status = excluded.status,
|
(err, row) => {
|
||||||
updated_at = CURRENT_TIMESTAMP`,
|
if (err) {
|
||||||
[userId, date, status],
|
return reject(err);
|
||||||
(err) => {
|
}
|
||||||
if (err) reject(err);
|
|
||||||
else resolve();
|
// Only update timestamp if status changed or it's a new entry
|
||||||
|
const statusChanged = !row || row.status !== status;
|
||||||
|
|
||||||
|
if (statusChanged) {
|
||||||
|
// Status changed - update with new timestamp
|
||||||
|
const currentTimestamp = getLocalTimestamp();
|
||||||
|
db.run(
|
||||||
|
`INSERT INTO calendar_marks (user_id, date, status, updated_at)
|
||||||
|
VALUES (?, ?, ?, ?)
|
||||||
|
ON CONFLICT(user_id, date) DO UPDATE SET
|
||||||
|
status = excluded.status,
|
||||||
|
updated_at = excluded.updated_at`,
|
||||||
|
[userId, date, status, currentTimestamp],
|
||||||
|
(err) => {
|
||||||
|
if (err) reject(err);
|
||||||
|
else resolve();
|
||||||
|
}
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
// Status unchanged - keep existing timestamp
|
||||||
|
db.run(
|
||||||
|
`INSERT INTO calendar_marks (user_id, date, status, updated_at)
|
||||||
|
VALUES (?, ?, ?, (SELECT updated_at FROM calendar_marks WHERE user_id = ? AND date = ?))
|
||||||
|
ON CONFLICT(user_id, date) DO UPDATE SET
|
||||||
|
status = excluded.status`,
|
||||||
|
[userId, date, status, userId, date],
|
||||||
|
(err) => {
|
||||||
|
if (err) reject(err);
|
||||||
|
else resolve();
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user