fix: 防止定时任务引用失效工作流
- 保存任务时校验工作流权限与必填参数 - 删除工作流前检查并重新确认定时任务引用
This commit is contained in:
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user