From 183cc2ebea8ad8d9990777abd86190c8bc806063 Mon Sep 17 00:00:00 2001 From: zm2000 <18386612143@163.com> Date: Tue, 28 Apr 2026 18:25:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E5=88=A0=E9=99=A4=E5=85=B3?= =?UTF-8?q?=E8=81=94=E4=B8=8E=E5=8F=96=E6=B6=88=E8=AF=AD=E9=9F=B3=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/uploadImgCos/uploadImgCos.vue | 279 ++++++++++++++++-- pages/work/product/edit.vue | 16 +- .../storage/receiving/receivingCreate.vue | 4 +- .../storage/receiving/receivingDetail.vue | 6 +- 4 files changed, 278 insertions(+), 27 deletions(-) diff --git a/components/uploadImgCos/uploadImgCos.vue b/components/uploadImgCos/uploadImgCos.vue index eed822c..952c813 100644 --- a/components/uploadImgCos/uploadImgCos.vue +++ b/components/uploadImgCos/uploadImgCos.vue @@ -43,6 +43,7 @@ export default { data() { return { internalFileList: [], + knownFileIds: [], // 记录正在上传的文件,用于避免重复上传 uploadingFiles: new Set() }; @@ -58,6 +59,12 @@ export default { } }, watch: { + business_id: { + immediate: true, + handler() { + this.knownFileIds = []; + } + }, value: { immediate: true, handler(newVal) { @@ -122,6 +129,23 @@ export default { return file.id || file.fileId || file.file_id || (file.file && (file.file.id || file.file.fileId || file.file.file_id)) || ''; }, + normalizeNumericFileIds(fileIds = []) { + return Array.from(new Set((Array.isArray(fileIds) ? fileIds : [fileIds]) + .map(fileId => Number(fileId)) + .filter(fileId => Number.isFinite(fileId) && fileId > 0))); + }, + collectFileIdsFromList(fileList = []) { + if (!Array.isArray(fileList)) { + return []; + } + return this.normalizeNumericFileIds(fileList.map(item => this.getFileId(item))); + }, + mergeKnownFileIds(fileIds = []) { + this.knownFileIds = this.normalizeNumericFileIds([...(this.knownFileIds || []), ...fileIds]); + }, + replaceKnownFileIds(fileIds = []) { + this.knownFileIds = this.normalizeNumericFileIds(fileIds); + }, extractImageListFromGetImagesResponse(response) { if (!response || typeof response !== 'object') { return []; @@ -189,6 +213,27 @@ export default { return trimmed.split('?')[0].split('#')[0]; }, + getFileUrlSignature(url) { + const normalizedUrl = this.normalizeFileUrl(url); + if (!normalizedUrl) { + return ''; + } + + const withoutProtocol = normalizedUrl.replace(/^https?:\/\//i, ''); + const pathWithHost = withoutProtocol.split('/'); + if (pathWithHost.length <= 1) { + return withoutProtocol.toLowerCase(); + } + + const pathOnly = '/' + pathWithHost.slice(1).join('/'); + const pathParts = pathOnly.split('/').filter(Boolean); + if (!pathParts.length) { + return pathOnly.toLowerCase(); + } + + const tail = pathParts.slice(-2).join('/').toLowerCase(); + return tail || pathOnly.toLowerCase(); + }, getRemoteFileUrl(file) { if (!file || typeof file !== 'object') { return ''; @@ -218,12 +263,15 @@ export default { business_type: this.business_type }); - return this.extractImageListFromGetImagesResponse(response) + const entries = this.extractImageListFromGetImagesResponse(response) .map(item => ({ fileId: this.getRemoteFileId(item), url: this.getRemoteFileUrl(item) })) .filter(item => item.fileId || item.url); + + this.mergeKnownFileIds(entries.map(item => item.fileId)); + return entries; }, async getRemoteFileIds() { if (!this.business_id) { @@ -241,7 +289,9 @@ export default { return []; } }, - async resolveDeletedFileIds(deletedFile) { + async resolveDeletedFileIds(deletedFile, options = {}) { + const deletedIndex = Number(options.deletedIndex); + const hasValidDeletedIndex = Number.isFinite(deletedIndex) && deletedIndex >= 0; const deletedIds = []; const directId = this.getFileId(deletedFile); if (directId) { @@ -255,15 +305,28 @@ export default { const deletedUrl = this.normalizeFileUrl( (deletedFile && (deletedFile.url || deletedFile.path || deletedFile.successUrl)) || '' ); + const deletedUrlSignature = this.getFileUrlSignature(deletedUrl); if (!deletedUrl) { - return []; + if (!hasValidDeletedIndex) { + return []; + } } try { const remoteEntries = await this.getRemoteImageEntries(); - const matched = remoteEntries + let matched = remoteEntries .filter(item => item.fileId && item.url && item.url === deletedUrl) .map(item => item.fileId); + + if (!matched.length && deletedUrlSignature) { + matched = remoteEntries + .filter(item => item.fileId && this.getFileUrlSignature(item.url) === deletedUrlSignature) + .map(item => item.fileId); + } + + if (!matched.length && hasValidDeletedIndex && remoteEntries[deletedIndex] && remoteEntries[deletedIndex].fileId) { + matched = [remoteEntries[deletedIndex].fileId]; + } return Array.from(new Set(matched)); } catch (error) { if (process.env.NODE_ENV !== 'production') { @@ -298,6 +361,11 @@ export default { id: this.getFileId(item) }; }); + + const listFileIds = this.collectFileIdsFromList(this.internalFileList); + if (listFileIds.length > 0) { + this.mergeKnownFileIds(listFileIds); + } }, /** @@ -414,7 +482,9 @@ export default { id: configData.fileId, successUrl: configData.fileUrl // 保存成功后的URL }; - await this.referenceFiles(); + await this.referenceFiles({ + source: 'upload' + }); return ; } // 4. 执行COS上传(这里不会返回响应数据) @@ -436,7 +506,9 @@ export default { }; // 7. 关联文件 - await this.referenceFiles(); + await this.referenceFiles({ + source: 'upload' + }); // 触发成功事件 this.$emit('upload-success', { file: this.fileList[fileIndex], @@ -528,28 +600,118 @@ export default { * 关联文件 */ async referenceFiles(options = {}) { - const { mergeRemote = true, excludedFileIds = [] } = options; + const { mergeRemote = true, excludedFileIds = [], excludedFileUrls = [], source = '', explicitFileIds = null } = options; console.log("this.fileList",this.fileList); try { - // 获取所有成功的文件(包括之前已经关联的) - const localFileIds = this.fileList - .filter(item => item.status === "success" && this.getFileId(item)) - .map(item => this.getFileId(item)); + const explicitIds = Array.isArray(explicitFileIds) + ? explicitFileIds + .map(fileId => Number(fileId)) + .filter(fileId => Number.isFinite(fileId) && fileId > 0) + : null; - const remoteFileIds = mergeRemote ? await this.getRemoteFileIds() : []; + if (explicitIds) { + const validFiles = Array.from(new Set(explicitIds)).map(fileId => ({ file_id: fileId })); + + if (process.env.NODE_ENV !== 'production') { + console.log('[UploadImgCos] ReferenceFile payload debug', { + source, + business_id: this.business_id, + type: this.business_type, + explicit_file_ids: validFiles.map(item => item.file_id) + }); + } + + const requestPayload = { + id: this.business_id, + type: this.business_type, + images: validFiles + }; + + console.log('[UploadImgCos] ReferenceFile request', { + source, + payload: requestPayload + }); + + const response = await this.$http('common.ReferenceFile', requestPayload); + + console.log('[UploadImgCos] ReferenceFile response', { + source, + response + }); + + this.replaceKnownFileIds(validFiles.map(item => item.file_id)); + this.$emit('change', this.fileList); + this.$emit('input', this.fileList); + return response; + } + + // 获取当前本地成功文件(以本地列表为准) + const localEntries = this.fileList + .filter(item => { + const status = String((item && item.status) || '').toLowerCase(); + if (!status) { + return true; + } + return status !== 'uploading' && status !== 'pending' && status !== 'error'; + }) + .map(item => ({ + fileId: this.getFileId(item), + url: this.normalizeFileUrl(item.url || item.path || item.successUrl || '') + })); + + const remoteEntries = mergeRemote ? await this.getRemoteImageEntries() : []; + const remoteFileIds = (remoteEntries || []).map(item => item.fileId).filter(Boolean); + const localFileIds = (localEntries || []).map(item => item.fileId).filter(Boolean); + const knownFileIds = this.normalizeNumericFileIds(this.knownFileIds || []); const excludedSet = new Set( - (Array.isArray(excludedFileIds) ? excludedFileIds : [excludedFileIds]).filter(Boolean) + (Array.isArray(excludedFileIds) ? excludedFileIds : [excludedFileIds]) + .filter(Boolean) + .map(fileId => String(fileId)) ); - const mergedFileIds = Array.from(new Set([...(remoteFileIds || []), ...(localFileIds || [])])) - .filter(fileId => !excludedSet.has(fileId)); + const excludedUrlSet = new Set( + (Array.isArray(excludedFileUrls) ? excludedFileUrls : [excludedFileUrls]) + .map(url => this.normalizeFileUrl(url)) + .filter(Boolean) + ); + + // 优先使用本地已有file_id;若本地项缺失file_id,则按URL从远端补全 + const localUrlSet = new Set( + localEntries + .map(item => this.normalizeFileUrl(item.url || '')) + .filter(Boolean) + ); + + const recoveredFileIds = mergeRemote + ? (remoteEntries || []) + .filter(item => { + const normalizedUrl = this.normalizeFileUrl(item && item.url ? item.url : ''); + return normalizedUrl && localUrlSet.has(normalizedUrl); + }) + .map(item => item.fileId) + .filter(Boolean) + : []; + + const shouldKeepAllRemoteIds = mergeRemote && source !== 'delete'; + const candidateFileIds = shouldKeepAllRemoteIds + ? [...knownFileIds, ...(remoteFileIds || []), ...(localFileIds || [])] + : [...knownFileIds, ...(localFileIds || []), ...(recoveredFileIds || [])]; + + const mergedFileIds = Array.from(new Set(candidateFileIds + .map(fileId => String(fileId)) + .filter(Boolean))) + .filter(fileId => !excludedSet.has(fileId)) + .map(fileId => Number(fileId)) + .filter(fileId => Number.isFinite(fileId) && fileId > 0); const validFiles = mergedFileIds.map(fileId => ({ file_id: fileId })); if (process.env.NODE_ENV !== 'production') { console.log('[UploadImgCos] ReferenceFile payload debug', { + source, business_id: this.business_id, type: this.business_type, merge_remote: mergeRemote, excluded_file_ids: Array.from(excludedSet), + excluded_file_urls: Array.from(excludedUrlSet), remote_file_ids: remoteFileIds, local_file_ids: localFileIds, file_ids: validFiles.map(item => item.file_id), @@ -564,24 +726,50 @@ export default { if (validFiles.length === 0) { // 如果没有成功文件,也要通知后端清空关联 - const response = await this.$http('common.ReferenceFile', { + const requestPayload = { id: this.business_id, type: this.business_type, images: [] + }; + + console.log('[UploadImgCos] ReferenceFile request', { + source, + payload: requestPayload + }); + + const response = await this.$http('common.ReferenceFile', requestPayload); + + console.log('[UploadImgCos] ReferenceFile response', { + source, + response }); + this.replaceKnownFileIds([]); // 更新外部绑定 this.$emit('change', this.fileList); this.$emit('input', this.fileList); return response; } - const response = await this.$http('common.ReferenceFile', { + const requestPayload = { id: this.business_id, type: this.business_type, images: validFiles + }; + + console.log('[UploadImgCos] ReferenceFile request', { + source, + payload: requestPayload + }); + + const response = await this.$http('common.ReferenceFile', requestPayload); + + console.log('[UploadImgCos] ReferenceFile response', { + source, + response }); + this.replaceKnownFileIds(validFiles.map(item => item.file_id)); // 更新外部绑定 this.$emit('change', this.fileList); this.$emit('input', this.fileList); @@ -604,6 +792,9 @@ export default { } const deletedFile = this.fileList[index]; + const deletedFileUrl = this.normalizeFileUrl( + (deletedFile && (deletedFile.url || deletedFile.path || deletedFile.successUrl)) || '' + ); // 从列表中移除 this.fileList.splice(index, 1); @@ -618,16 +809,59 @@ export default { this.$emit('change', this.fileList); this.$emit('input', this.fileList); - // 异步更新文件关联:合并远端+本地,仅排除当前删除项,避免误删其他图片 + // 异步更新文件关联:删除场景显式提交“剩余file_id”,避免误清空 try { - const deletedFileIds = await this.resolveDeletedFileIds(deletedFile); + const remoteEntries = await this.getRemoteImageEntries(); + const deletedFileIds = await this.resolveDeletedFileIds(deletedFile, { + deletedIndex: index + }); + const deletedIdSet = new Set((deletedFileIds || []).map(fileId => String(fileId)).filter(Boolean)); + const deletedDirectId = String(this.getFileId(deletedFile) || '').trim(); + if (deletedDirectId) { + deletedIdSet.add(deletedDirectId); + } + + const remoteAllIds = this.normalizeNumericFileIds((remoteEntries || []).map(item => item && item.fileId)); + const knownAllIds = this.normalizeNumericFileIds(this.knownFileIds || []); + + let finalFileIds = remoteAllIds.length > 0 + ? remoteAllIds.filter(fileId => !deletedIdSet.has(String(fileId))) + : knownAllIds.filter(fileId => !deletedIdSet.has(String(fileId))); + + if (this.fileList.length > 0 && finalFileIds.length === 0) { + console.warn('[UploadImgCos] 删除后未能可靠计算剩余file_id,已阻止空关联提交', { + deleted_file_ids: deletedFileIds, + deleted_file_url: deletedFileUrl, + remote_entries_count: Array.isArray(remoteEntries) ? remoteEntries.length : 0, + remote_all_ids: remoteAllIds, + known_all_ids: knownAllIds, + known_file_ids_count: Array.isArray(this.knownFileIds) ? this.knownFileIds.length : 0 + }); + // 回滚UI,避免前端显示与后端实际不一致 + this.fileList.splice(index, 0, deletedFile); + this.$emit('change', this.fileList); + this.$emit('input', this.fileList); + uni.showToast({ + title: '删除失败,请重试', + icon: 'none' + }); + return; + } + + this.replaceKnownFileIds(finalFileIds); await this.referenceFiles({ - mergeRemote: true, - excludedFileIds: deletedFileIds + explicitFileIds: finalFileIds, + source: 'delete' }); } catch (error) { console.error("删除后重新关联失败:", error); - // 这里可以选择给用户提示,但不阻塞UI + this.fileList.splice(index, 0, deletedFile); + this.$emit('change', this.fileList); + this.$emit('input', this.fileList); + uni.showToast({ + title: '删除失败,请重试', + icon: 'none' + }); } }, @@ -653,6 +887,7 @@ export default { */ clearFiles() { this.fileList = []; + this.replaceKnownFileIds([]); this.$emit('input', []); this.$emit('change', []); } diff --git a/pages/work/product/edit.vue b/pages/work/product/edit.vue index 424bdcd..09bc7a4 100644 --- a/pages/work/product/edit.vue +++ b/pages/work/product/edit.vue @@ -910,10 +910,24 @@ export default { } } - await this.$http('common.ReferenceFile', { + const requestPayload = { id: Number(businessId), type: 'stock', images: targetFileIds.map(fileId => ({ file_id: fileId })) + }; + + console.log('[ProductEdit] ReferenceFile request', { + source: 'cancel-or-back', + trigger: this.canceling ? 'cancel' : 'back', + payload: requestPayload + }); + + const response = await this.$http('common.ReferenceFile', requestPayload); + + console.log('[ProductEdit] ReferenceFile response', { + source: 'cancel-or-back', + trigger: this.canceling ? 'cancel' : 'back', + response }); this.formData.images = snapshot; diff --git a/pages/work/storage/receiving/receivingCreate.vue b/pages/work/storage/receiving/receivingCreate.vue index d2173e5..38021e4 100644 --- a/pages/work/storage/receiving/receivingCreate.vue +++ b/pages/work/storage/receiving/receivingCreate.vue @@ -649,7 +649,9 @@ this.formData.store_id = null; this.showToastMessage('已重置表单'); } else { - this.speakMessage('已取消'); + this.showToastMessage('已取消', 'none', { + speak: false + }); } } }); diff --git a/pages/work/storage/receiving/receivingDetail.vue b/pages/work/storage/receiving/receivingDetail.vue index 8096ab4..b9bc1cd 100644 --- a/pages/work/storage/receiving/receivingDetail.vue +++ b/pages/work/storage/receiving/receivingDetail.vue @@ -394,7 +394,7 @@ const confirm = await this.confirmStoreOwner(); if (!confirm) { this.showToastMessage('已取消', 'none', { - speakText: '已取消' + speak: false }); return; } @@ -717,7 +717,7 @@ // 修正:直接使用confirmResult.confirm if (!confirmResult[1].confirm) { this.showToastMessage('已取消', 'none', { - speakText: '已取消' + speak: false }); return; } @@ -810,7 +810,7 @@ console.log(confirmResult); if (!confirmResult[1].confirm) { this.showToastMessage('已取消', 'none', { - speakText: '已取消' + speak: false }); return; }