feat(banner): 首页常驻滚动通知与管理配置及类型样式支持
This commit is contained in:
✨await committed
1 parent
772c551989
commit
a3b6761ba9
34 files changed
+3345
-10
No files matched your search
@@ -476,3 +476,326 @@ func normalizeAnnouncementInput(req CreateAnnouncementRequest) (string, string,
|
||||
}
|
||||
return title, content, req.Level, nil
|
||||
}
|
||||
|
||||
type CreateBannerAnnouncementRequest struct {
|
||||
Title string `json:"title"`
|
||||
// TitleRuns 是标题的样式分段；非空时 Title 由分段文本拼接得出，请求里的 Title 只作兼容兜底。
|
||||
TitleRuns []model.BannerTitleRun `json:"titleRuns"`
|
||||
// NoticeType 通知类型，决定通知条底色；空值按默认类型（公告）处理。
|
||||
// 图标素材（emoji）内嵌在 TitleRuns 的文本里，不单独存字段。
|
||||
NoticeType string `json:"noticeType"`
|
||||
Link string `json:"link"`
|
||||
Status string `json:"status"` // "active" | "disabled"
|
||||
StartsAt *time.Time `json:"startsAt"`
|
||||
EndsAt *time.Time `json:"endsAt"`
|
||||
}
|
||||
|
||||
type UpdateBannerAnnouncementRequest = CreateBannerAnnouncementRequest
|
||||
|
||||
type BannerAnnouncementPage struct {
|
||||
Banners []model.BannerAnnouncement `json:"banners"`
|
||||
Total int64 `json:"total"`
|
||||
Page int `json:"page"`
|
||||
Limit int `json:"pageSize"`
|
||||
}
|
||||
|
||||
func (s *Service) ActiveBannerAnnouncements() ([]model.BannerAnnouncement, error) {
|
||||
banners, err := s.repo.ActiveBannerAnnouncements(time.Now())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if banners == nil {
|
||||
banners = []model.BannerAnnouncement{}
|
||||
}
|
||||
return banners, nil
|
||||
}
|
||||
|
||||
func (s *Service) AdminBannerAnnouncementPage(actor *model.User, query AdminListQuery) (*BannerAnnouncementPage, error) {
|
||||
if err := s.RequireAdmin(actor); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
page, limit := normalizeAdminPage(query.Page, query.Limit)
|
||||
banners, total, err := s.repo.AdminBannerAnnouncements(query.Keyword, query.Status, limit, (page-1)*limit)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if banners == nil {
|
||||
banners = []model.BannerAnnouncement{}
|
||||
}
|
||||
return &BannerAnnouncementPage{Banners: banners, Total: total, Page: page, Limit: limit}, nil
|
||||
}
|
||||
|
||||
// 标题样式分段的边界：字号与字重只接受固定档位，字体与颜色进白名单，避免把任意 CSS 写进通知条。
|
||||
const (
|
||||
bannerTitleMinFontSize = 10
|
||||
bannerTitleMaxFontSize = 20
|
||||
bannerTitleMaxRuns = 60
|
||||
bannerTitleMaxTextRunes = 120
|
||||
)
|
||||
|
||||
var bannerTitleFontWeights = map[int]struct{}{400: {}, 500: {}, 600: {}, 700: {}}
|
||||
var bannerTitleFontFamilies = map[string]struct{}{"sans": {}, "serif": {}, "mono": {}}
|
||||
|
||||
// normalizeBannerTitle 统一处理标题与样式分段：分段非空时以分段文本为准，分段为空时回落到纯文本标题。
|
||||
func normalizeBannerTitle(title string, runs []model.BannerTitleRun) (string, []model.BannerTitleRun, error) {
|
||||
normalized, err := normalizeBannerTitleRuns(runs)
|
||||
if err != nil {
|
||||
return "", nil, err
|
||||
}
|
||||
if len(normalized) == 0 {
|
||||
plain := strings.TrimSpace(title)
|
||||
if plain == "" {
|
||||
return "", nil, BadAuthRequest("请填写通知标题")
|
||||
}
|
||||
if utf8.RuneCountInString(plain) > bannerTitleMaxTextRunes {
|
||||
return "", nil, BadAuthRequest("通知标题不能超过 120 个字符")
|
||||
}
|
||||
return plain, nil, nil
|
||||
}
|
||||
plain := strings.TrimSpace(bannerTitleRunsText(normalized))
|
||||
if plain == "" {
|
||||
return "", nil, BadAuthRequest("请填写通知标题")
|
||||
}
|
||||
if utf8.RuneCountInString(plain) > bannerTitleMaxTextRunes {
|
||||
return "", nil, BadAuthRequest("通知标题不能超过 120 个字符")
|
||||
}
|
||||
return plain, normalized, nil
|
||||
}
|
||||
|
||||
func normalizeBannerTitleRuns(runs []model.BannerTitleRun) ([]model.BannerTitleRun, error) {
|
||||
if len(runs) == 0 {
|
||||
return nil, nil
|
||||
}
|
||||
if len(runs) > bannerTitleMaxRuns {
|
||||
return nil, BadAuthRequest("通知标题样式片段过多")
|
||||
}
|
||||
normalized := make([]model.BannerTitleRun, 0, len(runs))
|
||||
for _, run := range runs {
|
||||
if run.FontSize != nil {
|
||||
value := *run.FontSize
|
||||
if value < bannerTitleMinFontSize || value > bannerTitleMaxFontSize {
|
||||
return nil, BadAuthRequest("标题字号需在 10 到 20 之间")
|
||||
}
|
||||
run.FontSize = &value
|
||||
}
|
||||
if run.FontWeight != nil {
|
||||
value := *run.FontWeight
|
||||
if _, ok := bannerTitleFontWeights[value]; !ok {
|
||||
return nil, BadAuthRequest("标题字重仅支持 400 / 500 / 600 / 700")
|
||||
}
|
||||
run.FontWeight = &value
|
||||
}
|
||||
family := strings.TrimSpace(run.FontFamily)
|
||||
if family != "" {
|
||||
if _, ok := bannerTitleFontFamilies[family]; !ok {
|
||||
return nil, BadAuthRequest("标题字体仅支持默认、衬线或等宽")
|
||||
}
|
||||
}
|
||||
run.FontFamily = family
|
||||
color := strings.ToUpper(strings.TrimSpace(run.Color))
|
||||
if color != "" && !isBannerTitleHexColor(color) {
|
||||
return nil, BadAuthRequest("标题颜色需为 #RRGGBB 格式")
|
||||
}
|
||||
run.Color = color
|
||||
if run.Text == "" {
|
||||
continue
|
||||
}
|
||||
normalized = append(normalized, run)
|
||||
}
|
||||
return mergeBannerTitleRuns(normalized), nil
|
||||
}
|
||||
|
||||
// mergeBannerTitleRuns 合并相邻的同样式分段，避免前端反复编辑后存下大量零碎片段。
|
||||
func mergeBannerTitleRuns(runs []model.BannerTitleRun) []model.BannerTitleRun {
|
||||
merged := make([]model.BannerTitleRun, 0, len(runs))
|
||||
for _, run := range runs {
|
||||
if len(merged) > 0 && sameBannerTitleRunStyle(merged[len(merged)-1], run) {
|
||||
merged[len(merged)-1].Text += run.Text
|
||||
continue
|
||||
}
|
||||
merged = append(merged, run)
|
||||
}
|
||||
return merged
|
||||
}
|
||||
|
||||
func sameBannerTitleRunStyle(left model.BannerTitleRun, right model.BannerTitleRun) bool {
|
||||
return equalIntPointer(left.FontSize, right.FontSize) &&
|
||||
equalIntPointer(left.FontWeight, right.FontWeight) &&
|
||||
left.FontFamily == right.FontFamily &&
|
||||
left.Color == right.Color
|
||||
}
|
||||
|
||||
func equalIntPointer(left *int, right *int) bool {
|
||||
if left == nil || right == nil {
|
||||
return left == nil && right == nil
|
||||
}
|
||||
return *left == *right
|
||||
}
|
||||
|
||||
func isBannerTitleHexColor(value string) bool {
|
||||
if len(value) != 7 || value[0] != '#' {
|
||||
return false
|
||||
}
|
||||
for _, char := range value[1:] {
|
||||
if (char >= '0' && char <= '9') || (char >= 'A' && char <= 'F') {
|
||||
continue
|
||||
}
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
func bannerTitleRunsText(runs []model.BannerTitleRun) string {
|
||||
var text strings.Builder
|
||||
for _, run := range runs {
|
||||
text.WriteString(run.Text)
|
||||
}
|
||||
return text.String()
|
||||
}
|
||||
|
||||
func normalizeBannerLink(link string) (string, error) {
|
||||
link = strings.TrimSpace(link)
|
||||
if link == "" {
|
||||
return "", nil
|
||||
}
|
||||
lower := strings.ToLower(link)
|
||||
if strings.HasPrefix(lower, "http://") || strings.HasPrefix(lower, "https://") {
|
||||
if utf8.RuneCountInString(link) > 500 {
|
||||
return "", BadAuthRequest("跳转链接不能超过 500 个字符")
|
||||
}
|
||||
return link, nil
|
||||
}
|
||||
if strings.HasPrefix(link, "/") {
|
||||
if utf8.RuneCountInString(link) > 500 {
|
||||
return "", BadAuthRequest("站内路径不能超过 500 个字符")
|
||||
}
|
||||
return link, nil
|
||||
}
|
||||
return "", BadAuthRequest("跳转链接仅支持 http(s) 外链或以 / 开头的站内路径")
|
||||
}
|
||||
|
||||
// 通知类型的取值白名单。
|
||||
//
|
||||
// 必须与前端 web/src/lib/announcements/banner-notice.ts 的 BANNER_NOTICE_TYPES 逐项一致：
|
||||
// 后端多一项会让前端的合法取值被拒，少一项会让前端选中的值被静默丢弃；
|
||||
// web/test/banner-notice.test.ts 会读本文件做双向校验。
|
||||
// 图标素材（emoji）是普通文本，随 TitleRuns 走，不需要单独白名单。
|
||||
var bannerNoticeTypes = map[string]struct{}{
|
||||
"notice": {}, "activity": {}, "update": {}, "warning": {},
|
||||
}
|
||||
|
||||
const bannerNoticeDefaultType = "notice"
|
||||
|
||||
// normalizeBannerNoticeType 把空值补成默认类型，其余值必须在白名单内，避免存进无法渲染的类型。
|
||||
func normalizeBannerNoticeType(value string) (string, error) {
|
||||
normalized := strings.ToLower(strings.TrimSpace(value))
|
||||
if normalized == "" {
|
||||
return bannerNoticeDefaultType, nil
|
||||
}
|
||||
if _, ok := bannerNoticeTypes[normalized]; !ok {
|
||||
return "", BadAuthRequest("通知类型无效，仅支持公告、活动、更新或警告")
|
||||
}
|
||||
return normalized, nil
|
||||
}
|
||||
|
||||
func (s *Service) CreateBannerAnnouncement(actor *model.User, req CreateBannerAnnouncementRequest) (*model.BannerAnnouncement, error) {
|
||||
if err := s.RequireAdmin(actor); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
title, titleRuns, err := normalizeBannerTitle(req.Title, req.TitleRuns)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
link, err := normalizeBannerLink(req.Link)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
noticeType, err := normalizeBannerNoticeType(req.NoticeType)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
status := strings.TrimSpace(req.Status)
|
||||
if status != "active" && status != "disabled" {
|
||||
return nil, BadAuthRequest("通知状态无效，仅支持 active 或 disabled")
|
||||
}
|
||||
if req.StartsAt != nil && req.EndsAt != nil && req.EndsAt.Before(*req.StartsAt) {
|
||||
return nil, BadAuthRequest("有效期结束时间不能早于开始时间")
|
||||
}
|
||||
now := time.Now()
|
||||
banner := &model.BannerAnnouncement{
|
||||
ID: newID(),
|
||||
Title: title,
|
||||
TitleRuns: titleRuns,
|
||||
NoticeType: noticeType,
|
||||
Link: link,
|
||||
Status: status,
|
||||
StartsAt: req.StartsAt,
|
||||
EndsAt: req.EndsAt,
|
||||
CreatedBy: actor.ID,
|
||||
CreatedAt: now,
|
||||
UpdatedAt: now,
|
||||
}
|
||||
if err := s.repo.CreateBannerAnnouncement(banner); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return banner, nil
|
||||
}
|
||||
|
||||
func (s *Service) UpdateBannerAnnouncement(actor *model.User, id string, req UpdateBannerAnnouncementRequest) (*model.BannerAnnouncement, error) {
|
||||
if err := s.RequireAdmin(actor); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
banner, err := s.repo.BannerAnnouncement(strings.TrimSpace(id))
|
||||
if err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return nil, BadAuthRequest("常驻通知不存在")
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
title, titleRuns, err := normalizeBannerTitle(req.Title, req.TitleRuns)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
link, err := normalizeBannerLink(req.Link)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
noticeType, err := normalizeBannerNoticeType(req.NoticeType)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
status := strings.TrimSpace(req.Status)
|
||||
if status != "active" && status != "disabled" {
|
||||
return nil, BadAuthRequest("通知状态无效，仅支持 active 或 disabled")
|
||||
}
|
||||
if req.StartsAt != nil && req.EndsAt != nil && req.EndsAt.Before(*req.StartsAt) {
|
||||
return nil, BadAuthRequest("有效期结束时间不能早于开始时间")
|
||||
}
|
||||
banner.Title = title
|
||||
banner.TitleRuns = titleRuns
|
||||
banner.NoticeType = noticeType
|
||||
banner.Link = link
|
||||
banner.Status = status
|
||||
banner.StartsAt = req.StartsAt
|
||||
banner.EndsAt = req.EndsAt
|
||||
banner.UpdatedAt = time.Now()
|
||||
|
||||
if err := s.repo.UpdateBannerAnnouncement(banner); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return banner, nil
|
||||
}
|
||||
|
||||
func (s *Service) DeleteBannerAnnouncement(actor *model.User, id string) error {
|
||||
if err := s.RequireAdmin(actor); err != nil {
|
||||
return err
|
||||
}
|
||||
_, err := s.repo.BannerAnnouncement(strings.TrimSpace(id))
|
||||
if err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return BadAuthRequest("常驻通知不存在")
|
||||
}
|
||||
return err
|
||||
}
|
||||
return s.repo.DeleteBannerAnnouncement(strings.TrimSpace(id))
|
||||
}
|
||||
Reference in new issue
Block a user