Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ae817fe8f9 | ||
|
|
9e296e59e6 | ||
|
|
3f1becd374 | ||
|
|
b5d7720e52 | ||
|
|
caec0196bb |
15
app.py
15
app.py
@@ -427,7 +427,20 @@ def api_calendar_sync_all():
|
||||
summary = (evt.get('summary') or '').strip()
|
||||
if not summary:
|
||||
continue
|
||||
text = f"【{evt['time']}】{summary}" if evt.get('time') else summary
|
||||
date_str = evt.get('date', '')
|
||||
if date_str:
|
||||
try:
|
||||
parts = date_str.split('-')
|
||||
date_label = f"{int(parts[1])}月{int(parts[2])}日"
|
||||
except:
|
||||
date_label = date_str
|
||||
else:
|
||||
date_label = ''
|
||||
time_str = evt.get('time', '')
|
||||
prefix = f"【{date_label} {time_str}】" if date_label and time_str else \
|
||||
(f"【{date_label}】" if date_label else \
|
||||
(f"【{time_str}】" if time_str else ''))
|
||||
text = f"{prefix}{summary}" if prefix else summary
|
||||
loc = evt.get('location', '')
|
||||
if loc:
|
||||
text += f" @{loc}"
|
||||
|
||||
@@ -458,10 +458,12 @@
|
||||
html += '<div class="sync-day">';
|
||||
html += '<div class="sync-day-header"><span>' + day.date + '</span></div>';
|
||||
day.events.forEach(function(e) {
|
||||
var timeStr = e.time ? ' (' + e.time + ')' : '';
|
||||
var timeStr = e.time ? e.time : '';
|
||||
var dateStr = e.date || '';
|
||||
html += '<div class="sync-event">' +
|
||||
'<span class="sync-event-icon">📌</span>' +
|
||||
'<span class="sync-event-text">' + esc(e.summary) + '<span class="sync-event-time">' + esc(timeStr) + '</span></span>' +
|
||||
'<span class="sync-event-text">' + esc(e.summary) + '</span>' +
|
||||
'<span class="sync-event-meta">' + esc(dateStr) + (timeStr ? ' ' + esc(timeStr) : '') + '</span>' +
|
||||
'</div>';
|
||||
});
|
||||
html += '</div>';
|
||||
|
||||
@@ -833,7 +833,6 @@ body {
|
||||
|
||||
/* 编辑模式下才显示的元素 */
|
||||
.edit-only { display: flex; }
|
||||
.btn-edit-toggle:not(#study-edit-toggle) { display: none; }
|
||||
|
||||
/* 默认隐藏删除按钮 */
|
||||
.btn-del { display: none; }
|
||||
@@ -1029,7 +1028,7 @@ body {
|
||||
gap: 5px;
|
||||
width: 100%;
|
||||
padding: 9px;
|
||||
margin-top: auto;
|
||||
margin-top: 12px;
|
||||
border: 1.5px dashed var(--primary);
|
||||
background: var(--primary-light);
|
||||
color: var(--primary);
|
||||
@@ -1461,7 +1460,7 @@ body {
|
||||
.sync-event + .sync-event { border-top: 1px solid var(--bg); }
|
||||
.sync-event-icon { flex-shrink: 0; }
|
||||
.sync-event-text { flex: 1; }
|
||||
.sync-event-time { font-size: 11px; color: var(--text-muted); margin-left: 6px; }
|
||||
.sync-event-meta { font-size: 11px; color: var(--text-muted); }
|
||||
.sync-modal-footer {
|
||||
padding: 12px 20px;
|
||||
border-top: 1px solid var(--border);
|
||||
@@ -1800,3 +1799,7 @@ body {
|
||||
#panel-daily.editing-study .study-card-del:hover { background:var(--danger); color:#FFF; }
|
||||
.edit-only-study { display: none; }
|
||||
#panel-daily.editing-study .edit-only-study { display: flex; }
|
||||
|
||||
/* 编辑模式下显示删除按钮 */
|
||||
.btn-del { display: none; }
|
||||
.card.editing .btn-del { display: inline-flex; }
|
||||
|
||||
Reference in New Issue
Block a user