Skip to content
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

feat: bottom panel support accordion #2798

Merged
merged 1 commit into from
Jun 13, 2023
Merged

feat: bottom panel support accordion #2798

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 30 additions & 11 deletions packages/main-layout/src/browser/tabbar/panel.view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,16 +150,25 @@ const BottomPanelView: React.FC<{
side: string;
titleMenu: IMenu;
}> = ({ component, titleMenu, side }) => {
const contentRef = React.useRef<HTMLDivElement | null>();
const titleComponent = component.options && component.options.titleComponent;
const ref = React.useRef<HTMLElement | null>();
const containerRef = React.useRef<HTMLDivElement | null>(null);
const configContext = useInjectable<AppConfig>(AppConfig);
const tabbarService: TabbarService = useInjectable(TabbarServiceFactory)(side);
// 注入自定义视图 or 通过views注入视图
const { component: CustomComponent, containerId } = component.options || {};
const titleComponent = component.options && component.options.titleComponent;

if (!containerId) {
return null;
}
const progressService: IProgressService = useInjectable(IProgressService);
const indicator = progressService.getIndicator(component.options!.containerId)!;
const viewState = useViewState(side, contentRef);
const indicator = progressService.getIndicator(containerId);
if (!indicator) {
return null;
}
const viewState = useViewState(side, containerRef);

return (
<div className={styles.panel_container}>
<div ref={containerRef} className={styles.panel_container}>
<div className={styles.panel_title_bar} style={{ height: LAYOUT_VIEW_SIZE.PANEL_TITLEBAR_HEIGHT }}>
<h1>{component.options?.title?.toUpperCase()}</h1>
<div className={styles.title_component_container}>
Expand All @@ -172,12 +181,22 @@ const BottomPanelView: React.FC<{
<InlineMenuBar menus={tabbarService.commonTitleMenu} moreAtFirst />
</div>
</div>
<div ref={(ele) => (contentRef.current = ele)} className={styles.panel_wrapper}>
<div className={styles.container_wrap} ref={(ele) => (ref.current = ele)}>
<ProgressBar progressModel={indicator.progressModel} />
<ComponentRenderer
initialProps={{ viewState, ...component.options?.initialProps }}
Component={component.options?.component ? component.options.component : component.views[0].component!}
/>
{CustomComponent ? (
<ConfigProvider value={configContext}>
<ComponentRenderer
initialProps={{ viewState, ...component.options?.initialProps }}
Component={CustomComponent}
/>
</ConfigProvider>
) : (
<AccordionContainer
views={component.views}
minSize={component.options!.miniSize}
containerId={component.options!.containerId}
/>
)}
</div>
</div>
);
Expand Down