build / build-and-test (push) Successful in 3m38s
背景:v1.9.0 把界面迁到 Bootstrap 5 时保留了旧自研 CSS,v1.9.2 又叠加了一层 「墨绿渐变」覆盖层,形成三套令牌(--paper/--ink、prefers-color-scheme、 data-bs-theme)并存。系统偏好与 Cookie 不一致时,页面会出现半亮半暗、表单 标签/抽屉标题/订阅页签不可见、输入框变黑块等问题。 本次改动: - 样式加载顺序改为 bootstrap → app.css;删除旧纸墨令牌与 v1.9.2 覆盖层, app.css 重写为单一主题层(:root/[data-bs-theme=light] 与 [data-bs-theme=dark] 两套语义令牌)。组件只读 --app-*,解决 --ink-2 同时被当作「次级文字色」和 「卡片底色」的语义冲突。 - 主题只认 <html data-bs-theme>:服务端按 Cookie 直出;没有 Cookie 时由 <head> 内联脚本在首屏按系统偏好补齐,修好「跟随系统」并避免闪白。大屏同理。 - 修复 Bootstrap 覆盖自研设计的问题:正文 14px + 中文字体栈、22/16/14px 标题、 按钮/输入框/焦点环/卡片回到设计值;普通按钮新增 .btn-soft,不再变透明文字。 - 布局修复:客户/套餐表单的 .grid-2 不再塞 3 个字段;包详情页把筛选独立成 GET 表单(在搜索框回车不再误触批量开通);客户详情操作区与 meta 重排; 抽屉时钟改为固定 46px 并用它对齐抽屉头的 sticky 偏移;追加面板在抽屉里 两列月历、不再 1100px 竖排;手机端日历数字不再换行溢出,移动端表格隐藏 低优先级列,不再被裁切。 - 大屏:KPI/面板去掉 Bootstrap utility,统一由 screen.css 控制;TOP/今日待打 改为固定列宽 + grid-column 对齐;浅色主题的链接、热力、图例对比度补齐; 热力格不再整体降透明度;当日浮层可滚动并支持点击/键盘打开。 - 配色与可读性:普通文本对比度全部达标(截图 lint 由 65 处降到 0);日历 外月日期改为浅底深字,不再整格 opacity;archived 行改为中性底色而非降透明。 - 缓存:新增内嵌静态资源内容指纹 AssetVersion(12 位 sha256),所有 /static 链接带 ?v=;带指纹的响应 public, max-age=31536000, immutable,不带指纹的 回源 no-cache;HTML 继续 no-store。改样式重新编译即自动破缓存,不再依赖 手改版本号(仍保留 v1.10.0 作为产品版本)。 - 认证页重做:登录/初始化页改用 .auth 卡片(品牌、主题切换、绿色焦点环), 去掉 min-height:100vh 叠加 main padding 造成的 40px 纵向滚动。 - JS:修 toISOString 计算自然日差一天的时区 bug;主题切换读 data-bs-theme 并同步 aria-pressed;全选支持半选;大屏切主题同时更新 data-bs-theme; 提示条改为固定定位、淡出不再顶动页面。 - README 更新主题与缓存说明;版本号 1.9.5 → 1.10.0。 验证:gofmt / go vet / go test 全绿;1440、1100、390 三档,明暗两套,工作台/ 客户/套餐/订阅/设置/日志/大屏/登录全部截图走查,无横向溢出与控制台错误。
270 lines
14 KiB
HTML
270 lines
14 KiB
HTML
{{define "content"}}
|
||
<div class="cal-page">
|
||
<header class="cal-head">
|
||
<div class="cal-title">
|
||
<a class="btn btn-ghost btn-square" href="/calendar?y={{.D.PrevY}}&m={{.D.PrevM}}&{{.D.FilterQuery}}" aria-label="上个月">‹</a>
|
||
<h1>{{.D.Title}}</h1>
|
||
<a class="btn btn-ghost btn-square" href="/calendar?y={{.D.NextY}}&m={{.D.NextM}}&{{.D.FilterQuery}}" aria-label="下个月">›</a>
|
||
<a class="btn btn-soft btn-sm" href="/calendar?{{.D.FilterQuery}}">回到今天</a>
|
||
</div>
|
||
<div class="cal-stats">
|
||
<span><em>{{.D.MonthDue}}</em>本月到期</span>
|
||
<span><em>{{.D.MonthTasks}}</em>本月待打</span>
|
||
<span><em>{{.D.MonthDone}}</em>已完成</span>
|
||
{{if gt .D.MonthUrgent 0}}<span class="text-urgent"><em>{{.D.MonthUrgent}}</em>加急</span>{{end}}
|
||
<a class="btn btn-primary btn-sm" href="/customers/new">+ 新建客户</a>
|
||
</div>
|
||
</header>
|
||
|
||
{{if .D.HasTabs}}
|
||
<nav class="pkg-tabs">
|
||
{{range .D.Tabs}}
|
||
<a class="{{if .Active}}on{{end}}" style="--tab:{{.Color}}" href="{{.Href}}">
|
||
<i></i>{{.Name}}{{if gt .Count 0}}<em>{{.Count}}</em>{{end}}
|
||
</a>
|
||
{{end}}
|
||
</nav>
|
||
{{end}}
|
||
|
||
{{if .D.NoPackages}}
|
||
<div class="notice">还没有服务套餐,先去 <a href="/packages/new">新建套餐</a>,再给客户开通。</div>
|
||
{{else if .D.NoCustomers}}
|
||
<div class="notice">还没有客户,<a href="/customers/new">新建第一位客户</a>。</div>
|
||
{{end}}
|
||
|
||
<div class="cal-body">
|
||
<div class="cal-grid" role="grid">
|
||
<div class="cal-dow" role="row">
|
||
{{range .D.Weekdays}}<span>{{.}}</span>{{end}}
|
||
</div>
|
||
{{range .D.Weeks}}
|
||
<div class="cal-week" role="row">
|
||
{{range .}}
|
||
<a class="cal-cell heat-{{.Heat}}{{if not .InMonth}} out{{end}}{{if .IsToday}} today{{end}}{{if .IsSelected}} sel{{end}}{{if .IsWeekend}} weekend{{end}}{{if .DueCount}} has-due{{end}}"
|
||
href="/calendar?y={{$.D.Year}}&m={{$.D.Month}}&d={{.Date}}&{{$.D.FilterQuery}}" role="gridcell">
|
||
{{if .HasSeason}}<span class="season-band{{if .SeasonStart}} start{{end}}{{if .SeasonEnd}} end{{end}}" style="--sc:{{.SeasonColor}}" aria-hidden="true"></span>{{end}}
|
||
{{if .Strip}}<span class="asg-strip" aria-hidden="true">{{range .Strip}}<i style="background:{{.}}"></i>{{end}}</span>{{end}}
|
||
<div class="cell-top">
|
||
<span class="dnum">{{.Day}}</span>
|
||
<span class="cell-badges">
|
||
{{if gt .UrgentCnt 0}}<span class="urgent-dot" title="{{.UrgentCnt}} 项加急"></span>{{end}}
|
||
{{if .DueCount}}<span class="due-badge"><em>到期</em>{{.DueCount}}</span>{{end}}
|
||
</span>
|
||
</div>
|
||
{{if .TaskCount}}
|
||
<div class="cell-count">
|
||
<b>{{.DoneCount}}</b><span>/ {{.TaskCount}}</span>
|
||
</div>
|
||
{{end}}
|
||
</a>
|
||
{{end}}
|
||
</div>
|
||
{{end}}
|
||
</div>
|
||
|
||
<aside class="drawer">
|
||
<div class="drawer-clock">
|
||
<b data-clock>--:--:--</b>
|
||
<span>{{.D.TodayStr}}</span>
|
||
</div>
|
||
<header class="drawer-head">
|
||
<h2>{{.D.SelectedLabel}}</h2>
|
||
<div class="drawer-tags">
|
||
{{if .D.SelectedIsToday}}<span class="chip chip-active">今天</span>{{end}}
|
||
{{if .D.SelectedIsPast}}<span class="chip chip-closed">已过去</span>{{end}}
|
||
<span class="chip chip-plain">{{.D.TaskPending}} 待完成</span>
|
||
</div>
|
||
</header>
|
||
|
||
<section class="drawer-block">
|
||
<h3>当日待完成 <em>{{.D.TaskPending}}</em><span class="muted small">/ {{len .D.Tasks}} 单</span></h3>
|
||
<form class="quick-form" method="post" action="/checkins/quick">
|
||
<input type="hidden" name="date" value="{{.D.Selected}}">
|
||
<input type="hidden" name="pkg" value="{{.D.PkgID}}">
|
||
<input type="hidden" name="tag" value="{{.D.Tag}}">
|
||
<input type="hidden" name="back" value="{{.D.Back}}">
|
||
<input class="form-control form-control-sm" type="text" name="tail" placeholder="输入手机尾号,回车即可完成" maxlength="8" autocomplete="off" inputmode="numeric" aria-label="手机尾号快速完成">
|
||
<button class="btn btn-sm btn-primary" type="submit">完成</button>
|
||
<button type="button" class="btn btn-sm btn-ghost keypad-toggle" data-keypad-toggle title="切换触控/PC 模式" aria-label="切换触控/PC 模式">⌨</button>
|
||
</form>
|
||
<p class="muted small quick-hint">唯一匹配直接完成;同尾号多人 / 一单多服务会列出让你勾选。</p>
|
||
<div class="keypad" data-keypad role="group" aria-label="数字小键盘" hidden>
|
||
<button type="button" class="key" data-key="1">1</button>
|
||
<button type="button" class="key" data-key="2">2</button>
|
||
<button type="button" class="key" data-key="3">3</button>
|
||
<button type="button" class="key" data-key="4">4</button>
|
||
<button type="button" class="key" data-key="5">5</button>
|
||
<button type="button" class="key" data-key="6">6</button>
|
||
<button type="button" class="key" data-key="7">7</button>
|
||
<button type="button" class="key" data-key="8">8</button>
|
||
<button type="button" class="key" data-key="9">9</button>
|
||
<button type="button" class="key key-fn" data-key="back" aria-label="退格">⌫</button>
|
||
<button type="button" class="key" data-key="0">0</button>
|
||
<button type="button" class="key key-ok" data-key="ok" aria-label="确认完成">✓</button>
|
||
</div>
|
||
|
||
{{if .D.PickTail}}
|
||
<section class="picker">
|
||
<header class="picker-head">
|
||
<h4>尾号 {{.D.PickTail}} 的待完成项</h4>
|
||
<a class="btn btn-sm btn-ghost" href="{{.D.Back}}">收起</a>
|
||
</header>
|
||
{{if .D.PickRows}}
|
||
<form method="post" action="/checkins/batch">
|
||
<input type="hidden" name="date" value="{{.D.Selected}}">
|
||
<input type="hidden" name="back" value="{{.D.Back}}">
|
||
<ul class="pick-list">
|
||
{{range .D.PickRows}}
|
||
<li class="list-group-item px-0">
|
||
<label>
|
||
<input type="checkbox" name="sub_ids" value="{{.ID}}"{{if not .Done}}{{if not .Skipped}} checked{{end}}{{end}}>
|
||
<span class="ticket" style="--tag:{{.PackageColor}}"><b>{{.CustomerTail}}</b>{{.CustomerName}}</span>
|
||
<span class="pick-pkg">{{.PackageName}}</span>
|
||
<span class="pick-remain">{{.RemainShort}}</span>
|
||
{{if .Done}}<span class="chip chip-active">已完成</span>{{end}}
|
||
{{if .Skipped}}<span class="chip chip-paused">已跳过</span>{{end}}
|
||
</label>
|
||
</li>
|
||
{{end}}
|
||
</ul>
|
||
<div class="actions">
|
||
<button class="btn btn-primary btn-sm" type="submit">确认完成选中项</button>
|
||
<a class="btn btn-soft btn-sm" href="{{.D.Back}}">取消</a>
|
||
</div>
|
||
</form>
|
||
{{else}}
|
||
<p class="muted">{{.D.PickMsg}}</p>
|
||
{{end}}
|
||
</section>
|
||
{{end}}
|
||
|
||
{{if .D.Tasks}}
|
||
<ul class="list-group list-group-flush task-list">
|
||
{{range .D.Tasks}}
|
||
{{if or .Done .Skipped}}
|
||
<li class="list-group-item task task-done px-0" style="--asg:{{.AssigneeHex}}">
|
||
<details class="done-fold">
|
||
<summary>
|
||
<span class="ticket" style="--tag:{{.PackageColor}}"><b>{{.CustomerTail}}</b>{{.CustomerName}}</span>
|
||
<span class="pkg">{{.PackageName}}</span>
|
||
<span class="chip {{if .Done}}chip-active{{else}}chip-paused{{end}}">{{if .Done}}已完成{{else}}已跳过{{end}}</span>
|
||
{{if .Urgent}}<span class="tag-urgent">加急</span>{{end}}
|
||
<span class="fold-caret" aria-hidden="true"></span>
|
||
</summary>
|
||
<div class="done-detail">
|
||
<div class="task-meta">
|
||
<span class="asg{{if .AssigneeNone}} none{{end}}"><i style="background:{{.AssigneeHex}}"></i>{{.AssigneeLabel}}</span>
|
||
<span>{{.RemainText}}</span>
|
||
{{if .DueText}}<span class="due due-{{.Eval.Level}}">{{.DueText}}</span>{{end}}
|
||
</div>
|
||
{{if .Note}}<div class="task-note">{{.Note}}{{if .Operator}} · {{.Operator}}{{end}}</div>{{end}}
|
||
<div class="task-actions">
|
||
<form method="post" action="/checkins/{{.CheckinID}}/delete">
|
||
<input type="hidden" name="back" value="{{$.D.Back}}">
|
||
<button class="btn btn-sm btn-ghost" type="submit">撤销打卡</button>
|
||
</form>
|
||
<details class="more-actions">
|
||
<summary class="btn btn-sm btn-ghost" title="更多操作" aria-label="更多操作">⋯</summary>
|
||
<div class="more-menu">
|
||
<form method="post" action="/tasks/urgent">
|
||
<input type="hidden" name="sub_id" value="{{.ID}}">
|
||
<input type="hidden" name="date" value="{{$.D.Selected}}">
|
||
<input type="hidden" name="urgent" value="{{if .Urgent}}0{{else}}1{{end}}">
|
||
<input type="hidden" name="back" value="{{$.D.Back}}">
|
||
<button class="btn btn-sm {{if .Urgent}}btn-urgent{{else}}btn-ghost{{end}}" type="submit">{{if .Urgent}}取消加急{{else}}标记加急{{end}}</button>
|
||
</form>
|
||
<a class="btn btn-soft btn-sm" href="/calendar?y={{$.D.Year}}&m={{$.D.Month}}&d={{$.D.Selected}}&{{$.D.FilterQuery}}&extend={{.ID}}#extend">追加时长</a>
|
||
</div>
|
||
</details>
|
||
</div>
|
||
</div>
|
||
</details>
|
||
</li>
|
||
{{else}}
|
||
<li class="list-group-item task{{if .Urgent}} urgent{{end}} px-0" style="--asg:{{.AssigneeHex}}">
|
||
<div class="task-main">
|
||
<a class="task-title" href="/customers/{{.CustomerID}}">
|
||
<span class="ticket" style="--tag:{{.PackageColor}}"><b>{{.CustomerTail}}</b>{{.CustomerName}}</span>
|
||
<span class="pkg">{{.PackageName}}</span>
|
||
{{if .Urgent}}<span class="tag-urgent">加急</span>{{end}}
|
||
</a>
|
||
<div class="task-meta">
|
||
<span class="asg{{if .AssigneeNone}} none{{end}}"><i style="background:{{.AssigneeHex}}"></i>{{.AssigneeLabel}}</span>
|
||
<span>{{.RemainText}}</span>
|
||
{{if .DueText}}<span class="due due-{{.Eval.Level}}">{{.DueText}}</span>{{end}}
|
||
</div>
|
||
{{if .Note}}<div class="task-note">{{.Note}}{{if .Operator}} · {{.Operator}}{{end}}</div>{{end}}
|
||
</div>
|
||
<div class="task-actions">
|
||
<form method="post" action="/subscriptions/{{.ID}}/checkin">
|
||
<input type="hidden" name="date" value="{{$.D.Selected}}">
|
||
<input type="hidden" name="status" value="done">
|
||
<input type="hidden" name="back" value="{{$.D.Back}}">
|
||
<button class="btn btn-sm btn-primary">完成</button>
|
||
</form>
|
||
<details class="more-actions">
|
||
<summary class="btn btn-sm btn-ghost" title="更多操作" aria-label="更多操作">⋯</summary>
|
||
<div class="more-menu">
|
||
<form method="post" action="/subscriptions/{{.ID}}/checkin">
|
||
<input type="hidden" name="date" value="{{$.D.Selected}}">
|
||
<input type="hidden" name="status" value="skipped">
|
||
<input type="hidden" name="back" value="{{$.D.Back}}">
|
||
<button class="btn btn-sm btn-ghost" type="submit">跳过这次</button>
|
||
</form>
|
||
<form method="post" action="/tasks/urgent">
|
||
<input type="hidden" name="sub_id" value="{{.ID}}">
|
||
<input type="hidden" name="date" value="{{$.D.Selected}}">
|
||
<input type="hidden" name="urgent" value="{{if .Urgent}}0{{else}}1{{end}}">
|
||
<input type="hidden" name="back" value="{{$.D.Back}}">
|
||
<button class="btn btn-sm {{if .Urgent}}btn-urgent{{else}}btn-ghost{{end}}" type="submit">{{if .Urgent}}取消加急{{else}}标记加急{{end}}</button>
|
||
</form>
|
||
<a class="btn btn-soft btn-sm" href="/calendar?y={{$.D.Year}}&m={{$.D.Month}}&d={{$.D.Selected}}&{{$.D.FilterQuery}}&extend={{.ID}}#extend">追加时长</a>
|
||
</div>
|
||
</details>
|
||
</div>
|
||
</li>
|
||
{{end}}
|
||
{{end}}
|
||
</ul>
|
||
{{else}}<p class="muted">这天没有待打任务。</p>{{end}}
|
||
</section>
|
||
|
||
{{if .D.Extend}}{{template "extend-panel" .D.Extend}}{{end}}
|
||
|
||
<section class="drawer-block">
|
||
<h3>这天到期 <em>{{len .D.Due}}</em></h3>
|
||
{{if .D.Due}}
|
||
<ul class="list-group list-group-flush due-list">
|
||
{{range .D.Due}}
|
||
<li>
|
||
<a class="due-main" href="/customers/{{.CustomerID}}">
|
||
<span class="ticket" style="--tag:{{.PackageColor}}"><b>{{.CustomerTail}}</b>{{.CustomerName}}</span>
|
||
<span class="pkg">{{.PackageName}}</span>
|
||
<span class="rem">{{.RemainShort}}</span>
|
||
</a>
|
||
<a class="btn btn-soft btn-sm" href="/calendar?y={{$.D.Year}}&m={{$.D.Month}}&d={{$.D.Selected}}&{{$.D.FilterQuery}}&extend={{.ID}}#extend">追加</a>
|
||
</li>
|
||
{{end}}
|
||
</ul>
|
||
{{else}}<p class="muted">没有到期订阅。</p>{{end}}
|
||
</section>
|
||
|
||
<section class="drawer-block">
|
||
<h3>近 7 天到期</h3>
|
||
{{if .D.OtherDue}}
|
||
<ul class="mini-due">
|
||
{{range .D.OtherDue}}
|
||
<li>
|
||
<a href="/customers/{{.CustomerID}}"><span class="ticket" style="--tag:{{.PackageColor}}"><b>{{.CustomerTail}}</b>{{.CustomerName}}</span></a>
|
||
<span class="muted">{{.PackageName}}</span>
|
||
<span class="sm-date">{{.EndDate}}</span>
|
||
</li>
|
||
{{end}}
|
||
</ul>
|
||
{{else}}<p class="muted">7 天内没有其它到期。</p>{{end}}
|
||
</section>
|
||
</aside>
|
||
</div>
|
||
</div>
|
||
{{end}}
|