baha/skyline
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix: Fix link jump"

Browse Source
This commit is contained in:
Zuul 2021-11-17 12:24:34 +00:00 committed by Gerrit Code Review
commit dc0fa2104f
8 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/layouts/admin-menu.jsx
View File

@ -147,7 +147,7 @@ const renderMenu = (t) => {
{ {
path: /^\/compute\/baremetal-node-admin\/detail\/.[^/]+$/, path: /^\/compute\/baremetal-node-admin\/detail\/.[^/]+$/,
name: t('Bare Metal Node Detail'), name: t('Bare Metal Node Detail'),
key: 'baremetaNodeDetailAdmin', key: 'baremetalNodeDetailAdmin',
routePath: '/compute/baremetal-node-admin/detail/:id', routePath: '/compute/baremetal-node-admin/detail/:id',
level: 2, level: 2,
}, },

2
src/layouts/menu.jsx
View File

@ -272,7 +272,7 @@ const renderMenu = (t) => {
{ {
path: '/network/floatingip', path: '/network/floatingip',
name: t('Floating IPs'), name: t('Floating IPs'),
key: 'floatingip', key: 'fip',
level: 1, level: 1,
children: [ children: [
{ {

4
src/layouts/user-menu.jsx
View File

@ -23,7 +23,7 @@ const renderMenu = (t) => {
{ {
path: '/user/center', path: '/user/center',
name: t('User Center'), name: t('User Center'),
key: '/user', key: 'userCenter',
icon: <HomeOutlined />, icon: <HomeOutlined />,
level: 0, level: 0,
hasBreadcrumb: false, hasBreadcrumb: false,
@ -32,7 +32,7 @@ const renderMenu = (t) => {
{ {
path: '/user/application-credentials', path: '/user/application-credentials',
name: t('Application Credentials'), name: t('Application Credentials'),
key: '/user/application-credentials', key: 'applicationCredential',
level: 0, level: 0,
icon: <UserOutlined />, icon: <UserOutlined />,
children: [], children: [],

2
src/pages/compute/containers/BareMetalNode/index.jsx
View File

@ -54,7 +54,7 @@ export default class BareMetalNode extends Base {
{ {
title: t('Node ID/Name'), title: t('Node ID/Name'),
dataIndex: 'name', dataIndex: 'name',
routerName: 'baremetalNodeDetail', routeName: 'baremetalNodeDetailAdmin',
}, },
{ {
title: t('Ironic Instance Name'), title: t('Ironic Instance Name'),

2
src/pages/network/containers/FloatingIp/Detail/index.jsx
View File

@ -31,7 +31,7 @@ export class FloatingIpDetail extends Base {
} }
get listUrl() { get listUrl() {
return this.getRoutePath('floatingip'); return this.getRoutePath('fip');
} }
get actionConfigs() { get actionConfigs() {

2
src/pages/network/containers/LoadBalancers/Listener/index.jsx
View File

@ -61,7 +61,7 @@ export default class Listeners extends Base {
{ {
title: t('ID/Name'), title: t('ID/Name'),
dataIndex: 'name', dataIndex: 'name',
routeName: this.getRouteName('lbDetail'), routeName: this.getRouteName('lbListenerDetail'),
routeParamsFunc: (data) => { routeParamsFunc: (data) => {
return { return {
loadBalancerId: this.id, loadBalancerId: this.id,

2
src/pages/network/containers/QoSPolicy/Detail/index.jsx
View File

@ -30,7 +30,7 @@ export default class QoSPolicyDetail extends Base {
} }
get listUrl() { get listUrl() {
return this.getRoutePath('qosPolicy'); return this.getRoutePath('networkQos');
} }
get actionConfigs() { get actionConfigs() {

1
src/utils/route-map.jsx
View File

@ -28,6 +28,7 @@ const insertRouteMap = (record = {}) => {
export const setRouteMap = (routes = []) => { export const setRouteMap = (routes = []) => {
routes.forEach((r) => insertRouteMap(r)); routes.forEach((r) => insertRouteMap(r));
console.log('routeMap', routeMap);
return routeMap; return routeMap;
}; };