[dolphinscheduler] branch dev updated: [Feature][UI] Disabled statistics. (#9935)

[songjian]

This is an automated email from the ASF dual-hosted git repository.

songjian pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 1f8c59b3b4 [Feature][UI] Disabled statistics. (#9935)
1f8c59b3b4 is described below

commit 1f8c59b3b4858a12bdf1a07b261d0fab868c3928
Author: songjianet <1778651...@qq.com>
AuthorDate: Sat May 7 17:07:40 2022 +0800

    [Feature][UI] Disabled statistics. (#9935)
    
    * [Feature][UI] Disabled statistics.
    
    * [Feature][UI] Disabled statistics.
    
    * [Feature][UI] Disabled statistics.
---
 dolphinscheduler-ui/src/locales/modules/en_US.ts   |  4 +---
 dolphinscheduler-ui/src/locales/modules/zh_CN.ts   |  4 +---
 .../views/monitor/statistics/statistics/index.tsx  | 27 +---------------------
 .../task/components/node/fields/use-http.ts        |  4 +++-
 4 files changed, 6 insertions(+), 33 deletions(-)

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 (
-      <NGrid x-gap='12' y-gap='8' cols='2 xl:4' responsive='screen'>
+      <NGrid x-gap='12' y-gap='8' cols='2' responsive='screen'>
         <NGi>
           <Card
             title={t(
@@ -69,30 +68,6 @@ const statistics = defineComponent({
             </div>
           </Card>
         </NGi>
-        <NGi>
-          <Card 
title={t('monitor.statistics.tasks_number_of_waiting_running')}>
-            <div class={styles.connections}>
-              {Object.keys(statisticsRef.task).length > 0 && (
-                <NNumberAnimation
-                  from={0}
-                  to={(statisticsRef.task as TaskQueueRes).taskQueue}
-                />
-              )}
-            </div>
-          </Card>
-        </NGi>
-        <NGi>
-          <Card title={t('monitor.statistics.task_number_of_ready_to_kill')}>
-            <div class={styles.connections}>
-              {Object.keys(statisticsRef.task).length > 0 && (
-                <NNumberAnimation
-                  from={0}
-                  to={(statisticsRef.task as TaskQueueRes).taskKill}
-                />
-              )}
-            </div>
-          </Card>
-        </NGi>
       </NGrid>
     )
   }
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'))
           }
         }