Merge branch 'dev' into dev_wenjun_cannotDeleteWorkflowVersionWhenExi…

…stRunningInstance
apache · Mar 18, 2024 · 3f3a407 · 3f3a407
2 parents d8bb8ff + faa794c
commit 3f3a407
Show file tree

Hide file tree

Showing 71 changed files with 1,589 additions and 1,426 deletions.
diff --git a/dolphinscheduler-ui/src/common/common.ts b/dolphinscheduler-ui/src/common/common.ts
@@ -400,7 +400,7 @@ export const workflowExecutionState = (
     icon: HourglassOutlined,
     isSpin: false,
     classNames: 'wait_to_run'
-  },
+  }
 })
 
 /**

diff --git a/dolphinscheduler-ui/src/components/chart/modules/Bar.tsx b/dolphinscheduler-ui/src/components/chart/modules/Bar.tsx
@@ -49,7 +49,7 @@ const BarChart = defineComponent({
         trigger: 'axis',
         axisPointer: {
           type: 'shadow'
-        },
+        }
       },
       grid: {
         left: '3%',

diff --git a/dolphinscheduler-ui/src/components/chart/modules/Gauge.tsx b/dolphinscheduler-ui/src/components/chart/modules/Gauge.tsx
@@ -15,13 +15,7 @@
  * limitations under the License.
  */
 
-import {
-  defineComponent,
-  onMounted,
-  onBeforeUnmount,
-  PropType,
-  ref
-} from 'vue'
+import { defineComponent, onMounted, onBeforeUnmount, PropType, ref } from 'vue'
 import initChart from '@/components/chart'
 import type { Ref } from 'vue'
 

