4 Commits
v2.1.3 ... main

3 changed files with 158 additions and 33 deletions

View File

@@ -177,21 +177,35 @@
} }
var todayWk = fmtWeek(new Date()); var todayWk = fmtWeek(new Date());
var today = new Date();
var wHtml = ''; var wHtml = '';
for (var i2 = 0; i2 < weeks.length; i2++) { for (var i2 = 0; i2 < weeks.length; i2++) {
var w = weeks[i2]; var w = weeks[i2];
var cls = 'cal-week-cell'; var cls = 'cal-week-row';
var status = calendarStatus[w]; var status = calendarStatus[w];
if (status) cls += ' ' + status;
if (w === todayWk) cls += ' today'; if (w === todayWk) cls += ' today';
if (w === selectedWeek) cls += ' selected'; if (w === selectedWeek) cls += ' selected';
wHtml += '<div class="' + cls + '" data-week="' + w + '" title="' + w + '">' + // 计算日期范围
'第' + w.split('-W')[1].replace(/^0/, '') + '周</div>'; var monday = new Date(calYear, calMonth, 1);
while (fmtWeek(monday) !== w) monday.setDate(monday.getDate() + 7);
var sunday = new Date(monday);
sunday.setDate(sunday.getDate() + 6);
var dateRange = (monday.getMonth()+1) + '.' + monday.getDate() + ' - ' + sunday.getDate();
var statusIcon = status === 'pass' ? '✓' : (status === 'fail' ? '✗' : '○');
var statusLabel = status === 'pass' ? '达标' : (status === 'fail' ? '未达标' : '未打卡');
wHtml += '<div class="' + cls + '" data-week="' + w + '">' +
'<span class="cal-wk-status ' + (status || 'empty') + '">' + statusIcon + '</span>' +
'<div class="cal-wk-info">' +
'<span class="cal-wk-label">第' + w.split('-W')[1].replace(/^0/, '') + '周</span>' +
'<span class="cal-wk-date">' + dateRange + '</span>' +
'</div>' +
'<span class="cal-wk-badge">' + statusLabel + '</span>' +
'</div>';
} }
var we = document.getElementById('cal-weeks'); var we = document.getElementById('cal-weeks');
we.innerHTML = wHtml; we.innerHTML = wHtml;
we.querySelectorAll('.cal-week-cell').forEach(function(cell) { we.querySelectorAll('.cal-week-row').forEach(function(row) {
cell.addEventListener('click', function() { row.addEventListener('click', function() {
var wk = this.dataset.week; var wk = this.dataset.week;
if (wk) navigateToWeek(wk); if (wk) navigateToWeek(wk);
}); });
@@ -469,6 +483,17 @@
if (card) card.classList.add('active'); if (card) card.classList.add('active');
}; };
/* 头像菜单 */
window.toggleUserMenu = function(e) {
e.stopPropagation();
var dd = document.getElementById('user-dropdown');
if (dd) dd.style.display = dd.style.display === 'none' ? 'block' : 'none';
};
document.addEventListener('click', function() {
var dd = document.getElementById('user-dropdown');
if (dd) dd.style.display = 'none';
});
/* ================================================================ /* ================================================================
Load & Auto Save Checkin Load & Auto Save Checkin
================================================================ */ ================================================================ */

View File

@@ -71,6 +71,41 @@ body {
gap: 8px; gap: 8px;
padding: 24px 12px 16px; padding: 24px 12px 16px;
position: relative; position: relative;
cursor: pointer;
}
.sidebar-user .user-avatar {
transition: transform 0.15s;
}
.sidebar-user:hover .user-avatar { transform: scale(1.05); }
.user-dropdown {
position: absolute;
top: 100%;
left: 50%;
transform: translateX(-50%);
background: var(--card);
border: 1px solid var(--border);
border-radius: var(--radius-sm);
box-shadow: var(--shadow-hover);
z-index: 100;
min-width: 120px;
padding: 4px;
}
.user-dropdown-item {
display: flex;
align-items: center;
gap: 8px;
padding: 8px 12px;
font-size: 13px;
color: var(--text-dim);
text-decoration: none;
border-radius: 6px;
transition: all 0.15s;
}
.user-dropdown-item:hover {
background: var(--danger-light);
color: var(--danger);
} }
.sidebar-user .user-name { .sidebar-user .user-name {
@@ -174,6 +209,45 @@ body {
font-weight: 400; font-weight: 400;
} }
/* ═══════════════════════════════════════════
Sidebar Dark Theme左侧导航栏专属
═══════════════════════════════════════════ */
.sidebar {
background: linear-gradient(180deg, #1E293B 0%, #0F172A 100%);
border-right: 1px solid #334155;
}
.sidebar .user-name {
color: #94A3B8;
}
.sidebar .user-avatar {
background: #4F46E5;
color: #FFF;
}
.sidebar .btn-logout-icon {
color: #64748B;
}
.sidebar .btn-logout-icon:hover {
background: rgba(248,113,113,0.15);
color: #FCA5A5;
}
.sidebar .nav-item {
color: #94A3B8;
}
.sidebar .nav-item:hover {
background: rgba(99,102,241,0.08);
color: #E2E8F0;
}
.sidebar .nav-item .icon-md {
color: #6366F1;
}
.sidebar .nav-item:hover .icon-md { color: #818CF8; }
.sidebar .nav-item.active {
background: rgba(99,102,241,0.15);
color: #FFF;
border: 1px solid rgba(99,102,241,0.3);
}
.sidebar .nav-item.active .icon-md { color: #818CF8; }
/* ═══════════════════════════════════════════ /* ═══════════════════════════════════════════
Calendar Widget Calendar Widget
═══════════════════════════════════════════ */ ═══════════════════════════════════════════ */
@@ -218,36 +292,60 @@ body {
color: var(--text); color: var(--text);
} }
/* 周选择 */ /* 周列表行 */
.cal-weeks { .cal-week-rows {
display: grid; display: flex;
grid-template-columns: repeat(2, 1fr); flex-direction: column;
gap: 8px; gap: 6px;
padding: 8px 14px 10px; padding: 8px 14px 10px;
} }
.cal-week-cell { .cal-week-row {
height: 42px; display: flex;
align-items: center;
gap: 10px;
padding: 8px 10px;
border: 0.5px solid var(--border);
border-radius: 8px;
background: var(--card);
cursor: pointer;
transition: all 0.15s;
}
.cal-week-row:hover { border-color: var(--primary); }
.cal-week-row.today { border-color: var(--primary); }
.cal-week-row.selected { background: var(--primary); color: #FFF; border-color: transparent; }
.cal-week-row.selected .cal-wk-label,
.cal-week-row.selected .cal-wk-date,
.cal-week-row.selected .cal-wk-badge { color: #FFF; }
.cal-week-row.selected .cal-wk-status { background: rgba(255,255,255,0.2); color: #FFF; }
.cal-wk-status {
width: 28px;
height: 28px;
border-radius: 50%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font-size: 13px; font-size: 12px;
font-weight: 600; font-weight: 600;
border-radius: 8px; flex-shrink: 0;
color: var(--text-dim);
cursor: pointer;
transition: all 0.15s;
border: 1.5px solid var(--border);
background: var(--card);
} }
.cal-week-cell:hover { border-color: var(--primary); color: var(--primary); } .cal-wk-status.pass { background: var(--success-light); color: var(--success); }
.cal-week-cell.pass { background: var(--success-light); border-color: var(--success); color: var(--success); } .cal-wk-status.fail { background: var(--danger-light); color: var(--danger); }
.cal-week-cell.fail { background: var(--danger-light); border-color: var(--danger); color: var(--danger); } .cal-wk-status.empty { background: var(--bg); color: var(--text-muted); }
.cal-week-cell.today { border-color: var(--primary); box-shadow: 0 0 0 2px var(--primary-light); }
.cal-week-cell.selected { background: var(--primary); color: #FFF; border-color: var(--primary); }
/* 旧样式清理 */ .cal-wk-info {
.cal-week-list { display: none; } flex: 1;
.cal-week-cell .wk-num, .cal-week-cell .wk-dot { display: none; } display: flex;
flex-direction: column;
gap: 1px;
}
.cal-wk-label { font-size: 12px; font-weight: 600; color: var(--text); }
.cal-wk-date { font-size: 10px; color: var(--text-muted); }
.cal-wk-badge { font-size: 10px; color: var(--text-muted); }
/* 旧样式隐藏 */
.cal-weeks { display: none; }
.cal-week-cell { display: none; }
.cal-header { .cal-header {
display: flex; display: flex;

View File

@@ -40,13 +40,15 @@
<aside class="sidebar"> <aside class="sidebar">
<!-- 用户信息 --> <!-- 用户信息 -->
<div class="sidebar-user"> <div class="sidebar-user" id="sidebar-user-menu" onclick="toggleUserMenu(event)">
<div class="user-avatar">{{ username[0] }}</div> <div class="user-avatar">{{ username[0] }}</div>
<span class="user-name">{{ username }}</span> <span class="user-name">{{ username }}</span>
<a href="/logout" class="btn-logout-icon" title="退出登录" onclick="return confirm('确定退出登录?')"> <div class="user-dropdown" id="user-dropdown" style="display:none">
<svg class="icon-sm"><use href="#icon-logout"/></svg> <a class="user-dropdown-item" href="/logout" onclick="return confirm('确定退出登录?')">
<svg class="icon-sm"><use href="#icon-logout"/></svg> 退出登录
</a> </a>
</div> </div>
</div>
<!-- 功能入口 --> <!-- 功能入口 -->
<nav class="sidebar-nav"> <nav class="sidebar-nav">
@@ -123,7 +125,7 @@
<svg class="icon-sm"><use href="#icon-chevron-right"/></svg> <svg class="icon-sm"><use href="#icon-chevron-right"/></svg>
</button> </button>
</div> </div>
<div class="cal-weeks" id="cal-weeks"></div> <div class="cal-week-rows" id="cal-weeks"></div>
</div> </div>
</div> </div>
<!-- 右侧Tab + 内容 --> <!-- 右侧Tab + 内容 -->