feat:作业纸

miniprogram/components3.0/debug-publish-tools/debug-publish-tools.ts

@@ -41,6 +41,11 @@ Component({
             type: Object,
             value: {},
         },
+        /** 页面可指定发布弹窗的默认裁剪模式，未指定时沿用仅裁头部。 */
+        defaultCropMode: {
+            type: String,
+            value: 'header-only',
+        },
     },
 
     data: {
@@ -83,7 +88,7 @@ Component({
                 formSubtitle: meta?.subtitle ?? '',
                 formTags: meta?.tags?.join(', ') ?? '',
                 formStatus: meta?.status ?? 'draft',
-                formCropMode: 'header-only', // 默认裁剪头部
+                formCropMode: this.properties.defaultCropMode,
                 formQuality: DEBUG_PUBLISH_DEFAULT_QUALITY,
                 formWidth: DEBUG_PUBLISH_DEFAULT_WIDTH,
             });

miniprogram/components3.0/debug-publish-tools/debug-publish-tools.wxml

@@ -152,7 +152,7 @@
                         bindchange="onWidthChange" />
                 </view>
                 <text class="debug-publish-tools__hint">
-                    默认按文档规则裁掉页眉和页脚，并尽量压缩到 {{maxSizeKB}}KB 内。
+                    按所选裁剪模式处理图片，并尽量压缩到 {{maxSizeKB}}KB 内。
                 </text>
             </view>
 

miniprogram/config/config.ts

@@ -7,7 +7,7 @@
 // };
 
 /** 当前应用版本号；profile 页和首页公告共用 */
-export const APP_VERSION = '3.4.0';
+export const APP_VERSION = '3.6.0';
 
 export const defaultPrintConfig: PrintConfig = {
     // header: 'LogoImage',

miniprogram/config/worksheets/papers.ts

@@ -1,26 +1,72 @@
 import type { WorksheetDefinition } from './types';
 
-export const PAPER_SHEET_WORKSHEET_DEFINITIONS = [
+/** 业务条目与绘制方式分离；颜色等用户参数不另建 worksheet。 */
+export const PAPER_TYPES = [
+    { id: 'tian', name: '田字格', desc: '汉字练习' },
+    { id: 'mi', name: '米字格', desc: '书法练习' },
+    { id: 'square', name: '方格', desc: '书法练字纸' },
+    { id: 'four-line', name: '四线三格', desc: '拼音 / 字母' },
+    { id: 'letter', name: '信纸', desc: '横线信笺' },
+    { id: 'horizontal', name: '横线', desc: '横线本' },
+    { id: 'vertical', name: '竖线', desc: '竖排书写' },
+    { id: 'dictation-hanzi', name: '汉字听写', desc: '田字格 + 订正栏' },
     {
-        id: 'paper-sheet',
+        id: 'dictation-pinyin',
-        icon: 'draw-o',
+        name: '拼音/英语听写',
-        title: '作业纸',
+        desc: '四线三格 + 订正栏',
-        subtitle: '田字格 / 方格 / 信纸等多种作业纸一键打印',
-        ageMin: 3,
-        ageMax: 12,
-        difficulty: 1,
-        tags: [
-            '作业纸',
-            '田字格',
-            '米字格',
-            '方格',
-            '四线三格',
-            '信纸',
-            '横线',
-            '竖线',
-            '听写',
-            '作业登记表',
-        ],
-        sortOrder: 50,
     },
-] as const satisfies ReadonlyArray<WorksheetDefinition>;
+    { id: 'homework-log', name: '作业登记表', desc: '分科登记' },
+] as const;
+
+export type PaperType = (typeof PAPER_TYPES)[number]['id'];
+
+/** 原综合入口始终保留，不重分配历史收藏和统计。 */
+export const PAPER_SHEET_WORKSHEET_ID = 'paper-sheet';
+
+export interface PaperSheetDefinition extends WorksheetDefinition {
+    rendererKey: 'paper-sheet';
+    renderConfig: { paperType?: PaperType };
+}
+
+export const PAPER_SHEET_WORKSHEET_DEFINITIONS: ReadonlyArray<PaperSheetDefinition> =
+    [
+        {
+            id: PAPER_SHEET_WORKSHEET_ID,
+            rendererKey: 'paper-sheet',
+            renderConfig: {},
+            icon: 'draw-o',
+            title: '作业纸',
+            subtitle: '田字格 / 方格 / 信纸等多种作业纸一键打印',
+            ageMin: 3,
+            ageMax: 12,
+            difficulty: 1,
+            tags: [
+                '作业纸',
+                '田字格',
+                '米字格',
+                '方格',
+                '四线三格',
+                '信纸',
+                '横线',
+                '竖线',
+                '听写',
+                '作业登记表',
+            ],
+            sortOrder: 50,
+        },
+        ...PAPER_TYPES.map(
+            (paper, index): PaperSheetDefinition => ({
+                id: `paper-${paper.id}`,
+                rendererKey: 'paper-sheet',
+                renderConfig: { paperType: paper.id },
+                icon: 'draw-o',
+                title: paper.name,
+                subtitle: `${paper.desc}，一键生成打印`,
+                ageMin: 3,
+                ageMax: 12,
+                difficulty: 1,
+                tags: ['作业纸', paper.name, paper.desc],
+                sortOrder: 51 + index,
+            }),
+        ),
+    ];

miniprogram/pages/home/home.data.ts

@@ -77,7 +77,7 @@ export const HOME_NOTICES: HomeNotice[] = [
     },
     {
         id: `update-${APP_VERSION}`,
-        text: `${APP_VERSION} 上线：新增幼儿认识时钟，连线练习题`,
+        text: `${APP_VERSION} 上线：新增作业纸`,
         path: '/mathPages/clockReading/clockReading?id=clock-connect',
     },
 ];

miniprogram/pages/home/home.less

@@ -134,18 +134,17 @@
     }
 }
 
