From 78385bf82fe3c3ba96d42f8f77388f096844e8ff Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Wed, 22 Apr 2026 06:48:44 +0000 Subject: [PATCH] fix(layout): accept deprecated layout mix in ProSettings type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ProLayout maps mix to side at runtime; widening the type fixes tests and user configs that still pass layout="mix". Co-authored-by: 陈帅 --- src/layout/defaultSettings.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/layout/defaultSettings.ts b/src/layout/defaultSettings.ts index 8ad28d1398f8..0995d2bfb0c5 100644 --- a/src/layout/defaultSettings.ts +++ b/src/layout/defaultSettings.ts @@ -11,13 +11,14 @@ export type RenderSetting = { export type PureSettings = { /** * @name layout 的布局方式 - * @type 'side' | 'top' + * @type 'side' | 'top' | 'mix' * * @example 顶部菜单 layout="top" * @example 侧边菜单 layout="side" * @example 顶栏一级菜单 + 侧栏子菜单:layout="side" 且 `splitMenus`,或用 `headerMenuRender` 自定义顶栏菜单 + * @deprecated `layout="mix"` 仍会被接受,运行时按 `side` 处理,见 ProLayout 内注释 */ - layout?: 'side' | 'top'; + layout?: 'side' | 'top' | 'mix'; /** @name layout of content: `Fluid` or `Fixed`, only works when layout is top */ contentWidth?: ContentWidth; /** @name sticky header */