From 1a4e806ca83446bff0d2bf7f25912e3295205b36 Mon Sep 17 00:00:00 2001 From: que01 Date: Sun, 20 Sep 2026 10:19:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BC=BA=E5=8C=96=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=A9=BA=E9=97=B4=E5=AD=97=E6=AE=B5=E8=BF=90=E8=A1=8C=E6=97=B6?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/api/src/admin.dto.ts | 29 ++++++++++++++++++-------- apps/api/test/http.integration.test.js | 14 ++++++++++++- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/apps/api/src/admin.dto.ts b/apps/api/src/admin.dto.ts index 42c1a7f..deef6ac 100644 --- a/apps/api/src/admin.dto.ts +++ b/apps/api/src/admin.dto.ts @@ -1,4 +1,15 @@ -import { IsArray, IsBoolean, IsIn, IsInt, IsOptional, IsString, Max, Min } from "class-validator"; +import { + IsArray, + IsBoolean, + IsIn, + IsInt, + IsObject, + IsOptional, + IsString, + Matches, + Max, + Min, +} from "class-validator"; export class UpdateBrandDto { @IsOptional() @IsString() name?: string; @@ -137,21 +148,21 @@ export class UpdateModuleDto { } export class CreateFieldDefinitionDto { - @IsString() scope!: string; - @IsString() key!: string; + @IsIn(["profile", "service", "inquiry"]) scope!: string; + @IsString() @Matches(/^[a-z][a-z0-9_]*$/) key!: string; @IsString() label!: string; @IsIn(["text", "textarea", "number", "date", "select", "multi-select", "image", "url", "phone"]) type!: string; @IsOptional() @IsBoolean() required?: boolean; @IsOptional() @IsBoolean() isVisible?: boolean; @IsOptional() @IsInt() @Min(0) @Max(9999) sortOrder?: number; - @IsOptional() options?: unknown; - @IsOptional() visibleWhen?: unknown; + @IsOptional() @IsArray() options?: unknown[]; + @IsOptional() @IsObject() visibleWhen?: Record; } export class UpdateFieldDefinitionDto { - @IsOptional() @IsString() scope?: string; - @IsOptional() @IsString() key?: string; + @IsOptional() @IsIn(["profile", "service", "inquiry"]) scope?: string; + @IsOptional() @IsString() @Matches(/^[a-z][a-z0-9_]*$/) key?: string; @IsOptional() @IsString() label?: string; @IsOptional() @IsIn(["text", "textarea", "number", "date", "select", "multi-select", "image", "url", "phone"]) @@ -159,8 +170,8 @@ export class UpdateFieldDefinitionDto { @IsOptional() @IsBoolean() required?: boolean; @IsOptional() @IsBoolean() isVisible?: boolean; @IsOptional() @IsInt() @Min(0) @Max(9999) sortOrder?: number; - @IsOptional() options?: unknown; - @IsOptional() visibleWhen?: unknown; + @IsOptional() @IsArray() options?: unknown[]; + @IsOptional() @IsObject() visibleWhen?: Record; } export class CreateInquiryFormDto { diff --git a/apps/api/test/http.integration.test.js b/apps/api/test/http.integration.test.js index 32074ea..29e0b13 100644 --- a/apps/api/test/http.integration.test.js +++ b/apps/api/test/http.integration.test.js @@ -47,6 +47,9 @@ test("health and public content are available without authentication", async () }); test("admin can install a template and public workspace exposes enabled configuration", async () => { + await prisma.brandFieldDefinition.deleteMany({ where: { brandId } }); + await prisma.brandModule.deleteMany({ where: { brandId } }); + await prisma.brandTemplateInstallation.deleteMany({ where: { brandId } }); const login = await request("/admin/session/login", { method: "POST", payload: { username: "admin", password: process.env.SEED_ADMIN_PASSWORD }, @@ -85,6 +88,9 @@ test("admin can install a template and public workspace exposes enabled configur }); test("admin can customize workspace modules and fields with brand isolation", async () => { + await prisma.brandFieldDefinition.deleteMany({ where: { brandId } }); + await prisma.brandModule.deleteMany({ where: { brandId } }); + await prisma.brandTemplateInstallation.deleteMany({ where: { brandId } }); const login = await request("/admin/session/login", { method: "POST", payload: { username: "admin", password: process.env.SEED_ADMIN_PASSWORD }, @@ -100,6 +106,12 @@ test("admin can customize workspace modules and fields with brand isolation", as headers: { authorization: `Bearer ${token}` }, }); const moduleId = JSON.parse(workspace.body).modules[0].id; + const invalidField = await request("/admin/workspace/fields", { + method: "POST", + headers: { authorization: `Bearer ${token}` }, + payload: { scope: "unknown", key: "Bad-Key", label: "非法字段", type: "text" }, + }); + assert.equal(invalidField.statusCode, 400); const updatedModule = await request(`/admin/workspace/modules/${moduleId}`, { method: "PATCH", headers: { authorization: `Bearer ${token}` }, @@ -111,7 +123,7 @@ test("admin can customize workspace modules and fields with brand isolation", as headers: { authorization: `Bearer ${token}` }, payload: { scope: "profile", - key: `region-${Date.now()}`, + key: `region_${Date.now()}`, label: "服务区域", type: "text", required: false,