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

Jump to bottom

machbase/neo-web#791 - fix panel interval #408

Merged
merged 1 commit into from
Jun 21, 2024
Merged

machbase/neo-web#791 - fix panel interval #408

Show file tree
Hide file tree
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
28 changes: 18 additions & 10 deletions src/components/dashboard/createPanel/CreatePanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,15 @@ const CreatePanel = ({
}
sPanelOption.w = getChartDefaultWidthSize(sPanelOption.type, !!sPanelOption.chartOptions?.isPolar);

const sTmpPanelInfo = checkXAxisInterval(sPanelOption);

let sSaveTarget: any = sBoardList.find((aItem) => aItem.id === pBoardInfo.id);
if (sSaveTarget?.path !== '') {
const sTabList = sBoardList.map((aItem) => {
if (aItem.id === pBoardInfo.id) {
const sTmpDashboard = {
...aItem.dashboard,
panels: [...aItem.dashboard.panels, sPanelOption],
panels: [...aItem.dashboard.panels, sTmpPanelInfo],
};
sSaveTarget = {
...aItem,
Expand All @@ -106,7 +108,7 @@ const CreatePanel = ({
if (aItem.id === pBoardInfo.id) {
const sTmpDashboard = {
...aItem.dashboard,
panels: [...aItem.dashboard.panels, sPanelOption],
panels: [...aItem.dashboard.panels, sTmpPanelInfo],
};
sSaveTarget = {
...aItem,
Expand All @@ -120,16 +122,16 @@ const CreatePanel = ({
}

if (pBoardInfo.dashboard.panels.length === 0) {
pSetBoardTimeMinMax(await getTimeMinMax(sPanelOption.useCustomTime ? sPanelOption.timeRange : pBoardInfo.dashboard.timeRange));
pSetModifyState({ id: sPanelOption.id, state: true });
pSetBoardTimeMinMax(await getTimeMinMax(sTmpPanelInfo.useCustomTime ? sTmpPanelInfo.timeRange : pBoardInfo.dashboard.timeRange));
pSetModifyState({ id: sTmpPanelInfo.id, state: true });
} else {
const sChartPanelList = pBoardInfo.dashboard.panels.filter((panel: any) => panel.type !== 'Tql chart');
if (sChartPanelList.length === 0) {
pSetBoardTimeMinMax(await getTimeMinMax(sPanelOption.useCustomTime ? sPanelOption.timeRange : pBoardInfo.dashboard.timeRange));
pSetModifyState({ id: sPanelOption.id, state: true });
pSetBoardTimeMinMax(await getTimeMinMax(sTmpPanelInfo.useCustomTime ? sTmpPanelInfo.timeRange : pBoardInfo.dashboard.timeRange));
pSetModifyState({ id: sTmpPanelInfo.id, state: true });
} else {
if (sCreateModeTimeMinMax) pSetBoardTimeMinMax(sCreateModeTimeMinMax);
else pSetModifyState({ id: sPanelOption.id, state: true });
else pSetModifyState({ id: sTmpPanelInfo.id, state: true });
}
}
handleClose();
Expand All @@ -145,7 +147,7 @@ const CreatePanel = ({
const sTmpDashboard = {
...aItem.dashboard,
panels: aItem.dashboard.panels.map((bItem: any) => {
return bItem.id === pPanelId ? { ...sPanelOption, id: sNewPanelId } : bItem;
return bItem.id === pPanelId ? { ...checkXAxisInterval(sPanelOption), id: sNewPanelId } : bItem;
}),
};
sSaveTarget = {
Expand All @@ -165,7 +167,7 @@ const CreatePanel = ({
const sTmpDashboard = {
...aItem.dashboard,
panels: aItem.dashboard.panels.map((bItem: any) => {
return bItem.id === pPanelId ? { ...sPanelOption, id: sNewPanelId } : bItem;
return bItem.id === pPanelId ? { ...checkXAxisInterval(sPanelOption), id: sNewPanelId } : bItem;
}),
};
sSaveTarget = {
Expand All @@ -181,9 +183,15 @@ const CreatePanel = ({
if (sCreateModeTimeMinMax) pSetBoardTimeMinMax(sCreateModeTimeMinMax);
handleClose();
};
const checkXAxisInterval = (aPanelInfo: any) => {
if (aPanelInfo?.axisInterval?.IntervalType === '' || aPanelInfo?.axisInterval?.IntervalValue === '')
return { ...aPanelInfo, axisInterval: { IntervalType: '', IntervalValue: '' }, isAxisInterval: false };
else return { ...aPanelInfo, isAxisInterval: true };
};
// Preview
const applyPanel = async () => {
const sTmpPanelOption = JSON.parse(JSON.stringify(sPanelOption));
const sTmpPanelOption = checkXAxisInterval(sPanelOption);
// checkXAxisInterval(sTmpPanelOption);
if (sPanelOption.type === 'Tql chart') {
if (sTmpPanelOption.useCustomTime) {
let sStart: any;
Expand Down
8 changes: 6 additions & 2 deletions src/components/dashboard/createPanel/option/XAxisOptions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,12 @@ export const XAxisOptions = (props: XAxisOptionProps) => {
IntervalValue: aValue,
},
};
if (sResult.axisInterval.Interval !== '' && sResult.axisInterval.IntervalValue !== '') sResult.isAxisInterval = true;
else sResult.isAxisInterval = false;
// if (sResult.axisInterval.IntervalType !== '' && sResult.axisInterval.IntervalValue !== '') sResult.isAxisInterval = true;
// else {
// sResult.axisInterval.IntervalType = '';
// sResult.axisInterval.IntervalValue = '';
// sResult.isAxisInterval = false;
// }
return sResult;
});
};
Expand Down
Loading