fix:bug修复
This commit is contained in:
@@ -38,6 +38,9 @@
|
|||||||
</AddFile>
|
</AddFile>
|
||||||
<el-button type="primary" class="ml12" @click="downLoadFun">下载文件</el-button>
|
<el-button type="primary" class="ml12" @click="downLoadFun">下载文件</el-button>
|
||||||
</template>
|
</template>
|
||||||
|
<template v-else #leftOptions>
|
||||||
|
<el-button type="primary" class="ml12" @click="downLoadFun">下载文件</el-button>
|
||||||
|
</template>
|
||||||
|
|
||||||
<template #cardTemplate="{ tableData }">
|
<template #cardTemplate="{ tableData }">
|
||||||
<ImageCard
|
<ImageCard
|
||||||
|
|||||||
@@ -165,7 +165,7 @@ const createSuccessFun = () => {
|
|||||||
|
|
||||||
// 拼接改变
|
// 拼接改变
|
||||||
const changeJoinFun = async () => {
|
const changeJoinFun = async () => {
|
||||||
const version = await getRunDetailInfoFun(props.divInfo.uuid, operateType.value);
|
const version = await getVersionFun();
|
||||||
if (runInfoFormData.isJointProjectInfo) {
|
if (runInfoFormData.isJointProjectInfo) {
|
||||||
runInfoFormData.runNames = `${props.pageInfo.projectCode}_${props.workSpaceInfo.nodeCode}_${props.divInfo.nodeName || props.divInfo.runName}_A${version}`;
|
runInfoFormData.runNames = `${props.pageInfo.projectCode}_${props.workSpaceInfo.nodeCode}_${props.divInfo.nodeName || props.divInfo.runName}_A${version}`;
|
||||||
|
|
||||||
@@ -175,6 +175,21 @@ const changeJoinFun = async () => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const getVersionFun = async () => {
|
||||||
|
let version: any = 1;
|
||||||
|
if (props.operateFlag === 'createRun') {
|
||||||
|
version = await getRunVersionData({ type: NODE_TYPE.TASK, uuid: props.divInfo?.uuid });
|
||||||
|
}
|
||||||
|
if (props.operateFlag === 'createChildRun') {
|
||||||
|
version = await getRunVersionData({ type: NODE_TYPE.RUN, uuid: props.divInfo?.uuid });
|
||||||
|
}
|
||||||
|
if (props.operateFlag === 'copyRun') {
|
||||||
|
version = await getRunVersionData({ type: NODE_TYPE.TASK, uuid: props.divInfo?.taskId });
|
||||||
|
}
|
||||||
|
|
||||||
|
return version;
|
||||||
|
};
|
||||||
|
|
||||||
const getRunDetailInfoFun = async (id: any, flag: any) => {
|
const getRunDetailInfoFun = async (id: any, flag: any) => {
|
||||||
const param: any = {};
|
const param: any = {};
|
||||||
if (flag === 'createRun' || flag === 'copyRun') {
|
if (flag === 'createRun' || flag === 'copyRun') {
|
||||||
@@ -256,6 +271,8 @@ watch(
|
|||||||
},
|
},
|
||||||
];
|
];
|
||||||
runInfoFormData.parentRunVision = props.divInfo?.uuid;
|
runInfoFormData.parentRunVision = props.divInfo?.uuid;
|
||||||
|
runInfoFormData.templateName =
|
||||||
|
props.divInfo?.flowTemplateName || props.divInfo?.flowTemplate;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (newVal === 'copyRun') {
|
if (newVal === 'copyRun') {
|
||||||
@@ -268,7 +285,8 @@ watch(
|
|||||||
pageTitle.value = '编辑算例信息';
|
pageTitle.value = '编辑算例信息';
|
||||||
|
|
||||||
runInfoFormData.runNames = props.divInfo.nodeName || props.divInfo.runName;
|
runInfoFormData.runNames = props.divInfo.nodeName || props.divInfo.runName;
|
||||||
runInfoFormData.templateName = props.divInfo.flowTemplateName;
|
runInfoFormData.templateName =
|
||||||
|
props.divInfo?.flowTemplateName || props.divInfo?.flowTemplate;
|
||||||
} else {
|
} else {
|
||||||
// version = await getRunDetailInfoFun(props.divInfo.uuid, operateType.value);
|
// version = await getRunDetailInfoFun(props.divInfo.uuid, operateType.value);
|
||||||
|
|
||||||
@@ -293,14 +311,19 @@ watch(
|
|||||||
|
|
||||||
// 如果是新增子算例或者复制算例
|
// 如果是新增子算例或者复制算例
|
||||||
if (props.divInfo && props.divInfo?.nodeType === NODE_TYPE.RUN) {
|
if (props.divInfo && props.divInfo?.nodeType === NODE_TYPE.RUN) {
|
||||||
|
const str = `${props.pageInfo.projectCode}_${props.workSpaceInfo.nodeCode}_`;
|
||||||
if (runInfoFormData.isJointProjectInfo) {
|
if (runInfoFormData.isJointProjectInfo) {
|
||||||
if (newVal === 'copyRun') {
|
if (newVal === 'copyRun') {
|
||||||
runInfoFormData.runNames = `${props.pageInfo.projectCode}_${props.workSpaceInfo.nodeCode}_${props.divInfo.parentName}_A${version}`;
|
runInfoFormData.runNames = `${props.pageInfo.projectCode}_${props.workSpaceInfo.nodeCode}_${props.divInfo.parentName}_A${version}`;
|
||||||
} else {
|
} else {
|
||||||
runInfoFormData.runNames = `${props.pageInfo.projectCode}_${props.workSpaceInfo.nodeCode}_${props.divInfo.runName}_A${version}`;
|
runInfoFormData.runNames = `${props.pageInfo.projectCode}_${props.workSpaceInfo.nodeCode}_${props.divInfo.runName}_A${version}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
runInfoFormData.runNames = runInfoFormData.runNames.replaceAll(str, '');
|
||||||
|
runInfoFormData.runNames = str + runInfoFormData.runNames;
|
||||||
}
|
}
|
||||||
runInfoFormData.templateName = props.divInfo.flowTemplateName;
|
runInfoFormData.templateName =
|
||||||
|
props.divInfo?.flowTemplateName || props.divInfo?.flowTemplate;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user