Skip to content

Commit

Permalink
Merge pull request gocrane#749 from PmcFizz/main
Browse files Browse the repository at this point in the history
feat: 优化前端代码
  • Loading branch information
qmhu committed May 4, 2023
2 parents ad1f84e + a0cd434 commit 6d9fcfd
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion pkg/web/src/pages/Cost/ClusterOverview/PanelWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const PanelWrapper = React.memo(({panel, selectedDashboard}: PanelWrapper
const craneUrl = useCraneUrl();
const isValidPanel = useIsValidPanel({panel});
const isNeedSelectNamespace = useIsNeedSelectNamespace({selectedDashboard});
const queryStr = useGrafanaQueryStr({panelId: panel.id, selectedDashboard: selectedDashboard});
const queryStr = useGrafanaQueryStr({panelId: panel.id, selectedDashboard});

const span = panel?.gridPos?.w > 0 && panel?.gridPos?.w <= 24 ? Math.floor(panel.gridPos.w / 2) : 6;
const minHeight = panel?.gridPos?.h ? Math.max(panel.gridPos.h * baselineHeight, defaultHeight) : defaultHeight;
Expand Down
2 changes: 1 addition & 1 deletion pkg/web/src/pages/Cost/CostsByDimension/PanelWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const PanelWrapper = React.memo(({panel, selectedDashboard}: PanelWrapper
const craneUrl = useCraneUrl();
const isValidPanel = useIsValidPanel({panel});
const isNeedSelectNamespace = useIsNeedSelectNamespace({selectedDashboard});
const queryStr = useGrafanaQueryStr({panelId: panel.id, selectedDashboard: selectedDashboard});
const queryStr = useGrafanaQueryStr({panelId: panel.id, selectedDashboard});

const span = panel?.gridPos?.w > 0 && panel?.gridPos?.w <= 24 ? Math.floor(panel.gridPos.w / 2) : 6;
const minHeight = panel?.gridPos?.h ? Math.max(panel.gridPos.h * baselineHeight, defaultHeight) : defaultHeight;
Expand Down
2 changes: 1 addition & 1 deletion pkg/web/src/pages/Cost/NamespaceCosts/PanelWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const PanelWrapper = React.memo(({panel, selectedDashboard}: PanelWrapper
const craneUrl = useCraneUrl();
const isValidPanel = useIsValidPanel({panel});
const isNeedSelectNamespace = useIsNeedSelectNamespace({selectedDashboard});
const queryStr = useGrafanaQueryStr({panelId: panel.id, selectedDashboard: selectedDashboard});
const queryStr = useGrafanaQueryStr({panelId: panel.id, selectedDashboard});

const span = panel?.gridPos?.w > 0 && panel?.gridPos?.w <= 24 ? Math.floor(panel.gridPos.w / 2) : 6;
const minHeight = panel?.gridPos?.h ? Math.max(panel.gridPos.h * baselineHeight, defaultHeight) : defaultHeight;
Expand Down
2 changes: 1 addition & 1 deletion pkg/web/src/pages/Cost/WorkloadInsight/PanelWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const PanelWrapper = React.memo(({panel, selectedDashboard}: PanelWrapper
const craneUrl = useCraneUrl();
const isValidPanel = useIsValidPanel({panel});
const isNeedSelectNamespace = useIsNeedSelectNamespace({selectedDashboard});
const queryStr = useGrafanaQueryStr({panelId: panel.id, selectedDashboard: selectedDashboard});
const queryStr = useGrafanaQueryStr({panelId: panel.id, selectedDashboard});

const span = panel?.gridPos?.w > 0 && panel?.gridPos?.w <= 24 ? Math.floor(panel.gridPos.w / 2) : 6;
const minHeight = panel?.gridPos?.h ? Math.max(panel.gridPos.h * baselineHeight, defaultHeight) : defaultHeight;
Expand Down
2 changes: 1 addition & 1 deletion pkg/web/src/pages/Cost/WorkloadOverview/PanelWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const PanelWrapper = React.memo(({panel, selectedDashboard}: PanelWrapper
const craneUrl = useCraneUrl();
const isValidPanel = useIsValidPanel({panel});
const isNeedSelectNamespace = useIsNeedSelectNamespace({selectedDashboard});
const queryStr = useGrafanaQueryStr({panelId: panel.id, selectedDashboard: selectedDashboard});
const queryStr = useGrafanaQueryStr({panelId: panel.id, selectedDashboard});

const span = panel?.gridPos?.w > 0 && panel?.gridPos?.w <= 24 ? Math.floor(panel.gridPos.w / 2) : 6;
const minHeight = panel?.gridPos?.h ? Math.max(panel.gridPos.h * baselineHeight, defaultHeight) : defaultHeight;
Expand Down
2 changes: 1 addition & 1 deletion pkg/web/src/pages/Recommend/ReplicaRecommend/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export const SelectTable = () => {
colKey: 'status.currentInfo',
cell({ row }) {
console.log('row', row);
if (typeof row.status.currentInfo == 'string') {
if (typeof row.status.currentInfo === 'string') {
const replicas = JSON.parse(row?.status?.currentInfo).spec?.replicas;
return replicas
}
Expand Down

0 comments on commit 6d9fcfd

Please sign in to comment.