From c440cfac531046f79c31534bc2799dc26a38b4c2 Mon Sep 17 00:00:00 2001 From: pompurin404 Date: Wed, 4 Sep 2024 23:18:07 +0800 Subject: [PATCH] fix substore copy --- src/renderer/src/pages/profiles.tsx | 37 +++++++++++++++++++++++++---- src/renderer/src/pages/substore.tsx | 1 + 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/src/renderer/src/pages/profiles.tsx b/src/renderer/src/pages/profiles.tsx index b9fe9be..ece4706 100644 --- a/src/renderer/src/pages/profiles.tsx +++ b/src/renderer/src/pages/profiles.tsx @@ -1,6 +1,7 @@ import { Button, Checkbox, + Chip, Divider, Dropdown, DropdownItem, @@ -67,10 +68,10 @@ const Profiles: React.FC = () => { useSubStore ? subStoreCollections : (): undefined => {} ) const subStoreMenuItems = useMemo(() => { - const items: { icon?: ReactNode; key: string; name: string; divider: boolean }[] = [ + const items: { icon?: ReactNode; key: string; children: ReactNode; divider: boolean }[] = [ { key: 'open-substore', - name: '访问 Sub-Store', + children: '访问 Sub-Store', icon: , divider: (Boolean(subs) && subs.length > 0) || (Boolean(collections) && collections.length > 0) @@ -80,7 +81,20 @@ const Profiles: React.FC = () => { subs.forEach((sub, index) => { items.push({ key: `sub-${sub.name}`, - name: sub.displayName || sub.name, + children: ( +
+
{sub.displayName || sub.name}
+
+ {sub.tag?.map((tag) => { + return ( + + {tag} + + ) + })} +
+
+ ), icon: sub.icon ? : null, divider: index === subs.length - 1 && Boolean(collections) && collections.length > 0 }) @@ -90,7 +104,20 @@ const Profiles: React.FC = () => { collections.forEach((sub) => { items.push({ key: `collection-${sub.name}`, - name: sub.displayName || sub.name, + children: ( +
+
{sub.displayName || sub.name}
+
+ {sub.tag?.map((tag) => { + return ( + + {tag} + + ) + })} +
+
+ ), icon: sub.icon ? : null, divider: false }) @@ -313,7 +340,7 @@ const Profiles: React.FC = () => { > {subStoreMenuItems.map((item) => ( - {item.name} + {item.children} ))} diff --git a/src/renderer/src/pages/substore.tsx b/src/renderer/src/pages/substore.tsx index 1fe6d87..d7bdbaa 100644 --- a/src/renderer/src/pages/substore.tsx +++ b/src/renderer/src/pages/substore.tsx @@ -42,6 +42,7 @@ const SubStore: React.FC = () => { >