-.home-hero-placeholder {
+/** 紧凑预览轮播：按发布时仅裁头部后的比例展示，标题悬浮于图内。 */
-    margin: @section-gap @page-padding-x 0;
+.home-hero-gallery {
-    height: 450rpx;
+    margin-top: 16rpx;
-    border-radius: 40rpx;
+    background: radial-gradient(ellipse at center, #f3e8cc 0%, @bg-page 70%);
-    background: rgba(50, 46, 37, 0.04);
 }
 
-/** 首页顶部「精选」swiper 轮播 */
 .home-hero-swiper {
-    margin-top: 16rpx;
     width: 100%;
-    height: 450rpx;
+    // 单张宽 750 - 156 * 2 - 16 * 2 = 406rpx；裁头后预览约高 500rpx。
+    // 包含上下阴影留白，不再给副标题、年龄等信息预留高度。
+    height: 548rpx;
 }
 
 .home-hero-swiper-item {
@@ -153,115 +152,134 @@
 }
 
 .home-hero-card-wrap {
-    padding: 24rpx;
+    padding: 16rpx 16rpx 28rpx;
     box-sizing: border-box;
-    transition: transform 0.45s cubic-bezier(0.25, 0.46, 0.45, 0.94),
+    transform-origin: center center;
-        opacity 0.45s cubic-bezier(0.25, 0.46, 0.45, 0.94);
+    transform: translateY(12rpx) scale(0.88);
-    transform: scale(0.9);
+    opacity: 0.55;
-    opacity: 0.5;
+    transition:
+        transform 0.45s ease,
+        opacity 0.45s ease;
 }
 
 .home-hero-card-wrap--active {
-    transform: scale(1);
+    transform: translateY(0) scale(1);
     opacity: 1;
 }
 
 .home-hero-card {
     width: 100%;
-    border-radius: 32rpx;
+    position: relative;
-    overflow: visible;
+    border-radius: 16rpx;
+    overflow: hidden;
     background: #ffffff;
-    box-shadow: 0 10rpx 28rpx rgba(50, 46, 37, 0.08);
+    box-shadow:
+        0 12rpx 30rpx rgba(96, 75, 33, 0.12),
+        0 2rpx 6rpx rgba(96, 75, 33, 0.06);
 }
 
 .home-hero-card__top {
-    height: 260rpx;
+    width: 100%;
+    height: 0;
+    // 与 debugPublish 的 header-only 一致：595 × (842 - 110)。
+    padding-top: 123.02521%;
     position: relative;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    /* 顶部背景用自身圆角裁切，替代 card 的 overflow: hidden */
-    border-top-left-radius: 32rpx;
-    border-top-right-radius: 32rpx;
     overflow: hidden;
-    border-bottom: 1rpx solid rgba(50, 46, 37, 0.08);
+    background: #ffffff;
-    background: #f5edd8;
 }
 
 .home-hero-card__cover {
+    position: absolute;
+    left: 0;
+    top: 0;
     width: 100%;
     height: 100%;
     display: block;
-    object-fit: cover;
+    object-fit: contain;
+}
+
+.home-hero-card__fallback {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    gap: 24rpx;
+    background: #fffdf7;
 }
 
 .home-hero-card__icon {
-    font-size: 96rpx;
+    font-size: 100rpx;
-    line-height: 1;
+    line-height: 1.2;
 }
 
-.home-hero-card__badge {
+.home-hero-card__title-overlay {
     position: absolute;
-    top: 24rpx;
+    left: 12rpx;
-    right: 24rpx;
+    right: 12rpx;
-    padding: 8rpx 18rpx;
+    bottom: 12rpx;
-    border-radius: 999rpx;
+    padding: 10rpx 16rpx;
-    background: rgba(50, 46, 37, 0.12);
+    border-radius: 12rpx;
-    font-size: 22rpx;
+    background: rgba(255, 252, 244, 0.94);
-    color: @text-title;
+    box-shadow: 0 2rpx 12rpx rgba(50, 46, 37, 0.08);
-    font-weight: 600;
+    pointer-events: none;
-}
-
-.home-hero-card__body {
-    padding: 28rpx @page-padding-inner-x 30rpx;
-}
-
-.home-hero-card__title-row {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
-    gap: 16rpx;
-    /* 允许 flex 子项在文本过长时正确截断 */
-    min-width: 0;
 }
 
 .home-hero-card__title {
-    font-size: 34rpx;
+    display: block;
-    line-height: 1.35;
     color: @text-title;
+    font-size: 28rpx;
+    line-height: 40rpx;
     font-weight: 700;
-    margin: 0;
-    flex: 1;
-    min-width: 0;
-    /* 标题与 meta 同行：超出后省略号（避免高度抖动） */
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
 }
 
-.home-hero-card__sub {
+.home-hero-pagination {
-    margin-top: 10rpx;
+    display: flex;
-    font-size: 24rpx;
+    align-items: center;
-    line-height: 1.4;
+    justify-content: center;
-    color: @text-secondary;
+    gap: 16rpx;
-    /* 第二行：超出后省略号 */
+    height: 32rpx;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
 }
 
+.home-hero-pagination__dots {
+    display: flex;
+    align-items: center;
+}
 
-.home-hero-card__meta {
+.home-hero-pagination__target {
-    margin: 0;
+    min-width: 32rpx;
-    font-size: 22rpx;
+    height: 40rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.home-hero-pagination__dot {
+    width: 8rpx;
+    height: 8rpx;
+    border-radius: 999rpx;
+    background: #d5c9ad;
+    transition:
+        width 0.3s ease,
+        background 0.3s ease;
+}
+
+.home-hero-pagination__dot--active {
+    width: 28rpx;
+    background: @text-title;
+}
+
+.home-hero-pagination__count {
     color: @text-gray;
-    /* meta 也做单行截断，防止极端长文本把布局挤爆 */
+    font-size: 20rpx;
-    flex: 0 1 auto;
+    line-height: 28rpx;
-    min-width: 0;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
 }
 
 .home-section-panel {
@@ -477,7 +495,6 @@
     display: block;
 }
 
-
 .home-page .category-tabs {
     background: @bg-page;
 }
@@ -512,11 +529,11 @@
     pointer-events: none;
 
     .home-hero-card__top {
+        background: #f3efe5;
         animation: home-skeleton-pulse 1.5s ease-in-out infinite;
     }
 
-    .home-hero-card__title,
+    .home-hero-card__title {
-    .home-hero-card__sub {
         background: #e8e2d5;
         border-radius: 8rpx;
         color: transparent;
@@ -527,11 +544,6 @@
         width: 50%;
         height: 36rpx;
     }
-
-    .home-hero-card__sub {
-        width: 70%;
-        height: 26rpx;
-    }
 }
 
 .home-hot-card--skeleton {

miniprogram/pages/home/home.ts

@@ -279,6 +279,19 @@ Page({
         this.setData({ heroSwiperCurrent: e.detail.current });
     },
 
+    /** 指示点与手势共用 swiper current，单张内容不自动轮播。 */
+    onTapHeroDot(e: WechatMiniprogram.TouchEvent) {
+        const index = Number(e.currentTarget.dataset.index);
+        if (
+            this.data.loading ||
+            !Number.isInteger(index) ||
+            index < 0 ||
+            index >= this.data.featuredItems.length
+        )
+            return;
+        this.setData({ heroSwiperCurrent: index });
+    },
+
     onTabChange(e: WechatMiniprogram.CustomEvent) {
         const id = e.detail.id as string | undefined;
         if (!id) return;

miniprogram/pages/home/home.wxml

@@ -59,63 +59,76 @@
             </view>
         </view>
 
-        <swiper
+        <view
-            class="home-hero-swiper"
+            wx:if="{{loading || featuredItems.length > 0}}"
-            previous-margin="80rpx"
+            class="home-hero-gallery">
-            next-margin="80rpx"
+            <!-- 按发布时仅裁页眉后的画幅展示，标题悬浮，不额外占用卡片高度。 -->
-            circular="{{featuredItems.length > 1 && !loading}}"
+            <swiper
-            autoplay="{{!loading}}"
+                class="home-hero-swiper"
-            interval="{{4000}}"
+                previous-margin="156rpx"
-            duration="{{600}}"
+                next-margin="156rpx"
-            easing-function="easeInOutCubic"
+                current="{{heroSwiperCurrent}}"
-            bindchange="onHeroSwiperChange">
+                circular="{{featuredItems.length > 1 && !loading}}"
-            <swiper-item
+                autoplay="{{featuredItems.length > 1 && !loading}}"
-                wx:for="{{featuredItems}}"
+                interval="{{5200}}"
-                wx:key="id"
+                duration="{{500}}"
-                class="home-hero-swiper-item">
+                easing-function="easeInOutCubic"
-                <view
+                bindchange="onHeroSwiperChange">
-                    class="home-hero-card-wrap {{heroSwiperCurrent === index ? 'home-hero-card-wrap--active' : ''}}">
+                <swiper-item
+                    wx:for="{{featuredItems}}"
+                    wx:key="id"
+                    class="home-hero-swiper-item">
                     <view
-                        class="home-hero-card {{item.skeleton ? 'home-hero-card--skeleton' : ''}}"
+                        class="home-hero-card-wrap {{heroSwiperCurrent === index ? 'home-hero-card-wrap--active' : ''}}">
-                        data-title="{{item.title}}"
+                        <view
-                        data-path="{{item.path}}"
+                            class="home-hero-card {{item.skeleton ? 'home-hero-card--skeleton' : ''}}"
-                        bindtap="{{item.skeleton ? '' : 'onTapFeatured'}}">
+                            data-title="{{item.title}}"
-                        <view class="home-hero-card__top">
+                            data-path="{{item.path}}"
-                            <image
+                            bindtap="{{item.skeleton ? '' : 'onTapFeatured'}}">
-                                wx:if="{{!item.skeleton && item.previewImg}}"
+                            <view class="home-hero-card__top">
-                                class="home-hero-card__cover"
+                                <image
-                                src="{{item.previewImg}}"
+                                    wx:if="{{!item.skeleton && item.previewImg}}"
-                                mode="aspectFill" />
+                                    class="home-hero-card__cover"
-                            <text
+                                    src="{{item.previewImg}}"
-                                wx:if="{{!item.skeleton && !item.previewImg}}"
+                                    mode="aspectFit" />
-                                class="home-hero-card__icon"
+                                <view
-                                >{{item.icon}}</text
+                                    wx:if="{{!item.skeleton && !item.previewImg}}"
-                            >
+                                    class="home-hero-card__fallback">
-                            <text
+                                    <text class="home-hero-card__icon"
-                                wx:if="{{item.badge}}"
+                                        >{{item.icon}}</text
-                                class="home-hero-card__badge"
+                                    >
-                                >{{item.badge}}</text
+                                </view>
-                            >
+                            </view>
-                        </view>
+                            <view class="home-hero-card__title-overlay">
-                        <view class="home-hero-card__body">
-                            <view class="home-hero-card__title-row">
                                 <text class="home-hero-card__title"
                                     >{{item.title}}</text
                                 >
-                                <text
-                                    wx:if="{{!item.skeleton}}"
-                                    class="home-hero-card__meta"
-                                    >{{item.ageBand}}·{{item.difficulty}}</text
-                                >
                             </view>
-                            <text class="home-hero-card__sub"
-                                >{{item.subtitle}}</text
-                            >
                         </view>
                     </view>
+                </swiper-item>
+            </swiper>
+            <view
+                wx:if="{{!loading && featuredItems.length > 1}}"
+                class="home-hero-pagination">
+                <view class="home-hero-pagination__dots">
+                    <view
+                        wx:for="{{featuredItems}}"
+                        wx:key="id"
+                        class="home-hero-pagination__target"
+                        data-index="{{index}}"
+                        bindtap="onTapHeroDot"
+                        aria-role="button"
+                        aria-label="{{'查看第' + (index + 1) + '张练习纸'}}">
+                        <view
+                            class="home-hero-pagination__dot {{heroSwiperCurrent === index ? 'home-hero-pagination__dot--active' : ''}}" />
+                    </view>
                 </view>
-            </swiper-item>
+                <text class="home-hero-pagination__count"
-        </swiper>
+                    >{{heroSwiperCurrent + 1}} / {{featuredItems.length}}</text
+                >
+            </view>
+        </view>
 
         <view class="home-section-panel">
             <view class="home-section-head">

miniprogram/papersPages/paperSheet/paperSheet.config.ts

@@ -1,53 +1,42 @@
 import type { DebugPublishMeta } from '../../utils/debugPublish';
 import { inferGradeFromAge } from '../../utils/debugPublish';
-import { PAPER_SHEET_WORKSHEET_DEFINITIONS } from '../../config/worksheets/papers';
+import {
+    PAPER_SHEET_WORKSHEET_DEFINITIONS,
+    PAPER_SHEET_WORKSHEET_ID,
+    PAPER_TYPES,
+    type PaperType,
+} from '../../config/worksheets/papers';
 
-type PaperSheetWorksheetRow =
+export { PAPER_SHEET_WORKSHEET_ID, type PaperType };
-    (typeof PAPER_SHEET_WORKSHEET_DEFINITIONS)[number];
+export const PAPER_TYPE_OPTIONS = PAPER_TYPES;
 
-const WORKSHEET_BY_ID = Object.fromEntries(
+const WORKSHEET_BY_ID = new Map(
-    PAPER_SHEET_WORKSHEET_DEFINITIONS.map((m) => [m.id, m]),
+    PAPER_SHEET_WORKSHEET_DEFINITIONS.map((entry) => [entry.id, entry]),
-) as Record<string, PaperSheetWorksheetRow>;
+);
 
-export const PAPER_SHEET_WORKSHEET_ID = PAPER_SHEET_WORKSHEET_DEFINITIONS[0].id;
+/** 只接收已注册条目；旧综合入口继续支持 type，并兼容分享中的 mode。 */
-
+export function resolvePaperEntry(options: {
-/** 纸张类型 id */
+    id?: string;
-export type PaperType =
+    type?: string;
-    | 'tian'
+    mode?: string;
-    | 'mi'
+}) {
-    | 'square'
+    const id = options.id || PAPER_SHEET_WORKSHEET_ID;
-    | 'four-line'
+    const entry = WORKSHEET_BY_ID.get(id);
-    | 'letter'
+    if (!entry) throw new Error('当前作业纸暂不可用，请更新小程序');
-    | 'horizontal'
+    const legacyType = options.type || options.mode;
-    | 'vertical'
+    const paperType =
-    | 'dictation-hanzi'
+        entry.renderConfig.paperType ||
-    | 'dictation-pinyin'
+        (legacyType && isValidPaperType(legacyType)
-    | 'homework-log';
+            ? legacyType
-
+            : DEFAULT_PAPER_TYPE);
-export interface PaperTypeOption {
+    return { entry, paperType };
-    id: PaperType;
-    name: string;
-    /** 次要说明 */
-    desc: string;
 }
 
-/** 纸张类型选项（展示顺序与用户需求一致） */
+export function getWorksheetIdForPaperType(paperType: PaperType): string {
-export const PAPER_TYPE_OPTIONS: PaperTypeOption[] = [
+    return PAPER_SHEET_WORKSHEET_DEFINITIONS.find(
-    { id: 'tian', name: '田字格', desc: '汉字练习' },
+        (entry) => entry.renderConfig.paperType === paperType,
-    { id: 'mi', name: '米字格', desc: '书法练习' },
+    )!.id;
-    { id: 'square', name: '方格', desc: '书法练字纸' },
+}
-    { id: 'four-line', name: '四线三格', desc: '拼音 / 字母' },
-    { id: 'letter', name: '信纸', desc: '横线信笺' },
-    { id: 'horizontal', name: '横线', desc: '横线本' },
-    { id: 'vertical', name: '竖线', desc: '竖排书写' },
-    { id: 'dictation-hanzi', name: '汉字听写', desc: '田字格 + 订正栏' },
-    {
-        id: 'dictation-pinyin',
-        name: '拼音/英语听写',
-        desc: '四线三格 + 订正栏',
-    },
-    { id: 'homework-log', name: '作业登记表', desc: '分科登记' },
-];
 
 export interface PaperColorOption {
     id: string;
@@ -75,16 +64,16 @@ export function isValidPaperType(id: string): id is PaperType {
 }
 
 export function getModeInfo(id: string) {
-    const m = WORKSHEET_BY_ID[id];
+    const m = WORKSHEET_BY_ID.get(id);
     return m ? { title: m.title, desc: m.subtitle } : undefined;
 }
 
 export function isValidMode(id: string): boolean {
-    return id in WORKSHEET_BY_ID;
+    return WORKSHEET_BY_ID.has(id);
 }
 
 export function getPublishMetaByMode(id: string): DebugPublishMeta | null {
-    const m = WORKSHEET_BY_ID[id];
+    const m = WORKSHEET_BY_ID.get(id);
     if (!m) return null;
     return {
         id: m.id,

miniprogram/papersPages/paperSheet/paperSheet.ts

@@ -8,9 +8,16 @@ import {
     getModeInfo,
     getPublishMetaByMode,
     isValidPaperType,
+    resolvePaperEntry,
+    getWorksheetIdForPaperType,
     type PaperType,
 } from './paperSheet.config';
-import { createPage, type CanvasDataState } from '../../base/pageMixin';
+import {
+    createPage,
+    getPageCommonMethods,
+    type CanvasDataState,
+} from '../../base/pageMixin';
+import { getWorksheet } from '../../services/content-api';
 import { defaultShareConfig } from '../../config/config';
 import type { DebugPublishMeta } from '../../utils/debugPublish';
 import {
@@ -20,6 +27,10 @@ import {
 } from '../../utils/favorites';
 
 const pageInfoLookup = getModeInfo;
+const commonMethods = getPageCommonMethods({
+    pageInfoLookup,
+    shareConfig: defaultShareConfig,
+});
 
 type PageData = CanvasDataState & {
     worksheetId: string;
@@ -28,6 +39,8 @@ type PageData = CanvasDataState & {
     selectedPaperType: PaperType;
     selectedColor: string;
     isPreviewFavorite: boolean;
+    isWorksheetReady: boolean;
+    favoriteLoading: boolean;
     isDevEnv: boolean;
     debugPublishVisible: boolean;
     debugPublishLoading: boolean;
@@ -42,6 +55,8 @@ createPage(
         boxWidth: 0,
         drawService: null as PaperDrawService | null,
         _favoritedMap: {} as Record<string, boolean>,
+        _entryRequest: 0,
+        _favoriteVersions: {} as Record<string, number>,
 
         data: {
             pageTitle: '作业纸',
@@ -54,28 +69,77 @@ createPage(
             selectedPaperType: DEFAULT_PAPER_TYPE,
             selectedColor: DEFAULT_PAPER_COLOR,
             isPreviewFavorite: false,
+            isWorksheetReady: false,
+            favoriteLoading: false,
             isDevEnv: false,
             debugPublishVisible: false,
             debugPublishLoading: false,
             debugPublishMeta: null,
         } as unknown as PageData,
 
-        onLoad(options: { id?: string; type?: string }) {
+        async onLoad(options: { id?: string; type?: string; mode?: string }) {
             this.syncDebugPublishEnv();
-
+            await this.openEntry(options);
-            const initialType =
-                options.type && isValidPaperType(options.type)
-                    ? (options.type as PaperType)
-                    : DEFAULT_PAPER_TYPE;
-
-            this.setData({
-                selectedPaperType: initialType,
-            });
-
-            this.initPageInfo(PAPER_SHEET_WORKSHEET_ID, '作业纸');
             this.loadFavoritedMap();
         },
 
+        onUnload() {
+            this._entryRequest++;
+        },
+
+        /** 开发版直接预览已注册配置以制作封面；体验/正式版切换前校验公开状态。 */
+        async openEntry(options: {
+            id?: string;
+            type?: string;
+            mode?: string;
+        }) {
+            const request = ++this._entryRequest;
+            this.setData({
+                isWorksheetReady: false,
+                hasContent: false,
+                // 换纸张即丢弃旧发布表单，防止旧条目元数据配上新封面。
+                debugPublishVisible: false,
+                debugPublishMeta: null,
+            });
+            try {
+                const { entry, paperType } = resolvePaperEntry(options);
+                // 草稿在公开详情中固定为 404；开发版使用本地注册配置，不通过失败请求判断预览权限。
+                if (!this.data.isDevEnv) {
+                    const remote = await getWorksheet(entry.id);
+                    if (
+                        entry.id !== PAPER_SHEET_WORKSHEET_ID &&
+                        (remote.rendering?.rendererKey !== entry.rendererKey ||
+                            remote.rendering?.paperType !== paperType)
+                    ) {
+                        throw new Error('作业纸配置暂不可用，请更新小程序');
+                    }
+                }
+                if (request !== this._entryRequest) return;
+                this.setData({
+                    worksheetId: entry.id,
+                    selectedPaperType: paperType,
+                    // 综合入口分享保留所选纸张；独立条目由 ID 唯一确定纸张类型。
+                    currentMode:
+                        entry.id === PAPER_SHEET_WORKSHEET_ID
+                            ? paperType
+                            : entry.id,
+                    isPreviewFavorite: this._favoritedMap[entry.id] === true,
+                    isWorksheetReady: true,
+                });
+                this.initPageInfo(entry.id, entry.title);
+                await this.drawCanvas();
+            } catch (error) {
+                if (request !== this._entryRequest) return;
+                wx.showToast({
+                    title:
+                        error instanceof Error
+                            ? error.message
+                            : '作业纸加载失败',
+                    icon: 'none',
+                });
+            }
+        },
+
         onCanvasReady(e: WechatMiniprogram.CustomEvent) {
             this.initCanvasFromComponent(e.detail, {
                 createDrawService: (
@@ -93,23 +157,35 @@ createPage(
         },
 
         async drawCanvas() {
-            if (!this.drawService) return;
+            if (!this.drawService || !this.data.isWorksheetReady) return;
+            const request = this._entryRequest;
             try {
                 await (this.drawService as PaperDrawService).draw(
                     this.data.selectedPaperType,
                     this.data.selectedColor,
                 );
-                this.setData({ hasContent: true });
+                if (
+                    request === this._entryRequest &&
+                    this.data.isWorksheetReady
+                )
+                    this.setData({ hasContent: true });
             } catch (err) {
                 console.error('paperSheet draw failed', err);
-                this.setData({ hasContent: false });
+                if (request === this._entryRequest)
+                    this.setData({ hasContent: false });
             }
         },
 
         onSelectPaperType(e: WechatMiniprogram.TouchEvent) {
-            const id = e.currentTarget.dataset.id as PaperType | undefined;
+            const id = e.currentTarget.dataset.id as string | undefined;
-            if (!id || id === this.data.selectedPaperType) return;
+            if (!id || !isValidPaperType(id)) return;
-            this.setData({ selectedPaperType: id }, () => this.drawCanvas());
+            const worksheetId = getWorksheetIdForPaperType(id);
+            if (
+                worksheetId === this.data.worksheetId &&
+                this.data.isWorksheetReady
+            )
+                return;
+            return this.openEntry({ id: worksheetId });
         },
 
         onSelectColor(e: WechatMiniprogram.TouchEvent) {
@@ -124,33 +200,77 @@ createPage(
 
         onShare() {},
 
-        async onPreviewFavorite() {
+        async exportToPrint() {
-            const next = !this.data.isPreviewFavorite;
+            if (!this.data.isWorksheetReady || !this.data.hasContent) return;
-            this.setData({ isPreviewFavorite: next });
+            return commonMethods.exportToPrint.call(this);
-            const id = this.data.worksheetId;
+        },
-            if (id) {
+
-                this._favoritedMap[id] = next;
+        async onShareSuccess() {
-                if (next) {
+            if (!this.data.isWorksheetReady || !this.data.hasContent) {
-                    addFavorite(id);
+                this.setData({ showShareDialog: false });
-                } else {
+                return;
-                    removeFavorite(id);
+            }
-                }
+            return commonMethods.onShareSuccess.call(this);
+        },
+
+        /** 请求失败不显示收藏成功，且响应只更新操作时的条目。 */
+        async onPreviewFavorite() {
+            if (!this.data.isWorksheetReady || this.data.favoriteLoading)
+                return;
+            const id = this.data.worksheetId;
+            const next = !this.data.isPreviewFavorite;
+            this._favoriteVersions[id] = (this._favoriteVersions[id] || 0) + 1;
+            this.setData({ favoriteLoading: true });
+            try {
+                const ok = await (next ? addFavorite(id) : removeFavorite(id));
+                if (ok) {
+                    this._favoritedMap[id] = next;
+                    if (this.data.worksheetId === id)
+                        this.setData({ isPreviewFavorite: next });
+                }
+                wx.showToast({
+                    title: ok
+                        ? next
+                            ? '收藏成功'
+                            : '已取消收藏'
+                        : '收藏操作失败，请重试',
+                    icon: 'none',
+                });
+            } finally {
+                this.setData({ favoriteLoading: false });
             }
-            wx.showToast({
-                title: next ? '收藏成功' : '已取消收藏',
-                icon: 'none',
-            });
         },
 
         async loadFavoritedMap() {
-            const ids = [PAPER_SHEET_WORKSHEET_ID];
+            const ids = [
-            this._favoritedMap = await batchCheckFavorited(ids);
+                PAPER_SHEET_WORKSHEET_ID,
-            if (this._favoritedMap[this.data.worksheetId]) {
+                ...PAPER_TYPE_OPTIONS.map((paper) =>
-                this.setData({ isPreviewFavorite: true });
+                    getWorksheetIdForPaperType(paper.id),
+                ),
+            ];
+            const versions = { ...this._favoriteVersions };
+            try {
+                const map = await batchCheckFavorited(ids);
+                // 慢速初次查询不能覆盖查询期间完成的收藏操作。
+                for (const id of ids) {
+                    if (versions[id] === this._favoriteVersions[id])
+                        this._favoritedMap[id] = map[id] === true;
+                }
+                this.setData({
+                    isPreviewFavorite:
+                        this._favoritedMap[this.data.worksheetId] === true,
+                });
+            } catch {
+                // 收藏加载失败不阻止预览；后续操作仍以服务端写入结果为准。
             }
         },
 
+        getWorksheetStatsId(): string {
+            return this.data.worksheetId;
+        },
+
         getPublishMeta(): DebugPublishMeta {
+            if (!this.data.isWorksheetReady) throw new Error('请先加载作业纸');
             const meta = getPublishMetaByMode(this.data.worksheetId);
             if (!meta) {
                 throw new Error('当前题型配置不存在');

miniprogram/papersPages/paperSheet/paperSheet.wxml

@@ -1,11 +1,11 @@
-<nav-bar title="作业纸" />
+<nav-bar title="{{pageTitle}}" />
 
 <view class="ps-page">
     <view class="ps-main">
         <preview-card
             id="previewCard"
             showRefresh="{{true}}"
-            showFavorite="{{true}}"
+            showFavorite="{{isWorksheetReady && !favoriteLoading}}"
             favorited="{{isPreviewFavorite}}"
             bind:canvas-ready="onCanvasReady"
             bind:refresh="onPreviewRefresh"
@@ -63,6 +63,7 @@
 <debug-publish-tools
     wx:if="{{isDevEnv && hasContent}}"
     id="debugPublishTools"
+    defaultCropMode="none"
     visible="{{debugPublishVisible}}"
     loading="{{debugPublishLoading}}"
     meta="{{debugPublishMeta}}"

miniprogram/services/content-api.ts

@@ -1,3 +1,4 @@
+import type { PaperType } from '../config/worksheets/papers';
 import { apiRequest } from './api-request';
 
 /** 小程序使用的公开接口字段，不复用旧云集合的 _id 和管理配置。 */
@@ -10,6 +11,7 @@ export interface ApiCategory {
 }
 
 export interface ApiWorksheet {
+    rendering?: { rendererKey: 'paper-sheet'; paperType: PaperType };
     id: string;
     title: string;
     subtitle: string;

package.json

@@ -10,7 +10,8 @@
         "worksheet:patch:dry": "tsx scripts/worksheet-sync-cloud-payload.ts --all --dry-run",
         "test:category": "tsx --test tests/category-api.test.mjs",
         "test:assets": "tsx --test tests/preview-assets.test.mjs",
-        "test:auth": "tsx --test tests/auth-api.test.mjs"
+        "test:auth": "tsx --test tests/auth-api.test.mjs",
+        "test:papers": "tsx --test tests/paper-sheet.test.mjs"
     },
     "keywords": [],
     "author": "",

tests/paper-sheet.test.mjs

@@ -0,0 +1,308 @@
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import { test } from 'node:test';
+import vm from 'node:vm';
+import ts from 'typescript';
+import * as config from '../miniprogram/papersPages/paperSheet/paperSheet.config.ts';
+import { PAPER_SHEET_WORKSHEET_DEFINITIONS } from '../miniprogram/config/worksheets/papers.ts';
+import * as debugPublish from '../miniprogram/utils/debugPublish.ts';
+import { ApiRequestError } from '../miniprogram/services/api-transport.ts';
+
+const route = 'papersPages/paperSheet/paperSheet';
+const deferred = () => {
+    let resolve;
+    const promise = new Promise((done) => {
+        resolve = done;
+    });
+    return { promise, resolve };
+};
+
+/** 使用真实页面和公共分享/导出方法，仅隔离微信、网络、绘图与埋点。 */
+function createPage({
+    getWorksheet,
+    favorite = async () => true,
+    check = async () => ({}),
+} = {}) {
+    const toasts = [],
+        downloads = [],
+        favorites = [];
+    const wx = {
+        getAccountInfoSync: () => ({ miniProgram: { envVersion: 'release' } }),
+        setNavigationBarTitle() {},
+        showToast: (options) => toasts.push(options.title),
+    };
+    const load = (file, modules) => {
+        const exports = {};
+        const source = readFileSync(new URL(file, import.meta.url), 'utf8');
+        vm.runInNewContext(
+            ts.transpileModule(source, {
+                compilerOptions: {
+                    module: ts.ModuleKind.CommonJS,
+                    target: ts.ScriptTarget.ES2020,
+                },
+            }).outputText,
+            {
+                exports,
+                wx,
+                console,
+                Error,
+                require(id) {
+                    assert.ok(id in modules, id);
+                    return modules[id];
+                },
+            },
+        );
+        return exports;
+    };
+    const defaultShareConfig = {
+        title: '分享',
+        path: '/pages/index/index',
+        imageUrl: '',
+    };
+    const mixin = load('../miniprogram/base/pageMixin.ts', {
+        '../services/member-api': {},
+        '../services/api-request': {},
+        '../constants/colors': {},
+        '../core/draw/baseDraw': {},
+        '../utils/downloadPrint': {
+            downloadPrint: async (_canvas, options) => downloads.push(options),
+        },
+        '../utils/shareGuide': {
+            shouldUnlockWithAd: () => false,
+            shouldShowShareGuide: () => false,
+        },
+        '../utils/tracker': { default: new Proxy({}, { get: () => () => {} }) },
+        '../config/config': { defaultShareConfig },
+        '../utils/debugPublish': {
+            ...debugPublish,
+            isDebugPublishEnabled: () =>
+                wx.getAccountInfoSync().miniProgram.envVersion === 'develop',
+        },
+    });
+    let options;
+    load('../miniprogram/papersPages/paperSheet/paperSheet.ts', {
+        './draw/paperDrawService': {},
+        './paperSheet.config': config,
+        '../../base/pageMixin': {
+            ...mixin,
+            createPage(value, settings) {
+                options = mixin.applyPageMixin(value, settings);
+            },
+        },
+        '../../config/config': { defaultShareConfig },
+        '../../services/api-request': { ApiRequestError },
+        '../../services/content-api': {
+            getWorksheet:
+                getWorksheet ||
+                (async (id) => ({
+                    id,
+                    rendering: {
+                        rendererKey: 'paper-sheet',
+                        paperType: config.resolvePaperEntry({ id }).paperType,
+                    },
+                })),
+        },
+        '../../utils/favorites': {
+            addFavorite: async (id) => {
+                favorites.push(['add', id]);
+                return favorite(id);
+            },
+            removeFavorite: async (id) => {
+                favorites.push(['remove', id]);
+                return favorite(id);
+            },
+            batchCheckFavorited: check,
+        },
+    });
+    const page = {
+        ...options,
+        route,
+        data: structuredClone(options.data),
+        setData(value, callback) {
+            Object.assign(this.data, value);
+            callback?.();
+        },
+        drawService: { async draw() {} },
+        canvas: {},
+    };
+    return { page, toasts, downloads, favorites, wx };
+}
+
+test('十种独立条目复用绘制器，旧入口/type 分享兼容，独立 ID 不受额外 type 干扰', () => {
+    assert.equal(PAPER_SHEET_WORKSHEET_DEFINITIONS.length, 11);
+    for (const paper of config.PAPER_TYPE_OPTIONS) {
+        const id = config.getWorksheetIdForPaperType(paper.id);
+        const { entry, paperType } = config.resolvePaperEntry({
+            id,
+            type: 'unknown',
+        });
+        assert.equal(paperType, paper.id);
+        assert.equal(entry.rendererKey, 'paper-sheet');
+        assert.equal(
+            config.getPublishMetaByMode(id).path,
+            `/${route}?id=${id}`,
+        );
+    }
+    assert.equal(config.resolvePaperEntry({}).entry.id, 'paper-sheet');
+    assert.equal(
+        config.resolvePaperEntry({ id: 'paper-sheet', type: 'mi' }).paperType,
+        'mi',
+    );
+    assert.equal(
+        config.resolvePaperEntry({ id: 'paper-sheet', mode: 'vertical' })
+            .paperType,
+        'vertical',
+    );
+    assert.throws(() => config.resolvePaperEntry({ id: 'paper-unknown' }));
+});
+
+test('切换后页面身份、收藏、分享、发布和实际导出统计均属于当前条目', async () => {
+    const { page, downloads, favorites } = createPage();
+    await page.onLoad({ id: 'paper-mi' });
+    assert.equal(page.data.pageTitle, '米字格');
+    assert.equal(page.data.functionId, 'paper-mi');
+    assert.equal(page.data.selectedPaperType, 'mi');
+    assert.equal(page.onShareAppMessage().path, `/${route}?id=paper-mi`);
+    await page.onPreviewFavorite();
+    assert.deepEqual(favorites, [['add', 'paper-mi']]);
+    await page.exportToPrint();
+    assert.equal(downloads[0].worksheetId, 'paper-mi');
+    page.setData({
+        debugPublishVisible: true,
+        debugPublishMeta: page.getPublishMeta(),
+    });
+    await page.onSelectPaperType({
+        currentTarget: { dataset: { id: 'tian' } },
+    });
+    assert.equal(page.data.debugPublishVisible, false);
+    assert.equal(page.data.debugPublishMeta, null);
+    assert.equal(page.data.functionId, 'paper-tian');
+    assert.equal(page.data.isPreviewFavorite, false);
+    assert.equal(page.getPublishMeta().id, 'paper-tian');
+    assert.equal(page.onShareTimeline().query, 'id=paper-tian');
+    await page.onSelectPaperType({ currentTarget: { dataset: { id: 'mi' } } });
+    assert.equal(page.data.isPreviewFavorite, true);
+    await page.onPreviewFavorite();
+    assert.deepEqual(favorites[1], ['remove', 'paper-mi']);
+    await page.onLoad({ id: 'paper-sheet', type: 'vertical' });
+    assert.equal(
+        page.onShareAppMessage().path,
+        `/${route}?id=paper-sheet&mode=vertical`,
+    );
+});
+
+test('快速切换丢弃旧响应，加载期间禁止导出，未知条目/下架/配置错误不生成其他纸张', async () => {
+    const old = deferred();
+    const { page, downloads, toasts } = createPage({
+        getWorksheet: (id) =>
+            id === 'paper-mi'
+                ? old.promise
+                : Promise.resolve({
+                      rendering: {
+                          rendererKey: 'paper-sheet',
+                          paperType: 'tian',
+                      },
+                  }),
+    });
+    const first = page.onLoad({ id: 'paper-mi' });
+    await page.exportToPrint();
+    assert.equal(downloads.length, 0);
+    await page.onSelectPaperType({
+        currentTarget: { dataset: { id: 'tian' } },
+    });
+    old.resolve({ rendering: { rendererKey: 'paper-sheet', paperType: 'mi' } });
+    await first;
+    assert.equal(page.data.worksheetId, 'paper-tian');
+    await page.openEntry({ id: 'paper-unknown' });
+    assert.equal(page.data.hasContent, false);
+    assert.ok(toasts.length);
+    for (const getWorksheet of [
+        async () => {
+            throw new ApiRequestError('已下架', 404);
+        },
+        async () => ({
+            rendering: { rendererKey: 'paper-sheet', paperType: 'tian' },
+        }),
+    ]) {
+        const blocked = createPage({ getWorksheet }).page;
+        await blocked.onLoad({ id: 'paper-mi' });
+        assert.equal(blocked.data.hasContent, false);
+    }
+});
+
+test('收藏失败不报成功，慢速查询不能覆盖新收藏，切换时收藏响应不写错条目', async () => {
+    const pending = deferred();
+    const { page, toasts } = createPage({ favorite: async () => false });
+    await page.onLoad({ id: 'paper-mi' });
+    await page.onPreviewFavorite();
+    assert.equal(page.data.isPreviewFavorite, false);
+    assert.ok(toasts.some((title) => title.includes('失败')));
+    const active = createPage({ check: () => pending.promise }).page;
+    await active.onLoad({ id: 'paper-mi' });
+    await active.onPreviewFavorite();
+    pending.resolve({ 'paper-mi': false });
+    await new Promise((resolve) => setImmediate(resolve));
+    assert.equal(active.data.isPreviewFavorite, true);
+    const write = deferred();
+    const switching = createPage({ favorite: () => write.promise }).page;
+    await switching.onLoad({ id: 'paper-mi' });
+    const saving = switching.onPreviewFavorite();
+    await switching.openEntry({ id: 'paper-tian' });
+    write.resolve(true);
+    await saving;
+    assert.equal(switching.data.isPreviewFavorite, false);
+    assert.equal(switching._favoritedMap['paper-mi'], true);
+});
+
+test('开发版离线预览十种已注册纸张，切换不请求公开详情，未知 ID 仍不可用', async () => {
+    let requests = 0;
+    const { page, wx, toasts } = createPage({
+        getWorksheet: async () => {
+            requests++;
+            throw new Error('开发预览不应请求公开详情');
+        },
+    });
+    wx.getAccountInfoSync = () => ({ miniProgram: { envVersion: 'develop' } });
+    await page.onLoad({ id: 'paper-sheet' });
+    for (const paper of config.PAPER_TYPE_OPTIONS) {
+        await page.onSelectPaperType({
+            currentTarget: { dataset: { id: paper.id } },
+        });
+        assert.equal(page.data.hasContent, true);
+        assert.equal(page.data.selectedPaperType, paper.id);
+        assert.equal(
+            page.getPublishMeta().id,
+            config.getWorksheetIdForPaperType(paper.id),
+        );
+    }
+    assert.equal(requests, 0);
+    assert.equal(toasts.length, 0);
+    await page.openEntry({ id: 'paper-unknown' });
+    assert.equal(page.data.hasContent, false);
+    assert.equal(requests, 0);
+    assert.equal(toasts.length, 1);
+});
+
+test('体验版与正式版均校验公开详情，404 和网络故障不能降级成本地预览', async () => {
+    for (const version of ['trial', 'release']) {
+        for (const failure of [
+            new ApiRequestError('未发布', 404),
+            new ApiRequestError('网络故障', 0),
+        ]) {
+            let requests = 0;
+            const { page, wx } = createPage({
+                getWorksheet: async () => {
+                    requests++;
+                    throw failure;
+                },
+            });
+            wx.getAccountInfoSync = () => ({
+                miniProgram: { envVersion: version },
+            });
+            await page.onLoad({ id: 'paper-square' });
+            assert.equal(requests, 1);
+            assert.equal(page.data.hasContent, false);
+            assert.equal(page.data.isWorksheetReady, false);
+        }
+    }
+});