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.

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

fix(console): fix project meterice request header error #764

Merged
merged 3 commits into from
Sep 23, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
fix(console): fix some bug
  • Loading branch information
Johnny Wu authored and Johnny Wu committed Sep 23, 2020
commit 5a535cb5c18e300730031a92818b443e25812398
Binary file modified third_party/fe_node_modules.zip
Binary file not shown.
Binary file added third_party/guida.zip
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -972,7 +972,7 @@ export class EditResourceVisualizationPanel extends React.Component<RootProps, E
containersInfo = containers.map(c => {
let containerItem = {
name: c.name,
image: c.registry + (c.tag ? ':' + c.tag : ''),
image: c.registry + ':' + (c.tag ? c.tag : 'latest'),
imagePullPolicy: c.imagePullPolicy
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -395,12 +395,12 @@ export class UpdateWorkloadRegistryPanel extends React.Component<RootProps, Upda
return !isTapp //对于tapp来说,由于更新方式是merge(非strategy-merge),所以需要带上原本的container之前的内容 不然之前的内容会被清空掉
? {
name: c.name,
image: c.registry + (c.tag ? ':' + c.tag : '')
image: c.registry + ':' + (c.tag ? c.tag : 'latest')
}
: {
...targetContainer,
name: c.name,
image: c.registry + (c.tag ? ':' + c.tag : '')
image: c.registry + ':' + (c.tag ? c.tag : 'latest')
};
});

Expand Down
4 changes: 2 additions & 2 deletions web/console/src/modules/cluster/models/MonitorPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@ const statusReadyField = table => ({
return from === 'yAxis'
? v
: {
0: `正常`,
1: `<span class="text-danger">异常</span>`
1: `正常`,
0: `<span class="text-danger">异常</span>`
}[v];
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export function ClusterOverviewPanel(props: { clusterData: ClusterOverview }) {
</Col>
<Col>
<MetricsBoard
title="项目"
title="业务"
value={
isLodingDone ? (
<>
Expand Down