create-windy 0.3.19 → 0.4.1

package/template/apps/server/src/system/route-test-runtime.ts

@@ -0,0 +1,24 @@
+import type { FeatureFlagDefinition } from "@southwind-ai/shared";
+import { createServerRuntime, type ServerRuntimeOptions } from "../runtime.js";
+
+interface TestFeatureCatalog {
+  readonly features: readonly FeatureFlagDefinition[];
+  readonly disabledModuleNames?: readonly string[];
+}
+
+type TestRuntimeOptions = Omit<
+  ServerRuntimeOptions,
+  "featureCatalog" | "disabledModuleNames"
+>;
+
+export function createRouteTestRuntime(
+  catalog: TestFeatureCatalog,
+  env: Record<string, string | undefined> = {},
+  options: TestRuntimeOptions = {},
+) {
+  return createServerRuntime(env, {
+    ...options,
+    featureCatalog: catalog.features,
+    disabledModuleNames: new Set(catalog.disabledModuleNames),
+  });
+}

package/template/apps/server/src/system/routes-validation.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from "bun:test";
 import { createFoundationSnapshot } from "../foundation.js";
-import { createServerRuntime } from "../runtime.js";
 import { FakeRouteApp } from "./route-test-app.js";
+import { createRouteTestRuntime } from "./route-test-runtime.js";
 import { registerSystemRoutes } from "./routes.js";
 import { createSystemRepositories } from "./seed.js";
 
