@gx-design-vue/pro-layout 0.1.0-alpha.20 → 0.1.0-alpha.21

package/dist/style/breadcrumb.js

@@ -44,7 +44,8 @@ const genBreadcrumbStyle = (token) => {
 		[`${breadcrumbCls}-item-icon`]: {
 			display: "inline-flex",
 			alignItems: "center",
-			fontSize: token.fontSize
+			fontSize: token.fontSize,
+			minHeight: unit(token.fontHeight)
 		},
 		[`${breadcrumbCls}-overlay-link`]: {
 			color: token.colorTextDescription,

package/dist/style/logo.js

@@ -2,6 +2,11 @@
 const genLogoStyle = (token) => {
 	return {
 		[`${token.componentCls}-sider-header ${token.componentCls}-logo`]: { borderBlockEnd: `1px solid ${token.siderColorMenuItemDivider}` },
+		[`${token.componentCls}-mix ${token.componentCls}-sider-header ${token.componentCls}-logo, ${token.componentCls}-wide ${token.componentCls}-sider-header ${token.componentCls}-logo`]: {
+			paddingBlock: 0,
+			paddingInline: 12,
+			height: "100%"
+		},
 		[`${token.componentCls}-logo`]: {
 			position: "relative",
 			display: "flex",
@@ -52,7 +57,7 @@ const genLogoStyle = (token) => {
 				paddingInlineStart: 0
 			}
 		},
-		[`${token.componentCls}-side ${token.componentCls}-logo-collapsed`]: {
+		[`${token.componentCls}-side ${token.componentCls}-logo-collapsed, ${token.componentCls}-mix ${token.componentCls}-logo-collapsed, ${token.componentCls}-wide ${token.componentCls}-logo-collapsed`]: {
 			paddingInline: 0,
 			paddingBlock: 16
 		},

package/dist/style/menu.d.ts

@@ -4,7 +4,7 @@ import { GenerateStyle } from "antdv-next/dist/theme/internal";
 
 //#region src/style/menu.d.ts
 /**
- * LayoutMenu 结构样式 —— 颜色/背景/选中/hover 由 LayoutMenu 内层 ConfigProvider 的
+ * ProMenu 结构样式 —— 颜色/背景/选中/hover 由 ProMenu 内层 ConfigProvider 的
  * `components.Menu` token 负责，这里只补 antdv 未 token 化的结构/尺寸。
  *
  * 全部置于父级 `${componentCls}` 下命中 `${antCls}-menu`，靠 (0,2,0) 压过 antdv 的

package/dist/style/menu.js

@@ -1,7 +1,7 @@
 import { unit } from "@antdv-next/cssinjs";
 //#region src/style/menu.ts
 /**
-* LayoutMenu 结构样式 —— 颜色/背景/选中/hover 由 LayoutMenu 内层 ConfigProvider 的
+* ProMenu 结构样式 —— 颜色/背景/选中/hover 由 ProMenu 内层 ConfigProvider 的
 * `components.Menu` token 负责，这里只补 antdv 未 token 化的结构/尺寸。
 *
 * 全部置于父级 `${componentCls}` 下命中 `${antCls}-menu`，靠 (0,2,0) 压过 antdv 的

package/dist/theme/augment.d.ts

@@ -1,6 +1,6 @@
 import { ComponentToken } from "../components/AppPage/style.js";
 import { ComponentToken as ComponentToken$1 } from "../components/FooterToolbar/style.js";
-import { ComponentToken as ComponentToken$2 } from "../components/Menu/style/siderMenu.js";
+import { ComponentToken as ComponentToken$2 } from "../components/Menu/style/index.js";
 import { ComponentToken as ComponentToken$3 } from "../components/PageContainer/style.js";
 import { ComponentToken as ComponentToken$4 } from "../components/PageTransition/style.js";
 import { ComponentToken as ComponentToken$5 } from "../components/Tabs/style/index.js";
@@ -12,7 +12,7 @@ declare module 'antdv-next/dist/theme/interface/components' {
     ProLayout?: ComponentToken$6;
     InnerTabs?: ComponentToken$5;
     ProAppPage?: ComponentToken;
-    ProSiderMenu?: ComponentToken$2;
+    ProMenu?: ComponentToken$2;
     ProFooterToolbar?: ComponentToken$1;
     ProPageContainer?: ComponentToken$3;
     ProPageTransition?: ComponentToken$4;

package/dist/theme/interface/components.d.ts

@@ -1,6 +1,6 @@
 import { ComponentToken } from "../../components/AppPage/style.js";
 import { ComponentToken as ComponentToken$1 } from "../../components/FooterToolbar/style.js";
-import { ComponentToken as ComponentToken$2 } from "../../components/Menu/style/siderMenu.js";
+import { ComponentToken as ComponentToken$2 } from "../../components/Menu/style/index.js";
 import { ComponentToken as ComponentToken$3 } from "../../components/PageContainer/style.js";
 import { ComponentToken as ComponentToken$4 } from "../../components/PageTransition/style.js";
 import { ComponentToken as ComponentToken$5 } from "../../components/Tabs/style/index.js";
@@ -11,7 +11,7 @@ interface ComponentTokenMap {
   ProLayout?: ComponentToken$6;
   InnerTabs?: ComponentToken$5;
   ProAppPage?: ComponentToken;
-  ProSiderMenu?: ComponentToken$2;
+  ProMenu?: ComponentToken$2;
   ProFooterToolbar?: ComponentToken$1;
   ProPageContainer?: ComponentToken$3;
   ProPageTransition?: ComponentToken$4;

package/dist/utils/menu.d.ts

@@ -10,7 +10,7 @@ import { BreadcrumbItemType, LayoutMenuRoute, Meta } from "../interface.js";
  *   这是旧实现内存增长 / 卡顿的根因。
  * - **查询 O(1)/O(depth)**：用 `Map<name, entry>` + `parentNames` 替代旧的 `key="0-1-2"` 字符串切割。
  * - **只产路由分支**：数据层只输出清洗 / 排序 / 切分后的 `LayoutMenuRoute[]`；
- *   route → antdv-next `MenuItemType` 的转换交给 `LayoutMenu` 组件自洽完成。
+ *   route → antdv-next `MenuItemType` 的转换交给 `ProMenu` 组件自洽完成。
  */
 /** 扁平查找项：route 为 markRaw 的源路由，parentNames 为根→直接父（含序、不含自身）。 */
 interface MenuLookupEntry {
@@ -102,11 +102,11 @@ declare function toBreadcrumbItems(routes: LayoutMenuRoute[]): BreadcrumbItemTyp
  */
 declare function resolveRouteTarget(lookup: Map<string, MenuLookupEntry>, name: string): ResolveRouteResult;
 /**
- * 取顶层菜单中 `name` 命中项的子级（splitMenus / mix 布局的侧边分支）。
+ * 取顶层菜单中 `name` 命中项的子级（mix 布局的侧边分支）。
  * 替代旧 `menuData.find(name===selectedKeys[0])?.children` 与 `getMenuFirstChildren`。
  */
 declare function selectMenuBranch(menus: LayoutMenuRoute[], name: string | undefined): LayoutMenuRoute[];
-/** 按 `meta.fixed` 拆分菜单（fixed 项钉到侧边栏底部）。替代旧 SiderMenu 的 `baseMenus`/`footerMenus`。 */
+/** 按 `meta.fixed` 拆分菜单（fixed 项钉到侧边栏底部）。替代旧 ProMenu 的 `baseMenus`/`footerMenus`。 */
 declare function partitionFixedMenus(menus: LayoutMenuRoute[]): {
   baseMenus: LayoutMenuRoute[];
   fixedMenus: LayoutMenuRoute[];

package/dist/utils/menu.js

@@ -257,14 +257,14 @@ function resolveRouteTarget(lookup, name) {
 	};
 }
 /**
-* 取顶层菜单中 `name` 命中项的子级（splitMenus / mix 布局的侧边分支）。
+* 取顶层菜单中 `name` 命中项的子级（mix 布局的侧边分支）。
 * 替代旧 `menuData.find(name===selectedKeys[0])?.children` 与 `getMenuFirstChildren`。
 */
 function selectMenuBranch(menus, name) {
 	if (!name) return [];
 	return menus.find((menu) => menu.name === name)?.children ?? [];
 }
-/** 按 `meta.fixed` 拆分菜单（fixed 项钉到侧边栏底部）。替代旧 SiderMenu 的 `baseMenus`/`footerMenus`。 */
+/** 按 `meta.fixed` 拆分菜单（fixed 项钉到侧边栏底部）。替代旧 ProMenu 的 `baseMenus`/`footerMenus`。 */
 function partitionFixedMenus(menus) {
 	const baseMenus = [];
 	const fixedMenus = [];

package/dist/utils/themeComponents.d.ts

@@ -1,4 +1,4 @@
-import { ComponentToken } from "../components/Menu/style/siderMenu.js";
+import { ComponentToken } from "../components/Menu/style/index.js";
 import { BaseLayoutDesignToken } from "@gx-design-vue/pro-provider";
 import { ThemeConfig } from "antdv-next";
 
@@ -8,17 +8,21 @@ type MenuThemeTokens = NonNullable<NonNullable<ThemeConfig['components']>['Menu'
 /**
  * 侧边栏菜单的 antdv-next `Menu` token —— 用布局设计 token 重上色 antdv 自己的菜单 CSS。
  *
- * 等价于旧 `SiderMenu.tsx` 外层 `<ConfigProvider theme={{ components: { Menu } }}>`，
+ * 等价于旧菜单外层 `<ConfigProvider theme={{ components: { Menu } }}>`，
  * 但把 ant-design-vue v4 的 legacy token 名（colorItemBg 等）映射到 antdv-next 新名。
  */
 declare function buildSiderMenuTokens(token: BaseLayoutDesignToken): MenuThemeTokens;
 /**
- * 侧边栏自写菜单的 token —— 外部仍只配置 `components.Menu`，这里转成内部 `ProSiderMenu`。
+ * 侧边栏自写菜单的 token —— 外部仍只配置 `components.Menu`，这里转成内部 `ProMenu`。
  */
 declare function buildSiderProMenuTokens(token: BaseLayoutDesignToken, menuToken?: Partial<MenuThemeTokens>): Partial<ComponentToken>;
 /**
  * 顶部菜单的 antdv-next `Menu` token —— 水平态配色取布局 header token。
  */
 declare function buildHeaderMenuTokens(token: BaseLayoutDesignToken): MenuThemeTokens;
+/**
+ * 顶部自写菜单的 token —— 外部仍只配置 `components.Menu`，这里转成内部 `ProMenu`。
+ */
+declare function buildHeaderProMenuTokens(token: BaseLayoutDesignToken, menuToken?: Partial<MenuThemeTokens>): Partial<ComponentToken>;
 //#endregion
-export { buildHeaderMenuTokens, buildSiderMenuTokens, buildSiderProMenuTokens };
+export { buildHeaderMenuTokens, buildHeaderProMenuTokens, buildSiderMenuTokens, buildSiderProMenuTokens };

package/dist/utils/themeComponents.js

@@ -25,7 +25,7 @@ function pickSiderMenuTokens(menuToken) {
 /**
 * 侧边栏菜单的 antdv-next `Menu` token —— 用布局设计 token 重上色 antdv 自己的菜单 CSS。
 *
-* 等价于旧 `SiderMenu.tsx` 外层 `<ConfigProvider theme={{ components: { Menu } }}>`，
+* 等价于旧菜单外层 `<ConfigProvider theme={{ components: { Menu } }}>`，
 * 但把 ant-design-vue v4 的 legacy token 名（colorItemBg 等）映射到 antdv-next 新名。
 */
 function buildSiderMenuTokens(token) {
@@ -49,7 +49,7 @@ function buildSiderMenuTokens(token) {
 	});
 }
 /**
-* 侧边栏自写菜单的 token —— 外部仍只配置 `components.Menu`，这里转成内部 `ProSiderMenu`。
+* 侧边栏自写菜单的 token —— 外部仍只配置 `components.Menu`，这里转成内部 `ProMenu`。
 */
 function buildSiderProMenuTokens(token, menuToken) {
 	return compact({
@@ -72,8 +72,18 @@ function buildHeaderMenuTokens(token) {
 		horizontalItemHoverBg: header.colorBgMenuItemHover,
 		horizontalItemSelectedBg: header.colorBgMenuItemSelected,
 		horizontalItemBorderRadius: header.itemBorderRadius,
-		itemBorderRadius: header.itemBorderRadius
+		itemBorderRadius: header.itemBorderRadius,
+		itemHeight: header.menuItemHeight
+	});
+}
+/**
+* 顶部自写菜单的 token —— 外部仍只配置 `components.Menu`，这里转成内部 `ProMenu`。
+*/
+function buildHeaderProMenuTokens(token, menuToken) {
+	return compact({
+		...menuToken,
+		...buildHeaderMenuTokens(token)
 	});
 }
 //#endregion
-export { buildHeaderMenuTokens, buildSiderMenuTokens, buildSiderProMenuTokens };
+export { buildHeaderMenuTokens, buildHeaderProMenuTokens, buildSiderMenuTokens, buildSiderProMenuTokens };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gx-design-vue/pro-layout",
   "type": "module",
-  "version": "0.1.0-alpha.20",
+  "version": "0.1.0-alpha.21",
   "description": "Gx Design Pro Layout",
   "author": {
     "name": "gx12358",
@@ -38,13 +38,13 @@
   ],
   "peerDependencies": {
     "@antdv-next/cssinjs": "^1.0.6",
-    "@gx-design-vue/context": "^0.0.5-alpha.7",
-    "@gx-design-vue/icon": "^0.0.1-alpha.12",
-    "@gx-design-vue/pro-hooks": "^0.2.0-alpha.7",
-    "@gx-design-vue/pro-provider": "^0.1.0-alpha.16",
-    "@gx-design-vue/pro-utils": "^0.2.0-alpha.9",
-    "@gx-design-vue/scrollbar": "^0.2.0-alpha.6",
-    "antdv-next": "^1.4.0",
+    "@gx-design-vue/context": "^0.0.5-alpha.8",
+    "@gx-design-vue/icon": "^0.0.1-alpha.13",
+    "@gx-design-vue/pro-hooks": "^0.2.0-alpha.8",
+    "@gx-design-vue/pro-provider": "^0.1.0-alpha.17",
+    "@gx-design-vue/pro-utils": "^0.2.0-alpha.10",
+    "@gx-design-vue/scrollbar": "^0.2.0-alpha.7",
+    "antdv-next": "^1.4.1",
     "vue": ">=3.2.0"
   },
   "dependencies": {
@@ -56,14 +56,14 @@
   },
   "devDependencies": {
     "@antdv-next/cssinjs": "^1.0.6",
-    "antdv-next": "^1.4.0",
+    "antdv-next": "^1.4.1",
     "vue": "^3.5.38",
-    "@gx-design-vue/context": "^0.0.5-alpha.7",
-    "@gx-design-vue/icon": "^0.0.1-alpha.12",
-    "@gx-design-vue/pro-provider": "^0.1.0-alpha.16",
-    "@gx-design-vue/pro-utils": "^0.2.0-alpha.9",
-    "@gx-design-vue/scrollbar": "^0.2.0-alpha.6",
-    "@gx-design-vue/pro-hooks": "^0.2.0-alpha.7"
+    "@gx-design-vue/context": "^0.0.5-alpha.8",
+    "@gx-design-vue/pro-hooks": "^0.2.0-alpha.8",
+    "@gx-design-vue/pro-provider": "^0.1.0-alpha.17",
+    "@gx-design-vue/icon": "^0.0.1-alpha.13",
+    "@gx-design-vue/pro-utils": "^0.2.0-alpha.10",
+    "@gx-design-vue/scrollbar": "^0.2.0-alpha.7"
   },
   "browserslist": [
     "> 1%",

package/dist/components/Menu/SiderMenu.d.ts

@@ -1,29 +0,0 @@
-import { LayoutMenuEmits, LayoutMenuSlots } from "./interface.js";
-import { LayoutClassNamesType, LayoutMenuItemSlotProps, LayoutMenuRoute, LayoutStylesType } from "../../interface.js";
-import { CSSProperties, SlotsType } from "vue";
-import { CustomRender } from "@gx-design-vue/pro-utils";
-
-//#region src/components/Menu/SiderMenu.d.ts
-interface SiderMenuProps {
-  class?: string;
-  prefixCls?: string;
-  style?: CSSProperties;
-  menus?: LayoutMenuRoute[];
-  selectedKeys?: string[];
-  openKeys?: string[];
-  collapsed?: boolean;
-  proClasses?: LayoutClassNamesType;
-  proStyles?: LayoutStylesType;
-  /** 由外部（如 Sider）传入，用于获取包裹 SiderMenu 的滚动容器 DOM 引用 */
-  getScrollContainer?: () => HTMLElement | undefined;
-  menuItemIcon?: (slotProps: LayoutMenuItemSlotProps) => CustomRender;
-  menuItemLabel?: (slotProps: LayoutMenuItemSlotProps) => CustomRender;
-  menuItemExtra?: (slotProps: LayoutMenuItemSlotProps) => CustomRender;
-  onSelect?: LayoutMenuEmits['select'];
-  onOpenChange?: LayoutMenuEmits['openChange'];
-  'onUpdate:selectedKeys'?: LayoutMenuEmits['update:selectedKeys'];
-  'onUpdate:openKeys'?: LayoutMenuEmits['update:openKeys'];
-}
-declare const SiderMenu: import("vue").DefineSetupFnComponent<SiderMenuProps, LayoutMenuEmits, SlotsType<LayoutMenuSlots>, SiderMenuProps, import("vue").PublicProps>;
-//#endregion
-export { SiderMenu as default };