From e07b2039c93f6dde5622fe7d1fe119ba437fb49c Mon Sep 17 00:00:00 2001 From: xlsea Date: Tue, 25 Jun 2024 14:15:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(sj=5Fmap=5Freduce):=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=96=B0=E5=A2=9Ereduce=20=E5=88=86=E7=89=87?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/route-key.vue | 12 ++----- src/locales/langs/en-us.ts | 2 ++ src/locales/langs/zh-cn.ts | 2 ++ src/typings/app.d.ts | 2 ++ src/views/_builtin/log/index.vue | 6 ++-- .../task/modules/job-task-operate-drawer.vue | 31 ++++++++++++++----- 6 files changed, 34 insertions(+), 21 deletions(-) diff --git a/src/components/common/route-key.vue b/src/components/common/route-key.vue index 1635ed6..22841ef 100644 --- a/src/components/common/route-key.vue +++ b/src/components/common/route-key.vue @@ -14,18 +14,12 @@ interface Props { const props = defineProps(); -interface Emits { - (e: 'update:value', value: Api.Common.RouteKey): void; -} -const emit = defineEmits(); - -const modelValue = defineModel('value'); +const modelValue = defineModel('value', { + default: 4 +}); /** select 下拉选项 */ const selectOptions = computed(() => { - // 默认选中轮询 - emit('update:value', 4); - // 2:广播, 3:切片 ==> 只能选择`轮询` if (props.taskType === 2 || props.taskType === 3) { return translateOptions(routeKeyRecordOptions.filter(o => o.value === 4)); diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts index b5e1a9b..735768f 100644 --- a/src/locales/langs/en-us.ts +++ b/src/locales/langs/en-us.ts @@ -751,6 +751,7 @@ const local: App.I18n.Schema = { groupName: 'Group name', jobName: 'Mission name', argsStr: 'Method parameters', + shardNum: 'Reduce shard num', argsType: 'Parameter Type', nextTriggerAt: 'Next trigger time', jobStatus: 'State', @@ -786,6 +787,7 @@ const local: App.I18n.Schema = { blockStrategy: 'Please enter Blocking strategy', argsType: 'Please enter Parameter Type', argsStr: 'Please enter executor arguments', + shardNum: 'Please enter reduce shard num', groupName: 'Please enter Group name', retryInterval: 'Please enter retry interval' }, diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index f55f1b2..21dedd8 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -759,6 +759,7 @@ const local: App.I18n.Schema = { groupName: '组名称', jobName: '任务名称', argsStr: '方法参数', + shardNum: 'reduce 分片数', argsType: '参数类型', nextTriggerAt: '触发时间', jobStatus: '状态', @@ -794,6 +795,7 @@ const local: App.I18n.Schema = { blockStrategy: '请输入阻塞策略', argsType: '请输入参数类型', argsStr: '请输入方法参数', + shardNum: '请输入 reduce 分片数', groupName: '请输入组名称', retryInterval: '请输入重试间隔' }, diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts index 043f4a7..0b27eb3 100644 --- a/src/typings/app.d.ts +++ b/src/typings/app.d.ts @@ -932,6 +932,7 @@ declare namespace App { groupName: string; jobName: string; argsStr: string; + shardNum: string; argsType: string; nextTriggerAt: string; jobStatus: string; @@ -967,6 +968,7 @@ declare namespace App { blockStrategy: string; argsType: string; argsStr: string; + shardNum: string; groupName: string; retryInterval: string; }; diff --git a/src/views/_builtin/log/index.vue b/src/views/_builtin/log/index.vue index 1b52465..a08b70e 100644 --- a/src/views/_builtin/log/index.vue +++ b/src/views/_builtin/log/index.vue @@ -6,13 +6,11 @@ import { localStg } from '@/utils/storage'; const store = useLogStore(); -const data = ref(); +const data = ref(localStg.get('log')); const { routerPushByKey } = useRouterPush(); function init() { - const logData = localStg.get('log'); - if (!logData?.data) { - data.value = logData; + if (!data.value) { routerPushByKey('404'); } } diff --git a/src/views/job/task/modules/job-task-operate-drawer.vue b/src/views/job/task/modules/job-task-operate-drawer.vue index 0def5c6..9184a84 100644 --- a/src/views/job/task/modules/job-task-operate-drawer.vue +++ b/src/views/job/task/modules/job-task-operate-drawer.vue @@ -1,5 +1,5 @@