From e39e092794018e74ae14e1ea0b517e71a043dcc2 Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Fri, 20 Sep 2024 09:05:51 +0800 Subject: [PATCH] =?UTF-8?q?fix(1.2.0-beta1):=20=E4=BF=AE=E5=A4=8D=E9=9B=86?= =?UTF-8?q?=E7=BE=A4=E6=A8=A1=E5=BC=8F=E4=B8=8B=E9=98=BB=E5=A1=9E=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E5=B9=B6=E8=A1=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/modules/job-task-operate-drawer.vue | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) 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 00524eb..8dfea3d 100644 --- a/src/views/job/task/modules/job-task-operate-drawer.vue +++ b/src/views/job/task/modules/job-task-operate-drawer.vue @@ -4,14 +4,15 @@ import { type FormInst, NInputNumber } from 'naive-ui'; import { useFormRules, useNaiveForm } from '@/hooks/common/form'; import OperateDrawer from '@/components/common/operate-drawer.vue'; import { $t } from '@/locales'; -import { blockStrategyRecordOptions, enableStatusNumberOptions } from '@/constants/business'; +import { enableStatusNumberOptions } from '@/constants/business'; import { fetchAddJob, fetchEditJob } from '@/service/api'; import RouteKey from '@/components/common/route-key.vue'; +import BlockStrategy from '@/components/common/block-strategy.vue'; import ExecutorType from '@/components/common/executor-type.vue'; import TaskType from '@/components/common/task-type.vue'; import CodeMirror from '@/components/common/code-mirror.vue'; import JobTriggerInterval from '@/components/common/job-trigger-interval.vue'; -import { isNotNull, translateOptions } from '@/utils/common'; +import { isNotNull } from '@/utils/common'; defineOptions({ name: 'JobTaskOperateDrawer' @@ -382,13 +383,6 @@ watch( } ); -const blockStrategyOptions = computed(() => { - if (model.taskType === 1) { - return translateOptions(blockStrategyRecordOptions).filter(item => item.value !== 3); - } - return translateOptions(blockStrategyRecordOptions); -}); - function handleChangeExecutorCustomType() { if (executorCustomType.value === 0) { model.executorInfo = ''; @@ -606,11 +600,7 @@ const scriptMethodOptions = [ - +