From 17b227e1e9f31eb3294437d0f6ba48dd7fe220ff Mon Sep 17 00:00:00 2001 From: Zzm0809 Date: Wed, 27 Dec 2023 06:18:34 +0000 Subject: [PATCH] Spotless Apply --- dinky-web/src/locales/en-US/pages.ts | 3 ++- dinky-web/src/locales/zh-CN/pages.ts | 3 ++- dinky-web/src/pages/Metrics/index.tsx | 10 +++++++--- .../GlobalSetting/SettingOverView/index.tsx | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dinky-web/src/locales/en-US/pages.ts b/dinky-web/src/locales/en-US/pages.ts index d84e42aea9..6b23fa8ab8 100644 --- a/dinky-web/src/locales/en-US/pages.ts +++ b/dinky-web/src/locales/en-US/pages.ts @@ -338,7 +338,8 @@ export default { 'metrics.flink.subTask': 'SubTask', 'metrics.flink.subTask.placeholder': 'Please select a SubTask Name', 'metrics.flink.taskId': 'Dinky Job ID', - 'metrics.dinky.not.open': 'Dinky Server monitoring is not enabled, please go to the Setting Center -> Global Settings -> Metrics Configuration -> Dinky JVM Monitor switch to open', + 'metrics.dinky.not.open': + 'Dinky Server monitoring is not enabled, please go to the Setting Center -> Global Settings -> Metrics Configuration -> Dinky JVM Monitor switch to open', /** * diff --git a/dinky-web/src/locales/zh-CN/pages.ts b/dinky-web/src/locales/zh-CN/pages.ts index f84fe2305c..f747c43c3a 100644 --- a/dinky-web/src/locales/zh-CN/pages.ts +++ b/dinky-web/src/locales/zh-CN/pages.ts @@ -327,7 +327,8 @@ export default { 'metrics.flink.subTask': '子任务', 'metrics.flink.subTask.placeholder': '请选择子任务名称', 'metrics.flink.taskId': 'Dinky 任务ID', - 'metrics.dinky.not.open': '暂未开启 Dinky Server 监控, 请前往 配置中心 -> 全局配置 -> Metrics 配置 -> Dinky JVM Monitor 开关 进行开启', + 'metrics.dinky.not.open': + '暂未开启 Dinky Server 监控, 请前往 配置中心 -> 全局配置 -> Metrics 配置 -> Dinky JVM Monitor 开关 进行开启', /** * * pages diff --git a/dinky-web/src/pages/Metrics/index.tsx b/dinky-web/src/pages/Metrics/index.tsx index bc6c6a5ab5..01f4367dd8 100644 --- a/dinky-web/src/pages/Metrics/index.tsx +++ b/dinky-web/src/pages/Metrics/index.tsx @@ -23,10 +23,10 @@ import { MetricsTimeFilter } from '@/pages/DevOps/JobDetail/data'; import JobMetricsList from '@/pages/Metrics/JobMetricsList'; import Server from '@/pages/Metrics/Server'; import { getAllConfig } from '@/pages/Metrics/service'; +import { l } from '@/utils/intl'; import { PageContainer, ProCard } from '@ant-design/pro-components'; +import { Alert } from 'antd'; import { useState } from 'react'; -import {Alert} from "antd"; -import {l} from "@/utils/intl"; export default () => { const [timeRange, setTimeRange] = useState({ @@ -57,7 +57,11 @@ export default () => { fixedHeader={true} //todo 后面title改为下拉列表,用户自定义选择展示哪些layout,而不是全部展示 loading={showServer.loading} - subTitle={!showServer.data && } + subTitle={ + !showServer.data && ( + + ) + } header={{ extra: [] }} content={ <> diff --git a/dinky-web/src/pages/SettingCenter/GlobalSetting/SettingOverView/index.tsx b/dinky-web/src/pages/SettingCenter/GlobalSetting/SettingOverView/index.tsx index 358a99da8b..8d3e4b74c6 100644 --- a/dinky-web/src/pages/SettingCenter/GlobalSetting/SettingOverView/index.tsx +++ b/dinky-web/src/pages/SettingCenter/GlobalSetting/SettingOverView/index.tsx @@ -34,6 +34,7 @@ import { EnvConfig } from '@/pages/SettingCenter/GlobalSetting/SettingOverView/E import { FlinkConfig } from '@/pages/SettingCenter/GlobalSetting/SettingOverView/FlinkConfig'; import { LdapConfig } from '@/pages/SettingCenter/GlobalSetting/SettingOverView/LdapConfig'; import { MavenConfig } from '@/pages/SettingCenter/GlobalSetting/SettingOverView/MavenConfig'; +import { MetricsConfig } from '@/pages/SettingCenter/GlobalSetting/SettingOverView/MetricsConfig'; import { ResourcesConfig } from '@/pages/SettingCenter/GlobalSetting/SettingOverView/ResourcesConfig'; import { handleOption, queryDataByParams } from '@/services/BusinessCrud'; import { RESPONSE_CODE } from '@/services/constants'; @@ -42,7 +43,6 @@ import { BaseConfigProperties, Settings } from '@/types/SettingCenter/data'; import { l } from '@/utils/intl'; import { ProCard } from '@ant-design/pro-components'; import { memo, useEffect, useState } from 'react'; -import {MetricsConfig} from "@/pages/SettingCenter/GlobalSetting/SettingOverView/MetricsConfig"; const imgSize = 25;