@@ -71,12 +71,16 @@ describe("system route query validation", () => {
 });
 
 async function createFixture(path: string) {
-  const runtime = createServerRuntime({ WINDY_DEV_ADMIN_TOKEN: "token_1" });
+  const snapshot = createFoundationSnapshot();
+  const runtime = createRouteTestRuntime(snapshot, {
+    WINDY_DEV_ADMIN_TOKEN: "token_1",
+  });
   const app = new FakeRouteApp();
   registerSystemRoutes(
     app,
-    createSystemRepositories(createFoundationSnapshot()),
+    createSystemRepositories(snapshot),
     runtime,
+    snapshot.features,
   );
   const guardContext = await runtime.createGuardContext(
     new Request(`http://localhost${path}`, {

package/template/apps/server/src/system/routes.test.ts

@@ -12,19 +12,21 @@ import { registerSystemRoutes } from "./routes.js";
 import { createSystemRepositories } from "./seed.js";
 
 async function routeFixture(
-  features: FeatureFlagDefinition[] = [],
+  features?: FeatureFlagDefinition[],
   auditWriter?: AuditEventWriter,
 ) {
+  const snapshot = createFoundationSnapshot();
+  const activeFeatures = features ?? snapshot.features;
   const runtime = createServerRuntime(
     { WINDY_DEV_ADMIN_TOKEN: "token_1" },
-    { auditWriter },
+    { auditWriter, featureCatalog: activeFeatures },
   );
   const app = new FakeRouteApp();
   registerSystemRoutes(
     app,
-    createSystemRepositories(createFoundationSnapshot()),
+    createSystemRepositories(snapshot),
     runtime,
-    features,
+    activeFeatures,
   );
   const guardContext = await runtime.createGuardContext(
     new Request("http://localhost/api/system/users", {
@@ -78,12 +80,17 @@ describe("system routes", () => {
   });
 
   test("缺少权限时返回 403 Response 并记录 security.denied", async () => {
-    const runtime = createServerRuntime();
+    const snapshot = createFoundationSnapshot();
+    const runtime = createServerRuntime(
+      {},
+      { featureCatalog: snapshot.features },
+    );
     const app = new FakeRouteApp();
     registerSystemRoutes(
       app,
-      createSystemRepositories(createFoundationSnapshot()),
+      createSystemRepositories(snapshot),
       runtime,
+      snapshot.features,
     );
     const guardContext = await runtime.createGuardContext(
       new Request("http://localhost/api/system/users"),
@@ -127,7 +134,7 @@ describe("system routes", () => {
 
     expect(hiddenResponse.status).toBe(403);
     await expect(hiddenResponse.json()).resolves.toMatchObject({
-      reason: "feature-disabled",
+      reason: "dependency-missing",
     });
 
     // @windy-module system.license begin
@@ -209,7 +216,7 @@ describe("system routes", () => {
 
   test("用户与角色变更使用关键策略，普通资源变更保持降级可用", async () => {
     const policies: string[] = [];
-    const { app, guardContext } = await routeFixture([], {
+    const { app, guardContext } = await routeFixture(undefined, {
       write: async (_event, policy) => void policies.push(policy || "ordinary"),
     });
 
@@ -234,7 +241,7 @@ describe("system routes", () => {
   });
 
   test("关键资源审计失败会拒绝请求，普通资源仍完成并报告降级", async () => {
-    const { app, runtime, guardContext } = await routeFixture([], {
+    const { app, runtime, guardContext } = await routeFixture(undefined, {
       write: async () => {
         throw new Error("audit persistence unavailable");
       },
@@ -281,7 +288,10 @@ describe("system routes", () => {
     await repositories.features.syncManifest(snapshot.features);
     const runtime = createServerRuntime(
       { WINDY_DEV_ADMIN_TOKEN: "token_1" },
-      { featureResolver: repositories.features },
+      {
+        featureResolver: repositories.features,
+        featureCatalog: snapshot.features,
+      },
     );
     const app = new FakeRouteApp();
     registerSystemRoutes(app, repositories, runtime, snapshot.features);
@@ -315,7 +325,7 @@ describe("system routes", () => {
     });
     expect(denied.status).toBe(403);
     await expect(denied.json()).resolves.toMatchObject({
-      reason: "feature-disabled",
+      reason: "dependency-missing",
     });
     expect(app.handlers.has("POST /system/features")).toBe(false);
     expect(app.handlers.has("POST /system/features/import")).toBe(false);

package/template/apps/server/src/system/routes.ts

@@ -27,7 +27,7 @@ export function registerSystemRoutes(
   app: RouteApp,
   repositories: SystemRepositories,
   runtime: ReturnType<typeof createServerRuntime>,
-  features: FeatureFlagDefinition[] = [],
+  features: FeatureFlagDefinition[],
   options: {
     authRepository?: Pick<AuthRepository, "revokeUserSessions">;
   } = {},
@@ -98,7 +98,16 @@ export function registerSystemRoutes(
     ),
     runtime,
   );
-  registerFeatureFlagRoutes(app, repositories.features, runtime);
+  const featureManagement = findSystemFeature(features, "feature");
+  if (!featureManagement) {
+    throw new Error("功能开关管理缺少 system.feature Feature");
+  }
+  registerFeatureFlagRoutes(
+    app,
+    repositories.features,
+    runtime,
+    featureManagement,
+  );
   // @windy-module system.license begin
   registerResourceRoutes(
     app,

package/template/apps/server/src/work-order/foundation-modules.test.ts

@@ -43,7 +43,9 @@ describe("平台模块 composition root", () => {
       "advanced",
     ]);
     const workOrder = modules.find(({ name }) => name === "work-order");
-    expect(workOrder?.adminRoutes).toEqual([]);
+    expect(workOrder?.adminRoutes.map(({ key }) => key)).toEqual([
+      "work-order.ticket.list",
+    ]);
     expect(workOrder?.apiPermissions).toHaveLength(5);
     expect(workOrder?.tasks.map(({ key }) => key)).toContain(
       "work-order.ticket.snapshot",
@@ -88,9 +90,9 @@ describe("平台模块 composition root", () => {
       "@southwind-ai/web",
     );
     expect(businessPackage.dependencies).not.toHaveProperty("vue");
-    expect(webPackage.dependencies).not.toHaveProperty(
-      "@southwind-ai/example-work-order",
-    );
+    expect(webPackage.dependencies).toMatchObject({
+      "@southwind-ai/example-work-order": "workspace:*",
+    });
   });
 
   test("示例模块经 Host 声明式装配提供搜索 Provider", async () => {

package/template/apps/server/src/work-order/routes.test.ts

@@ -22,6 +22,9 @@ describe("示例工单 routes", () => {
       items: WorkOrder[];
     };
     expect(listed.items.map(({ id }) => id)).toEqual(["ticket_self"]);
+    expect(fixture.runtime.auditSink.list()).toContainEqual(
+      expect.objectContaining({ action: "data.read" }),
+    );
 
     const denied = (await fixture.invoke("GET", "/work-orders/:id", {
       id: "ticket_other",
@@ -76,6 +79,11 @@ describe("示例工单 routes", () => {
         target: expect.objectContaining({ id: created.id, type: "work-order" }),
       }),
     );
+    expect(
+      fixture.runtime.auditSink
+        .list()
+        .filter(({ action }) => action === "crud.create"),
+    ).toHaveLength(1);
   });
 });
 

package/template/apps/server/src/work-order/task.test.ts

@@ -33,9 +33,14 @@ describe("示例工单后台任务", () => {
         workOrderDataScopeBinding,
       ),
     });
+    const definitions = createModuleTaskDefinitions(
+      hosts,
+      createFoundationSnapshot().features,
+    );
+    expect(definitions[0]?.auditAction).toBe("task.execute");
     const scheduler = new SchedulerService(
       new InMemorySchedulerRepository(),
-      createModuleTaskDefinitions(hosts, createFoundationSnapshot().features),
+      definitions,
       runtime,
     );
     await scheduler.initialize();

package/template/apps/web/Dockerfile

@@ -4,6 +4,7 @@ FROM oven/bun:1.3.14-alpine AS deps
 WORKDIR /app
 
 COPY package.json bun.lock ./
+COPY windy.modules.json windy.modules.json
 # windy-copy:deps begin
 COPY apps/license/package.json apps/license/package.json
 COPY apps/server/package.json apps/server/package.json
@@ -27,9 +28,13 @@ RUN --mount=type=cache,id=windy-bun-1.3.14,target=/root/.bun/install/cache,shari
 FROM deps AS build
 # windy-copy:build begin
 COPY apps/web apps/web
+COPY packages/example-work-order packages/example-work-order
+COPY packages/jobs packages/jobs
 COPY packages/license-sdk packages/license-sdk
 COPY packages/modules packages/modules
+COPY packages/server-sdk packages/server-sdk
 COPY packages/shared packages/shared
+COPY packages/storage packages/storage
 # windy-copy:build end
 RUN bun run --cwd apps/web build
 

package/template/apps/web/package.json

@@ -18,6 +18,7 @@
     "@tanstack/vue-form": "^1.33.0",
     "@tanstack/vue-table": "^8.21.3",
     "@vueuse/core": "^14.3.0",
+    "@southwind-ai/example-work-order": "workspace:*",
     "@southwind-ai/license": "workspace:*",
     "@southwind-ai/shared": "workspace:*",
     "class-variance-authority": "^0.7.1",

package/template/apps/web/scripts/validate-admin-ui-composition.ts

@@ -0,0 +1,106 @@
+import moduleAssembly from "../../../windy.modules.json";
+import {
+  systemAdminUiManifests,
+  validateProjectModuleAssembly,
+} from "@southwind-ai/modules/admin-ui";
+import {
+  projectAdminUiManifest,
+  type AdminUiManifestSource,
+} from "@southwind-ai/modules";
+import { webComposition } from "../src/app/web-composition";
+import {
+  resolveAdminUiComposition,
+  validateAdminRoutePathCollisions,
+  type AdminUiModule,
+} from "../src/router/admin-ui-composition";
+import { validatePlatformAdminRouteKeys } from "../src/router/manifest-routes";
+import { platformAdminRouteBindings } from "../src/router/platform-admin-route-bindings";
+import { reservedWebRoutePathList } from "../src/router/reserved-route-paths";
+
+const assembly = validateProjectModuleAssembly(moduleAssembly);
+const installedModules = await Promise.all(
+  assembly.modules
+    .filter(
+      (
+        entry,
+      ): entry is typeof entry & {
+        readonly package: string;
+      } => entry.enabled && entry.package !== null,
+    )
+    .map(async (entry) => {
+      const [adminLoaded, manifestLoaded]: readonly [unknown, unknown] =
+        await Promise.all([
+          import(`${entry.package}/admin`),
+          import(`${entry.package}/manifest`),
+        ]);
+      if (!isAdminUiModuleExport(adminLoaded)) {
+        throw new Error(
+          `Module ${entry.name} 缺少 windyAdminUiModule 标准导出`,
+        );
+      }
+      if (!isModuleManifestExport(manifestLoaded)) {
+        throw new Error(
+          `Module ${entry.name} 缺少 windyModuleManifest 标准导出`,
+        );
+      }
+      if (adminLoaded.windyAdminUiModule.manifest.name !== entry.name) {
+        throw new Error(
+          `Module package ${entry.package} 导出了错误 Admin UI：${adminLoaded.windyAdminUiModule.manifest.name}`,
+        );
+      }
+      const expectedAdminManifest = projectAdminUiManifest(
+        manifestLoaded.windyModuleManifest,
+      );
+      if (
+        JSON.stringify(adminLoaded.windyAdminUiModule.manifest) !==
+        JSON.stringify(expectedAdminManifest)
+      ) {
+        throw new Error(
+          `Module ${entry.name} 的 ./admin 与 ./manifest 投影不一致`,
+        );
+      }
+      return adminLoaded.windyAdminUiModule;
+    }),
+);
+
+const composition = resolveAdminUiComposition({
+  declaration: webComposition,
+  assembly,
+  platformModules: systemAdminUiManifests(),
+  installedModules,
+});
+validateAdminRoutePathCollisions(composition, reservedWebRoutePathList);
+validatePlatformAdminRouteKeys(
+  platformAdminRouteBindings.map(({ routeKey }) => routeKey),
+);
+
+function isAdminUiModuleExport(
+  value: unknown,
+): value is { readonly windyAdminUiModule: AdminUiModule } {
+  if (!isRecord(value) || !isRecord(value.windyAdminUiModule)) return false;
+  const module = value.windyAdminUiModule;
+  return (
+    isRecord(module.manifest) &&
+    typeof module.manifest.name === "string" &&
+    typeof module.manifest.version === "string" &&
+    Array.isArray(module.manifest.adminRoutes) &&
+    typeof module.hostRange === "string" &&
+    Array.isArray(module.pages)
+  );
+}
+
+function isModuleManifestExport(
+  value: unknown,
+): value is { readonly windyModuleManifest: AdminUiManifestSource } {
+  if (!isRecord(value) || !isRecord(value.windyModuleManifest)) return false;
+  const manifest = value.windyModuleManifest;
+  return (
+    typeof manifest.name === "string" &&
+    typeof manifest.version === "string" &&
+    Array.isArray(manifest.adminRoutes)
+  );
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}

package/template/apps/web/src/app/web-composition.ts

@@ -0,0 +1,24 @@
+import { defineWebComposition } from "../router/admin-ui-composition";
+
+/**
+ * 客户拥有的 Admin UI 覆盖声明。
+ *
+ * 模块的窄 Manifest 与默认页面来自 package 标准 `./admin` 导出；这里只覆盖客户
+ * 自己接管的页面 loader 与呈现偏好，不复制路径、标题、Feature 或 Permission。
+ */
+export const webComposition = defineWebComposition({
+  overrides: [
+    // @windy-module work-order begin
+    {
+      moduleName: "work-order",
+      pages: [
+        {
+          routeKey: "work-order.ticket.list",
+          load: () => import("../pages/work-orders/WorkOrderListPage.vue"),
+        },
+      ],
+    },
+    // @windy-module work-order end
+  ],
+  presentation: [],
+});

package/template/apps/web/src/app/web-composition.webtest.ts

@@ -0,0 +1,15 @@
+import { describe, expect, test } from "vitest";
+import { webComposition } from "./web-composition";
+
+describe("project-owned Web 组合声明", () => {
+  test("示例工单只覆盖 moduleName 与 lazy page loader", () => {
+    const registration = webComposition.overrides.find(
+      ({ moduleName }) => moduleName === "work-order",
+    );
+
+    expect(registration?.moduleName).toBe("work-order");
+    expect(registration?.pages).toHaveLength(1);
+    expect(registration?.pages[0]?.routeKey).toBe("work-order.ticket.list");
+    expect(registration?.pages[0]?.load).toBeTypeOf("function");
+  });
+});

package/template/apps/web/src/composables/useWatermarkSettings.webtest.ts

@@ -30,6 +30,8 @@ describe("全局水印策略状态", () => {
       density: "high",
       contentFields: ["custom"],
       customContent: "全局审计",
+      opacityPercent: 12,
+      fontSize: 18,
     });
     const { useWatermarkSettings } = await import("./useWatermarkSettings");
     const watermark = useWatermarkSettings(shallowRef(undefined));
@@ -42,6 +44,8 @@ describe("全局水印策略状态", () => {
       density: "high",
       contentFields: ["custom"],
       customContent: "全局审计",
+      opacityPercent: 12,
+      fontSize: 18,
     });
     expect(localStorageRead).not.toHaveBeenCalled();
     expect(localStorageWrite).not.toHaveBeenCalled();
@@ -54,6 +58,8 @@ describe("全局水印策略状态", () => {
       density: "medium",
       contentFields: ["username", "displayName"],
       customContent: "",
+      opacityPercent: 8,
+      fontSize: 14,
     });
     api.update.mockResolvedValue({
       enabled: true,
@@ -61,6 +67,8 @@ describe("全局水印策略状态", () => {
       density: "high",
       contentFields: ["username", "custom"],
       customContent: "  内部资料  ",
+      opacityPercent: 16,
+      fontSize: 20,
     });
     const { useWatermarkSettings } = await import("./useWatermarkSettings");
     const actor = shallowRef({
@@ -80,6 +88,8 @@ describe("全局水印策略状态", () => {
       density: "high",
       contentFields: ["username", "custom"],
       customContent: "内部资料",
+      opacityPercent: 16,
+      fontSize: 20,
     });
 
     expect(api.update).toHaveBeenCalledWith({
@@ -88,6 +98,8 @@ describe("全局水印策略状态", () => {
       density: "high",
       contentFields: ["username", "custom"],
       customContent: "内部资料",
+      opacityPercent: 16,
+      fontSize: 20,
     });
     expect(second.policy.value).toEqual({
       enabled: true,
@@ -95,6 +107,8 @@ describe("全局水印策略状态", () => {
       density: "high",
       contentFields: ["username", "custom"],
       customContent: "内部资料",
+      opacityPercent: 16,
+      fontSize: 20,
     });
   });
 });

package/template/apps/web/src/composables/watermark-settings.ts

@@ -3,6 +3,8 @@ import {
   DEFAULT_PLATFORM_WATERMARK_POLICY,
   WATERMARK_CONTENT_FIELDS,
   WATERMARK_DENSITIES,
+  WATERMARK_FONT_SIZE_RANGE,
+  WATERMARK_OPACITY_RANGE,
   type PlatformWatermarkPolicy,
   type WatermarkContentField,
   type WatermarkDensity,
@@ -16,8 +18,6 @@ const DENSITY_GAPS: Record<
   medium: { horizontal: 72, vertical: 48 },
   high: { horizontal: 36, vertical: 24 },
 };
-const FONT_SIZE = 14;
-const LINE_HEIGHT = 22;
 const ROTATION_RADIANS = (22 * Math.PI) / 180;
 const MAX_LINE_WEIGHT = 32;
 
@@ -58,15 +58,26 @@ export function normalizeWatermarkPolicy(
       ),
     ),
   ];
+  const enabled = Boolean(value.enabled && value.businessPagesEnabled);
   return {
-    enabled: value.enabled,
-    businessPagesEnabled: value.businessPagesEnabled,
+    enabled,
+    businessPagesEnabled: enabled,
     density,
     contentFields:
       contentFields.length > 0
         ? contentFields
         : [...DEFAULT_PLATFORM_WATERMARK_POLICY.contentFields],
     customContent: value.customContent.trim().slice(0, 80),
+    opacityPercent: boundedInteger(
+      value.opacityPercent,
+      WATERMARK_OPACITY_RANGE,
+      DEFAULT_PLATFORM_WATERMARK_POLICY.opacityPercent,
+    ),
+    fontSize: boundedInteger(
+      value.fontSize,
+      WATERMARK_FONT_SIZE_RANGE,
+      DEFAULT_PLATFORM_WATERMARK_POLICY.fontSize,
+    ),
   };
 }
 
@@ -78,10 +89,19 @@ export interface WatermarkPattern {
 export function createWatermarkPattern(
   content: string,
   density: WatermarkDensity,
+  fontSize: number,
 ): WatermarkPattern {
+  const safeFontSize = boundedInteger(
+    fontSize,
+    WATERMARK_FONT_SIZE_RANGE,
+    DEFAULT_PLATFORM_WATERMARK_POLICY.fontSize,
+  );
+  const lineHeight = Math.ceil(safeFontSize * 1.57);
   const lines = wrapWatermarkContent(content);
-  const textWidth = Math.max(...lines.map(estimatedTextWidth));
-  const textHeight = lines.length * LINE_HEIGHT;
+  const textWidth = Math.max(
+    ...lines.map((line) => estimatedTextWidth(line, safeFontSize)),
+  );
+  const textHeight = lines.length * lineHeight;
   const rotatedWidth =
     textWidth * Math.cos(ROTATION_RADIANS) +
     textHeight * Math.sin(ROTATION_RADIANS);
@@ -91,17 +111,17 @@ export function createWatermarkPattern(
   const gap = DENSITY_GAPS[density];
   const width = Math.ceil(rotatedWidth + gap.horizontal);
   const height = Math.ceil(rotatedHeight + gap.vertical);
-  const firstLineY = (height - textHeight) / 2 + FONT_SIZE;
+  const firstLineY = (height - textHeight) / 2 + safeFontSize;
   const tspans = lines
     .map(
       (line, index) =>
-        `<tspan x="${width / 2}" y="${firstLineY + index * LINE_HEIGHT}">${escapeXml(line)}</tspan>`,
+        `<tspan x="${width / 2}" y="${firstLineY + index * lineHeight}">${escapeXml(line)}</tspan>`,
     )
     .join("");
   const svg =
     `<svg xmlns="http://www.w3.org/2000/svg" width="${width}" height="${height}" viewBox="0 0 ${width} ${height}">` +
     `<g transform="rotate(-22 ${width / 2} ${height / 2})">` +
-    `<text text-anchor="middle" font-family="system-ui,sans-serif" font-size="${FONT_SIZE}" font-weight="500" fill="black">${tspans}</text>` +
+    `<text text-anchor="middle" font-family="system-ui,sans-serif" font-size="${safeFontSize}" font-weight="500" fill="black">${tspans}</text>` +
     "</g></svg>";
   return {
     image: `url("data:image/svg+xml,${encodeURIComponent(svg)}")`,
@@ -125,8 +145,8 @@ function wrapWatermarkContent(content: string): string[] {
   return lines.length > 0 ? lines : [""];
 }
 
-function estimatedTextWidth(value: string): number {
-  return Math.max(1, textWeight(value)) * (FONT_SIZE * 0.56);
+function estimatedTextWidth(value: string, fontSize: number): number {
+  return Math.max(1, textWeight(value)) * (fontSize * 0.56);
 }
 
 function textWeight(value: string): number {
@@ -145,3 +165,12 @@ function escapeXml(value: string): string {
     .replaceAll('"', "&quot;")
     .replaceAll("'", "&apos;");
 }
+
+function boundedInteger(
+  value: number,
+  range: { readonly min: number; readonly max: number },
+  fallback: number,
+): number {
+  if (!Number.isFinite(value)) return fallback;
+  return Math.min(range.max, Math.max(range.min, Math.round(value)));
+}

package/template/apps/web/src/composables/watermark-settings.webtest.ts

@@ -73,8 +73,8 @@ describe("水印设置", () => {
   test("高密度缩小平铺单元且长内容自动换行以避免相邻水印重叠", () => {
     const content =
       "zhangsan · 张三 · 13800138000 · zs@example.com · 内部资料请勿外传";
-    const low = createWatermarkPattern(content, "low");
-    const high = createWatermarkPattern(content, "high");
+    const low = createWatermarkPattern(content, "low", 14);
+    const high = createWatermarkPattern(content, "high", 14);
     const dimensions = (value: typeof low) =>
       value.size.match(/\d+/g)!.map(Number);
 
@@ -86,21 +86,34 @@ describe("水印设置", () => {
     ).toBeGreaterThan(1);
   });
 
-  test("服务端策略内容会被规范化后渲染", () => {
+  test("字体大小会改变平铺尺寸并写入实际 SVG", () => {
+    const small = createWatermarkPattern("zhangsan · 张三", "medium", 12);
+    const large = createWatermarkPattern("zhangsan · 张三", "medium", 32);
+    const width = (value: typeof small) => Number(value.size.match(/\d+/)?.[0]);
+
+    expect(width(large)).toBeGreaterThan(width(small));
+    expect(decodeURIComponent(large.image)).toContain('font-size="32"');
+  });
+
+  test("服务端策略内容会被规范化后渲染且旧范围开关合并到总开关", () => {
     expect(
       normalizeWatermarkPolicy({
-        enabled: false,
-        businessPagesEnabled: true,
+        enabled: true,
+        businessPagesEnabled: false,
         density: "high",
         contentFields: ["phone", "phone"],
         customContent: `  ${"x".repeat(100)}  `,
+        opacityPercent: 99,
+        fontSize: 2,
       }),
     ).toEqual({
       enabled: false,
-      businessPagesEnabled: true,
+      businessPagesEnabled: false,
       density: "high",
       contentFields: ["phone"],
       customContent: "x".repeat(80),
+      opacityPercent: 30,
+      fontSize: 12,
     });
   });
 });

package/template/apps/web/src/layout/AppSidebar.vue

@@ -40,6 +40,7 @@ import { useAccessSnapshot } from "@/composables/useAccessSnapshot";
 import { useLicenseRuntime } from "@/composables/useLicenseRuntime";
 // @windy-module system.license end
 import { usePlatformSettings } from "@/composables/usePlatformSettings";
+import { webAdminUiComposition } from "@/router/web-composition-host";
 import { authorizedSidebarMenus } from "./navigation";
 
 interface NavigationGroup {
@@ -74,7 +75,13 @@ const license = useLicenseRuntime();
 const platform = usePlatformSettings();
 const openGroups = reactive<Record<string, boolean>>(loadOpenGroups());
 const authorizedMenus = computed(() =>
-  access.snapshot.value ? authorizedSidebarMenus(access.snapshot.value) : [],
+  access.snapshot.value
+    ? authorizedSidebarMenus(
+        access.snapshot.value,
+        webAdminUiComposition.presentation,
+        webAdminUiComposition,
+      )
+    : [],
 );
 const settingsMenu = computed(() =>
   findMenu(authorizedMenus.value, "system.settings"),

package/template/apps/web/src/layout/GlobalWatermark.layering.webtest.ts

@@ -17,6 +17,8 @@ const state = vi.hoisted(() => {
       density: "medium",
       contentFields: ["username", "displayName"],
       customContent: "",
+      opacityPercent: 8,
+      fontSize: 14,
     },
   };