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 三档,明暗两套,工作台/ 客户/套餐/订阅/设置/日志/大屏/登录全部截图走查,无横向溢出与控制台错误。
303 lines
7.6 KiB
Go
303 lines
7.6 KiB
Go
package web
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
"net/url"
|
|
"strings"
|
|
|
|
"daili/internal/domain"
|
|
"daili/internal/store"
|
|
)
|
|
|
|
type screenDay struct {
|
|
Date string
|
|
Day int
|
|
InMonth bool
|
|
IsToday bool
|
|
IsPast bool
|
|
Count int
|
|
Done int
|
|
Urgent int
|
|
Heat int
|
|
// Strip 打手色竖条(去重)
|
|
Strip []string
|
|
}
|
|
|
|
type screenTask struct {
|
|
TaskRow
|
|
}
|
|
|
|
type screenData struct {
|
|
Stats *store.Stats
|
|
MonthTitle string
|
|
Year, Month int
|
|
Weeks [][]screenDay
|
|
Weekdays []string
|
|
Top []SubView
|
|
DueToday []SubView
|
|
TodayList []screenTask
|
|
Recent []store.Adjustment
|
|
TodayTasks int
|
|
TodayDone int
|
|
TodayUrgent int
|
|
Refresh int
|
|
Version string
|
|
AssetVersion string
|
|
|
|
HeatMode string // task = 每日待完成;due = 到期
|
|
Tag string
|
|
HeatTotal int
|
|
Tabs []PkgTab
|
|
PkgID int64
|
|
HasTabs bool
|
|
FilterQuery string
|
|
Theme string
|
|
}
|
|
|
|
// screenCalSubs 读取大屏日历区间内的订阅,并带上暂停/打卡/加急。
|
|
func (s *Server) screenCalSubs(from, to string, pkgID int64, tag string) ([]calSub, map[int64]map[string]store.Checkin, map[int64]map[string]bool, error) {
|
|
subs, pauses, checkins, urgent, err := s.loadCalendarSubs(from, to, pkgID, tag)
|
|
if err != nil {
|
|
return nil, nil, nil, err
|
|
}
|
|
today := domain.Today()
|
|
warn := s.warnDays()
|
|
list := make([]calSub, 0, len(subs))
|
|
for _, sub := range subs {
|
|
cs := calSub{sub: sub, pauses: pauses[sub.ID], eval: sub.Eval(today, warn)}
|
|
if sub.EndDate != "" {
|
|
cs.hasEnd = true
|
|
cs.end = domain.ParseDateOr(sub.EndDate, today)
|
|
}
|
|
list = append(list, cs)
|
|
}
|
|
return list, checkins, urgent, nil
|
|
}
|
|
|
|
func (s *Server) handleScreen(w http.ResponseWriter, r *http.Request) {
|
|
today := domain.Today()
|
|
warn := s.warnDays()
|
|
pkgID := int64(s.queryInt(r, "pkg", 0))
|
|
tag := strings.TrimSpace(r.URL.Query().Get("tag"))
|
|
heatMode := r.URL.Query().Get("heat")
|
|
if heatMode != "due" {
|
|
heatMode = "task"
|
|
}
|
|
|
|
stats, err := s.db.ScreenStats(today, warn)
|
|
if err != nil {
|
|
http.Error(w, "读取大屏数据失败", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
data := &screenData{
|
|
Stats: stats,
|
|
MonthTitle: fmt.Sprintf("%d 年 %d 月", today.Year(), int(today.Month())),
|
|
Year: today.Year(),
|
|
Month: int(today.Month()),
|
|
Weekdays: []string{"一", "二", "三", "四", "五", "六", "日"},
|
|
Top: subViews(stats.Top, today, warn),
|
|
Refresh: s.screenRefresh(),
|
|
Version: s.cfg.Version,
|
|
AssetVersion: s.assetVersion,
|
|
HeatMode: heatMode,
|
|
PkgID: pkgID,
|
|
Tag: tag,
|
|
FilterQuery: "pkg=" + itoa(pkgID),
|
|
}
|
|
|
|
// 今日到期(可按套餐过滤)
|
|
dueToday := []store.Subscription{}
|
|
for _, sub := range stats.DueTodaySubs {
|
|
if pkgID > 0 && sub.PackageID != pkgID {
|
|
continue
|
|
}
|
|
dueToday = append(dueToday, sub)
|
|
}
|
|
data.DueToday = subViews(dueToday, today, warn)
|
|
|
|
// 本月热力:默认统计“每日待完成的单子”,可切换到“到期”
|
|
monthStart := domain.MonthStart(today.Year(), today.Month())
|
|
monthEnd := domain.MonthEnd(today.Year(), today.Month())
|
|
gridStart := domain.AddDays(monthStart, -domain.WeekdayIndex(monthStart))
|
|
weeks := (domain.WeekdayIndex(monthStart) + monthEnd.Day() + 6) / 7
|
|
gridEnd := domain.AddDays(gridStart, weeks*7-1)
|
|
|
|
list, checkins, urgent, err := s.screenCalSubs(domain.Date(gridStart), domain.Date(gridEnd), pkgID, tag)
|
|
if err != nil {
|
|
http.Error(w, "读取大屏日历失败", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
|
|
for wi := 0; wi < weeks; wi++ {
|
|
week := make([]screenDay, 0, 7)
|
|
for di := 0; di < 7; di++ {
|
|
d := domain.AddDays(gridStart, wi*7+di)
|
|
ds := domain.Date(d)
|
|
count, doneN, urgentN := 0, 0, 0
|
|
strip := []string{}
|
|
seenColor := map[string]bool{}
|
|
for _, cs := range list {
|
|
if heatMode == "due" {
|
|
if cs.sub.EndDate == ds {
|
|
count++
|
|
}
|
|
continue
|
|
}
|
|
if !cs.covers(ds) {
|
|
continue
|
|
}
|
|
ci, has := checkins[cs.sub.ID][ds]
|
|
if has && (ci.Status == "done" || ci.Status == "skipped") {
|
|
doneN++
|
|
continue // “待完成”热力只统计还没处理的
|
|
}
|
|
count++
|
|
if urgent[cs.sub.ID][ds] {
|
|
urgentN++
|
|
}
|
|
color := cs.sub.AssigneeColor
|
|
if color == "" {
|
|
color = "#8A8F98"
|
|
}
|
|
if !seenColor[color] {
|
|
seenColor[color] = true
|
|
strip = append(strip, color)
|
|
}
|
|
}
|
|
if d.Month() == today.Month() {
|
|
data.HeatTotal += count
|
|
}
|
|
week = append(week, screenDay{
|
|
Date: ds,
|
|
Day: d.Day(),
|
|
InMonth: d.Month() == today.Month(),
|
|
IsToday: ds == domain.Date(today),
|
|
IsPast: d.Before(today),
|
|
Count: count + doneN,
|
|
Done: doneN,
|
|
Urgent: urgentN,
|
|
Heat: heatLevel(count),
|
|
Strip: strip,
|
|
})
|
|
}
|
|
data.Weeks = append(data.Weeks, week)
|
|
}
|
|
|
|
// 今日待打(加急置顶)
|
|
rows, err := s.pendingTasks(domain.Date(today), nil, pkgID, tag)
|
|
if err == nil {
|
|
for _, row := range rows {
|
|
if row.Done || row.Skipped {
|
|
continue
|
|
}
|
|
data.TodayList = append(data.TodayList, screenTask{TaskRow: row})
|
|
if row.Urgent {
|
|
data.TodayUrgent++
|
|
}
|
|
}
|
|
}
|
|
data.TodayTasks = len(data.TodayList)
|
|
for _, row := range rows {
|
|
if row.Done {
|
|
data.TodayDone++
|
|
}
|
|
}
|
|
|
|
// 最近追加(底部细条)
|
|
if adj, err := s.db.RecentAdjustments(6); err == nil {
|
|
data.Recent = adj
|
|
}
|
|
|
|
// 页签:按标签合并 + 独立显示另开
|
|
pkgs, _ := s.db.ListPackages(true)
|
|
data.Tabs, data.HasTabs = buildCalendarTabs(pkgs, nil, 0)
|
|
for i := range data.Tabs {
|
|
t := &data.Tabs[i]
|
|
href := "/screen?heat=" + heatMode
|
|
if t.Tag != "" {
|
|
href += "&tag=" + url.QueryEscape(t.Tag)
|
|
t.Active = t.Tag == tag
|
|
} else if t.ID > 0 {
|
|
href += "&pkg=" + itoa(t.ID)
|
|
t.Active = t.ID == pkgID
|
|
} else {
|
|
t.Active = tag == "" && pkgID == 0
|
|
}
|
|
t.Href = href
|
|
}
|
|
|
|
if tag != "" {
|
|
data.FilterQuery = "tag=" + url.QueryEscape(tag)
|
|
}
|
|
data.Theme = themeFromRequest(r)
|
|
p := s.newPage(r, "大屏", "screen")
|
|
p.Theme = data.Theme
|
|
p.D = data
|
|
s.render(w, r, "screen", p)
|
|
}
|
|
|
|
// handleScreenDay 返回某天的待办明细,供大屏悬停浮层使用。
|
|
func (s *Server) handleScreenDay(w http.ResponseWriter, r *http.Request) {
|
|
date := r.URL.Query().Get("date")
|
|
if _, err := domain.ParseDate(date); err != nil {
|
|
http.Error(w, "日期不正确", http.StatusBadRequest)
|
|
return
|
|
}
|
|
pkgID := int64(s.queryInt(r, "pkg", 0))
|
|
rows, err := s.pendingTasks(date, nil, pkgID, strings.TrimSpace(r.URL.Query().Get("tag")))
|
|
if err != nil {
|
|
http.Error(w, "读取失败", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
type item struct {
|
|
Tail string `json:"tail"`
|
|
Name string `json:"name"`
|
|
Pkg string `json:"pkg"`
|
|
Color string `json:"color"`
|
|
Remain string `json:"remain"`
|
|
Urgent bool `json:"urgent"`
|
|
Done bool `json:"done"`
|
|
Who string `json:"who"`
|
|
WhoCol string `json:"who_color"`
|
|
}
|
|
out := struct {
|
|
Date string `json:"date"`
|
|
Total int `json:"total"`
|
|
Done int `json:"done"`
|
|
Urgent int `json:"urgent"`
|
|
More int `json:"more"`
|
|
Items []item `json:"items"`
|
|
}{Date: date}
|
|
|
|
const limit = 60
|
|
for _, row := range rows {
|
|
out.Total++
|
|
if row.Done || row.Skipped {
|
|
out.Done++
|
|
}
|
|
if row.Urgent {
|
|
out.Urgent++
|
|
}
|
|
if len(out.Items) >= limit {
|
|
out.More++
|
|
continue
|
|
}
|
|
out.Items = append(out.Items, item{
|
|
Tail: row.CustomerTail,
|
|
Name: row.CustomerName,
|
|
Pkg: row.PackageName,
|
|
Color: row.PackageColor,
|
|
Remain: row.RemainText,
|
|
Urgent: row.Urgent,
|
|
Done: row.Done || row.Skipped,
|
|
Who: row.AssigneeLabel(),
|
|
WhoCol: row.AssigneeHex(),
|
|
})
|
|
}
|
|
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
|
w.Header().Set("Cache-Control", "no-store")
|
|
_ = json.NewEncoder(w).Encode(out)
|
|
}
|