diff --git a/apps/admin/src/components/ImageUrlField.tsx b/apps/admin/src/components/ImageUrlField.tsx index c30130e..0d0e998 100644 --- a/apps/admin/src/components/ImageUrlField.tsx +++ b/apps/admin/src/components/ImageUrlField.tsx @@ -1,5 +1,5 @@ -import { CloudUploadOutlined, InboxOutlined } from "@ant-design/icons"; -import { Alert, Button, Image, Input, Space, Typography, Upload, message } from "antd"; +import { CloudUploadOutlined, DeleteOutlined, PictureOutlined } from "@ant-design/icons"; +import { Alert, Button, Image, Popconfirm, Space, Spin, Upload, message } from "antd"; import { useEffect, useState } from "react"; import { createApiClient } from "../lib/api.js"; @@ -66,13 +66,7 @@ export function ImageUrlField({ id, value, onChange, placeholder, scope }: Image } return ( - - onChange?.(event.target.value)} - placeholder={placeholder ?? "粘贴图片地址"} - /> + {storageStatus !== "ok" ? ( ) : null} - { - if (storageStatus === "ok") void upload(file); - return false; - }} - > -

- -

-

{uploading ? "上传中..." : "点击或拖拽上传图片"}

-

JPG、PNG、WebP 或 AVIF,最大 10MB

