Skip to content

fix: 修复sidebar 获焦状态 #4074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laojun merged 2 commits into from
Dec 15, 2025
Merged

fix: 修复sidebar 获焦状态 #4074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d27892
fix: 修复sidebar 获焦状态
laojun Dec 15, 2025
09dc40e
fix: add tooltip
laojun Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions shell/app/common/components/dropdown-select-new/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
background-color: rgba($white, 0.08);
}

&.selected-item {
background-color: unset;
}

.option-label {
font-weight: bold;
color: $white;
Expand Down
62 changes: 36 additions & 26 deletions shell/app/layout/pages/page-container/components/navigation/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,14 @@ export const NavItem = ({ icon, label, link, onClick, isActive, onHover }: NavIt

const Navigation = () => {
const currentApp = layoutStore.useStore((s) => s.currentApp);

const { switchMessageCenter } = layoutStore.reducers;
const unreadCount = messageStore.useStore((s) => s.unreadCount);
const current = window.localStorage.getItem('locale') || 'zh';
const [currentOrg, orgs] = orgStore.useStore((s) => [s.currentOrg, s.orgs]);
const platformEntries = usePlatformEntries();
const isIn = routeStore.getState((s) => s.isIn);
const currentPath = routeStore.getState((s) => s.currentRoute.path);
const isAdminRoute = isIn('sysAdmin');
const curOrgName = currentOrg.name;
const bottomItems = [
Expand Down Expand Up @@ -136,38 +138,46 @@ const Navigation = () => {
process.env.FOR_COMMUNITY ? '' : 'cursor-pointer'
}`}
>
<div className={'w-9 h-9 flex-all-center cursor-pointer rounded-[4px] erda-logo-container'}>
{process.env.FOR_COMMUNITY ? (
<img src={homepageIcon} alt="home page icon" className="w-6 h-6" />
) : (
<img
src={homepageIcon}
alt="home page icon"
className="w-6 h-6"
onClick={() => {
layoutStore.reducers.switchMessageCenter(false);
const isIncludeOrg = !!orgs.find((x) => x.name === curOrgName);
if (isAdminRoute) {
const lastOrg = window.localStorage.getItem('lastOrg');
const isInLastOrg = !!orgs.find((x: Obj) => x.name === lastOrg);
if (isInLastOrg) {
goTo(goTo.pages.orgRoot, { orgName: lastOrg });
<Tooltip title={i18n.t('Personal workbench')} placement={'right'} align={{ offset: [2, 0] }}>
<div
className={`w-9 h-9 flex-all-center cursor-pointer rounded-[4px] erda-logo-container ${
currentPath === '/:orgName' ? 'active' : ''
}`}
>
{process.env.FOR_COMMUNITY ? (
<img src={homepageIcon} alt="home page icon" className="w-6 h-6" />
) : (
<img
src={homepageIcon}
alt="home page icon"
className="w-6 h-6"
onClick={() => {
layoutStore.reducers.switchMessageCenter(false);
const isIncludeOrg = !!orgs.find((x) => x.name === curOrgName);
if (isAdminRoute) {
const lastOrg = window.localStorage.getItem('lastOrg');
const isInLastOrg = !!orgs.find((x: Obj) => x.name === lastOrg);
if (isInLastOrg) {
goTo(goTo.pages.orgRoot, { orgName: lastOrg });
} else {
goTo(goTo.pages.landPage);
}
} else if (isIncludeOrg) {
goTo(goTo.pages.orgRoot);
} else {
goTo(goTo.pages.landPage);
}
} else if (isIncludeOrg) {
goTo(goTo.pages.orgRoot);
} else {
goTo(goTo.pages.landPage);
}
}}
/>
)}
</div>
}}
/>
)}
</div>
</Tooltip>
</div>
<div className="split-line" />
<div className="py-2 relative h-12 w-full flex flex-all-center">
<OrgSelector mode="simple" size="middle" trigger={['hover']} noIcon align={{ offset: [-40, -30] }} />
<div className="w-9 h-9 erda-logo-container rounded-[4px] flex flex-all-center">
<OrgSelector mode="simple" size="middle" trigger={['hover']} noIcon align={{ offset: [-40, -30] }} />
</div>
</div>
<div className="split-line" />
{platformEntries.map((item) => {
Expand Down
Loading