feat(web): 修复yarn页面查看资源队列错误

This commit is contained in:
2025-06-16 23:51:36 +08:00
parent 45da452f18
commit e470a87372
2 changed files with 12 additions and 11 deletions

View File

@@ -1,16 +1,16 @@
import React from 'react' import React from 'react'
import {useLocation, useParams} from 'react-router' import {useLocation, useParams} from 'react-router'
import { import {
amisRender, amisRender,
commonInfo, commonInfo,
crudCommonOptions, crudCommonOptions,
paginationCommonOptions, paginationCommonOptions,
yarnCrudColumns, yarnCrudColumns,
yarnQueueCrud, yarnQueueCrud,
} from '../../util/amis.tsx' } from '../../util/amis.tsx'
const Yarn: React.FC = () => { const Yarn: React.FC = () => {
const {clusters, queue, search} = useParams() const {clusters, queues, search} = useParams()
const location = useLocation() const location = useLocation()
return ( return (
<div key={location.key} className="hudi-yarn"> <div key={location.key} className="hudi-yarn">
@@ -27,7 +27,7 @@ const Yarn: React.FC = () => {
type: 'tpl', type: 'tpl',
tpl: '<span class="font-bold text-xl">集群资源</span>', tpl: '<span class="font-bold text-xl">集群资源</span>',
}, },
yarnQueueCrud(clusters, queue), yarnQueueCrud(clusters, queues),
{ {
type: 'tpl', type: 'tpl',
tpl: '<span class="font-bold text-xl">集群任务</span>', tpl: '<span class="font-bold text-xl">集群任务</span>',

View File

@@ -31,6 +31,7 @@ import YarnCluster from './pages/overview/YarnCluster.tsx'
import {commonInfo} from './util/amis.tsx' import {commonInfo} from './util/amis.tsx'
import Test from './pages/Test.tsx' import Test from './pages/Test.tsx'
import Feedback from './pages/ai/feedback/Feedback.tsx' import Feedback from './pages/ai/feedback/Feedback.tsx'
import {values} from 'licia'
export const routes: RouteObject[] = [ export const routes: RouteObject[] = [
{ {
@@ -58,7 +59,7 @@ export const routes: RouteObject[] = [
Component: Version, Component: Version,
}, },
{ {
path: 'yarn/:clusters/:queue/:search?', path: 'yarn/:clusters/:queues/:search?',
Component: Yarn, Component: Yarn,
}, },
{ {
@@ -146,12 +147,12 @@ export const menus = {
icon: <SunOutlined/>, icon: <SunOutlined/>,
}, },
{ {
path: `/yarn/${commonInfo.clusters.sync_names()}/root/Sync`, path: `/yarn/${commonInfo.clusters.sync_names()}/default/Sync`,
name: '同步集群', name: '同步集群',
icon: <SyncOutlined/>, icon: <SyncOutlined/>,
}, },
{ {
path: `/yarn/${commonInfo.clusters.compaction_names()}/default/Compaction`, path: `/yarn/${commonInfo.clusters.compaction_names()}/${values(commonInfo.clusters.compaction).join(",")}/Compaction`,
name: '压缩集群', name: '压缩集群',
icon: <SyncOutlined/>, icon: <SyncOutlined/>,
}, },