diff --git a/dolphinscheduler-ui/src/locales/modules/en_US.ts b/dolphinscheduler-ui/src/locales/modules/en_US.ts index 512fe74ae6..4a391d0301 100644 --- a/dolphinscheduler-ui/src/locales/modules/en_US.ts +++ b/dolphinscheduler-ui/src/locales/modules/en_US.ts @@ -180,9 +180,7 @@ const monitor = { statistics: { command_number_of_waiting_for_running: 'Command Number Of Waiting For Running', - failure_command_number: 'Failure Command Number', - tasks_number_of_waiting_running: 'Tasks Number Of Waiting Running', - task_number_of_ready_to_kill: 'Task Number Of Ready To Kill' + failure_command_number: 'Failure Command Number' }, audit_log: { user_name: 'User Name', diff --git a/dolphinscheduler-ui/src/locales/modules/zh_CN.ts b/dolphinscheduler-ui/src/locales/modules/zh_CN.ts index 7880ff3b50..88d0aab6c3 100644 --- a/dolphinscheduler-ui/src/locales/modules/zh_CN.ts +++ b/dolphinscheduler-ui/src/locales/modules/zh_CN.ts @@ -178,9 +178,7 @@ const monitor = { }, statistics: { command_number_of_waiting_for_running: '待执行的命令数', - failure_command_number: '执行失败的命令数', - tasks_number_of_waiting_running: '待运行任务数', - task_number_of_ready_to_kill: '待杀死任务数' + failure_command_number: '执行失败的命令数' }, audit_log: { user_name: '用户名称', diff --git a/dolphinscheduler-ui/src/views/monitor/statistics/statistics/index.tsx b/dolphinscheduler-ui/src/views/monitor/statistics/statistics/index.tsx index 53963032ab..5d50728598 100644 --- a/dolphinscheduler-ui/src/views/monitor/statistics/statistics/index.tsx +++ b/dolphinscheduler-ui/src/views/monitor/statistics/statistics/index.tsx @@ -21,7 +21,6 @@ import { useStatistics } from './use-statistics' import { useI18n } from 'vue-i18n' import Card from '@/components/card' import styles from './index.module.scss' -import type { TaskQueueRes } from '@/service/modules/projects-analysis/types' const statistics = defineComponent({ name: 'statistics', @@ -36,7 +35,7 @@ const statistics = defineComponent({ const { t, statisticsRef } = this return ( - + - - -
- {Object.keys(statisticsRef.task).length > 0 && ( - - )} -
-
-
- - -
- {Object.keys(statisticsRef.task).length > 0 && ( - - )} -
-
-
) } diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-http.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-http.ts index a8ff5ebea7..eaa29fdf1d 100644 --- a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-http.ts +++ b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-http.ts @@ -55,7 +55,9 @@ export function useHttp(model: { [field: string]: any }): IJsonItem[] { if (!value) { return new Error(t('project.node.http_url_tips')) } - if (value.search(new RegExp('http[s]{0,1}:\/\/([\w.]+\/?)\S*', 'i'))) { + if ( + value.search(new RegExp(/http[s]{0,1}:\/\/([\w.]+\/?)\S*/, 'i')) + ) { return new Error(t('project.node.http_url_validator')) } }