feat(about): 块式页面构建器——九类区块 + 三级回落零回归（5g T1/T2）

- schema：siteAbout 增 layout{showIdCard} + blocks（z.discriminatedUnion 九类：prose/tracks/cards/timeline/quote/figure/linklist/cta/divider，图片字段走 Astro image()）；对未知块型用 z.union([knownUnion, z.looseObject({type})]) 复合——已知块严格校验，未知块落宽松分支再由访问器 WARN+丢弃（容错与严格校验的张力取舍） - page-blocks.ts：enabled:false 过滤、未知 type WARN+skip、pickBi 回落 zh 并 WARN、上限（块≤24/单块文本≤4000，超限截断并 WARN） - BlockRenderer 统一外壳 `<section class="blk" data-block={type}>`（E2E 抓手）+ 九个块组件（样式自 AboutPage 原 <style> 搬迁，只吃既有 token） - AboutPage 三级回落：blocks → intro markdown → 内置默认；legacy tracks/build 段整体挪入回退分支（文案逐字一致，零回归） - 图标白名单 src/lib/icons.ts（12 键，未登记回退首字占位） - 后台 about 单例四段结构（blocks/layout/intro/typography），块为 list+types+typeKey，每块带「显示」开关与中文标签协调报备：车道修了一处跨车道插入事故（T3 把 typography 插进了 intro 的 widget 内导致字段错位），重写为四段正确结构；并发构建擦 dist 的假失败改用「build→快照 dist→快照起服务跑 E2E」规避（37/37 稳定）验证: 构建 48 页 exit 0；E2E 37/37（快照口径）；九类块顺序与配置一致、 figure 走 /_astro/*.webp 管线、未知块与外链图被拦并 WARN、终版 3 块零回归、en 同构、admin about 四段字段齐全 Spec: 2026-11-02_blog-5g-pages (T1/T2) Co-authored-by: GLM-5.3
2026-11-02 18:21:33 +08:00
1 parent 6096a9dafe
commit 2f7cbcf7bd
@@ -119,6 +119,23 @@ collections:
        fields:
          - label: 身份语
            name: tagline
+          - label: 页面排版覆盖（可选）
+            name: typography
+            widget: object
+            required: false
+            hint: 本页正文默认字体 / 强调色 / 字号缩放（0.8–1.25）；不填用全站默认，只影响本页
+            fields:
+              - label: 正文字体类
+                name: font
+                widget: select
+                required: false
+                options: [font-serif, font-kai, font-sans, font-mono, font-song, font-kai-sys, font-hei-sys, font-fangsong, font-huiwen, font-kuaile]
+              - label: 强调色类
+                name: accent
+                widget: select
+                required: false
+                options: [ink-accent, ink-accent-soft, c-blue, c-blue-soft, c-teal, c-teal-soft, c-green, c-green-soft, c-yellow, c-yellow-soft, c-orange, c-orange-soft, c-red, c-red-soft, c-pink, c-pink-soft, c-purple, c-purple-soft]
+              - { label: 字号缩放, name: scale, widget: number, required: false, value_type: float, min: 0.8, max: 1.25, step: 0.05 }
            widget: object
            fields:
              - { label: 中文, name: zh, widget: string, required: false }
@@ -183,20 +200,294 @@ collections:
      - name: about
        label: 关于页
        file: content/site/about.yaml
+        # 块内图片上传落 content/site/assets/，yaml 写 ./assets/xxx（Astro 图片管线）
+        media_folder: content/site/assets
+        public_folder: ./assets
        fields:
-          - label: 正文（markdown，多段）
+          - label: 页面块（拖拽排序；每块可折叠）
+            name: blocks
+            widget: list
+            typeKey: type
+            required: false
+            summary: '{{fields.type}}'
+            hint: '点「+ 添加」选块型。关掉某块用该块内的「显示」开关'
+            types:
+              - label: 正文（markdown）
+                name: prose
+                widget: object
+                fields:
+                  - { label: 显示, name: enabled, widget: boolean, required: false, default: true }
+                  - label: 小标题（可选）
+                    name: title
+                    widget: object
+                    required: false
+                    fields:
+                      - { label: 中文, name: zh, widget: string, required: false }
+                      - { label: 英文, name: en, widget: string, required: false }
+                  - label: 正文（markdown）
+                    name: body
+                    widget: object
+                    fields:
+                      - { label: 中文, name: zh, widget: markdown, required: false }
+                      - { label: 英文, name: en, widget: markdown, required: false }
+                  - label: 宽度
+                    name: width
+                    widget: select
+                    required: false
+                    default: narrow
+                    options: [{ label: 版心宽度, value: narrow }, { label: 通栏, value: full }]
+              - label: 版图（图标+名称+描述）
+                name: tracks
+                widget: object
+                fields:
+                  - { label: 显示, name: enabled, widget: boolean, required: false, default: true }
+                  - label: 标题
+                    name: title
+                    widget: object
+                    fields:
+                      - { label: 中文, name: zh, widget: string, required: false }
+                      - { label: 英文, name: en, widget: string, required: false }
+                  - label: 条目
+                    name: items
+                    widget: list
+                    summary: '{{fields.name.zh}}'
+                    fields:
+                      - label: 图标
+                        name: icon
+                        widget: select
+                        required: false
+                        options: [book, terminal, camera, code, git, rss, email, github, bilibili, x, star, link]
+                        hint: 白名单外或留空 → 显示首字占位
+                      - label: 名称
+                        name: name
+                        widget: object
+                        fields:
+                          - { label: 中文, name: zh, widget: string, required: false }
+                          - { label: 英文, name: en, widget: string, required: false }
+                      - label: 描述
+                        name: desc
+                        widget: object
+                        required: false
+                        fields:
+                          - { label: 中文, name: zh, widget: text, required: false }
+                          - { label: 英文, name: en, widget: text, required: false }
+              - label: 卡片（2/3 列）
+                name: cards
+                widget: object
+                fields:
+                  - { label: 显示, name: enabled, widget: boolean, required: false, default: true }
+                  - label: 标题（可选）
+                    name: title
+                    widget: object
+                    required: false
+                    fields:
+                      - { label: 中文, name: zh, widget: string, required: false }
+                      - { label: 英文, name: en, widget: string, required: false }
+                  - { label: 列数, name: columns, widget: number, required: false, default: 3, min: 2, max: 3, value_type: int }
+                  - label: 卡片条目
+                    name: items
+                    widget: list
+                    summary: '{{fields.title.zh}}'
+                    fields:
+                      - label: 标题
+                        name: title
+                        widget: object
+                        fields:
+                          - { label: 中文, name: zh, widget: string, required: false }
+                          - { label: 英文, name: en, widget: string, required: false }
+                      - label: 描述
+                        name: desc
+                        widget: object
+                        required: false
+                        fields:
+                          - { label: 中文, name: zh, widget: text, required: false }
+                          - { label: 英文, name: en, widget: text, required: false }
+                      - { label: 链接（可选）, name: href, widget: string, required: false }
+                      - label: 角标（可选）
+                        name: tag
+                        widget: object
+                        required: false
+                        fields:
+                          - { label: 中文, name: zh, widget: string, required: false }
+                          - { label: 英文, name: en, widget: string, required: false }
+              - label: 时间线
+                name: timeline
+                widget: object
+                fields:
+                  - { label: 显示, name: enabled, widget: boolean, required: false, default: true }
+                  - label: 标题（可选）
+                    name: title
+                    widget: object
+                    required: false
+                    fields:
+                      - { label: 中文, name: zh, widget: string, required: false }
+                      - { label: 英文, name: en, widget: string, required: false }
+                  - label: 条目
+                    name: items
+                    widget: list
+                    summary: '{{fields.time}} · {{fields.title.zh}}'
+                    fields:
+                      - { label: 时间, name: time, widget: string, hint: '自由文本，如 2024 — 2026' }
+                      - label: 标题
+                        name: title
+                        widget: object
+                        fields:
+                          - { label: 中文, name: zh, widget: string, required: false }
+                          - { label: 英文, name: en, widget: string, required: false }
+                      - label: 描述（可选）
+                        name: desc
+                        widget: object
+                        required: false
+                        fields:
+                          - { label: 中文, name: zh, widget: text, required: false }
+                          - { label: 英文, name: en, widget: text, required: false }
+              - label: 引文
+                name: quote
+                widget: object
+                fields:
+                  - { label: 显示, name: enabled, widget: boolean, required: false, default: true }
+                  - label: 引文
+                    name: text
+                    widget: object
+                    fields:
+                      - { label: 中文, name: zh, widget: text, required: false }
+                      - { label: 英文, name: en, widget: text, required: false }
+                  - label: 出处（可选）
+                    name: cite
+                    widget: object
+                    required: false
+                    fields:
+                      - { label: 中文, name: zh, widget: string, required: false }
+                      - { label: 英文, name: en, widget: string, required: false }
+              - label: 图片
+                name: figure
+                widget: object
+                fields:
+                  - { label: 显示, name: enabled, widget: boolean, required: false, default: true }
+                  - { label: 图片（必填，请用后台上传）, name: image, widget: image, hint: '禁止填外链：只能上传（落 content/site/assets/），走 Astro 图片管线' }
+                  - { label: 替代文本（无障碍）, name: alt, widget: string, required: false }
+                  - label: 图注（可选）
+                    name: caption
+                    widget: object
+                    required: false
+                    fields:
+                      - { label: 中文, name: zh, widget: string, required: false }
+                      - { label: 英文, name: en, widget: string, required: false }
+              - label: 链接清单
+                name: linklist
+                widget: object
+                fields:
+                  - { label: 显示, name: enabled, widget: boolean, required: false, default: true }
+                  - label: 标题（可选）
+                    name: title
+                    widget: object
+                    required: false
+                    fields:
+                      - { label: 中文, name: zh, widget: string, required: false }
+                      - { label: 英文, name: en, widget: string, required: false }
+                  - label: 链接条目
+                    name: items
+                    widget: list
+                    summary: '{{fields.label.zh}} → {{fields.href}}'
+                    fields:
+                      - label: 名称
+                        name: label
+                        widget: object
+                        fields:
+                          - { label: 中文, name: zh, widget: string, required: false }
+                          - { label: 英文, name: en, widget: string, required: false }
+                      - { label: 链接, name: href, widget: string }
+                      - label: 备注（可选）
+                        name: note
+                        widget: object
+                        required: false
+                        fields:
+                          - { label: 中文, name: zh, widget: string, required: false }
+                          - { label: 英文, name: en, widget: string, required: false }
+              - label: 行动按钮
+                name: cta
+                widget: object
+                fields:
+                  - { label: 显示, name: enabled, widget: boolean, required: false, default: true }
+                  - label: 说明文字
+                    name: text
+                    widget: object
+                    fields:
+                      - { label: 中文, name: zh, widget: string, required: false }
+                      - { label: 英文, name: en, widget: string, required: false }
+                  - { label: 按钮链接, name: href, widget: string }
+                  - label: 按钮文字
+                    name: label
+                    widget: object
+                    fields:
+                      - { label: 中文, name: zh, widget: string, required: false }
+                      - { label: 英文, name: en, widget: string, required: false }
+              - label: 分隔
+                name: divider
+                widget: object
+                fields:
+                  - { label: 显示, name: enabled, widget: boolean, required: false, default: true }
+                  - label: 样式
+                    name: style
+                    widget: select
+                    required: false
+                    default: line
+                    options: [{ label: 细分隔线, value: line }, { label: 纯留白, value: space }]
+          - label: 名片区开关
+            name: layout
+            widget: object
+            required: false
+            hint: 关掉则不显示头像/名字/社交（它们的数据在「主页设置」）
+            fields:
+              - { label: 显示名片区, name: showIdCard, widget: boolean, required: false, default: true }
+          - label: 正文回退（blocks 为空时用，markdown，多段）
            name: intro
            widget: object
-            hint: 渲染在「关于」标题下方、名片之上；支持段落/列表/粗斜体/链接；留空用默认文案
+            required: false
+            hint: 仅在「页面块」为空时渲染；与块同时存在时以块为准
            fields:
              - { label: 中文, name: zh, widget: markdown, required: false }
              - { label: 英文, name: en, widget: markdown, required: false }
+          - label: 页面排版覆盖（可选）
+            name: typography
+            widget: object
+            required: false
+            hint: 本页正文默认字体 / 强调色 / 字号缩放（0.8–1.25）；不填用全站默认，只影响本页
+            fields:
+              - label: 正文字体类
+                name: font
+                widget: select
+                required: false
+                options: [font-serif, font-kai, font-sans, font-mono, font-song, font-kai-sys, font-hei-sys, font-fangsong, font-huiwen, font-kuaile]
+              - label: 强调色类
+                name: accent
+                widget: select
+                required: false
+                options: [ink-accent, ink-accent-soft, c-blue, c-blue-soft, c-teal, c-teal-soft, c-green, c-green-soft, c-yellow, c-yellow-soft, c-orange, c-orange-soft, c-red, c-red-soft, c-pink, c-pink-soft, c-purple, c-purple-soft]
+              - { label: 字号缩放, name: scale, widget: number, required: false, value_type: float, min: 0.8, max: 1.25, step: 0.05 }
      - name: opensource
        label: 开源页
        file: content/site/opensource.yaml
        fields:
          - label: 叙述（链接前）
            name: blurb
+          - label: 页面排版覆盖（可选）
+            name: typography
+            widget: object
+            required: false
+            hint: 本页正文默认字体 / 强调色 / 字号缩放（0.8–1.25）；不填用全站默认，只影响本页
+            fields:
+              - label: 正文字体类
+                name: font
+                widget: select
+                required: false
+                options: [font-serif, font-kai, font-sans, font-mono, font-song, font-kai-sys, font-hei-sys, font-fangsong, font-huiwen, font-kuaile]
+              - label: 强调色类
+                name: accent
+                widget: select
+                required: false
+                options: [ink-accent, ink-accent-soft, c-blue, c-blue-soft, c-teal, c-teal-soft, c-green, c-green-soft, c-yellow, c-yellow-soft, c-orange, c-orange-soft, c-red, c-red-soft, c-pink, c-pink-soft, c-purple, c-purple-soft]
+              - { label: 字号缩放, name: scale, widget: number, required: false, value_type: float, min: 0.8, max: 1.25, step: 0.05 }
            widget: object
            fields:
              - { label: 中文, name: zh, widget: string, required: false }