fix: 防止定时任务引用失效工作流

- 保存任务时校验工作流权限与必填参数

- 删除工作流前检查并重新确认定时任务引用
This commit is contained in:
2026-08-03 14:50:28 +08:00
parent 93db17b384
commit 8c334be65d
12 changed files with 817 additions and 43 deletions

View File

@@ -0,0 +1,184 @@
/* eslint-disable vue/one-component-per-file */
import { flushPromises, mount } from '@vue/test-utils';
import { defineComponent, h, nextTick } from 'vue';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import SysJobModal from './SysJobModal.vue';
const apiMocks = vi.hoisted(() => ({
get: vi.fn(),
post: vi.fn(),
}));
vi.mock('#/api/request', () => ({ api: apiMocks }));
vi.mock('#/locales', () => ({ $t: (key: string) => key }));
vi.mock('#/components/cron/CronPicker.vue', () => ({
default: defineComponent({ name: 'CronPicker', setup: () => () => h('div') }),
}));
vi.mock('#/components/dict/DictSelect.vue', () => ({
default: defineComponent({ name: 'DictSelect', setup: () => () => h('div') }),
}));
vi.mock('#/views/ai/workflow/components/WorkflowFormItem.vue', () => ({
default: defineComponent({
name: 'WorkflowFormItem',
setup: () => () => h('div'),
}),
}));
vi.mock('@easyflow/common-ui', () => ({
EasyFlowFormModal: defineComponent({
name: 'EasyFlowFormModal',
props: {
confirmDisabled: Boolean,
confirmLoading: Boolean,
open: Boolean,
},
emits: ['confirm'],
setup(props, { emit, slots }) {
return () =>
props.open
? h('section', [
...(slots.default?.() || []),
h(
'button',
{
'data-test': 'confirm',
onClick: () => emit('confirm'),
},
'confirm',
),
])
: null;
},
}),
}));
vi.mock('element-plus', () => ({
ElAlert: defineComponent({
name: 'ElAlert',
props: { title: { default: '', type: String } },
setup(props) {
return () => h('p', props.title);
},
}),
ElForm: defineComponent({
name: 'ElForm',
setup(_, { expose, slots }) {
expose({
resetFields: vi.fn(),
validate: (callback: (valid: boolean) => void) => callback(true),
});
return () => h('form', slots.default?.());
},
}),
ElFormItem: defineComponent({
name: 'ElFormItem',
setup(_, { slots }) {
return () => h('div', slots.default?.());
},
}),
ElInput: defineComponent({ name: 'ElInput', setup: () => () => h('input') }),
ElMessage: { success: vi.fn() },
}));
describe('sys job modal', () => {
beforeEach(() => {
vi.clearAllMocks();
apiMocks.get.mockRejectedValue(new Error('工作流不存在'));
apiMocks.post.mockResolvedValue({ errorCode: 0, message: '保存成功' });
});
it('releases loading and keeps new task creation available after a deleted workflow fails to load', async () => {
const wrapper = mount(SysJobModal, {
global: {
directives: {
loading: {
mounted(element, binding) {
element.dataset.loading = String(binding.value);
},
updated(element, binding) {
element.dataset.loading = String(binding.value);
},
},
},
},
});
(wrapper.vm as { openDialog: (row: unknown) => void }).openDialog({
id: 1,
jobParams: { workflowId: '101', workflowParams: {} },
jobType: 1,
});
await flushPromises();
expect(apiMocks.get).toHaveBeenCalledWith(
'/api/v1/workflow/getRunningParameters?id=101',
);
expect(wrapper.get('form').attributes('data-loading')).toBe('false');
expect(wrapper.text()).toContain('所选工作流已不可用,请重新选择');
expect(
wrapper
.findComponent({ name: 'EasyFlowFormModal' })
.props('confirmDisabled'),
).toBe(true);
await wrapper.get('[data-test="confirm"]').trigger('click');
expect(apiMocks.post).not.toHaveBeenCalled();
(wrapper.vm as { openDialog: (row: unknown) => void }).openDialog({});
await flushPromises();
expect(wrapper.get('form').attributes('data-loading')).toBe('false');
expect(
wrapper
.findComponent({ name: 'EasyFlowFormModal' })
.props('confirmDisabled'),
).toBe(false);
});
it('blocks save while workflow parameters are loading', async () => {
let resolveParameters: ((value: unknown) => void) | undefined;
apiMocks.get.mockReturnValue(
new Promise((resolve) => {
resolveParameters = resolve;
}),
);
const wrapper = mount(SysJobModal, {
global: {
directives: {
loading: {
mounted(element, binding) {
element.dataset.loading = String(binding.value);
},
updated(element, binding) {
element.dataset.loading = String(binding.value);
},
},
},
},
});
(wrapper.vm as { openDialog: (row: unknown) => void }).openDialog({
id: 1,
jobParams: { workflowId: '101', workflowParams: {} },
jobType: 1,
});
await nextTick();
const modal = wrapper.findComponent({ name: 'EasyFlowFormModal' });
expect(modal.props('confirmDisabled')).toBe(true);
expect(modal.props('confirmLoading')).toBe(true);
await wrapper.get('[data-test="confirm"]').trigger('click');
expect(apiMocks.post).not.toHaveBeenCalled();
resolveParameters?.({ data: { parameters: [] } });
await flushPromises();
expect(modal.props('confirmDisabled')).toBe(false);
expect(modal.props('confirmLoading')).toBe(false);
await wrapper.get('[data-test="confirm"]').trigger('click');
await flushPromises();
expect(apiMocks.post).toHaveBeenCalledTimes(1);
});
});

