fix(1.2.0-beta1): 修复集群模式下阻塞策略并行不显示问题
This commit is contained in:
parent
33b1ec7662
commit
e39e092794
@ -4,14 +4,15 @@ import { type FormInst, NInputNumber } from 'naive-ui';
|
|||||||
import { useFormRules, useNaiveForm } from '@/hooks/common/form';
|
import { useFormRules, useNaiveForm } from '@/hooks/common/form';
|
||||||
import OperateDrawer from '@/components/common/operate-drawer.vue';
|
import OperateDrawer from '@/components/common/operate-drawer.vue';
|
||||||
import { $t } from '@/locales';
|
import { $t } from '@/locales';
|
||||||
import { blockStrategyRecordOptions, enableStatusNumberOptions } from '@/constants/business';
|
import { enableStatusNumberOptions } from '@/constants/business';
|
||||||
import { fetchAddJob, fetchEditJob } from '@/service/api';
|
import { fetchAddJob, fetchEditJob } from '@/service/api';
|
||||||
import RouteKey from '@/components/common/route-key.vue';
|
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 ExecutorType from '@/components/common/executor-type.vue';
|
||||||
import TaskType from '@/components/common/task-type.vue';
|
import TaskType from '@/components/common/task-type.vue';
|
||||||
import CodeMirror from '@/components/common/code-mirror.vue';
|
import CodeMirror from '@/components/common/code-mirror.vue';
|
||||||
import JobTriggerInterval from '@/components/common/job-trigger-interval.vue';
|
import JobTriggerInterval from '@/components/common/job-trigger-interval.vue';
|
||||||
import { isNotNull, translateOptions } from '@/utils/common';
|
import { isNotNull } from '@/utils/common';
|
||||||
|
|
||||||
defineOptions({
|
defineOptions({
|
||||||
name: 'JobTaskOperateDrawer'
|
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() {
|
function handleChangeExecutorCustomType() {
|
||||||
if (executorCustomType.value === 0) {
|
if (executorCustomType.value === 0) {
|
||||||
model.executorInfo = '';
|
model.executorInfo = '';
|
||||||
@ -606,11 +600,7 @@ const scriptMethodOptions = [
|
|||||||
</NGi>
|
</NGi>
|
||||||
<NGi>
|
<NGi>
|
||||||
<NFormItem :label="$t('page.jobTask.blockStrategy')" path="blockStrategy">
|
<NFormItem :label="$t('page.jobTask.blockStrategy')" path="blockStrategy">
|
||||||
<NSelect
|
<BlockStrategy v-model:value="model.blockStrategy" />
|
||||||
v-model:value="model.blockStrategy"
|
|
||||||
:placeholder="$t('common.blockStrategy.form')"
|
|
||||||
:options="blockStrategyOptions"
|
|
||||||
/>
|
|
||||||
</NFormItem>
|
</NFormItem>
|
||||||
</NGi>
|
</NGi>
|
||||||
</NGrid>
|
</NGrid>
|
||||||
|
Loading…
Reference in New Issue
Block a user