From 9f5f49a0c855879a03949186c35fedeeac513048 Mon Sep 17 00:00:00 2001 From: caoxing Date: Wed, 18 Dec 2024 17:19:54 +0800 Subject: [PATCH 1/3] chore: brand new component `BreadCrumb` --- packages/ui-lib/src/shadcn/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/ui-lib/src/shadcn/index.ts b/packages/ui-lib/src/shadcn/index.ts index c8f82c9018..95c66ff997 100644 --- a/packages/ui-lib/src/shadcn/index.ts +++ b/packages/ui-lib/src/shadcn/index.ts @@ -38,3 +38,4 @@ export * from './ui/carousel'; export * from './ui/toggle-group'; export * from './ui/chart'; export * from './ui/input-otp'; +export * from './ui/breadcrumb'; From 82313fab7a8af85ac2461dea76f19e3632d8a835 Mon Sep 17 00:00:00 2001 From: caoxing Date: Wed, 18 Dec 2024 17:21:34 +0800 Subject: [PATCH 2/3] fix: navigate path in base sidebar active status error --- .../src/features/app/blocks/base/base-side-bar/BaseSideBar.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/nextjs-app/src/features/app/blocks/base/base-side-bar/BaseSideBar.tsx b/apps/nextjs-app/src/features/app/blocks/base/base-side-bar/BaseSideBar.tsx index 771d51d704..93b5922bf4 100644 --- a/apps/nextjs-app/src/features/app/blocks/base/base-side-bar/BaseSideBar.tsx +++ b/apps/nextjs-app/src/features/app/blocks/base/base-side-bar/BaseSideBar.tsx @@ -125,7 +125,7 @@ export const BaseSideBar = () => { asChild className={cn( 'w-full justify-start text-sm my-[2px]', - href === router.asPath && 'bg-secondary' + router.asPath.startsWith(href) && 'bg-secondary' )} > From 17416d5a5991c4c3f2bf302db924595acc0284d0 Mon Sep 17 00:00:00 2001 From: caoxing Date: Wed, 18 Dec 2024 17:32:52 +0800 Subject: [PATCH 3/3] fix: share aggregation does not work --- .../app/blocks/share/view/component/grid/GridViewBase.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/nextjs-app/src/features/app/blocks/share/view/component/grid/GridViewBase.tsx b/apps/nextjs-app/src/features/app/blocks/share/view/component/grid/GridViewBase.tsx index d6db556570..b534e158d2 100644 --- a/apps/nextjs-app/src/features/app/blocks/share/view/component/grid/GridViewBase.tsx +++ b/apps/nextjs-app/src/features/app/blocks/share/view/component/grid/GridViewBase.tsx @@ -287,7 +287,6 @@ export const GridViewBase = (props: IGridViewProps) => { )} -