From 9b420e7509aba8e05173ea4dcbcd7ccc3220e511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Mon, 28 Apr 2025 16:49:59 +0800
Subject: [PATCH 1/6] docs(menu): update usage example
---
packages/components/menu/_usage/index.jsx | 29 ++++++++++++++++-------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/packages/components/menu/_usage/index.jsx b/packages/components/menu/_usage/index.jsx
index 9bd87220bd..f2b7dc7737 100644
--- a/packages/components/menu/_usage/index.jsx
+++ b/packages/components/menu/_usage/index.jsx
@@ -7,11 +7,10 @@ import React, { useState, useEffect, useMemo } from 'react';
import BaseUsage, { useConfigChange, usePanelChange } from '@tdesign/react-site/src/components/BaseUsage';
import jsxToString from 'react-element-to-jsx-string';
-import configProps from './props.json';
-
import { Menu } from 'tdesign-react';
import { CodeIcon, AppIcon, FileIcon } from 'tdesign-icons-react';
+import configProps from './props.json';
export default function Usage() {
const [configList, setConfigList] = useState(configProps);
@@ -23,7 +22,7 @@ export default function Usage() {
{ label: 'headMenu', value: 'headMenu' },
];
const defaultProps = {
- logo:
,
+ logo:
,
};
const panelMap = {
menu: (
@@ -64,13 +63,25 @@ export default function Usage() {
borderRadius: 3,
}}
>
-
-
- 菜单1
-
-
- 菜单2
+
+ }>
+ 仪表盘
+ 资源列表} icon={}>
+
+ 菜单二
+
+
+ 调度平台} icon={}>
+
+ 三级菜单-1
+ 三级菜单-2
+ 三级菜单-3
+
+
+ 二级菜单-2
+
+
),
From 304d189094fa20d18ac5dec89674dbb893356692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Mon, 28 Apr 2025 16:57:23 +0800
Subject: [PATCH 2/6] feat: theme logo
---
packages/components/menu/_usage/index.jsx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/packages/components/menu/_usage/index.jsx b/packages/components/menu/_usage/index.jsx
index f2b7dc7737..7d702755da 100644
--- a/packages/components/menu/_usage/index.jsx
+++ b/packages/components/menu/_usage/index.jsx
@@ -21,9 +21,9 @@ export default function Usage() {
{ label: 'menu', value: 'menu' },
{ label: 'headMenu', value: 'headMenu' },
];
- const defaultProps = {
- logo:
,
- };
+ const getLogo = (theme) => (
+
+ );
const panelMap = {
menu: (
-
+
}>
仪表盘
From c2b00ae69e166274af8f1bee9bdbd00d7cbe1caf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Wed, 30 Apr 2025 09:30:35 +0800
Subject: [PATCH 3/6] docs(menu): update usage example
---
packages/components/menu/_usage/index.jsx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/packages/components/menu/_usage/index.jsx b/packages/components/menu/_usage/index.jsx
index 7d702755da..e515093eb2 100644
--- a/packages/components/menu/_usage/index.jsx
+++ b/packages/components/menu/_usage/index.jsx
@@ -21,9 +21,9 @@ export default function Usage() {
{ label: 'menu', value: 'menu' },
{ label: 'headMenu', value: 'headMenu' },
];
- const getLogo = (theme) => (
-
- );
+ const defaultProps = {
+ logo:
,
+ };
const panelMap = {
menu: (
-
+
}>
仪表盘
From 480ae38f56913dd70bcb02f1b069d70d9d82e9b9 Mon Sep 17 00:00:00 2001
From: Uyarn
Date: Wed, 30 Apr 2025 10:26:32 +0800
Subject: [PATCH 4/6] chore: update common
---
packages/common | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/common b/packages/common
index cd28911d7c..cb8e2875e1 160000
--- a/packages/common
+++ b/packages/common
@@ -1 +1 @@
-Subproject commit cd28911d7cf73b10dce3349619a5c078110fcf25
+Subproject commit cb8e2875e10e551517a85f2944ae264d018ab45f
From 50171e132c5cb0da3a69b3a50064dca7cd8aed73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com>
Date: Wed, 30 Apr 2025 11:18:40 +0800
Subject: [PATCH 5/6] fix(submenu): fix title width
---
packages/components/menu/SubMenu.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/components/menu/SubMenu.tsx b/packages/components/menu/SubMenu.tsx
index e027cee988..da749959db 100644
--- a/packages/components/menu/SubMenu.tsx
+++ b/packages/components/menu/SubMenu.tsx
@@ -254,7 +254,7 @@ const SubTitleMenu: FC = (props) => {
style={style}
>
{parseTNode(icon)}
- {title}
+ {title}
{isPopUp && }
From 88b6dd10bd2d242acc9cec6e2ca2f01bbfeb7af0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
Date: Wed, 30 Apr 2025 14:47:41 +0000
Subject: [PATCH 6/6] chore: update snapshot
---
test/snap/__snapshots__/csr.test.jsx.snap | 52 +++++++++++++++++------
test/snap/__snapshots__/ssr.test.jsx.snap | 4 +-
2 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/test/snap/__snapshots__/csr.test.jsx.snap b/test/snap/__snapshots__/csr.test.jsx.snap
index 30fd7153bb..119b6d6ba3 100644
--- a/test/snap/__snapshots__/csr.test.jsx.snap
+++ b/test/snap/__snapshots__/csr.test.jsx.snap
@@ -62798,7 +62798,9 @@ exports[`csr snapshot test > csr test packages/components/menu/_example/double.t
@@ -62809,7 +62811,9 @@ exports[`csr snapshot test > csr test packages/components/menu/_example/double.t
@@ -62820,7 +62824,9 @@ exports[`csr snapshot test > csr test packages/components/menu/_example/double.t
@@ -62831,7 +62837,9 @@ exports[`csr snapshot test > csr test packages/components/menu/_example/double.t
@@ -62938,7 +62946,9 @@ exports[`csr snapshot test > csr test packages/components/menu/_example/double.t
@@ -62949,7 +62959,9 @@ exports[`csr snapshot test > csr test packages/components/menu/_example/double.t
@@ -62960,7 +62972,9 @@ exports[`csr snapshot test > csr test packages/components/menu/_example/double.t
@@ -62971,7 +62985,9 @@ exports[`csr snapshot test > csr test packages/components/menu/_example/double.t
@@ -64158,7 +64174,9 @@ exports[`csr snapshot test > csr test packages/components/menu/_example/multiple