View File

@@ -1,7 +1,7 @@
<script setup lang="ts">
import type { FormInstance } from 'element-plus';
import { onMounted, ref } from 'vue';
import { computed, onMounted, ref } from 'vue';
import { EasyFlowFormModal } from '@easyflow/common-ui';
@@ -60,10 +60,18 @@ const baseRules = ref({
const paramsLoading = ref(false);
const workflowParams = ref<any[]>([]);
const workflowParamsLoadError = ref('');
const rules = ref({ ...baseRules.value });
let workflowParamsRequestId = 0;
const workflowParamsSubmissionBlocked = computed(
() =>
entity.value.jobType === 1 &&
(paramsLoading.value || Boolean(workflowParamsLoadError.value)),
);
// functions
function openDialog(row: any) {
resetWorkflowParamsState();
if (row.id) {
entity.value = { ...row };
// 确保 jobParams 存在
@@ -80,37 +88,41 @@ function openDialog(row: any) {
dialogVisible.value = true;
}
function save() {
if (btnLoading.value || workflowParamsSubmissionBlocked.value) {
return;
}
saveForm.value?.validate((valid) => {
if (valid) {
btnLoading.value = true;
api
.post(
isAdd.value ? 'api/v1/sysJob/save' : 'api/v1/sysJob/update',
entity.value,
)
.then((res) => {
btnLoading.value = false;
if (res.errorCode === 0) {
ElMessage.success(res.message);
emit('reload');
closeDialog();
}
})
.catch(() => {
btnLoading.value = false;
});
if (!valid || btnLoading.value || workflowParamsSubmissionBlocked.value) {
return;
}
btnLoading.value = true;
api
.post(
isAdd.value ? 'api/v1/sysJob/save' : 'api/v1/sysJob/update',
entity.value,
)
.then((res) => {
btnLoading.value = false;
if (res.errorCode === 0) {
ElMessage.success(res.message);
emit('reload');
closeDialog();
}
})
.catch(() => {
btnLoading.value = false;
});
});
}
function closeDialog() {
saveForm.value?.resetFields();
isAdd.value = true;
entity.value = { ...initEntity };
workflowParams.value = [];
resetWorkflowParamsState();
dialogVisible.value = false;
}
function jobTypeChange(v: any) {
workflowParams.value = [];
resetWorkflowParamsState();
entity.value.jobParams = {
workflowParams: {},
};
@@ -122,12 +134,34 @@ function workflowChange(v: any) {
entity.value.jobParams.workflowParams = {};
getWorkflowParams(v);
}
function getWorkflowParams(v: any) {
function resetWorkflowParamsState() {
workflowParamsRequestId += 1;
paramsLoading.value = false;
workflowParams.value = [];
workflowParamsLoadError.value = '';
}
async function getWorkflowParams(v: any) {
const requestId = ++workflowParamsRequestId;
paramsLoading.value = true;
api.get(`/api/v1/workflow/getRunningParameters?id=${v}`).then((res) => {
paramsLoading.value = false;
workflowParams.value = res.data.parameters;
});
workflowParams.value = [];
workflowParamsLoadError.value = '';
try {
const res = await api.get(`/api/v1/workflow/getRunningParameters?id=${v}`);
if (requestId !== workflowParamsRequestId) {
return;
}
workflowParams.value = Array.isArray(res.data?.parameters)
? res.data.parameters
: [];
} catch {
if (requestId === workflowParamsRequestId) {
workflowParamsLoadError.value = '所选工作流已不可用,请重新选择';
}
} finally {
if (requestId === workflowParamsRequestId) {
paramsLoading.value = false;
}
}
}
const str = '"param"';
</script>
@@ -138,7 +172,8 @@ const str = '"param"';
:closable="!btnLoading"
:title="isAdd ? $t('button.add') : $t('button.edit')"
:before-close="closeDialog"
:confirm-loading="btnLoading"
:confirm-disabled="workflowParamsSubmissionBlocked"
:confirm-loading="btnLoading || paramsLoading"
:confirm-text="$t('button.save')"
:submitting="btnLoading"
@confirm="save"
@@ -180,6 +215,13 @@ const str = '"param"';
@change="workflowChange"
/>
</ElFormItem>
<ElAlert
v-if="workflowParamsLoadError"
:title="workflowParamsLoadError"
type="error"
:closable="false"
show-icon
/>
<WorkflowFormItem
v-model:run-params="entity.jobParams.workflowParams"
:parameters="workflowParams"