-
+ {imageUrl ? ( +
+ {placeholder + onChange?.("")}> + + +
+ ) : ( + { + if (storageStatus === "ok") void upload(file); + return false; + }} + > +

{uploading ? : }

+

{uploading ? "上传中..." : "点击或拖拽上传图片"}

+

JPG、PNG、WebP 或 AVIF,最大 10MB

+
+ )} {storageStatus === "unavailable" ? ( ) : null} - {imageUrl ? ( - - - 预览图 - - ) : null} +
); } diff --git a/apps/admin/vite.config.ts b/apps/admin/vite.config.ts index ba5ec1b..42d8c0a 100644 --- a/apps/admin/vite.config.ts +++ b/apps/admin/vite.config.ts @@ -27,6 +27,10 @@ export default defineConfig({ target: process.env.VITE_DEV_API_TARGET ?? "http://localhost:3001", rewrite: (path) => path.replace(/^\/api/, ""), }, + "/media": { + target: process.env.VITE_MEDIA_API_TARGET ?? "http://localhost:3001", + changeOrigin: true, + }, ...(process.env.VITE_MEDIA_PROXY_TARGET ? { [`/${(process.env.OBJECT_STORAGE_BUCKET ?? "personal-brand-media").replace(/^\/+/, "")}`]: diff --git a/apps/api/prisma/assets/doors-hero.jpg b/apps/api/prisma/assets/doors-hero.jpg new file mode 100644 index 0000000..20c1015 Binary files /dev/null and b/apps/api/prisma/assets/doors-hero.jpg differ diff --git a/apps/api/prisma/assets/doors-room-door.jpg b/apps/api/prisma/assets/doors-room-door.jpg new file mode 100644 index 0000000..f62d228 Binary files /dev/null and b/apps/api/prisma/assets/doors-room-door.jpg differ diff --git a/apps/api/prisma/assets/doors-stone-wall.jpg b/apps/api/prisma/assets/doors-stone-wall.jpg new file mode 100644 index 0000000..4fd79ab Binary files /dev/null and b/apps/api/prisma/assets/doors-stone-wall.jpg differ diff --git a/apps/api/prisma/assets/doors-yard-gate.jpg b/apps/api/prisma/assets/doors-yard-gate.jpg new file mode 100644 index 0000000..973bcc1 Binary files /dev/null and b/apps/api/prisma/assets/doors-yard-gate.jpg differ diff --git a/apps/api/prisma/assets/food-package-01.jpg b/apps/api/prisma/assets/food-package-01.jpg new file mode 100644 index 0000000..ceacf57 Binary files /dev/null and b/apps/api/prisma/assets/food-package-01.jpg differ diff --git a/apps/api/prisma/assets/food-package-02.jpg b/apps/api/prisma/assets/food-package-02.jpg new file mode 100644 index 0000000..9089079 Binary files /dev/null and b/apps/api/prisma/assets/food-package-02.jpg differ diff --git a/apps/api/prisma/assets/food-private-chef.jpg b/apps/api/prisma/assets/food-private-chef.jpg new file mode 100644 index 0000000..9a88d04 Binary files /dev/null and b/apps/api/prisma/assets/food-private-chef.jpg differ diff --git a/apps/api/prisma/assets/personal-advisory.jpg b/apps/api/prisma/assets/personal-advisory.jpg new file mode 100644 index 0000000..3284c59 Binary files /dev/null and b/apps/api/prisma/assets/personal-advisory.jpg differ diff --git a/apps/api/prisma/assets/personal-avatar.jpg b/apps/api/prisma/assets/personal-avatar.jpg new file mode 100644 index 0000000..61629b7 Binary files /dev/null and b/apps/api/prisma/assets/personal-avatar.jpg differ diff --git a/apps/api/prisma/assets/personal-consulting.jpg b/apps/api/prisma/assets/personal-consulting.jpg new file mode 100644 index 0000000..f140339 Binary files /dev/null and b/apps/api/prisma/assets/personal-consulting.jpg differ diff --git a/apps/api/prisma/assets/seed-01.jpg b/apps/api/prisma/assets/seed-01.jpg deleted file mode 100644 index c371f9c..0000000 Binary files a/apps/api/prisma/assets/seed-01.jpg and /dev/null differ diff --git a/apps/api/prisma/assets/seed-02.jpg b/apps/api/prisma/assets/seed-02.jpg deleted file mode 100644 index 7480e16..0000000 Binary files a/apps/api/prisma/assets/seed-02.jpg and /dev/null differ diff --git a/apps/api/prisma/assets/seed-03.jpg b/apps/api/prisma/assets/seed-03.jpg deleted file mode 100644 index 14a467e..0000000 Binary files a/apps/api/prisma/assets/seed-03.jpg and /dev/null differ diff --git a/apps/api/prisma/migrations/20261011230000_restore_original_seed_media/migration.sql b/apps/api/prisma/migrations/20261011230000_restore_original_seed_media/migration.sql new file mode 100644 index 0000000..10d661a --- /dev/null +++ b/apps/api/prisma/migrations/20261011230000_restore_original_seed_media/migration.sql @@ -0,0 +1,72 @@ +-- Restore collapsed seed media placeholders to their original per-role local files. +UPDATE "Offering" +SET "coverUrl" = CASE "coverUrl" + WHEN '/media/seed/seed-01.jpg' THEN CASE "name" + WHEN '红烧肉双拼套餐' THEN '/media/seed/food-package-01.jpg' + WHEN '当代铸铜木核防暴装甲门' THEN '/media/seed/doors-hero.jpg' + ELSE '/media/seed/personal-consulting.jpg' + END + WHEN '/media/seed/seed-02.jpg' THEN CASE "name" + WHEN '小炒鸡套餐' THEN '/media/seed/food-package-02.jpg' + WHEN '悬挑风琴式耐候双开院门' THEN '/media/seed/doors-yard-gate.jpg' + ELSE '/media/seed/personal-advisory.jpg' + END + WHEN '/media/seed/seed-03.jpg' THEN CASE "name" + WHEN '家庭聚餐私厨' THEN '/media/seed/food-private-chef.jpg' + WHEN '通顶极窄边框实木室内门' THEN '/media/seed/doors-room-door.jpg' + WHEN '石材及皮质背景墙一体门' THEN '/media/seed/doors-stone-wall.jpg' + ELSE '/media/seed/personal-consulting.jpg' + END +END +WHERE "coverUrl" IN ('/media/seed/seed-01.jpg', '/media/seed/seed-02.jpg', '/media/seed/seed-03.jpg'); + +UPDATE "Offering" +SET "config" = replace( + replace( + replace( + "config"::text, + '/media/seed/seed-01.jpg', + '/media/seed/food-package-01.jpg' + ), + '/media/seed/seed-02.jpg', + '/media/seed/food-package-02.jpg' + ), + '/media/seed/seed-03.jpg', + '/media/seed/food-private-chef.jpg' +)::jsonb +WHERE "config"::text LIKE '%/media/seed/seed-0%' AND "name" IN ('红烧肉双拼套餐', '小炒鸡套餐', '家庭聚餐私厨'); + +UPDATE "Offering" +SET "config" = replace( + replace( + replace( + "config"::text, + '/media/seed/seed-01.jpg', + '/media/seed/doors-hero.jpg' + ), + '/media/seed/seed-02.jpg', + '/media/seed/doors-yard-gate.jpg' + ), + '/media/seed/seed-03.jpg', + CASE "name" + WHEN '通顶极窄边框实木室内门' THEN '/media/seed/doors-room-door.jpg' + ELSE '/media/seed/doors-stone-wall.jpg' + END +)::jsonb +WHERE "config"::text LIKE '%/media/seed/seed-0%' AND "name" LIKE '%门'; + +UPDATE "BrandProfile" +SET "config" = replace( + replace( + replace( + "config"::text, + '/media/seed/seed-01.jpg', + CASE "templateKey" WHEN 'doors' THEN '/media/seed/doors-hero.jpg' ELSE '/media/seed/personal-consulting.jpg' END + ), + '/media/seed/seed-02.jpg', + '/media/seed/personal-advisory.jpg' + ), + '/media/seed/seed-03.jpg', + '/media/seed/doors-room-door.jpg' +)::jsonb +WHERE "config"::text LIKE '%/media/seed/seed-0%'; diff --git a/apps/api/prisma/migrations/20261011230100_restore_release_seed_media/migration.sql b/apps/api/prisma/migrations/20261011230100_restore_release_seed_media/migration.sql new file mode 100644 index 0000000..2a9b3e9 --- /dev/null +++ b/apps/api/prisma/migrations/20261011230100_restore_release_seed_media/migration.sql @@ -0,0 +1,32 @@ +-- Keep publication snapshots aligned with restored original seed media paths. +UPDATE "BrandRelease" +SET "snapshot" = replace( + replace( + replace( + "snapshot"::text, + '/media/seed/seed-01.jpg', + '/media/seed/food-package-01.jpg' + ), + '/media/seed/seed-02.jpg', + '/media/seed/food-package-02.jpg' + ), + '/media/seed/seed-03.jpg', + '/media/seed/food-private-chef.jpg' +)::jsonb +WHERE "brandId" = '00000000-0000-0000-0000-000000000001'; + +UPDATE "BrandRelease" +SET "snapshot" = replace( + replace( + replace( + "snapshot"::text, + '/media/seed/seed-01.jpg', + '/media/seed/doors-hero.jpg' + ), + '/media/seed/seed-02.jpg', + '/media/seed/doors-yard-gate.jpg' + ), + '/media/seed/seed-03.jpg', + '/media/seed/doors-room-door.jpg' +)::jsonb +WHERE "brandId" = '00000000-0000-0000-0000-000000000002'; diff --git a/apps/api/prisma/migrations/20261011230200_restore_sample_media_by_brand/migration.sql b/apps/api/prisma/migrations/20261011230200_restore_sample_media_by_brand/migration.sql new file mode 100644 index 0000000..bc9ae72 --- /dev/null +++ b/apps/api/prisma/migrations/20261011230200_restore_sample_media_by_brand/migration.sql @@ -0,0 +1,30 @@ +-- Restore non-runtime sample offerings by brand visual context. +UPDATE "Offering" o +SET "coverUrl" = '/media/seed/food-package-01.jpg' +FROM "BrandProfile" b +WHERE o."brandId" = b.id AND b.slug = 'default-brand' AND o.name IN ('家庭聚餐定制', '示例·今日套餐'); + +UPDATE "Offering" o +SET "coverUrl" = '/media/seed/food-package-02.jpg' +FROM "BrandProfile" b +WHERE o."brandId" = b.id AND b.slug = 'default-brand' AND o.name IN ('示例·品牌定位咨询', '示例·聚餐定制'); + +UPDATE "Offering" o +SET "coverUrl" = '/media/seed/doors-hero.jpg' +FROM "BrandProfile" b +WHERE o."brandId" = b.id AND b.slug = 'linjing-doors' AND o.name IN ('序章·入户门', '别墅入户大门'); + +UPDATE "Offering" o +SET "coverUrl" = '/media/seed/doors-yard-gate.jpg' +FROM "BrandProfile" b +WHERE o."brandId" = b.id AND b.slug = 'linjing-doors' AND o.name IN ('庭院·边界门', '院门与围合系统'); + +UPDATE "Offering" o +SET "coverUrl" = '/media/seed/doors-room-door.jpg' +FROM "BrandProfile" b +WHERE o."brandId" = b.id AND b.slug = 'linjing-doors' AND o.name IN ('室内户内门系统', '室内·静谧门'); + +UPDATE "Offering" o +SET "coverUrl" = '/media/seed/doors-stone-wall.jpg' +FROM "BrandProfile" b +WHERE o."brandId" = b.id AND b.slug = 'linjing-doors' AND o.name = '一对一门系统设计咨询'; diff --git a/apps/api/prisma/seed.ts b/apps/api/prisma/seed.ts index 631ca2c..c5352cb 100644 --- a/apps/api/prisma/seed.ts +++ b/apps/api/prisma/seed.ts @@ -6,9 +6,17 @@ import { buildBrandReleaseSnapshot } from "../src/brand-release.service.js"; const prisma = new PrismaClient(); const runtimeImages = { - doors: ["/media/seed/seed-01.jpg", "/media/seed/seed-02.jpg", "/media/seed/seed-03.jpg"], - food: ["/media/seed/seed-01.jpg", "/media/seed/seed-02.jpg", "/media/seed/seed-03.jpg"], - personal: ["/media/seed/seed-01.jpg", "/media/seed/seed-02.jpg"], + doors: [ + "/media/seed/doors-hero.jpg", + "/media/seed/doors-yard-gate.jpg", + "/media/seed/doors-room-door.jpg", + ], + food: [ + "/media/seed/food-package-01.jpg", + "/media/seed/food-package-02.jpg", + "/media/seed/food-private-chef.jpg", + ], + personal: ["/media/seed/personal-consulting.jpg", "/media/seed/personal-advisory.jpg"], } as const; type OfferingKind = "service" | "product" | "package" | "subscription"; @@ -290,7 +298,7 @@ const runtimeSeedTemplates: Record<"personal" | "food" | "doors", RuntimeSeedTem phone: "186-0218-9908", wechat: "LIN-ATELIER-2024", studioAddress: "上海市静安区威海路设计中心 A 座 / 杭州良渚研造工坊", - avatarUrl: "/media/seed/seed-01.jpg", + avatarUrl: "/media/seed/personal-avatar.jpg", profilePresentation: { coverage: [ { @@ -489,7 +497,7 @@ const runtimeSeedTemplates: Record<"personal" | "food" | "doors", RuntimeSeedTem { name: "石材及皮质背景墙一体门", summary: "将门体与背景墙材料、纹理和收口一体深化,保留私宅完整的墙面秩序。", - image: "/media/seed/seed-03.jpg", + image: "/media/seed/doors-stone-wall.jpg", kind: "product", priceText: "¥18,000 - ¥36,000 / 樘", config: { @@ -497,7 +505,7 @@ const runtimeSeedTemplates: Record<"personal" | "food" | "doors", RuntimeSeedTem series: "「无垠」密室及背景墙融合门", tag: "精密收口工程", area: "广东·深圳香蜜湖一号", - detailHero: "/media/seed/seed-03.jpg", + detailHero: "/media/seed/doors-stone-wall.jpg", woodMaterial: "3mm 超薄大理石复合蜂窝板 / 进口鞍革手工双缝线", hardware: "感应式电动自开闭装置或碰珠反弹器", spaceType: "雪茄室 / 私人金库 / 地下酒窖 / 视听隐藏储物区", diff --git a/scripts/check-local-media.mjs b/scripts/check-local-media.mjs index 2b1e172..271e6a7 100644 --- a/scripts/check-local-media.mjs +++ b/scripts/check-local-media.mjs @@ -22,3 +22,11 @@ for (const file of await readdir(assetDirectory)) { if (!/\.(?:jpe?g|png|webp|avif)$/i.test(file)) continue; await readFile(`media/seed/${file}`); } + +const localMediaDirectory = "media/seed"; +for (const file of await readdir(localMediaDirectory)) { + if (file.startsWith("seed-")) { + console.error(`media/seed/${file} is a collapsed placeholder`); + process.exitCode = 1; + } +}