v2-dev
xiaojunnuo 2025-09-01 14:18:42 +08:00
parent 1ceeacc526
commit a4cbb11693
2 changed files with 26 additions and 6 deletions

View File

@ -313,6 +313,8 @@ function useStepForm() {
}; };
const stepDelete = () => { const stepDelete = () => {
//
Modal.confirm({ Modal.confirm({
title: "确认", title: "确认",
content: `确定要删除此步骤吗?`, content: `确定要删除此步骤吗?`,

View File

@ -279,7 +279,7 @@
</fs-page> </fs-page>
</template> </template>
<script lang="ts"> <script lang="tsx">
import { computed, defineComponent, onMounted, onUnmounted, provide, ref, Ref, watch } from "vue"; import { computed, defineComponent, onMounted, onUnmounted, provide, ref, Ref, watch } from "vue";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import PiTaskForm from "./component/task-form/index.vue"; import PiTaskForm from "./component/task-form/index.vue";
@ -758,9 +758,12 @@ export default defineComponent({
//stepid //stepid
let hasError = false; let hasError = false;
let errorMessage = ""; let errorMessages = [];
let errorIndex = 1;
eachSteps(pp, (step: any, task: any, stage: any) => { eachSteps(pp, (step: any, task: any, stage: any) => {
stepIds.push(step.id); if (step.disabled !== true) {
stepIds.push(step.id);
}
if (step.input) { if (step.input) {
for (const key in step.input) { for (const key in step.input) {
const value = step.input[key]; const value = step.input[key];
@ -775,21 +778,36 @@ export default defineComponent({
const paramName = arr[2]; const paramName = arr[2];
if (!stepIds.includes(stepId)) { if (!stepIds.includes(stepId)) {
hasError = true; hasError = true;
const message = `任务${step.title}的前置输出步骤${paramName}不存在,请重新修改此任务`; const message = `${step.title}的前置输出步骤${paramName}不存在或已被禁用`;
errorIndex++;
addValidateError(task.id, { addValidateError(task.id, {
message, message,
}); });
addValidateError(step.id, { addValidateError(step.id, {
message, message,
}); });
errorMessage += message + ""; errorMessages.push(message);
} }
} }
} }
}); });
if (hasError) { if (hasError) {
notification.error({ message: errorMessage }); notification.error({
message: () => {
const nodes = [];
let i = 0;
for (const error of errorMessages) {
i++;
nodes.push(
<div>
{i}.{error}
</div>
);
}
return nodes;
},
});
throw new Error(errorMessage); throw new Error(errorMessage);
} }
} }