feat(缺陷管理): 缺陷管理详情编辑报错优化

This commit is contained in:
xinxin.wu 2024-09-12 14:46:37 +08:00 committed by Craftsman
parent db0c14f723
commit 97741d4b33
3 changed files with 107 additions and 78 deletions

View File

@ -575,13 +575,6 @@
} else { } else {
activeTab.value = 'detail'; activeTab.value = 'detail';
} }
} else {
if (!props.pagination && !props.tableData) return;
const query = { ...route.query };
delete query.id;
router.replace({
query,
});
} }
} }
); );

View File

@ -17,7 +17,13 @@
/> />
</template> </template>
<div class="h-[calc(100vh-168px)] w-full"> <div class="h-[calc(100vh-168px)] w-full">
<BugDetail ref="bugDetailRef" v-model:template-id="bugTemplateId" :bug-id="bugId" @save-params="saveParams" /> <BugDetail
ref="bugDetailRef"
v-model:template-id="bugTemplateId"
:bug-id="bugId"
:is-copy-bug="isCopy"
@save-params="saveParams"
/>
</div> </div>
</MsCard> </MsCard>
</template> </template>

View File

@ -215,7 +215,6 @@
import { EditorPreviewFileUrl } from '@/api/requrls/bug-management'; import { EditorPreviewFileUrl } from '@/api/requrls/bug-management';
import { useI18n } from '@/hooks/useI18n'; import { useI18n } from '@/hooks/useI18n';
import { useAppStore } from '@/store'; import { useAppStore } from '@/store';
import useUserStore from '@/store/modules/user';
import { downloadByteFile } from '@/utils'; import { downloadByteFile } from '@/utils';
import { scrollIntoView } from '@/utils/dom'; import { scrollIntoView } from '@/utils/dom';
import { findParents, Option } from '@/utils/recursion'; import { findParents, Option } from '@/utils/recursion';
@ -239,6 +238,7 @@
const props = defineProps<{ const props = defineProps<{
templateId: string; // id templateId: string; // id
isCopyBug?: boolean; //
bugId?: string; // id bugId?: string; // id
isDrawer?: boolean; // isDrawer?: boolean; //
caseType?: CaseLinkEnum; // caseType?: CaseLinkEnum; //
@ -262,7 +262,6 @@
const { t } = useI18n(); const { t } = useI18n();
const appStore = useAppStore(); const appStore = useAppStore();
const route = useRoute();
const form = ref<BugEditFormObject>({ const form = ref<BugEditFormObject>({
projectId: appStore.currentProjectId, projectId: appStore.currentProjectId,
title: '', title: '',
@ -297,11 +296,9 @@
const associatedDrawer = ref(false); const associatedDrawer = ref(false);
const loading = ref(false); const loading = ref(false);
const acceptType = ref('none'); // - const acceptType = ref('none'); // -
const userStore = useUserStore(); const isEdit = computed(() => props.bugId && !props.isCopyBug);
const isEdit = computed(() => !!route.query.id && route.params.mode === 'edit');
const bugId = ref<string | undefined>(props.bugId); const bugId = ref<string | undefined>(props.bugId);
const isEditOrCopy = computed(() => !!bugId.value); const isEditOrCopy = computed(() => !!bugId.value);
const isCopy = computed(() => route.params.mode === 'copy');
const isPlatformDefaultTemplate = ref(false); const isPlatformDefaultTemplate = ref(false);
const imageUrl = ref(''); const imageUrl = ref('');
const previewVisible = ref<boolean>(false); const previewVisible = ref<boolean>(false);
@ -310,7 +307,7 @@
// -/ID // -/ID
const descriptionFileIdMap = ref<Record<string, string[]>>({}); const descriptionFileIdMap = ref<Record<string, string[]>>({});
const isLoading = ref<boolean>(true); const isLoading = ref<boolean>(false);
const rowLength = ref<number>(0); const rowLength = ref<number>(0);
// //
@ -593,7 +590,7 @@
copyFiles, copyFiles,
richTextTmpFileIds: isPlatformDefaultTemplate.value ? getDescriptionFileId() : descriptionFileIds.value, richTextTmpFileIds: isPlatformDefaultTemplate.value ? getDescriptionFileId() : descriptionFileIds.value,
}; };
if (isCopy.value) { if (props.isCopyBug) {
delete tmpObj.id; delete tmpObj.id;
delete tmpObj.richTextTmpFileIds; delete tmpObj.richTextTmpFileIds;
} }
@ -644,23 +641,29 @@
return []; return [];
}; };
// //
const getDetailInfo = async () => { async function setTemplateValue(bugDetail: BugEditFormObject) {
loading.value = true; const { status, templateId, platformBugId } = bugDetail;
const id = route.query.id as string; try {
if (!id) return; if (props.isCopyBug) {
const res = await getBugDetail(id);
const { customFields, templateId, attachments } = res;
// ID
if (isCopy.value) {
// , // ,
await templateChange(templateId); await templateChange(templateId);
} else { } else {
await templateChange(templateId, { fromStatusId: res.status, platformBugKey: res.platformBugId }); await templateChange(templateId, { fromStatusId: status, platformBugKey: platformBugId });
}
} catch (error) {
// eslint-disable-next-line no-console
console.log(error);
}
}
//
async function handleFile(attachments: AttachFileInfo[]) {
if (!attachments.length) {
return;
} }
if (attachments && attachments.length) {
if (!isCopy.value) {
// Copy, // Copy,
if (!props.isCopyBug) {
attachmentsList.value = attachments; attachmentsList.value = attachments;
} }
// //
@ -672,7 +675,7 @@
...fileInfo, ...fileInfo,
name: fileInfo.fileName, name: fileInfo.fileName,
isUpdateFlag: checkUpdateFileIds.includes(fileInfo.fileId), isUpdateFlag: checkUpdateFileIds.includes(fileInfo.fileId),
isCopyFlag: isCopy.value, isCopyFlag: props.isCopyBug,
}; };
}) })
.map((fileInfo: any) => { .map((fileInfo: any) => {
@ -680,15 +683,19 @@
}); });
} }
function makeCustomValue(bugDetail: BugEditFormObject) {
const { customFields, status } = bugDetail;
let tmpObj: Record<string, any> = {}; let tmpObj: Record<string, any> = {};
if (isEdit.value) { if (isEdit.value) {
tmpObj = { status: res.status }; tmpObj = { status };
} }
if (customFields && Array.isArray(customFields)) { if (customFields && Array.isArray(customFields)) {
const MULTIPLE_TYPE = ['MULTIPLE_SELECT', 'MULTIPLE_INPUT', 'CHECKBOX', 'MULTIPLE_MEMBER']; const MULTIPLE_TYPE = ['MULTIPLE_SELECT', 'MULTIPLE_INPUT', 'CHECKBOX', 'MULTIPLE_MEMBER'];
const SINGRADIO_TYPE = ['RADIO', 'SELECT', 'MEMBER']; const SINGRADIO_TYPE = ['RADIO', 'SELECT', 'MEMBER'];
customFields.forEach((item) => { customFields.forEach((item) => {
if (item.id === 'status' && isCopy.value) { if (item.id === 'status' && props.isCopyBug) {
// , // ,
tmpObj[item.id] = ''; tmpObj[item.id] = '';
// //
@ -730,8 +737,25 @@
} }
}); });
} }
// return tmpObj;
}
//
const getDetailInfo = async () => {
try {
loading.value = true;
const res = await getBugDetail(bugId.value as string);
const { templateId, attachments } = res;
if (templateId) {
await setTemplateValue(res);
}
//
handleFile(attachments);
//
const tmpObj = await makeCustomValue(res);
fApi.value.setValue(tmpObj); fApi.value.setValue(tmpObj);
// //
if (isPlatformDefaultTemplate.value && form.value.platformSystemFields) { if (isPlatformDefaultTemplate.value && form.value.platformSystemFields) {
Object.keys(form.value.platformSystemFields).forEach((key) => { Object.keys(form.value.platformSystemFields).forEach((key) => {
@ -741,23 +765,29 @@
const { platformSystemFields } = form.value; const { platformSystemFields } = form.value;
let copyName = ''; let copyName = '';
if (isCopy.value) { if (props.isCopyBug) {
copyName = `copy_${res.title}`; copyName = `copy_${res.title}`;
if (copyName.length > 255) { if (copyName.length > 255) {
form.value.title = copyName.slice(0, 255); form.value.title = copyName.slice(0, 255);
} }
} }
// //
form.value = { form.value = {
id: res.id, id: res.id,
title: isCopy.value ? copyName : res.title, title: props.isCopyBug ? copyName : res.title,
description: res.description, description: res.description,
templateId: res.templateId, templateId: res.templateId,
tags: res.tags || [], tags: res.tags || [],
projectId: res.projectId, projectId: res.projectId,
platformSystemFields, platformSystemFields,
}; };
} catch (error) {
// eslint-disable-next-line no-console
console.log(error);
} finally {
loading.value = false; loading.value = false;
}
}; };
// formCreate // formCreate