refactor(jd): 图片区拆出 JdProductImageManager 子组件——编辑抽屉 856 行超后管 800 报警线(超长棘轮清单只许减)
This commit is contained in:
@@ -7,10 +7,8 @@
|
||||
* +可选块(attrGroups 重建 attr_json 的 tabs 段、skus 按 skuId 改价格库存、deleteImageIds
|
||||
* 删图——先删桶、共用对象保留)。保存即置人工编辑锁 manual_locked=1:后续采集不再覆盖该行,
|
||||
* 底部常驻提示点名这件事。
|
||||
* 图片区(2026-11-16 客户口径「删除做成打叉的 icon 放图右上角,也要支持编辑替换本地的图」,
|
||||
* B109-01 落地):× 右上角标删(保存时一并删除,语义不变);替换/新增走 multipart
|
||||
* POST /{id}/images 立即生效(服务端置锁+刷投影),与标删的「保存时生效」不同。
|
||||
* objectKey 由服务端按上传字节 sha256 内容寻址生成(铁律 32),前端不自造 key。
|
||||
* 图片区拆在 JdProductImageManager 子组件(2026-11-16:× 右上角标删+替换/新增本地图,
|
||||
* B109-01 落地;标删集合经 update:deleteIds 上抛进保存负载,上传立即生效由子组件自理)。
|
||||
* 京东时间/信息分/商品编码只读。
|
||||
* 数据自取 fetchJdProductDetail 回填,保存成功用返回的刷新详情直接回填并 emit('saved')。 */
|
||||
import { computed, ref, watch } from 'vue'
|
||||
@@ -18,9 +16,9 @@ import {
|
||||
fetchJdProductDetail,
|
||||
fetchJdProductGroups,
|
||||
updateJdProduct,
|
||||
uploadJdProductImage,
|
||||
type JdProductGroup,
|
||||
} from './jd-product-api.ts'
|
||||
import JdProductImageManager from './JdProductImageManager.vue'
|
||||
import type {
|
||||
JdProductAttrEntry,
|
||||
JdProductAttrGroup,
|
||||
@@ -66,71 +64,18 @@ const form = ref({
|
||||
const draftAttrGroups = ref<DraftAttrGroup[]>([])
|
||||
const draftSkus = ref<JdProductSku[]>([])
|
||||
const images = ref<JdProductImage[]>([])
|
||||
/** 标删的图片行 id(前端只标记,保存时一次提交 deleteImageIds)。 */
|
||||
const deleteImageIds = ref<Set<number>>(new Set())
|
||||
/** 图片子组件上抛的标删行 id(保存时一次提交 deleteImageIds)。 */
|
||||
const managerDeleteIds = ref<number[]>([])
|
||||
/** attr_json 解析失败(attrJsonRaw 兜底行):属性块禁用,防保存把原文形状弄丢。 */
|
||||
const attrJsonRaw = ref('')
|
||||
const groupOptions = ref<JdProductGroup[]>([])
|
||||
|
||||
const skuDimensions = computed(() => jdSkuDimensions(draftSkus.value))
|
||||
const deletedCount = computed(() => deleteImageIds.value.size)
|
||||
const remainingImageCount = computed(() => images.value.length - deletedCount.value)
|
||||
|
||||
function skuAttrValue(sku: JdProductSku, dimension: string): string {
|
||||
return sku.saleAttrs.find((attr) => attr.name === dimension)?.value || '-'
|
||||
}
|
||||
|
||||
function toggleDeleteImage(image: JdProductImage): void {
|
||||
const next = new Set(deleteImageIds.value)
|
||||
if (next.has(image.id)) next.delete(image.id)
|
||||
else next.add(image.id)
|
||||
deleteImageIds.value = next
|
||||
}
|
||||
|
||||
// ---------------- 图片上传/替换(立即生效,与标删的「保存时生效」不同) ----------------
|
||||
|
||||
/** 文件选择上下文:null=新增主图;有值=替换该登记行(档位继承原行,后端语义)。 */
|
||||
const pendingReplaceImageId = ref<number | null>(null)
|
||||
const fileInputRef = ref<HTMLInputElement | null>(null)
|
||||
/** 上传中的图行 id(0=新增上传中);上传期间防重复点。 */
|
||||
const uploadingImageId = ref<number | null>(null)
|
||||
const uploadError = ref('')
|
||||
|
||||
function pickImage(replaceImageId: number | null): void {
|
||||
if (uploadingImageId.value !== null || !props.item) return
|
||||
uploadError.value = ''
|
||||
pendingReplaceImageId.value = replaceImageId
|
||||
// 同选一张图也要重触发 change:先清值再弹窗。
|
||||
if (fileInputRef.value) {
|
||||
fileInputRef.value.value = ''
|
||||
fileInputRef.value.click()
|
||||
}
|
||||
}
|
||||
|
||||
async function onFileChosen(event: Event): Promise<void> {
|
||||
const input = event.target as HTMLInputElement
|
||||
const file = input.files?.[0]
|
||||
if (!file || !props.item) return
|
||||
uploadingImageId.value = pendingReplaceImageId.value ?? 0
|
||||
try {
|
||||
const detail = await uploadJdProductImage(props.item.id, file, pendingReplaceImageId.value
|
||||
? { replaceImageId: pendingReplaceImageId.value }
|
||||
: { imageType: 'MAIN' })
|
||||
// 立即生效:用返回详情回填图片区(标删集合里已不存在的行 id 顺手清掉)。
|
||||
images.value = detail.images
|
||||
const liveIds = new Set(detail.images.map((image) => image.id))
|
||||
deleteImageIds.value = new Set([...deleteImageIds.value].filter((id) => liveIds.has(id)))
|
||||
showAdminFeedback(pendingReplaceImageId.value ? '图片已替换(该商品已转为人工维护)' : '图片已新增(该商品已转为人工维护)', 'success')
|
||||
emit('saved')
|
||||
} catch (error) {
|
||||
uploadError.value = requestErrorMessage(error) || '图片上传失败,请稍后重试'
|
||||
} finally {
|
||||
uploadingImageId.value = null
|
||||
pendingReplaceImageId.value = null
|
||||
input.value = ''
|
||||
}
|
||||
}
|
||||
|
||||
function removeAttrRow(group: DraftAttrGroup, index: number): void {
|
||||
group.attrs.splice(index, 1)
|
||||
}
|
||||
@@ -168,7 +113,7 @@ async function loadDetail(): Promise<void> {
|
||||
}))
|
||||
draftSkus.value = detail.skus.map((sku) => ({ ...sku }))
|
||||
images.value = detail.images
|
||||
deleteImageIds.value = new Set()
|
||||
managerDeleteIds.value = []
|
||||
attrJsonRaw.value = detail.attrJsonRaw
|
||||
} catch (error) {
|
||||
loadFailure.value = requestErrorMessage(error) || '商品详情加载失败'
|
||||
@@ -219,7 +164,7 @@ async function save(): Promise<void> {
|
||||
stock: sku.stock,
|
||||
}))
|
||||
: null,
|
||||
deleteImageIds: deleteImageIds.value.size ? [...deleteImageIds.value] : null,
|
||||
deleteImageIds: managerDeleteIds.value.length ? [...managerDeleteIds.value] : null,
|
||||
})
|
||||
// 保存成功:用返回的刷新详情直接回填(图片行集已扣掉删掉的行、计数已刷新)。
|
||||
form.value.title = detail.item.title
|
||||
@@ -237,7 +182,7 @@ async function save(): Promise<void> {
|
||||
}))
|
||||
draftSkus.value = detail.skus.map((sku) => ({ ...sku }))
|
||||
images.value = detail.images
|
||||
deleteImageIds.value = new Set()
|
||||
managerDeleteIds.value = []
|
||||
showAdminFeedback('已保存,该商品已转为人工维护(采集不再覆盖)', 'success')
|
||||
emit('saved')
|
||||
} catch (error) {
|
||||
@@ -386,55 +331,14 @@ function dash(value: string | number | null | undefined): string {
|
||||
<p v-else class="drawer-tip">暂无 SKU 矩阵(V198 之前采集的旧行需重新采集)</p>
|
||||
</section>
|
||||
|
||||
<section class="detail-block">
|
||||
<div class="image-head">
|
||||
<h4>图片(右上角 × 标记删除,保存时一并删除;替换 / 新增立即生效)</h4>
|
||||
<button class="btn-add-image" type="button" :disabled="uploadingImageId !== null || loading" @click="pickImage(null)">
|
||||
{{ uploadingImageId === 0 ? '上传中...' : '+ 新增主图' }}
|
||||
</button>
|
||||
</div>
|
||||
<input ref="fileInputRef" type="file" accept="image/jpeg,image/png,image/webp,image/gif" hidden @change="onFileChosen" />
|
||||
<div v-if="images.length" class="image-grid">
|
||||
<div
|
||||
v-for="image in images"
|
||||
:key="`${image.id}-${image.url}`"
|
||||
class="image-cell"
|
||||
:class="{ marked: deleteImageIds.has(image.id) }"
|
||||
>
|
||||
<img
|
||||
:src="image.url"
|
||||
alt=""
|
||||
loading="lazy"
|
||||
:class="{ dimmed: deleteImageIds.has(image.id) || uploadingImageId === image.id }"
|
||||
/>
|
||||
<!-- 右上角 × 删除标记(京麦样式,2026-11-16 客户口径):点 × 标记,再点撤销。 -->
|
||||
<button
|
||||
class="image-x"
|
||||
type="button"
|
||||
:title="deleteImageIds.has(image.id) ? '撤销删除标记' : '标记删除(保存时一并删除)'"
|
||||
@click="toggleDeleteImage(image)"
|
||||
>×</button>
|
||||
<!-- 标删遮罩(整格可点撤销),未标删时 hover 底部出现「替换」条。 -->
|
||||
<button
|
||||
v-if="deleteImageIds.has(image.id)"
|
||||
class="image-marked-mask"
|
||||
type="button"
|
||||
title="点击撤销删除标记"
|
||||
@click="toggleDeleteImage(image)"
|
||||
>已标记删除 · 点击撤销</button>
|
||||
<button
|
||||
v-else
|
||||
class="image-replace"
|
||||
type="button"
|
||||
:disabled="uploadingImageId !== null"
|
||||
@click="pickImage(image.id)"
|
||||
>{{ uploadingImageId === image.id ? '上传中...' : '替换' }}</button>
|
||||
</div>
|
||||
</div>
|
||||
<p v-else class="drawer-tip">暂无图片(可点右上「+ 新增主图」上传本地图)</p>
|
||||
<p v-if="uploadError" class="drawer-failure">{{ uploadError }}</p>
|
||||
<p v-if="deletedCount" class="delete-count">已标记删除 {{ deletedCount }} 张,保存后剩余 {{ remainingImageCount }} 张</p>
|
||||
</section>
|
||||
<JdProductImageManager
|
||||
:product-id="item?.id ?? 0"
|
||||
:images="images"
|
||||
:disabled="loading"
|
||||
@update:images="images = $event"
|
||||
@update:delete-ids="managerDeleteIds = $event"
|
||||
@saved="emit('saved')"
|
||||
/>
|
||||
|
||||
<div v-if="saveError" class="drawer-failure">{{ saveError }}</div>
|
||||
<p class="save-hint">保存后该商品转为人工维护,后续采集不再覆盖它的数据(含本单重爬);删除的图片文件一并从存储桶清理(共用的保留);替换 / 新增图片立即生效并同样置锁。</p>
|
||||
@@ -684,133 +588,6 @@ function dash(value: string | number | null | undefined): string {
|
||||
font-size: 12px;
|
||||
color: #4e6479;
|
||||
}
|
||||
.image-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
}
|
||||
.image-head h4 {
|
||||
margin: 0;
|
||||
}
|
||||
.btn-add-image {
|
||||
min-height: 30px;
|
||||
padding: 4px 12px;
|
||||
border: 1px solid #95b1cb;
|
||||
border-radius: 8px;
|
||||
background: #ffffff;
|
||||
color: #2f5d8b;
|
||||
font-size: 12.5px;
|
||||
cursor: pointer;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.btn-add-image:hover {
|
||||
background: #edf5fb;
|
||||
}
|
||||
.btn-add-image:disabled {
|
||||
opacity: 0.55;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
.image-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fill, minmax(110px, 1fr));
|
||||
gap: 10px;
|
||||
}
|
||||
.image-cell {
|
||||
position: relative;
|
||||
}
|
||||
.image-cell img {
|
||||
display: block;
|
||||
width: 100%;
|
||||
aspect-ratio: 1;
|
||||
object-fit: cover;
|
||||
border: 1px solid #d8e3ee;
|
||||
border-radius: 8px;
|
||||
background: #f2f7fb;
|
||||
}
|
||||
.image-cell img.dimmed {
|
||||
opacity: 0.35;
|
||||
}
|
||||
.image-cell.marked img {
|
||||
outline: 2px solid #d08a7b;
|
||||
}
|
||||
/* 右上角 × 删除标记(京麦样式):hover 格子时出现;已标删常显。 */
|
||||
.image-x {
|
||||
position: absolute;
|
||||
top: 4px;
|
||||
right: 4px;
|
||||
display: none;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
border: none;
|
||||
border-radius: 50%;
|
||||
background: rgba(38, 50, 63, 0.72);
|
||||
color: #ffffff;
|
||||
font-size: 15px;
|
||||
line-height: 1;
|
||||
cursor: pointer;
|
||||
}
|
||||
.image-cell:hover .image-x,
|
||||
.image-cell.marked .image-x {
|
||||
display: flex;
|
||||
}
|
||||
.image-x:hover {
|
||||
background: #a04432;
|
||||
}
|
||||
/* 标删态:整格遮罩可点撤销。 */
|
||||
.image-marked-mask {
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 6px;
|
||||
border: none;
|
||||
border-radius: 8px;
|
||||
background: rgba(160, 68, 50, 0.32);
|
||||
color: #ffffff;
|
||||
font-size: 12px;
|
||||
line-height: 1.5;
|
||||
cursor: pointer;
|
||||
}
|
||||
.image-marked-mask:hover {
|
||||
background: rgba(160, 68, 50, 0.5);
|
||||
}
|
||||
/* hover 底部替换条(京麦替换入口);上传中常显。 */
|
||||
.image-replace {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
display: none;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
min-height: 26px;
|
||||
border: none;
|
||||
border-radius: 0 0 8px 8px;
|
||||
background: rgba(38, 50, 63, 0.72);
|
||||
color: #ffffff;
|
||||
font-size: 12px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.image-cell:hover .image-replace {
|
||||
display: flex;
|
||||
}
|
||||
.image-cell .image-replace:disabled {
|
||||
display: flex;
|
||||
background: rgba(38, 50, 63, 0.55);
|
||||
cursor: wait;
|
||||
}
|
||||
.image-replace:hover {
|
||||
background: #2f5d8b;
|
||||
}
|
||||
.delete-count {
|
||||
margin: 10px 0 0;
|
||||
color: #a04432;
|
||||
font-size: 12.5px;
|
||||
}
|
||||
.save-hint {
|
||||
margin: 0;
|
||||
padding: 10px 14px;
|
||||
|
||||
@@ -0,0 +1,300 @@
|
||||
<script setup lang="ts">
|
||||
/** 京东商品编辑抽屉「图片区」子组件(2026-11-16 从 JdProductEditDrawer 拆出:编辑抽屉
|
||||
* 856 行超后管 800 报警线,图片区自洽成件——× 右上角标删+hover 替换+新增主图,
|
||||
* B109-01 落地,2026-11-16 客户口径「删除做成打叉的 icon 放图右上角,也要支持编辑
|
||||
* 替换本地的图」)。
|
||||
*
|
||||
* 交互语义:× 标删=前端标记、随父级「保存」一并提交(deleteImageIds 上抛);替换/新增
|
||||
* =multipart 立即生效(服务端置锁+刷投影),上传成功用返回详情回填本区并上抛 saved。
|
||||
* objectKey 由服务端按上传字节 sha256 内容寻址生成(铁律 32),前端不自造 key。
|
||||
* 形状照 JdProductEditDrawer 原图片区(image-grid + image-cell,零 element-plus)。 */
|
||||
import { computed, ref, watch } from 'vue'
|
||||
import { uploadJdProductImage } from './jd-product-api.ts'
|
||||
import type { JdProductImage } from './jd-product-model.ts'
|
||||
import { requestErrorMessage } from '../../api/envelope.ts'
|
||||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||||
|
||||
const props = defineProps<{
|
||||
productId: number
|
||||
images: JdProductImage[]
|
||||
/** 父级 loading 中禁上传入口。 */
|
||||
disabled: boolean
|
||||
}>()
|
||||
|
||||
const emit = defineEmits<{
|
||||
(event: 'update:images', images: JdProductImage[]): void
|
||||
(event: 'update:deleteIds', ids: number[]): void
|
||||
(event: 'saved'): void
|
||||
}>()
|
||||
|
||||
/** 标删的图片行 id(前端只标记,父级保存时一次提交 deleteImageIds)。 */
|
||||
const deleteImageIds = ref<Set<number>>(new Set())
|
||||
|
||||
function toggleDeleteImage(image: JdProductImage): void {
|
||||
const next = new Set(deleteImageIds.value)
|
||||
if (next.has(image.id)) next.delete(image.id)
|
||||
else next.add(image.id)
|
||||
deleteImageIds.value = next
|
||||
emit('update:deleteIds', [...next])
|
||||
}
|
||||
|
||||
// ---------------- 图片上传/替换(立即生效,与标删的「保存时生效」不同) ----------------
|
||||
|
||||
/** 文件选择上下文:null=新增主图;有值=替换该登记行(档位继承原行,后端语义)。 */
|
||||
const pendingReplaceImageId = ref<number | null>(null)
|
||||
const fileInputRef = ref<HTMLInputElement | null>(null)
|
||||
/** 上传中的图行 id(0=新增上传中);上传期间防重复点。 */
|
||||
const uploadingImageId = ref<number | null>(null)
|
||||
const uploadError = ref('')
|
||||
|
||||
function pickImage(replaceImageId: number | null): void {
|
||||
if (uploadingImageId.value !== null || props.disabled) return
|
||||
uploadError.value = ''
|
||||
pendingReplaceImageId.value = replaceImageId
|
||||
// 同选一张图也要重触发 change:先清值再弹窗。
|
||||
if (fileInputRef.value) {
|
||||
fileInputRef.value.value = ''
|
||||
fileInputRef.value.click()
|
||||
}
|
||||
}
|
||||
|
||||
async function onFileChosen(event: Event): Promise<void> {
|
||||
const input = event.target as HTMLInputElement
|
||||
const file = input.files?.[0]
|
||||
if (!file || props.disabled) return
|
||||
uploadingImageId.value = pendingReplaceImageId.value ?? 0
|
||||
try {
|
||||
const detail = await uploadJdProductImage(props.productId, file, pendingReplaceImageId.value
|
||||
? { replaceImageId: pendingReplaceImageId.value }
|
||||
: { imageType: 'MAIN' })
|
||||
// 立即生效:用返回详情回填图片区(标删集合里已不存在的行 id 由 images watch 清理)。
|
||||
emit('update:images', detail.images)
|
||||
showAdminFeedback(pendingReplaceImageId.value ? '图片已替换(该商品已转为人工维护)' : '图片已新增(该商品已转为人工维护)', 'success')
|
||||
emit('saved')
|
||||
} catch (error) {
|
||||
uploadError.value = requestErrorMessage(error) || '图片上传失败,请稍后重试'
|
||||
} finally {
|
||||
uploadingImageId.value = null
|
||||
pendingReplaceImageId.value = null
|
||||
input.value = ''
|
||||
}
|
||||
}
|
||||
|
||||
/** 换商品打开时标删集合必须清零(父级 loadDetail 换 item.id)。 */
|
||||
watch(() => props.productId, () => {
|
||||
deleteImageIds.value = new Set()
|
||||
emit('update:deleteIds', [])
|
||||
})
|
||||
|
||||
/** 行集变化时清掉已不存在的标删 id(保存删行回填/上传回填两路共用;不清理的话
|
||||
* 下次保存会把已删的 id 再提交一遍=后端按「图片不存在」整笔拒绝)。 */
|
||||
watch(() => props.images, (images) => {
|
||||
const live = new Set(images.map((image) => image.id))
|
||||
const next = new Set([...deleteImageIds.value].filter((id) => live.has(id)))
|
||||
if (next.size !== deleteImageIds.value.size) {
|
||||
deleteImageIds.value = next
|
||||
emit('update:deleteIds', [...next])
|
||||
}
|
||||
})
|
||||
|
||||
const markedCount = computed(() => deleteImageIds.value.size)
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<section class="detail-block">
|
||||
<div class="image-head">
|
||||
<h4>图片(右上角 × 标记删除,保存时一并删除;替换 / 新增立即生效)</h4>
|
||||
<button class="btn-add-image" type="button" :disabled="uploadingImageId !== null || disabled" @click="pickImage(null)">
|
||||
{{ uploadingImageId === 0 ? '上传中...' : '+ 新增主图' }}
|
||||
</button>
|
||||
</div>
|
||||
<input ref="fileInputRef" type="file" accept="image/jpeg,image/png,image/webp,image/gif" hidden @change="onFileChosen" />
|
||||
<div v-if="images.length" class="image-grid">
|
||||
<div
|
||||
v-for="image in images"
|
||||
:key="`${image.id}-${image.url}`"
|
||||
class="image-cell"
|
||||
:class="{ marked: deleteImageIds.has(image.id) }"
|
||||
>
|
||||
<img
|
||||
:src="image.url"
|
||||
alt=""
|
||||
loading="lazy"
|
||||
:class="{ dimmed: deleteImageIds.has(image.id) || uploadingImageId === image.id }"
|
||||
/>
|
||||
<!-- 右上角 × 删除标记(京麦样式,2026-11-16 客户口径):点 × 标记,再点撤销。 -->
|
||||
<button
|
||||
class="image-x"
|
||||
type="button"
|
||||
:title="deleteImageIds.has(image.id) ? '撤销删除标记' : '标记删除(保存时一并删除)'"
|
||||
@click="toggleDeleteImage(image)"
|
||||
>×</button>
|
||||
<!-- 标删遮罩(整格可点撤销),未标删时 hover 底部出现「替换」条。 -->
|
||||
<button
|
||||
v-if="deleteImageIds.has(image.id)"
|
||||
class="image-marked-mask"
|
||||
type="button"
|
||||
title="点击撤销删除标记"
|
||||
@click="toggleDeleteImage(image)"
|
||||
>已标记删除 · 点击撤销</button>
|
||||
<button
|
||||
v-else
|
||||
class="image-replace"
|
||||
type="button"
|
||||
:disabled="uploadingImageId !== null"
|
||||
@click="pickImage(image.id)"
|
||||
>{{ uploadingImageId === image.id ? '上传中...' : '替换' }}</button>
|
||||
</div>
|
||||
</div>
|
||||
<p v-else class="drawer-tip">暂无图片(可点右上「+ 新增主图」上传本地图)</p>
|
||||
<p v-if="uploadError" class="drawer-failure">{{ uploadError }}</p>
|
||||
<p v-if="markedCount" class="delete-count">已标记删除 {{ markedCount }} 张,保存后剩余 {{ images.length - markedCount }} 张</p>
|
||||
</section>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.image-head {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 12px;
|
||||
}
|
||||
.image-head h4 {
|
||||
margin: 0 0 10px;
|
||||
font-size: 13.5px;
|
||||
font-weight: 650;
|
||||
color: #4e6479;
|
||||
}
|
||||
.btn-add-image {
|
||||
min-height: 30px;
|
||||
padding: 4px 12px;
|
||||
border: 1px solid #95b1cb;
|
||||
border-radius: 8px;
|
||||
background: #ffffff;
|
||||
color: #2f5d8b;
|
||||
font-size: 12.5px;
|
||||
cursor: pointer;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.btn-add-image:hover {
|
||||
background: #edf5fb;
|
||||
}
|
||||
.btn-add-image:disabled {
|
||||
opacity: 0.55;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
.image-grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fill, minmax(110px, 1fr));
|
||||
gap: 10px;
|
||||
}
|
||||
.image-cell {
|
||||
position: relative;
|
||||
}
|
||||
.image-cell img {
|
||||
display: block;
|
||||
width: 100%;
|
||||
aspect-ratio: 1;
|
||||
object-fit: cover;
|
||||
border: 1px solid #d8e3ee;
|
||||
border-radius: 8px;
|
||||
background: #f2f7fb;
|
||||
}
|
||||
.image-cell img.dimmed {
|
||||
opacity: 0.35;
|
||||
}
|
||||
.image-cell.marked img {
|
||||
outline: 2px solid #d08a7b;
|
||||
}
|
||||
/* 右上角 × 删除标记(京麦样式):hover 格子时出现;已标删常显。 */
|
||||
.image-x {
|
||||
position: absolute;
|
||||
top: 4px;
|
||||
right: 4px;
|
||||
display: none;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
border: none;
|
||||
border-radius: 50%;
|
||||
background: rgba(38, 50, 63, 0.72);
|
||||
color: #ffffff;
|
||||
font-size: 15px;
|
||||
line-height: 1;
|
||||
cursor: pointer;
|
||||
}
|
||||
.image-cell:hover .image-x,
|
||||
.image-cell.marked .image-x {
|
||||
display: flex;
|
||||
}
|
||||
.image-x:hover {
|
||||
background: #a04432;
|
||||
}
|
||||
/* 标删态:整格遮罩可点撤销。 */
|
||||
.image-marked-mask {
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 6px;
|
||||
border: none;
|
||||
border-radius: 8px;
|
||||
background: rgba(160, 68, 50, 0.32);
|
||||
color: #ffffff;
|
||||
font-size: 12px;
|
||||
line-height: 1.5;
|
||||
cursor: pointer;
|
||||
}
|
||||
.image-marked-mask:hover {
|
||||
background: rgba(160, 68, 50, 0.5);
|
||||
}
|
||||
/* hover 底部替换条(京麦替换入口);上传中常显。 */
|
||||
.image-replace {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
display: none;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
min-height: 26px;
|
||||
border: none;
|
||||
border-radius: 0 0 8px 8px;
|
||||
background: rgba(38, 50, 63, 0.72);
|
||||
color: #ffffff;
|
||||
font-size: 12px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.image-cell:hover .image-replace {
|
||||
display: flex;
|
||||
}
|
||||
.image-cell .image-replace:disabled {
|
||||
display: flex;
|
||||
background: rgba(38, 50, 63, 0.55);
|
||||
cursor: wait;
|
||||
}
|
||||
.image-replace:hover {
|
||||
background: #2f5d8b;
|
||||
}
|
||||
.delete-count {
|
||||
margin: 10px 0 0;
|
||||
color: #a04432;
|
||||
font-size: 12.5px;
|
||||
}
|
||||
.drawer-tip {
|
||||
margin: 0;
|
||||
color: #8293a5;
|
||||
font-size: 13.5px;
|
||||
}
|
||||
.drawer-failure {
|
||||
margin: 10px 0 0;
|
||||
padding: 10px 14px;
|
||||
border: 1px solid #f0c9c2;
|
||||
border-radius: 10px;
|
||||
background: #fdf1ef;
|
||||
color: #a04432;
|
||||
font-size: 13px;
|
||||
}
|
||||
</style>
|
||||
@@ -1,87 +1,41 @@
|
||||
/**
|
||||
* 京东商品编辑抽屉「图片区」(2026-11-16 客户口径「删除做成打叉的 icon 放图右上角,
|
||||
* 也要支持编辑替换本地的图」+替换+新增,B109-01 落地)的挂载契约。
|
||||
* 京东商品编辑抽屉「图片区」子组件 JdProductImageManager(2026-11-16 客户口径
|
||||
* 「删除做成打叉的 icon 放图右上角,也要支持编辑替换本地的图」+替换+新增,B109-01
|
||||
* 落地;从 JdProductEditDrawer 拆出成件后本测试直接挂子组件)的挂载契约。
|
||||
*
|
||||
* 形态:× 右上角标删(保存时一并删除,遮罩可点撤销);hover 替换条(multipart 立即生效);
|
||||
* 「+ 新增主图」入口(imageType=MAIN)。objectKey 服务端内容寻址生成——前端只传文件。
|
||||
* 形态:× 右上角标删(保存时一并删除,遮罩可点撤销,标删集合经 update:deleteIds 上抛);
|
||||
* hover 替换条(multipart 立即生效,返回详情经 update:images 上抛);「+ 新增主图」入口
|
||||
* (imageType=MAIN)。objectKey 服务端内容寻址生成——前端只传文件。
|
||||
* 跑法:`npx vitest run tests/mount/jd-edit-drawer-images.mount.test.ts`
|
||||
*/
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { flushPromises, mount, type VueWrapper } from '@vue/test-utils'
|
||||
|
||||
import JdProductEditDrawer from '@/pages/jd/JdProductEditDrawer.vue'
|
||||
import JdProductImageManager from '@/pages/jd/JdProductImageManager.vue'
|
||||
|
||||
const jdApi = vi.hoisted(() => ({
|
||||
JD_PRODUCT_ENDPOINT: '/api/admin/jd-products',
|
||||
JD_PRODUCT_GROUP_ENDPOINT: '/api/admin/jd-product-groups',
|
||||
fetchJdProductList: vi.fn(),
|
||||
fetchJdProductDetail: vi.fn(),
|
||||
deleteJdProducts: vi.fn(),
|
||||
fetchJdProductGroups: vi.fn(),
|
||||
fetchJdProductCategories: vi.fn(),
|
||||
createJdProductGroup: vi.fn(),
|
||||
updateJdProductGroup: vi.fn(),
|
||||
deleteJdProductGroup: vi.fn(),
|
||||
updateJdProduct: vi.fn(),
|
||||
uploadJdProductImage: vi.fn(),
|
||||
batchAssignJdProductGroup: vi.fn(),
|
||||
}))
|
||||
|
||||
const feedbackMock = vi.hoisted(() => vi.fn())
|
||||
|
||||
vi.mock('@/pages/jd/jd-product-api.ts', () => jdApi)
|
||||
vi.mock('@/pages/jd/jd-product-api.ts', () => ({
|
||||
uploadJdProductImage: jdApi.uploadJdProductImage,
|
||||
}))
|
||||
vi.mock('@/components/admin-feedback-ui', () => ({ showAdminFeedback: feedbackMock }))
|
||||
|
||||
const ITEM = {
|
||||
id: 9,
|
||||
shopId: 3,
|
||||
shopName: '旗舰自营店',
|
||||
productCode: 'JD-1009',
|
||||
skuId: 'SKU-9',
|
||||
itemNum: 'ITEM-9',
|
||||
skuCount: 12,
|
||||
healthScore: 81,
|
||||
title: '304不锈钢保温杯大容量便携',
|
||||
brand: '锅宝',
|
||||
categoryPath: '家居 > 厨具 > 保温杯',
|
||||
priceMin: '12.9',
|
||||
priceMax: '15.9',
|
||||
stockTotal: 500,
|
||||
saleStatus: '上架中',
|
||||
listTab: 'search',
|
||||
jdCreatedAt: '2026-11-07 18:49:47',
|
||||
jdOnlineAt: '2026-11-12 15:03:37',
|
||||
jdUpdatedAt: '2026-11-13 14:06:07',
|
||||
mainImageUrl: 'https://img.example/main-9.jpg',
|
||||
attrCount: 0,
|
||||
imageCount: 2,
|
||||
groupId: null,
|
||||
groupName: '',
|
||||
syncedAt: '2026-11-12 09:00:00',
|
||||
}
|
||||
|
||||
function image(id: number, imageType: string, url: string) {
|
||||
return { id, imageType, attrName: null, sortNo: id, url, byteSize: 1024, width: null, height: null }
|
||||
}
|
||||
|
||||
function detailPayload(images: ReturnType<typeof image>[]) {
|
||||
return { item: ITEM, attrGroups: [], images, skus: [], attrJsonRaw: '' }
|
||||
}
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
jdApi.fetchJdProductGroups.mockResolvedValue([])
|
||||
})
|
||||
|
||||
async function mountWith(images: ReturnType<typeof image>[]): Promise<VueWrapper<Element>> {
|
||||
jdApi.fetchJdProductDetail.mockResolvedValue(detailPayload(images))
|
||||
// 抽屉的加载 watch 非 immediate(真实页面里由「点编辑」把 visible 翻真触发):
|
||||
// 先挂 false 再 setProps 翻真,与生产触发时序同形。
|
||||
const wrapper = mount(JdProductEditDrawer, {
|
||||
props: { item: null as typeof ITEM | null, visible: false },
|
||||
const wrapper = mount(JdProductImageManager, {
|
||||
props: { productId: 9, images, disabled: false },
|
||||
})
|
||||
await wrapper.setProps({ item: ITEM, visible: true })
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
return wrapper
|
||||
}
|
||||
@@ -97,7 +51,7 @@ async function chooseFile(wrapper: VueWrapper<Element>, name = 'a.png'): Promise
|
||||
return file
|
||||
}
|
||||
|
||||
describe('京东商品编辑抽屉图片区(×右上角+替换+新增,B109-01)', () => {
|
||||
describe('京东商品编辑抽屉图片区子组件(×右上角+替换+新增,B109-01)', () => {
|
||||
it('挂载回填图片区:每格右上角有 × 标记、hover 替换条存在、新增按钮存在(上传/替换暂未开放的旧文案下线)', async () => {
|
||||
const wrapper = await mountWith([image(11, 'MAIN', 'https://img.example/a.jpg'), image(12, 'DETAIL', 'https://img.example/b.jpg')])
|
||||
const cells = wrapper.findAll('.image-cell')
|
||||
@@ -111,13 +65,15 @@ describe('京东商品编辑抽屉图片区(×右上角+替换+新增,B1
|
||||
expect(wrapper.find('h4').text()).not.toContain('暂未开放', '「上传/替换暂未开放」旧文案下线')
|
||||
})
|
||||
|
||||
it('点 × 标记删除(保存时一并删除):遮罩出现、计数文案更新;再点撤销恢复', async () => {
|
||||
it('点 × 标记删除(保存时一并删除):遮罩出现、update:deleteIds 上抛、计数文案更新;再点撤销恢复', async () => {
|
||||
const wrapper = await mountWith([image(11, 'MAIN', 'https://img.example/a.jpg'), image(12, 'MAIN', 'https://img.example/b.jpg')])
|
||||
await wrapper.find('.image-cell .image-x').trigger('click')
|
||||
let cell = wrapper.findAll('.image-cell')[0]
|
||||
expect(cell.classes()).toContain('marked')
|
||||
expect(cell.find('.image-marked-mask').exists()).toBe(true)
|
||||
expect(wrapper.find('.delete-count').text()).toContain('已标记删除 1 张')
|
||||
expect(wrapper.emitted('update:deleteIds')).toBeTruthy()
|
||||
expect(wrapper.emitted('update:deleteIds')![0]).toEqual([[11]])
|
||||
|
||||
await cell.find('.image-marked-mask').trigger('click')
|
||||
cell = wrapper.findAll('.image-cell')[0]
|
||||
@@ -126,19 +82,25 @@ describe('京东商品编辑抽屉图片区(×右上角+替换+新增,B1
|
||||
expect(jdApi.uploadJdProductImage).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it('hover 替换条选本地图:uploadJdProductImage 带 replaceImageId 调用,立即生效回填新 url 并置 saved', async () => {
|
||||
it('hover 替换条选本地图:uploadJdProductImage 带 replaceImageId 调用,update:images 上抛新行集并置 saved', async () => {
|
||||
const wrapper = await mountWith([image(11, 'MAIN', 'https://img.example/a.jpg')])
|
||||
const clickSpy = vi.spyOn(HTMLInputElement.prototype, 'click').mockImplementation(() => {})
|
||||
await wrapper.find('.image-cell .image-replace').trigger('click')
|
||||
expect(clickSpy).toHaveBeenCalled()
|
||||
|
||||
jdApi.uploadJdProductImage.mockResolvedValue(detailPayload([image(11, 'MAIN', 'https://img.example/replaced.jpg')]))
|
||||
jdApi.uploadJdProductImage.mockResolvedValue({
|
||||
item: { id: 9 },
|
||||
attrGroups: [],
|
||||
images: [image(11, 'MAIN', 'https://img.example/replaced.jpg')],
|
||||
skus: [],
|
||||
attrJsonRaw: '',
|
||||
})
|
||||
const file = await chooseFile(wrapper, 'b.png')
|
||||
expect(jdApi.uploadJdProductImage).toHaveBeenCalledTimes(1)
|
||||
expect(jdApi.uploadJdProductImage.mock.calls[0][0]).toBe(9)
|
||||
expect(jdApi.uploadJdProductImage.mock.calls[0][1]).toBe(file)
|
||||
expect(jdApi.uploadJdProductImage.mock.calls[0][2]).toEqual({ replaceImageId: 11 })
|
||||
expect(wrapper.findAll('.image-cell')[0].find('img').attributes('src')).toBe('https://img.example/replaced.jpg')
|
||||
expect(wrapper.emitted('update:images')![0][0]).toEqual([image(11, 'MAIN', 'https://img.example/replaced.jpg')])
|
||||
expect(feedbackMock).toHaveBeenCalledWith(expect.stringContaining('已替换'), 'success')
|
||||
expect(wrapper.emitted('saved')).toBeTruthy()
|
||||
clickSpy.mockRestore()
|
||||
@@ -150,25 +112,41 @@ describe('京东商品编辑抽屉图片区(×右上角+替换+新增,B1
|
||||
await wrapper.find('.btn-add-image').trigger('click')
|
||||
expect(clickSpy).toHaveBeenCalled()
|
||||
|
||||
jdApi.uploadJdProductImage.mockResolvedValue(detailPayload([
|
||||
image(11, 'MAIN', 'https://img.example/a.jpg'),
|
||||
image(13, 'MAIN', 'https://img.example/new.jpg'),
|
||||
]))
|
||||
jdApi.uploadJdProductImage.mockResolvedValue({
|
||||
item: { id: 9 },
|
||||
attrGroups: [],
|
||||
images: [image(11, 'MAIN', 'https://img.example/a.jpg'), image(13, 'MAIN', 'https://img.example/new.jpg')],
|
||||
skus: [],
|
||||
attrJsonRaw: '',
|
||||
})
|
||||
await chooseFile(wrapper, 'c.png')
|
||||
expect(jdApi.uploadJdProductImage.mock.calls[0][2]).toEqual({ imageType: 'MAIN' })
|
||||
expect(wrapper.findAll('.image-cell')).toHaveLength(2)
|
||||
expect(wrapper.emitted('update:images')![0][0]).toHaveLength(2)
|
||||
expect(feedbackMock).toHaveBeenCalledWith(expect.stringContaining('已新增'), 'success')
|
||||
clickSpy.mockRestore()
|
||||
})
|
||||
|
||||
it('上传失败:红条出现(requestErrorMessage 对非信封异常回通用文案)、图片区不回填', async () => {
|
||||
it('上传失败:红条出现(requestErrorMessage 对非信封异常回通用文案)、不 update:images 不置 saved', async () => {
|
||||
const wrapper = await mountWith([image(11, 'MAIN', 'https://img.example/a.jpg')])
|
||||
vi.spyOn(HTMLInputElement.prototype, 'click').mockImplementation(() => {})
|
||||
await wrapper.find('.btn-add-image').trigger('click')
|
||||
jdApi.uploadJdProductImage.mockRejectedValue(new Error('单张图片不能超过 10MB'))
|
||||
await chooseFile(wrapper, 'big.png')
|
||||
expect(wrapper.find('.drawer-failure').exists()).toBe(true, '失败红条出现')
|
||||
expect(wrapper.findAll('.image-cell')).toHaveLength(1, '失败不回填')
|
||||
expect(wrapper.emitted('update:images')).toBeFalsy()
|
||||
expect(wrapper.emitted('saved')).toBeFalsy()
|
||||
vi.restoreAllMocks()
|
||||
})
|
||||
|
||||
it('行集变化清掉已不存在的标删 id:父级保存删行回填后,残留标删不再进 update:deleteIds', async () => {
|
||||
const wrapper = await mountWith([image(11, 'MAIN', 'https://img.example/a.jpg'), image(12, 'MAIN', 'https://img.example/b.jpg')])
|
||||
await wrapper.find('.image-cell .image-x').trigger('click')
|
||||
expect(wrapper.emitted('update:deleteIds')!.at(-1)).toEqual([[11]])
|
||||
|
||||
// 父级保存成功回填:11 行已删、只剩 12 —— 标删集合里 11 被清掉
|
||||
await wrapper.setProps({ images: [image(12, 'MAIN', 'https://img.example/b.jpg')] })
|
||||
await flushPromises()
|
||||
expect(wrapper.emitted('update:deleteIds')!.at(-1)).toEqual([[]])
|
||||
expect(wrapper.find('.delete-count').exists()).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user