Skip to content

Commit 4af6697

Browse files
committed
feat(dashboard): replace echartsOptions with getEchartsOptions
1 parent d6945e3 commit 4af6697

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

dashboard/src/components/panel/panel-editor/dropdown-menu-items/dropdown-menu-items.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ type Props = {
1010

1111
export const PanelDropdownMenuItems = observer(({ view }: Props) => {
1212
const { getEchartsOptions, panel } = useRenderPanelContext();
13-
const echartsOptions = getEchartsOptions();
1413
const items = useItems(view);
15-
return items.map((item) => item.render({ echartsOptions, inEditMode: true, panelID: panel.id, viewID: view.id }));
14+
return items.map((item) => item.render({ getEchartsOptions, inEditMode: true, panelID: panel.id, viewID: view.id }));
1615
});

dashboard/src/components/panel/panel-render/dropdown-menu-items/dropdown-menu-items.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ type Props = {
1010

1111
export const PanelDropdownMenuItems = observer(({ view }: Props) => {
1212
const { getEchartsOptions, panel } = useRenderPanelContext();
13-
const echartsOptions = getEchartsOptions();
1413
const items = useItems(view);
15-
return items.map((item) => item.render({ echartsOptions, inEditMode: false, panelID: panel.id, viewID: view.id }));
14+
return items.map((item) => item.render({ getEchartsOptions, inEditMode: false, panelID: panel.id, viewID: view.id }));
1615
});

dashboard/src/types/dashboard.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export type DashboardContentDBType = {
100100
export type PanelMenuItem = {
101101
order: number;
102102
render: (props: {
103-
echartsOptions: EChartsOption | null;
103+
getEchartsOptions: () => EChartsOption | null;
104104
inEditMode: boolean;
105105
panelID: string;
106106
viewID: string;

website/src/pages/dashboard-render-page/content.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import './content.css';
1313
import { DashboardIsEmpty } from './placeholder';
1414
import { useLanguageContext } from '../../contexts';
1515

16-
const DownloadChartData: PanelMenuItem['render'] = ({ echartsOptions }) => {
17-
return <Menu.Item onClick={() => console.log(echartsOptions)}>下载图表数据</Menu.Item>;
16+
const DownloadChartData: PanelMenuItem['render'] = ({ getEchartsOptions }) => {
17+
return <Menu.Item onClick={() => console.log(getEchartsOptions())}>下载图表数据</Menu.Item>;
1818
};
1919

2020
const items = [

0 commit comments

Comments
 (0)