diff --git a/dolphinscheduler-ui/src/layouts/content/use-dataList.ts b/dolphinscheduler-ui/src/layouts/content/use-dataList.ts
@@ -110,18 +110,18 @@ export function useDataList() {
               {
                 label: t('menu.project_overview'),
                 key: `/projects/${projectCode}`,
-                payload: { projectName: projectName },
+                payload: { projectName: projectName }
               },
               {
                 label: t('menu.project_parameter'),
                 key: `/projects/${projectCode}/parameter`,
-                payload: { projectName: projectName },
+                payload: { projectName: projectName }
               },
               {
                 label: t('menu.project_preferences'),
                 key: `/projects/${projectCode}/preferences`,
-                payload: { projectName: projectName },
-              },
+                payload: { projectName: projectName }
+              }
             ]
           },
           {

diff --git a/dolphinscheduler-ui/src/locales/en_US/project.ts b/dolphinscheduler-ui/src/locales/en_US/project.ts
@@ -41,7 +41,7 @@ export default {
     no_permission: 'No Permission',
     read_permission: 'Read Permission',
     all_permission: 'All Permission',
-    assign_worker_group: 'Worker Group',
+    assign_worker_group: 'Worker Group'
   },
   workflow: {
     on_line: 'Online',
@@ -239,12 +239,17 @@ export default {
     time_to_online: 'Confirm to make the Scheduler online?',
     time_to_offline: 'Confirm to make the Scheduler offline?',
     warning_dependent_tasks_title: 'Warning',
-    warning_dependent_tasks_desc: 'The downstream dependent tasks exists. Are you sure to make the workflow offline?',
+    warning_dependent_tasks_desc:
+      'The downstream dependent tasks exists. Are you sure to make the workflow offline?',
     warning_dependencies: 'Dependencies:',
-    delete_validate_dependent_tasks_desc: 'The downstream dependent tasks exists. You can not delete the workflow.',
-    warning_offline_scheduler_dependent_tasks_desc: 'The downstream dependent tasks exists. Are you sure to make the scheduler offline?',
-    delete_task_validate_dependent_tasks_desc: 'The downstream dependent tasks exists. You can not delete the task.',
-    warning_delete_scheduler_dependent_tasks_desc: 'The downstream dependent tasks exists. Are you sure to delete the scheduler?',
+    delete_validate_dependent_tasks_desc:
+      'The downstream dependent tasks exists. You can not delete the workflow.',
+    warning_offline_scheduler_dependent_tasks_desc:
+      'The downstream dependent tasks exists. Are you sure to make the scheduler offline?',
+    delete_task_validate_dependent_tasks_desc:
+      'The downstream dependent tasks exists. You can not delete the task.',
+    warning_delete_scheduler_dependent_tasks_desc:
+      'The downstream dependent tasks exists. Are you sure to delete the scheduler?'
   },
   task: {
     on_line: 'Online',
@@ -314,7 +319,8 @@ export default {
     whether_dry_run: 'Whether Dry-Run',
     please_choose: 'Please Choose',
     remove_task_cache: 'Clear cache',
-    delete_validate_dependent_tasks_desc: 'The downstream dependent tasks exists. You can not delete the task.',
+    delete_validate_dependent_tasks_desc:
+      'The downstream dependent tasks exists. You can not delete the task.'
   },
   dag: {
     create: 'Create Workflow',
@@ -843,9 +849,12 @@ export default {
     please_select_target_datasource: 'Please select target datasource id',
     please_select_target_database: 'Please select target database',
     please_enter_target_table: 'Please select target table name',
-    please_enter_target_filter_expression: 'Please enter target filter expression',
-    please_enter_comparison_name_the_alias_in_comparison_execute_sql: 'Please enter comparison name the alias in comparison execute sql',
-    please_enter_statistics_name_the_alias_in_statistics_execute_sql: 'Please enter statistics name the alias in statistics execute sql',
+    please_enter_target_filter_expression:
+      'Please enter target filter expression',
+    please_enter_comparison_name_the_alias_in_comparison_execute_sql:
+      'Please enter comparison name the alias in comparison execute sql',
+    please_enter_statistics_name_the_alias_in_statistics_execute_sql:
+      'Please enter statistics name the alias in statistics execute sql',
     please_enter_comparison_execute_sql: 'Please enter comparison execute sql',
     please_enter_statistics_execute_sql: 'Please enter statistics execute sql',
     please_enter_threshold_number_is_needed:
@@ -899,8 +908,7 @@ export default {
     yarn_queue_tips: 'Please input yarn queue(optional)',
     dependent_type: 'Dependency Type',
     dependent_on_workflow: 'Dependent on workflow',
-    dependent_on_task: 'Dependent on task',
-
+    dependent_on_task: 'Dependent on task'
   },
   menu: {
     fav: 'Favorites',
@@ -927,15 +935,16 @@ export default {
     edit: 'Edit',
     delete: 'Delete',
     delete_confirm: 'Delete?',
-    success: 'Success',
+    success: 'Success'
   },
   preference: {
     edit_preference: 'Edit Preference',
     preference_manage: 'Project Preference Management',
-    instruction_tips: 'The settings below will affect all workflows and tasks under this project.When creating the workflow or task, these preferences will be the default value of their components.',
+    instruction_tips:
+      'The settings below will affect all workflows and tasks under this project.When creating the workflow or task, these preferences will be the default value of their components.',
     success: 'Success',
     submit: 'Submit',
     enabled: 'Enabled',
     disabled: 'Disabled'
-  },
+  }
 }
diff --git a/dolphinscheduler-ui/src/locales/en_US/security.ts b/dolphinscheduler-ui/src/locales/en_US/security.ts
@@ -273,14 +273,14 @@ export default {
     MsgType: 'Msg Type',
     // eslint-disable-next-line quotes
     IsAtAll: "{'@'}All",
-    calledNumber:"Called phone number",
-    calledShowNumber:"Call display number",
-    ttsCode:"TTS Code",
-    address:'Address',
-    accessKeyId:"AccessKeyId",
-    accessKeySecret:"AccessKeySecret",
+    calledNumber: 'Called phone number',
+    calledShowNumber: 'Call display number',
+    ttsCode: 'TTS Code',
+    address: 'Address',
+    accessKeyId: 'AccessKeyId',
+    accessKeySecret: 'AccessKeySecret',
     annotations: 'Annotations',
-    generatorURL: 'GeneratorURL',
+    generatorURL: 'GeneratorURL'
   },
   k8s_namespace: {
     create_namespace: 'Create Namespace',

diff --git a/dolphinscheduler-ui/src/locales/zh_CN/project.ts b/dolphinscheduler-ui/src/locales/zh_CN/project.ts
@@ -41,7 +41,7 @@ export default {
     no_permission: '无权限',
     read_permission: '读权限',
     all_permission: '所有权限',
-    assign_worker_group: '分配WorkerGroup',
+    assign_worker_group: '分配WorkerGroup'
   },
   workflow: {
     on_line: '线上',
@@ -237,12 +237,16 @@ export default {
     time_to_online: '是否确定上线该定时?',
     time_to_offline: '是否确定下线该定时?',
     warning_dependent_tasks_title: '警告',
-    warning_dependent_tasks_desc: '下游存在依赖, 下线操作可能会对下游任务产生影响. 你确定要下线该工作流嘛?',
+    warning_dependent_tasks_desc:
+      '下游存在依赖, 下线操作可能会对下游任务产生影响. 你确定要下线该工作流嘛?',
     warning_dependencies: '依赖如下:',
     delete_validate_dependent_tasks_desc: '下游存在依赖，你不能删除该工作流',
-    warning_offline_scheduler_dependent_tasks_desc: '下游存在依赖, 下线操作可能会对下游任务产生影响. 你确定要下线该定时嘛?',
-    delete_task_validate_dependent_tasks_desc: '下游存在依赖，你不能删除该任务.',
-    warning_delete_scheduler_dependent_tasks_desc: '下游存在依赖, 删除定时可能会对下游任务产生影响. 你确定要删除该定时嘛?',
+    warning_offline_scheduler_dependent_tasks_desc:
+      '下游存在依赖, 下线操作可能会对下游任务产生影响. 你确定要下线该定时嘛?',
+    delete_task_validate_dependent_tasks_desc:
+      '下游存在依赖，你不能删除该任务.',
+    warning_delete_scheduler_dependent_tasks_desc:
+      '下游存在依赖, 删除定时可能会对下游任务产生影响. 你确定要删除该定时嘛?'
   },
   task: {
     on_line: '线上',
@@ -312,7 +316,7 @@ export default {
     whether_dry_run: '是否空跑',
     please_choose: '请选择',
     remove_task_cache: '清除缓存',
-    delete_validate_dependent_tasks_desc: '下游存在依赖，你不能删除该任务定义',
+    delete_validate_dependent_tasks_desc: '下游存在依赖，你不能删除该任务定义'
   },
   dag: {
     create: '创建工作流',
@@ -822,8 +826,10 @@ export default {
     please_select_target_database: '请选择目标数据库',
     please_enter_target_table: '请选择目标数据表',
     please_enter_target_filter_expression: '请输入目标表过滤条件',
-    please_enter_comparison_name_the_alias_in_comparison_execute_sql: '请输入期望值名',
-    please_enter_statistics_name_the_alias_in_statistics_execute_sql: '请输入实际值名',
+    please_enter_comparison_name_the_alias_in_comparison_execute_sql:
+      '请输入期望值名',
+    please_enter_statistics_name_the_alias_in_statistics_execute_sql:
+      '请输入实际值名',
     please_enter_comparison_execute_sql: '请输入期望值计算SQL',
     please_enter_statistics_execute_sql: '请输入实际值计算SQL',
     custom_config: '自定义配置',
@@ -872,7 +878,7 @@ export default {
     yarn_queue_tips: '请输入Yarn队列(选填)',
     dependent_type: '依赖类型',
     dependent_on_workflow: '依赖于工作流',
-    dependent_on_task: '依赖于任务',
+    dependent_on_task: '依赖于任务'
   },
   menu: {
     fav: '收藏组件',
@@ -899,15 +905,16 @@ export default {
     edit: '编辑',
     delete: '删除',
     delete_confirm: '确定删除吗?',
-    success: '成功',
+    success: '成功'
   },
   preference: {
     edit_preference: '修改项目偏好设置',
     preference_manage: '项目偏好管理',
-    instruction_tips: '下面这些项目偏好配置将影响这个项目下的所有工作流和任务。当创建工作流和任务时，这些配置将影响组件中的默认选项',
+    instruction_tips:
+      '下面这些项目偏好配置将影响这个项目下的所有工作流和任务。当创建工作流和任务时，这些配置将影响组件中的默认选项',
     success: '成功',
     submit: '提交',
     enabled: '启用',
     disabled: '未启用'
-  },
+  }
 }
diff --git a/dolphinscheduler-ui/src/locales/zh_CN/security.ts b/dolphinscheduler-ui/src/locales/zh_CN/security.ts
@@ -272,14 +272,14 @@ export default {
     MsgType: '消息类型',
     // eslint-disable-next-line quotes
     IsAtAll: "{'@'}所有人",
-    calledNumber:"被叫电话号码",
-    calledShowNumber:"呼叫显示号码",
-    ttsCode:"语音模板",
-    address:'访问域名',
-    accessKeyId:"AccessKeyId",
-    accessKeySecret:"AccessKeySecret",
+    calledNumber: '被叫电话号码',
+    calledShowNumber: '呼叫显示号码',
+    ttsCode: '语音模板',
+    address: '访问域名',
+    accessKeyId: 'AccessKeyId',
+    accessKeySecret: 'AccessKeySecret',
     annotations: '注释',
-    generatorURL: '生成地址',
+    generatorURL: '生成地址'
   },
   k8s_namespace: {
     create_namespace: '创建命名空间',

diff --git a/dolphinscheduler-ui/src/service/modules/data-source/index.ts b/dolphinscheduler-ui/src/service/modules/data-source/index.ts
@@ -134,7 +134,7 @@ export function getDatasourceDatabasesById(datasourceId: number): any {
     url: '/datasources/databases',
     method: 'get',
     params: {
-       datasourceId
+      datasourceId
     }
   })
 }

diff --git a/dolphinscheduler-ui/src/service/modules/lineages/index.ts b/dolphinscheduler-ui/src/service/modules/lineages/index.ts
@@ -16,7 +16,7 @@
  */
 
 import { axios } from '@/service/service'
-import {DependentTaskReq, ProjectCodeReq, WorkflowCodeReq} from './types'
+import { DependentTaskReq, ProjectCodeReq, WorkflowCodeReq } from './types'
 
 export function queryWorkFlowList(projectCode: ProjectCodeReq): any {
   return axios({
@@ -42,10 +42,13 @@ export function queryLineageByWorkFlowCode(
   })
 }
 
-export function queryDependentTasks(projectCode: number, params: DependentTaskReq): any {
+export function queryDependentTasks(
+  projectCode: number,
+  params: DependentTaskReq
+): any {
   return axios({
     url: `/projects/${projectCode}/lineages/query-dependent-tasks`,
     method: 'get',
     params
   })
-}
+}
diff --git a/dolphinscheduler-ui/src/service/modules/login/index.ts b/dolphinscheduler-ui/src/service/modules/login/index.ts
@@ -36,13 +36,13 @@ export function ssoLoginUrl(): any {
 export function getOauth2Provider(): any {
   return axios({
     url: '/oauth2-provider',
-    method: 'get',
+    method: 'get'
   })
 }
 
 export function clearCookie(): any {
   return axios({
     url: '/cookies',
-    method: 'delete',
+    method: 'delete'
   })
-}
+}
diff --git a/dolphinscheduler-ui/src/service/modules/login/types.ts b/dolphinscheduler-ui/src/service/modules/login/types.ts
@@ -26,10 +26,10 @@ interface LoginRes {
 }
 
 interface OAuth2Provider {
-  clientId: string,
-  redirectUri: string,
-  provider: string,
-  authorizationUri: string,
+  clientId: string
+  redirectUri: string
+  provider: string
+  authorizationUri: string
   iconUri: string
 }
 

diff --git a/dolphinscheduler-ui/src/service/modules/projects-preference/index.ts b/dolphinscheduler-ui/src/service/modules/projects-preference/index.ts
@@ -22,9 +22,7 @@ import {
   UpdateProjectPreferenceStateReq
 } from './types'
 
-export function queryProjectPreferenceByProjectCode(
-  projectCode: number
-): any {
+export function queryProjectPreferenceByProjectCode(projectCode: number): any {
   return axios({
     url: `/projects/${projectCode}/project-preference`,
     method: 'get'
@@ -43,12 +41,12 @@ export function updateProjectPreference(
 }
 
 export function updateProjectPreferenceState(
-    data: UpdateProjectPreferenceStateReq,
-    projectCode: number,
+  data: UpdateProjectPreferenceStateReq,
+  projectCode: number
 ): any {
   return axios({
     url: `/projects/${projectCode}/project-preference`,
     method: 'post',
     data
   })
-}
+}
diff --git a/dolphinscheduler-ui/src/service/modules/projects-preference/types.ts b/dolphinscheduler-ui/src/service/modules/projects-preference/types.ts
@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 interface ProjectPreferenceReq {
   projectPreferences: string
 }

diff --git a/dolphinscheduler-ui/src/service/modules/projects-worker-group/index.ts b/dolphinscheduler-ui/src/service/modules/projects-worker-group/index.ts
@@ -16,11 +16,9 @@
  */
 
 import { axios } from '@/service/service'
-import { UpdateProjectWorkerGroupsReq } from "@/service/modules/projects-worker-group/types";
+import { UpdateProjectWorkerGroupsReq } from '@/service/modules/projects-worker-group/types'
 
-export function queryWorkerGroupsByProjectCode(
-  projectCode: number
-): any {
+export function queryWorkerGroupsByProjectCode(projectCode: number): any {
   return axios({
     url: `/projects/${projectCode}/worker-group`,
     method: 'get'
@@ -36,4 +34,4 @@ export function assignWorkerGroups(
     method: 'post',
     data
   })
-}
+}