feat(sj_map_reduce): 任务表单新增reduce 分片数字段

src/components/common/route-key.vue

@@ -14,18 +14,12 @@ interface Props {
 
 const props = defineProps<Props>();
 
-interface Emits {
+const modelValue = defineModel<Api.Common.RouteKey>('value', {
-  (e: 'update:value', value: Api.Common.RouteKey): void;
+  default: 4
-}
+});
-const emit = defineEmits<Emits>();
-
-const modelValue = defineModel<Api.Common.RouteKey>('value');
 
 /** 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));

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'
       },

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: '请输入重试间隔'
       },

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;
           };

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 (!data.value) {
-  if (!logData?.data) {
-    data.value = logData;
     routerPushByKey('404');
   }
 }

src/views/job/task/modules/job-task-operate-drawer.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, reactive, watch } from 'vue';
+import { computed, reactive, ref, watch } from 'vue';
 import { useFormRules, useNaiveForm } from '@/hooks/common/form';
 import OperateDrawer from '@/components/common/operate-drawer.vue';
 import { $t } from '@/locales';
@@ -37,6 +37,7 @@ const visible = defineModel<boolean>('visible', {
 const dynamicForm = reactive({
   args: [{ arg: '' }]
 });
+const shardNum = ref(0);
 
 const { formRef, validate, restoreValidation } = useNaiveForm();
 const { defaultRequiredRule } = useFormRules();
@@ -80,7 +81,7 @@ function createDefaultModel(): Model {
     argsStr: '',
     argsType: 1,
     jobStatus: 1,
-    routeKey: 1,
+    routeKey: 4,
     executorType: 1,
     triggerType: 2,
     executorInfo: '',
@@ -147,6 +148,12 @@ function handleUpdateModelWhenEdit() {
         })
       });
     }
+
+    if (model.taskType === 5 && model.argsStr) {
+      const argsJson = JSON.parse(model.argsStr);
+      shardNum.value = argsJson.shardNum;
+      model.argsStr = argsJson.argsStr;
+    }
   }
 }
 
@@ -180,7 +187,7 @@ async function handleSubmit() {
     const { error } = await fetchAddJob({
       groupName,
       jobName,
-      argsStr,
+      argsStr: taskType === 5 ? JSON.stringify({ shardNum: shardNum.value, argsStr }) : argsStr,
       argsType,
       jobStatus,
       routeKey,
@@ -225,7 +232,7 @@ async function handleSubmit() {
       id,
       groupName,
       jobName,
-      argsStr,
+      argsStr: taskType === 5 ? JSON.stringify({ shardNum: shardNum.value, argsStr }) : argsStr,
       argsType,
       jobStatus,
       routeKey,
@@ -283,11 +290,16 @@ watch(dynamicForm, () => {
 watch(
   () => model.taskType,
   taskType => {
-    if (visible.value) {
+    if (props.operateType === 'add') {
-      if (taskType !== 3) {
+      if (visible.value) {
-        dynamicForm.args = [];
+        if (taskType !== 3) {
+          dynamicForm.args = [];
+        }
+        if (taskType !== 5) {
+          shardNum.value = 0;
+        }
+        model.argsStr = '';
       }
-      model.argsStr = '';
     }
   }
 );
@@ -328,6 +340,9 @@ watch(
       <NFormItem :label="$t('page.jobTask.taskType')" path="taskType">
         <TaskType v-model:value="model.taskType" :placeholder="$t('page.jobTask.form.taskType')" />
       </NFormItem>
+      <NFormItem v-if="model.taskType === 5" :label="$t('page.jobTask.shardNum')">
+        <NInputNumber v-model:value="shardNum" :min="0" :placeholder="$t('page.jobTask.form.shardNum')" />
+      </NFormItem>
       <NFormItem
         :label="$t('page.jobTask.argsStr')"
         path="argsStr"