groupName中文名 bug修复

新增定时任务执行日志里的中文组名称
新增在线机器页面的中文组名称
en-us英文更新

src/components/common/job-task-list-table.vue

@@ -74,8 +74,8 @@ const { columns, searchParams, columnChecks, data, getData, loading, mobilePagin
       )
     },
     {
-      key: 'groupName',
-      title: $t('page.jobBatch.jobTask.groupName'),
+      key: 'groupNameCn',
+      title: $t('page.jobBatch.jobTask.groupNameCn'),
       align: 'left',
       minWidth: 180
     },

src/locales/langs/en-us.ts

@@ -1,3 +1,4 @@
+
 const local: App.I18n.Schema = {
   system: {
     title: 'Task Flux',
@@ -144,6 +145,10 @@ const local: App.I18n.Schema = {
         python: 'Python'
       }
     },
+    variableType: {
+      variableType1: 'character variable',
+      variableType2: 'Expression variable'
+    },
     taskType: {
       label: 'Task Type',
       form: 'Please enter task type',
@@ -392,7 +397,10 @@ const local: App.I18n.Schema = {
     job: 'Schedule Task Management',
     job_task: 'Schedule Task List',
     job_batch: 'Schedule Task Batch List',
-    group: 'Group Config'
+    group: 'Group Config',
+    system: 'system variable',
+    system_variable: 'system_manager',
+    system_manager: 'system_manager'
   },
   page: {
     common: {
@@ -506,6 +514,7 @@ const local: App.I18n.Schema = {
       title: 'Online Machine',
       nodeType: 'Node Type',
       groupName: 'Group Name',
+      groupNameCn: 'Chinese Group Name',
       hostId: 'Pod ID',
       hostIp: 'IP',
       hostPort: 'Port',
@@ -540,6 +549,7 @@ const local: App.I18n.Schema = {
       detail: 'Group Detail',
       namespaceId: 'Namespace ID',
       groupName: 'Group Name',
+      groupNameCn: 'Chinese group name',
       token: 'Token',
       groupStatus: 'Status',
       idGeneratorMode: 'ID Generator Mode',
@@ -553,6 +563,7 @@ const local: App.I18n.Schema = {
       retryConfig: 'RetryConfig',
       form: {
         groupName: 'Please enter group name',
+        groupNameCn: 'Please enter Chinese group name',
         token: 'Please enter token',
         groupStatus: 'Please select group status',
         description: 'Please enter description',
@@ -576,6 +587,7 @@ const local: App.I18n.Schema = {
       title: 'Alarm Notify List',
       groupName: 'Group name',
       businessName: 'Business ID',
+      groupNameCn: 'Chinese group name',
       notifyName: 'Notify name',
       notifyStatus: 'State',
       notifyType: 'Notify type',
@@ -669,6 +681,7 @@ const local: App.I18n.Schema = {
       detail: 'RetryDeadLetter Detail',
       uniqueId: 'UniqueId',
       groupName: 'Group name',
+      groupNameCn: 'Chinese group name',
       sceneName: 'Scene name',
       idempotentId: 'Idempotent ID',
       bizNo: 'bizNo',
@@ -689,6 +702,7 @@ const local: App.I18n.Schema = {
       title: 'Retry List',
       detail: 'Retry Detail',
       groupName: 'Group name',
+      groupNameCn: 'Chinese group name',
       sceneName: 'Scene name',
       idempotentId: 'Idempotent ID',
       bizNo: 'Business Number',
@@ -731,6 +745,7 @@ const local: App.I18n.Schema = {
       baseConfig: 'Base Config',
       cbConfig: 'Callback Config',
       groupName: 'Group name',
+      groupNameCn: 'Chinese group name',
       sceneName: 'Scene name',
       notifyName: 'Notify name',
       sceneStatus: 'State',
@@ -778,6 +793,7 @@ const local: App.I18n.Schema = {
       title: 'Retry Task List',
       detail: 'Retry Task Detail',
       groupName: 'Group name',
+      groupNameCn: 'Chinese group name',
       sceneName: 'Scene name',
       taskStatus: 'Task status',
       taskType: 'Task type',
@@ -801,6 +817,7 @@ const local: App.I18n.Schema = {
       title: 'Workflow Batch List',
       workflowName: 'Workflow name',
       groupName: 'Group name',
+      groupNameCn: 'Chinese group name',
       executionAt: 'Execution time',
       taskBatchStatus: 'State',
       operationReason: 'Reason for operation',
@@ -817,6 +834,7 @@ const local: App.I18n.Schema = {
       title: 'Workflow List',
       workflowName: 'Workflow name',
       groupName: 'Group name',
+      groupNameCn: 'Chinese group name',
       nextTriggerAt: 'Trigger time',
       workflowStatus: 'State',
       triggerType: 'Trigger type',
@@ -834,6 +852,7 @@ const local: App.I18n.Schema = {
     jobTask: {
       title: 'JobTask List',
       groupName: 'Group name',
+      groupNameCn: 'Chinese group name',
       ownerName: 'Ower name',
       jobName: 'Mission name',
       argsStr: 'Method parameters',
@@ -893,6 +912,7 @@ const local: App.I18n.Schema = {
     jobBatch: {
       title: 'Job Batch List',
       groupName: 'Group name',
+      groupNameCn: 'Chinese group name',
       jobName: 'Job name',
       taskType: 'Task Type',
       executorInfo: 'Executor Name',
@@ -911,6 +931,7 @@ const local: App.I18n.Schema = {
         title: 'Job task list',
         id: 'ID',
         groupName: 'Group name',
+        groupNameCn: 'Chinese group name',
         taskStatus: 'Status',
         clientInfo: 'Client address',
         argsStr: 'Argument string',
@@ -948,6 +969,28 @@ const local: App.I18n.Schema = {
         admin: 'Admin'
       }
     },
+    system_variable: {
+      title: 'system parameter',
+      variableKey: 'variableKey',
+      variableName: 'variableName',
+      variableValue: 'variableValue',
+      variableType: 'variableType',
+      description: 'description',
+      detail: 'detail',
+      add: 'Add',
+      edit: 'Edit',
+      addVariable: 'Add Variable',
+      editVariable: 'Edit Variable',
+      variableType1: 'character variable',
+      variableType2: 'Expression variable',
+      form: {
+        variableName: 'Please enter the variable name',
+        variableKey: 'Please enter the variable identifier',
+        variableValue: 'Please enter the variable value',
+        variableType: 'Please select variable type',
+        description: 'Please enter a description',
+      }
+    },
     log: {
       title: 'Log Detail',
       view: 'View Log',

src/locales/langs/zh-cn.ts

@@ -525,6 +525,7 @@ const local: App.I18n.Schema = {
       title: '在线机器',
       nodeType: '类型',
       groupName: '组名称',
+      groupNameCn: '组名称',
       hostId: '机器 ID',
       hostIp: 'IP地址',
       hostPort: '端口',
@@ -594,6 +595,7 @@ const local: App.I18n.Schema = {
     notifyConfig: {
       title: '告警通知列表',
       groupName: '组名称',
+      groupNameCn: '组名称',
       businessName: '业务ID',
       notifyName: '通知名称',
       notifyStatus: '通知状态',
@@ -688,6 +690,7 @@ const local: App.I18n.Schema = {
       detail: '死信任务详情',
       uniqueId: 'UniqueId',
       groupName: '组名',
+      groupNameCn: '组名',
       sceneName: '场景名称',
       idempotentId: '幂等ID',
       bizNo: '业务编号',
@@ -708,6 +711,7 @@ const local: App.I18n.Schema = {
       title: '重试列表',
       detail: '重试详情',
       groupName: '组名称',
+      groupNameCn: '组名称',
       sceneName: '场景名称',
       idempotentId: '幂等ID',
       bizNo: '业务编号',
@@ -750,6 +754,7 @@ const local: App.I18n.Schema = {
       baseConfig: '基础配置',
       cbConfig: '回调配置',
       groupName: '组名',
+      groupNameCn: '组名',
       sceneName: '场景名',
       notifyName: '告警通知',
       sceneStatus: '状态',
@@ -797,6 +802,7 @@ const local: App.I18n.Schema = {
       title: '重试任务列表',
       detail: '重试详情',
       groupName: '组名称',
+      groupNameCn: '组名称',
       sceneName: '场景名称',
       taskStatus: '状态',
       taskType: '类型',
@@ -820,6 +826,7 @@ const local: App.I18n.Schema = {
       title: '工作流列表',
       workflowName: '工作流名称',
       groupName: '组名称',
+      groupNameCn: '组名称',
       nextTriggerAt: '触发时间',
       workflowStatus: '状态',
       triggerType: '触发类型',
@@ -838,6 +845,7 @@ const local: App.I18n.Schema = {
       title: '工作流批次列表',
       workflowName: '工作流名称',
       groupName: '组名称',
+      groupNameCn: '组名称',
       executionAt: '执行时间',
       taskBatchStatus: '状态',
       operationReason: '操作原因',
@@ -853,6 +861,7 @@ const local: App.I18n.Schema = {
     jobTask: {
       title: '定时任务列表',
       groupName: '组名称',
+      groupNameCn: '组名称',
       ownerName: '负责人',
       jobName: '任务名称',
       argsStr: '方法参数',
@@ -912,6 +921,7 @@ const local: App.I18n.Schema = {
     jobBatch: {
       title: '任务批次列表',
       groupName: '组名称',
+      groupNameCn: '组名称',
       jobName: '任务名称',
       taskType: '任务类型',
       executorInfo: '执行器名称',
@@ -930,6 +940,7 @@ const local: App.I18n.Schema = {
         title: 'JobTask 列表',
         id: 'ID',
         groupName: '组名称',
+        groupNameCn: '组名称',
         taskStatus: '状态',
         clientInfo: '地址',
         argsStr: '参数',

src/typings/api.d.ts

@@ -330,6 +330,8 @@ declare namespace Api {
       extAttrs: string;
       /** 组名称 */
       groupName: string;
+      /** 组名称 */
+      groupNameCn: string;
       /** host id */
       hostId: string;
       /** host IP */
@@ -773,6 +775,8 @@ declare namespace Api {
     type Retry = Common.CommonRecord<{
       /** 组名称 */
       groupName: string;
+      /** 组名称中文 */
+      groupNameCn: string;
       /** 场景名称 */
       sceneName: string;
       /** 幂等id */
@@ -932,6 +936,8 @@ declare namespace Api {
       workflowName: string;
       /** 组名称 */
       groupName: string;
+      /** 组名称中文 */
+      groupNameCn: string;
       /** 触发时间 */
       nextTriggerAt: string;
       /** 告警通知场景ids */
@@ -991,6 +997,8 @@ declare namespace Api {
     type Job = Common.CommonRecord<{
       /** 组名称 */
       groupName: string;
+      /** 组名称 */
+      groupNameCn: string;
       /** 负责人id */
       ownerId: string;
       /** 负责人名 */
@@ -1100,6 +1108,8 @@ declare namespace Api {
       jobId: string;
       /** 组名称 */
       groupName: string;
+      /** 组名称中文 */
+      groupNameCn: string;
       /** 任务名称 */
       taskName: string;
       /** 地址 */
@@ -1158,6 +1168,8 @@ declare namespace Api {
     type JobBatch = Common.CommonRecord<{
       /** 组名称 */
       groupName: string;
+      /** 组名称中文 */
+      groupNameCn: string;
       /** 任务名称 */
       jobName: string;
       /** 任务类型 */
@@ -1214,6 +1226,8 @@ declare namespace Api {
       workflowId?: number;
       /** 组名称 */
       groupName: string;
+      /** 组名称中文 */
+      groupNameCn: string;
       /** 执行时间 */
       executionAt: string;
       /** 状态 */
@@ -1250,6 +1264,8 @@ declare namespace Api {
       retryId: string;
       /** 组名称 */
       groupName: string;
+      /** 组名称中文 */
+      groupNameCn: string;
       /** 场景名称 */
       sceneName: string;
       /** 重试状态 */

src/typings/app.d.ts

@@ -747,6 +747,7 @@ declare namespace App {
           title: string;
           nodeType: string;
           groupName: string;
+          groupNameCn: string;
           hostId: string;
           hostIp: string;
           hostPort: string;
@@ -816,6 +817,7 @@ declare namespace App {
         notifyConfig: {
           title: string;
           groupName: string;
+          groupNameCn: string;
           businessName: string;
           notifyName: string;
           notifyStatus: string;
@@ -910,6 +912,7 @@ declare namespace App {
           detail: string;
           uniqueId: string;
           groupName: string;
+          groupNameCn: string;
           sceneName: string;
           idempotentId: string;
           bizNo: string;
@@ -930,6 +933,7 @@ declare namespace App {
           title: string;
           detail: string;
           groupName: string;
+          groupNameCn: string;
           sceneName: string;
           idempotentId: string;
           bizNo: string;
@@ -972,6 +976,7 @@ declare namespace App {
           baseConfig: string;
           cbConfig: string;
           groupName: string;
+          groupNameCn: string;
           sceneName: string;
           notifyName: string;
           sceneStatus: string;
@@ -1019,6 +1024,7 @@ declare namespace App {
           title: string;
           detail: string;
           groupName: string;
+          groupNameCn: string;
           sceneName: string;
           taskStatus: string;
           taskType: string;
@@ -1042,6 +1048,7 @@ declare namespace App {
           title: string;
           workflowName: string;
           groupName: string;
+          groupNameCn: string,
           nextTriggerAt: string;
           workflowStatus: string;
           triggerType: string;
@@ -1060,6 +1067,7 @@ declare namespace App {
           title: string;
           workflowName: string;
           groupName: string;
+          groupNameCn: string;
           executionAt: string;
           taskBatchStatus: string;
           operationReason: string;
@@ -1075,6 +1083,7 @@ declare namespace App {
         jobTask: {
           title: string;
           groupName: string;
+          groupNameCn: string;
           ownerName: string;
           jobName: string;
           argsStr: string;
@@ -1134,6 +1143,7 @@ declare namespace App {
         jobBatch: {
           title: string;
           groupName: string;
+          groupNameCn: string;
           jobName: string;
           taskType: string;
           executorInfo: string;
@@ -1152,6 +1162,7 @@ declare namespace App {
             title: string;
             id: string;
             groupName: string;
+            groupNameCn: string;
             taskStatus: string;
             clientInfo: string;
             argsStr: string;

src/views/job/batch/index.vue

@@ -86,8 +86,8 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
       }
     },
     {
-      key: 'groupName',
-      title: $t('page.jobBatch.groupName'),
+      key: 'groupNameCn',
+      title: $t('page.jobBatch.groupNameCn'),
       align: 'left',
       width: 120
     },

src/views/job/task/index.vue

@@ -71,8 +71,8 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
       }
     },
     {
-      key: 'groupName',
-      title: $t('page.jobTask.groupName'),
+      key: 'groupNameCn',
+      title: $t('page.jobTask.groupNameCn'),
       align: 'left',
       width: 150
     },
@@ -80,7 +80,14 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
       key: 'executorInfo',
       title: $t('page.jobTask.executorInfo'),
       align: 'left',
-      width: 120
+      width: 120,
+      render: row => {
+        if (row.executorType == 1) {
+          return '自定义执行器:'+row.executorInfo;
+        }else{
+          return '内置执行器';
+        }
+      }
     },
     {
       key: 'ownerName',

src/views/namespace/index.vue

@@ -118,8 +118,8 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
       align: 'left',
       width: 120,
       ellipsis: {
-        tooltip: true,  // 默认悬浮显示完整内容:ml-citation{ref="1" data="citationList"}
-        contentStyle: { maxWidth: '110px' }  // 自定义提示框宽度:ml-citation{ref="1" data="citationList"}
+        tooltip: true,
+        contentStyle: { maxWidth: '110px' }
       },
     },
     {
@@ -140,7 +140,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
           {namespaceId.value !== row.uniqueId! ? (
             <>
               <n-divider vertical />
-              <NButton type="warning" text ghost size="small" onClick={() => handleChange(row.uniqueId!)}>
+              <NButton type="warning"  text ghost size="small" onClick={() => handleChange(row.uniqueId!)} >
                 {$t('common.switch')}
               </NButton>
               <n-divider vertical />
@@ -156,7 +156,23 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
               </NPopconfirm>
             </>
           ) : (
-            ''
+            <>
+              <n-divider vertical />
+              <NButton disabled type="warning" text ghost size="small" onClick={() => handleChange(row.uniqueId!)}>
+                {$t('common.switch')}
+              </NButton>
+              <n-divider vertical />
+              <NPopconfirm onPositiveClick={() => handleDelete(row.uniqueId!)}>
+                {{
+                  default: () => $t('common.confirmDelete'),
+                  trigger: () => (
+                    <NButton disabled type="error" text ghost size="small">
+                      {$t('common.delete')}
+                    </NButton>
+                  )
+                }}
+              </NPopconfirm>
+            </>
           )}
         </div>
       )

src/views/notify/config/index.vue

@@ -66,8 +66,8 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
       }
     },
     {
-      key: 'groupName',
-      title: $t('page.notifyConfig.groupName'),
+      key: 'groupNameCn',
+      title: $t('page.notifyConfig.groupNameCn'),
       align: 'left',
       width: 120
     },

src/views/pods/index.vue

@@ -47,8 +47,8 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
       }
     },
     {
-      key: 'groupName',
-      title: $t('page.pods.groupName'),
+      key: 'groupNameCn',
+      title: $t('page.pods.groupNameCn'),
       align: 'left',
       width: 120,
       resizable: true,

src/views/retry/dead-letter/index.vue

@@ -59,8 +59,8 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
       }
     },
     {
-      key: 'groupName',
-      title: $t('page.retryDeadLetter.groupName'),
+      key: 'groupNameCn',
+      title: $t('page.retryDeadLetter.groupNameCn'),
       align: 'center',
       minWidth: 120
     },

src/views/retry/info/index.vue

@@ -88,8 +88,8 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
       }
     },
     {
-      key: 'groupName',
-      title: $t('page.retry.groupName'),
+      key: 'groupNameCn',
+      title: $t('page.retry.groupNameCn'),
       align: 'center',
       width: 180
     },

src/views/retry/scene/index.vue

@@ -76,8 +76,8 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
       }
     },
     {
-      key: 'groupName',
-      title: $t('page.retryScene.groupName'),
+      key: 'groupNameCn',
+      title: $t('page.retryScene.groupNameCn'),
       align: 'center',
       width: 180
     },

src/views/retry/task/index.vue

@@ -84,8 +84,8 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
       }
     },
     {
-      key: 'groupName',
-      title: $t('page.retryTask.groupName'),
+      key: 'groupNameCn',
+      title: $t('page.retryTask.groupNameCn'),
       align: 'center',
       minWidth: 120
     },

src/views/workflow/batch/index.vue

@@ -67,8 +67,8 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
       minWidth: 120
     },
     {
-      key: 'groupName',
-      title: $t('page.workflowBatch.groupName'),
+      key: 'groupNameCn',
+      title: $t('page.workflowBatch.groupNameCn'),
       align: 'center',
       minWidth: 120
     },

src/views/workflow/task/index.vue

@@ -158,8 +158,8 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
       }
     },
     {
-      key: 'groupName',
-      title: $t('page.workflow.groupName'),
+      key: 'groupNameCn',
+      title: $t('page.workflow.groupNameCn'),
       align: 'left',
       minWidth: 120
     },