Compare commits
90
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
45a5e4d666 | ||
|
|
b0265f3be3 | ||
|
|
aa2b6f35b0 | ||
|
|
29116678aa | ||
|
|
b6fedd9f63 | ||
|
|
abf4e1b1c9 | ||
|
|
03460d5ab0 | ||
|
|
8f252d088a | ||
|
|
61f216ae0e | ||
|
|
96c3d3292d | ||
|
|
cbbf122280 | ||
|
|
64b6f5c27c | ||
|
|
a3730ee8fc | ||
|
|
d0a0eeea8c | ||
|
|
e75c524343 | ||
|
|
1a4f71996a | ||
|
|
a2fa6c3c31 | ||
|
|
015947f8fb | ||
|
|
072a1037ac | ||
|
|
447c224fce | ||
|
|
f2fc1e0810 | ||
|
|
12a3bf2f3b | ||
|
|
ca6d1712bd | ||
|
|
e7ef0b3ce5 | ||
|
|
b82aa12875 | ||
|
|
b43b6f2785 | ||
|
|
965dd10219 | ||
|
|
371689484e | ||
|
|
d923b8cea9 | ||
|
|
a1b29cedee | ||
|
|
34504c0b44 | ||
|
|
3af5611da5 | ||
|
|
2fe108d66a | ||
|
|
4cd3749806 | ||
|
|
00aeaa3cb1 | ||
|
|
b190f2758a | ||
|
|
4d9c84defc | ||
|
|
b4e3e86dcd | ||
|
|
5051839986 | ||
|
|
84522a8908 | ||
|
|
18bcdbeb00 | ||
|
|
040504774d | ||
|
|
1001c43af6 | ||
|
|
121148f6cf | ||
|
|
a08a2f0f98 | ||
|
|
669d4a7de6 | ||
|
|
ec0cf78d69 | ||
|
|
658c94a4e9 | ||
|
|
261a33a5ca | ||
|
|
f28332f49a | ||
|
|
c33c9cbd63 | ||
|
|
b742fc70b5 | ||
|
|
6bd91d5ee8 | ||
|
|
cdc7b407bc | ||
|
|
9bfa4bb736 | ||
|
|
c04ab1ef60 | ||
|
|
4a6bc42635 | ||
|
|
b86c661af5 | ||
|
|
71c068966e | ||
|
|
784b9cbac8 | ||
|
|
2325214078 | ||
|
|
e194e605f9 | ||
|
|
82381a5e93 | ||
|
|
ec6b0dee3e | ||
|
|
060bad2df0 | ||
|
|
adcaa12970 | ||
|
|
330d67adc1 | ||
|
|
737010ea03 | ||
|
|
ec84988e57 | ||
|
|
f266bda3a9 | ||
|
|
88ab2561bd | ||
|
|
98c7701ccd | ||
|
|
e752a3b7ed | ||
|
|
9389235a6c | ||
|
|
a293591dba | ||
|
|
8c5860699f | ||
|
|
06619a191f | ||
|
|
3a0099e674 | ||
|
|
ca1b873a50 | ||
|
|
c2bd956b07 | ||
|
|
b101d169c9 | ||
|
|
ab17f80607 | ||
|
|
6df4e1d72b | ||
|
|
cb046a4c27 | ||
|
|
3738be884b | ||
|
|
193858c727 | ||
|
|
ea81c754ed | ||
|
|
16fd827634 | ||
|
|
38e9d59864 | ||
|
|
fb072d844b |
No files matched your search
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"schemaVersion": 1,
|
||||
"scope": "模板完成证据登记,保留命令、日志与产物哈希",
|
||||
"generatedAt": "2026-10-20T09:00:52.740+00:00",
|
||||
"generatedAt": "2026-10-29T07:09:56.748Z",
|
||||
"templates": {
|
||||
"acheng-campus-food": {
|
||||
"real-manifest-interaction": {
|
||||
@@ -256,5 +256,5 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"sourceTreeHash": "775950266c3ec796f5af6eafabedae91a1fa6c1d4c71b29ca8d5b589b4846473"
|
||||
"sourceTreeHash": "6c984c7a56aeef55ed6af2b9f95ec5a8fb2073405b14846fdc79e056c8fe2a65"
|
||||
}
|
||||
@@ -1212,7 +1212,7 @@
|
||||
"code": "CONDITIONAL_RENDER_REVIEW",
|
||||
"severity": "review",
|
||||
"file": "packages/template-atelier-solopreneur/taro/index.tsx",
|
||||
"target": "atelier-solopreneur.detail.projectDetail",
|
||||
"target": "atelier-solopreneur.detail.projectHero",
|
||||
"line": 310,
|
||||
"message": "条件显示需验证全部分支与空数据入口。",
|
||||
"reviewStatus": "source-reviewed",
|
||||
@@ -1229,7 +1229,7 @@
|
||||
"code": "UNRESOLVED_RENDER_VALUE",
|
||||
"severity": "review",
|
||||
"file": "packages/template-atelier-solopreneur/taro/index.tsx",
|
||||
"target": "atelier-solopreneur.detail.projectDetail",
|
||||
"target": "atelier-solopreneur.detail.projectFacts",
|
||||
"page": "detail",
|
||||
"expression": "[item.category, item.area, item.series].filter",
|
||||
"line": 340,
|
||||
@@ -1248,7 +1248,7 @@
|
||||
"code": "DYNAMIC_TARGET_REVIEW",
|
||||
"severity": "review",
|
||||
"file": "packages/template-atelier-solopreneur/taro/index.tsx",
|
||||
"line": 433,
|
||||
"line": 453,
|
||||
"message": "动态目标需用真实 manifest 和实际记录验证分支。",
|
||||
"reviewStatus": "source-reviewed",
|
||||
"decision": "formTargets 为固定映射,模板只对 inquiry 注入 chips 和隐私区,其余共享页面保持原 children;没有动态业务 binding。",
|
||||
@@ -1860,7 +1860,7 @@
|
||||
"severity": "review",
|
||||
"file": "packages/template-atelier-solopreneur/taro/index.tsx",
|
||||
"page": "detail",
|
||||
"target": "atelier-solopreneur.detail.projectDetail",
|
||||
"target": "atelier-solopreneur.detail.projectFacts",
|
||||
"expression": "[item.category, item.area, item.series].filter(Boolean).map",
|
||||
"line": 340,
|
||||
"message": "需要核对循环项或间接映射,不能视为已覆盖。",
|
||||
|
||||
+5
-4
@@ -9,6 +9,8 @@ API_PREFIX=
|
||||
CORS_ORIGINS=http://localhost:3000
|
||||
ADMIN_PORT=3000
|
||||
SESSION_SECRET=replace-with-a-long-random-value
|
||||
# 单实例使用 memory;多实例部署改用 postgres 并先执行数据库迁移
|
||||
CLIENT_ERROR_THROTTLE_STORE=memory
|
||||
DEFAULT_BRAND_ID=00000000-0000-0000-0000-000000000001
|
||||
TEMPLATE_ARTIFACT_ROOT=/var/lib/personal-brand/template-artifacts
|
||||
SEED_ADMIN_PASSWORD=change-me-now-123
|
||||
@@ -17,19 +19,18 @@ OBJECT_STORAGE_PUBLIC_URL=http://localhost:9000/personal-brand-media
|
||||
OBJECT_STORAGE_BUCKET=personal-brand-media
|
||||
OBJECT_STORAGE_ACCESS_KEY=minioadmin
|
||||
OBJECT_STORAGE_SECRET_KEY=minioadmin
|
||||
WECHAT_APP_ID=
|
||||
WECHAT_APP_SECRET=
|
||||
# 微信 AppID 与 AppSecret 按品牌在后台「小程序配置」维护,不使用全局环境变量
|
||||
WECHAT_UPLOAD_PRIVATE_KEY=
|
||||
MINIAPP_CREDENTIAL_ENCRYPTION_KEY=replace-with-32-byte-random-secret
|
||||
# 小程序代码构建产物根目录,相对路径按仓库根目录解析;默认 apps/taro/dist
|
||||
# MINIAPP_ARTIFACT_ROOT=apps/taro/dist
|
||||
# 构建超过该毫秒数没有进度更新即视为中断,允许重新上传;默认 15 分钟
|
||||
# MINIAPP_BUILD_STALE_MS=900000
|
||||
# 小程序请求地址在后台「小程序上传配置」维护,这里仅为回落值;
|
||||
# 小程序请求地址在后台「小程序配置」维护,这里仅为回落值;
|
||||
# 未设置时由 PUBLIC_BASE_URL + MINIAPP_API_PATH 推导
|
||||
# MINIAPP_API_BASE_URL=https://wechat.app.que01.top/api
|
||||
# MINIAPP_API_PATH=/api
|
||||
# 单个品牌的 AppID 在后台“小程序上传配置”维护,这里只作为回落值
|
||||
# 单个品牌的 AppID 在后台“小程序配置”维护,这里只作为回落值
|
||||
# WEAPP_APP_ID=
|
||||
# 上传子进程工作目录;miniprogram-ci 的编译缓存放这里,默认系统临时目录
|
||||
# MINIAPP_UPLOAD_WORKSPACE=/tmp/personal-brand-miniapp-upload
|
||||
+13
-3
@@ -6,6 +6,11 @@ POSTGRES_PORT=5432
|
||||
|
||||
DATABASE_URL=postgresql://personal_brand:replace-with-a-long-database-password@127.0.0.1:5432/personal_brand?schema=public
|
||||
SESSION_SECRET=replace-with-at-least-32-random-characters
|
||||
# 建议单独配置并长期保持不变;未设置时回退 SESSION_SECRET。
|
||||
# 轮换该密钥后,已保存的上传私钥和 AppSecret 都需要在后台重新填写。
|
||||
# MINIAPP_CREDENTIAL_ENCRYPTION_KEY=replace-with-32-byte-random-secret
|
||||
# 单实例使用 memory;多实例部署改用 postgres 并先执行数据库迁移
|
||||
CLIENT_ERROR_THROTTLE_STORE=memory
|
||||
DEFAULT_BRAND_ID=00000000-0000-0000-0000-000000000001
|
||||
SEED_ADMIN_PASSWORD=replace-with-a-one-time-initial-password
|
||||
SEED_MODE=skip
|
||||
@@ -14,6 +19,12 @@ API_PORT=3001
|
||||
API_PREFIX=
|
||||
CORS_ORIGINS=
|
||||
|
||||
# 发布备份保留 7 份;定时备份默认保留 14 天
|
||||
BACKUP_RETENTION_DAYS=14
|
||||
# 可选:配置 rsync 目标后,每次定时备份会额外复制一份到异地
|
||||
# 需要预先为 ubuntu 用户配置 SSH key;未配置时备份只保留在本机
|
||||
# BACKUP_OFFSITE_TARGET=backup@example-host:/srv/personal-brand-backups/
|
||||
|
||||
LOCAL_MEDIA_ROOT=/home/ubuntu/persional-brand/media
|
||||
LOCAL_MEDIA_BASE_URL=/media
|
||||
OBJECT_STORAGE_ENDPOINT=
|
||||
@@ -23,10 +34,9 @@ OBJECT_STORAGE_ACCESS_KEY=
|
||||
OBJECT_STORAGE_SECRET_KEY=
|
||||
OBJECT_STORAGE_REGION=us-east-1
|
||||
|
||||
WECHAT_APP_ID=
|
||||
WECHAT_APP_SECRET=
|
||||
# 微信 AppID 与 AppSecret 按品牌在后台「小程序配置」维护,不使用全局环境变量
|
||||
|
||||
# 小程序请求地址正常情况下在后台「小程序上传配置」维护;
|
||||
# 小程序请求地址正常情况下在后台「小程序配置」维护;
|
||||
# 这里仅作为后台未配置时的回落值(否则由 PUBLIC_BASE_URL + /api 推导)
|
||||
# MINIAPP_API_BASE_URL=https://wechat.app.que01.top/api
|
||||
# MINIAPP_BUILD_STALE_MS=900000
|
||||
@@ -0,0 +1,178 @@
|
||||
name: CI
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
# 纯文档提交不占用 runner;需要状态时用 workflow_dispatch 手动触发。
|
||||
paths-ignore:
|
||||
- "**.md"
|
||||
# PR 不设置 paths-ignore:branch protection 的 required checks 必须始终上报,
|
||||
# 否则纯文档 PR 会永远等不到状态检查而无法合并。
|
||||
pull_request:
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
group: ci-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
env:
|
||||
NODE_VERSION: "24"
|
||||
PNPM_VERSION: "9.15.0"
|
||||
# runner 任务容器把该路径 bind mount 到宿主机共享 store,避免每个 job 重复下载依赖。
|
||||
npm_config_store_dir: /workspace/.pnpm-store
|
||||
|
||||
jobs:
|
||||
static:
|
||||
name: Static checks
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 40
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Verify preinstalled toolchain
|
||||
# 任务镜像已内置 Node 与 pnpm;不在这里下载 Node,避免 nodejs.org 慢连接拖死整个 job。
|
||||
run: |
|
||||
actual_node="$(node -p 'process.versions.node')"
|
||||
actual_pnpm="$(pnpm --version)"
|
||||
test "${actual_node%%.*}" = "$NODE_VERSION" || { echo "expected Node $NODE_VERSION.x, got $actual_node" >&2; exit 1; }
|
||||
test "$actual_pnpm" = "$PNPM_VERSION" || { echo "expected pnpm $PNPM_VERSION, got $actual_pnpm" >&2; exit 1; }
|
||||
- name: Restore Prisma engine cache
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ~/.cache/prisma
|
||||
key: prisma-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml') }}
|
||||
restore-keys: |
|
||||
prisma-${{ runner.os }}-${{ runner.arch }}-
|
||||
- name: Restore Turbo cache
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: .turbo/cache
|
||||
key: turbo-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml') }}-${{ github.sha }}
|
||||
restore-keys: |
|
||||
turbo-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml') }}-
|
||||
turbo-${{ runner.os }}-${{ runner.arch }}-
|
||||
- run: pnpm install --frozen-lockfile
|
||||
- run: pnpm check
|
||||
- run: pnpm test:api-routes
|
||||
- run: pnpm test:deploy
|
||||
- run: pnpm validate:templates
|
||||
- run: pnpm template:compatibility
|
||||
- run: pnpm --filter @personal-brand/api exec tsx --test test/template-preview-matrix.test.ts
|
||||
- run: pnpm template:conformance
|
||||
- run: pnpm template:doctor
|
||||
|
||||
build:
|
||||
name: Production build
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 60
|
||||
needs: [static]
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Verify preinstalled toolchain
|
||||
# 任务镜像已内置 Node 与 pnpm;不在这里下载 Node,避免 nodejs.org 慢连接拖死整个 job。
|
||||
run: |
|
||||
actual_node="$(node -p 'process.versions.node')"
|
||||
actual_pnpm="$(pnpm --version)"
|
||||
test "${actual_node%%.*}" = "$NODE_VERSION" || { echo "expected Node $NODE_VERSION.x, got $actual_node" >&2; exit 1; }
|
||||
test "$actual_pnpm" = "$PNPM_VERSION" || { echo "expected pnpm $PNPM_VERSION, got $actual_pnpm" >&2; exit 1; }
|
||||
- name: Restore Prisma engine cache
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ~/.cache/prisma
|
||||
key: prisma-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml') }}
|
||||
restore-keys: |
|
||||
prisma-${{ runner.os }}-${{ runner.arch }}-
|
||||
- name: Restore Turbo cache
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: .turbo/cache
|
||||
key: turbo-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml') }}-${{ github.sha }}
|
||||
restore-keys: |
|
||||
turbo-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml') }}-
|
||||
turbo-${{ runner.os }}-${{ runner.arch }}-
|
||||
- run: pnpm install --frozen-lockfile
|
||||
- run: pnpm build
|
||||
- run: pnpm build:admin:preview
|
||||
- run: pnpm validate:template-release
|
||||
|
||||
browser-smoke:
|
||||
name: Browser smoke
|
||||
# 只在 PR 和手动触发时运行,避免 main 合并后重复消耗共享生产 runner。
|
||||
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 30
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Verify preinstalled toolchain
|
||||
# 任务镜像已内置 Node 与 pnpm;不在这里下载 Node,避免 nodejs.org 慢连接拖死整个 job。
|
||||
run: |
|
||||
actual_node="$(node -p 'process.versions.node')"
|
||||
actual_pnpm="$(pnpm --version)"
|
||||
test "${actual_node%%.*}" = "$NODE_VERSION" || { echo "expected Node $NODE_VERSION.x, got $actual_node" >&2; exit 1; }
|
||||
test "$actual_pnpm" = "$PNPM_VERSION" || { echo "expected pnpm $PNPM_VERSION, got $actual_pnpm" >&2; exit 1; }
|
||||
- name: Restore Prisma engine cache
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ~/.cache/prisma
|
||||
key: prisma-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml') }}
|
||||
restore-keys: |
|
||||
prisma-${{ runner.os }}-${{ runner.arch }}-
|
||||
- run: pnpm install --frozen-lockfile
|
||||
- name: Cache Playwright browsers
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ~/.cache/ms-playwright
|
||||
key: playwright-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml') }}
|
||||
- name: Install Chromium
|
||||
# 系统依赖与同版本 Chromium 已预装在 personal-brand-ci:node24 中;这里只做版本兜底。
|
||||
run: pnpm --filter @personal-brand/taro exec playwright install chromium
|
||||
- name: Run PR browser smoke
|
||||
run: pnpm test:browser:smoke
|
||||
|
||||
api:
|
||||
name: API integration
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 45
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:16-alpine
|
||||
env:
|
||||
POSTGRES_USER: postgres
|
||||
POSTGRES_PASSWORD: postgres
|
||||
POSTGRES_DB: personal_brand
|
||||
options: >-
|
||||
--health-cmd "pg_isready -U postgres -d personal_brand"
|
||||
--health-interval 5s
|
||||
--health-timeout 5s
|
||||
--health-retries 12
|
||||
env:
|
||||
DATABASE_URL: postgresql://postgres:postgres@postgres:5432/personal_brand
|
||||
DEFAULT_BRAND_ID: 00000000-0000-0000-0000-000000000001
|
||||
SESSION_SECRET: ci-integration-session-secret-0123456789abcdef
|
||||
SEED_ADMIN_PASSWORD: ci-integration-admin-password
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Verify preinstalled toolchain
|
||||
# 任务镜像已内置 Node 与 pnpm;不在这里下载 Node,避免 nodejs.org 慢连接拖死整个 job。
|
||||
run: |
|
||||
actual_node="$(node -p 'process.versions.node')"
|
||||
actual_pnpm="$(pnpm --version)"
|
||||
test "${actual_node%%.*}" = "$NODE_VERSION" || { echo "expected Node $NODE_VERSION.x, got $actual_node" >&2; exit 1; }
|
||||
test "$actual_pnpm" = "$PNPM_VERSION" || { echo "expected pnpm $PNPM_VERSION, got $actual_pnpm" >&2; exit 1; }
|
||||
- name: Restore Prisma engine cache
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: ~/.cache/prisma
|
||||
key: prisma-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml') }}
|
||||
restore-keys: |
|
||||
prisma-${{ runner.os }}-${{ runner.arch }}-
|
||||
- run: pnpm install --frozen-lockfile
|
||||
- name: Prepare API test env
|
||||
working-directory: apps/api
|
||||
run: |
|
||||
cat > .env <<EOF
|
||||
DATABASE_URL=$DATABASE_URL
|
||||
DEFAULT_BRAND_ID=$DEFAULT_BRAND_ID
|
||||
SESSION_SECRET=$SESSION_SECRET
|
||||
SEED_ADMIN_PASSWORD=$SEED_ADMIN_PASSWORD
|
||||
EOF
|
||||
- run: pnpm --filter @personal-brand/api test:integration
|
||||
Executable
+6
@@ -0,0 +1,6 @@
|
||||
#!/bin/sh
|
||||
# 提交前让模板完成证据的源码哈希跟随当前工作树,避免额外的 chore 提交。
|
||||
set -e
|
||||
[ -f scripts/template-evidence-refresh.mjs ] || exit 0
|
||||
command -v node >/dev/null 2>&1 || exit 0
|
||||
node scripts/template-evidence-refresh.mjs --stage
|
||||
@@ -1,198 +0,0 @@
|
||||
name: CI
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
push:
|
||||
branches: [main]
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
static:
|
||||
name: Static checks
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: pnpm/action-setup@v4
|
||||
with:
|
||||
version: 9.15.0
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 24
|
||||
cache: pnpm
|
||||
- run: pnpm install --frozen-lockfile
|
||||
- run: pnpm check
|
||||
- run: pnpm test:api-routes
|
||||
- run: pnpm audit --prod --registry=https://registry.npmjs.org
|
||||
- run: pnpm validate:templates
|
||||
- run: pnpm template:compatibility
|
||||
- run: pnpm --filter @personal-brand/api exec tsx --test test/template-preview-matrix.test.ts
|
||||
- run: pnpm template:conformance
|
||||
- run: pnpm template:doctor
|
||||
|
||||
build:
|
||||
name: Production build
|
||||
runs-on: ubuntu-latest
|
||||
needs: [static]
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: pnpm/action-setup@v4
|
||||
with:
|
||||
version: 9.15.0
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 24
|
||||
cache: pnpm
|
||||
- run: pnpm install --frozen-lockfile
|
||||
- run: pnpm build
|
||||
- run: pnpm build:admin:preview
|
||||
- run: pnpm validate:template-release
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: admin-dist
|
||||
path: apps/admin/dist
|
||||
retention-days: 7
|
||||
|
||||
api:
|
||||
name: API integration
|
||||
runs-on: ubuntu-latest
|
||||
needs: [static]
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:16-alpine
|
||||
env:
|
||||
POSTGRES_USER: postgres
|
||||
POSTGRES_PASSWORD: postgres
|
||||
POSTGRES_DB: personal_brand
|
||||
ports:
|
||||
- 5432:5432
|
||||
options: >-
|
||||
--health-cmd "pg_isready -U postgres -d personal_brand"
|
||||
--health-interval 5s
|
||||
--health-timeout 5s
|
||||
--health-retries 12
|
||||
env:
|
||||
DATABASE_URL: postgresql://postgres:postgres@localhost:5432/personal_brand
|
||||
DEFAULT_BRAND_ID: 00000000-0000-0000-0000-000000000001
|
||||
SESSION_SECRET: ci-integration-session-secret-0123456789abcdef
|
||||
SEED_ADMIN_PASSWORD: ci-integration-admin-password
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: pnpm/action-setup@v4
|
||||
with:
|
||||
version: 9.15.0
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 24
|
||||
cache: pnpm
|
||||
- run: pnpm install --frozen-lockfile
|
||||
- name: Prepare API test env
|
||||
working-directory: apps/api
|
||||
run: |
|
||||
cat > .env <<EOF
|
||||
DATABASE_URL=$DATABASE_URL
|
||||
DEFAULT_BRAND_ID=$DEFAULT_BRAND_ID
|
||||
SESSION_SECRET=$SESSION_SECRET
|
||||
SEED_ADMIN_PASSWORD=$SEED_ADMIN_PASSWORD
|
||||
EOF
|
||||
- run: pnpm --filter @personal-brand/api test:integration
|
||||
|
||||
taro:
|
||||
name: Taro builds
|
||||
runs-on: ubuntu-latest
|
||||
needs: [static]
|
||||
strategy:
|
||||
matrix:
|
||||
template: [acheng-campus-food, atelier-solopreneur, linjing-editorial]
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: pnpm/action-setup@v4
|
||||
with:
|
||||
version: 9.15.0
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 24
|
||||
cache: pnpm
|
||||
- run: pnpm install --frozen-lockfile
|
||||
- run: TEMPLATE_KEY=acheng-campus-food pnpm --filter @personal-brand/taro build:h5
|
||||
env:
|
||||
TEMPLATE_KEY: ${{ matrix.template }}
|
||||
- run: TEMPLATE_KEY=acheng-campus-food pnpm --filter @personal-brand/taro build:weapp
|
||||
env:
|
||||
TEMPLATE_KEY: ${{ matrix.template }}
|
||||
|
||||
browser:
|
||||
name: Browser regression
|
||||
runs-on: ubuntu-latest
|
||||
needs: [build, taro]
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:16-alpine
|
||||
env:
|
||||
POSTGRES_USER: postgres
|
||||
POSTGRES_PASSWORD: postgres
|
||||
POSTGRES_DB: personal_brand
|
||||
ports:
|
||||
- 5432:5432
|
||||
options: >-
|
||||
--health-cmd "pg_isready -U postgres -d personal_brand"
|
||||
--health-interval 5s
|
||||
--health-timeout 5s
|
||||
--health-retries 12
|
||||
env:
|
||||
DATABASE_URL: postgresql://postgres:postgres@localhost:5432/personal_brand
|
||||
DEFAULT_BRAND_ID: 00000000-0000-0000-0000-000000000001
|
||||
SESSION_SECRET: ci-integration-session-secret-0123456789abcdef
|
||||
SEED_ADMIN_PASSWORD: ci-integration-admin-password
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: pnpm/action-setup@v4
|
||||
with:
|
||||
version: 9.15.0
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 24
|
||||
cache: pnpm
|
||||
- run: pnpm install --frozen-lockfile
|
||||
- run: pnpm --filter @personal-brand/taro exec playwright install --with-deps chromium
|
||||
- name: Prepare API test env
|
||||
working-directory: apps/api
|
||||
run: |
|
||||
cat > .env <<EOF
|
||||
DATABASE_URL=$DATABASE_URL
|
||||
DEFAULT_BRAND_ID=$DEFAULT_BRAND_ID
|
||||
SESSION_SECRET=$SESSION_SECRET
|
||||
SEED_ADMIN_PASSWORD=$SEED_ADMIN_PASSWORD
|
||||
EOF
|
||||
- run: pnpm --filter @personal-brand/api db:migrate:deploy
|
||||
- run: pnpm --filter @personal-brand/api db:seed
|
||||
- run: pnpm --filter @personal-brand/api test:integration
|
||||
- name: Start API
|
||||
run: pnpm --filter @personal-brand/api start > /tmp/api.log 2>&1 &
|
||||
env:
|
||||
DATABASE_URL: postgresql://postgres:postgres@localhost:5432/personal_brand
|
||||
DEFAULT_BRAND_ID: 00000000-0000-0000-0000-000000000001
|
||||
SESSION_SECRET: browser-ci-session-secret-0123456789abcdef
|
||||
NODE_ENV: development
|
||||
- name: Start mini program preview
|
||||
run: pnpm --filter @personal-brand/taro dev:h5 > /tmp/taro.log 2>&1 &
|
||||
env:
|
||||
API_BASE_URL: http://localhost:3001
|
||||
BRAND_SLUG: default-brand
|
||||
TEMPLATE_KEY: acheng-campus-food
|
||||
- name: Start admin
|
||||
run: pnpm --filter @personal-brand/admin dev > /tmp/admin.log 2>&1 &
|
||||
env:
|
||||
VITE_API_BASE_URL: /api
|
||||
VITE_DEV_API_TARGET: http://localhost:3001
|
||||
VITE_TEMPLATE_PREVIEW_URL: http://localhost:3002
|
||||
- name: Wait for services
|
||||
run: |
|
||||
curl --retry 30 --retry-delay 1 --retry-connrefused -fsS http://localhost:3001/health
|
||||
curl --retry 30 --retry-delay 1 --retry-connrefused -fsS http://localhost:3002
|
||||
curl --retry 30 --retry-delay 1 --retry-connrefused -fsS http://localhost:3000
|
||||
- run: pnpm --filter @personal-brand/taro exec playwright test --config=playwright.config.ts --reporter=line
|
||||
env:
|
||||
ADMIN_URL: http://localhost:3000
|
||||
@@ -24,6 +24,9 @@ media/
|
||||
|
||||
**/.swc/
|
||||
.codex-tasks/
|
||||
!.codex-tasks/template-audit-execution/
|
||||
!.codex-tasks/template-audit-execution/raw/
|
||||
!.codex-tasks/template-audit-execution/raw/completion-evidence.json
|
||||
docker-compose.override.yml
|
||||
.env.production
|
||||
|
||||
|
||||
+110
-17
@@ -1,26 +1,76 @@
|
||||
# Project Status
|
||||
|
||||
最后更新:2026-10-20
|
||||
最后更新:2026-10-21
|
||||
|
||||
## 当前阶段
|
||||
|
||||
系统已从“餐饮试点小程序”演进为多模板个人品牌平台。当前分支完成了统一模板契约收口、模板完成证据门禁、管理员登录态撤销和 release 版本一致性修复。
|
||||
系统已从“餐饮试点小程序”演进为多模板个人品牌平台。当前已完成统一模板契约收口、模板完成证据门禁、品牌与页面方案拆分、管理员登录态撤销和 release 版本一致性修复。
|
||||
|
||||
ADR 0033 已落地:
|
||||
|
||||
- “表达方式”已从 Admin 源码移除。
|
||||
- “业务类型”和“页面方案”是两个独立概念。
|
||||
- 新增“创建品牌”和“页面方案”页面。
|
||||
- 创建品牌不会自动导入示例内容。
|
||||
- `linjing-editorial` 只兼容 `doors`,不再兼容 `personal`。
|
||||
|
||||
## 当前能力
|
||||
|
||||
- NestJS + Fastify API、Prisma PostgreSQL、全局 DTO 校验、统一错误响应和 `requestId`。
|
||||
- 多品牌 Admin、品牌 membership、角色边界、品牌切换和品牌隔离。
|
||||
- 创建品牌时按业务类型筛选兼容的页面方案;不兼容组合无法提交。
|
||||
- 模板包发现、确定性打包、导入、校验、发布、预览、安装、升级和回滚。
|
||||
- 三套已交付模板:
|
||||
- `acheng-campus-food@1.0.3`
|
||||
- `atelier-solopreneur@1.3.2`
|
||||
- `linjing-editorial@1.0.7`
|
||||
- 三套已交付模板及其业务类型:
|
||||
- `acheng-campus-food@1.0.3`:`food`
|
||||
- `atelier-solopreneur@1.3.2`:`personal`
|
||||
- `linjing-editorial@1.0.7`:`doors`
|
||||
- Taro Runtime、Admin 组件预览、真实 manifest 驱动编辑、草稿/发布隔离。
|
||||
- 发布备注为可选字段;空备注不会写入数据库,也不影响发布、回滚和公开内容。
|
||||
- 依赖 override 的运行时兼容性通过 `miniprogram-ci` / Jimp / image-size / uuid smoke test 守卫。
|
||||
- Gitea Actions CI 已在 `oracle_arm` 自托管 runner 上落地,`static` / `build` / `api` 三个 job 已完整通过(run 21);详见 `docs/ci.md`。
|
||||
- 小程序构建、上传任务状态机、attempt lease 和失败记录。
|
||||
- Admin/Customer token version:修改 admin 密码或调用 logout 后旧 token 立即失效;无 membership 的账号不会自动获得 owner 权限。
|
||||
- `visualPresentation` 已进入唯一 `template.json` 契约,旧手写 visual manifest 优先路径已删除。
|
||||
|
||||
## 生产状态
|
||||
|
||||
当前生产 release:
|
||||
|
||||
```text
|
||||
20261023100112-a2fa6c3c3140
|
||||
```
|
||||
|
||||
该 release 由提交 `a2fa6c3` 构建,新增生产数据库每日定时备份、备份可读性校验、发布/定时备份保留策略、`backup-timer` 与 `backup-age-hours` 部署状态门禁。部署后已手动触发一次 `personal-brand-backup.service`,生成 `scheduled-20261023T100426Z-1029929.dump`,并通过 `pg_restore -l` 校验可读。
|
||||
|
||||
生产健康检查:
|
||||
|
||||
```text
|
||||
api=online
|
||||
pm2-autostart=enabled
|
||||
admin=active
|
||||
database=running
|
||||
backups=8
|
||||
latest-backup=2026-10-23 10:04:27 +0000 scheduled-20261023T100426Z-1029929.dump
|
||||
backup-timer=active
|
||||
backup-age-hours=0
|
||||
backup-temp-files=0
|
||||
/admin/ 200
|
||||
/template-preview/ 200
|
||||
/api/health 200
|
||||
/media/seed/food-package-02.jpg 200
|
||||
/admin/client-errors(无登录态) 401
|
||||
```
|
||||
|
||||
生产数据库已应用全部 48 个 Prisma migration,schema 为 up to date。
|
||||
|
||||
三个生产品牌的当前发布快照:
|
||||
|
||||
| 品牌 | 业务类型 | 页面方案 | 发布版本 |
|
||||
| ---------------- | ---------- | --------------------------- | ------------ |
|
||||
| `atelier-studio` | `personal` | `atelier-solopreneur@1.3.2` | `v2 current` |
|
||||
| `default-brand` | `food` | `acheng-campus-food@1.0.3` | `v2 current` |
|
||||
| `linjing-doors` | `doors` | `linjing-editorial@1.0.7` | `v3 current` |
|
||||
|
||||
## 完成证据
|
||||
|
||||
`.codex-tasks/template-audit-execution/raw/completion-evidence.json` 登记四类证据:
|
||||
@@ -38,6 +88,50 @@ completionStatus=complete
|
||||
unresolvedIssues=0
|
||||
```
|
||||
|
||||
Admin 浏览器回归新增 `apps/taro/test/browser/brand-creation-and-page-scheme.spec.ts`,覆盖:
|
||||
|
||||
- 创建品牌时按业务类型筛选页面方案。
|
||||
- `personal` 不出现林境页面方案。
|
||||
- 切换业务类型后清除不兼容的页面方案选择,提交按钮禁用。
|
||||
- 创建失败时保留用户输入并显示错误。
|
||||
- 页面方案切换和升级提交正确版本、校验和与冲突保留参数。
|
||||
- 操作成功后刷新工作区、页面方案选项和升级预览查询。
|
||||
|
||||
`apps/taro/test/browser/publication-release.spec.ts` 覆盖内容与发布流程:
|
||||
|
||||
- 发布按钮按 readiness 启用;空备注发布提交空 body,不写入 `note`。
|
||||
- 备注提交前去除首尾空格。
|
||||
- 发布失败时保留备注与确认弹窗,并显示服务端错误。
|
||||
- 撤回当前版本、恢复历史版本分别提交正确路径与版本号。
|
||||
- 小程序配置页从服务端回填设置,只提交用户新输入的私钥。
|
||||
|
||||
该回归同时发现并修复了 `MiniAppSettingsTab` 的 `Form` 实例归属问题:表单实例原本在父组件创建、子组件懒挂载,触发 antd `useForm` 未连接警告;现已下沉到配置页自身。
|
||||
|
||||
## Admin 渲染错误边界
|
||||
|
||||
后台此前没有任何 React error boundary:任一页面在渲染阶段抛错(例如接口返回了形状不符的数据)都会导致整页白屏,用户只能从控制台看到堆栈。现在按两级兜底:
|
||||
|
||||
- `Root` 上的整页边界:后台外壳自身渲染失败时显示错误页,提供「重新加载页面」和「返回概览」。
|
||||
- `Dashboard` 内容区的页面边界:单个业务页面失败时保留侧边栏与顶部导航,提供「重试」和「重新加载页面」,切换路由后自动复位。
|
||||
- 错误页展示可复制的错误编号,日志侧输出同一编号、堆栈与组件栈,便于把用户反馈和服务器日志对应起来。
|
||||
- 开发环境额外显示原始错误信息;生产环境不暴露堆栈。
|
||||
|
||||
外壳数据不再直接信任接口形状:`apps/admin/src/lib/brand-switcher.ts` 只接受完整成员记录,跳过异常条目并对重复品牌、缺失名称和非字符串品牌名做稳定收敛,避免单条脏数据让整个后台外壳崩溃。错误边界只作为最后一道防线。
|
||||
|
||||
`apps/taro/test/browser/admin-error-boundary.spec.ts` 覆盖:
|
||||
|
||||
- 品牌成员与品牌名称返回异常结构时,后台外壳仍正常渲染。
|
||||
- 业务页面数据异常时保留导航,重试仍失败保持错误页,重新加载后恢复。
|
||||
|
||||
`apps/admin/test/brand-switcher.test.mjs` 覆盖选项转换的异常条目、非数组、重复品牌、缺失名称与非字符串名称。
|
||||
|
||||
## Ant Design 6 弃用项
|
||||
|
||||
- `Alert` 统一使用 `title`,`Space` 统一使用 `orientation`。
|
||||
- 提示与确认框改为 `App.useApp()` 实例,删除静态 `message` 转出口 `components/AdminMessage.ts`。
|
||||
- `apps/admin/test/antd-deprecations.test.mjs` 作为静态门禁,阻止静态 `message`、`Modal.confirm`、`Alert.message`、`Space.direction` 回流。
|
||||
- `List` 仍保留:`Listy` 是虚拟滚动组件,API 不兼容,当前仅用于小数据量场景;已记录在 `docs/adr/0034-antd6-static-api-and-list.md`,升级 Ant Design 7 前重新评估。
|
||||
|
||||
## 已验证门禁
|
||||
|
||||
- `pnpm check`
|
||||
@@ -46,13 +140,21 @@ unresolvedIssues=0
|
||||
- `pnpm --filter @personal-brand/api test:integration`
|
||||
- `miniprogram-ci` override 兼容 smoke test
|
||||
- `pnpm test:api-client`
|
||||
- `pnpm test:deploy`
|
||||
- `pnpm --filter @personal-brand/admin typecheck`
|
||||
- `pnpm --filter @personal-brand/admin lint`
|
||||
- `pnpm --filter @personal-brand/admin test`
|
||||
- `pnpm --filter @personal-brand/admin build`
|
||||
- `pnpm build`
|
||||
- `pnpm template:doctor`
|
||||
- Playwright:
|
||||
- `brand-creation-and-page-scheme.spec.ts`
|
||||
- `publication-release.spec.ts`
|
||||
- `admin-error-boundary.spec.ts`
|
||||
- `template-preview-media.spec.ts`
|
||||
- `admin-editor.spec.ts`
|
||||
|
||||
本机数据库已应用全部 46 个 Prisma migration,`prisma migrate status` 为 up to date。
|
||||
发布脚本的 Node 版本门禁已提前到所有构建之前。Node 22 下执行 `pnpm deploy:release` 会立即失败,并给出 Node.js 24 要求提示,不再先执行一轮无用构建。
|
||||
|
||||
## 安全审计
|
||||
|
||||
@@ -61,17 +163,8 @@ unresolvedIssues=0
|
||||
- 剩余 8 条为 `miniprogram-ci@2.1.31` 无修复版本的上游 advisory,已在 `pnpm.auditConfig.ignoreGhsas` 和 `docs/security-audit.md` 中显式登记风险、控制措施与跟进条件。
|
||||
- Taro 官方 peer 仍声明 Vite 4;当前使用 Vite 6.4.3,H5 与 Weapp 实际构建均通过,peer warning 记录在安全审计文档。
|
||||
|
||||
## 本机数据状态
|
||||
|
||||
- 本机数据库 schema 已 up to date。
|
||||
- 当前三个新版本已通过模板导入服务导入并发布:
|
||||
- `acheng-campus-food@1.0.3`
|
||||
- `atelier-solopreneur@1.3.2`
|
||||
- `linjing-editorial@1.0.7`
|
||||
- 既有品牌安装仍锁定各自原版本,需通过 Admin 的显式升级流程升级,不在本任务中静默变更。
|
||||
|
||||
## 未决事项
|
||||
|
||||
- 生产发布仍需按 `docs/deployment.md` 配置真实环境变量并执行部署后健康检查。
|
||||
- `miniprogram-ci` 上游发布修复版本后,需要移除对应的 audit ignore、风险登记和本地 patch。
|
||||
- Gitea SSH 直连仍受 OCI 安全列表限制;当前本机通过 `oracle_arm` ProxyCommand 转发访问,不阻塞业务。
|
||||
- CI 已加入 audit 和三套模板矩阵构建;后续可继续拆分更细粒度的 smoke/visual matrix。
|
||||
@@ -33,7 +33,7 @@ import {
|
||||
} from "./routes.js";
|
||||
import { LoadingStack } from "../components/LoadingStack.js";
|
||||
import { AdminMenu } from "../components/AdminMenu.js";
|
||||
import { adminMessage as message } from "../components/AdminMessage.js";
|
||||
import { App } from "antd";
|
||||
import { AdminButton } from "../components/AdminButton.js";
|
||||
import { AdminSelect } from "../components/AdminSelect.js";
|
||||
import { AdminLayout } from "../components/AdminLayout.js";
|
||||
@@ -41,6 +41,8 @@ import { Route, Routes } from "react-router-dom";
|
||||
import { AdminOverviewRedirect } from "./AdminRouter.js";
|
||||
import { createBrandRouteElement } from "./route-access.js";
|
||||
import { Suspense } from "react";
|
||||
import { AdminErrorBoundary } from "../components/AdminErrorBoundary.js";
|
||||
import { toBrandDisplayName, toBrandSwitcherOptions } from "../lib/brand-switcher.js";
|
||||
|
||||
export function Dashboard({
|
||||
onLogout,
|
||||
@@ -51,6 +53,7 @@ export function Dashboard({
|
||||
role: string;
|
||||
platformTemplateRole: "none" | "template_admin";
|
||||
}) {
|
||||
const { message } = App.useApp();
|
||||
const navigate = useNavigate();
|
||||
const location = useLocation();
|
||||
const brand = useQuery({
|
||||
@@ -70,6 +73,8 @@ export function Dashboard({
|
||||
}
|
||||
};
|
||||
const page = location.pathname.split("/")[2] || "overview";
|
||||
const brandName = toBrandDisplayName(brand.data?.name, "当前品牌");
|
||||
const brandOptions = toBrandSwitcherOptions(memberships.data);
|
||||
const items = [
|
||||
{
|
||||
type: "group" as const,
|
||||
@@ -106,7 +111,7 @@ export function Dashboard({
|
||||
<AdminLayout className="admin-shell">
|
||||
<AdminLayout.Sider className="admin-sider" breakpoint="lg" collapsedWidth={0} width={232}>
|
||||
<div className="admin-sider-brand">
|
||||
<BrandMark name={brand.data?.name} />
|
||||
<BrandMark name={toBrandDisplayName(brand.data?.name, "")} />
|
||||
<span className="admin-sider-brand-name">品牌工作区</span>
|
||||
</div>
|
||||
<AdminMenu
|
||||
@@ -118,7 +123,7 @@ export function Dashboard({
|
||||
<AdminLayout className="admin-main">
|
||||
<AdminLayout.Header className="admin-header">
|
||||
<div className="admin-header-left">
|
||||
<span className="admin-header-brand">{brand.data?.name || "当前品牌"}</span>
|
||||
<span className="admin-header-brand">{brandName}</span>
|
||||
<span className="admin-header-context">品牌工作区</span>
|
||||
<StatusTag
|
||||
tone={role === "owner" ? "info" : "neutral"}
|
||||
@@ -133,10 +138,7 @@ export function Dashboard({
|
||||
onChange={(value: string | undefined) => {
|
||||
if (value) void switchBrand(value);
|
||||
}}
|
||||
options={(memberships.data ?? []).map((item) => ({
|
||||
value: item.brand.id,
|
||||
label: item.brand.name,
|
||||
}))}
|
||||
options={brandOptions}
|
||||
/>
|
||||
</div>
|
||||
<AdminButton type="text" onClick={onLogout}>
|
||||
@@ -145,37 +147,39 @@ export function Dashboard({
|
||||
</AdminLayout.Header>
|
||||
<AdminLayout.Content className="admin-content">
|
||||
<div className="admin-content-inner">
|
||||
<Suspense fallback={<LoadingStack />}>
|
||||
<Routes>
|
||||
<Route index element={<AdminOverviewRedirect />} />
|
||||
<Route path="overview" element={<FeatureOverviewPage />} />
|
||||
<Route path="publication" element={<FeaturePublicationPage />} />
|
||||
<Route path="brand" element={<FeatureBrandPage />} />
|
||||
<Route path="trust" element={<FeatureTrustContentPage />} />
|
||||
<Route path="services" element={<FeatureServicesPage />} />
|
||||
<Route path="inquiries" element={<FeatureInquiriesPage />} />
|
||||
<Route path="workspace" element={<FeatureWorkspacePage />} />
|
||||
{role === "editor" ? null : (
|
||||
<>
|
||||
<Route
|
||||
path="brands"
|
||||
element={<FeatureBrandsPage canCreate={role === "owner"} />}
|
||||
/>
|
||||
<Route
|
||||
path="brands/new"
|
||||
element={createBrandRouteElement(role, <FeatureCreateBrandPage />)}
|
||||
/>
|
||||
<Route path="page-scheme" element={<FeaturePageSchemePage />} />
|
||||
<Route path="capabilities" element={<FeatureCapabilitiesPage />} />
|
||||
<Route path="members" element={<FeatureMembersPage />} />
|
||||
{platformTemplateRole === "template_admin" ? (
|
||||
<Route path="templates" element={<FeatureTemplateManagementPage />} />
|
||||
) : null}
|
||||
</>
|
||||
)}
|
||||
<Route path="*" element={<AdminOverviewRedirect />} />
|
||||
</Routes>
|
||||
</Suspense>
|
||||
<AdminErrorBoundary key={location.pathname}>
|
||||
<Suspense fallback={<LoadingStack />}>
|
||||
<Routes>
|
||||
<Route index element={<AdminOverviewRedirect />} />
|
||||
<Route path="overview" element={<FeatureOverviewPage />} />
|
||||
<Route path="publication" element={<FeaturePublicationPage />} />
|
||||
<Route path="brand" element={<FeatureBrandPage />} />
|
||||
<Route path="trust" element={<FeatureTrustContentPage />} />
|
||||
<Route path="services" element={<FeatureServicesPage />} />
|
||||
<Route path="inquiries" element={<FeatureInquiriesPage />} />
|
||||
<Route path="workspace" element={<FeatureWorkspacePage />} />
|
||||
{role === "editor" ? null : (
|
||||
<>
|
||||
<Route
|
||||
path="brands"
|
||||
element={<FeatureBrandsPage canCreate={role === "owner"} />}
|
||||
/>
|
||||
<Route
|
||||
path="brands/new"
|
||||
element={createBrandRouteElement(role, <FeatureCreateBrandPage />)}
|
||||
/>
|
||||
<Route path="page-scheme" element={<FeaturePageSchemePage />} />
|
||||
<Route path="capabilities" element={<FeatureCapabilitiesPage />} />
|
||||
<Route path="members" element={<FeatureMembersPage />} />
|
||||
{platformTemplateRole === "template_admin" ? (
|
||||
<Route path="templates" element={<FeatureTemplateManagementPage />} />
|
||||
) : null}
|
||||
</>
|
||||
)}
|
||||
<Route path="*" element={<AdminOverviewRedirect />} />
|
||||
</Routes>
|
||||
</Suspense>
|
||||
</AdminErrorBoundary>
|
||||
</div>
|
||||
</AdminLayout.Content>
|
||||
</AdminLayout>
|
||||
|
||||
@@ -3,13 +3,15 @@ import type { AdminSession } from "@personal-brand/api-client";
|
||||
import { ChangePassword, Login } from "../features/auth/AuthPages.js";
|
||||
import { Dashboard } from "./Dashboard.js";
|
||||
import { AdminRouter } from "./AdminRouter.js";
|
||||
import { adminMessage as message } from "../components/AdminMessage.js";
|
||||
import { App } from "antd";
|
||||
import { createApiClient } from "../lib/api.js";
|
||||
import { LoadingStack } from "../components/LoadingStack.js";
|
||||
import { AdminErrorBoundary } from "../components/AdminErrorBoundary.js";
|
||||
|
||||
type SessionState = Omit<AdminSession, "authenticated">;
|
||||
|
||||
export function Root() {
|
||||
const { message } = App.useApp();
|
||||
const [session, setSession] = useState<SessionState | null>(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
|
||||
@@ -72,12 +74,14 @@ export function Root() {
|
||||
/>
|
||||
);
|
||||
return (
|
||||
<AdminRouter>
|
||||
<Dashboard
|
||||
onLogout={logout}
|
||||
role={session.role}
|
||||
platformTemplateRole={session.platformTemplateRole}
|
||||
/>
|
||||
</AdminRouter>
|
||||
<AdminErrorBoundary variant="page">
|
||||
<AdminRouter>
|
||||
<Dashboard
|
||||
onLogout={logout}
|
||||
role={session.role}
|
||||
platformTemplateRole={session.platformTemplateRole}
|
||||
/>
|
||||
</AdminRouter>
|
||||
</AdminErrorBoundary>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,98 @@
|
||||
import { Component, type ErrorInfo, type ReactNode } from "react";
|
||||
import { Button, Result, Space, Typography } from "antd";
|
||||
import { createApiClient } from "../lib/api.js";
|
||||
|
||||
interface AdminErrorBoundaryProps {
|
||||
children: ReactNode;
|
||||
variant?: "page" | "content";
|
||||
}
|
||||
|
||||
interface AdminErrorBoundaryState {
|
||||
error: Error | null;
|
||||
errorId: string | null;
|
||||
}
|
||||
|
||||
function createErrorId(): string {
|
||||
return `admin-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* 后台渲染错误边界:页面级兜底整页,内容级兜底单个业务页面且保留导航。
|
||||
* React 只支持 class 组件捕获渲染异常,因此这里保留 class 实现。
|
||||
*/
|
||||
export class AdminErrorBoundary extends Component<
|
||||
AdminErrorBoundaryProps,
|
||||
AdminErrorBoundaryState
|
||||
> {
|
||||
override state: AdminErrorBoundaryState = { error: null, errorId: null };
|
||||
private reportedErrorId: string | null = null;
|
||||
|
||||
static getDerivedStateFromError(error: Error): AdminErrorBoundaryState {
|
||||
return { error, errorId: createErrorId() };
|
||||
}
|
||||
|
||||
override componentDidCatch(error: Error, info: ErrorInfo) {
|
||||
const errorId = this.state.errorId ?? createErrorId();
|
||||
console.error("[admin] 页面渲染异常", errorId, error, info.componentStack);
|
||||
if (this.reportedErrorId === errorId) return;
|
||||
this.reportedErrorId = errorId;
|
||||
// 上报失败不能影响错误页本身:只记录到控制台,不抛出、不改状态。
|
||||
void createApiClient()
|
||||
.reportAdminClientError({
|
||||
errorId,
|
||||
message: error.message.slice(0, 2000) || error.name,
|
||||
route: `${window.location.pathname}${window.location.search}`.slice(0, 500),
|
||||
...(info.componentStack ? { componentStack: info.componentStack.slice(0, 20000) } : {}),
|
||||
})
|
||||
.catch((reportError: unknown) => {
|
||||
console.warn("[admin] 渲染异常上报失败", errorId, reportError);
|
||||
});
|
||||
}
|
||||
|
||||
private reset = () => {
|
||||
this.setState({ error: null, errorId: null });
|
||||
};
|
||||
|
||||
private reload = () => {
|
||||
window.location.reload();
|
||||
};
|
||||
|
||||
override render() {
|
||||
const { error, errorId } = this.state;
|
||||
if (!error) return this.props.children;
|
||||
const isPage = this.props.variant === "page";
|
||||
return (
|
||||
<Result
|
||||
status="error"
|
||||
title="页面渲染出错"
|
||||
subTitle={
|
||||
isPage
|
||||
? "后台页面无法显示。可以重新加载;如果问题持续,请把错误编号提供给管理员。"
|
||||
: "这个页面无法显示,其他页面仍可正常使用。可以重试或重新加载页面。"
|
||||
}
|
||||
extra={
|
||||
<Space wrap>
|
||||
{isPage ? null : (
|
||||
<Button type="primary" onClick={this.reset}>
|
||||
重试
|
||||
</Button>
|
||||
)}
|
||||
<Button type={isPage ? "primary" : "default"} onClick={this.reload}>
|
||||
重新加载页面
|
||||
</Button>
|
||||
{isPage ? <Button href="/admin/overview">返回概览</Button> : null}
|
||||
</Space>
|
||||
}
|
||||
>
|
||||
<Typography.Paragraph type="secondary" copyable={{ text: errorId ?? "" }}>
|
||||
错误编号:{errorId}
|
||||
</Typography.Paragraph>
|
||||
{import.meta.env.DEV ? (
|
||||
<Typography.Paragraph type="secondary">
|
||||
开发环境错误信息:{error.message}
|
||||
</Typography.Paragraph>
|
||||
) : null}
|
||||
</Result>
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
export { message as adminMessage } from "antd";
|
||||
@@ -1,5 +1,5 @@
|
||||
import { CloudUploadOutlined, DeleteOutlined, PictureOutlined } from "@ant-design/icons";
|
||||
import { Alert, Button, Image, Popconfirm, Spin, Upload, message } from "antd";
|
||||
import { Alert, App, Button, Image, Popconfirm, Spin, Upload } from "antd";
|
||||
import { useEffect, useMemo, useState } from "react";
|
||||
import { apiBaseUrl, authenticatedFetch, createApiClient } from "../lib/api.js";
|
||||
|
||||
@@ -12,6 +12,7 @@ interface ImageUrlFieldProps {
|
||||
}
|
||||
|
||||
export function ImageUrlField({ id, value, onChange, placeholder, scope }: ImageUrlFieldProps) {
|
||||
const { message } = App.useApp();
|
||||
const imageUrl = typeof value === "string" ? value.trim() : "";
|
||||
const [uploading, setUploading] = useState(false);
|
||||
const [storageStatus, setStorageStatus] = useState<
|
||||
@@ -74,7 +75,7 @@ export function ImageUrlField({ id, value, onChange, placeholder, scope }: Image
|
||||
<Alert
|
||||
type={storageStatus === "loading" ? "info" : "warning"}
|
||||
showIcon
|
||||
message={
|
||||
title={
|
||||
storageStatus === "loading"
|
||||
? "正在检查媒体存储..."
|
||||
: storageStatus === "unconfigured"
|
||||
|
||||
@@ -20,7 +20,7 @@ export function RecordContentFields({
|
||||
return (
|
||||
<Row gutter={16}>
|
||||
{section.fields.map((field) => (
|
||||
<Col key={field.key} xs={24} md={24}>
|
||||
<Col key={field.key} xs={24} md={24} data-presentation-binding={field.binding}>
|
||||
{field.input === "list" ? (
|
||||
<TemplateListField field={field} name={presentationFieldName(sectionKey, field.key)} />
|
||||
) : (
|
||||
@@ -76,7 +76,7 @@ export function RecordContentEditor({
|
||||
<Alert
|
||||
type="info"
|
||||
showIcon
|
||||
message={
|
||||
title={
|
||||
source === "offering"
|
||||
? `正在编辑业务提供项:${recordName}`
|
||||
: `正在编辑信任内容:${recordName}`
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Form, message } from "antd";
|
||||
import { App, Form } from "antd";
|
||||
import { useMutation, useQueryClient } from "@tanstack/react-query";
|
||||
import { useEffect, useMemo, useState } from "react";
|
||||
import type { TemplateAdminSection } from "@personal-brand/api-client";
|
||||
@@ -12,6 +12,7 @@ import {
|
||||
type PresentationValues,
|
||||
} from "../../lib/presentation/presentation-bindings.js";
|
||||
import type { RecordContentSource } from "./types.js";
|
||||
import { getFullFormValues } from "../../lib/form-values.js";
|
||||
|
||||
function createInitialValues(
|
||||
record: Offering | TrustContent,
|
||||
@@ -59,6 +60,7 @@ export function useRecordContentEditorState({
|
||||
onDraft?: ((values: PresentationValues) => void) | undefined;
|
||||
onSaved?: (() => void) | undefined;
|
||||
}) {
|
||||
const { message } = App.useApp();
|
||||
const [form] = Form.useForm<PresentationValues>();
|
||||
const queryClient = useQueryClient();
|
||||
const [draftValues, setDraftValues] = useState<PresentationValues>(() =>
|
||||
@@ -95,12 +97,12 @@ export function useRecordContentEditorState({
|
||||
});
|
||||
|
||||
const submit = (values: PresentationValues) => {
|
||||
const currentValues = form.getFieldsValue(true) as PresentationValues;
|
||||
const currentValues = getFullFormValues<PresentationValues>(form);
|
||||
save.mutate({ ...draftValues, ...values, ...currentValues });
|
||||
};
|
||||
|
||||
const handleValuesChange = (_values: PresentationValues) => {
|
||||
const currentValues = form.getFieldsValue(true) as PresentationValues;
|
||||
const currentValues = getFullFormValues<PresentationValues>(form);
|
||||
const next = { ...draftValues, ..._values, ...currentValues };
|
||||
setDraftValues(next);
|
||||
onDraft?.(next);
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
import { useState } from "react";
|
||||
import { App } from "antd";
|
||||
import { createApiClient } from "../../lib/api.js";
|
||||
import { BrandMark } from "../../components/BrandMark.js";
|
||||
import { adminMessage as message } from "../../components/AdminMessage.js";
|
||||
import { AdminButton } from "../../components/AdminButton.js";
|
||||
import { AdminCard } from "../../components/AdminCard.js";
|
||||
import { AdminForm, AdminInput } from "../../components/AdminForm.js";
|
||||
import type { AdminLoginSession } from "@personal-brand/api-client";
|
||||
|
||||
export function Login({ onLogin }: { onLogin: (session: AdminLoginSession) => void }) {
|
||||
const { message } = App.useApp();
|
||||
const [form] = AdminForm.useForm();
|
||||
const [loading, setLoading] = useState(false);
|
||||
async function submit(values: { username: string; password: string }) {
|
||||
@@ -52,6 +53,7 @@ export function Login({ onLogin }: { onLogin: (session: AdminLoginSession) => vo
|
||||
}
|
||||
|
||||
export function ChangePassword({ onComplete }: { onComplete: () => void }) {
|
||||
const { message } = App.useApp();
|
||||
const [form] = AdminForm.useForm<{
|
||||
currentPassword: string;
|
||||
newPassword: string;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Alert, Button, Col, Form, Input, Row, Segmented, message } from "antd";
|
||||
import { Alert, App, Button, Col, Form, Input, Row, Segmented } from "antd";
|
||||
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
||||
import { useState } from "react";
|
||||
import { Link, useLocation } from "react-router-dom";
|
||||
@@ -14,6 +14,7 @@ import "./BrandPage.css";
|
||||
import { useEditorDraft } from "./use-editor-draft.js";
|
||||
|
||||
export function BrandPage() {
|
||||
const { message } = App.useApp();
|
||||
const location = useLocation();
|
||||
const initialSelection = location.state as PreviewSelection | undefined;
|
||||
const [panel, setPanel] = useState("pages");
|
||||
@@ -219,7 +220,7 @@ export function BrandPage() {
|
||||
className="brand-page__template-note"
|
||||
type="info"
|
||||
showIcon
|
||||
message={`当前页面方案:${workspace.data?.templateContent?.displayName ?? template.data.name}`}
|
||||
title={`当前页面方案:${workspace.data?.templateContent?.displayName ?? template.data.name}`}
|
||||
description={`适用场景:${template.data.serviceCategories.join("、") || "通用品牌展示"}`}
|
||||
/>
|
||||
) : null}
|
||||
|
||||
@@ -205,7 +205,7 @@ export function ComponentTemplatePreview({
|
||||
return () => window.removeEventListener("keydown", clear);
|
||||
}, [onTargetSelected]);
|
||||
if (!Renderer)
|
||||
return <Alert type="warning" showIcon message="此模板尚无组件预览,请使用页面预览" />;
|
||||
return <Alert type="warning" showIcon title="此模板尚无组件预览,请使用页面预览" />;
|
||||
return (
|
||||
<div className="component-template-preview-shell">
|
||||
<div
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Alert, Button, Form, Input, Select, Space, Switch, message } from "antd";
|
||||
import { Alert, App, Button, Form, Input, Select, Space, Switch } from "antd";
|
||||
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
||||
import { useEffect } from "react";
|
||||
import type { RuntimeWorkspace } from "@personal-brand/api-client";
|
||||
@@ -18,6 +18,7 @@ export function InquiryPreviewEditor({
|
||||
onDraft: (fields: RuntimeInquiryForm["fields"]) => void;
|
||||
onSaved?: () => void;
|
||||
}) {
|
||||
const { message } = App.useApp();
|
||||
const [form] = Form.useForm<Record<string, unknown>>();
|
||||
const cache = useQueryClient();
|
||||
const query = useQuery({
|
||||
@@ -27,8 +28,9 @@ export function InquiryPreviewEditor({
|
||||
const record = query.data?.find((item) => item.id === runtime.key);
|
||||
const field = runtime.fields.find((item) => item.key === fieldKey);
|
||||
useEffect(() => {
|
||||
if (field) form.setFieldsValue({ ...field });
|
||||
}, [fieldKey, runtime.key, form]);
|
||||
if (!record || !field) return;
|
||||
form.setFieldsValue({ ...field });
|
||||
}, [field, fieldKey, form, record, runtime.key]);
|
||||
const update = (values: Record<string, unknown>) =>
|
||||
runtime.fields.map((item) => (item.key === fieldKey ? { ...item, ...values } : item));
|
||||
const save = useMutation({
|
||||
@@ -59,7 +61,7 @@ export function InquiryPreviewEditor({
|
||||
return (
|
||||
<Alert
|
||||
type="error"
|
||||
message="表单读取失败"
|
||||
title="表单读取失败"
|
||||
action={<Button onClick={() => void query.refetch()}>重试</Button>}
|
||||
/>
|
||||
);
|
||||
@@ -67,10 +69,10 @@ export function InquiryPreviewEditor({
|
||||
return (
|
||||
<Alert
|
||||
type="info"
|
||||
message={query.isPending ? "正在读取表单" : "未找到对应表单,请刷新后重试"}
|
||||
title={query.isPending ? "正在读取表单" : "未找到对应表单,请刷新后重试"}
|
||||
/>
|
||||
);
|
||||
if (!field) return <Alert type="warning" message="字段已不存在" />;
|
||||
if (!field) return <Alert type="warning" title="字段已不存在" />;
|
||||
return (
|
||||
<Form<Record<string, unknown>>
|
||||
form={form}
|
||||
|
||||
@@ -1,34 +1,15 @@
|
||||
import { Alert, Button, Grid, Select, Segmented, Space, Typography } from "antd";
|
||||
import { useQueryClient } from "@tanstack/react-query";
|
||||
import { useCallback, useEffect, useMemo, useState } from "react";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import type { AdminTemplateContent, RuntimeWorkspace } from "@personal-brand/api-client";
|
||||
import type { BrandProfile } from "@personal-brand/api-client";
|
||||
import { Alert, Grid, Segmented, Select, Space } from "antd";
|
||||
import type {
|
||||
AdminTemplateContent,
|
||||
BrandProfile,
|
||||
RuntimeWorkspace,
|
||||
} from "@personal-brand/api-client";
|
||||
import { StatusTag } from "../../components/StatusTag.js";
|
||||
import { RecordContentEditor } from "../../components/RecordContentEditor.js";
|
||||
import { TemplatePreview } from "./TemplatePreview.js";
|
||||
import { InquiryPreviewEditor } from "./InquiryPreviewEditor.js";
|
||||
import {
|
||||
resolvePreviewSelection,
|
||||
previewTrustRecordId,
|
||||
type PreviewSelection,
|
||||
type PreviewTarget,
|
||||
} from "./preview-selection.js";
|
||||
import { filterSectionsForPreviewTarget } from "../../lib/presentation/presentation-bindings.js";
|
||||
import "./PresentationEditor.css";
|
||||
import { useEditorDraft } from "./use-editor-draft.js";
|
||||
import {
|
||||
usePresentationRecordQueries,
|
||||
useBrandPresentationSections,
|
||||
useBrandSaveMutation,
|
||||
useBrandPresentationForm,
|
||||
useBrandPreviewDraft,
|
||||
} from "./presentation-editor-state.js";
|
||||
import { useRecordPreview } from "./presentation-editor-record-preview.js";
|
||||
import type { RecordDraft } from "./presentation-editor-record-preview.js";
|
||||
import { pageTitle, previewTargetSource, trustSection } from "./presentation-editor-helpers.js";
|
||||
import { useDraftWorkspace } from "./use-draft-workspace.js";
|
||||
import { PresentationFormPanel } from "./PresentationFormPanel.js";
|
||||
import type { PreviewSelection } from "./preview-selection.js";
|
||||
import { usePresentationEditorController } from "./presentation-editor-controller.js";
|
||||
import { PresentationEditorInspector } from "./PresentationEditorInspector.js";
|
||||
import { PresentationEditorPreview } from "./PresentationEditorPreview.js";
|
||||
|
||||
interface PresentationEditorProps {
|
||||
templateContent: AdminTemplateContent | null | undefined;
|
||||
@@ -49,254 +30,14 @@ export function PresentationEditor({
|
||||
error,
|
||||
initialSelection,
|
||||
}: PresentationEditorProps) {
|
||||
const queryClient = useQueryClient();
|
||||
const navigate = useNavigate();
|
||||
const breakpoints = Grid.useBreakpoint();
|
||||
const [activePage, setActivePage] = useState<string>();
|
||||
const [selection, setSelection] = useState<PreviewSelection | undefined>(initialSelection);
|
||||
const [hasInitializedSelection, setHasInitializedSelection] = useState(Boolean(initialSelection));
|
||||
const [detailOfferingId, setDetailOfferingId] = useState<string>();
|
||||
const [recordDraft, setRecordDraft] = useState<RecordDraft>();
|
||||
const [inquiryDraft, setInquiryDraft] =
|
||||
useState<RuntimeWorkspace["inquiryForms"][number]["fields"]>();
|
||||
const [brandDirty, setBrandDirty] = useState(false);
|
||||
const guardDraft = useEditorDraft(brandDirty || !!recordDraft || !!inquiryDraft);
|
||||
const inquiryRuntime = previewWorkspace?.inquiryForms.find((item) => item.target === "brand");
|
||||
const sections = useBrandPresentationSections(templateContent);
|
||||
const pageOptions = useMemo(() => {
|
||||
const pages = new Map<string, string>();
|
||||
for (const item of templateContent?.navigation ?? []) pages.set(item.page, item.label);
|
||||
for (const section of templateContent?.admin.sections ?? []) {
|
||||
const navigation = templateContent?.navigation.find((item) => item.page === section.page);
|
||||
if (!pages.has(section.page))
|
||||
pages.set(section.page, navigation?.label ?? pageTitle(section.page));
|
||||
}
|
||||
return [...pages].map(([value, label]) => ({ value, label }));
|
||||
}, [templateContent]);
|
||||
const selectedPage = pageOptions.some((item) => item.value === activePage)
|
||||
? activePage
|
||||
: pageOptions[0]?.value;
|
||||
const visibleSections = sections.filter((section) => section.page === selectedPage);
|
||||
const recordSections = useMemo(
|
||||
() =>
|
||||
(templateContent?.trustContentTypes ?? [])
|
||||
.filter((item) => item.pages?.includes(selectedPage ?? ""))
|
||||
.map((item) => trustSection(item, selectedPage ?? "home")),
|
||||
[templateContent, selectedPage],
|
||||
);
|
||||
const visibleTargets = useMemo<PreviewTarget[]>(
|
||||
() =>
|
||||
[...(templateContent?.admin.sections ?? []), ...recordSections]
|
||||
.filter(
|
||||
(section) =>
|
||||
section.page === selectedPage &&
|
||||
(selectedPage !== "detail" || section.target === "brand"),
|
||||
)
|
||||
.flatMap((section) =>
|
||||
(section.previewTargets ?? []).map((target) => ({
|
||||
...target,
|
||||
page: section.page,
|
||||
source: previewTargetSource(section, target.key),
|
||||
...(section.key.startsWith("trust:") ? { trustType: section.key.slice(6) } : {}),
|
||||
})),
|
||||
)
|
||||
.concat(
|
||||
selectedPage === "inquiry" && inquiryRuntime
|
||||
? inquiryRuntime.fields.map((field) => ({
|
||||
key: `inquiry-field:${field.key}`,
|
||||
label: field.label,
|
||||
page: "inquiry",
|
||||
source: "inquiry" as const,
|
||||
}))
|
||||
: [],
|
||||
),
|
||||
[templateContent, selectedPage, recordSections, inquiryRuntime],
|
||||
);
|
||||
const activeTarget = selection?.targetKey;
|
||||
const selectedTarget = visibleTargets.find((target) => target.key === activeTarget);
|
||||
const selectedSection = [...(templateContent?.admin.sections ?? []), ...recordSections].find(
|
||||
(section) =>
|
||||
section.page === selectedPage &&
|
||||
section.previewTargets?.some((target) => target.key === selectedTarget?.key),
|
||||
);
|
||||
const selectedRecordSource =
|
||||
selectedTarget?.source === "offering" || selectedTarget?.source === "trust"
|
||||
? selectedTarget.source
|
||||
: undefined;
|
||||
const { offeringsQuery, trustQuery, selectedRecord } = usePresentationRecordQueries(
|
||||
selectedRecordSource,
|
||||
selection?.recordId,
|
||||
);
|
||||
const editableSections = filterSectionsForPreviewTarget(
|
||||
visibleSections.filter((section) =>
|
||||
section.fields.some((field) => field.binding.startsWith("brand.")),
|
||||
),
|
||||
selectedTarget?.key,
|
||||
);
|
||||
const recordSection = useMemo(
|
||||
() =>
|
||||
selectedSection && selection?.targetKey
|
||||
? {
|
||||
...selectedSection,
|
||||
fields: selectedSection.fields.filter(
|
||||
(field) => field.previewTarget === selection.targetKey,
|
||||
),
|
||||
}
|
||||
: undefined,
|
||||
[selectedSection, selection?.targetKey],
|
||||
);
|
||||
const handleTargetSelected = useCallback(
|
||||
(next?: PreviewSelection) => {
|
||||
const select = () =>
|
||||
setSelection(
|
||||
next
|
||||
? resolvePreviewSelection(
|
||||
next.targetKey,
|
||||
next.recordId,
|
||||
visibleTargets,
|
||||
selectedPage ?? "home",
|
||||
)
|
||||
: undefined,
|
||||
);
|
||||
if (recordDraft || inquiryDraft)
|
||||
guardDraft(() => {
|
||||
setInquiryDraft(undefined);
|
||||
setRecordDraft(undefined);
|
||||
select();
|
||||
});
|
||||
else select();
|
||||
},
|
||||
[visibleTargets, selectedPage, recordDraft, inquiryDraft, guardDraft],
|
||||
);
|
||||
const relatedTargets = [
|
||||
...(templateContent?.admin.sections ?? [])
|
||||
.filter((section) => section.page === selectedPage && section.target !== "brand")
|
||||
.map((section) => section.target),
|
||||
...((templateContent?.trustContentTypes ?? []).some((item) =>
|
||||
item.pages?.includes(selectedPage ?? ""),
|
||||
)
|
||||
? ["trust"]
|
||||
: []),
|
||||
];
|
||||
const pageLinks = [...new Set(relatedTargets)].flatMap((target) =>
|
||||
target === "trust"
|
||||
? (templateContent?.trustContentTypes ?? [])
|
||||
.filter((item) => item.pages?.includes(selectedPage ?? ""))
|
||||
.map((item) => ({
|
||||
target: `trust:${item.type}`,
|
||||
label: `编辑${item.label}`,
|
||||
}))
|
||||
: [
|
||||
{
|
||||
target,
|
||||
label: (
|
||||
{ offering: "管理此页展示的业务内容", inquiry: "管理此页的咨询表单" } as Record<
|
||||
string,
|
||||
string
|
||||
>
|
||||
)[target],
|
||||
},
|
||||
],
|
||||
);
|
||||
const relevantPageLinks = selectedSection
|
||||
? pageLinks.filter((item) => {
|
||||
if (item.target.startsWith("trust:")) return selectedSection.target === "trust";
|
||||
return item.target === selectedSection.target;
|
||||
})
|
||||
: pageLinks;
|
||||
const formState = useBrandPresentationForm({ brand, config, sections });
|
||||
const { form, initialValues } = formState;
|
||||
const save = useBrandSaveMutation({
|
||||
...formState,
|
||||
brand,
|
||||
config,
|
||||
sections,
|
||||
queryClient,
|
||||
onSaved: () => setBrandDirty(false),
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
const initialPage =
|
||||
typeof initialSelection === "object" && "page" in initialSelection
|
||||
? String(initialSelection.page)
|
||||
: undefined;
|
||||
if (initialPage) {
|
||||
setActivePage(
|
||||
pageOptions.some((item) => item.value === initialPage)
|
||||
? initialPage
|
||||
: pageOptions[0]?.value,
|
||||
);
|
||||
return;
|
||||
}
|
||||
if (!activePage && pageOptions.length) setActivePage(pageOptions[0]?.value);
|
||||
}, [activePage, initialSelection, pageOptions]);
|
||||
useEffect(() => {
|
||||
if (hasInitializedSelection) return;
|
||||
if (!pageOptions.length) return;
|
||||
if (!initialSelection) return;
|
||||
const requestedPage =
|
||||
typeof initialSelection === "object" && "page" in initialSelection
|
||||
? String(initialSelection.page)
|
||||
: undefined;
|
||||
const resolvedPage =
|
||||
requestedPage && pageOptions.some((item) => item.value === requestedPage)
|
||||
? requestedPage
|
||||
: (pageOptions[0]?.value ?? "home");
|
||||
setSelection(
|
||||
resolvePreviewSelection(
|
||||
initialSelection.targetKey,
|
||||
initialSelection.recordId,
|
||||
visibleTargets,
|
||||
resolvedPage,
|
||||
),
|
||||
);
|
||||
setActivePage(resolvedPage);
|
||||
setHasInitializedSelection(true);
|
||||
}, [hasInitializedSelection, initialSelection, pageOptions, selectedPage, visibleTargets]);
|
||||
useEffect(() => {
|
||||
if (!initialSelection) setSelection(undefined);
|
||||
}, [initialSelection, selectedPage, templateContent?.displayName]);
|
||||
useEffect(() => {
|
||||
if (!selection?.recordId) return;
|
||||
const records =
|
||||
selectedTarget?.source === "trust"
|
||||
? previewWorkspace?.trustItems
|
||||
: previewWorkspace?.offerings;
|
||||
if (records && !records.some((item) => item.id === selection.recordId)) setSelection(undefined);
|
||||
}, [
|
||||
previewWorkspace?.offerings,
|
||||
previewWorkspace?.trustItems,
|
||||
selectedTarget?.source,
|
||||
selection,
|
||||
]);
|
||||
useEffect(
|
||||
() => setRecordDraft(undefined),
|
||||
[selection?.targetKey, selection?.recordId, selectedPage],
|
||||
);
|
||||
const { previewBrand, handleValuesChange, resetPreview } = useBrandPreviewDraft({
|
||||
brand,
|
||||
config,
|
||||
sections,
|
||||
form,
|
||||
onDirty: () => setBrandDirty(true),
|
||||
});
|
||||
const recordPreview = useRecordPreview({ recordDraft, selectedRecord, recordSection });
|
||||
useEffect(() => resetPreview(), [config, initialValues, resetPreview]);
|
||||
const draftWorkspace = useDraftWorkspace({
|
||||
previewWorkspace,
|
||||
previewBrand,
|
||||
inquiryRuntime,
|
||||
inquiryDraft,
|
||||
recordDraft,
|
||||
selectedRecord,
|
||||
recordSection,
|
||||
recordPreview,
|
||||
const controller = usePresentationEditorController({
|
||||
templateContent,
|
||||
previewWorkspace,
|
||||
config,
|
||||
brand,
|
||||
...(initialSelection ? { initialSelection } : {}),
|
||||
});
|
||||
const selectedDetailOfferingId =
|
||||
detailOfferingId && draftWorkspace?.offerings.some((item) => item.id === detailOfferingId)
|
||||
? detailOfferingId
|
||||
: draftWorkspace?.offerings[0]?.id;
|
||||
|
||||
return (
|
||||
<section className="presentation-editor" aria-labelledby="presentation-editor-title">
|
||||
@@ -311,12 +52,12 @@ export function PresentationEditor({
|
||||
</div>
|
||||
{templateContent ? <StatusTag tone="info" label={templateContent.displayName} /> : null}
|
||||
</div>
|
||||
{loading ? <Alert type="info" showIcon message="正在读取当前页面方案的编辑项目" /> : null}
|
||||
{loading ? <Alert type="info" showIcon title="正在读取当前页面方案的编辑项目" /> : null}
|
||||
{error ? (
|
||||
<Alert type="warning" showIcon message="页面方案编辑项目读取失败,请刷新后重试。" />
|
||||
<Alert type="warning" showIcon title="页面方案编辑项目读取失败,请刷新后重试。" />
|
||||
) : null}
|
||||
{!loading && !error && !templateContent ? (
|
||||
<Alert type="warning" showIcon message="当前页面方案暂未提供可编辑的页面内容。" />
|
||||
<Alert type="warning" showIcon title="当前页面方案暂未提供可编辑的页面内容。" />
|
||||
) : null}
|
||||
{templateContent ? (
|
||||
<>
|
||||
@@ -324,306 +65,33 @@ export function PresentationEditor({
|
||||
{breakpoints.xs ? (
|
||||
<Select
|
||||
aria-label="选择小程序页面"
|
||||
value={selectedPage}
|
||||
options={pageOptions}
|
||||
onChange={(value) =>
|
||||
guardDraft(() => {
|
||||
setBrandDirty(false);
|
||||
form.setFieldsValue(initialValues);
|
||||
resetPreview();
|
||||
setRecordDraft(undefined);
|
||||
setInquiryDraft(undefined);
|
||||
setActivePage(value);
|
||||
})
|
||||
}
|
||||
value={controller.selectedPage ?? null}
|
||||
options={controller.pageOptions}
|
||||
onChange={controller.selectPage}
|
||||
className="admin-field-w-2xl"
|
||||
/>
|
||||
) : (
|
||||
<Segmented
|
||||
value={selectedPage}
|
||||
options={pageOptions}
|
||||
onChange={(value) =>
|
||||
guardDraft(() => {
|
||||
setBrandDirty(false);
|
||||
form.setFieldsValue(initialValues);
|
||||
resetPreview();
|
||||
setRecordDraft(undefined);
|
||||
setInquiryDraft(undefined);
|
||||
setActivePage(String(value));
|
||||
})
|
||||
}
|
||||
value={controller.selectedPage ?? null}
|
||||
options={controller.pageOptions}
|
||||
onChange={(value) => controller.selectPage(String(value))}
|
||||
/>
|
||||
)}
|
||||
</Space>
|
||||
<div className="presentation-editor__workspace">
|
||||
<div className="presentation-editor__preview">
|
||||
<h3 className="admin-section-title admin-flush">页面预览</h3>
|
||||
{selectedPage === "detail" && draftWorkspace?.offerings.length ? (
|
||||
<Select
|
||||
aria-label="选择详情页业务内容"
|
||||
className="admin-block admin-offset-bottom-sm"
|
||||
value={selectedDetailOfferingId}
|
||||
options={draftWorkspace.offerings.map((item) => ({
|
||||
value: item.id,
|
||||
label: item.name,
|
||||
}))}
|
||||
onChange={(value) => {
|
||||
setDetailOfferingId(value);
|
||||
setSelection(undefined);
|
||||
}}
|
||||
/>
|
||||
) : null}
|
||||
<TemplatePreview
|
||||
brand={previewBrand}
|
||||
{...(draftWorkspace ? { workspace: draftWorkspace } : {})}
|
||||
page={selectedPage ?? "home"}
|
||||
{...(selectedPage === "detail" && selectedDetailOfferingId
|
||||
? { offeringId: selectedDetailOfferingId }
|
||||
: {})}
|
||||
{...(activeTarget ? { targetKey: activeTarget } : {})}
|
||||
{...(selection ? { selection } : {})}
|
||||
targets={visibleTargets}
|
||||
onTargetSelected={handleTargetSelected}
|
||||
/>
|
||||
</div>
|
||||
<aside className="presentation-editor__outline" aria-label="页面区域">
|
||||
<h3 className="admin-section-title admin-flush">页面区域</h3>
|
||||
<p className="admin-section-description">选择区域,编辑对应内容</p>
|
||||
{visibleTargets.length ? (
|
||||
<Space className="presentation-editor__regions admin-offset-top" wrap>
|
||||
{visibleTargets.map((target) => (
|
||||
<Button
|
||||
key={target.key}
|
||||
className={
|
||||
visibleTargets.some((parent) => parent.children?.includes(target.key))
|
||||
? "is-child-region"
|
||||
: ""
|
||||
}
|
||||
aria-pressed={activeTarget === target.key}
|
||||
type={activeTarget === target.key ? "primary" : "default"}
|
||||
onClick={() => {
|
||||
const recordId =
|
||||
target.source === "offering"
|
||||
? selectedPage === "detail"
|
||||
? selectedDetailOfferingId
|
||||
: draftWorkspace?.offerings[0]?.id
|
||||
: target.source === "trust"
|
||||
? previewTrustRecordId(
|
||||
draftWorkspace?.trustItems ?? [],
|
||||
target.trustType,
|
||||
)
|
||||
: undefined;
|
||||
handleTargetSelected({
|
||||
targetKey: target.key,
|
||||
...(recordId ? { recordId } : {}),
|
||||
});
|
||||
}}
|
||||
>
|
||||
{target.label}
|
||||
</Button>
|
||||
))}
|
||||
</Space>
|
||||
) : null}
|
||||
{!visibleTargets.length ? (
|
||||
<Typography.Text type="secondary">此页为动态预览</Typography.Text>
|
||||
) : null}
|
||||
</aside>
|
||||
<div className="presentation-editor__inspector">
|
||||
<h3 className="admin-section-title admin-flush">
|
||||
{selectedTarget?.label ?? pageTitle(selectedPage ?? "home")}
|
||||
</h3>
|
||||
<StatusTag
|
||||
tone={
|
||||
save.isError
|
||||
? "error"
|
||||
: save.isPending || brandDirty || recordDraft || inquiryDraft
|
||||
? "warning"
|
||||
: "neutral"
|
||||
}
|
||||
label={
|
||||
save.isPending
|
||||
? "正在保存"
|
||||
: save.isError
|
||||
? "保存失败,请重试"
|
||||
: brandDirty || recordDraft || inquiryDraft
|
||||
? "有未保存修改"
|
||||
: "草稿已同步"
|
||||
}
|
||||
/>
|
||||
{selectedPage === "detail" && !selectedTarget ? (
|
||||
<Alert
|
||||
type="info"
|
||||
showIcon
|
||||
message="详情页由所选业务内容动态生成"
|
||||
description="选择业务内容预览详情,记录内容在业务提供项中维护;公共标题和按钮文案可从左侧区域列表配置,对全部详情生效。"
|
||||
action={
|
||||
<Button
|
||||
onClick={() => {
|
||||
void navigate("/admin/services");
|
||||
}}
|
||||
>
|
||||
管理业务内容
|
||||
</Button>
|
||||
}
|
||||
/>
|
||||
) : activeTarget?.startsWith("inquiry-field:") && inquiryRuntime ? (
|
||||
<InquiryPreviewEditor
|
||||
runtime={
|
||||
draftWorkspace?.inquiryForms.find((item) => item.key === inquiryRuntime.key) ??
|
||||
inquiryRuntime
|
||||
}
|
||||
fieldKey={activeTarget.slice("inquiry-field:".length)}
|
||||
onDraft={setInquiryDraft}
|
||||
onSaved={() => setInquiryDraft(undefined)}
|
||||
/>
|
||||
) : selectedTarget?.composite ? (
|
||||
<Alert
|
||||
type="info"
|
||||
showIcon
|
||||
message="这是一个组合区域"
|
||||
description={
|
||||
<Space wrap>
|
||||
{(selectedTarget.children ?? []).map((childKey) => {
|
||||
const child = visibleTargets.find((item) => item.key === childKey);
|
||||
if (!child) return null;
|
||||
return (
|
||||
<Button
|
||||
key={child.key}
|
||||
onClick={() => {
|
||||
const recordId =
|
||||
child.source === "offering"
|
||||
? selectedPage === "detail"
|
||||
? selectedDetailOfferingId
|
||||
: draftWorkspace?.offerings[0]?.id
|
||||
: child.source === "trust"
|
||||
? previewTrustRecordId(
|
||||
draftWorkspace?.trustItems ?? [],
|
||||
child.trustType,
|
||||
)
|
||||
: undefined;
|
||||
handleTargetSelected({
|
||||
targetKey: child.key,
|
||||
...(recordId ? { recordId } : {}),
|
||||
});
|
||||
}}
|
||||
>
|
||||
编辑{child.label}
|
||||
</Button>
|
||||
);
|
||||
})}
|
||||
</Space>
|
||||
}
|
||||
/>
|
||||
) : selectedRecordSource && selection?.recordId && selectedSection ? (
|
||||
selectedRecord ? (
|
||||
<RecordContentEditor
|
||||
key={`${selectedRecordSource}:${selectedRecord.id}:${selectedSection.key}`}
|
||||
source={selectedRecordSource}
|
||||
record={selectedRecord}
|
||||
section={recordSection!}
|
||||
context="visual"
|
||||
onDraft={(values) =>
|
||||
setRecordDraft({
|
||||
source: selectedRecordSource,
|
||||
id: selectedRecord.id,
|
||||
values,
|
||||
})
|
||||
}
|
||||
onSaved={() => setRecordDraft(undefined)}
|
||||
/>
|
||||
) : (
|
||||
<Alert
|
||||
type={
|
||||
(
|
||||
selectedRecordSource === "offering"
|
||||
? offeringsQuery.isError
|
||||
: trustQuery.isError
|
||||
)
|
||||
? "error"
|
||||
: "info"
|
||||
}
|
||||
message={
|
||||
(
|
||||
selectedRecordSource === "offering"
|
||||
? offeringsQuery.isError
|
||||
: trustQuery.isError
|
||||
)
|
||||
? "内容读取失败"
|
||||
: (
|
||||
selectedRecordSource === "offering"
|
||||
? offeringsQuery.isSuccess
|
||||
: trustQuery.isSuccess
|
||||
)
|
||||
? "对应内容已不存在,请重新选择页面中的区域"
|
||||
: "正在读取对应内容"
|
||||
}
|
||||
{...((
|
||||
selectedRecordSource === "offering"
|
||||
? offeringsQuery.isError
|
||||
: trustQuery.isError
|
||||
)
|
||||
? {
|
||||
action: (
|
||||
<Button
|
||||
size="small"
|
||||
onClick={() => {
|
||||
if (selectedRecordSource === "offering")
|
||||
void offeringsQuery.refetch();
|
||||
else void trustQuery.refetch();
|
||||
}}
|
||||
>
|
||||
重试
|
||||
</Button>
|
||||
),
|
||||
}
|
||||
: {})}
|
||||
/>
|
||||
)
|
||||
) : selectedRecordSource ? (
|
||||
<Alert
|
||||
type="info"
|
||||
showIcon
|
||||
message="此区域尚未配置内容"
|
||||
description="创建并启用对应内容后,即可在预览中点选编辑。"
|
||||
action={
|
||||
<Button
|
||||
onClick={() =>
|
||||
guardDraft(() => {
|
||||
void navigate(
|
||||
selectedRecordSource === "trust"
|
||||
? `/admin/trust?type=${encodeURIComponent(selectedTarget?.trustType ?? "")}`
|
||||
: "/admin/services",
|
||||
);
|
||||
})
|
||||
}
|
||||
>
|
||||
配置此区域内容
|
||||
</Button>
|
||||
}
|
||||
/>
|
||||
) : !selectedTarget ? (
|
||||
<div className="presentation-editor__empty">
|
||||
<h3 className="admin-subhead">选择要编辑的区域</h3>
|
||||
<p className="admin-section-description">
|
||||
点击预览中的内容,或使用区域列表,查看并修改对应字段。
|
||||
</p>
|
||||
</div>
|
||||
) : (
|
||||
<PresentationFormPanel
|
||||
form={form}
|
||||
initialValues={initialValues}
|
||||
editableSections={editableSections}
|
||||
relevantPageLinks={relevantPageLinks}
|
||||
selectedTarget={selectedTarget}
|
||||
save={{
|
||||
error: save.error,
|
||||
isPending: save.isPending,
|
||||
mutate: (values) => save.mutate(values),
|
||||
}}
|
||||
onValuesChange={handleValuesChange}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
<PresentationEditorPreview
|
||||
previewBrand={controller.previewBrand}
|
||||
draftWorkspace={controller.draftWorkspace}
|
||||
selectedPage={controller.selectedPage}
|
||||
selectedDetailOfferingId={controller.selectedDetailOfferingId}
|
||||
activeTarget={controller.activeTarget}
|
||||
selection={controller.selection}
|
||||
visibleTargets={controller.visibleTargets}
|
||||
onSelectDetailOffering={controller.selectDetailOffering}
|
||||
onTargetSelected={controller.handleTargetSelected}
|
||||
onSelectPreviewTarget={controller.selectPreviewTarget}
|
||||
/>
|
||||
<PresentationEditorInspector controller={controller} />
|
||||
</div>
|
||||
</>
|
||||
) : null}
|
||||
|
||||
@@ -0,0 +1,196 @@
|
||||
import { Alert, Button, Space } from "antd";
|
||||
import { StatusTag } from "../../components/StatusTag.js";
|
||||
import { RecordContentEditor } from "../../components/RecordContentEditor.js";
|
||||
import { InquiryPreviewEditor } from "./InquiryPreviewEditor.js";
|
||||
import { PresentationFormPanel } from "./PresentationFormPanel.js";
|
||||
import { pageTitle } from "./presentation-editor-helpers.js";
|
||||
import type { PresentationEditorController } from "./presentation-editor-controller.js";
|
||||
|
||||
export function PresentationEditorInspector({
|
||||
controller,
|
||||
}: {
|
||||
controller: PresentationEditorController;
|
||||
}) {
|
||||
const {
|
||||
selectedPage,
|
||||
selectedTarget,
|
||||
activeTarget,
|
||||
selection,
|
||||
selectedSection,
|
||||
selectedRecordSource,
|
||||
selectedRecord,
|
||||
recordSection,
|
||||
editableSections,
|
||||
relevantPageLinks,
|
||||
inquiryRuntime,
|
||||
draftWorkspace,
|
||||
form,
|
||||
initialValues,
|
||||
save,
|
||||
offeringsQuery,
|
||||
trustQuery,
|
||||
recordDraft,
|
||||
inquiryDraft,
|
||||
brandDirty,
|
||||
guardDraft,
|
||||
} = controller;
|
||||
const recordQuery = selectedRecordSource === "trust" ? trustQuery : offeringsQuery;
|
||||
|
||||
return (
|
||||
<div className="presentation-editor__inspector">
|
||||
<h3 className="admin-section-title admin-flush">
|
||||
{selectedTarget?.label ?? pageTitle(selectedPage ?? "home")}
|
||||
</h3>
|
||||
<StatusTag
|
||||
tone={
|
||||
save.isError
|
||||
? "error"
|
||||
: save.isPending || brandDirty || recordDraft || inquiryDraft
|
||||
? "warning"
|
||||
: "neutral"
|
||||
}
|
||||
label={
|
||||
save.isPending
|
||||
? "正在保存"
|
||||
: save.isError
|
||||
? "保存失败,请重试"
|
||||
: brandDirty || recordDraft || inquiryDraft
|
||||
? "有未保存修改"
|
||||
: "草稿已同步"
|
||||
}
|
||||
/>
|
||||
{selectedPage === "detail" && !selectedTarget ? (
|
||||
<Alert
|
||||
type="info"
|
||||
showIcon
|
||||
title="详情页由所选业务内容动态生成"
|
||||
description="选择业务内容预览详情,记录内容在业务提供项中维护;公共标题和按钮文案可从左侧区域列表配置,对全部详情生效。"
|
||||
action={
|
||||
<Button
|
||||
onClick={() => {
|
||||
void controller.navigate("/admin/services");
|
||||
}}
|
||||
>
|
||||
管理业务内容
|
||||
</Button>
|
||||
}
|
||||
/>
|
||||
) : activeTarget?.startsWith("inquiry-field:") && inquiryRuntime ? (
|
||||
<InquiryPreviewEditor
|
||||
runtime={
|
||||
draftWorkspace?.inquiryForms.find((item) => item.key === inquiryRuntime.key) ??
|
||||
inquiryRuntime
|
||||
}
|
||||
fieldKey={activeTarget.slice("inquiry-field:".length)}
|
||||
onDraft={controller.setInquiryDraft}
|
||||
onSaved={() => controller.setInquiryDraft(undefined)}
|
||||
/>
|
||||
) : selectedTarget?.composite ? (
|
||||
<Alert
|
||||
type="info"
|
||||
showIcon
|
||||
title="这是一个组合区域"
|
||||
description={
|
||||
<Space wrap>
|
||||
{(selectedTarget.children ?? []).map((childKey) => {
|
||||
const child = visibleTarget(childKey, controller);
|
||||
if (!child) return null;
|
||||
return (
|
||||
<Button key={child.key} onClick={() => controller.selectPreviewTarget(child)}>
|
||||
编辑{child.label}
|
||||
</Button>
|
||||
);
|
||||
})}
|
||||
</Space>
|
||||
}
|
||||
/>
|
||||
) : selectedRecordSource && selection?.recordId && selectedSection ? (
|
||||
selectedRecord ? (
|
||||
<RecordContentEditor
|
||||
key={`${selectedRecordSource}:${selectedRecord.id}:${selectedSection.key}`}
|
||||
source={selectedRecordSource}
|
||||
record={selectedRecord}
|
||||
section={recordSection!}
|
||||
context="visual"
|
||||
onDraft={(values) =>
|
||||
controller.setRecordDraft({
|
||||
source: selectedRecordSource,
|
||||
id: selectedRecord.id,
|
||||
values,
|
||||
})
|
||||
}
|
||||
onSaved={() => controller.setRecordDraft(undefined)}
|
||||
/>
|
||||
) : (
|
||||
<Alert
|
||||
type={recordQuery.isError ? "error" : "info"}
|
||||
title={
|
||||
recordQuery.isError
|
||||
? "内容读取失败"
|
||||
: recordQuery.isSuccess
|
||||
? "对应内容已不存在,请重新选择页面中的区域"
|
||||
: "正在读取对应内容"
|
||||
}
|
||||
{...(recordQuery.isError
|
||||
? {
|
||||
action: (
|
||||
<Button size="small" onClick={() => void recordQuery.refetch()}>
|
||||
重试
|
||||
</Button>
|
||||
),
|
||||
}
|
||||
: {})}
|
||||
/>
|
||||
)
|
||||
) : selectedRecordSource ? (
|
||||
<Alert
|
||||
type="info"
|
||||
showIcon
|
||||
title="此区域尚未配置内容"
|
||||
description="创建并启用对应内容后,即可在预览中点选编辑。"
|
||||
action={
|
||||
<Button
|
||||
onClick={() =>
|
||||
guardDraft(() => {
|
||||
void controller.navigate(
|
||||
selectedRecordSource === "trust"
|
||||
? `/admin/trust?type=${encodeURIComponent(selectedTarget?.trustType ?? "")}`
|
||||
: "/admin/services",
|
||||
);
|
||||
})
|
||||
}
|
||||
>
|
||||
配置此区域内容
|
||||
</Button>
|
||||
}
|
||||
/>
|
||||
) : !selectedTarget ? (
|
||||
<div className="presentation-editor__empty">
|
||||
<h3 className="admin-subhead">选择要编辑的区域</h3>
|
||||
<p className="admin-section-description">
|
||||
点击预览中的内容,或使用区域列表,查看并修改对应字段。
|
||||
</p>
|
||||
</div>
|
||||
) : (
|
||||
<PresentationFormPanel
|
||||
key={`${selectedPage}:${selectedTarget.key}`}
|
||||
form={form}
|
||||
initialValues={initialValues}
|
||||
editableSections={editableSections}
|
||||
relevantPageLinks={relevantPageLinks}
|
||||
selectedTarget={selectedTarget}
|
||||
save={{
|
||||
error: save.error,
|
||||
isPending: save.isPending,
|
||||
mutate: (values) => save.mutate(values),
|
||||
}}
|
||||
onValuesChange={controller.handleValuesChange}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function visibleTarget(key: string, controller: PresentationEditorController) {
|
||||
return controller.visibleTargets.find((item) => item.key === key);
|
||||
}
|
||||
@@ -0,0 +1,88 @@
|
||||
import { Button, Select, Space, Typography } from "antd";
|
||||
import type { BrandProfile, RuntimeWorkspace } from "@personal-brand/api-client";
|
||||
import { TemplatePreview } from "./TemplatePreview.js";
|
||||
import type { PreviewSelection, PreviewTarget } from "./preview-selection.js";
|
||||
|
||||
interface PresentationEditorPreviewProps {
|
||||
previewBrand: BrandProfile;
|
||||
draftWorkspace?: RuntimeWorkspace | undefined;
|
||||
selectedPage: string | undefined;
|
||||
selectedDetailOfferingId: string | undefined;
|
||||
activeTarget: string | undefined;
|
||||
selection: PreviewSelection | undefined;
|
||||
visibleTargets: PreviewTarget[];
|
||||
onSelectDetailOffering: (id: string) => void;
|
||||
onTargetSelected: (next?: PreviewSelection) => void;
|
||||
onSelectPreviewTarget: (target: PreviewTarget) => void;
|
||||
}
|
||||
|
||||
export function PresentationEditorPreview({
|
||||
previewBrand,
|
||||
draftWorkspace,
|
||||
selectedPage,
|
||||
selectedDetailOfferingId,
|
||||
activeTarget,
|
||||
selection,
|
||||
visibleTargets,
|
||||
onSelectDetailOffering,
|
||||
onTargetSelected,
|
||||
onSelectPreviewTarget,
|
||||
}: PresentationEditorPreviewProps) {
|
||||
return (
|
||||
<>
|
||||
<div className="presentation-editor__preview">
|
||||
<h3 className="admin-section-title admin-flush">页面预览</h3>
|
||||
{selectedPage === "detail" && draftWorkspace?.offerings.length ? (
|
||||
<Select
|
||||
aria-label="选择详情页业务内容"
|
||||
className="admin-block admin-offset-bottom-sm"
|
||||
value={selectedDetailOfferingId ?? null}
|
||||
options={draftWorkspace.offerings.map((item) => ({
|
||||
value: item.id,
|
||||
label: item.name,
|
||||
}))}
|
||||
onChange={onSelectDetailOffering}
|
||||
/>
|
||||
) : null}
|
||||
<TemplatePreview
|
||||
brand={previewBrand}
|
||||
{...(draftWorkspace ? { workspace: draftWorkspace } : {})}
|
||||
page={selectedPage ?? "home"}
|
||||
{...(selectedPage === "detail" && selectedDetailOfferingId
|
||||
? { offeringId: selectedDetailOfferingId }
|
||||
: {})}
|
||||
{...(activeTarget ? { targetKey: activeTarget } : {})}
|
||||
{...(selection ? { selection } : {})}
|
||||
targets={visibleTargets}
|
||||
onTargetSelected={onTargetSelected}
|
||||
/>
|
||||
</div>
|
||||
<aside className="presentation-editor__outline" aria-label="页面区域">
|
||||
<h3 className="admin-section-title admin-flush">页面区域</h3>
|
||||
<p className="admin-section-description">选择区域,编辑对应内容</p>
|
||||
{visibleTargets.length ? (
|
||||
<Space className="presentation-editor__regions admin-offset-top" wrap>
|
||||
{visibleTargets.map((target) => (
|
||||
<Button
|
||||
key={target.key}
|
||||
className={
|
||||
visibleTargets.some((parent) => parent.children?.includes(target.key))
|
||||
? "is-child-region"
|
||||
: ""
|
||||
}
|
||||
aria-pressed={activeTarget === target.key}
|
||||
type={activeTarget === target.key ? "primary" : "default"}
|
||||
onClick={() => onSelectPreviewTarget(target)}
|
||||
>
|
||||
{target.label}
|
||||
</Button>
|
||||
))}
|
||||
</Space>
|
||||
) : null}
|
||||
{!visibleTargets.length ? (
|
||||
<Typography.Text type="secondary">此页为动态预览</Typography.Text>
|
||||
) : null}
|
||||
</aside>
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -11,6 +11,7 @@ import {
|
||||
} from "../../lib/presentation/presentation-bindings.js";
|
||||
import { fieldTargetTitle } from "./presentation-editor-helpers.js";
|
||||
import type { PreviewTarget } from "./preview-selection.js";
|
||||
import { getFullFormValues } from "../../lib/form-values.js";
|
||||
|
||||
interface PresentationFormPanelProps {
|
||||
form: FormInstance<PresentationValues>;
|
||||
@@ -44,7 +45,7 @@ export function PresentationFormPanel({
|
||||
layout="vertical"
|
||||
initialValues={initialValues}
|
||||
onValuesChange={onValuesChange}
|
||||
onFinish={() => save.mutate(form.getFieldsValue(true) as PresentationValues)}
|
||||
onFinish={() => save.mutate(getFullFormValues<PresentationValues>(form))}
|
||||
className="presentation-editor__form"
|
||||
>
|
||||
<div className="presentation-editor__form-body">
|
||||
@@ -89,7 +90,7 @@ export function PresentationFormPanel({
|
||||
type="info"
|
||||
showIcon
|
||||
className="admin-offset-bottom-lg"
|
||||
message="这个页面还有关联内容"
|
||||
title="这个页面还有关联内容"
|
||||
description={
|
||||
<Space wrap>
|
||||
{relevantPageLinks.map((item) => (
|
||||
|
||||
@@ -124,7 +124,7 @@ export function TemplatePreview({
|
||||
<Alert
|
||||
type="warning"
|
||||
showIcon
|
||||
message="页面预览暂不可用"
|
||||
title="页面预览暂不可用"
|
||||
description="请确认模板预览资源已构建并发布,或本地预览服务正在运行。"
|
||||
/>
|
||||
);
|
||||
@@ -146,11 +146,11 @@ export function TemplatePreview({
|
||||
<>
|
||||
{!ready && !error ? (
|
||||
<div className="template-preview__loading">
|
||||
<Spin tip="正在加载页面预览" />
|
||||
<Spin description="正在加载页面预览" />
|
||||
</div>
|
||||
) : null}
|
||||
{error ? (
|
||||
<Alert type="error" showIcon message="页面预览加载失败" description={error} />
|
||||
<Alert type="error" showIcon title="页面预览加载失败" description={error} />
|
||||
) : null}
|
||||
<iframe
|
||||
key={url}
|
||||
|
||||
@@ -0,0 +1,416 @@
|
||||
import { useQueryClient } from "@tanstack/react-query";
|
||||
import { useCallback, useEffect, useMemo, useState } from "react";
|
||||
import { useNavigate, type NavigateFunction } from "react-router-dom";
|
||||
import type {
|
||||
AdminTemplateContent,
|
||||
BrandProfile,
|
||||
Offering,
|
||||
RuntimeWorkspace,
|
||||
TemplateAdminSection,
|
||||
TrustContent,
|
||||
} from "@personal-brand/api-client";
|
||||
import type { FormInstance } from "antd";
|
||||
import { filterSectionsForPreviewTarget } from "../../lib/presentation/presentation-bindings.js";
|
||||
import type { PresentationValues } from "../../lib/presentation/presentation-bindings.js";
|
||||
import {
|
||||
resolvePreviewSelection,
|
||||
previewTrustRecordId,
|
||||
type PreviewSelection,
|
||||
type PreviewTarget,
|
||||
} from "./preview-selection.js";
|
||||
import { useEditorDraft } from "./use-editor-draft.js";
|
||||
import {
|
||||
useBrandPresentationForm,
|
||||
useBrandPresentationSections,
|
||||
useBrandPreviewDraft,
|
||||
useBrandSaveMutation,
|
||||
usePresentationRecordQueries,
|
||||
} from "./presentation-editor-state.js";
|
||||
import { useRecordPreview, type RecordDraft } from "./presentation-editor-record-preview.js";
|
||||
import { pageTitle, previewTargetSource, trustSection } from "./presentation-editor-helpers.js";
|
||||
import { useDraftWorkspace } from "./use-draft-workspace.js";
|
||||
|
||||
export interface PresentationEditorControllerInput {
|
||||
templateContent: AdminTemplateContent | null | undefined;
|
||||
previewWorkspace?: RuntimeWorkspace | undefined;
|
||||
config: Record<string, unknown> | null | undefined;
|
||||
brand: BrandProfile;
|
||||
initialSelection?: PreviewSelection;
|
||||
}
|
||||
|
||||
export interface PresentationRecordQuery {
|
||||
isError: boolean;
|
||||
isSuccess: boolean;
|
||||
refetch: () => unknown;
|
||||
}
|
||||
|
||||
export interface PresentationEditorController {
|
||||
pageOptions: { value: string; label: string }[];
|
||||
selectedPage: string | undefined;
|
||||
visibleTargets: PreviewTarget[];
|
||||
selectedTarget: PreviewTarget | undefined;
|
||||
selectedSection: TemplateAdminSection | undefined;
|
||||
selectedRecordSource: "offering" | "trust" | undefined;
|
||||
selectedRecord: Offering | TrustContent | undefined;
|
||||
recordSection: TemplateAdminSection | undefined;
|
||||
editableSections: TemplateAdminSection[];
|
||||
relevantPageLinks: { target: string; label: string | undefined }[];
|
||||
inquiryRuntime: RuntimeWorkspace["inquiryForms"][number] | undefined;
|
||||
draftWorkspace: RuntimeWorkspace | undefined;
|
||||
previewBrand: BrandProfile;
|
||||
selectedDetailOfferingId: string | undefined;
|
||||
form: FormInstance<PresentationValues>;
|
||||
initialValues: PresentationValues;
|
||||
save: {
|
||||
error: unknown;
|
||||
isError: boolean;
|
||||
isPending: boolean;
|
||||
mutate: (values: PresentationValues) => void;
|
||||
};
|
||||
offeringsQuery: PresentationRecordQuery;
|
||||
trustQuery: PresentationRecordQuery;
|
||||
recordDraft: RecordDraft | undefined;
|
||||
inquiryDraft: RuntimeWorkspace["inquiryForms"][number]["fields"] | undefined;
|
||||
brandDirty: boolean;
|
||||
selection: PreviewSelection | undefined;
|
||||
activeTarget: string | undefined;
|
||||
guardDraft: (action: () => void) => void;
|
||||
selectPage: (page: string) => void;
|
||||
selectDetailOffering: (id: string) => void;
|
||||
selectPreviewTarget: (target: PreviewTarget) => void;
|
||||
handleTargetSelected: (next?: PreviewSelection) => void;
|
||||
setRecordDraft: (draft: RecordDraft | undefined) => void;
|
||||
setInquiryDraft: (fields: RuntimeWorkspace["inquiryForms"][number]["fields"] | undefined) => void;
|
||||
handleValuesChange: (changed: PresentationValues, allValues: PresentationValues) => void;
|
||||
navigate: NavigateFunction;
|
||||
}
|
||||
|
||||
/**
|
||||
* PresentationEditor 的状态与派生数据集中在此处。
|
||||
* 视图组件只负责渲染,避免页面组件继续膨胀。
|
||||
*/
|
||||
export function usePresentationEditorController({
|
||||
templateContent,
|
||||
previewWorkspace,
|
||||
config,
|
||||
brand,
|
||||
initialSelection,
|
||||
}: PresentationEditorControllerInput): PresentationEditorController {
|
||||
const queryClient = useQueryClient();
|
||||
const navigate = useNavigate();
|
||||
const [activePage, setActivePage] = useState<string>();
|
||||
const [selection, setSelection] = useState<PreviewSelection | undefined>(initialSelection);
|
||||
const [hasInitializedSelection, setHasInitializedSelection] = useState(Boolean(initialSelection));
|
||||
const [detailOfferingId, setDetailOfferingId] = useState<string>();
|
||||
const [recordDraft, setRecordDraft] = useState<RecordDraft>();
|
||||
const [inquiryDraft, setInquiryDraft] =
|
||||
useState<RuntimeWorkspace["inquiryForms"][number]["fields"]>();
|
||||
const [brandDirty, setBrandDirty] = useState(false);
|
||||
const guardDraft = useEditorDraft(brandDirty || !!recordDraft || !!inquiryDraft);
|
||||
const inquiryRuntime = previewWorkspace?.inquiryForms.find((item) => item.target === "brand");
|
||||
const sections = useBrandPresentationSections(templateContent);
|
||||
const pageOptions = useMemo(() => {
|
||||
const pages = new Map<string, string>();
|
||||
for (const item of templateContent?.navigation ?? []) pages.set(item.page, item.label);
|
||||
for (const section of templateContent?.admin.sections ?? []) {
|
||||
const navigation = templateContent?.navigation.find((item) => item.page === section.page);
|
||||
if (!pages.has(section.page))
|
||||
pages.set(section.page, navigation?.label ?? pageTitle(section.page));
|
||||
}
|
||||
return [...pages].map(([value, label]) => ({ value, label }));
|
||||
}, [templateContent]);
|
||||
const selectedPage = pageOptions.some((item) => item.value === activePage)
|
||||
? activePage
|
||||
: pageOptions[0]?.value;
|
||||
const visibleSections = sections.filter((section) => section.page === selectedPage);
|
||||
const recordSections = useMemo(
|
||||
() =>
|
||||
(templateContent?.trustContentTypes ?? [])
|
||||
.filter((item) => item.pages?.includes(selectedPage ?? ""))
|
||||
.map((item) => trustSection(item, selectedPage ?? "home")),
|
||||
[templateContent, selectedPage],
|
||||
);
|
||||
const visibleTargets = useMemo<PreviewTarget[]>(
|
||||
() =>
|
||||
[...(templateContent?.admin.sections ?? []), ...recordSections]
|
||||
.filter(
|
||||
(section) =>
|
||||
section.page === selectedPage &&
|
||||
(selectedPage !== "detail" || section.target === "brand"),
|
||||
)
|
||||
.flatMap((section) =>
|
||||
(section.previewTargets ?? []).map((target) => ({
|
||||
...target,
|
||||
page: section.page,
|
||||
source: previewTargetSource(section, target.key),
|
||||
...(section.key.startsWith("trust:") ? { trustType: section.key.slice(6) } : {}),
|
||||
})),
|
||||
)
|
||||
.concat(
|
||||
selectedPage === "inquiry" && inquiryRuntime
|
||||
? inquiryRuntime.fields.map((field) => ({
|
||||
key: `inquiry-field:${field.key}`,
|
||||
label: field.label,
|
||||
page: "inquiry",
|
||||
source: "inquiry" as const,
|
||||
}))
|
||||
: [],
|
||||
),
|
||||
[templateContent, selectedPage, recordSections, inquiryRuntime],
|
||||
);
|
||||
const activeTarget = selection?.targetKey;
|
||||
const selectedTarget = visibleTargets.find((target) => target.key === activeTarget);
|
||||
const selectedSection = [...(templateContent?.admin.sections ?? []), ...recordSections].find(
|
||||
(section) =>
|
||||
section.page === selectedPage &&
|
||||
section.previewTargets?.some((target) => target.key === selectedTarget?.key),
|
||||
);
|
||||
const selectedRecordSource =
|
||||
selectedTarget?.source === "offering" || selectedTarget?.source === "trust"
|
||||
? selectedTarget.source
|
||||
: undefined;
|
||||
const { offeringsQuery, trustQuery, selectedRecord } = usePresentationRecordQueries(
|
||||
selectedRecordSource,
|
||||
selection?.recordId,
|
||||
);
|
||||
const editableSections = filterSectionsForPreviewTarget(
|
||||
visibleSections.filter((section) =>
|
||||
section.fields.some((field) => field.binding.startsWith("brand.")),
|
||||
),
|
||||
selectedTarget?.key,
|
||||
);
|
||||
const recordSection = useMemo(
|
||||
() =>
|
||||
selectedSection && selection?.targetKey
|
||||
? {
|
||||
...selectedSection,
|
||||
fields: selectedSection.fields.filter(
|
||||
(field) => field.previewTarget === selection.targetKey,
|
||||
),
|
||||
}
|
||||
: undefined,
|
||||
[selectedSection, selection?.targetKey],
|
||||
);
|
||||
const handleTargetSelected = useCallback(
|
||||
(next?: PreviewSelection) => {
|
||||
const select = () =>
|
||||
setSelection(
|
||||
next
|
||||
? resolvePreviewSelection(
|
||||
next.targetKey,
|
||||
next.recordId,
|
||||
visibleTargets,
|
||||
selectedPage ?? "home",
|
||||
)
|
||||
: undefined,
|
||||
);
|
||||
if (recordDraft || inquiryDraft)
|
||||
guardDraft(() => {
|
||||
setInquiryDraft(undefined);
|
||||
setRecordDraft(undefined);
|
||||
select();
|
||||
});
|
||||
else select();
|
||||
},
|
||||
[visibleTargets, selectedPage, recordDraft, inquiryDraft, guardDraft],
|
||||
);
|
||||
const relatedTargets = [
|
||||
...(templateContent?.admin.sections ?? [])
|
||||
.filter((section) => section.page === selectedPage && section.target !== "brand")
|
||||
.map((section) => section.target),
|
||||
...((templateContent?.trustContentTypes ?? []).some((item) =>
|
||||
item.pages?.includes(selectedPage ?? ""),
|
||||
)
|
||||
? ["trust"]
|
||||
: []),
|
||||
];
|
||||
const pageLinks = [...new Set(relatedTargets)].flatMap((target) =>
|
||||
target === "trust"
|
||||
? (templateContent?.trustContentTypes ?? [])
|
||||
.filter((item) => item.pages?.includes(selectedPage ?? ""))
|
||||
.map((item) => ({
|
||||
target: `trust:${item.type}`,
|
||||
label: `编辑${item.label}`,
|
||||
}))
|
||||
: [
|
||||
{
|
||||
target,
|
||||
label: (
|
||||
{ offering: "管理此页展示的业务内容", inquiry: "管理此页的咨询表单" } as Record<
|
||||
string,
|
||||
string
|
||||
>
|
||||
)[target],
|
||||
},
|
||||
],
|
||||
);
|
||||
const relevantPageLinks = selectedSection
|
||||
? pageLinks.filter((item) => {
|
||||
if (item.target.startsWith("trust:")) return selectedSection.target === "trust";
|
||||
return item.target === selectedSection.target;
|
||||
})
|
||||
: pageLinks;
|
||||
const formState = useBrandPresentationForm({ brand, config, sections });
|
||||
const { form, initialValues } = formState;
|
||||
const save = useBrandSaveMutation({
|
||||
...formState,
|
||||
brand,
|
||||
config,
|
||||
sections,
|
||||
queryClient,
|
||||
onSaved: () => setBrandDirty(false),
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
const initialPage =
|
||||
typeof initialSelection === "object" && "page" in initialSelection
|
||||
? String(initialSelection.page)
|
||||
: undefined;
|
||||
if (initialPage) {
|
||||
setActivePage(
|
||||
pageOptions.some((item) => item.value === initialPage)
|
||||
? initialPage
|
||||
: pageOptions[0]?.value,
|
||||
);
|
||||
return;
|
||||
}
|
||||
if (!activePage && pageOptions.length) setActivePage(pageOptions[0]?.value);
|
||||
}, [activePage, initialSelection, pageOptions]);
|
||||
useEffect(() => {
|
||||
if (hasInitializedSelection) return;
|
||||
if (!pageOptions.length) return;
|
||||
if (!initialSelection) return;
|
||||
const requestedPage =
|
||||
typeof initialSelection === "object" && "page" in initialSelection
|
||||
? String(initialSelection.page)
|
||||
: undefined;
|
||||
const resolvedPage =
|
||||
requestedPage && pageOptions.some((item) => item.value === requestedPage)
|
||||
? requestedPage
|
||||
: (pageOptions[0]?.value ?? "home");
|
||||
setSelection(
|
||||
resolvePreviewSelection(
|
||||
initialSelection.targetKey,
|
||||
initialSelection.recordId,
|
||||
visibleTargets,
|
||||
resolvedPage,
|
||||
),
|
||||
);
|
||||
setActivePage(resolvedPage);
|
||||
setHasInitializedSelection(true);
|
||||
}, [hasInitializedSelection, initialSelection, pageOptions, selectedPage, visibleTargets]);
|
||||
useEffect(() => {
|
||||
if (!initialSelection) setSelection(undefined);
|
||||
}, [initialSelection, selectedPage, templateContent?.displayName]);
|
||||
useEffect(() => {
|
||||
if (!selection?.recordId) return;
|
||||
const records =
|
||||
selectedTarget?.source === "trust"
|
||||
? previewWorkspace?.trustItems
|
||||
: previewWorkspace?.offerings;
|
||||
if (records && !records.some((item) => item.id === selection.recordId)) setSelection(undefined);
|
||||
}, [
|
||||
previewWorkspace?.offerings,
|
||||
previewWorkspace?.trustItems,
|
||||
selectedTarget?.source,
|
||||
selection,
|
||||
]);
|
||||
useEffect(
|
||||
() => setRecordDraft(undefined),
|
||||
[selection?.targetKey, selection?.recordId, selectedPage],
|
||||
);
|
||||
const { previewBrand, handleValuesChange, resetPreview } = useBrandPreviewDraft({
|
||||
brand,
|
||||
config,
|
||||
sections,
|
||||
form,
|
||||
onDirty: () => setBrandDirty(true),
|
||||
});
|
||||
const recordPreview = useRecordPreview({ recordDraft, selectedRecord, recordSection });
|
||||
useEffect(() => resetPreview(), [config, initialValues, resetPreview]);
|
||||
const draftWorkspace = useDraftWorkspace({
|
||||
previewWorkspace,
|
||||
previewBrand,
|
||||
inquiryRuntime,
|
||||
inquiryDraft,
|
||||
recordDraft,
|
||||
selectedRecord,
|
||||
recordSection,
|
||||
recordPreview,
|
||||
templateContent,
|
||||
});
|
||||
const selectedDetailOfferingId =
|
||||
detailOfferingId && draftWorkspace?.offerings.some((item) => item.id === detailOfferingId)
|
||||
? detailOfferingId
|
||||
: draftWorkspace?.offerings[0]?.id;
|
||||
|
||||
const selectPage = useCallback(
|
||||
(page: string) => {
|
||||
guardDraft(() => {
|
||||
setBrandDirty(false);
|
||||
resetPreview();
|
||||
setRecordDraft(undefined);
|
||||
setInquiryDraft(undefined);
|
||||
setActivePage(page);
|
||||
});
|
||||
},
|
||||
[guardDraft, resetPreview],
|
||||
);
|
||||
const selectDetailOffering = useCallback((id: string) => {
|
||||
setDetailOfferingId(id);
|
||||
setSelection(undefined);
|
||||
}, []);
|
||||
const selectPreviewTarget = useCallback(
|
||||
(target: PreviewTarget) => {
|
||||
const recordId =
|
||||
target.source === "offering"
|
||||
? selectedPage === "detail"
|
||||
? selectedDetailOfferingId
|
||||
: draftWorkspace?.offerings[0]?.id
|
||||
: target.source === "trust"
|
||||
? previewTrustRecordId(draftWorkspace?.trustItems ?? [], target.trustType)
|
||||
: undefined;
|
||||
handleTargetSelected({
|
||||
targetKey: target.key,
|
||||
...(recordId ? { recordId } : {}),
|
||||
});
|
||||
},
|
||||
[handleTargetSelected, selectedPage, selectedDetailOfferingId, draftWorkspace],
|
||||
);
|
||||
|
||||
return {
|
||||
pageOptions,
|
||||
selectedPage,
|
||||
visibleTargets,
|
||||
selectedTarget,
|
||||
selectedSection,
|
||||
selectedRecordSource,
|
||||
selectedRecord,
|
||||
recordSection,
|
||||
editableSections,
|
||||
relevantPageLinks,
|
||||
inquiryRuntime,
|
||||
draftWorkspace,
|
||||
previewBrand,
|
||||
selectedDetailOfferingId,
|
||||
form,
|
||||
initialValues,
|
||||
save,
|
||||
offeringsQuery,
|
||||
trustQuery,
|
||||
recordDraft,
|
||||
inquiryDraft,
|
||||
brandDirty,
|
||||
selection,
|
||||
activeTarget,
|
||||
guardDraft,
|
||||
selectPage,
|
||||
selectDetailOffering,
|
||||
selectPreviewTarget,
|
||||
handleTargetSelected,
|
||||
setRecordDraft,
|
||||
setInquiryDraft,
|
||||
handleValuesChange,
|
||||
navigate,
|
||||
};
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Form, message } from "antd";
|
||||
import { App, Form } from "antd";
|
||||
import { useMutation, useQuery } from "@tanstack/react-query";
|
||||
import type { QueryClient } from "@tanstack/react-query";
|
||||
import { useCallback, useEffect, useMemo, useState } from "react";
|
||||
@@ -11,6 +11,7 @@ import type {
|
||||
TrustContent,
|
||||
} from "@personal-brand/api-client";
|
||||
import { createApiClient } from "../../lib/api.js";
|
||||
import { getFullFormValues } from "../../lib/form-values.js";
|
||||
import {
|
||||
applyBrandPreviewValues,
|
||||
applyPresentationValues,
|
||||
@@ -89,7 +90,6 @@ export function useBrandPresentationForm({
|
||||
return values;
|
||||
}, [brand, config, sections]);
|
||||
|
||||
useEffect(() => form.setFieldsValue(initialValues), [form, initialValues]);
|
||||
return { form, initialValues };
|
||||
}
|
||||
|
||||
@@ -108,6 +108,7 @@ export function useBrandSaveMutation({
|
||||
queryClient,
|
||||
onSaved,
|
||||
}: BrandSaveMutationOptions) {
|
||||
const { message } = App.useApp();
|
||||
return useMutation({
|
||||
mutationFn: (values: PresentationValues) => {
|
||||
const nextConfig = applyPresentationValues(config, sections, values);
|
||||
@@ -161,7 +162,7 @@ export function useBrandPreviewDraft({
|
||||
const handleValuesChange = (changed: PresentationValues, allValues: PresentationValues) => {
|
||||
onDirty();
|
||||
const synchronized: PresentationValues = {
|
||||
...(form.getFieldsValue(true) as PresentationValues),
|
||||
...getFullFormValues<PresentationValues>(form),
|
||||
...allValues,
|
||||
};
|
||||
for (const section of sections) {
|
||||
|
||||
@@ -27,7 +27,21 @@ const element = (tag) =>
|
||||
|
||||
export const View = element("div");
|
||||
export const Text = element("span");
|
||||
export const Button = element("button");
|
||||
export const Button = React.forwardRef(
|
||||
({ children, className, style, onClick, loading, ...props }, ref) =>
|
||||
React.createElement(
|
||||
"button",
|
||||
{
|
||||
...props,
|
||||
ref,
|
||||
className,
|
||||
style,
|
||||
onClick,
|
||||
...(loading ? { "aria-busy": "true" } : {}),
|
||||
},
|
||||
children,
|
||||
),
|
||||
);
|
||||
export const Input = React.forwardRef(({ onInput, ...props }, ref) =>
|
||||
React.createElement("input", {
|
||||
...props,
|
||||
@@ -101,16 +115,18 @@ export const Label = element("label");
|
||||
export const Image = React.forwardRef(({ mode, src, style, ...props }, ref) => {
|
||||
const key = React.useContext(TemplateAssetContext);
|
||||
const assets = React.useContext(TemplatePreviewAssetsContext);
|
||||
const normalizedSrc = typeof src === "string" ? src.trim() : "";
|
||||
if (!normalizedSrc) return null;
|
||||
return React.createElement("img", {
|
||||
...props,
|
||||
ref,
|
||||
src:
|
||||
assets && typeof src === "string" && src.startsWith("/assets/")
|
||||
assets && normalizedSrc.startsWith("/assets/")
|
||||
? // 导入包资源以 /assets 开头;本地多模板预览的 renderer 可能额外携带包 key 前缀。
|
||||
(assets[src]?.dataUrl ??
|
||||
assets[src.replace(`/assets/${key}/`, "/assets/")]?.dataUrl ??
|
||||
src)
|
||||
: resolveImageSource(src, key),
|
||||
(assets[normalizedSrc]?.dataUrl ??
|
||||
assets[normalizedSrc.replace(`/assets/${key}/`, "/assets/")]?.dataUrl ??
|
||||
normalizedSrc)
|
||||
: resolveImageSource(normalizedSrc, key),
|
||||
style: { objectFit: mode === "aspectFit" ? "contain" : "cover", ...style },
|
||||
});
|
||||
});
|
||||
@@ -1,8 +1,9 @@
|
||||
import { useEffect } from "react";
|
||||
import { Modal } from "antd";
|
||||
import { App } from "antd";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
|
||||
export function useEditorDraft(dirty: boolean) {
|
||||
const { modal } = App.useApp();
|
||||
const navigate = useNavigate();
|
||||
useEffect(() => {
|
||||
if (!dirty) return;
|
||||
@@ -22,7 +23,7 @@ export function useEditorDraft(dirty: boolean) {
|
||||
return;
|
||||
event.preventDefault();
|
||||
event.stopImmediatePropagation();
|
||||
Modal.confirm({
|
||||
modal.confirm({
|
||||
title: "有尚未保存的修改",
|
||||
content: "离开工作台会丢失未保存内容。请先保存,或确认放弃修改。",
|
||||
okText: "放弃修改并继续",
|
||||
@@ -40,7 +41,7 @@ export function useEditorDraft(dirty: boolean) {
|
||||
}, [dirty, navigate]);
|
||||
return (action: () => void) => {
|
||||
if (!dirty) return action();
|
||||
Modal.confirm({
|
||||
modal.confirm({
|
||||
title: "有尚未保存的修改",
|
||||
content: "切换后当前内容可能丢失。请先保存,或确认放弃修改。",
|
||||
okText: "放弃修改并继续",
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
import { Alert, Button, Card, Col, Row, Space } from "antd";
|
||||
import { Alert, App, Button, Card, Col, Row, Space } from "antd";
|
||||
import { PlusOutlined } from "@ant-design/icons";
|
||||
import { useQuery } from "@tanstack/react-query";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import { createApiClient } from "../../lib/api.js";
|
||||
import { adminMessage as message } from "../../components/AdminMessage.js";
|
||||
import { AdminPageHeader } from "../../components/AdminPageHeader.js";
|
||||
import { EmptyState } from "../../components/EmptyState.js";
|
||||
import { QueryState } from "../../components/QueryState.js";
|
||||
@@ -12,6 +11,7 @@ import { StatusTag } from "../../components/StatusTag.js";
|
||||
const client = createApiClient();
|
||||
|
||||
export function BrandsPage({ canCreate }: { canCreate: boolean }) {
|
||||
const { message } = App.useApp();
|
||||
const navigate = useNavigate();
|
||||
const brands = useQuery({
|
||||
queryKey: ["admin-brand-memberships"],
|
||||
@@ -58,7 +58,7 @@ export function BrandsPage({ canCreate }: { canCreate: boolean }) {
|
||||
className="admin-offset-bottom"
|
||||
type="info"
|
||||
showIcon
|
||||
message="切换品牌会进入对应品牌的工作区"
|
||||
title="切换品牌会进入对应品牌的工作区"
|
||||
description="品牌之间的业务内容、成员、发布记录和页面方案相互隔离。"
|
||||
/>
|
||||
{brands.data?.length ? (
|
||||
@@ -88,7 +88,7 @@ export function BrandsPage({ canCreate }: { canCreate: boolean }) {
|
||||
</Button>,
|
||||
]}
|
||||
>
|
||||
<Space direction="vertical" size={8}>
|
||||
<Space orientation="vertical" size={8}>
|
||||
<span className="admin-section-description">
|
||||
小程序地址标识:{membership.brand.slug}
|
||||
</span>
|
||||
|
||||
@@ -28,6 +28,7 @@ export function CreateBrandPage() {
|
||||
const navigate = useNavigate();
|
||||
const [form] = Form.useForm<CreateBrandInput>();
|
||||
const businessType = Form.useWatch("businessType", form);
|
||||
const selectedSchemeId = Form.useWatch("templatePackageVersionId", form);
|
||||
const options = useQuery({
|
||||
queryKey: ["admin-brand-creation-options"],
|
||||
queryFn: () => client.getAdminBrandCreationOptions(),
|
||||
@@ -121,12 +122,12 @@ export function CreateBrandPage() {
|
||||
<Alert
|
||||
type="warning"
|
||||
showIcon
|
||||
message="当前业务类型还没有可用的页面方案"
|
||||
title="当前业务类型还没有可用的页面方案"
|
||||
description="请先联系平台管理员发布兼容的页面方案。"
|
||||
/>
|
||||
)
|
||||
) : (
|
||||
<Alert type="info" showIcon message="选择业务类型后,将只显示兼容的页面方案" />
|
||||
<Alert type="info" showIcon title="选择业务类型后,将只显示兼容的页面方案" />
|
||||
)}
|
||||
</AdminSection>
|
||||
|
||||
@@ -140,7 +141,7 @@ export function CreateBrandPage() {
|
||||
rules={[{ required: true, message: "请选择页面方案" }]}
|
||||
>
|
||||
<Radio.Group className="admin-stack">
|
||||
<Space direction="vertical" size={12} className="admin-full-width">
|
||||
<Space orientation="vertical" size={12} className="admin-full-width">
|
||||
{schemes.map((scheme) => (
|
||||
<Radio.Button
|
||||
key={scheme.templatePackageVersionId}
|
||||
@@ -179,7 +180,7 @@ export function CreateBrandPage() {
|
||||
<Alert
|
||||
type="info"
|
||||
showIcon
|
||||
message="创建品牌不会自动导入示例内容"
|
||||
title="创建品牌不会自动导入示例内容"
|
||||
description="新品牌会从空白内容开始,避免把示例品牌、案例或联系方式误当成真实信息发布。"
|
||||
/>
|
||||
<MutationError error={create.error} />
|
||||
@@ -190,7 +191,10 @@ export function CreateBrandPage() {
|
||||
htmlType="submit"
|
||||
size="large"
|
||||
loading={create.isPending}
|
||||
disabled={!businessType || schemes.length === 0}
|
||||
disabled={
|
||||
!businessType ||
|
||||
!schemes.some((scheme) => scheme.templatePackageVersionId === selectedSchemeId)
|
||||
}
|
||||
>
|
||||
创建并进入品牌
|
||||
</Button>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
||||
import { message } from "antd";
|
||||
import { App } from "antd";
|
||||
import { createApiClient } from "../../../lib/api.js";
|
||||
import { readAdminCapability } from "../types.js";
|
||||
import type { CapabilityValues } from "../types.js";
|
||||
@@ -17,6 +17,7 @@ export function useCapabilityQuery() {
|
||||
}
|
||||
|
||||
export function useCapabilityMutation() {
|
||||
const { message } = App.useApp();
|
||||
const queryClient = useQueryClient();
|
||||
return useMutation({
|
||||
mutationFn: ({ key, ...values }: { key: string } & CapabilityValues) =>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Badge, Button, Descriptions, Drawer, Select, Space, Table, message, Input } from "antd";
|
||||
import { App, Badge, Button, Descriptions, Drawer, Select, Space, Table, Input } from "antd";
|
||||
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
||||
import type { AdminBooking, InquirySubmission } from "@personal-brand/api-client";
|
||||
import { createApiClient } from "../../lib/api.js";
|
||||
@@ -51,6 +51,7 @@ const statusTones: Record<string, StatusTone> = {
|
||||
};
|
||||
|
||||
export function InquiriesPage() {
|
||||
const { message } = App.useApp();
|
||||
const client = createApiClient();
|
||||
const queryClient = useQueryClient();
|
||||
const [status, setStatus] = useState<string>();
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { Alert, Button, Card, Collapse, Descriptions, Empty, List, Modal, Space, Tag } from "antd";
|
||||
import { Alert, App, Button, Card, Collapse, Descriptions, Empty, List, Space, Tag } from "antd";
|
||||
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
||||
import { createApiClient } from "../../lib/api.js";
|
||||
import { adminMessage as message } from "../../components/AdminMessage.js";
|
||||
import { AdminPageHeader } from "../../components/AdminPageHeader.js";
|
||||
import { AdminSection } from "../../components/AdminSection.js";
|
||||
import { MutationError, QueryState } from "../../components/QueryState.js";
|
||||
@@ -11,6 +10,7 @@ import { StatusTag } from "../../components/StatusTag.js";
|
||||
const client = createApiClient();
|
||||
|
||||
export function PageSchemePage() {
|
||||
const { message, modal } = App.useApp();
|
||||
const queryClient = useQueryClient();
|
||||
const [selectedVersionId, setSelectedVersionId] = useState<string>();
|
||||
const [samplePreview, setSamplePreview] = useState<Awaited<
|
||||
@@ -43,6 +43,7 @@ export function PageSchemePage() {
|
||||
const refresh = () => {
|
||||
for (const queryKey of [
|
||||
"page-scheme-workspace",
|
||||
"admin-page-scheme-options",
|
||||
"page-scheme-upgrade-preview",
|
||||
"admin-workspace",
|
||||
"admin-preview-workspace",
|
||||
@@ -134,7 +135,7 @@ export function PageSchemePage() {
|
||||
const target = compatibleSchemes.find(
|
||||
(scheme) => scheme.templatePackageVersionId === templatePackageVersionId,
|
||||
);
|
||||
Modal.confirm({
|
||||
modal.confirm({
|
||||
title: "切换页面方案版本",
|
||||
content: target
|
||||
? `将当前品牌切换到「${target.name}」版本 ${target.version}。现有品牌内容会保留。`
|
||||
@@ -146,7 +147,7 @@ export function PageSchemePage() {
|
||||
};
|
||||
const confirmUpgrade = () => {
|
||||
const preview = upgradePreview.data;
|
||||
Modal.confirm({
|
||||
modal.confirm({
|
||||
title: "升级页面方案",
|
||||
content:
|
||||
preview && preview.conflicts.length
|
||||
@@ -158,7 +159,7 @@ export function PageSchemePage() {
|
||||
});
|
||||
};
|
||||
const confirmRollback = () => {
|
||||
Modal.confirm({
|
||||
modal.confirm({
|
||||
title: "恢复上一版配置基线",
|
||||
content: "此操作只恢复上一版页面方案配置,不会删除品牌内容、业务提供项或咨询记录。",
|
||||
okText: "确认恢复",
|
||||
@@ -211,7 +212,7 @@ export function PageSchemePage() {
|
||||
>
|
||||
<Card>
|
||||
{upgradePreview.data?.canUpgrade ? (
|
||||
<Space direction="vertical" size={12} className="admin-full-width">
|
||||
<Space orientation="vertical" size={12} className="admin-full-width">
|
||||
<div className="admin-row-line">
|
||||
<strong>可升级到版本 {upgradePreview.data.latestVersion}</strong>
|
||||
<Tag color="blue">建议先预览</Tag>
|
||||
@@ -234,11 +235,11 @@ export function PageSchemePage() {
|
||||
<Alert
|
||||
type="warning"
|
||||
showIcon
|
||||
message={`发现 ${upgradePreview.data.conflicts.length} 项自定义内容与新版布局存在差异`}
|
||||
title={`发现 ${upgradePreview.data.conflicts.length} 项自定义内容与新版布局存在差异`}
|
||||
description="升级时会全部保留现有内容,不会逐项覆盖。请确认后再执行升级。"
|
||||
/>
|
||||
) : (
|
||||
<Alert type="success" showIcon message="未发现内容绑定冲突" />
|
||||
<Alert type="success" showIcon title="未发现内容绑定冲突" />
|
||||
)}
|
||||
<Button type="primary" onClick={confirmUpgrade} loading={upgrade.isPending}>
|
||||
升级到 {upgradePreview.data.latestVersion}
|
||||
@@ -317,11 +318,11 @@ export function PageSchemePage() {
|
||||
key: "sample-content",
|
||||
label: "高级:导入示例内容",
|
||||
children: (
|
||||
<Space direction="vertical" size={12} className="admin-full-width">
|
||||
<Space orientation="vertical" size={12} className="admin-full-width">
|
||||
<Alert
|
||||
type="warning"
|
||||
showIcon
|
||||
message="此操作会写入当前品牌内容"
|
||||
title="此操作会写入当前品牌内容"
|
||||
description="仅导入当前缺失的内容,不会覆盖已有品牌资料。创建品牌时不会自动执行。"
|
||||
/>
|
||||
<Space>
|
||||
|
||||
@@ -125,7 +125,7 @@ export function MiniAppReleaseCard({
|
||||
return (
|
||||
<Card size="small" styles={{ body: { padding: 16 } }}>
|
||||
<Flex justify="space-between" align="flex-start" gap={12} wrap>
|
||||
<Space direction="vertical" size={4}>
|
||||
<Space orientation="vertical" size={4}>
|
||||
<Space wrap size={8} align="center">
|
||||
<Typography.Text strong>品牌内容 v{task.version}</Typography.Text>
|
||||
<StatusTag label={status.label} tone={status.tone} />
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useEffect } from "react";
|
||||
import { Alert, Button, Form, Input, Space } from "antd";
|
||||
import type { FormInstance } from "antd";
|
||||
import type { MiniAppReleaseSettings } from "@personal-brand/api-client";
|
||||
import { AdminSection } from "../../components/AdminSection.js";
|
||||
import { MutationError } from "../../components/QueryState.js";
|
||||
@@ -9,35 +9,41 @@ export type MiniAppSettingsValues = {
|
||||
appId: string;
|
||||
apiBaseUrl: string;
|
||||
privateKey?: string;
|
||||
appSecret?: string;
|
||||
};
|
||||
|
||||
interface MiniAppSettingsTabProps {
|
||||
form: FormInstance<MiniAppSettingsValues>;
|
||||
settings: MiniAppReleaseSettings | undefined;
|
||||
saving: boolean;
|
||||
error?: unknown;
|
||||
onSave: (values: MiniAppSettingsValues) => void;
|
||||
}
|
||||
|
||||
export function MiniAppSettingsTab({
|
||||
form,
|
||||
settings,
|
||||
saving,
|
||||
error,
|
||||
onSave,
|
||||
}: MiniAppSettingsTabProps) {
|
||||
export function MiniAppSettingsTab({ settings, saving, error, onSave }: MiniAppSettingsTabProps) {
|
||||
const [form] = Form.useForm<MiniAppSettingsValues>();
|
||||
|
||||
useEffect(() => {
|
||||
if (!settings) return;
|
||||
form.setFieldsValue({
|
||||
appId: settings.appId,
|
||||
apiBaseUrl: settings.apiBaseUrl,
|
||||
privateKey: "",
|
||||
appSecret: "",
|
||||
});
|
||||
}, [form, settings]);
|
||||
|
||||
return (
|
||||
<div className="admin-stack admin-stack-lg">
|
||||
<AdminSection
|
||||
title="小程序上传配置"
|
||||
description="AppID 用于服务端调用微信官方上传工具;上传私钥保存前会使用 AES-256-GCM 加密。"
|
||||
title="小程序配置"
|
||||
description="AppID 同时用于代码上传和小程序登录;AppSecret 只用于 wx.login 换取 OpenID;上传私钥和 AppSecret 均使用 AES-256-GCM 加密保存。"
|
||||
>
|
||||
{settings?.buildError ? (
|
||||
<Alert
|
||||
type="warning"
|
||||
showIcon
|
||||
className="admin-offset-bottom"
|
||||
message="小程序构建参数未就绪"
|
||||
title="小程序构建参数未就绪"
|
||||
description={settings.buildError}
|
||||
/>
|
||||
) : (
|
||||
@@ -45,7 +51,7 @@ export function MiniAppSettingsTab({
|
||||
type="info"
|
||||
showIcon
|
||||
className="admin-offset-bottom"
|
||||
message={`请求域名 ${settings?.requestDomain ?? "未确认"}`}
|
||||
title={`请求域名 ${settings?.requestDomain ?? "未确认"}`}
|
||||
description="该域名在构建时写入小程序包,必须与微信后台“开发设置 → 服务器域名 → request 合法域名”一致;不一致会导致小程序打开即加载失败。"
|
||||
/>
|
||||
)}
|
||||
@@ -55,7 +61,32 @@ export function MiniAppSettingsTab({
|
||||
label="微信 AppID"
|
||||
rules={[{ required: true, message: "请输入微信 AppID" }]}
|
||||
>
|
||||
<Input maxLength={100} />
|
||||
<Input maxLength={100} autoComplete="off" />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
name="appSecret"
|
||||
label="微信登录 AppSecret"
|
||||
help={
|
||||
settings?.hasStoredAppSecret
|
||||
? "已加密保存。留空保持现有 AppSecret;修改 AppID 时必须同时填写新 AppID 对应的 AppSecret。"
|
||||
: "从微信公众平台“开发管理 → 开发设置”复制。保存后立即生效,不需要重新上传小程序代码。"
|
||||
}
|
||||
rules={[
|
||||
{
|
||||
validator: (_rule, value: string) =>
|
||||
!value || /^[A-Za-z0-9]{16,64}$/.test(value.trim())
|
||||
? Promise.resolve()
|
||||
: Promise.reject(new Error("AppSecret 应为 16-64 位字母或数字,请复制完整值")),
|
||||
},
|
||||
]}
|
||||
>
|
||||
<Input.Password
|
||||
maxLength={64}
|
||||
autoComplete="new-password"
|
||||
placeholder={
|
||||
settings?.hasStoredAppSecret ? "留空保持现有 AppSecret" : "填写该小程序的 AppSecret"
|
||||
}
|
||||
/>
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
name="apiBaseUrl"
|
||||
@@ -94,15 +125,29 @@ export function MiniAppSettingsTab({
|
||||
className="admin-code-input"
|
||||
/>
|
||||
</Form.Item>
|
||||
<Space>
|
||||
{!settings?.loginConfigured ? (
|
||||
<Alert
|
||||
type="warning"
|
||||
showIcon
|
||||
className="admin-offset-bottom"
|
||||
title="微信登录尚不可用"
|
||||
description="该品牌需要同时保存微信 AppID 和 AppSecret,体验版才能通过 wx.login 换取 OpenID。"
|
||||
/>
|
||||
) : null}
|
||||
<Space wrap>
|
||||
<Button type="primary" loading={saving} htmlType="submit">
|
||||
保存上传配置
|
||||
保存小程序配置
|
||||
</Button>
|
||||
{settings?.hasStoredCredentials ? (
|
||||
<StatusTag tone="success" label="已加密保存上传凭据" />
|
||||
) : (
|
||||
<StatusTag tone="warning" label="未配置上传私钥" />
|
||||
)}
|
||||
{settings?.hasStoredAppSecret ? (
|
||||
<StatusTag tone="success" label="已加密保存登录凭据" />
|
||||
) : (
|
||||
<StatusTag tone="warning" label="未配置登录 AppSecret" />
|
||||
)}
|
||||
</Space>
|
||||
<MutationError error={error} />
|
||||
</Form>
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
import { useState } from "react";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import { useQueryClient } from "@tanstack/react-query";
|
||||
import { Alert, Button, Divider, Form, Input, Modal, Space, Tabs, Typography } from "antd";
|
||||
import { Alert, Button, Divider, Input, Modal, Space, Tabs, Typography } from "antd";
|
||||
import { AdminPageHeader } from "../../components/AdminPageHeader.js";
|
||||
import { AdminSection } from "../../components/AdminSection.js";
|
||||
import { EmptyState } from "../../components/EmptyState.js";
|
||||
import { MutationError, QueryState } from "../../components/QueryState.js";
|
||||
import { StatusTag, statusLabel } from "../../components/StatusTag.js";
|
||||
import { MiniAppReleaseCard } from "./MiniAppReleaseCard.js";
|
||||
import { MiniAppSettingsTab, type MiniAppSettingsValues } from "./MiniAppSettingsTab.js";
|
||||
import { MiniAppSettingsTab } from "./MiniAppSettingsTab.js";
|
||||
import { usePublicationQueries } from "./use-publication-queries.js";
|
||||
import { usePublicationMutations } from "./use-publication-mutations.js";
|
||||
|
||||
@@ -29,8 +29,7 @@ export function PublicationPage() {
|
||||
const [rollbackVersion, setRollbackVersion] = useState<number | null>(null);
|
||||
const [note, setNote] = useState("");
|
||||
const [activeTab, setActiveTab] = useState("content");
|
||||
const [miniAppSettingsForm] = Form.useForm<MiniAppSettingsValues>();
|
||||
const queries = usePublicationQueries(miniAppSettingsForm);
|
||||
const queries = usePublicationQueries();
|
||||
const {
|
||||
workspace,
|
||||
readiness,
|
||||
@@ -255,7 +254,6 @@ export function PublicationPage() {
|
||||
label: "小程序配置",
|
||||
children: (
|
||||
<MiniAppSettingsTab
|
||||
form={miniAppSettingsForm}
|
||||
settings={miniAppSettings.data}
|
||||
saving={saveMiniAppSettings.isPending}
|
||||
error={saveMiniAppSettings.error}
|
||||
@@ -277,7 +275,7 @@ export function PublicationPage() {
|
||||
{confirmAction === "revoke" ? (
|
||||
<Alert
|
||||
type="warning"
|
||||
message="撤回后,小程序将显示品牌尚未发布,新的咨询和预约会停止受理。"
|
||||
title="撤回后,小程序将显示品牌尚未发布,新的咨询和预约会停止受理。"
|
||||
/>
|
||||
) : (
|
||||
<div className="admin-stack">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useMutation, useQueryClient } from "@tanstack/react-query";
|
||||
import { message } from "antd";
|
||||
import { App } from "antd";
|
||||
import { createApiClient } from "../../lib/api.js";
|
||||
|
||||
const client = createApiClient();
|
||||
@@ -17,6 +17,7 @@ export function usePublicationMutations({
|
||||
onNoteClear,
|
||||
onRollbackClose,
|
||||
}: MutationOptions) {
|
||||
const { message } = App.useApp();
|
||||
const queryClient = useQueryClient();
|
||||
const publish = useMutation({
|
||||
mutationFn: (note: string) => client.publishAdminRelease(note || undefined),
|
||||
@@ -55,14 +56,20 @@ export function usePublicationMutations({
|
||||
},
|
||||
});
|
||||
const saveMiniAppSettings = useMutation({
|
||||
mutationFn: (values: { appId: string; apiBaseUrl: string; privateKey?: string }) =>
|
||||
mutationFn: (values: {
|
||||
appId: string;
|
||||
apiBaseUrl: string;
|
||||
privateKey?: string;
|
||||
appSecret?: string;
|
||||
}) =>
|
||||
client.updateAdminMiniAppSettings({
|
||||
appId: values.appId,
|
||||
apiBaseUrl: values.apiBaseUrl,
|
||||
...(values.privateKey ? { privateKey: values.privateKey } : {}),
|
||||
...(values.appSecret ? { appSecret: values.appSecret } : {}),
|
||||
}),
|
||||
onSuccess: () => {
|
||||
message.success("小程序上传配置已保存");
|
||||
message.success("小程序配置已保存");
|
||||
void queryClient.invalidateQueries({ queryKey: ["publication-miniapp-settings"] });
|
||||
},
|
||||
});
|
||||
|
||||
@@ -1,17 +1,10 @@
|
||||
import { useEffect } from "react";
|
||||
import { useQuery } from "@tanstack/react-query";
|
||||
import type { FormInstance } from "antd";
|
||||
import { createApiClient } from "../../lib/api.js";
|
||||
|
||||
const client = createApiClient();
|
||||
|
||||
export function usePublicationQueries(
|
||||
miniAppSettingsForm: FormInstance<{
|
||||
appId: string;
|
||||
apiBaseUrl: string;
|
||||
privateKey?: string;
|
||||
}>,
|
||||
) {
|
||||
export function usePublicationQueries() {
|
||||
const brand = useQuery<Awaited<ReturnType<typeof client.getAdminBrand>>>({
|
||||
queryKey: ["publication-brand"],
|
||||
queryFn: () => client.getAdminBrand(),
|
||||
@@ -37,15 +30,6 @@ export function usePublicationQueries(
|
||||
queryFn: () => client.getAdminMiniAppSettings(),
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
if (!miniAppSettings.data) return;
|
||||
miniAppSettingsForm.setFieldsValue({
|
||||
appId: miniAppSettings.data.appId,
|
||||
apiBaseUrl: miniAppSettings.data.apiBaseUrl,
|
||||
privateKey: "",
|
||||
});
|
||||
}, [miniAppSettings.data, miniAppSettingsForm]);
|
||||
|
||||
useEffect(() => {
|
||||
const building = miniAppReleases.data?.find(
|
||||
(task) =>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { Alert, Button, Form, Input, Modal, Segmented, Select } from "antd";
|
||||
import { useEffect, useRef } from "react";
|
||||
import type {
|
||||
Offering,
|
||||
RuntimeWorkspace,
|
||||
@@ -8,9 +9,10 @@ import type {
|
||||
import { ImageUrlField } from "../../components/ImageUrlField.js";
|
||||
import { RecordContentFields } from "../../components/RecordContentEditor.js";
|
||||
import { ComponentTemplatePreview } from "../brand/ComponentTemplatePreview.js";
|
||||
import type { PreviewTarget } from "../brand/preview-selection.js";
|
||||
import type { PreviewSelection, PreviewTarget } from "../brand/preview-selection.js";
|
||||
import type { FormInstance } from "antd";
|
||||
import "./ServicesPage.css";
|
||||
import { getFullFormValues } from "../../lib/form-values.js";
|
||||
|
||||
type OfferingEditorModalProps = {
|
||||
open: boolean;
|
||||
@@ -20,13 +22,16 @@ type OfferingEditorModalProps = {
|
||||
previewWorkspace: RuntimeWorkspace | undefined;
|
||||
previewTargets: Record<"offerings" | "detail", PreviewTarget[]>;
|
||||
activeTemplateFields: TemplateAdminField[];
|
||||
activePreviewBindings: string[];
|
||||
selectedTarget: PreviewTarget | undefined;
|
||||
templateFieldSection: TemplateAdminSection;
|
||||
hasTemplateDetailCopy: boolean;
|
||||
listTarget: PreviewTarget;
|
||||
listTarget: PreviewTarget | undefined;
|
||||
detailTarget: PreviewTarget | undefined;
|
||||
saving: boolean;
|
||||
onClose: () => void;
|
||||
onPreviewPageChange: (page: "offerings" | "detail") => void;
|
||||
onPreviewTargetSelected: (selection?: PreviewSelection) => void;
|
||||
onValuesChange: (values: Record<string, unknown>) => void;
|
||||
onFinish: (values: Record<string, unknown>) => void;
|
||||
onEditInBrand: () => void;
|
||||
@@ -40,6 +45,8 @@ export function OfferingEditorModal({
|
||||
previewWorkspace,
|
||||
previewTargets,
|
||||
activeTemplateFields,
|
||||
activePreviewBindings,
|
||||
selectedTarget,
|
||||
templateFieldSection,
|
||||
hasTemplateDetailCopy,
|
||||
listTarget,
|
||||
@@ -47,10 +54,46 @@ export function OfferingEditorModal({
|
||||
saving,
|
||||
onClose,
|
||||
onPreviewPageChange,
|
||||
onPreviewTargetSelected,
|
||||
onValuesChange,
|
||||
onFinish,
|
||||
onEditInBrand,
|
||||
}: OfferingEditorModalProps) {
|
||||
const formScroll = useRef<HTMLDivElement>(null);
|
||||
const previewPageTarget = previewPage === "offerings" ? listTarget : detailTarget;
|
||||
const previewSelectionTarget = selectedTarget ?? previewPageTarget;
|
||||
const viewOptions = [
|
||||
...(listTarget ? [{ value: "offerings" as const, label: "列表卡片" }] : []),
|
||||
...(detailTarget ? [{ value: "detail" as const, label: "详情内容" }] : []),
|
||||
];
|
||||
const previewSelection: PreviewSelection | undefined = previewSelectionTarget
|
||||
? previewSelectionTarget.source === "offering" && editingOffering
|
||||
? { targetKey: previewSelectionTarget.key, recordId: editingOffering.id }
|
||||
: { targetKey: previewSelectionTarget.key }
|
||||
: undefined;
|
||||
// 标准字段与模板字段使用同一份 manifest binding;点选后只显示当前区域真正声明的字段。
|
||||
const activeBindingSet = new Set(activePreviewBindings);
|
||||
const isBaseFieldVisible = (name: string) =>
|
||||
!selectedTarget || activeBindingSet.has(`offering.${name}`);
|
||||
const showDescriptionField = !hasTemplateDetailCopy && isBaseFieldVisible("description");
|
||||
const hasVisibleBaseFields =
|
||||
["kind", "name", "summary", "priceText", "coverUrl", "sortOrder", "isEnabled"].some((name) =>
|
||||
isBaseFieldVisible(name),
|
||||
) || showDescriptionField;
|
||||
|
||||
// 点选区块后,在右侧滚动到并高亮对应的输入项;品牌通用区块没有对应输入项时只保留提示。
|
||||
useEffect(() => {
|
||||
const host = formScroll.current;
|
||||
if (!host || !selectedTarget || activePreviewBindings.length === 0) return;
|
||||
const bindings = new Set(activePreviewBindings);
|
||||
const nodes = Array.from(
|
||||
host.querySelectorAll<HTMLElement>("[data-presentation-binding]"),
|
||||
).filter((node) => bindings.has(node.dataset.presentationBinding ?? ""));
|
||||
nodes.forEach((node) => node.classList.add("is-preview-active"));
|
||||
nodes[0]?.scrollIntoView({ block: "center", behavior: "smooth" });
|
||||
return () => nodes.forEach((node) => node.classList.remove("is-preview-active"));
|
||||
}, [selectedTarget, activePreviewBindings]);
|
||||
|
||||
return (
|
||||
<Modal
|
||||
open={open}
|
||||
@@ -66,32 +109,28 @@ export function OfferingEditorModal({
|
||||
<Segmented
|
||||
className="service-offering-editor__view"
|
||||
value={previewPage}
|
||||
options={[
|
||||
{ value: "offerings", label: "列表卡片" },
|
||||
{ value: "detail", label: "详情内容" },
|
||||
]}
|
||||
options={viewOptions}
|
||||
onChange={onPreviewPageChange}
|
||||
/>
|
||||
<Alert
|
||||
type="info"
|
||||
showIcon
|
||||
message={previewPage === "offerings" ? "正在核对列表展示" : "正在核对详情展示"}
|
||||
title={previewPage === "offerings" ? "正在核对列表展示" : "正在核对详情展示"}
|
||||
description={
|
||||
previewPage === "offerings"
|
||||
? "右侧「列表展示」字段修改后,会实时反映在当前卡片。"
|
||||
: "右侧「详情展示」字段修改后,会实时反映在当前详情内容。"
|
||||
selectedTarget
|
||||
? `右侧只显示「${selectedTarget.label}」对应的字段,修改会实时反映在左侧预览;点击预览空白处或「查看全部字段」可恢复。`
|
||||
: previewPage === "offerings"
|
||||
? "点击左侧区块后,右侧只显示该区块对应的字段;未点选时显示全部列表展示字段。"
|
||||
: "点击左侧区块后,右侧只显示该区块对应的字段;未点选时显示全部详情展示字段。"
|
||||
}
|
||||
/>
|
||||
<ComponentTemplatePreview
|
||||
workspace={previewWorkspace}
|
||||
page={previewPage}
|
||||
page={previewPageTarget?.page ?? previewPage}
|
||||
offeringId={editingOffering.id}
|
||||
targets={previewTargets[previewPage]}
|
||||
selection={{
|
||||
targetKey: previewPage === "offerings" ? listTarget.key : (detailTarget?.key ?? ""),
|
||||
recordId: editingOffering.id,
|
||||
}}
|
||||
onTargetSelected={() => {}}
|
||||
{...(previewSelection ? { selection: previewSelection } : {})}
|
||||
onTargetSelected={onPreviewTargetSelected}
|
||||
/>
|
||||
</div>
|
||||
) : null}
|
||||
@@ -100,64 +139,130 @@ export function OfferingEditorModal({
|
||||
form={form}
|
||||
layout="vertical"
|
||||
onValuesChange={(_, allValues) => onValuesChange(allValues)}
|
||||
onFinish={onFinish}
|
||||
// 动态隐藏的字段会被卸载,onFinish 默认只返回仍挂载的字段。
|
||||
// 提交时读取完整表单存储,避免切换区块后隐藏字段的修改丢失。
|
||||
onFinish={() => onFinish(getFullFormValues(form))}
|
||||
>
|
||||
<div className="service-offering-editor__form-scroll">
|
||||
<h4 className="admin-subhead">基础信息</h4>
|
||||
<Form.Item name="kind" label="类型" rules={[{ required: true }]}>
|
||||
<Select
|
||||
options={[
|
||||
{ value: "service", label: "服务" },
|
||||
{ value: "product", label: "定制产品" },
|
||||
{ value: "package", label: "套餐" },
|
||||
{ value: "subscription", label: "订阅" },
|
||||
]}
|
||||
/>
|
||||
</Form.Item>
|
||||
<Form.Item name="name" label="名称" rules={[{ required: true }]}>
|
||||
<Input />
|
||||
</Form.Item>
|
||||
<Form.Item name="summary" label="一句话说明">
|
||||
<Input />
|
||||
</Form.Item>
|
||||
{!hasTemplateDetailCopy ? (
|
||||
<Form.Item name="description" label="详细介绍">
|
||||
<div ref={formScroll} className="service-offering-editor__form-scroll">
|
||||
{selectedTarget ? (
|
||||
<div className="service-offering-editor__selection">
|
||||
<div>
|
||||
<strong>正在编辑「{selectedTarget.label}」</strong>
|
||||
<p className="admin-section-description">
|
||||
只显示这个区块对应的字段,其他字段已临时隐藏。
|
||||
</p>
|
||||
</div>
|
||||
<Button
|
||||
size="small"
|
||||
htmlType="button"
|
||||
onClick={() => onPreviewTargetSelected(undefined)}
|
||||
>
|
||||
查看全部字段
|
||||
</Button>
|
||||
</div>
|
||||
) : null}
|
||||
{hasVisibleBaseFields ? <h4 className="admin-subhead">基础信息</h4> : null}
|
||||
{isBaseFieldVisible("kind") ? (
|
||||
<Form.Item name="kind" label="类型" rules={[{ required: true }]}>
|
||||
<Select
|
||||
options={[
|
||||
{ value: "service", label: "服务" },
|
||||
{ value: "product", label: "定制产品" },
|
||||
{ value: "package", label: "套餐" },
|
||||
{ value: "subscription", label: "订阅" },
|
||||
]}
|
||||
/>
|
||||
</Form.Item>
|
||||
) : null}
|
||||
{isBaseFieldVisible("name") ? (
|
||||
<Form.Item
|
||||
name="name"
|
||||
label="名称"
|
||||
data-presentation-binding="offering.name"
|
||||
rules={[{ required: true }]}
|
||||
>
|
||||
<Input />
|
||||
</Form.Item>
|
||||
) : null}
|
||||
{isBaseFieldVisible("summary") ? (
|
||||
<Form.Item
|
||||
name="summary"
|
||||
label="一句话说明"
|
||||
data-presentation-binding="offering.summary"
|
||||
>
|
||||
<Input />
|
||||
</Form.Item>
|
||||
) : null}
|
||||
{showDescriptionField ? (
|
||||
<Form.Item
|
||||
name="description"
|
||||
label="详细介绍"
|
||||
data-presentation-binding="offering.description"
|
||||
>
|
||||
<Input.TextArea rows={5} />
|
||||
</Form.Item>
|
||||
) : null}
|
||||
<Form.Item name="priceText" label="价格展示">
|
||||
<Input placeholder="例如:按现场评估报价 / ¥ 2,800 起" />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
name="coverUrl"
|
||||
label="封面图片地址"
|
||||
help="点击上传,或粘贴服务/产品封面图片地址。"
|
||||
>
|
||||
<ImageUrlField placeholder="粘贴服务或产品封面图片地址" scope="offering" />
|
||||
</Form.Item>
|
||||
<Form.Item
|
||||
name="sortOrder"
|
||||
label="展示顺序"
|
||||
help="数字越小越靠前,不确定时填写 0。"
|
||||
rules={[{ type: "number", min: 0, max: 9999 }]}
|
||||
>
|
||||
<Input type="number" min={0} max={9999} />
|
||||
</Form.Item>
|
||||
<Form.Item name="isEnabled" label="公开状态">
|
||||
<Select
|
||||
options={[
|
||||
{ value: true, label: "已启用" },
|
||||
{ value: false, label: "已停用" },
|
||||
]}
|
||||
{isBaseFieldVisible("priceText") ? (
|
||||
<Form.Item
|
||||
name="priceText"
|
||||
label="价格展示"
|
||||
data-presentation-binding="offering.priceText"
|
||||
>
|
||||
<Input placeholder="例如:按现场评估报价 / ¥ 2,800 起" />
|
||||
</Form.Item>
|
||||
) : null}
|
||||
{isBaseFieldVisible("coverUrl") ? (
|
||||
<Form.Item
|
||||
name="coverUrl"
|
||||
label="封面图片地址"
|
||||
help="点击上传,或粘贴服务/产品封面图片地址。"
|
||||
data-presentation-binding="offering.coverUrl"
|
||||
>
|
||||
<ImageUrlField placeholder="粘贴服务或产品封面图片地址" scope="offering" />
|
||||
</Form.Item>
|
||||
) : null}
|
||||
{isBaseFieldVisible("sortOrder") ? (
|
||||
<Form.Item
|
||||
name="sortOrder"
|
||||
label="展示顺序"
|
||||
help="数字越小越靠前,不确定时填写 0。"
|
||||
rules={[{ type: "number", min: 0, max: 9999 }]}
|
||||
>
|
||||
<Input type="number" min={0} max={9999} />
|
||||
</Form.Item>
|
||||
) : null}
|
||||
{isBaseFieldVisible("isEnabled") ? (
|
||||
<Form.Item name="isEnabled" label="公开状态">
|
||||
<Select
|
||||
options={[
|
||||
{ value: true, label: "已启用" },
|
||||
{ value: false, label: "已停用" },
|
||||
]}
|
||||
/>
|
||||
</Form.Item>
|
||||
) : null}
|
||||
{selectedTarget && selectedTarget.source !== "offering" ? (
|
||||
<Alert
|
||||
type="warning"
|
||||
showIcon
|
||||
className="admin-offset-bottom"
|
||||
title={`「${selectedTarget.label}」属于页面通用内容`}
|
||||
description="这项内容不在业务提供项里维护。可点击下方「在小程序页面编辑」到对应区块修改。"
|
||||
/>
|
||||
</Form.Item>
|
||||
) : null}
|
||||
{activeTemplateFields.length ? (
|
||||
<div>
|
||||
<h4 className="admin-subhead">
|
||||
{previewPage === "offerings" ? "列表展示字段" : "详情展示字段"}
|
||||
{selectedTarget
|
||||
? `${selectedTarget.label}对应字段`
|
||||
: previewPage === "offerings"
|
||||
? "列表展示字段"
|
||||
: "详情展示字段"}
|
||||
</h4>
|
||||
<p className="admin-section-description admin-offset-bottom">
|
||||
这里只编辑左侧预览对应的字段;它们与小程序页面编辑的是同一份业务数据。
|
||||
{selectedTarget
|
||||
? "右侧已定位到该区块使用的字段,修改会实时反映在左侧预览。"
|
||||
: "这里只编辑左侧预览对应的字段;它们与小程序页面编辑的是同一份业务数据。"}
|
||||
</p>
|
||||
<RecordContentFields
|
||||
section={{
|
||||
@@ -167,6 +272,14 @@ export function OfferingEditorModal({
|
||||
sectionKey="offering"
|
||||
/>
|
||||
</div>
|
||||
) : selectedTarget?.source === "offering" ? (
|
||||
<Alert
|
||||
type="info"
|
||||
showIcon
|
||||
className="admin-offset-bottom"
|
||||
title={`「${selectedTarget.label}」只包含基础信息`}
|
||||
description="请修改上方基础信息,左侧预览会实时同步。"
|
||||
/>
|
||||
) : null}
|
||||
{editingOffering ? (
|
||||
<Button htmlType="button" onClick={onEditInBrand}>
|
||||
|
||||
@@ -55,10 +55,39 @@
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
.service-offering-editor__selection {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
margin-bottom: 16px;
|
||||
padding: 12px 14px;
|
||||
border: 1px solid rgba(22, 119, 255, 0.28);
|
||||
border-radius: 10px;
|
||||
background-color: rgba(22, 119, 255, 0.06);
|
||||
}
|
||||
|
||||
.service-offering-editor__selection p {
|
||||
margin: 4px 0 0;
|
||||
}
|
||||
|
||||
.service-offering-editor__form-scroll .ant-form-item {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.service-offering-editor__form-scroll [data-presentation-binding] {
|
||||
scroll-margin-block: 24px;
|
||||
border-radius: 8px;
|
||||
transition:
|
||||
background-color 180ms ease,
|
||||
box-shadow 180ms ease;
|
||||
}
|
||||
|
||||
.service-offering-editor__form-scroll [data-presentation-binding].is-preview-active {
|
||||
background-color: rgba(22, 119, 255, 0.07);
|
||||
box-shadow: 0 0 0 2px rgba(22, 119, 255, 0.24);
|
||||
}
|
||||
|
||||
.service-offering-editor__form-scroll .ant-typography h5.ant-typography {
|
||||
margin: 28px 0 4px;
|
||||
padding-bottom: 8px;
|
||||
|
||||
@@ -7,9 +7,15 @@ import { QueryState } from "../../components/QueryState.js";
|
||||
import { OfferingEditorModal } from "./OfferingEditorModal.js";
|
||||
import { OfferingsTable } from "./OfferingsTable.js";
|
||||
import { detailPageLabel, hasTemplateDetailCopy, offeringPageLabel } from "./offering-model.js";
|
||||
import { buildOfferingPreviewWorkspace, previewTargetsByPage } from "./offering-preview.js";
|
||||
import {
|
||||
buildOfferingPreviewWorkspace,
|
||||
pageTemplateFields as collectPageTemplateFields,
|
||||
previewFieldsByTarget,
|
||||
previewTargetsByPage,
|
||||
} from "./offering-preview.js";
|
||||
import { useOfferingEditor } from "./use-offering-editor.js";
|
||||
import { useOfferingMutations, useOfferingQueries } from "./use-offering-data.js";
|
||||
import type { PreviewSelection } from "../brand/preview-selection.js";
|
||||
|
||||
type PreviewPage = "offerings" | "detail";
|
||||
|
||||
@@ -28,34 +34,50 @@ export function ServicesPage() {
|
||||
|
||||
const sections = workspace.data?.templateContent?.admin.sections ?? [];
|
||||
const previewTargets = useMemo(() => previewTargetsByPage(sections), [sections]);
|
||||
const listTarget = previewTargets.offerings.find((target) =>
|
||||
templateFields.some((field) => field.previewTarget === target.key),
|
||||
) ?? {
|
||||
key: "offering.list.item",
|
||||
label: "业务卡片",
|
||||
page: "offerings",
|
||||
source: "offering",
|
||||
};
|
||||
const detailTarget = previewTargets.detail.find((target) => target.source === "offering");
|
||||
const listFields = useMemo(
|
||||
() => templateFields.filter((field) => field.previewTarget === listTarget.key),
|
||||
[templateFields, listTarget.key],
|
||||
const fieldsByTarget = useMemo(() => previewFieldsByTarget(sections), [sections]);
|
||||
// 只使用 manifest 中真实存在的业务卡片区域;模板没有对应区域时不显示列表预览。
|
||||
const listTarget = useMemo(
|
||||
() => previewTargets.offerings.find((target) => target.source === "offering"),
|
||||
[previewTargets],
|
||||
);
|
||||
const detailFields = useMemo(
|
||||
() => templateFields.filter((field) => field.previewTarget === detailTarget?.key),
|
||||
[templateFields, detailTarget?.key],
|
||||
const detailTarget = useMemo(
|
||||
() => previewTargets.detail.find((target) => target.source === "offering"),
|
||||
[previewTargets],
|
||||
);
|
||||
const otherFields = useMemo(
|
||||
// 页面级字段必须按该页所有真实预览区域收集,不能只取列表/详情首个区域,
|
||||
// 否则模板把详情拆成多个区域后,未点选的“全部字段”会漏掉后续区域。
|
||||
const pageTemplateFields = useMemo<TemplateAdminField[]>(
|
||||
() =>
|
||||
templateFields.filter(
|
||||
(field) => !listFields.includes(field) && !detailFields.includes(field),
|
||||
),
|
||||
[templateFields, listFields, detailFields],
|
||||
collectPageTemplateFields({
|
||||
previewPage: editor.previewPage,
|
||||
previewTargets,
|
||||
templateFields,
|
||||
listPage: listTarget?.page,
|
||||
}),
|
||||
[editor.previewPage, listTarget?.page, previewTargets, templateFields],
|
||||
);
|
||||
// 点选预览区块后,右侧只保留该区块对应的字段,与小程序页面点选编辑保持一致。
|
||||
const selectedTarget = useMemo(() => {
|
||||
if (!editor.previewTargetKey) return undefined;
|
||||
return previewTargets[editor.previewPage].find(
|
||||
(target) => target.key === editor.previewTargetKey,
|
||||
);
|
||||
}, [editor.previewPage, editor.previewTargetKey, previewTargets]);
|
||||
const activeTemplateFields = useMemo<TemplateAdminField[]>(
|
||||
() =>
|
||||
selectedTarget
|
||||
? pageTemplateFields.filter((field) => field.previewTarget === selectedTarget.key)
|
||||
: pageTemplateFields,
|
||||
[pageTemplateFields, selectedTarget],
|
||||
);
|
||||
// 区块字段的 binding 用于在右侧表单中滚动并高亮同一份数据。
|
||||
const activePreviewBindings = useMemo(
|
||||
() =>
|
||||
selectedTarget
|
||||
? (fieldsByTarget[selectedTarget.key] ?? []).map((field) => field.binding)
|
||||
: [],
|
||||
[fieldsByTarget, selectedTarget],
|
||||
);
|
||||
const activeTemplateFields: TemplateAdminField[] =
|
||||
editor.previewPage === "offerings"
|
||||
? [...listFields, ...otherFields.filter((field) => field.page === "offerings")]
|
||||
: [...detailFields, ...otherFields.filter((field) => field.page === "detail")];
|
||||
const previewWorkspaceDraft = useMemo(() => {
|
||||
if (!previewWorkspace.data || !editor.editingOffering) return undefined;
|
||||
return buildOfferingPreviewWorkspace({
|
||||
@@ -74,12 +96,13 @@ export function ServicesPage() {
|
||||
|
||||
const navigateToBrand = () => {
|
||||
if (!editor.editingOffering) return;
|
||||
const target =
|
||||
selectedTarget ?? (editor.previewPage === "offerings" ? listTarget : detailTarget);
|
||||
if (!target) return;
|
||||
void navigate("/admin/brand", {
|
||||
state: {
|
||||
targetKey:
|
||||
editor.previewPage === "offerings"
|
||||
? listTarget.key
|
||||
: (detailTarget?.key ?? listTarget.key),
|
||||
page: target.page,
|
||||
targetKey: target.key,
|
||||
recordId: editor.editingOffering.id,
|
||||
},
|
||||
});
|
||||
@@ -120,13 +143,18 @@ export function ServicesPage() {
|
||||
previewWorkspace={previewWorkspaceDraft}
|
||||
previewTargets={previewTargets}
|
||||
activeTemplateFields={activeTemplateFields}
|
||||
activePreviewBindings={activePreviewBindings}
|
||||
selectedTarget={selectedTarget}
|
||||
templateFieldSection={editor.templateFieldSection}
|
||||
hasTemplateDetailCopy={hasTemplateDetailCopy(templateFields)}
|
||||
listTarget={listTarget}
|
||||
detailTarget={detailTarget}
|
||||
saving={mutations.saveOffering.isPending}
|
||||
onClose={editor.closeOffering}
|
||||
onPreviewPageChange={(page: PreviewPage) => editor.setPreviewPage(page)}
|
||||
onPreviewPageChange={(page: PreviewPage) => editor.changePreviewPage(page)}
|
||||
onPreviewTargetSelected={(selection?: PreviewSelection) =>
|
||||
editor.selectPreviewTarget(selection?.targetKey)
|
||||
}
|
||||
onValuesChange={(values) => editor.handleValuesChange(null, values)}
|
||||
onFinish={(values) => mutations.saveOffering.mutate(values)}
|
||||
onEditInBrand={navigateToBrand}
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
import type { RuntimeOffering } from "@personal-brand/api-client";
|
||||
|
||||
type RuntimePresentation = RuntimeOffering["presentation"];
|
||||
|
||||
function isFilledString(value: unknown): value is string {
|
||||
return typeof value === "string" && value.trim() !== "";
|
||||
}
|
||||
|
||||
/**
|
||||
* 把表单草稿投影到单条 Runtime Offering 上。
|
||||
* 该函数是 buildOfferingPreviewWorkspace 的核心合并规则:
|
||||
* - name/coverUrl 等展示字段为空时保留原值,避免输入中间态清空预览;
|
||||
* - summary/priceText 允许清空为空字符串;
|
||||
* - presentation 由原值、模板 config、config.presentation 与事实字段逐层合并;
|
||||
* - detailHero 优先于 coverUrl,两者都为空时保留原 heroImage。
|
||||
*/
|
||||
export function projectOfferingPreviewFields(options: {
|
||||
item: Pick<RuntimeOffering, "name" | "summary" | "priceText" | "coverUrl" | "presentation">;
|
||||
config: Record<string, unknown>;
|
||||
formValues: Record<string, unknown>;
|
||||
}): {
|
||||
name: string;
|
||||
summary: string;
|
||||
priceText: string | null;
|
||||
coverUrl: string | null;
|
||||
presentation: RuntimePresentation;
|
||||
} {
|
||||
const { item, config, formValues } = options;
|
||||
const nestedPresentation =
|
||||
config.presentation && typeof config.presentation === "object"
|
||||
? (config.presentation as Record<string, unknown>)
|
||||
: {};
|
||||
const configDetails =
|
||||
config.details && typeof config.details === "object"
|
||||
? (config.details as Record<string, unknown>)
|
||||
: {};
|
||||
|
||||
const presentation: RuntimePresentation = {
|
||||
...item.presentation,
|
||||
...config,
|
||||
...nestedPresentation,
|
||||
...(typeof config.area === "string" ? { area: config.area } : {}),
|
||||
...(typeof config.series === "string" ? { series: config.series } : {}),
|
||||
...(typeof config.spaceType === "string" ? { spaceType: config.spaceType } : {}),
|
||||
heroImage: isFilledString(config.detailHero)
|
||||
? config.detailHero
|
||||
: isFilledString(formValues.coverUrl)
|
||||
? formValues.coverUrl
|
||||
: (item.coverUrl ?? null),
|
||||
details: {
|
||||
...item.presentation.details,
|
||||
...configDetails,
|
||||
},
|
||||
};
|
||||
|
||||
return {
|
||||
name: isFilledString(formValues.name) ? formValues.name : item.name,
|
||||
summary: typeof formValues.summary === "string" ? formValues.summary : item.summary,
|
||||
priceText: typeof formValues.priceText === "string" ? formValues.priceText : item.priceText,
|
||||
coverUrl: isFilledString(formValues.coverUrl) ? formValues.coverUrl : item.coverUrl,
|
||||
presentation,
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
import type { AdminTemplateContent, TemplateAdminField } from "@personal-brand/api-client";
|
||||
import type { PreviewTarget } from "../brand/preview-selection.js";
|
||||
|
||||
export function previewTargetsByPage(
|
||||
sections: AdminTemplateContent["admin"]["sections"],
|
||||
): Record<"offerings" | "detail", PreviewTarget[]> {
|
||||
const targets = sections.flatMap((section) =>
|
||||
(section.previewTargets ?? []).map((target) => ({
|
||||
...target,
|
||||
page: section.page,
|
||||
source: section.fields.some(
|
||||
(field) => field.binding.startsWith("offering.") && field.previewTarget === target.key,
|
||||
)
|
||||
? ("offering" as const)
|
||||
: section.target,
|
||||
})),
|
||||
);
|
||||
const pages = [...new Set(sections.map((section) => section.page))];
|
||||
const offeringPages = pages.filter(
|
||||
(page) =>
|
||||
page !== "detail" &&
|
||||
targets.some((target) => target.page === page && target.source === "offering"),
|
||||
);
|
||||
// 业务卡片不一定在“服务页”:独立工坊把案例卡片放在首页。优先使用专门的
|
||||
// offerings 页,没有时退回第一个包含业务记录的页面。
|
||||
const listPage = offeringPages.find((page) => page === "offerings") ?? offeringPages[0];
|
||||
return {
|
||||
offerings: listPage ? targets.filter((target) => target.page === listPage) : [],
|
||||
detail: targets.filter((target) => target.page === "detail"),
|
||||
};
|
||||
}
|
||||
|
||||
export function pageTemplateFields(options: {
|
||||
previewPage: "offerings" | "detail";
|
||||
previewTargets: Record<"offerings" | "detail", PreviewTarget[]>;
|
||||
templateFields: TemplateAdminField[];
|
||||
listPage?: string | undefined;
|
||||
}): TemplateAdminField[] {
|
||||
const { previewPage, previewTargets, templateFields, listPage } = options;
|
||||
const targets = previewPage === "offerings" ? previewTargets.offerings : previewTargets.detail;
|
||||
const targetKeys = new Set(targets.map((target) => target.key));
|
||||
return templateFields.filter(
|
||||
(field) =>
|
||||
(field.previewTarget && targetKeys.has(field.previewTarget)) ||
|
||||
(!field.previewTarget && field.page === (previewPage === "offerings" ? listPage : "detail")),
|
||||
);
|
||||
}
|
||||
@@ -1,33 +1,23 @@
|
||||
export { pageTemplateFields, previewTargetsByPage } from "./offering-preview-targets.js";
|
||||
|
||||
import type {
|
||||
AdminTemplateContent,
|
||||
Offering,
|
||||
RuntimeWorkspace,
|
||||
TemplateAdminField,
|
||||
} from "@personal-brand/api-client";
|
||||
import type { PreviewTarget } from "../brand/preview-selection.js";
|
||||
import { applyPresentationValues } from "../../lib/presentation/presentation-bindings.js";
|
||||
import { projectOfferingPreviewFields } from "./offering-preview-projection.js";
|
||||
|
||||
export function previewTargetsByPage(
|
||||
export function previewFieldsByTarget(
|
||||
sections: AdminTemplateContent["admin"]["sections"],
|
||||
): Record<"offerings" | "detail", PreviewTarget[]> {
|
||||
const result: Record<"offerings" | "detail", PreviewTarget[]> = {
|
||||
offerings: [],
|
||||
detail: [],
|
||||
};
|
||||
for (const page of ["offerings", "detail"] as const) {
|
||||
result[page] = sections
|
||||
.filter((section) => section.page === page)
|
||||
.flatMap((section) =>
|
||||
(section.previewTargets ?? []).map((target) => ({
|
||||
...target,
|
||||
page: section.page,
|
||||
source: section.fields.some(
|
||||
(field) => field.binding.startsWith("offering.") && field.previewTarget === target.key,
|
||||
)
|
||||
? "offering"
|
||||
: section.target,
|
||||
})),
|
||||
);
|
||||
): Record<string, TemplateAdminField[]> {
|
||||
const result: Record<string, TemplateAdminField[]> = {};
|
||||
for (const section of sections) {
|
||||
for (const field of section.fields) {
|
||||
if (!field.previewTarget) continue;
|
||||
(result[field.previewTarget] ??= []).push(field);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
@@ -44,60 +34,11 @@ export function buildOfferingPreviewWorkspace(options: {
|
||||
[{ key: "offering", fields: templateFields }],
|
||||
formValues,
|
||||
);
|
||||
const offeringValues = {
|
||||
name: formValues.name,
|
||||
summary: formValues.summary,
|
||||
description: formValues.description,
|
||||
priceText: formValues.priceText,
|
||||
coverUrl: formValues.coverUrl,
|
||||
};
|
||||
return {
|
||||
...previewWorkspace,
|
||||
offerings: previewWorkspace.offerings.map((item) =>
|
||||
item.id === editingOffering.id
|
||||
? {
|
||||
...item,
|
||||
name:
|
||||
typeof offeringValues.name === "string" && offeringValues.name.trim()
|
||||
? offeringValues.name
|
||||
: item.name,
|
||||
summary:
|
||||
typeof offeringValues.summary === "string" ? offeringValues.summary : item.summary,
|
||||
priceText:
|
||||
typeof offeringValues.priceText === "string"
|
||||
? offeringValues.priceText
|
||||
: item.priceText,
|
||||
coverUrl:
|
||||
typeof offeringValues.coverUrl === "string" && offeringValues.coverUrl.trim()
|
||||
? offeringValues.coverUrl
|
||||
: item.coverUrl,
|
||||
config,
|
||||
presentation: {
|
||||
...item.presentation,
|
||||
...config,
|
||||
...(config.presentation && typeof config.presentation === "object"
|
||||
? (config.presentation as Record<string, unknown>)
|
||||
: {}),
|
||||
...(typeof config.area === "string" ? { area: config.area } : {}),
|
||||
...(typeof config.series === "string" ? { series: config.series } : {}),
|
||||
...(typeof config.spaceType === "string" ? { spaceType: config.spaceType } : {}),
|
||||
heroImage:
|
||||
typeof config.detailHero === "string"
|
||||
? config.detailHero
|
||||
: typeof offeringValues.coverUrl === "string" && offeringValues.coverUrl.trim()
|
||||
? offeringValues.coverUrl
|
||||
: (item.coverUrl ?? null),
|
||||
details: {
|
||||
...item.presentation.details,
|
||||
...(config.details && typeof config.details === "object"
|
||||
? {
|
||||
...item.presentation.details,
|
||||
...(config.details as Record<string, unknown>),
|
||||
}
|
||||
: {}),
|
||||
},
|
||||
},
|
||||
}
|
||||
? { ...item, ...projectOfferingPreviewFields({ item, config, formValues }) }
|
||||
: item,
|
||||
),
|
||||
};
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
||||
import type { Offering } from "@personal-brand/api-client";
|
||||
import { message } from "antd";
|
||||
import { App } from "antd";
|
||||
import { useMemo } from "react";
|
||||
import { createApiClient } from "../../lib/api.js";
|
||||
import {
|
||||
@@ -46,6 +46,7 @@ export function useOfferingMutations(options: {
|
||||
templateFields: ReturnType<typeof offeringTemplateFields>;
|
||||
onSuccess: () => void;
|
||||
}) {
|
||||
const { message } = App.useApp();
|
||||
const client = createApiClient();
|
||||
const queryClient = useQueryClient();
|
||||
const invalidateAfterSave = () => {
|
||||
|
||||
@@ -6,6 +6,7 @@ import type {
|
||||
TemplateAdminSection,
|
||||
} from "@personal-brand/api-client";
|
||||
import { offeringDefaultFormValues, offeringEditFormValues } from "./offering-form.js";
|
||||
import { getFullFormValues } from "../../lib/form-values.js";
|
||||
|
||||
export type OfferingPreviewPage = "offerings" | "detail";
|
||||
|
||||
@@ -15,6 +16,7 @@ export function useOfferingEditor(templateFields: TemplateAdminField[]) {
|
||||
const [editingOffering, setEditingOffering] = useState<Offering | null>(null);
|
||||
const [offeringDraftVersion, setOfferingDraftVersion] = useState(0);
|
||||
const [previewPage, setPreviewPage] = useState<OfferingPreviewPage>("detail");
|
||||
const [previewTargetKey, setPreviewTargetKey] = useState<string>();
|
||||
const [formValues, setFormValues] = useState<Record<string, unknown>>({});
|
||||
|
||||
const templateFieldSection = useMemo<TemplateAdminSection>(
|
||||
@@ -32,21 +34,32 @@ export function useOfferingEditor(templateFields: TemplateAdminField[]) {
|
||||
const beginOffering = (item?: Offering) => {
|
||||
setEditingOffering(item ?? null);
|
||||
setPreviewPage("detail");
|
||||
setPreviewTargetKey(undefined);
|
||||
setOfferingOpen(true);
|
||||
offeringForm.setFieldsValue(
|
||||
item
|
||||
? offeringEditFormValues(item, templateFields)
|
||||
: offeringDefaultFormValues(templateFields),
|
||||
);
|
||||
setFormValues(offeringForm.getFieldsValue(true) as Record<string, unknown>);
|
||||
setFormValues(getFullFormValues(offeringForm));
|
||||
};
|
||||
|
||||
const closeOffering = () => {
|
||||
setOfferingOpen(false);
|
||||
setEditingOffering(null);
|
||||
setPreviewTargetKey(undefined);
|
||||
offeringForm.resetFields();
|
||||
};
|
||||
|
||||
// 预览与右侧表单共用同一份选中状态:点选区块即定位到对应字段。
|
||||
const selectPreviewTarget = (targetKey?: string) => setPreviewTargetKey(targetKey);
|
||||
|
||||
// 列表与详情是两张不同的页面,切换时清空区块选中,避免沿用另一页的 key。
|
||||
const changePreviewPage = (page: OfferingPreviewPage) => {
|
||||
setPreviewPage(page);
|
||||
setPreviewTargetKey(undefined);
|
||||
};
|
||||
|
||||
const handleValuesChange = (_: unknown, allValues: Record<string, unknown>) => {
|
||||
setFormValues(allValues);
|
||||
setOfferingDraftVersion((version) => version + 1);
|
||||
@@ -60,7 +73,9 @@ export function useOfferingEditor(templateFields: TemplateAdminField[]) {
|
||||
templateFieldSection,
|
||||
formValues,
|
||||
offeringDraftVersion,
|
||||
setPreviewPage,
|
||||
previewTargetKey,
|
||||
changePreviewPage,
|
||||
selectPreviewTarget,
|
||||
beginOffering,
|
||||
closeOffering,
|
||||
handleValuesChange,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Alert, Button, Card, Form, Input, Modal, Select, Space, Table, message } from "antd";
|
||||
import { Alert, App, Button, Card, Form, Input, Modal, Select, Space, Table } from "antd";
|
||||
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
||||
import type { AdminBrandMember } from "@personal-brand/api-client";
|
||||
import { useState } from "react";
|
||||
@@ -16,6 +16,7 @@ const roleLabels: Record<string, string> = {
|
||||
};
|
||||
|
||||
export function MembersPage() {
|
||||
const { message } = App.useApp();
|
||||
const client = createApiClient();
|
||||
const queryClient = useQueryClient();
|
||||
const [addOpen, setAddOpen] = useState(false);
|
||||
@@ -71,7 +72,7 @@ export function MembersPage() {
|
||||
type="info"
|
||||
showIcon
|
||||
className="admin-offset-bottom"
|
||||
message="请将初始账号和密码安全地交给成员"
|
||||
title="请将初始账号和密码安全地交给成员"
|
||||
description="当前采用负责人手动添加方式;系统不会再次显示成员初始密码。"
|
||||
/>
|
||||
<Table
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { useRef, useState } from "react";
|
||||
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
||||
import { Alert, Button, List, Modal, Table, Tag, Typography, message } from "antd";
|
||||
import { Alert, App, Button, List, Modal, Table, Tag, Typography } from "antd";
|
||||
import { EyeOutlined, ReloadOutlined, UploadOutlined } from "@ant-design/icons";
|
||||
import type { TemplatePackageVersion } from "@personal-brand/api-client";
|
||||
import { createApiClient } from "../../lib/api.js";
|
||||
@@ -31,6 +31,7 @@ function formatBytes(value: unknown): string {
|
||||
}
|
||||
|
||||
export function TemplateManagementPage() {
|
||||
const { message } = App.useApp();
|
||||
const inputRef = useRef<HTMLInputElement>(null);
|
||||
const [page, setPage] = useState(1);
|
||||
const [pageSize, setPageSize] = useState(20);
|
||||
@@ -110,7 +111,7 @@ export function TemplateManagementPage() {
|
||||
<Alert
|
||||
type="info"
|
||||
showIcon
|
||||
message="导入规则"
|
||||
title="导入规则"
|
||||
description="系统会校验文件路径、链接、文件数量、解压体积、template.json、package.json 和 checksums.json;包内脚本不会被执行。"
|
||||
/>
|
||||
{importing.isError ? <ErrorNote error={importing.error} /> : null}
|
||||
@@ -118,7 +119,7 @@ export function TemplateManagementPage() {
|
||||
<Alert
|
||||
type="success"
|
||||
showIcon
|
||||
message={importing.data.idempotent ? "模板版本已存在,未重复写入" : "模板版本导入成功"}
|
||||
title={importing.data.idempotent ? "模板版本已存在,未重复写入" : "模板版本导入成功"}
|
||||
description={`${importing.data.version.packageKey}@${importing.data.version.version}`}
|
||||
/>
|
||||
) : null}
|
||||
|
||||
@@ -78,7 +78,7 @@ export function TemplatePackagePreviewModal({
|
||||
<Alert
|
||||
type="info"
|
||||
showIcon
|
||||
message="模板演示预览"
|
||||
title="模板演示预览"
|
||||
description="演示内容不属于真实品牌,咨询提交和客户记录读取已禁用。"
|
||||
/>
|
||||
{!industry ? (
|
||||
@@ -92,12 +92,7 @@ export function TemplatePackagePreviewModal({
|
||||
{data ? (
|
||||
<>
|
||||
{data.preview.diagnostics.map((diagnostic) => (
|
||||
<Alert
|
||||
key={diagnostic.code}
|
||||
type="warning"
|
||||
showIcon
|
||||
message={diagnostic.message}
|
||||
/>
|
||||
<Alert key={diagnostic.code} type="warning" showIcon title={diagnostic.message} />
|
||||
))}
|
||||
<Typography.Text type="secondary">
|
||||
演示数据:
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useMutation, useQueryClient } from "@tanstack/react-query";
|
||||
import { message } from "antd";
|
||||
import { App } from "antd";
|
||||
import type { TrustContent, TrustContentInput } from "@personal-brand/api-client";
|
||||
import { createApiClient } from "../../../lib/api.js";
|
||||
|
||||
@@ -10,6 +10,7 @@ export function useTrustContentMutations({
|
||||
editing: TrustContent | null;
|
||||
closeEditor: () => void;
|
||||
}) {
|
||||
const { message } = App.useApp();
|
||||
const client = createApiClient();
|
||||
const queryClient = useQueryClient();
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { message } from "antd";
|
||||
import { App } from "antd";
|
||||
import { useMutation } from "@tanstack/react-query";
|
||||
import type { FormInstance } from "antd";
|
||||
import type { BrandFieldDefinition, InquiryForm } from "@personal-brand/api-client";
|
||||
@@ -19,6 +19,7 @@ export function useFieldMutations({
|
||||
queryClient,
|
||||
onClose,
|
||||
}: FieldMutationOptions) {
|
||||
const { message } = App.useApp();
|
||||
const createField = useMutation({
|
||||
mutationFn: (values: Omit<BrandFieldDefinition, "id" | "source">) =>
|
||||
client.createAdminField(values),
|
||||
@@ -49,6 +50,7 @@ export function useInquiryFormMutations({
|
||||
};
|
||||
onClose: () => void;
|
||||
}) {
|
||||
const { message } = App.useApp();
|
||||
const createForm = useMutation({
|
||||
mutationFn: (values: {
|
||||
name: string;
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
export interface BrandSwitcherOption {
|
||||
value: string;
|
||||
label: string;
|
||||
}
|
||||
|
||||
/**
|
||||
* 品牌切换器只接受形状完整的成员记录。
|
||||
* 接口返回异常条目时跳过该条,避免整个后台外壳渲染失败。
|
||||
*/
|
||||
export function toBrandSwitcherOptions(value: unknown): BrandSwitcherOption[] {
|
||||
if (!Array.isArray(value)) return [];
|
||||
const options: BrandSwitcherOption[] = [];
|
||||
const seen = new Set<string>();
|
||||
|
||||
for (const item of value) {
|
||||
const brand = (item as { brand?: { id?: unknown; name?: unknown } } | null | undefined)?.brand;
|
||||
if (!brand || typeof brand.id !== "string" || brand.id.length === 0) continue;
|
||||
if (seen.has(brand.id)) continue;
|
||||
seen.add(brand.id);
|
||||
options.push({
|
||||
value: brand.id,
|
||||
label: typeof brand.name === "string" && brand.name.length > 0 ? brand.name : brand.id,
|
||||
});
|
||||
}
|
||||
|
||||
return options;
|
||||
}
|
||||
|
||||
/** 品牌名称必须是字符串,异常数据回退到给定文案。 */
|
||||
export function toBrandDisplayName(value: unknown, fallback: string): string {
|
||||
return typeof value === "string" && value.trim().length > 0 ? value : fallback;
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
import type { FormInstance } from "antd";
|
||||
|
||||
// 动态隐藏的字段会被 Ant Design Form 卸载,onFinish 默认只返回仍挂载的字段。
|
||||
// 提交时读取完整表单存储,避免切换区块后隐藏字段的修改丢失。
|
||||
export function getFullFormValues<T = Record<string, unknown>>(form: FormInstance): T {
|
||||
return form.getFieldsValue(true) as T;
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
import assert from "node:assert/strict";
|
||||
import { readdir, readFile, access } from "node:fs/promises";
|
||||
import path from "node:path";
|
||||
import { test } from "node:test";
|
||||
|
||||
const sourceRoot = path.resolve(import.meta.dirname, "../src");
|
||||
|
||||
async function listSourceFiles(directory) {
|
||||
const entries = await readdir(directory, { withFileTypes: true });
|
||||
const files = await Promise.all(
|
||||
entries.map(async (entry) => {
|
||||
const absolute = path.join(directory, entry.name);
|
||||
if (entry.isDirectory()) return listSourceFiles(absolute);
|
||||
return /\.(?:ts|tsx)$/.test(entry.name) ? [absolute] : [];
|
||||
}),
|
||||
);
|
||||
return files.flat();
|
||||
}
|
||||
|
||||
function readTag(source, start) {
|
||||
let index = start;
|
||||
let quote = null;
|
||||
while (index < source.length) {
|
||||
const char = source[index];
|
||||
if (quote) {
|
||||
if (char === quote) quote = null;
|
||||
} else if (char === '"' || char === "'" || char === "`") {
|
||||
quote = char;
|
||||
} else if (char === ">") {
|
||||
return source.slice(start, index + 1);
|
||||
}
|
||||
index += 1;
|
||||
}
|
||||
return source.slice(start);
|
||||
}
|
||||
|
||||
function tagsNamed(source, name) {
|
||||
const tags = [];
|
||||
for (const match of source.matchAll(new RegExp("<" + name + "\\b", "g"))) {
|
||||
tags.push(readTag(source, match.index));
|
||||
}
|
||||
return tags;
|
||||
}
|
||||
|
||||
test("Admin 源码不使用 Ant Design 6 已弃用的静态提示 API", async () => {
|
||||
const files = await listSourceFiles(sourceRoot);
|
||||
const violations = [];
|
||||
for (const file of files) {
|
||||
const source = await readFile(file, "utf8");
|
||||
const relative = path.relative(sourceRoot, file);
|
||||
if (/import\s*\{[^}]*\bmessage\b[^}]*\}\s*from\s*"antd"/.test(source)) {
|
||||
violations.push(`${relative}: 仍从 antd 导入静态 message`);
|
||||
}
|
||||
if (/\bModal\.confirm\s*\(/.test(source)) {
|
||||
violations.push(`${relative}: 仍调用静态 Modal.confirm`);
|
||||
}
|
||||
for (const tag of tagsNamed(source, "Alert")) {
|
||||
if (/(?<![\w.])message\s*=/.test(tag)) {
|
||||
violations.push(`${relative}: Alert 仍使用 message 属性`);
|
||||
}
|
||||
}
|
||||
for (const tag of tagsNamed(source, "Space")) {
|
||||
if (/(?<![\w.])direction\s*=/.test(tag)) {
|
||||
violations.push(`${relative}: Space 仍使用 direction 属性`);
|
||||
}
|
||||
}
|
||||
}
|
||||
assert.deepEqual(violations, []);
|
||||
});
|
||||
|
||||
test("Admin 不再保留静态 message 转出口", async () => {
|
||||
const legacyBridge = path.resolve(sourceRoot, "components/AdminMessage.ts");
|
||||
await assert.rejects(access(legacyBridge));
|
||||
});
|
||||
@@ -0,0 +1,57 @@
|
||||
import assert from "node:assert/strict";
|
||||
import { test } from "node:test";
|
||||
import { toBrandDisplayName, toBrandSwitcherOptions } from "../src/lib/brand-switcher.ts";
|
||||
|
||||
test("完整成员记录转换为品牌切换选项", () => {
|
||||
assert.deepEqual(
|
||||
toBrandSwitcherOptions([
|
||||
{ id: "membership-1", role: "owner", brand: { id: "brand-1", name: "独立工坊" } },
|
||||
{ id: "membership-2", role: "editor", brand: { id: "brand-2", name: "林境门作" } },
|
||||
]),
|
||||
[
|
||||
{ value: "brand-1", label: "独立工坊" },
|
||||
{ value: "brand-2", label: "林境门作" },
|
||||
],
|
||||
);
|
||||
});
|
||||
|
||||
test("异常成员条目被跳过而不是让外壳崩溃", () => {
|
||||
assert.deepEqual(toBrandSwitcherOptions([{}, null, { brand: null }, { brand: { id: 1 } }]), []);
|
||||
assert.deepEqual(
|
||||
toBrandSwitcherOptions([
|
||||
{},
|
||||
null,
|
||||
{ brand: { id: "brand-1", name: "独立工坊" } },
|
||||
{ brand: { id: "" } },
|
||||
]),
|
||||
[{ value: "brand-1", label: "独立工坊" }],
|
||||
);
|
||||
});
|
||||
|
||||
test("非数组返回空选项集合", () => {
|
||||
for (const value of [undefined, null, {}, "oops", 42]) {
|
||||
assert.deepEqual(toBrandSwitcherOptions(value), []);
|
||||
}
|
||||
});
|
||||
|
||||
test("重复品牌与缺失名称按稳定规则收敛", () => {
|
||||
assert.deepEqual(
|
||||
toBrandSwitcherOptions([
|
||||
{ brand: { id: "brand-1", name: "独立工坊" } },
|
||||
{ brand: { id: "brand-1", name: "重复品牌" } },
|
||||
{ brand: { id: "brand-2", name: 123 } },
|
||||
]),
|
||||
[
|
||||
{ value: "brand-1", label: "独立工坊" },
|
||||
{ value: "brand-2", label: "brand-2" },
|
||||
],
|
||||
);
|
||||
});
|
||||
|
||||
test("品牌名称只接受非空字符串", () => {
|
||||
assert.equal(toBrandDisplayName("独立工坊", "当前品牌"), "独立工坊");
|
||||
assert.equal(toBrandDisplayName(" ", "当前品牌"), "当前品牌");
|
||||
assert.equal(toBrandDisplayName({ name: "x" }, "当前品牌"), "当前品牌");
|
||||
assert.equal(toBrandDisplayName(null, "当前品牌"), "当前品牌");
|
||||
assert.equal(toBrandDisplayName(undefined, ""), "");
|
||||
});
|
||||
@@ -0,0 +1,138 @@
|
||||
import assert from "node:assert/strict";
|
||||
import test from "node:test";
|
||||
import { projectOfferingPreviewFields } from "../src/features/services/offering-preview-projection.ts";
|
||||
|
||||
const baseItem = {
|
||||
name: "原名称",
|
||||
summary: "原简介",
|
||||
priceText: "原价格",
|
||||
coverUrl: "/media/original-cover.jpg",
|
||||
presentation: {
|
||||
categoryKey: "portfolio",
|
||||
categoryLabel: "品牌视觉",
|
||||
heroImage: "/media/original-hero.jpg",
|
||||
keywords: ["原始"],
|
||||
media: [],
|
||||
details: {
|
||||
background: "原始背景",
|
||||
designConcept: "",
|
||||
crafts: [],
|
||||
materialsList: [],
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
test("filled name and coverUrl override originals", () => {
|
||||
const result = projectOfferingPreviewFields({
|
||||
item: baseItem,
|
||||
config: {},
|
||||
formValues: {
|
||||
name: "新名称",
|
||||
coverUrl: "/media/new-cover.jpg",
|
||||
summary: "",
|
||||
priceText: "",
|
||||
},
|
||||
});
|
||||
|
||||
assert.equal(result.name, "新名称");
|
||||
assert.equal(result.coverUrl, "/media/new-cover.jpg");
|
||||
// summary/priceText 空字符串应覆盖原值(允许清空)。
|
||||
assert.equal(result.summary, "");
|
||||
assert.equal(result.priceText, "");
|
||||
});
|
||||
|
||||
test("empty name and coverUrl preserve originals", () => {
|
||||
const result = projectOfferingPreviewFields({
|
||||
item: baseItem,
|
||||
config: {},
|
||||
formValues: {
|
||||
name: " ",
|
||||
coverUrl: "",
|
||||
summary: "新简介",
|
||||
},
|
||||
});
|
||||
|
||||
assert.equal(result.name, "原名称");
|
||||
assert.equal(result.coverUrl, "/media/original-cover.jpg");
|
||||
assert.equal(result.summary, "新简介");
|
||||
});
|
||||
|
||||
test("presentation merges base config and nested presentation", () => {
|
||||
const result = projectOfferingPreviewFields({
|
||||
item: baseItem,
|
||||
config: {
|
||||
area: "杭州",
|
||||
series: "品牌焕新",
|
||||
spaceType: "线上与线下",
|
||||
presentation: { categoryLabel: "新分类" },
|
||||
keywords: ["新关键词"],
|
||||
},
|
||||
formValues: {},
|
||||
});
|
||||
|
||||
assert.equal(result.presentation.area, "杭州");
|
||||
assert.equal(result.presentation.series, "品牌焕新");
|
||||
assert.equal(result.presentation.spaceType, "线上与线下");
|
||||
assert.equal(result.presentation.categoryLabel, "新分类");
|
||||
assert.deepEqual(result.presentation.keywords, ["新关键词"]);
|
||||
// categoryKey 不被覆盖时保留原值。
|
||||
assert.equal(result.presentation.categoryKey, "portfolio");
|
||||
});
|
||||
|
||||
test("heroImage follows detailHero, then coverUrl, then original", () => {
|
||||
const hero = projectOfferingPreviewFields({
|
||||
item: baseItem,
|
||||
config: { detailHero: "/media/detail-hero.jpg" },
|
||||
formValues: { coverUrl: "/media/new-cover.jpg" },
|
||||
});
|
||||
assert.equal(hero.presentation.heroImage, "/media/detail-hero.jpg");
|
||||
|
||||
const fallbackCover = projectOfferingPreviewFields({
|
||||
item: baseItem,
|
||||
config: { detailHero: "" },
|
||||
formValues: { coverUrl: "/media/new-cover.jpg" },
|
||||
});
|
||||
assert.equal(fallbackCover.presentation.heroImage, "/media/new-cover.jpg");
|
||||
|
||||
const fallbackOriginal = projectOfferingPreviewFields({
|
||||
item: baseItem,
|
||||
config: { detailHero: "" },
|
||||
formValues: { coverUrl: "" },
|
||||
});
|
||||
assert.equal(fallbackOriginal.presentation.heroImage, "/media/original-cover.jpg");
|
||||
});
|
||||
|
||||
test("details merge preserves originals and applies updates", () => {
|
||||
const result = projectOfferingPreviewFields({
|
||||
item: baseItem,
|
||||
config: {
|
||||
details: {
|
||||
background: "更新后的背景",
|
||||
designConcept: "新的设计理念",
|
||||
crafts: ["新交付"],
|
||||
materialsList: [{ name: "策略", spec: "定位" }],
|
||||
},
|
||||
},
|
||||
formValues: {},
|
||||
});
|
||||
|
||||
assert.equal(result.presentation.details.background, "更新后的背景");
|
||||
assert.equal(result.presentation.details.designConcept, "新的设计理念");
|
||||
assert.deepEqual(result.presentation.details.crafts, ["新交付"]);
|
||||
assert.deepEqual(result.presentation.details.materialsList, [{ name: "策略", spec: "定位" }]);
|
||||
});
|
||||
|
||||
test("non-object config.presentation and details are ignored safely", () => {
|
||||
const result = projectOfferingPreviewFields({
|
||||
item: baseItem,
|
||||
config: {
|
||||
presentation: "invalid",
|
||||
details: 42,
|
||||
},
|
||||
formValues: {},
|
||||
});
|
||||
|
||||
assert.deepEqual(result.presentation.keywords, ["原始"]);
|
||||
assert.equal(result.presentation.details.background, "原始背景");
|
||||
assert.deepEqual(result.presentation.details.crafts, []);
|
||||
});
|
||||
@@ -0,0 +1,141 @@
|
||||
import assert from "node:assert/strict";
|
||||
import test from "node:test";
|
||||
import {
|
||||
pageTemplateFields,
|
||||
previewTargetsByPage,
|
||||
} from "../src/features/services/offering-preview-targets.ts";
|
||||
|
||||
function section(page, target, fields) {
|
||||
return {
|
||||
key: `${page}-${target}`,
|
||||
title: target,
|
||||
description: "",
|
||||
page,
|
||||
target,
|
||||
fields,
|
||||
previewTargets: [{ key: `${page}.${target}`, label: target }],
|
||||
};
|
||||
}
|
||||
|
||||
test("previewTargetsByPage prefers the offerings page for list targets", () => {
|
||||
const sections = [
|
||||
section("home", "homeCard", [{ binding: "offering.name", previewTarget: "home.homeCard" }]),
|
||||
section("offerings", "offeringCard", [
|
||||
{ binding: "offering.name", previewTarget: "offerings.offeringCard" },
|
||||
]),
|
||||
section("detail", "projectHero", [
|
||||
{ binding: "offering.name", previewTarget: "detail.projectHero" },
|
||||
]),
|
||||
];
|
||||
|
||||
const result = previewTargetsByPage(sections);
|
||||
assert.deepEqual(
|
||||
result.offerings.map((target) => target.key),
|
||||
["offerings.offeringCard"],
|
||||
);
|
||||
assert.deepEqual(
|
||||
result.detail.map((target) => target.key),
|
||||
["detail.projectHero"],
|
||||
);
|
||||
});
|
||||
|
||||
test("previewTargetsByPage falls back to the first non-detail page with offering records", () => {
|
||||
const sections = [
|
||||
section("home", "homeCard", [{ binding: "offering.name", previewTarget: "home.homeCard" }]),
|
||||
section("detail", "projectHero", []),
|
||||
];
|
||||
|
||||
const result = previewTargetsByPage(sections);
|
||||
assert.equal(result.offerings.length, 1);
|
||||
assert.equal(result.offerings[0].key, "home.homeCard");
|
||||
assert.equal(result.offerings[0].source, "offering");
|
||||
});
|
||||
|
||||
test("previewTargetsByPage returns no list targets without offering-backed pages", () => {
|
||||
const sections = [
|
||||
section("detail", "projectHero", [
|
||||
{ binding: "brand.name", previewTarget: "detail.projectHero" },
|
||||
]),
|
||||
];
|
||||
|
||||
const result = previewTargetsByPage(sections);
|
||||
assert.deepEqual(result.offerings, []);
|
||||
assert.deepEqual(
|
||||
result.detail.map((target) => target.key),
|
||||
["detail.projectHero"],
|
||||
);
|
||||
assert.notEqual(result.detail[0].source, "offering");
|
||||
});
|
||||
|
||||
test("pageTemplateFields collects every detail target field", () => {
|
||||
const previewTargets = previewTargetsByPage([
|
||||
section("detail", "projectHero", [
|
||||
{ binding: "offering.name", previewTarget: "detail.projectHero" },
|
||||
]),
|
||||
section("detail", "projectFacts", [
|
||||
{ binding: "offering.priceText", previewTarget: "detail.projectFacts" },
|
||||
]),
|
||||
section("home", "homeCard", [{ binding: "offering.summary", previewTarget: "home.homeCard" }]),
|
||||
]);
|
||||
const templateFields = [
|
||||
{ key: "name", binding: "offering.name", previewTarget: "detail.projectHero" },
|
||||
{ key: "priceText", binding: "offering.priceText", previewTarget: "detail.projectFacts" },
|
||||
{ key: "summary", binding: "offering.summary", previewTarget: "home.homeCard" },
|
||||
];
|
||||
|
||||
const result = pageTemplateFields({
|
||||
previewPage: "detail",
|
||||
previewTargets,
|
||||
templateFields,
|
||||
});
|
||||
assert.deepEqual(
|
||||
result.map((field) => field.key),
|
||||
["name", "priceText"],
|
||||
);
|
||||
});
|
||||
|
||||
test("pageTemplateFields falls back to page fields without previewTarget", () => {
|
||||
const previewTargets = previewTargetsByPage([
|
||||
section("detail", "projectHero", [
|
||||
{ binding: "offering.name", previewTarget: "detail.projectHero" },
|
||||
]),
|
||||
]);
|
||||
const templateFields = [
|
||||
{ key: "name", binding: "offering.name", previewTarget: "detail.projectHero" },
|
||||
{ key: "legacy", binding: "offering.config.legacy", page: "detail" },
|
||||
{ key: "other", binding: "offering.config.other", previewTarget: "unknown.target" },
|
||||
];
|
||||
|
||||
const result = pageTemplateFields({
|
||||
previewPage: "detail",
|
||||
previewTargets,
|
||||
templateFields,
|
||||
});
|
||||
assert.deepEqual(
|
||||
result.map((field) => field.key),
|
||||
["name", "legacy"],
|
||||
);
|
||||
});
|
||||
|
||||
test("pageTemplateFields uses the inferred list page for offerings", () => {
|
||||
const previewTargets = previewTargetsByPage([
|
||||
section("home", "homeCard", [{ binding: "offering.name", previewTarget: "home.homeCard" }]),
|
||||
section("detail", "projectHero", []),
|
||||
]);
|
||||
const templateFields = [
|
||||
{ key: "name", binding: "offering.name", previewTarget: "home.homeCard" },
|
||||
{ key: "legacy", binding: "offering.config.legacy", page: "home" },
|
||||
{ key: "detail", binding: "offering.config.detail", previewTarget: "detail.projectHero" },
|
||||
];
|
||||
|
||||
const result = pageTemplateFields({
|
||||
previewPage: "offerings",
|
||||
previewTargets,
|
||||
templateFields,
|
||||
listPage: previewTargets.offerings[0]?.page,
|
||||
});
|
||||
assert.deepEqual(
|
||||
result.map((field) => field.key),
|
||||
["name", "legacy"],
|
||||
);
|
||||
});
|
||||
@@ -4,11 +4,12 @@
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"build": "tsc -p tsconfig.json",
|
||||
"postinstall": "prisma generate",
|
||||
"dev": "pnpm build && node --env-file=.env --watch dist/main.js",
|
||||
"lint": "eslint .",
|
||||
"typecheck": "tsc -p tsconfig.json --noEmit",
|
||||
"test": "tsx --test test/**/*.test.ts",
|
||||
"test:integration": "pnpm build && node --env-file=.env test/template-contract-migration.integration.mjs && node --env-file=.env test/run-integration.cjs && pnpm --filter @personal-brand/api exec tsx --test test/http.upload.test.js",
|
||||
"test:integration": "pnpm --workspace-root exec turbo run build --filter=@personal-brand/api... && node --env-file=.env test/template-contract-migration.integration.mjs && node --env-file=.env test/run-integration.cjs && pnpm --filter @personal-brand/api exec tsx --test test/http.upload.test.js",
|
||||
"clean": "rimraf dist",
|
||||
"start": "node dist/main.js",
|
||||
"db:generate": "prisma generate",
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
-- CreateTable
|
||||
CREATE TABLE "ClientErrorThrottleWindow" (
|
||||
"subject" TEXT NOT NULL,
|
||||
"windowStart" TIMESTAMP(3) NOT NULL,
|
||||
"count" INTEGER NOT NULL,
|
||||
"updatedAt" TIMESTAMP(3) NOT NULL,
|
||||
|
||||
CONSTRAINT "ClientErrorThrottleWindow_pkey" PRIMARY KEY ("subject")
|
||||
);
|
||||
|
||||
-- CreateTable
|
||||
CREATE TABLE "ClientErrorDedupe" (
|
||||
"id" TEXT NOT NULL,
|
||||
"subject" TEXT NOT NULL,
|
||||
"errorId" TEXT NOT NULL,
|
||||
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
|
||||
CONSTRAINT "ClientErrorDedupe_pkey" PRIMARY KEY ("id")
|
||||
);
|
||||
|
||||
-- CreateIndex
|
||||
CREATE INDEX "ClientErrorThrottleWindow_windowStart_idx" ON "ClientErrorThrottleWindow"("windowStart");
|
||||
|
||||
-- CreateIndex
|
||||
CREATE UNIQUE INDEX "ClientErrorDedupe_subject_errorId_key" ON "ClientErrorDedupe"("subject", "errorId");
|
||||
|
||||
-- CreateIndex
|
||||
CREATE INDEX "ClientErrorDedupe_createdAt_idx" ON "ClientErrorDedupe"("createdAt");
|
||||
@@ -1,6 +1,6 @@
|
||||
generator client {
|
||||
provider = "prisma-client-js"
|
||||
binaryTargets = ["linux-musl-openssl-3.0.x", "debian-openssl-3.0.x"]
|
||||
binaryTargets = ["linux-musl-openssl-3.0.x", "debian-openssl-3.0.x", "linux-arm64-openssl-3.0.x"]
|
||||
}
|
||||
|
||||
datasource db {
|
||||
@@ -468,6 +468,25 @@ model AdminUser {
|
||||
templateAuditLogs TemplatePackageAuditLog[] @relation("TemplatePackageAuditActor")
|
||||
}
|
||||
|
||||
model ClientErrorThrottleWindow {
|
||||
subject String @id
|
||||
windowStart DateTime
|
||||
count Int
|
||||
updatedAt DateTime @updatedAt
|
||||
|
||||
@@index([windowStart])
|
||||
}
|
||||
|
||||
model ClientErrorDedupe {
|
||||
id String @id @default(uuid())
|
||||
subject String
|
||||
errorId String
|
||||
createdAt DateTime @default(now())
|
||||
|
||||
@@unique([subject, errorId])
|
||||
@@index([createdAt])
|
||||
}
|
||||
|
||||
model TemplatePackage {
|
||||
id String @id @default(uuid())
|
||||
packageKey String @unique
|
||||
|
||||
@@ -4,16 +4,36 @@ import { PrismaService } from "./prisma.service.js";
|
||||
import { readAdminToken } from "./admin-access.identity.js";
|
||||
import { readIdentity } from "./auth.js";
|
||||
|
||||
type TokenAccess = {
|
||||
subject: string;
|
||||
brandId: string;
|
||||
mustChangePassword: boolean;
|
||||
tokenVersion: number;
|
||||
platformTemplateRole: string;
|
||||
};
|
||||
|
||||
type BrandAccess = { subject: string; brandId: string; role: string };
|
||||
|
||||
@Injectable()
|
||||
export class AdminAccessService {
|
||||
/**
|
||||
* 同一 HTTP 请求内 Guard 和 Controller 都会调用访问校验。
|
||||
* 用 WeakMap 按请求缓存结果,既避免重复查询,也不会把权限状态跨请求缓存。
|
||||
*/
|
||||
private readonly tokenAccess = new WeakMap<FastifyRequest, Promise<TokenAccess>>();
|
||||
private readonly brandAccess = new WeakMap<FastifyRequest, Promise<BrandAccess>>();
|
||||
|
||||
constructor(private readonly prisma: PrismaService) {}
|
||||
|
||||
async requireToken(request: FastifyRequest): Promise<{
|
||||
subject: string;
|
||||
brandId: string;
|
||||
mustChangePassword: boolean;
|
||||
tokenVersion: number;
|
||||
}> {
|
||||
requireToken(request: FastifyRequest): Promise<TokenAccess> {
|
||||
const cached = this.tokenAccess.get(request);
|
||||
if (cached) return cached;
|
||||
const pending = this.resolveToken(request);
|
||||
this.tokenAccess.set(request, pending);
|
||||
return pending;
|
||||
}
|
||||
|
||||
private async resolveToken(request: FastifyRequest): Promise<TokenAccess> {
|
||||
const token = readAdminToken(request);
|
||||
if (!token) throw new UnauthorizedException("缺少管理员登录态");
|
||||
let identity;
|
||||
@@ -25,7 +45,12 @@ export class AdminAccessService {
|
||||
if (identity.role !== "admin") throw new ForbiddenException("无管理员权限");
|
||||
const user = await this.prisma.adminUser.findUnique({
|
||||
where: { id: identity.subject },
|
||||
select: { isEnabled: true, mustChangePassword: true, tokenVersion: true },
|
||||
select: {
|
||||
isEnabled: true,
|
||||
mustChangePassword: true,
|
||||
tokenVersion: true,
|
||||
platformTemplateRole: true,
|
||||
},
|
||||
});
|
||||
if (!user || identity.tokenVersion !== user.tokenVersion)
|
||||
throw new UnauthorizedException("管理员登录态已失效,请重新登录");
|
||||
@@ -35,12 +60,19 @@ export class AdminAccessService {
|
||||
brandId: identity.brandId,
|
||||
mustChangePassword: user.mustChangePassword,
|
||||
tokenVersion: user.tokenVersion,
|
||||
platformTemplateRole: user.platformTemplateRole,
|
||||
};
|
||||
}
|
||||
|
||||
async requireBrand(
|
||||
request: FastifyRequest,
|
||||
): Promise<{ subject: string; brandId: string; role: string }> {
|
||||
requireBrand(request: FastifyRequest): Promise<BrandAccess> {
|
||||
const cached = this.brandAccess.get(request);
|
||||
if (cached) return cached;
|
||||
const pending = this.resolveBrand(request);
|
||||
this.brandAccess.set(request, pending);
|
||||
return pending;
|
||||
}
|
||||
|
||||
private async resolveBrand(request: FastifyRequest): Promise<BrandAccess> {
|
||||
const access = await this.requireToken(request);
|
||||
if (access.mustChangePassword)
|
||||
throw new ForbiddenException("请先完成初始密码修改后再访问管理后台");
|
||||
@@ -63,11 +95,7 @@ export class AdminAccessService {
|
||||
const access = await this.requireToken(request);
|
||||
if (access.mustChangePassword)
|
||||
throw new ForbiddenException("请先完成初始密码修改后再访问管理后台");
|
||||
const user = await this.prisma.adminUser.findUniqueOrThrow({
|
||||
where: { id: access.subject },
|
||||
select: { platformTemplateRole: true },
|
||||
});
|
||||
if (user.platformTemplateRole !== "template_admin")
|
||||
if (access.platformTemplateRole !== "template_admin")
|
||||
throw new ForbiddenException("当前账号没有模板管理权限");
|
||||
return { subject: access.subject };
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { UnauthorizedException } from "@nestjs/common";
|
||||
import { createHmac, timingSafeEqual } from "node:crypto";
|
||||
import { isPlaceholderSecret } from "./runtime-config.js";
|
||||
|
||||
type Identity = {
|
||||
subject: string;
|
||||
@@ -9,9 +10,20 @@ type Identity = {
|
||||
exp: number;
|
||||
};
|
||||
|
||||
let warnedAboutPlaceholderSecret = false;
|
||||
|
||||
function secret(): string {
|
||||
const value = process.env.SESSION_SECRET;
|
||||
if (!value || value.length < 32) throw new UnauthorizedException("服务端会话密钥未正确配置");
|
||||
if (isPlaceholderSecret(value)) {
|
||||
// 生产环境已在启动时 fail fast;这里保留二次防线,避免绕过 createApp 的调用方签发弱 token。
|
||||
if (process.env.NODE_ENV === "production")
|
||||
throw new UnauthorizedException("服务端会话密钥未正确配置");
|
||||
if (!warnedAboutPlaceholderSecret) {
|
||||
warnedAboutPlaceholderSecret = true;
|
||||
console.warn("[api] SESSION_SECRET 仍是示例占位符,仅可用于本地开发");
|
||||
}
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
import { IsOptional, IsString, Matches, MaxLength, MinLength } from "class-validator";
|
||||
|
||||
/** 后台渲染异常上报:只接受白名单字段,避免把任意浏览器数据写进日志。 */
|
||||
export class CreateClientErrorDto {
|
||||
@IsString()
|
||||
@Matches(/^[A-Za-z0-9._-]{4,128}$/, { message: "errorId 格式不正确" })
|
||||
errorId!: string;
|
||||
|
||||
@IsString()
|
||||
@MinLength(1, { message: "message 不能为空" })
|
||||
@MaxLength(2000, { message: "message 过长" })
|
||||
message!: string;
|
||||
|
||||
@IsString()
|
||||
@Matches(/^\//, { message: "route 必须以 / 开头" })
|
||||
@MaxLength(500, { message: "route 过长" })
|
||||
route!: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
@MaxLength(20000, { message: "componentStack 过长" })
|
||||
componentStack?: string;
|
||||
}
|
||||
@@ -6,8 +6,10 @@ import multipart from "@fastify/multipart";
|
||||
import fastifyStatic from "@fastify/static";
|
||||
import path from "node:path";
|
||||
import { AppModule, configureApp } from "./app.module.js";
|
||||
import { assertProductionSecret } from "./runtime-config.js";
|
||||
|
||||
export async function createApp(): Promise<NestFastifyApplication> {
|
||||
assertProductionSecret(process.env.SESSION_SECRET);
|
||||
const app = await NestFactory.create<NestFastifyApplication>(AppModule, new FastifyAdapter());
|
||||
app
|
||||
.getHttpAdapter()
|
||||
|
||||
+1
-1
@@ -38,7 +38,7 @@ export function decryptMiniAppCredential(value: unknown): string {
|
||||
typeof payload.iv !== "string" ||
|
||||
typeof payload.authTag !== "string"
|
||||
)
|
||||
throw new UnauthorizedException("小程序上传凭据不可用");
|
||||
throw new UnauthorizedException("小程序凭据不可用");
|
||||
const decipher = createDecipheriv(ALGORITHM, encryptionKey(), Buffer.from(payload.iv, "base64"));
|
||||
decipher.setAuthTag(Buffer.from(payload.authTag, "base64"));
|
||||
return Buffer.concat([
|
||||
@@ -1,22 +1,12 @@
|
||||
import { AdminBrand } from "../../admin-auth.decorators.js";
|
||||
import {
|
||||
Body,
|
||||
Controller,
|
||||
ForbiddenException,
|
||||
Get,
|
||||
Param,
|
||||
Post,
|
||||
Query,
|
||||
Req,
|
||||
UnauthorizedException,
|
||||
} from "@nestjs/common";
|
||||
import { Body, Controller, Get, Param, Post, Query, Req } from "@nestjs/common";
|
||||
import { Transform } from "class-transformer";
|
||||
import type { TransformFnParams } from "class-transformer";
|
||||
import { BookingStatus } from "@prisma/client";
|
||||
import { IsBoolean, IsEnum, IsOptional, IsString } from "class-validator";
|
||||
import type { FastifyRequest } from "fastify";
|
||||
import { AdminAccessService } from "../../admin-access.service.js";
|
||||
import { BookingService } from "../../booking.service.js";
|
||||
import { readIdentity } from "../../auth.js";
|
||||
import { UpdateBookingStatusDto, UpdateBookingTagsDto, CreateTagDto } from "../../admin.dto.js";
|
||||
|
||||
class AdminBookingQueryDto {
|
||||
@@ -35,67 +25,67 @@ class AdminBookingQueryDto {
|
||||
@AdminBrand()
|
||||
@Controller("admin/bookings")
|
||||
export class AdminBookingController {
|
||||
constructor(private readonly bookings: BookingService) {}
|
||||
constructor(
|
||||
private readonly access: AdminAccessService,
|
||||
private readonly bookings: BookingService,
|
||||
) {}
|
||||
|
||||
@Get()
|
||||
list(@Req() request: FastifyRequest, @Query() query: AdminBookingQueryDto): Promise<unknown> {
|
||||
const brandId = this.requireAdmin(request);
|
||||
async list(
|
||||
@Req() request: FastifyRequest,
|
||||
@Query() query: AdminBookingQueryDto,
|
||||
): Promise<unknown> {
|
||||
const { brandId } = await this.access.requireBrand(request);
|
||||
return this.bookings.listForAdmin(brandId, query);
|
||||
}
|
||||
|
||||
@Get("unread-count")
|
||||
unreadCount(@Req() request: FastifyRequest): Promise<unknown> {
|
||||
return this.bookings.unreadCountForAdmin(this.requireAdmin(request));
|
||||
async unreadCount(@Req() request: FastifyRequest): Promise<unknown> {
|
||||
const { brandId } = await this.access.requireBrand(request);
|
||||
return this.bookings.unreadCountForAdmin(brandId);
|
||||
}
|
||||
|
||||
@Get(":id")
|
||||
detail(@Req() request: FastifyRequest, @Param("id") id: string): Promise<unknown> {
|
||||
return this.bookings.getForAdmin(this.requireAdmin(request), id);
|
||||
async detail(@Req() request: FastifyRequest, @Param("id") id: string): Promise<unknown> {
|
||||
const { brandId } = await this.access.requireBrand(request);
|
||||
return this.bookings.getForAdmin(brandId, id);
|
||||
}
|
||||
|
||||
@Post(":id/status")
|
||||
update(
|
||||
async update(
|
||||
@Req() request: FastifyRequest,
|
||||
@Param("id") id: string,
|
||||
@Body() body: UpdateBookingStatusDto,
|
||||
): Promise<unknown> {
|
||||
return this.bookings.updateStatus(this.requireAdmin(request), id, body.status, body.adminNote);
|
||||
const { brandId } = await this.access.requireBrand(request);
|
||||
return this.bookings.updateStatus(brandId, id, body.status, body.adminNote);
|
||||
}
|
||||
|
||||
@Post(":id/read")
|
||||
markRead(@Req() request: FastifyRequest, @Param("id") id: string): Promise<unknown> {
|
||||
return this.bookings.markRead(this.requireAdmin(request), id);
|
||||
async markRead(@Req() request: FastifyRequest, @Param("id") id: string): Promise<unknown> {
|
||||
const { brandId } = await this.access.requireBrand(request);
|
||||
return this.bookings.markRead(brandId, id);
|
||||
}
|
||||
|
||||
@Post(":id/tags")
|
||||
updateTags(
|
||||
async updateTags(
|
||||
@Req() request: FastifyRequest,
|
||||
@Param("id") id: string,
|
||||
@Body() body: UpdateBookingTagsDto,
|
||||
): Promise<unknown> {
|
||||
return this.bookings.updateTags(this.requireAdmin(request), id, body.tagIds);
|
||||
const { brandId } = await this.access.requireBrand(request);
|
||||
return this.bookings.updateTags(brandId, id, body.tagIds);
|
||||
}
|
||||
|
||||
@Get("tags")
|
||||
listTags(@Req() request: FastifyRequest): Promise<unknown> {
|
||||
return this.bookings.listTags(this.requireAdmin(request));
|
||||
async listTags(@Req() request: FastifyRequest): Promise<unknown> {
|
||||
const { brandId } = await this.access.requireBrand(request);
|
||||
return this.bookings.listTags(brandId);
|
||||
}
|
||||
|
||||
@Post("tags")
|
||||
createTag(@Req() request: FastifyRequest, @Body() body: CreateTagDto): Promise<unknown> {
|
||||
return this.bookings.createTag(this.requireAdmin(request), body.name);
|
||||
}
|
||||
|
||||
private requireAdmin(request: FastifyRequest): string {
|
||||
const token = request.headers.authorization?.replace(/^Bearer\s+/i, "");
|
||||
if (!token) throw new UnauthorizedException("缺少管理员登录态");
|
||||
let identity;
|
||||
try {
|
||||
identity = readIdentity(token);
|
||||
} catch {
|
||||
throw new UnauthorizedException("管理员登录态无效或已过期");
|
||||
}
|
||||
if (identity.role !== "admin") throw new ForbiddenException("无管理员权限");
|
||||
return identity.brandId;
|
||||
async createTag(@Req() request: FastifyRequest, @Body() body: CreateTagDto): Promise<unknown> {
|
||||
const { brandId } = await this.access.requireBrand(request);
|
||||
return this.bookings.createTag(brandId, body.name);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
import { AdminBrand } from "../../admin-auth.decorators.js";
|
||||
import { Body, Controller, Post, Req } from "@nestjs/common";
|
||||
import type { FastifyRequest } from "fastify";
|
||||
import { AdminAccessService } from "../../admin-access.service.js";
|
||||
import { CreateClientErrorDto } from "../../client-error.dto.js";
|
||||
import { AdminClientErrorService } from "./admin-client-error.service.js";
|
||||
|
||||
@AdminBrand()
|
||||
@Controller("admin/client-errors")
|
||||
export class AdminClientErrorController {
|
||||
constructor(
|
||||
private readonly access: AdminAccessService,
|
||||
private readonly errors: AdminClientErrorService,
|
||||
) {}
|
||||
|
||||
@Post()
|
||||
async create(
|
||||
@Req() request: FastifyRequest,
|
||||
@Body() body: CreateClientErrorDto,
|
||||
): Promise<{ received: true; duplicate: boolean }> {
|
||||
const identity = await this.access.requireBrand(request);
|
||||
return this.errors.record({
|
||||
subject: identity.subject,
|
||||
brandId: identity.brandId,
|
||||
errorId: body.errorId,
|
||||
message: body.message,
|
||||
route: body.route,
|
||||
componentStack: body.componentStack,
|
||||
requestId:
|
||||
(request as FastifyRequest & { requestId?: string }).requestId ??
|
||||
request.headers["x-request-id"]?.toString() ??
|
||||
null,
|
||||
userAgent: request.headers["user-agent"]?.toString().slice(0, 300) ?? null,
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
import { Inject, Injectable } from "@nestjs/common";
|
||||
import {
|
||||
CLIENT_ERROR_THROTTLE_STORE,
|
||||
type ClientErrorThrottleStore,
|
||||
} from "./client-error-throttle.store.js";
|
||||
|
||||
const LOG_STACK_LIMIT = 4000;
|
||||
|
||||
export interface ClientErrorReport {
|
||||
subject: string;
|
||||
brandId: string;
|
||||
errorId: string;
|
||||
message: string;
|
||||
route: string;
|
||||
componentStack?: string | undefined;
|
||||
requestId: string | null;
|
||||
userAgent: string | null;
|
||||
}
|
||||
|
||||
export interface ClientErrorReceipt {
|
||||
received: true;
|
||||
duplicate: boolean;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class AdminClientErrorService {
|
||||
constructor(
|
||||
@Inject(CLIENT_ERROR_THROTTLE_STORE)
|
||||
private readonly throttle: ClientErrorThrottleStore,
|
||||
) {}
|
||||
|
||||
async record(report: ClientErrorReport): Promise<ClientErrorReceipt> {
|
||||
const result = await this.throttle.record(report);
|
||||
if (result.duplicate) return { received: true, duplicate: true };
|
||||
|
||||
console.error("admin client error", {
|
||||
errorId: report.errorId,
|
||||
message: report.message,
|
||||
route: report.route,
|
||||
subject: report.subject,
|
||||
brandId: report.brandId,
|
||||
requestId: report.requestId,
|
||||
userAgent: report.userAgent,
|
||||
componentStack: report.componentStack?.slice(0, LOG_STACK_LIMIT) ?? null,
|
||||
});
|
||||
|
||||
return { received: true, duplicate: false };
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,7 @@ import {
|
||||
UpdateBrandPresentationDto,
|
||||
UpdateTrustContentDto,
|
||||
} from "../../admin.dto.js";
|
||||
import { TemplateWorkspaceService } from "../../template-workspace.service.js";
|
||||
import { TrustContentService } from "../../template/trust-content.service.js";
|
||||
import { requireAdminIdentity } from "../../admin-access.identity.js";
|
||||
import { AdminBrandConfigService } from "./admin-brand-config.service.js";
|
||||
|
||||
@@ -15,7 +15,7 @@ import { AdminBrandConfigService } from "./admin-brand-config.service.js";
|
||||
@Controller("admin/config")
|
||||
export class AdminConfigController {
|
||||
constructor(
|
||||
private readonly templateWorkspace: TemplateWorkspaceService,
|
||||
private readonly trustContent: TrustContentService,
|
||||
private readonly brandConfig: AdminBrandConfigService,
|
||||
) {}
|
||||
@Get("brand")
|
||||
@@ -42,7 +42,7 @@ export class AdminConfigController {
|
||||
@Get("trust-content")
|
||||
listTrustContent(@Req() request: FastifyRequest): Promise<unknown> {
|
||||
const identity = requireAdminIdentity(request);
|
||||
return this.templateWorkspace.listTrustContent(identity.brandId);
|
||||
return this.trustContent.listTrustContent(identity.brandId);
|
||||
}
|
||||
@Post("trust-content")
|
||||
createTrustContent(
|
||||
@@ -50,7 +50,7 @@ export class AdminConfigController {
|
||||
@Body() body: CreateTrustContentDto,
|
||||
): Promise<unknown> {
|
||||
const identity = requireAdminIdentity(request);
|
||||
return this.templateWorkspace.createTrustContent(identity.brandId, body);
|
||||
return this.trustContent.createTrustContent(identity.brandId, body);
|
||||
}
|
||||
@Patch("trust-content/:id")
|
||||
updateTrustContent(
|
||||
@@ -59,7 +59,7 @@ export class AdminConfigController {
|
||||
@Body() body: UpdateTrustContentDto,
|
||||
): Promise<unknown> {
|
||||
const identity = requireAdminIdentity(request);
|
||||
return this.templateWorkspace.updateTrustContent(identity.brandId, id, body);
|
||||
return this.trustContent.updateTrustContent(identity.brandId, id, body);
|
||||
}
|
||||
@Delete("trust-content/:id")
|
||||
async deleteTrustContent(
|
||||
@@ -67,6 +67,6 @@ export class AdminConfigController {
|
||||
@Param("id") id: string,
|
||||
): Promise<unknown> {
|
||||
const identity = requireAdminIdentity(request);
|
||||
return this.templateWorkspace.deleteTrustContent(identity.brandId, id);
|
||||
return this.trustContent.deleteTrustContent(identity.brandId, id);
|
||||
}
|
||||
}
|
||||
@@ -18,4 +18,9 @@ export class UpdateMiniAppSettingsDto {
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
privateKey?: string;
|
||||
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
@MaxLength(128)
|
||||
appSecret?: string;
|
||||
}
|
||||
@@ -3,7 +3,7 @@ import { Prisma } from "@prisma/client";
|
||||
import { AdminMiniAppReleaseService } from "./admin-miniapp-release.service.js";
|
||||
import { miniappArtifactRoot } from "./miniapp-artifact.js";
|
||||
import { miniappApiBaseUrl, validateApiBaseUrl, weappAppId } from "./miniapp-build-config.js";
|
||||
import { encryptMiniAppCredential } from "./miniapp-credential-crypto.js";
|
||||
import { encryptMiniAppCredential } from "../../miniapp-credential-crypto.js";
|
||||
import { inspectPrivateKey, normalizePrivateKey } from "./miniapp-private-key.js";
|
||||
import type { UpdateMiniAppSettingsDto } from "./admin-miniapp-settings.dto.js";
|
||||
|
||||
@@ -18,10 +18,17 @@ export class AdminMiniAppSettingsService {
|
||||
|
||||
async update(brandId: string, body: UpdateMiniAppSettingsDto & { privateKey?: string }) {
|
||||
if (body.privateKey !== undefined) this.validatePrivateKey(body.privateKey);
|
||||
if (body.appSecret !== undefined) this.validateAppSecret(body.appSecret);
|
||||
const current = this.jsonObject(await this.releases.settings(brandId));
|
||||
const currentAppId = typeof current.appId === "string" ? current.appId : "";
|
||||
const nextAppId = body.appId === undefined ? currentAppId : body.appId.trim();
|
||||
if (currentAppId && nextAppId !== currentAppId && body.appSecret === undefined)
|
||||
throw new BadRequestException(
|
||||
"修改微信 AppID 时必须同时填写该 AppID 对应的 AppSecret,避免登录凭据与小程序不匹配",
|
||||
);
|
||||
const settings = {
|
||||
...current,
|
||||
appId: body.appId ?? current.appId ?? "",
|
||||
appId: nextAppId,
|
||||
apiBaseUrl:
|
||||
body.apiBaseUrl === undefined ? (current.apiBaseUrl ?? "") : this.apiBaseUrl(body),
|
||||
build: {
|
||||
@@ -31,6 +38,9 @@ export class AdminMiniAppSettingsService {
|
||||
...(body.privateKey === undefined
|
||||
? {}
|
||||
: { credential: encryptMiniAppCredential(normalizePrivateKey(body.privateKey)) }),
|
||||
...(body.appSecret === undefined
|
||||
? {}
|
||||
: { appSecretCredential: encryptMiniAppCredential(body.appSecret.trim()) }),
|
||||
templateKey: current.templateKey ?? null,
|
||||
} satisfies Prisma.InputJsonObject;
|
||||
await this.releases.saveSettings(brandId, settings);
|
||||
@@ -47,6 +57,14 @@ export class AdminMiniAppSettingsService {
|
||||
);
|
||||
}
|
||||
|
||||
private validateAppSecret(appSecret: string) {
|
||||
const trimmed = appSecret.trim();
|
||||
if (!/^[A-Za-z0-9]{16,64}$/.test(trimmed))
|
||||
throw new BadRequestException(
|
||||
"微信登录 AppSecret 格式无效:应为 16-64 位字母或数字,请从微信公众平台复制完整值",
|
||||
);
|
||||
}
|
||||
|
||||
private apiBaseUrl(body: UpdateMiniAppSettingsDto) {
|
||||
const trimmed = body.apiBaseUrl?.trim();
|
||||
if (!trimmed) throw new BadRequestException("小程序请求地址不能为空");
|
||||
@@ -58,16 +76,21 @@ export class AdminMiniAppSettingsService {
|
||||
}
|
||||
|
||||
private present(settings: Record<string, unknown>) {
|
||||
const { credential, appSecretCredential, ...rest } = settings;
|
||||
delete rest.appSecret;
|
||||
const appId = typeof rest.appId === "string" ? rest.appId : "";
|
||||
return {
|
||||
appId: "",
|
||||
artifactPath: miniappArtifactRoot(),
|
||||
build: {},
|
||||
...settings,
|
||||
apiBaseUrl: this.effectiveApiBaseUrl(settings.apiBaseUrl),
|
||||
...rest,
|
||||
apiBaseUrl: this.effectiveApiBaseUrl(rest.apiBaseUrl),
|
||||
privateKey: undefined,
|
||||
credential: settings.credential ? { algorithm: "aes-256-gcm" } : null,
|
||||
hasStoredCredentials: Boolean(settings.credential),
|
||||
...this.buildConfigSummary(settings.apiBaseUrl, settings.appId),
|
||||
credential: credential ? { algorithm: "aes-256-gcm" } : null,
|
||||
hasStoredCredentials: Boolean(credential),
|
||||
hasStoredAppSecret: Boolean(appSecretCredential),
|
||||
loginConfigured: Boolean(appId && appSecretCredential),
|
||||
...this.buildConfigSummary(rest.apiBaseUrl, rest.appId),
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ import {
|
||||
import { miniappReleaseProjectPath, miniappTaroOutputRoot } from "./miniapp-artifact.js";
|
||||
import { miniappApiBaseUrl, weappAppId } from "./miniapp-build-config.js";
|
||||
import { buildingStaleMs, isStaleBuilding } from "./miniapp-build-status.js";
|
||||
import { decryptMiniAppCredential } from "./miniapp-credential-crypto.js";
|
||||
import { decryptMiniAppCredential } from "../../miniapp-credential-crypto.js";
|
||||
import { inspectPrivateKey, normalizePrivateKey } from "./miniapp-private-key.js";
|
||||
import { runMiniAppUpload } from "./miniapp-upload.js";
|
||||
|
||||
@@ -68,7 +68,7 @@ export class AdminMiniAppUploadService {
|
||||
const keyInspection = inspectPrivateKey(normalizedPrivateKey);
|
||||
if (!keyInspection.valid)
|
||||
throw new BadRequestException(
|
||||
`上传私钥无法解析(${keyInspection.reason ?? "PEM 格式错误"})。请在“小程序上传配置”里重新粘贴完整私钥。`,
|
||||
`上传私钥无法解析(${keyInspection.reason ?? "PEM 格式错误"})。请在“小程序配置”里重新粘贴完整私钥。`,
|
||||
);
|
||||
|
||||
const templateManifest = miniAppTemplateManifest(brand.templateKey);
|
||||
|
||||
@@ -2,6 +2,11 @@ import { Module } from "@nestjs/common";
|
||||
import { BookingModule } from "../booking.module.js";
|
||||
import { InfrastructureModule } from "../infrastructure.module.js";
|
||||
import { AdminBookingController } from "./admin-booking.controller.js";
|
||||
import { AdminClientErrorController } from "./admin-client-error.controller.js";
|
||||
import { AdminClientErrorService } from "./admin-client-error.service.js";
|
||||
import { createClientErrorThrottleStore } from "./client-error-throttle.factory.js";
|
||||
import { CLIENT_ERROR_THROTTLE_STORE } from "./client-error-throttle.store.js";
|
||||
import { PrismaService } from "../../prisma.service.js";
|
||||
import { AdminBrandConfigService } from "./admin-brand-config.service.js";
|
||||
import { AdminConfigController } from "./admin-config.controller.js";
|
||||
import { AdminLocalUploadController } from "./admin-local-upload.controller.js";
|
||||
@@ -32,6 +37,7 @@ import { AdminTemplatePreviewAssetsService } from "./admin-template-preview-asse
|
||||
AdminBookingController,
|
||||
AdminTemplatePackageController,
|
||||
TemplateOperationMetricsController,
|
||||
AdminClientErrorController,
|
||||
],
|
||||
providers: [
|
||||
AdminBrandConfigService,
|
||||
@@ -44,6 +50,12 @@ import { AdminTemplatePreviewAssetsService } from "./admin-template-preview-asse
|
||||
AdminTemplatePreviewService,
|
||||
AdminTemplatePreviewAssetsService,
|
||||
TemplateOperationMetricsService,
|
||||
{
|
||||
provide: CLIENT_ERROR_THROTTLE_STORE,
|
||||
useFactory: (prisma: PrismaService) => createClientErrorThrottleStore(prisma),
|
||||
inject: [PrismaService],
|
||||
},
|
||||
AdminClientErrorService,
|
||||
],
|
||||
})
|
||||
export class AdminModule {}
|
||||
@@ -0,0 +1,20 @@
|
||||
import type { PrismaService } from "../../prisma.service.js";
|
||||
import { PostgresClientErrorThrottleStore } from "./client-error-throttle.postgres.store.js";
|
||||
import {
|
||||
MemoryClientErrorThrottleStore,
|
||||
type ClientErrorThrottleStore,
|
||||
} from "./client-error-throttle.store.js";
|
||||
|
||||
export function createClientErrorThrottleStore(
|
||||
prisma: PrismaService,
|
||||
mode = process.env.CLIENT_ERROR_THROTTLE_STORE ?? "memory",
|
||||
): ClientErrorThrottleStore {
|
||||
switch (mode) {
|
||||
case "memory":
|
||||
return new MemoryClientErrorThrottleStore();
|
||||
case "postgres":
|
||||
return new PostgresClientErrorThrottleStore(prisma);
|
||||
default:
|
||||
throw new Error(`Unsupported CLIENT_ERROR_THROTTLE_STORE: ${mode}`);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,94 @@
|
||||
import { randomUUID } from "node:crypto";
|
||||
import { HttpException } from "@nestjs/common";
|
||||
import { Prisma } from "@prisma/client";
|
||||
import type { PrismaService } from "../../prisma.service.js";
|
||||
import {
|
||||
CLIENT_ERROR_DEDUPE_TTL_MS,
|
||||
CLIENT_ERROR_RATE_LIMIT,
|
||||
CLIENT_ERROR_RATE_WINDOW_MS,
|
||||
type ClientErrorThrottleReport,
|
||||
type ClientErrorThrottleResult,
|
||||
type ClientErrorThrottleStore,
|
||||
} from "./client-error-throttle.store.js";
|
||||
|
||||
/**
|
||||
* 多实例部署使用的共享存储实现。
|
||||
* 去重与限流在同一事务中执行:限流拒绝时不会留下已去重标记。
|
||||
*/
|
||||
export class PostgresClientErrorThrottleStore implements ClientErrorThrottleStore {
|
||||
private lastCleanupAt = 0;
|
||||
|
||||
constructor(private readonly prisma: PrismaService) {}
|
||||
|
||||
async record(
|
||||
report: ClientErrorThrottleReport,
|
||||
now = Date.now(),
|
||||
): Promise<ClientErrorThrottleResult> {
|
||||
const cutoff = new Date(now - CLIENT_ERROR_DEDUPE_TTL_MS);
|
||||
const windowStart = new Date(
|
||||
Math.floor(now / CLIENT_ERROR_RATE_WINDOW_MS) * CLIENT_ERROR_RATE_WINDOW_MS,
|
||||
);
|
||||
const recordedAt = new Date(now);
|
||||
let duplicate = false;
|
||||
|
||||
await this.prisma.$transaction(async (transaction) => {
|
||||
const inserted = await transaction.$queryRaw<Array<{ id: string }>>(Prisma.sql`
|
||||
INSERT INTO "ClientErrorDedupe" ("id", "subject", "errorId", "createdAt")
|
||||
VALUES (${randomUUID()}, ${report.subject}, ${report.errorId}, ${recordedAt})
|
||||
ON CONFLICT ("subject", "errorId") DO UPDATE SET
|
||||
"createdAt" = EXCLUDED."createdAt"
|
||||
WHERE "ClientErrorDedupe"."createdAt" < ${cutoff}
|
||||
RETURNING "id"
|
||||
`);
|
||||
if (!inserted.length) {
|
||||
duplicate = true;
|
||||
return;
|
||||
}
|
||||
|
||||
const rows = await transaction.$queryRaw<Array<{ count: number }>>(Prisma.sql`
|
||||
INSERT INTO "ClientErrorThrottleWindow" ("subject", "windowStart", "count", "updatedAt")
|
||||
VALUES (${report.subject}, ${windowStart}, 1, ${recordedAt})
|
||||
ON CONFLICT ("subject") DO UPDATE SET
|
||||
"count" = CASE
|
||||
WHEN EXCLUDED."windowStart" > "ClientErrorThrottleWindow"."windowStart"
|
||||
THEN 1
|
||||
WHEN EXCLUDED."windowStart" = "ClientErrorThrottleWindow"."windowStart"
|
||||
THEN LEAST("ClientErrorThrottleWindow"."count" + 1, ${CLIENT_ERROR_RATE_LIMIT + 1})
|
||||
ELSE "ClientErrorThrottleWindow"."count"
|
||||
END,
|
||||
"windowStart" = GREATEST(
|
||||
"ClientErrorThrottleWindow"."windowStart",
|
||||
EXCLUDED."windowStart"
|
||||
),
|
||||
"updatedAt" = EXCLUDED."updatedAt"
|
||||
RETURNING "count"
|
||||
`);
|
||||
if (Number(rows[0]?.count ?? 1) > CLIENT_ERROR_RATE_LIMIT) {
|
||||
throw new HttpException("客户端错误上报过于频繁,请稍后再试", 429);
|
||||
}
|
||||
});
|
||||
|
||||
await this.cleanupIfNeeded(cutoff, windowStart, now);
|
||||
return { duplicate };
|
||||
}
|
||||
|
||||
private async cleanupIfNeeded(cutoff: Date, windowStart: Date, now: number): Promise<void> {
|
||||
if (now - this.lastCleanupAt < CLIENT_ERROR_RATE_WINDOW_MS) return;
|
||||
this.lastCleanupAt = now;
|
||||
try {
|
||||
await Promise.all([
|
||||
this.prisma.clientErrorDedupe.deleteMany({ where: { createdAt: { lt: cutoff } } }),
|
||||
this.prisma.clientErrorThrottleWindow.deleteMany({
|
||||
where: {
|
||||
windowStart: {
|
||||
lt: new Date(windowStart.getTime() - CLIENT_ERROR_RATE_WINDOW_MS),
|
||||
},
|
||||
},
|
||||
}),
|
||||
]);
|
||||
} catch (error) {
|
||||
// 清理失败不能影响诊断上报本身,下一分钟会再次尝试。
|
||||
console.warn("[api] client error throttle cleanup failed", error);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
import { HttpException } from "@nestjs/common";
|
||||
|
||||
export const CLIENT_ERROR_RATE_WINDOW_MS = 60_000;
|
||||
export const CLIENT_ERROR_RATE_LIMIT = 10;
|
||||
export const CLIENT_ERROR_DEDUPE_TTL_MS = 10 * 60_000;
|
||||
export const CLIENT_ERROR_DEDUPE_CAPACITY = 500;
|
||||
export const CLIENT_ERROR_THROTTLE_STORE = Symbol("CLIENT_ERROR_THROTTLE_STORE");
|
||||
|
||||
export interface ClientErrorThrottleReport {
|
||||
subject: string;
|
||||
errorId: string;
|
||||
}
|
||||
|
||||
export interface ClientErrorThrottleResult {
|
||||
duplicate: boolean;
|
||||
}
|
||||
|
||||
export interface ClientErrorThrottleStore {
|
||||
record(report: ClientErrorThrottleReport, now?: number): Promise<ClientErrorThrottleResult>;
|
||||
}
|
||||
|
||||
/** 单实例部署使用的进程内实现;多实例必须切换为共享存储。 */
|
||||
export class MemoryClientErrorThrottleStore implements ClientErrorThrottleStore {
|
||||
private readonly recentErrorIds = new Map<string, number>();
|
||||
private readonly windows = new Map<string, number[]>();
|
||||
|
||||
record(report: ClientErrorThrottleReport, now = Date.now()): Promise<ClientErrorThrottleResult> {
|
||||
this.prune(now);
|
||||
|
||||
const dedupeKey = `${report.subject}:${report.errorId}`;
|
||||
if (this.recentErrorIds.has(dedupeKey)) return Promise.resolve({ duplicate: true });
|
||||
|
||||
this.assertWithinRate(report.subject, now);
|
||||
this.recentErrorIds.set(dedupeKey, now);
|
||||
this.trimDedupe();
|
||||
return Promise.resolve({ duplicate: false });
|
||||
}
|
||||
|
||||
private assertWithinRate(subject: string, now: number): void {
|
||||
const recent = (this.windows.get(subject) ?? []).filter(
|
||||
(timestamp) => now - timestamp < CLIENT_ERROR_RATE_WINDOW_MS,
|
||||
);
|
||||
if (recent.length >= CLIENT_ERROR_RATE_LIMIT) {
|
||||
this.windows.set(subject, recent);
|
||||
throw new HttpException("客户端错误上报过于频繁,请稍后再试", 429);
|
||||
}
|
||||
recent.push(now);
|
||||
this.windows.set(subject, recent);
|
||||
}
|
||||
|
||||
private prune(now: number): void {
|
||||
for (const [key, timestamp] of this.recentErrorIds) {
|
||||
if (now - timestamp >= CLIENT_ERROR_DEDUPE_TTL_MS) this.recentErrorIds.delete(key);
|
||||
}
|
||||
for (const [subject, timestamps] of this.windows) {
|
||||
const recent = timestamps.filter(
|
||||
(timestamp) => now - timestamp < CLIENT_ERROR_RATE_WINDOW_MS,
|
||||
);
|
||||
if (recent.length === 0) this.windows.delete(subject);
|
||||
else this.windows.set(subject, recent);
|
||||
}
|
||||
}
|
||||
|
||||
private trimDedupe(): void {
|
||||
while (this.recentErrorIds.size > CLIENT_ERROR_DEDUPE_CAPACITY) {
|
||||
const oldest = this.recentErrorIds.keys().next();
|
||||
if (oldest.done) return;
|
||||
this.recentErrorIds.delete(oldest.value);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -26,7 +26,7 @@ export function miniappApiBaseUrl(
|
||||
normalizeBaseUrl(`${normalizeBaseUrl(publicBase)}${env.MINIAPP_API_PATH ?? "/api"}`),
|
||||
);
|
||||
throw new Error(
|
||||
"未配置小程序请求地址:请在“配置与发布 → 小程序上传配置”里填写“小程序请求地址”,例如 https://wechat.app.que01.top/api",
|
||||
"未配置小程序请求地址:请在“配置与发布 → 小程序配置”里填写“小程序请求地址”,例如 https://wechat.app.que01.top/api",
|
||||
);
|
||||
}
|
||||
|
||||
@@ -53,6 +53,6 @@ export function weappAppId(storedAppId: unknown, env: NodeJS.ProcessEnv = proces
|
||||
? storedAppId.trim()
|
||||
: (env.WEAPP_APP_ID?.trim() ?? "");
|
||||
if (!candidate || candidate === "undefined" || candidate === "touristappid")
|
||||
throw new Error("未配置微信 AppID:请在“小程序上传配置”里填写或设置 WEAPP_APP_ID");
|
||||
throw new Error("未配置微信 AppID:请在“小程序配置”里填写或设置 WEAPP_APP_ID");
|
||||
return candidate;
|
||||
}
|
||||
@@ -4,7 +4,9 @@ import { AdminMembershipGuard } from "../admin-membership.guard.js";
|
||||
import { BrandReleaseApiService } from "../brand-release-api.service.js";
|
||||
import { BrandReleaseService } from "../brand-release.service.js";
|
||||
import { PrismaService } from "../prisma.service.js";
|
||||
import { TemplateWorkspaceService } from "../template-workspace.service.js";
|
||||
import { PageSchemeService } from "../template/page-scheme.service.js";
|
||||
import { TemplateInstallationService } from "../template/template-installation.service.js";
|
||||
import { TrustContentService } from "../template/trust-content.service.js";
|
||||
import { WechatAuthService } from "../wechat-auth.js";
|
||||
|
||||
@Module({
|
||||
@@ -15,7 +17,9 @@ import { WechatAuthService } from "../wechat-auth.js";
|
||||
AdminMembershipGuard,
|
||||
BrandReleaseService,
|
||||
BrandReleaseApiService,
|
||||
TemplateWorkspaceService,
|
||||
PageSchemeService,
|
||||
TemplateInstallationService,
|
||||
TrustContentService,
|
||||
],
|
||||
exports: [
|
||||
PrismaService,
|
||||
@@ -24,7 +28,9 @@ import { WechatAuthService } from "../wechat-auth.js";
|
||||
AdminMembershipGuard,
|
||||
BrandReleaseService,
|
||||
BrandReleaseApiService,
|
||||
TemplateWorkspaceService,
|
||||
PageSchemeService,
|
||||
TemplateInstallationService,
|
||||
TrustContentService,
|
||||
],
|
||||
})
|
||||
export class InfrastructureModule {}
|
||||
@@ -1,7 +1,11 @@
|
||||
import { BadRequestException, Injectable } from "@nestjs/common";
|
||||
import { PrismaService } from "../../prisma.service.js";
|
||||
import { signIdentity } from "../../auth.js";
|
||||
import type { WechatSession } from "../../wechat-auth.js";
|
||||
import {
|
||||
WechatAuthService,
|
||||
resolveWechatLoginCredentials,
|
||||
type WechatSession,
|
||||
} from "../../wechat-auth.js";
|
||||
import { PublicBrandContextService } from "../public/public-brand-context.service.js";
|
||||
|
||||
@Injectable()
|
||||
@@ -9,15 +13,18 @@ export class CustomerSessionService {
|
||||
constructor(
|
||||
private readonly prisma: PrismaService,
|
||||
private readonly brandContext: PublicBrandContextService,
|
||||
private readonly wechatAuth: WechatAuthService,
|
||||
) {}
|
||||
|
||||
async loginWithWechat(session: WechatSession, brandSlug?: string): Promise<{ token: string }> {
|
||||
async loginWithWechat(code: string, brandSlug?: string): Promise<{ token: string }> {
|
||||
const brandId = await this.brandContext.resolveId(brandSlug);
|
||||
const brand = await this.prisma.brandProfile.findUnique({
|
||||
where: { id: brandId },
|
||||
select: { id: true },
|
||||
select: { id: true, miniAppSettings: true },
|
||||
});
|
||||
if (!brand) throw new BadRequestException("品牌尚未初始化");
|
||||
const credentials = resolveWechatLoginCredentials(brand.miniAppSettings);
|
||||
const session: WechatSession = await this.wechatAuth.exchangeCode(code, credentials);
|
||||
const customer = await this.prisma.customerUser.upsert({
|
||||
where: { brandId_openid: { brandId: brand.id, openid: session.openid } },
|
||||
update: { lastLoginAt: new Date() },
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { Body, Controller, Get, Post, Query, Req, Res } from "@nestjs/common";
|
||||
import type { FastifyReply, FastifyRequest } from "fastify";
|
||||
import { WechatAuthService } from "../../wechat-auth.js";
|
||||
import { AdminPublic, AdminTokenOnly } from "../../admin-auth.decorators.js";
|
||||
import { clearAdminSessionCookie, setAdminSessionCookie } from "../../admin-session-cookie.js";
|
||||
import { AdminAuthService } from "../../admin-auth.service.js";
|
||||
@@ -11,18 +10,14 @@ import { ChangeAdminPasswordDto } from "../../admin.dto.js";
|
||||
|
||||
@Controller("customer/session")
|
||||
export class CustomerSessionController {
|
||||
constructor(
|
||||
private readonly wechatAuth: WechatAuthService,
|
||||
private readonly sessions: CustomerSessionService,
|
||||
) {}
|
||||
constructor(private readonly sessions: CustomerSessionService) {}
|
||||
|
||||
@Post("wechat")
|
||||
async wechatLogin(
|
||||
@Body() body: WechatLoginDto,
|
||||
@Query("brandSlug") brandSlug?: string,
|
||||
): Promise<{ token: string }> {
|
||||
const session = await this.wechatAuth.exchangeCode(body.code);
|
||||
return this.sessions.loginWithWechat(session, brandSlug);
|
||||
return this.sessions.loginWithWechat(body.code, brandSlug);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,8 @@ import type {
|
||||
CreateBrandMemberDto,
|
||||
UpdateBrandMemberDto,
|
||||
} from "../../admin.dto.js";
|
||||
import { TemplateWorkspaceService } from "../../template-workspace.service.js";
|
||||
import { PageSchemeService } from "../../template/page-scheme.service.js";
|
||||
import { TemplateInstallationService } from "../../template/template-installation.service.js";
|
||||
|
||||
type AdminIdentity = { subject: string; brandId: string; tokenVersion?: number };
|
||||
|
||||
@@ -22,11 +23,12 @@ type AdminIdentity = { subject: string; brandId: string; tokenVersion?: number }
|
||||
export class TenantService {
|
||||
constructor(
|
||||
private readonly prisma: PrismaService,
|
||||
private readonly templateWorkspace: TemplateWorkspaceService,
|
||||
private readonly pageSchemes: PageSchemeService,
|
||||
private readonly templateInstallations: TemplateInstallationService,
|
||||
) {}
|
||||
|
||||
async getCreationOptions() {
|
||||
const catalog = await this.templateWorkspace.getPageSchemeCatalog();
|
||||
const catalog = await this.pageSchemes.getPageSchemeCatalog();
|
||||
// 创建品牌只应从每个页面方案的最新已发布版本开始;旧版本仍可在页面方案页显式切换。
|
||||
return {
|
||||
...catalog,
|
||||
@@ -40,7 +42,7 @@ export class TenantService {
|
||||
const name = body.name.trim();
|
||||
const slug = body.slug.trim();
|
||||
if (!name || !slug) throw new BadRequestException("品牌名称和小程序地址标识不能为空");
|
||||
const packageVersion = await this.templateWorkspace.resolveInstallablePackageVersion(
|
||||
const packageVersion = await this.templateInstallations.resolveInstallablePackageVersion(
|
||||
body.businessType,
|
||||
body.templatePackageVersionId,
|
||||
);
|
||||
|
||||
@@ -2,24 +2,28 @@ import { AdminBrand, AdminRoles } from "../../admin-auth.decorators.js";
|
||||
import { Body, Controller, Get, Post, Req } from "@nestjs/common";
|
||||
import type { FastifyRequest } from "fastify";
|
||||
import { RollbackTemplateDto, UpgradeTemplateDto } from "../../admin.dto.js";
|
||||
import { TemplateWorkspaceService } from "../../template-workspace.service.js";
|
||||
import { PageSchemeService } from "../../template/page-scheme.service.js";
|
||||
import { TemplateInstallationService } from "../../template/template-installation.service.js";
|
||||
import { requireAdminIdentity } from "../../admin-access.identity.js";
|
||||
|
||||
@AdminBrand()
|
||||
@Controller("admin/workspace")
|
||||
class AdminTemplateController {
|
||||
constructor(private readonly templateWorkspace: TemplateWorkspaceService) {}
|
||||
constructor(
|
||||
private readonly pageSchemes: PageSchemeService,
|
||||
private readonly templateInstallations: TemplateInstallationService,
|
||||
) {}
|
||||
|
||||
@AdminRoles(["owner", "admin", "platform-admin"])
|
||||
@Get("template/options")
|
||||
options(@Req() request: FastifyRequest): Promise<unknown> {
|
||||
return this.templateWorkspace.getPageSchemeOptions(requireAdminIdentity(request).brandId);
|
||||
return this.pageSchemes.getPageSchemeOptions(requireAdminIdentity(request).brandId);
|
||||
}
|
||||
|
||||
@AdminRoles(["owner", "admin", "platform-admin"])
|
||||
@Get("template/preview")
|
||||
preview(@Req() request: FastifyRequest): Promise<unknown> {
|
||||
return this.templateWorkspace.preview(requireAdminIdentity(request).brandId);
|
||||
return this.templateInstallations.preview(requireAdminIdentity(request).brandId);
|
||||
}
|
||||
|
||||
@AdminRoles(["owner", "admin", "platform-admin"])
|
||||
@@ -30,7 +34,7 @@ class AdminTemplateController {
|
||||
): Promise<unknown> {
|
||||
const identity = requireAdminIdentity(request);
|
||||
const requestId = request.headers["x-request-id"]?.toString() ?? request.id;
|
||||
return this.templateWorkspace.upgrade(identity.brandId, body, identity.subject, requestId);
|
||||
return this.templateInstallations.upgrade(identity.brandId, body, identity.subject, requestId);
|
||||
}
|
||||
|
||||
@AdminRoles(["owner", "admin", "platform-admin"])
|
||||
@@ -41,7 +45,7 @@ class AdminTemplateController {
|
||||
): Promise<unknown> {
|
||||
const identity = requireAdminIdentity(request);
|
||||
const requestId = request.headers["x-request-id"]?.toString() ?? request.id;
|
||||
return this.templateWorkspace.rollback(identity.brandId, identity.subject, body, requestId);
|
||||
return this.templateInstallations.rollback(identity.brandId, identity.subject, body, requestId);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8,19 +8,19 @@ import {
|
||||
validateCapabilityConfig,
|
||||
} from "@personal-brand/config";
|
||||
import { PrismaService } from "../../prisma.service.js";
|
||||
import { TemplateWorkspaceService } from "../../template-workspace.service.js";
|
||||
import { TemplateInstallationService } from "../../template/template-installation.service.js";
|
||||
import type { UpdateCapabilityInstallationDto } from "../../admin.dto.js";
|
||||
|
||||
@Injectable()
|
||||
export class AdminWorkspaceCapabilitiesService {
|
||||
constructor(
|
||||
private readonly prisma: PrismaService,
|
||||
private readonly templateWorkspace: TemplateWorkspaceService,
|
||||
private readonly templateInstallations: TemplateInstallationService,
|
||||
) {}
|
||||
|
||||
async list(brandId: string) {
|
||||
const [templateKey, installations] = await Promise.all([
|
||||
this.templateWorkspace.getEffectiveTemplateKey(brandId),
|
||||
this.templateInstallations.getEffectiveTemplateKey(brandId),
|
||||
this.prisma.capabilityInstallation.findMany({ where: { brandId } }),
|
||||
]);
|
||||
const installed = new Map(installations.map((item) => [item.capabilityKey, item]));
|
||||
@@ -54,7 +54,7 @@ export class AdminWorkspaceCapabilitiesService {
|
||||
body: UpdateCapabilityInstallationDto,
|
||||
) {
|
||||
const template = getBrandTemplate(
|
||||
await this.templateWorkspace.getEffectiveTemplateKey(brandId),
|
||||
await this.templateInstallations.getEffectiveTemplateKey(brandId),
|
||||
);
|
||||
if (!template?.capabilities.includes(key as never) && !(key in capabilityPlugins))
|
||||
throw new BadRequestException("能力未被当前模板声明");
|
||||
|
||||
@@ -2,7 +2,7 @@ import { AdminBrand, AdminRoles } from "../../admin-auth.decorators.js";
|
||||
import { Controller, Get, Post, Body, Req } from "@nestjs/common";
|
||||
import type { FastifyRequest } from "fastify";
|
||||
import { InstallTemplateDto, SelectTemplateVersionDto } from "../../admin.dto.js";
|
||||
import { TemplateWorkspaceService } from "../../template-workspace.service.js";
|
||||
import { TemplateInstallationService } from "../../template/template-installation.service.js";
|
||||
import { requireAdminIdentity } from "../../admin-access.identity.js";
|
||||
import { AdminWorkspaceService } from "./admin-workspace.service.js";
|
||||
|
||||
@@ -11,7 +11,7 @@ import { AdminWorkspaceService } from "./admin-workspace.service.js";
|
||||
class AdminWorkspacePreviewController {
|
||||
constructor(
|
||||
private readonly workspaceService: AdminWorkspaceService,
|
||||
private readonly templateWorkspace: TemplateWorkspaceService,
|
||||
private readonly templateInstallations: TemplateInstallationService,
|
||||
) {}
|
||||
|
||||
@Get()
|
||||
@@ -32,7 +32,7 @@ class AdminWorkspacePreviewController {
|
||||
): Promise<unknown> {
|
||||
const identity = requireAdminIdentity(request);
|
||||
const requestId = request.headers["x-request-id"]?.toString() ?? request.id;
|
||||
return this.templateWorkspace.install(
|
||||
return this.templateInstallations.install(
|
||||
identity.brandId,
|
||||
body.templateKey,
|
||||
body.templatePackageVersionId,
|
||||
@@ -49,7 +49,7 @@ class AdminWorkspacePreviewController {
|
||||
): Promise<unknown> {
|
||||
const identity = requireAdminIdentity(request);
|
||||
const requestId = request.headers["x-request-id"]?.toString() ?? request.id;
|
||||
return this.templateWorkspace.selectVersion(
|
||||
return this.templateInstallations.selectVersion(
|
||||
identity.brandId,
|
||||
body,
|
||||
identity.subject,
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
const PLACEHOLDER_PATTERN = /(replace-with|change-me|changeme|^your[-_ ]|example|placeholder)/i;
|
||||
|
||||
/** 判断值是否仍是仓库示例中的占位符,而不是真实随机密钥。 */
|
||||
export function isPlaceholderSecret(value: string): boolean {
|
||||
return PLACEHOLDER_PATTERN.test(value.trim());
|
||||
}
|
||||
|
||||
/**
|
||||
* 生产环境启动前的快速失败校验。
|
||||
* 本地开发允许占位符,避免示例 `.env` 阻塞调试;生产环境必须使用真实随机值。
|
||||
*/
|
||||
export function assertProductionSecret(
|
||||
value: string | undefined,
|
||||
nodeEnv: string | undefined = process.env.NODE_ENV,
|
||||
): void {
|
||||
if (nodeEnv !== "production") return;
|
||||
const secret = value?.trim() ?? "";
|
||||
if (secret.length < 32) throw new Error("SESSION_SECRET 必须是至少 32 位的随机值");
|
||||
if (isPlaceholderSecret(secret)) throw new Error("SESSION_SECRET 不能使用示例占位符");
|
||||
}
|
||||
@@ -0,0 +1,114 @@
|
||||
import type { TemplatePackageVersion } from "@prisma/client";
|
||||
|
||||
export function record(value: unknown): Record<string, unknown> {
|
||||
return value && typeof value === "object" && !Array.isArray(value)
|
||||
? (value as Record<string, unknown>)
|
||||
: {};
|
||||
}
|
||||
|
||||
export function manifestRecords(value: unknown): Record<string, unknown>[] {
|
||||
return Array.isArray(value)
|
||||
? value.filter((item): item is Record<string, unknown> =>
|
||||
Boolean(item && typeof item === "object" && !Array.isArray(item)),
|
||||
)
|
||||
: [];
|
||||
}
|
||||
|
||||
export function stringList(value: unknown): string[] {
|
||||
return Array.isArray(value)
|
||||
? value.filter((item): item is string => typeof item === "string")
|
||||
: [];
|
||||
}
|
||||
|
||||
export function hasBindingValue(config: Record<string, unknown>, binding: unknown): boolean {
|
||||
if (typeof binding !== "string" || !binding.startsWith("brand.config.")) return false;
|
||||
const value = binding
|
||||
.slice("brand.config.".length)
|
||||
.split(".")
|
||||
.reduce<unknown>((current, key) => record(current)[key], config);
|
||||
return value !== undefined && value !== null && value !== "";
|
||||
}
|
||||
|
||||
export function compareRecords(current: Record<string, unknown>, target: Record<string, unknown>) {
|
||||
const currentKeys = Object.keys(current);
|
||||
const targetKeys = Object.keys(target);
|
||||
return {
|
||||
added: targetKeys
|
||||
.filter((key) => !(key in current))
|
||||
.map((key) => ({ key, target: target[key] })),
|
||||
removed: currentKeys
|
||||
.filter((key) => !(key in target))
|
||||
.map((key) => ({ key, current: current[key] })),
|
||||
changed: targetKeys
|
||||
.filter(
|
||||
(key) => key in current && JSON.stringify(current[key]) !== JSON.stringify(target[key]),
|
||||
)
|
||||
.map((key) => ({ key, current: current[key], target: target[key] })),
|
||||
};
|
||||
}
|
||||
|
||||
export function compareKeyedRecords(
|
||||
current: Record<string, unknown>[],
|
||||
target: Record<string, unknown>[],
|
||||
) {
|
||||
const currentByKey = new Map(
|
||||
current
|
||||
.filter((item) => typeof item.key === "string")
|
||||
.map((item) => [item.key as string, item]),
|
||||
);
|
||||
const targetByKey = new Map(
|
||||
target.filter((item) => typeof item.key === "string").map((item) => [item.key as string, item]),
|
||||
);
|
||||
return {
|
||||
added: [...targetByKey].filter(([key]) => !currentByKey.has(key)).map(([, item]) => item),
|
||||
removed: [...currentByKey].filter(([key]) => !targetByKey.has(key)).map(([, item]) => item),
|
||||
changed: [...targetByKey].flatMap(([key, item]) => {
|
||||
const previous = currentByKey.get(key);
|
||||
return previous && JSON.stringify(previous) !== JSON.stringify(item)
|
||||
? [{ key, current: previous, target: item }]
|
||||
: [];
|
||||
}),
|
||||
};
|
||||
}
|
||||
|
||||
export function compareFiles(
|
||||
current: Record<string, unknown>[],
|
||||
target: Record<string, unknown>[],
|
||||
) {
|
||||
const currentByPath = new Map(
|
||||
current
|
||||
.filter((item) => typeof item.path === "string")
|
||||
.map((item) => [item.path as string, item]),
|
||||
);
|
||||
const targetByPath = new Map(
|
||||
target
|
||||
.filter((item) => typeof item.path === "string")
|
||||
.map((item) => [item.path as string, item]),
|
||||
);
|
||||
const available = currentByPath.size > 0 && targetByPath.size > 0;
|
||||
return {
|
||||
available,
|
||||
...(available
|
||||
? {
|
||||
added: [...targetByPath]
|
||||
.filter(([path]) => !currentByPath.has(path))
|
||||
.map(([, item]) => item),
|
||||
removed: [...currentByPath]
|
||||
.filter(([path]) => !targetByPath.has(path))
|
||||
.map(([, item]) => item),
|
||||
changed: [...targetByPath].flatMap(([path, item]) => {
|
||||
const previous = currentByPath.get(path);
|
||||
return previous && previous.sha256 !== item.sha256
|
||||
? [{ path, current: previous, target: item }]
|
||||
: [];
|
||||
}),
|
||||
}
|
||||
: { reason: "版本验证报告未包含完整文件清单" }),
|
||||
};
|
||||
}
|
||||
|
||||
export function readPackageFiles(
|
||||
version: Pick<TemplatePackageVersion, "validationReport">,
|
||||
): Record<string, unknown>[] {
|
||||
return manifestRecords(record(version.validationReport).files);
|
||||
}
|
||||
@@ -0,0 +1,105 @@
|
||||
import { BadRequestException, Injectable } from "@nestjs/common";
|
||||
import {
|
||||
type BrandTemplateKey,
|
||||
brandTemplateKeys,
|
||||
getBrandTemplate,
|
||||
getVisualTemplate,
|
||||
getVisualTemplateManifest,
|
||||
isVisualTemplateCompatible,
|
||||
validateTemplatePackageManifest,
|
||||
} from "@personal-brand/config";
|
||||
import { PrismaService } from "../prisma.service.js";
|
||||
import { compareTemplateVersions } from "../template-version-order.js";
|
||||
import { record } from "./manifest-diff.helpers.js";
|
||||
|
||||
@Injectable()
|
||||
export class PageSchemeService {
|
||||
constructor(private readonly prisma: PrismaService) {}
|
||||
|
||||
async getPageSchemeCatalog() {
|
||||
const versions = await this.prisma.templatePackageVersion.findMany({
|
||||
where: { status: "published" },
|
||||
orderBy: [{ importedAt: "desc" }, { createdAt: "desc" }],
|
||||
});
|
||||
const candidates = versions.flatMap((version) => {
|
||||
const manifest = record(version.manifestSnapshot);
|
||||
const visualTemplateKey = manifest.visualTemplateKey;
|
||||
if (
|
||||
manifest.packageKey !== version.packageKey ||
|
||||
manifest.version !== version.version ||
|
||||
typeof visualTemplateKey !== "string" ||
|
||||
visualTemplateKey !== version.packageKey
|
||||
)
|
||||
return [];
|
||||
const visualTemplate = getVisualTemplate(visualTemplateKey);
|
||||
const visualManifest = getVisualTemplateManifest(visualTemplateKey);
|
||||
if (!visualTemplate || !visualManifest) return [];
|
||||
const supportedBusinessTypes = Array.isArray(manifest.supportedIndustryTemplates)
|
||||
? manifest.supportedIndustryTemplates.filter(
|
||||
(value): value is BrandTemplateKey =>
|
||||
typeof value === "string" &&
|
||||
brandTemplateKeys.includes(value) &&
|
||||
Boolean(getBrandTemplate(value)),
|
||||
)
|
||||
: [];
|
||||
if (
|
||||
supportedBusinessTypes.length === 0 ||
|
||||
supportedBusinessTypes.some(
|
||||
(businessType) => !isVisualTemplateCompatible(visualTemplate, businessType),
|
||||
) ||
|
||||
validateTemplatePackageManifest(manifest).length > 0
|
||||
)
|
||||
return [];
|
||||
return [
|
||||
{
|
||||
templatePackageVersionId: version.id,
|
||||
packageKey: version.packageKey,
|
||||
name: version.displayName,
|
||||
description: visualManifest.description,
|
||||
version: version.version,
|
||||
supportedBusinessTypes,
|
||||
},
|
||||
];
|
||||
});
|
||||
const latestByPackage = new Map<string, string>();
|
||||
for (const candidate of candidates) {
|
||||
const latestVersion = latestByPackage.get(candidate.packageKey);
|
||||
if (!latestVersion || compareTemplateVersions(candidate.version, latestVersion) > 0) {
|
||||
latestByPackage.set(candidate.packageKey, candidate.version);
|
||||
}
|
||||
}
|
||||
const pageSchemes = candidates.map(({ packageKey, ...candidate }) => ({
|
||||
...candidate,
|
||||
isLatestForPackage: latestByPackage.get(packageKey) === candidate.version,
|
||||
}));
|
||||
|
||||
return {
|
||||
businesses: brandTemplateKeys.map((key) => {
|
||||
const template = getBrandTemplate(key);
|
||||
if (!template) throw new BadRequestException("业务类型配置不完整");
|
||||
return { key, name: template.name, description: template.description };
|
||||
}),
|
||||
pageSchemes,
|
||||
};
|
||||
}
|
||||
|
||||
async getPageSchemeOptions(brandId: string) {
|
||||
const brand = await this.prisma.brandProfile.findUnique({
|
||||
where: { id: brandId },
|
||||
select: { templateKey: true },
|
||||
});
|
||||
const template = brand ? getBrandTemplate(brand.templateKey) : undefined;
|
||||
if (!brand || !template) throw new BadRequestException("品牌业务类型无效");
|
||||
const catalog = await this.getPageSchemeCatalog();
|
||||
return {
|
||||
business: {
|
||||
key: template.key,
|
||||
name: template.name,
|
||||
description: template.description,
|
||||
},
|
||||
pageSchemes: catalog.pageSchemes.filter((scheme) =>
|
||||
scheme.supportedBusinessTypes.includes(template.key),
|
||||
),
|
||||
};
|
||||
}
|
||||
}
|
||||
+15
-258
@@ -3,7 +3,6 @@ import type { TemplatePackageVersion } from "@prisma/client";
|
||||
import { Prisma } from "@prisma/client";
|
||||
import {
|
||||
type BrandTemplateKey,
|
||||
brandTemplateKeys,
|
||||
getBrandTemplate,
|
||||
getVisualTemplate,
|
||||
getVisualTemplateManifest,
|
||||
@@ -11,157 +10,25 @@ import {
|
||||
validateTemplatePackageManifest,
|
||||
} from "@personal-brand/config";
|
||||
import type { TemplatePackageManifest } from "@personal-brand/config";
|
||||
import type { CreateTrustContentDto, UpdateTrustContentDto } from "./admin.dto.js";
|
||||
import type { RollbackTemplateDto, UpgradeTemplateDto } from "./admin.dto.js";
|
||||
import { PrismaService } from "./prisma.service.js";
|
||||
import { recordTemplateOperationFailure } from "./modules/admin/template-operation-failure.js";
|
||||
import { compareTemplateVersions, latestTemplateVersion } from "./template-version-order.js";
|
||||
import type { RollbackTemplateDto, UpgradeTemplateDto } from "../admin.dto.js";
|
||||
import { PrismaService } from "../prisma.service.js";
|
||||
import { recordTemplateOperationFailure } from "../modules/admin/template-operation-failure.js";
|
||||
import { latestTemplateVersion } from "../template-version-order.js";
|
||||
import {
|
||||
compareFiles,
|
||||
compareKeyedRecords,
|
||||
compareRecords,
|
||||
hasBindingValue,
|
||||
manifestRecords,
|
||||
readPackageFiles,
|
||||
record,
|
||||
stringList,
|
||||
} from "./manifest-diff.helpers.js";
|
||||
|
||||
@Injectable()
|
||||
export class TemplateWorkspaceService {
|
||||
export class TemplateInstallationService {
|
||||
constructor(private readonly prisma: PrismaService) {}
|
||||
|
||||
async getPageSchemeCatalog() {
|
||||
const versions = await this.prisma.templatePackageVersion.findMany({
|
||||
where: { status: "published" },
|
||||
orderBy: [{ importedAt: "desc" }, { createdAt: "desc" }],
|
||||
});
|
||||
const candidates = versions.flatMap((version) => {
|
||||
const manifest = record(version.manifestSnapshot);
|
||||
const visualTemplateKey = manifest.visualTemplateKey;
|
||||
if (
|
||||
manifest.packageKey !== version.packageKey ||
|
||||
manifest.version !== version.version ||
|
||||
typeof visualTemplateKey !== "string" ||
|
||||
visualTemplateKey !== version.packageKey
|
||||
)
|
||||
return [];
|
||||
const visualTemplate = getVisualTemplate(visualTemplateKey);
|
||||
const visualManifest = getVisualTemplateManifest(visualTemplateKey);
|
||||
if (!visualTemplate || !visualManifest) return [];
|
||||
const supportedBusinessTypes = Array.isArray(manifest.supportedIndustryTemplates)
|
||||
? manifest.supportedIndustryTemplates.filter(
|
||||
(value): value is BrandTemplateKey =>
|
||||
typeof value === "string" &&
|
||||
brandTemplateKeys.includes(value) &&
|
||||
Boolean(getBrandTemplate(value)),
|
||||
)
|
||||
: [];
|
||||
if (
|
||||
supportedBusinessTypes.length === 0 ||
|
||||
supportedBusinessTypes.some(
|
||||
(businessType) => !isVisualTemplateCompatible(visualTemplate, businessType),
|
||||
) ||
|
||||
validateTemplatePackageManifest(manifest).length > 0
|
||||
)
|
||||
return [];
|
||||
return [
|
||||
{
|
||||
templatePackageVersionId: version.id,
|
||||
packageKey: version.packageKey,
|
||||
name: version.displayName,
|
||||
description: visualManifest.description,
|
||||
version: version.version,
|
||||
supportedBusinessTypes,
|
||||
},
|
||||
];
|
||||
});
|
||||
const latestByPackage = new Map<string, string>();
|
||||
for (const candidate of candidates) {
|
||||
const latestVersion = latestByPackage.get(candidate.packageKey);
|
||||
if (!latestVersion || compareTemplateVersions(candidate.version, latestVersion) > 0) {
|
||||
latestByPackage.set(candidate.packageKey, candidate.version);
|
||||
}
|
||||
}
|
||||
const pageSchemes = candidates.map(({ packageKey, ...candidate }) => ({
|
||||
...candidate,
|
||||
isLatestForPackage: latestByPackage.get(packageKey) === candidate.version,
|
||||
}));
|
||||
|
||||
return {
|
||||
businesses: brandTemplateKeys.map((key) => {
|
||||
const template = getBrandTemplate(key);
|
||||
if (!template) throw new BadRequestException("业务类型配置不完整");
|
||||
return { key, name: template.name, description: template.description };
|
||||
}),
|
||||
pageSchemes,
|
||||
};
|
||||
}
|
||||
|
||||
async getPageSchemeOptions(brandId: string) {
|
||||
const brand = await this.prisma.brandProfile.findUnique({
|
||||
where: { id: brandId },
|
||||
select: { templateKey: true },
|
||||
});
|
||||
const template = brand ? getBrandTemplate(brand.templateKey) : undefined;
|
||||
if (!brand || !template) throw new BadRequestException("品牌业务类型无效");
|
||||
const catalog = await this.getPageSchemeCatalog();
|
||||
return {
|
||||
business: {
|
||||
key: template.key,
|
||||
name: template.name,
|
||||
description: template.description,
|
||||
},
|
||||
pageSchemes: catalog.pageSchemes.filter((scheme) =>
|
||||
scheme.supportedBusinessTypes.includes(template.key),
|
||||
),
|
||||
};
|
||||
}
|
||||
|
||||
async getTrustContentTypes(brandId: string): Promise<string[]> {
|
||||
const installation = await this.prisma.brandTemplateInstallation.findUnique({
|
||||
where: { brandId },
|
||||
include: { templatePackageVersion: true },
|
||||
});
|
||||
if (!installation?.templatePackageVersion)
|
||||
throw new BadRequestException("品牌没有锁定精确视觉模板包版本");
|
||||
const manifest = record(
|
||||
installation.templatePackageVersion.manifestSnapshot,
|
||||
) as unknown as TemplatePackageManifest;
|
||||
if (validateTemplatePackageManifest(manifest).length)
|
||||
throw new BadRequestException("当前安装的模板包不符合统一模板契约");
|
||||
return manifest.trustContentTypes?.map((item) => item.type) ?? [];
|
||||
}
|
||||
async createTrustContent(brandId: string, body: CreateTrustContentDto) {
|
||||
if (!(await this.getTrustContentTypes(brandId)).includes(body.type))
|
||||
throw new BadRequestException("当前模板不支持此信任内容类型");
|
||||
const { config, ...fields } = body;
|
||||
return this.prisma.trustContent.create({
|
||||
data: {
|
||||
...fields,
|
||||
brandId,
|
||||
...(config === undefined ? {} : { config: config as Prisma.InputJsonValue }),
|
||||
},
|
||||
});
|
||||
}
|
||||
async updateTrustContent(brandId: string, id: string, body: UpdateTrustContentDto) {
|
||||
const item = await this.prisma.trustContent.findFirst({ where: { id, brandId } });
|
||||
if (!item) throw new BadRequestException("信任内容不存在");
|
||||
if (body.type !== undefined && !(await this.getTrustContentTypes(brandId)).includes(body.type))
|
||||
throw new BadRequestException("当前模板不支持此信任内容类型");
|
||||
const { config, ...fields } = body;
|
||||
return this.prisma.trustContent.update({
|
||||
where: { id },
|
||||
data: {
|
||||
...fields,
|
||||
...(config === undefined ? {} : { config: config as Prisma.InputJsonValue }),
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
listTrustContent(brandId: string) {
|
||||
return this.prisma.trustContent.findMany({
|
||||
where: { brandId },
|
||||
orderBy: [{ type: "asc" }, { sortOrder: "asc" }],
|
||||
});
|
||||
}
|
||||
|
||||
async deleteTrustContent(brandId: string, id: string) {
|
||||
const item = await this.prisma.trustContent.findFirst({ where: { id, brandId } });
|
||||
if (!item) throw new BadRequestException("信任内容不存在");
|
||||
await this.prisma.trustContent.delete({ where: { id } });
|
||||
return { deleted: true };
|
||||
}
|
||||
async getEffectiveTemplateKey(brandId: string): Promise<BrandTemplateKey> {
|
||||
const [brand, installation] = await Promise.all([
|
||||
this.prisma.brandProfile.findUnique({
|
||||
@@ -759,113 +626,3 @@ export class TemplateWorkspaceService {
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
function readPackageFiles(
|
||||
version: Pick<TemplatePackageVersion, "validationReport">,
|
||||
): Record<string, unknown>[] {
|
||||
return manifestRecords(record(version.validationReport).files);
|
||||
}
|
||||
|
||||
function record(value: unknown): Record<string, unknown> {
|
||||
return value && typeof value === "object" && !Array.isArray(value)
|
||||
? (value as Record<string, unknown>)
|
||||
: {};
|
||||
}
|
||||
|
||||
function manifestRecords(value: unknown): Record<string, unknown>[] {
|
||||
return Array.isArray(value)
|
||||
? value.filter((item): item is Record<string, unknown> =>
|
||||
Boolean(item && typeof item === "object" && !Array.isArray(item)),
|
||||
)
|
||||
: [];
|
||||
}
|
||||
|
||||
function stringList(value: unknown): string[] {
|
||||
return Array.isArray(value)
|
||||
? value.filter((item): item is string => typeof item === "string")
|
||||
: [];
|
||||
}
|
||||
|
||||
function hasBindingValue(config: Record<string, unknown>, binding: unknown): boolean {
|
||||
if (typeof binding !== "string" || !binding.startsWith("brand.config.")) return false;
|
||||
const value = binding
|
||||
.slice("brand.config.".length)
|
||||
.split(".")
|
||||
.reduce<unknown>((current, key) => record(current)[key], config);
|
||||
return value !== undefined && value !== null && value !== "";
|
||||
}
|
||||
|
||||
function compareRecords(current: Record<string, unknown>, target: Record<string, unknown>) {
|
||||
const currentKeys = Object.keys(current);
|
||||
const targetKeys = Object.keys(target);
|
||||
return {
|
||||
added: targetKeys
|
||||
.filter((key) => !(key in current))
|
||||
.map((key) => ({ key, target: target[key] })),
|
||||
removed: currentKeys
|
||||
.filter((key) => !(key in target))
|
||||
.map((key) => ({ key, current: current[key] })),
|
||||
changed: targetKeys
|
||||
.filter(
|
||||
(key) => key in current && JSON.stringify(current[key]) !== JSON.stringify(target[key]),
|
||||
)
|
||||
.map((key) => ({ key, current: current[key], target: target[key] })),
|
||||
};
|
||||
}
|
||||
|
||||
function compareKeyedRecords(
|
||||
current: Record<string, unknown>[],
|
||||
target: Record<string, unknown>[],
|
||||
) {
|
||||
const currentByKey = new Map(
|
||||
current
|
||||
.filter((item) => typeof item.key === "string")
|
||||
.map((item) => [item.key as string, item]),
|
||||
);
|
||||
const targetByKey = new Map(
|
||||
target.filter((item) => typeof item.key === "string").map((item) => [item.key as string, item]),
|
||||
);
|
||||
return {
|
||||
added: [...targetByKey].filter(([key]) => !currentByKey.has(key)).map(([, item]) => item),
|
||||
removed: [...currentByKey].filter(([key]) => !targetByKey.has(key)).map(([, item]) => item),
|
||||
changed: [...targetByKey].flatMap(([key, item]) => {
|
||||
const previous = currentByKey.get(key);
|
||||
return previous && JSON.stringify(previous) !== JSON.stringify(item)
|
||||
? [{ key, current: previous, target: item }]
|
||||
: [];
|
||||
}),
|
||||
};
|
||||
}
|
||||
|
||||
function compareFiles(current: Record<string, unknown>[], target: Record<string, unknown>[]) {
|
||||
const currentByPath = new Map(
|
||||
current
|
||||
.filter((item) => typeof item.path === "string")
|
||||
.map((item) => [item.path as string, item]),
|
||||
);
|
||||
const targetByPath = new Map(
|
||||
target
|
||||
.filter((item) => typeof item.path === "string")
|
||||
.map((item) => [item.path as string, item]),
|
||||
);
|
||||
const available = currentByPath.size > 0 && targetByPath.size > 0;
|
||||
return {
|
||||
available,
|
||||
...(available
|
||||
? {
|
||||
added: [...targetByPath]
|
||||
.filter(([path]) => !currentByPath.has(path))
|
||||
.map(([, item]) => item),
|
||||
removed: [...currentByPath]
|
||||
.filter(([path]) => !targetByPath.has(path))
|
||||
.map(([, item]) => item),
|
||||
changed: [...targetByPath].flatMap(([path, item]) => {
|
||||
const previous = currentByPath.get(path);
|
||||
return previous && previous.sha256 !== item.sha256
|
||||
? [{ path, current: previous, target: item }]
|
||||
: [];
|
||||
}),
|
||||
}
|
||||
: { reason: "版本验证报告未包含完整文件清单" }),
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
import { BadRequestException, Injectable } from "@nestjs/common";
|
||||
import { Prisma } from "@prisma/client";
|
||||
import { validateTemplatePackageManifest } from "@personal-brand/config";
|
||||
import type { TemplatePackageManifest } from "@personal-brand/config";
|
||||
import type { CreateTrustContentDto, UpdateTrustContentDto } from "../admin.dto.js";
|
||||
import { PrismaService } from "../prisma.service.js";
|
||||
import { record } from "./manifest-diff.helpers.js";
|
||||
|
||||
@Injectable()
|
||||
export class TrustContentService {
|
||||
constructor(private readonly prisma: PrismaService) {}
|
||||
|
||||
async getTrustContentTypes(brandId: string): Promise<string[]> {
|
||||
const installation = await this.prisma.brandTemplateInstallation.findUnique({
|
||||
where: { brandId },
|
||||
include: { templatePackageVersion: true },
|
||||
});
|
||||
if (!installation?.templatePackageVersion)
|
||||
throw new BadRequestException("品牌没有锁定精确视觉模板包版本");
|
||||
const manifest = record(
|
||||
installation.templatePackageVersion.manifestSnapshot,
|
||||
) as unknown as TemplatePackageManifest;
|
||||
if (validateTemplatePackageManifest(manifest).length)
|
||||
throw new BadRequestException("当前安装的模板包不符合统一模板契约");
|
||||
return manifest.trustContentTypes?.map((item) => item.type) ?? [];
|
||||
}
|
||||
|
||||
async createTrustContent(brandId: string, body: CreateTrustContentDto) {
|
||||
if (!(await this.getTrustContentTypes(brandId)).includes(body.type))
|
||||
throw new BadRequestException("当前模板不支持此信任内容类型");
|
||||
const { config, ...fields } = body;
|
||||
return this.prisma.trustContent.create({
|
||||
data: {
|
||||
...fields,
|
||||
brandId,
|
||||
...(config === undefined ? {} : { config: config as Prisma.InputJsonValue }),
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
async updateTrustContent(brandId: string, id: string, body: UpdateTrustContentDto) {
|
||||
const item = await this.prisma.trustContent.findFirst({ where: { id, brandId } });
|
||||
if (!item) throw new BadRequestException("信任内容不存在");
|
||||
if (body.type !== undefined && !(await this.getTrustContentTypes(brandId)).includes(body.type))
|
||||
throw new BadRequestException("当前模板不支持此信任内容类型");
|
||||
const { config, ...fields } = body;
|
||||
return this.prisma.trustContent.update({
|
||||
where: { id },
|
||||
data: {
|
||||
...fields,
|
||||
...(config === undefined ? {} : { config: config as Prisma.InputJsonValue }),
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
listTrustContent(brandId: string) {
|
||||
return this.prisma.trustContent.findMany({
|
||||
where: { brandId },
|
||||
orderBy: [{ type: "asc" }, { sortOrder: "asc" }],
|
||||
});
|
||||
}
|
||||
|
||||
async deleteTrustContent(brandId: string, id: string) {
|
||||
const item = await this.prisma.trustContent.findFirst({ where: { id, brandId } });
|
||||
if (!item) throw new BadRequestException("信任内容不存在");
|
||||
await this.prisma.trustContent.delete({ where: { id } });
|
||||
return { deleted: true };
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
import { Injectable, ServiceUnavailableException, UnauthorizedException } from "@nestjs/common";
|
||||
import { decryptMiniAppCredential } from "./miniapp-credential-crypto.js";
|
||||
|
||||
interface WechatSessionResponse {
|
||||
openid?: string;
|
||||
@@ -14,17 +15,45 @@ export interface WechatSession {
|
||||
unionid?: string;
|
||||
}
|
||||
|
||||
export interface WechatLoginCredentials {
|
||||
appId: string;
|
||||
appSecret: string;
|
||||
}
|
||||
|
||||
/**
|
||||
* 每个品牌对应自己的小程序,登录凭据必须来自该品牌的后台上传配置。
|
||||
* 不使用全局环境变量或跨品牌回退,避免把 A 品牌的 OpenID 登录到 B 品牌。
|
||||
*/
|
||||
export function resolveWechatLoginCredentials(settings: unknown): WechatLoginCredentials {
|
||||
const payload =
|
||||
settings && typeof settings === "object" && !Array.isArray(settings)
|
||||
? (settings as Record<string, unknown>)
|
||||
: {};
|
||||
const appId = typeof payload.appId === "string" ? payload.appId.trim() : "";
|
||||
if (!appId) throw new ServiceUnavailableException("该品牌尚未配置微信 AppID");
|
||||
if (!payload.appSecretCredential)
|
||||
throw new ServiceUnavailableException("该品牌尚未配置微信登录 AppSecret");
|
||||
let appSecret: string;
|
||||
try {
|
||||
appSecret = decryptMiniAppCredential(payload.appSecretCredential);
|
||||
} catch {
|
||||
throw new ServiceUnavailableException("该品牌微信登录凭据不可用,请重新保存 AppSecret");
|
||||
}
|
||||
if (!appSecret)
|
||||
throw new ServiceUnavailableException("该品牌微信登录 AppSecret 为空,请重新保存");
|
||||
return { appId, appSecret };
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class WechatAuthService {
|
||||
async exchangeCode(code: string): Promise<WechatSession> {
|
||||
async exchangeCode(code: string, credentials: WechatLoginCredentials): Promise<WechatSession> {
|
||||
if (!code.trim()) throw new UnauthorizedException("微信登录 code 不能为空");
|
||||
const appId = process.env.WECHAT_APP_ID;
|
||||
const appSecret = process.env.WECHAT_APP_SECRET;
|
||||
if (!appId || !appSecret) throw new ServiceUnavailableException("微信登录尚未配置");
|
||||
if (!credentials.appId || !credentials.appSecret)
|
||||
throw new ServiceUnavailableException("微信登录尚未配置");
|
||||
|
||||
const query = new URLSearchParams({
|
||||
appid: appId,
|
||||
secret: appSecret,
|
||||
appid: credentials.appId,
|
||||
secret: credentials.appSecret,
|
||||
js_code: code,
|
||||
grant_type: "authorization_code",
|
||||
});
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
import assert from "node:assert/strict";
|
||||
import test from "node:test";
|
||||
import { ForbiddenException } from "@nestjs/common";
|
||||
import { AdminAccessService } from "../src/admin-access.service.js";
|
||||
import { signIdentity } from "../src/auth.js";
|
||||
|
||||
process.env.SESSION_SECRET = "admin-access-service-test-secret-1234567890";
|
||||
|
||||
type RequestFixture = {
|
||||
headers: { authorization: string };
|
||||
};
|
||||
|
||||
function requestFixture(subject = "admin-1", brandId = "brand-1"): RequestFixture {
|
||||
return {
|
||||
headers: {
|
||||
authorization: `Bearer ${signIdentity({ subject, brandId, role: "admin" })}`,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
function accessFixture() {
|
||||
const calls = { adminUser: 0, membership: 0 };
|
||||
const prisma = {
|
||||
adminUser: {
|
||||
findUnique: async () => {
|
||||
calls.adminUser += 1;
|
||||
return {
|
||||
isEnabled: true,
|
||||
mustChangePassword: false,
|
||||
tokenVersion: 0,
|
||||
platformTemplateRole: "none",
|
||||
};
|
||||
},
|
||||
},
|
||||
brandMembership: {
|
||||
findUnique: async () => {
|
||||
calls.membership += 1;
|
||||
return { role: "owner", isEnabled: true };
|
||||
},
|
||||
},
|
||||
};
|
||||
return { calls, prisma };
|
||||
}
|
||||
|
||||
test("同一请求内 Guard 与 Controller 复用访问校验结果", async () => {
|
||||
const { calls, prisma } = accessFixture();
|
||||
const service = new AdminAccessService(prisma as never);
|
||||
const request = requestFixture();
|
||||
|
||||
const [guardResult, controllerResult] = await Promise.all([
|
||||
service.requireBrand(request as never),
|
||||
service.requireBrand(request as never),
|
||||
]);
|
||||
assert.deepEqual(guardResult, controllerResult);
|
||||
await service.requireRole(request as never, ["owner"]);
|
||||
await assert.rejects(
|
||||
service.requireTemplateAdmin(request as never),
|
||||
(error: unknown) => error instanceof ForbiddenException,
|
||||
);
|
||||
|
||||
assert.equal(calls.adminUser, 1);
|
||||
assert.equal(calls.membership, 1);
|
||||
});
|
||||
|
||||
test("不同请求之间不共享访问校验缓存", async () => {
|
||||
const { calls, prisma } = accessFixture();
|
||||
const service = new AdminAccessService(prisma as never);
|
||||
|
||||
await service.requireBrand(requestFixture("admin-1") as never);
|
||||
await service.requireBrand(requestFixture("admin-2") as never);
|
||||
|
||||
assert.equal(calls.adminUser, 2);
|
||||
assert.equal(calls.membership, 2);
|
||||
});
|
||||
@@ -0,0 +1,58 @@
|
||||
import assert from "node:assert/strict";
|
||||
import { test } from "node:test";
|
||||
import { HttpException } from "@nestjs/common";
|
||||
import { AdminClientErrorService } from "../src/modules/admin/admin-client-error.service.js";
|
||||
import { MemoryClientErrorThrottleStore } from "../src/modules/admin/client-error-throttle.store.js";
|
||||
|
||||
function report(errorId: string, subject = "admin:user-1") {
|
||||
return {
|
||||
subject,
|
||||
brandId: "brand-1",
|
||||
errorId,
|
||||
message: "boom",
|
||||
route: "/admin/trust",
|
||||
requestId: "req-1",
|
||||
userAgent: "test-agent",
|
||||
};
|
||||
}
|
||||
|
||||
function service() {
|
||||
return new AdminClientErrorService(new MemoryClientErrorThrottleStore());
|
||||
}
|
||||
|
||||
test("首次上报记录,相同 errorId 在窗口内按管理员去重", async () => {
|
||||
const errors = service();
|
||||
assert.deepEqual(await errors.record(report("admin-error-1")), {
|
||||
received: true,
|
||||
duplicate: false,
|
||||
});
|
||||
assert.deepEqual(await errors.record(report("admin-error-1")), {
|
||||
received: true,
|
||||
duplicate: true,
|
||||
});
|
||||
// 不同管理员使用相同 errorId 时互不影响
|
||||
assert.deepEqual(await errors.record(report("admin-error-1", "admin:user-2")), {
|
||||
received: true,
|
||||
duplicate: false,
|
||||
});
|
||||
});
|
||||
|
||||
test("同一管理员 60 秒内最多接受 10 条不同错误", async () => {
|
||||
const errors = service();
|
||||
for (let index = 0; index < 10; index += 1) {
|
||||
assert.deepEqual(await errors.record(report(`admin-rate-${index}`)), {
|
||||
received: true,
|
||||
duplicate: false,
|
||||
});
|
||||
}
|
||||
await assert.rejects(errors.record(report("admin-rate-overflow")), (error) => {
|
||||
assert.ok(error instanceof HttpException);
|
||||
assert.equal(error.getStatus(), 429);
|
||||
return true;
|
||||
});
|
||||
// 另一个管理员不受影响
|
||||
assert.deepEqual(await errors.record(report("admin-rate-other", "admin:user-2")), {
|
||||
received: true,
|
||||
duplicate: false,
|
||||
});
|
||||
});
|
||||
@@ -4,7 +4,10 @@ import { BadRequestException } from "@nestjs/common";
|
||||
import { generateKeyPairSync } from "node:crypto";
|
||||
import { AdminMiniAppSettingsService } from "../src/modules/admin/admin-miniapp-settings.service.js";
|
||||
import type { AdminMiniAppReleaseService } from "../src/modules/admin/admin-miniapp-release.service.js";
|
||||
import { decryptMiniAppCredential } from "../src/modules/admin/miniapp-credential-crypto.js";
|
||||
import {
|
||||
decryptMiniAppCredential,
|
||||
encryptMiniAppCredential,
|
||||
} from "../src/miniapp-credential-crypto.js";
|
||||
|
||||
process.env.SESSION_SECRET = "settings-service-test-secret-1234567890";
|
||||
|
||||
@@ -25,12 +28,19 @@ function createService(settings: Record<string, unknown> = {}) {
|
||||
return { service: new AdminMiniAppSettingsService(releases), saved };
|
||||
}
|
||||
|
||||
test("settings presentation never exposes plaintext credentials", async () => {
|
||||
test("settings presentation never exposes encrypted credential payloads", async () => {
|
||||
const credential = { algorithm: "aes-256-gcm" };
|
||||
const appSecretCredential = {
|
||||
algorithm: "aes-256-gcm",
|
||||
ciphertext: "encrypted-secret",
|
||||
iv: "iv",
|
||||
authTag: "tag",
|
||||
};
|
||||
const { service } = createService({
|
||||
appId: "wxtestsettings",
|
||||
apiBaseUrl: "https://wechat.example.com/api",
|
||||
credential,
|
||||
appSecretCredential,
|
||||
build: { keep: true },
|
||||
});
|
||||
const result = (await service.get("brand-1")) as Record<string, unknown>;
|
||||
@@ -38,8 +48,12 @@ test("settings presentation never exposes plaintext credentials", async () => {
|
||||
assert.equal(result.apiBaseUrl, "https://wechat.example.com/api");
|
||||
assert.equal(result.requestDomain, "wechat.example.com");
|
||||
assert.equal(result.hasStoredCredentials, true);
|
||||
assert.equal(result.hasStoredAppSecret, true);
|
||||
assert.equal(result.loginConfigured, true);
|
||||
assert.deepEqual(result.credential, { algorithm: "aes-256-gcm" });
|
||||
assert.equal(result.privateKey, undefined);
|
||||
assert.equal("appSecretCredential" in result, false);
|
||||
assert.equal(JSON.stringify(result).includes("encrypted-secret"), false);
|
||||
});
|
||||
|
||||
test("update validates URL and private key before persistence", async () => {
|
||||
@@ -67,6 +81,7 @@ test("update encrypts a valid private key and preserves existing settings", asyn
|
||||
appId: "wxnew",
|
||||
apiBaseUrl: "https://new.example.com/api/",
|
||||
privateKey,
|
||||
appSecret: "0123456789abcdef0123456789abcdef",
|
||||
build: { extra: true },
|
||||
})) as Record<string, unknown>;
|
||||
assert.equal(saved.length, 1);
|
||||
@@ -82,3 +97,54 @@ test("update encrypts a valid private key and preserves existing settings", asyn
|
||||
assert.ok(!JSON.stringify(saved[0]).includes(privateKey));
|
||||
assert.equal(result.hasStoredCredentials, true);
|
||||
});
|
||||
|
||||
test("update encrypts the WeChat login AppSecret without exposing it", async () => {
|
||||
const appSecret = "0123456789abcdef0123456789abcdef";
|
||||
const { service, saved } = createService({
|
||||
appId: "wxtestsettings",
|
||||
apiBaseUrl: "https://wechat.example.com/api",
|
||||
});
|
||||
const result = (await service.update("brand-1", { appSecret })) as Record<string, unknown>;
|
||||
assert.equal(saved.length, 1);
|
||||
const appSecretCredential = saved[0]?.appSecretCredential as Record<string, string>;
|
||||
assert.equal(appSecretCredential.algorithm, "aes-256-gcm");
|
||||
assert.equal(decryptMiniAppCredential(appSecretCredential), appSecret);
|
||||
assert.equal(JSON.stringify(saved[0]).includes(appSecret), false);
|
||||
assert.equal(result.hasStoredAppSecret, true);
|
||||
assert.equal(result.loginConfigured, true);
|
||||
assert.equal("appSecretCredential" in result, false);
|
||||
});
|
||||
|
||||
test("update rejects malformed WeChat login AppSecret", async () => {
|
||||
const { service, saved } = createService();
|
||||
await assert.rejects(
|
||||
() => service.update("brand-1", { appSecret: "not-a-valid-secret!" }),
|
||||
BadRequestException,
|
||||
);
|
||||
assert.equal(saved.length, 0);
|
||||
});
|
||||
|
||||
test("changing AppID requires the matching AppSecret", async () => {
|
||||
const appSecret = "0123456789abcdef0123456789abcdef";
|
||||
const { service, saved } = createService({
|
||||
appId: "wxold",
|
||||
appSecretCredential: encryptMiniAppCredential(appSecret),
|
||||
});
|
||||
await assert.rejects(
|
||||
() => service.update("brand-1", { appId: "wxnew" }),
|
||||
/必须同时填写该 AppID 对应的 AppSecret/,
|
||||
);
|
||||
assert.equal(saved.length, 0);
|
||||
});
|
||||
|
||||
test("leaving AppSecret empty preserves the stored credential", async () => {
|
||||
const appSecret = "0123456789abcdef0123456789abcdef";
|
||||
const storedCredential = encryptMiniAppCredential(appSecret);
|
||||
const { service, saved } = createService({
|
||||
appId: "wxtestsettings",
|
||||
appSecretCredential: storedCredential,
|
||||
});
|
||||
await service.update("brand-1", { appId: "wxtestsettings" });
|
||||
assert.equal(saved.length, 1);
|
||||
assert.deepEqual(saved[0]?.appSecretCredential, storedCredential);
|
||||
});
|
||||
@@ -8,7 +8,7 @@ import { tmpdir } from "node:os";
|
||||
import { join, resolve } from "node:path";
|
||||
import { AdminMiniAppUploadService } from "../src/modules/admin/admin-miniapp-upload.service.js";
|
||||
import type { AdminMiniAppReleaseService } from "../src/modules/admin/admin-miniapp-release.service.js";
|
||||
import { encryptMiniAppCredential } from "../src/modules/admin/miniapp-credential-crypto.js";
|
||||
import { encryptMiniAppCredential } from "../src/miniapp-credential-crypto.js";
|
||||
|
||||
process.env.SESSION_SECRET = "upload-service-test-secret-1234567890";
|
||||
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
import assert from "node:assert/strict";
|
||||
import { test } from "node:test";
|
||||
import { createClientErrorThrottleStore } from "../src/modules/admin/client-error-throttle.factory.js";
|
||||
import { PostgresClientErrorThrottleStore } from "../src/modules/admin/client-error-throttle.postgres.store.js";
|
||||
import { MemoryClientErrorThrottleStore } from "../src/modules/admin/client-error-throttle.store.js";
|
||||
|
||||
const prisma = {} as never;
|
||||
|
||||
test("默认使用进程内存储", () => {
|
||||
const store = createClientErrorThrottleStore(prisma, "memory");
|
||||
assert.ok(store instanceof MemoryClientErrorThrottleStore);
|
||||
});
|
||||
|
||||
test("多实例可切换为 Postgres 共享存储", () => {
|
||||
const store = createClientErrorThrottleStore(prisma, "postgres");
|
||||
assert.ok(store instanceof PostgresClientErrorThrottleStore);
|
||||
});
|
||||
|
||||
test("未知存储模式在启动时快速失败", () => {
|
||||
assert.throws(
|
||||
() => createClientErrorThrottleStore(prisma, "redis"),
|
||||
/Unsupported CLIENT_ERROR_THROTTLE_STORE/,
|
||||
);
|
||||
});
|
||||
@@ -11,7 +11,13 @@ import { getTemplatePackageManifest, getVisualTemplateManifest } from "@personal
|
||||
import { createApp } from "../dist/main.js";
|
||||
import { readIdentity, signIdentity } from "../dist/auth.js";
|
||||
import { WechatAuthService } from "../dist/wechat-auth.js";
|
||||
import { encryptMiniAppCredential } from "../dist/miniapp-credential-crypto.js";
|
||||
import { AdminMiniAppReleaseService } from "../dist/modules/admin/admin-miniapp-release.service.js";
|
||||
import { PostgresClientErrorThrottleStore } from "../dist/modules/admin/client-error-throttle.postgres.store.js";
|
||||
import {
|
||||
CLIENT_ERROR_DEDUPE_TTL_MS,
|
||||
CLIENT_ERROR_RATE_WINDOW_MS,
|
||||
} from "../dist/modules/admin/client-error-throttle.store.js";
|
||||
|
||||
let app;
|
||||
const prisma = new PrismaClient();
|
||||
@@ -384,7 +390,7 @@ test("平台模板管理员可以按行业预览版本,且预览不写入品
|
||||
// 预览只允许使用平台当前已部署的精确 renderer 版本;复用 prepare 阶段导入的基线版本,
|
||||
// 避免测试自造一个 renderer 尚未部署的新版本。
|
||||
const baselineVersion = await prisma.templatePackageVersion.findFirstOrThrow({
|
||||
where: { packageKey: "atelier-solopreneur", version: "1.3.2", status: "published" },
|
||||
where: { packageKey: "atelier-solopreneur", version: "1.3.3", status: "published" },
|
||||
});
|
||||
const versionId = baselineVersion.id;
|
||||
|
||||
@@ -861,7 +867,7 @@ test("API restart recovers an expired persisted miniapp build attempt", async ()
|
||||
}
|
||||
});
|
||||
|
||||
test("miniapp release settings never expose or persist plaintext private keys", async () => {
|
||||
test("miniapp release settings never expose or persist plaintext credentials", async () => {
|
||||
const login = await request("/admin/session/login", {
|
||||
method: "POST",
|
||||
payload: { username: "admin", password: process.env.SEED_ADMIN_PASSWORD },
|
||||
@@ -892,6 +898,13 @@ test("miniapp release settings never expose or persist plaintext private keys",
|
||||
payload: { appId: "wxtestsettings", apiBaseUrl: "http://wechat.example.com/api" },
|
||||
});
|
||||
assert.equal(rejected.statusCode, 400);
|
||||
const invalidSecret = await request("/admin/miniapp-releases/settings", {
|
||||
method: "PATCH",
|
||||
headers,
|
||||
payload: { appSecret: "invalid secret!" },
|
||||
});
|
||||
assert.equal(invalidSecret.statusCode, 400);
|
||||
const appSecret = "0123456789abcdef0123456789abcdef";
|
||||
const saved = await request("/admin/miniapp-releases/settings", {
|
||||
method: "PATCH",
|
||||
headers,
|
||||
@@ -899,6 +912,7 @@ test("miniapp release settings never expose or persist plaintext private keys",
|
||||
appId: "wxtestsettings",
|
||||
apiBaseUrl: "https://wechat.example.com/api/",
|
||||
privateKey,
|
||||
appSecret,
|
||||
},
|
||||
});
|
||||
assert.equal(saved.statusCode, 200);
|
||||
@@ -907,17 +921,24 @@ test("miniapp release settings never expose or persist plaintext private keys",
|
||||
assert.equal(body.apiBaseUrl, "https://wechat.example.com/api");
|
||||
assert.equal(body.requestDomain, "wechat.example.com");
|
||||
assert.equal(body.hasStoredCredentials, true);
|
||||
assert.equal(body.hasStoredAppSecret, true);
|
||||
assert.equal(body.loginConfigured, true);
|
||||
assert.equal(body.privateKey, undefined);
|
||||
assert.equal(body.credential?.algorithm, "aes-256-gcm");
|
||||
assert.equal("appSecretCredential" in body, false);
|
||||
assert.ok(body.requestDomain === null || typeof body.requestDomain === "string");
|
||||
assert.ok(body.buildError === null || typeof body.buildError === "string");
|
||||
if (typeof body.requestDomain === "string") assert.ok(!body.requestDomain.includes("localhost"));
|
||||
const brand = await prisma.brandProfile.findUniqueOrThrow({ where: { id: brandId } });
|
||||
const credential = brand.miniAppSettings?.credential;
|
||||
const appSecretCredential = brand.miniAppSettings?.appSecretCredential;
|
||||
assert.ok(credential);
|
||||
assert.ok(appSecretCredential);
|
||||
assert.equal(brand.miniAppSettings.apiBaseUrl, "https://wechat.example.com/api");
|
||||
assert.equal(typeof credential.ciphertext, "string");
|
||||
assert.equal(typeof appSecretCredential.ciphertext, "string");
|
||||
assert.ok(!JSON.stringify(brand.miniAppSettings).includes(privateKey));
|
||||
assert.ok(!JSON.stringify(brand.miniAppSettings).includes(appSecret));
|
||||
const missing = await request("/admin/miniapp-releases/settings");
|
||||
assert.equal(missing.statusCode, 401);
|
||||
const forbidden = await request("/admin/miniapp-releases/settings", {
|
||||
@@ -1892,6 +1913,124 @@ async function request(url, options = {}) {
|
||||
});
|
||||
}
|
||||
|
||||
test("admin client error reports are authenticated, validated, and deduplicated", async () => {
|
||||
await assertProtectedRouteBoundary("/admin/client-errors", {
|
||||
method: "POST",
|
||||
payload: { errorId: "admin-boundary-check", message: "boom", route: "/admin/publication" },
|
||||
});
|
||||
|
||||
const login = await request("/admin/session/login", {
|
||||
method: "POST",
|
||||
payload: { username: "admin", password: process.env.SEED_ADMIN_PASSWORD },
|
||||
});
|
||||
assert.equal(login.statusCode, 201);
|
||||
const headers = { authorization: `Bearer ${sessionToken(login)}` };
|
||||
const errorId = `admin-it-${Date.now().toString(36)}`;
|
||||
const payload = {
|
||||
errorId,
|
||||
message: "Cannot read properties of null (reading 'type')",
|
||||
route: "/admin/trust?tab=1",
|
||||
componentStack: "at TrustContentPage",
|
||||
};
|
||||
|
||||
const first = await request("/admin/client-errors", { method: "POST", headers, payload });
|
||||
assert.equal(first.statusCode, 201);
|
||||
assert.deepEqual(JSON.parse(first.body), { received: true, duplicate: false });
|
||||
|
||||
const duplicate = await request("/admin/client-errors", { method: "POST", headers, payload });
|
||||
assert.equal(duplicate.statusCode, 201);
|
||||
assert.deepEqual(JSON.parse(duplicate.body), { received: true, duplicate: true });
|
||||
|
||||
const invalid = await request("/admin/client-errors", {
|
||||
method: "POST",
|
||||
headers,
|
||||
payload: { errorId: "bad", message: "", route: "no-slash" },
|
||||
});
|
||||
assert.equal(invalid.statusCode, 400);
|
||||
});
|
||||
|
||||
test("postgres client error store deduplicates and rate limits across instances", async () => {
|
||||
const storeA = new PostgresClientErrorThrottleStore(prisma);
|
||||
const storeB = new PostgresClientErrorThrottleStore(prisma);
|
||||
const subjectPrefix = `pg-client-error-${randomUUID()}`;
|
||||
const dedupeSubject = `${subjectPrefix}-dedupe`;
|
||||
const concurrentSubject = `${subjectPrefix}-concurrent`;
|
||||
const rateSubject = `${subjectPrefix}-rate`;
|
||||
const lateSubject = `${subjectPrefix}-late`;
|
||||
const now = Date.now();
|
||||
try {
|
||||
assert.deepEqual(await storeA.record({ subject: dedupeSubject, errorId: "same" }, now), {
|
||||
duplicate: false,
|
||||
});
|
||||
assert.deepEqual(await storeB.record({ subject: dedupeSubject, errorId: "same" }, now), {
|
||||
duplicate: true,
|
||||
});
|
||||
assert.deepEqual(
|
||||
await storeB.record(
|
||||
{ subject: dedupeSubject, errorId: "same" },
|
||||
now + CLIENT_ERROR_DEDUPE_TTL_MS + 1_000,
|
||||
),
|
||||
{ duplicate: false },
|
||||
);
|
||||
|
||||
const concurrent = await Promise.all(
|
||||
Array.from({ length: 6 }, (_, index) =>
|
||||
(index % 2 === 0 ? storeA : storeB).record(
|
||||
{ subject: concurrentSubject, errorId: "concurrent-same" },
|
||||
now,
|
||||
),
|
||||
),
|
||||
);
|
||||
assert.equal(concurrent.filter((result) => !result.duplicate).length, 1);
|
||||
|
||||
for (let index = 0; index < 10; index += 1) {
|
||||
const store = index % 2 === 0 ? storeA : storeB;
|
||||
assert.deepEqual(
|
||||
await store.record({ subject: rateSubject, errorId: `rate-${index}` }, now),
|
||||
{ duplicate: false },
|
||||
);
|
||||
}
|
||||
await assert.rejects(
|
||||
storeB.record({ subject: rateSubject, errorId: "rate-overflow" }, now),
|
||||
(error) => error.getStatus?.() === 429,
|
||||
);
|
||||
assert.deepEqual(
|
||||
await storeA.record(
|
||||
{ subject: rateSubject, errorId: "rate-next-window" },
|
||||
now + CLIENT_ERROR_RATE_WINDOW_MS,
|
||||
),
|
||||
{ duplicate: false },
|
||||
);
|
||||
|
||||
// 旧窗口的迟到请求不得把窗口指针回拨,否则会额外放行一整窗口。
|
||||
await storeA.record(
|
||||
{ subject: lateSubject, errorId: "late-first" },
|
||||
now + CLIENT_ERROR_RATE_WINDOW_MS,
|
||||
);
|
||||
await storeB.record({ subject: lateSubject, errorId: "late-old" }, now);
|
||||
for (let index = 0; index < 9; index += 1) {
|
||||
assert.deepEqual(
|
||||
await storeA.record(
|
||||
{ subject: lateSubject, errorId: `late-next-${index}` },
|
||||
now + CLIENT_ERROR_RATE_WINDOW_MS,
|
||||
),
|
||||
{ duplicate: false },
|
||||
);
|
||||
}
|
||||
await assert.rejects(
|
||||
storeB.record(
|
||||
{ subject: lateSubject, errorId: "late-overflow" },
|
||||
now + CLIENT_ERROR_RATE_WINDOW_MS,
|
||||
),
|
||||
(error) => error.getStatus?.() === 429,
|
||||
);
|
||||
} finally {
|
||||
const subjects = [dedupeSubject, concurrentSubject, rateSubject, lateSubject];
|
||||
await prisma.clientErrorDedupe.deleteMany({ where: { subject: { in: subjects } } });
|
||||
await prisma.clientErrorThrottleWindow.deleteMany({ where: { subject: { in: subjects } } });
|
||||
}
|
||||
});
|
||||
|
||||
async function assertProtectedRouteBoundary(url, options = {}) {
|
||||
const { method = "GET", payload, forbiddenRole = "customer", headers = {} } = options;
|
||||
const requestOptions = payload === undefined ? { method, headers } : { method, headers, payload };
|
||||
@@ -2199,7 +2338,7 @@ test("brand creation options are owner-scoped", async () => {
|
||||
assert.equal(linjingScheme.isLatestForPackage, true);
|
||||
const atelierScheme = options.pageSchemes.find((scheme) => scheme.name.includes("工坊"));
|
||||
assert.ok(atelierScheme);
|
||||
assert.equal(atelierScheme.version, "1.3.2");
|
||||
assert.equal(atelierScheme.version, "1.3.3");
|
||||
assert.deepEqual(atelierScheme.supportedBusinessTypes, ["personal"]);
|
||||
assert.equal(
|
||||
options.pageSchemes.some(
|
||||
@@ -2227,7 +2366,7 @@ test("owner can create an isolated brand", async () => {
|
||||
const atelier = await prisma.templatePackageVersion.findFirstOrThrow({
|
||||
where: {
|
||||
packageKey: "atelier-solopreneur",
|
||||
version: "1.3.2",
|
||||
version: "1.3.3",
|
||||
status: "published",
|
||||
},
|
||||
});
|
||||
@@ -5087,6 +5226,71 @@ test("disabled brand membership blocks existing admin token", async () => {
|
||||
}
|
||||
});
|
||||
|
||||
test("booking endpoints share the brand access policy", async () => {
|
||||
const username = `booking-policy-${randomUUID()}`;
|
||||
const password = "booking-policy-password-123";
|
||||
const user = await prisma.adminUser.create({
|
||||
data: {
|
||||
username,
|
||||
passwordHash: await bcrypt.hash(password, 12),
|
||||
displayName: "预订策略测试管理员",
|
||||
mustChangePassword: true,
|
||||
},
|
||||
});
|
||||
const membership = await prisma.brandMembership.create({
|
||||
data: { brandId, adminUserId: user.id, role: "admin", isEnabled: true },
|
||||
});
|
||||
try {
|
||||
const login = await request("/admin/session/login", {
|
||||
method: "POST",
|
||||
payload: { username, password },
|
||||
});
|
||||
assert.equal(login.statusCode, 201, login.body);
|
||||
const headers = { authorization: `Bearer ${sessionToken(login)}` };
|
||||
const routes = [
|
||||
{ method: "GET", url: "/admin/bookings" },
|
||||
{ method: "GET", url: "/admin/bookings/unread-count" },
|
||||
{ method: "GET", url: "/admin/bookings/tags" },
|
||||
{ method: "POST", url: "/admin/bookings/tags", payload: { name: "策略测试标签" } },
|
||||
];
|
||||
|
||||
// 初始密码未修改时,预订路由必须与其他后台路由一样被拒绝。
|
||||
for (const route of routes) {
|
||||
const response = await request(route.url, {
|
||||
method: route.method,
|
||||
headers,
|
||||
...(route.payload ? { payload: route.payload } : {}),
|
||||
});
|
||||
assert.equal(response.statusCode, 403, `${route.method} ${route.url}: ${response.body}`);
|
||||
}
|
||||
|
||||
// 品牌成员被停用后,同一 token 也不能再访问预订数据。
|
||||
await prisma.adminUser.update({ where: { id: user.id }, data: { mustChangePassword: false } });
|
||||
const changed = await request("/admin/session/login", {
|
||||
method: "POST",
|
||||
payload: { username, password },
|
||||
});
|
||||
assert.equal(changed.statusCode, 201, changed.body);
|
||||
const activeHeaders = { authorization: `Bearer ${sessionToken(changed)}` };
|
||||
assert.equal((await request("/admin/bookings", { headers: activeHeaders })).statusCode, 200);
|
||||
|
||||
await prisma.brandMembership.update({
|
||||
where: { id: membership.id },
|
||||
data: { isEnabled: false },
|
||||
});
|
||||
for (const route of routes) {
|
||||
const response = await request(route.url, {
|
||||
method: route.method,
|
||||
headers: activeHeaders,
|
||||
...(route.payload ? { payload: route.payload } : {}),
|
||||
});
|
||||
assert.equal(response.statusCode, 403, `${route.method} ${route.url}: ${response.body}`);
|
||||
}
|
||||
} finally {
|
||||
await prisma.adminUser.delete({ where: { id: user.id } });
|
||||
}
|
||||
});
|
||||
|
||||
test("admin can read and update brand and service configuration", async () => {
|
||||
const login = await request("/admin/session/login", {
|
||||
method: "POST",
|
||||
@@ -5409,13 +5613,30 @@ test("wechat login validates the request DTO before exchanging the code", async
|
||||
assert.equal(response.statusCode, 400);
|
||||
});
|
||||
|
||||
test("wechat login creates a customer session for the requested brand", async () => {
|
||||
test("wechat login creates a customer session using the requested brand credentials", async () => {
|
||||
const doorsBrand = await prisma.brandProfile.findUnique({ where: { slug: "linjing-doors" } });
|
||||
assert.ok(doorsBrand);
|
||||
const sessionOpenid = `doors-login-${Date.now()}`;
|
||||
const appId = "wxintegrationdoors";
|
||||
const appSecret = "0123456789abcdef0123456789abcdef";
|
||||
const originalSettings = doorsBrand.miniAppSettings;
|
||||
await prisma.brandProfile.update({
|
||||
where: { id: doorsBrand.id },
|
||||
data: {
|
||||
miniAppSettings: {
|
||||
...(originalSettings && typeof originalSettings === "object" ? originalSettings : {}),
|
||||
appId,
|
||||
appSecretCredential: encryptMiniAppCredential(appSecret),
|
||||
},
|
||||
},
|
||||
});
|
||||
const wechatAuth = app.get(WechatAuthService);
|
||||
const originalExchangeCode = wechatAuth.exchangeCode;
|
||||
wechatAuth.exchangeCode = async () => ({ openid: sessionOpenid });
|
||||
wechatAuth.exchangeCode = async (code, credentials) => {
|
||||
assert.equal(code, "test-code");
|
||||
assert.deepEqual(credentials, { appId, appSecret });
|
||||
return { openid: sessionOpenid };
|
||||
};
|
||||
try {
|
||||
const response = await request("/customer/session/wechat?brandSlug=linjing-doors", {
|
||||
method: "POST",
|
||||
@@ -5433,6 +5654,49 @@ test("wechat login creates a customer session for the requested brand", async ()
|
||||
} finally {
|
||||
wechatAuth.exchangeCode = originalExchangeCode;
|
||||
await prisma.customerUser.deleteMany({ where: { openid: sessionOpenid } });
|
||||
await prisma.brandProfile.update({
|
||||
where: { id: doorsBrand.id },
|
||||
data: { miniAppSettings: originalSettings },
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
test("wechat login fails closed when a brand has no login AppSecret", async () => {
|
||||
const brand = await prisma.brandProfile.findUnique({ where: { slug: "default-brand" } });
|
||||
assert.ok(brand);
|
||||
const originalSettings = brand.miniAppSettings;
|
||||
const { appSecretCredential: _ignoredAppSecretCredential, ...settingsWithoutAppSecret } =
|
||||
originalSettings && typeof originalSettings === "object" ? originalSettings : {};
|
||||
await prisma.brandProfile.update({
|
||||
where: { id: brand.id },
|
||||
data: {
|
||||
miniAppSettings: {
|
||||
...settingsWithoutAppSecret,
|
||||
appId: "wxmissingsessionsecret",
|
||||
},
|
||||
},
|
||||
});
|
||||
const wechatAuth = app.get(WechatAuthService);
|
||||
const originalExchangeCode = wechatAuth.exchangeCode;
|
||||
let exchanged = false;
|
||||
wechatAuth.exchangeCode = async () => {
|
||||
exchanged = true;
|
||||
return { openid: `must-not-login-${Date.now()}` };
|
||||
};
|
||||
try {
|
||||
const response = await request("/customer/session/wechat?brandSlug=default-brand", {
|
||||
method: "POST",
|
||||
payload: { code: "test-code" },
|
||||
});
|
||||
assert.equal(response.statusCode, 503);
|
||||
assert.equal(JSON.parse(response.body).error.message, "该品牌尚未配置微信登录 AppSecret");
|
||||
assert.equal(exchanged, false);
|
||||
} finally {
|
||||
wechatAuth.exchangeCode = originalExchangeCode;
|
||||
await prisma.brandProfile.update({
|
||||
where: { id: brand.id },
|
||||
data: { miniAppSettings: originalSettings },
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -117,8 +117,8 @@ export const ROUTE_COVERAGE: RouteCoverage[] = [
|
||||
method: "GET",
|
||||
path: "/admin/miniapp-releases/settings",
|
||||
auth: "brand",
|
||||
authorizationTest: "miniapp release settings never expose or persist plaintext private keys",
|
||||
successTest: "miniapp release settings never expose or persist plaintext private keys",
|
||||
authorizationTest: "miniapp release settings never expose or persist plaintext credentials",
|
||||
successTest: "miniapp release settings never expose or persist plaintext credentials",
|
||||
},
|
||||
{
|
||||
method: "GET",
|
||||
@@ -378,8 +378,8 @@ export const ROUTE_COVERAGE: RouteCoverage[] = [
|
||||
path: "/admin/miniapp-releases/settings",
|
||||
auth: "roles",
|
||||
roles: ["owner", "admin", "platform-admin"],
|
||||
authorizationTest: "miniapp release settings never expose or persist plaintext private keys",
|
||||
successTest: "miniapp release settings never expose or persist plaintext private keys",
|
||||
authorizationTest: "miniapp release settings never expose or persist plaintext credentials",
|
||||
successTest: "miniapp release settings never expose or persist plaintext credentials",
|
||||
},
|
||||
{
|
||||
method: "PATCH",
|
||||
@@ -655,7 +655,14 @@ export const ROUTE_COVERAGE: RouteCoverage[] = [
|
||||
path: "/customer/session/wechat",
|
||||
auth: "public",
|
||||
authorizationTest: null,
|
||||
successTest: "wechat login creates a customer session for the requested brand",
|
||||
successTest: "wechat login creates a customer session using the requested brand credentials",
|
||||
},
|
||||
{
|
||||
method: "POST",
|
||||
path: "/admin/client-errors",
|
||||
auth: "brand",
|
||||
authorizationTest: "admin client error reports are authenticated, validated, and deduplicated",
|
||||
successTest: "admin client error reports are authenticated, validated, and deduplicated",
|
||||
},
|
||||
{
|
||||
method: "PUT",
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
import assert from "node:assert/strict";
|
||||
import { test } from "node:test";
|
||||
import { assertProductionSecret, isPlaceholderSecret } from "../src/runtime-config.js";
|
||||
|
||||
test("production rejects missing or short session secrets", () => {
|
||||
assert.throws(() => assertProductionSecret(undefined, "production"), /至少 32 位/);
|
||||
assert.throws(() => assertProductionSecret("short-secret", "production"), /至少 32 位/);
|
||||
});
|
||||
|
||||
test("production rejects example placeholder secrets", () => {
|
||||
assert.throws(
|
||||
() => assertProductionSecret("replace-with-at-least-32-random-characters", "production"),
|
||||
/示例占位符/,
|
||||
);
|
||||
assert.throws(
|
||||
() => assertProductionSecret("change-me-now-1234567890-abcdefghij", "production"),
|
||||
/示例占位符/,
|
||||
);
|
||||
});
|
||||
|
||||
test("production accepts a strong random secret", () => {
|
||||
assert.doesNotThrow(() =>
|
||||
assertProductionSecret("s3cure-Random-Value-0123456789-abcdefghij", "production"),
|
||||
);
|
||||
});
|
||||
|
||||
test("development keeps working with the example placeholder", () => {
|
||||
assert.doesNotThrow(() =>
|
||||
assertProductionSecret("replace-with-a-long-random-value", "development"),
|
||||
);
|
||||
});
|
||||
|
||||
test("placeholder detection covers documented example values", () => {
|
||||
assert.equal(isPlaceholderSecret("replace-with-a-long-random-value"), true);
|
||||
assert.equal(isPlaceholderSecret(" YOur-secret-value "), true);
|
||||
assert.equal(isPlaceholderSecret("s3cure-Random-Value-0123456789-abcdefghij"), false);
|
||||
});
|
||||
@@ -45,7 +45,6 @@ async function main() {
|
||||
.filter((entry) => entry.isDirectory() && entry.name !== targetMigration)
|
||||
.map((entry) => entry.name)
|
||||
.sort();
|
||||
assert.equal(migrationDirs.at(-1), "20261019100000_remove_brand_profile_defaults");
|
||||
await admin.$executeRawUnsafe(`CREATE SCHEMA "${schema}"`);
|
||||
createdSchema = true;
|
||||
|
||||
|
||||
Loaded 100 of 172 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user