From 85f8ebc3c77446c967dc18787e9998a7d0d9cf1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Sun, 15 Nov 2026 00:01:33 +0800 Subject: [PATCH] =?UTF-8?q?fix(app-web):=20=E7=89=88=E6=9C=AC=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E3=80=8C=E5=B7=B2=E6=98=AF=E6=9C=80=E6=96=B0=E3=80=8D?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=87=BA=E6=9B=B4=E6=96=B0=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8B=E8=A1=8C=E5=86=85=E5=8A=A8=E4=BD=9C=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=AD=97=E5=8F=B7=E9=92=89=E6=AD=BB=2012px?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/BrandAppearancePatentTab.vue | 7 +- .../brand/components/BrandCollectDataTab.vue | 6 +- .../components/BrandShopDataCrawlTab.vue | 4 +- .../brand/components/BrandSimilarAsinTab.vue | 10 ++- .../src/shared/components/VersionPicker.vue | 74 +++++++++++++----- .../shared/components/tasks/TaskItemCard.vue | 10 ++- .../src/shared/utils/version-picker.ts | 19 +++++ .../版本更新按钮按最新版隐藏.mount.test.ts | 75 +++++++++++++++++++ frontend-vue/tests/version-picker.test.ts | 28 +++++++ 9 files changed, 207 insertions(+), 26 deletions(-) create mode 100644 frontend-vue/tests/mount/版本更新按钮按最新版隐藏.mount.test.ts diff --git a/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue b/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue index d746ddcab..1175cdbc4 100644 --- a/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue @@ -756,8 +756,11 @@ onUnmounted(() => { .channel-title { color: #5e6878; } .channel-opt { display: inline-flex; align-items: center; gap: 6px; cursor: pointer; } .channel-opt:has(input:disabled) { opacity: .55; cursor: not-allowed; } -.btn-run, .btn-delete, .btn-retry, .btn-interrupt, .download { border: none; cursor: pointer; border-radius: 7px; } -.btn-run { padding: 10px 18px; color: #f5f8fc; background: #3498db; font-weight: 600; } +.btn-run, .btn-delete, .btn-retry, .btn-interrupt, .download { border: none; cursor: pointer; } +/* 行内动作按钮钉死 12px 字号 + 6px 圆角:reset.css 里 button 是 font: inherit, + 不写就继承到 16px,比状态徽章高出一截、字也大一号(2026-11-12 实测徽章 38px / 按钮 54px) */ +.btn-delete, .btn-retry, .btn-interrupt, .download { border-radius: 6px; font-size: 12px; } +.btn-run { padding: 10px 18px; border-radius: 7px; color: #f5f8fc; background: #3498db; font-weight: 600; } .btn-queue { background: #27ae60; } .btn-run:disabled { opacity: .55; cursor: not-allowed; } .prompt-card, .secret-card { margin-bottom: 18px; } diff --git a/frontend-vue/src/pages/brand/components/BrandCollectDataTab.vue b/frontend-vue/src/pages/brand/components/BrandCollectDataTab.vue index 0ae5dc377..aecfe191a 100644 --- a/frontend-vue/src/pages/brand/components/BrandCollectDataTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandCollectDataTab.vue @@ -843,8 +843,10 @@ async function batchDeleteHistory(views: TaskItemView[]) { .queue-debug-line { color: #9ad; font-size: 12px; } .queue-debug-payload { margin-top: 8px; padding: 8px 10px; background: #151a25; border-radius: 6px; color: #a0acbe; font-size: 11px; overflow: auto; max-height: 200px; } -.download { padding: 6px 10px; color: #c8d2e2; background: rgba(52, 152, 219, .18); } -.btn-delete { padding: 6px 10px; color: #ff8f8f; background: rgba(231, 76, 60, .12); } +/* 行内动作按钮钉死 12px 字号 + 6px 圆角:reset.css 里 button 是 font: inherit, + 不写就继承到 16px,比状态徽章高出一截、字也大一号 */ +.download { padding: 6px 10px; border-radius: 6px; font-size: 12px; color: #c8d2e2; background: rgba(52, 152, 219, .18); } +.btn-delete { padding: 6px 10px; border-radius: 6px; font-size: 12px; color: #ff8f8f; background: rgba(231, 76, 60, .12); } @media (max-width: 1100px) { .main-content { flex-direction: column; height: auto; } .left-panel { width: 100%; border-right: none; border-bottom: 1px solid #2e3a52; } diff --git a/frontend-vue/src/pages/brand/components/BrandShopDataCrawlTab.vue b/frontend-vue/src/pages/brand/components/BrandShopDataCrawlTab.vue index d0a447c07..77a1f8991 100644 --- a/frontend-vue/src/pages/brand/components/BrandShopDataCrawlTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandShopDataCrawlTab.vue @@ -701,7 +701,9 @@ async function batchDeleteHistory(views: TaskItemView[]) { .ok { color: #67c23a; } .files { font-size: 12px; color: #5e6878; } .fail, .error-text { color: #f56c6c; } -.download, .btn-delete { padding: 5px 10px; border: 1px solid #444; border-radius: 4px; background: transparent; color: #c8d2e2; cursor: pointer; } +/* 12px 字号钉死(reset.css 里 button 是 font: inherit,不写会继承到 16px), + 保证与同排状态徽章等高 */ +.download, .btn-delete { padding: 5px 10px; border: 1px solid #444; border-radius: 4px; background: transparent; color: #c8d2e2; font-size: 12px; cursor: pointer; } .download { border-color: #409eff; color: #8dc4ff; } .btn-delete { color: #f56c6c; } @media (max-width: 900px) { .main-content { height: auto; flex-direction: column; }.left-panel { width: 100%; border-right: 0; } } diff --git a/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue b/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue index ba8e5be3c..45e21f23b 100644 --- a/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue @@ -990,11 +990,19 @@ onUnmounted(() => { .download { border: none; cursor: pointer; - border-radius: 7px; +} + +/* 行内动作按钮钉死 12px 字号 + 6px 圆角:reset.css 里 button 是 font: inherit, + 不写就继承到 16px,比状态徽章高出一截、字也大一号 */ +.btn-delete, +.download { + border-radius: 6px; + font-size: 12px; } .btn-run { padding: 10px 18px; + border-radius: 7px; color: #f5f8fc; background: #3498db; font-weight: 600; diff --git a/frontend-vue/src/shared/components/VersionPicker.vue b/frontend-vue/src/shared/components/VersionPicker.vue index c9b9b2bec..05808a805 100644 --- a/frontend-vue/src/shared/components/VersionPicker.vue +++ b/frontend-vue/src/shared/components/VersionPicker.vue @@ -15,20 +15,25 @@ v-model="selected" class="version-picker-select" :disabled="loading || !versions.length" - @change="emit('select', selected)" + @change="onSelectChange" > + -
{{ tip }}
+
+ {{ tip || idleTip }} +
@@ -41,11 +46,16 @@ * (列表项与判定文案见 shared/utils/version-picker)。 * 选到低于本机的版本时给出"回退操作"提示,实际确认框由 doUpdateVersion 再提示一次。 * 用户改选时 emit('select', version),页面转发给 useVersionUpdate 以切换更新日志。 + * + * 默认选中口径:仅当列表第一条(最新版)高于本机时才自动选中;本机已是最新或更高时 + * 不默认选中、连"更新到此版本"按钮一起不出(判定见 pickDefaultVersion)—— + * 已经是最新版本的人不该再看见更新按钮,但更新日志与旧版本回退照旧可用。 */ import { computed, ref, watch } from 'vue' import { classifyTargetVersion, describeTargetVersion, + pickDefaultVersion, type ClientVersionItem, } from '@/shared/utils/version-picker' @@ -66,6 +76,8 @@ const emit = defineEmits<{ }>() const selected = ref('') +/** 当前选中是否由用户显式改选(是=不被自动默认覆盖;自动默认不改变更新日志视图) */ +const pickedByUser = ref(false) const selectedItem = computed(() => props.versions.find((item) => item.version === selected.value), @@ -78,24 +90,52 @@ const tip = computed(() => selected.value ? describeTargetVersion(kind.value, props.currentVersion || '', selected.value) : '', ) -// 列表刷新后选中项可能已不存在(版本被删除):清空选择并通知父组件回退日志, -// 避免日志还停留在已下架的版本上; -// 无选中时默认选列表第一条(列表按版本号倒序,第一条即最新版)——这只是给「更新到此版本」 -// 一个默认目标,不触发 select 事件,更新日志保持默认视图(用户主动改选才切换) +/** + * 没有选中目标版本时的说明:本机已是最新(或更高)时讲清楚"为什么没有更新按钮", + * 并提示回退/重装要自己从列表里挑版本。有新版时默认已选中,走 tip 分支,这里不出文案。 + * 不再复述版本号——面板上方那行"已是最新版本 vX"已经讲过了。 + */ +const idleTip = computed(() => { + if (selected.value) return '' + const first = props.versions[0] + if (!first || !props.currentVersion) return '' + const kind = classifyTargetVersion(props.currentVersion, first.version) + if (kind === 'newer') return '' + return kind === 'older' + ? '当前版本高于线上发布版本;如需回退或重装,请从列表选择目标版本' + : '无需更新;如需回退或重装,请从列表选择目标版本' +}) + +/** 列表/本机版本变化时同步选中项:用户显式选过就尊重(除非该版本已下架)。 */ +function syncSelection(list: ClientVersionItem[], current: string) { + if (!list.length) { + selected.value = '' + pickedByUser.value = false + return + } + if (pickedByUser.value) { + if (selected.value && list.some((item) => item.version === selected.value)) return + // 用户选的版本被删除:清空选择并退回自动默认,同时通知父组件回退日志 + pickedByUser.value = false + selected.value = '' + emit('select', '') + } + selected.value = pickDefaultVersion(current, list) +} + +// 版本列表刷新、本机版本异步读到(桌面桥)都会改变"该不该有默认目标": +// 两个来源一起观察,避免列表先到(默认选了最新版)本机版本后到(其实已是最新)时按钮还挂着 watch( - () => props.versions, - (list) => { - if (selected.value && !list.some((item) => item.version === selected.value)) { - selected.value = '' - emit('select', '') - } - if (!selected.value && list.length) { - selected.value = list[0].version - } - }, + [() => props.versions, () => props.currentVersion], + ([list, current]) => syncSelection(list, current || ''), { immediate: true }, ) +function onSelectChange() { + pickedByUser.value = Boolean(selected.value) + emit('select', selected.value) +} + function submit() { const item = selectedItem.value if (!item) return diff --git a/frontend-vue/src/shared/components/tasks/TaskItemCard.vue b/frontend-vue/src/shared/components/tasks/TaskItemCard.vue index db2b0e820..1849d7db8 100644 --- a/frontend-vue/src/shared/components/tasks/TaskItemCard.vue +++ b/frontend-vue/src/shared/components/tasks/TaskItemCard.vue @@ -75,8 +75,10 @@ defineProps<{ flex-shrink: 0; } +/* 状态徽章与同排动作按钮共用一套尺寸(12px 字号 + 6px 10px 内边距), + 否则徽章比按钮矮一截、字也小一号——各 Tab 的按钮样式自己写,徽章只有这里一处。 */ .status { - padding: 4px 10px; + padding: 6px 10px; border-radius: 6px; font-size: 12px; white-space: nowrap; @@ -87,9 +89,11 @@ defineProps<{ color: #2ecc71; } +/* 「失败」永远和「删除」并排出现:底色与文字色取同一个红(rgba .12 + #ff8f8f), + 别再用更浓的 .18 + #ff6b6b,否则同一排里徽章比按钮更刺眼。 */ .status.failed { - background: rgba(231, 76, 60, .18); - color: #ff6b6b; + background: rgba(231, 76, 60, .12); + color: #ff8f8f; } .status.running { diff --git a/frontend-vue/src/shared/utils/version-picker.ts b/frontend-vue/src/shared/utils/version-picker.ts index 3f61623c0..a9cf08e6b 100644 --- a/frontend-vue/src/shared/utils/version-picker.ts +++ b/frontend-vue/src/shared/utils/version-picker.ts @@ -74,6 +74,25 @@ export function classifyTargetVersion(current: string, target: string): TargetVe return 'same' } +/** + * 「指定版本更新」下拉的默认选中项。 + * + * 只有列表第一条(列表按版本号倒序,即最新版)确实高于本机时才默认选中它; + * 本机已是最新(同版)或更高(回滚过/灰度)时返回空串—— + * 否则下拉一打开就停在本机已装的版本上,「更新到此版本」会退化成"一键重装"的假更新按钮: + * 用户已经是最新版却还看见一个更新按钮,与本面板的语义冲突。 + * 本机版本读不到(旧客户端无版本桥 / 浏览器形态)时仍默认选第一条:没有本机版本可比, + * 让用户能一键装最新版。 + * + * @returns 默认选中的版本号;空串=不默认选中(等用户显式挑一个版本,回退/重装都走显式选择) + */ +export function pickDefaultVersion(current: string, versions: ClientVersionItem[]): string { + const first = versions[0] + if (!first) return '' + const kind = classifyTargetVersion(current, first.version) + return kind === 'same' || kind === 'older' ? '' : first.version +} + /** 目标版本提示/确认文案(同版与回退必须说清楚,避免用户以为在升级)。 */ export function describeTargetVersion(kind: TargetVersionKind, current: string, target: string): string { switch (kind) { diff --git a/frontend-vue/tests/mount/版本更新按钮按最新版隐藏.mount.test.ts b/frontend-vue/tests/mount/版本更新按钮按最新版隐藏.mount.test.ts new file mode 100644 index 000000000..824c6a490 --- /dev/null +++ b/frontend-vue/tests/mount/版本更新按钮按最新版隐藏.mount.test.ts @@ -0,0 +1,75 @@ +/** + * 「指定版本更新」面板:本机已是最新时不出更新按钮(挂载用例)。 + * + * 钉三件事,缺一条就是假绿: + * ① 已是最新版 → 不默认选中任何版本、「更新到此版本」按钮不渲染,并说明"无需更新"; + * ② 更新日志/回退入口不受影响——显式挑一个旧版本,回退按钮立刻出现且带回退提示; + * ③ 本机版本读不到(旧客户端无版本桥)或确实有新版时,仍默认选中最新版可一键安装。 + * + * 跑法:cd frontend-vue && npx vitest run tests/mount/版本更新按钮按最新版隐藏.mount.test.ts + */ +import { describe, expect, it } from 'vitest' +import { mount } from '@vue/test-utils' +import { nextTick } from 'vue' + +import VersionPicker from '@/shared/components/VersionPicker.vue' +import type { ClientVersionItem } from '@/shared/utils/version-picker' + +const VERSIONS: ClientVersionItem[] = [ + { id: 3, version: '4.0.14', fileUrl: 'https://oss/4.0.14.zip', createdAt: '2026-09-14 10:00' }, + { id: 2, version: '4.0.13', fileUrl: 'https://oss/4.0.13.zip', createdAt: '2026-09-13 10:00' }, +] + +const UPDATE_BTN = '.version-picker-btn' + +describe('VersionPicker:更新按钮只在真有目标版本时出现', () => { + it('已是最新版本:不默认选中,不渲染更新按钮,并说明无需更新', () => { + const wrapper = mount(VersionPicker, { + props: { versions: VERSIONS, currentVersion: '4.0.14' }, + }) + expect(wrapper.find(UPDATE_BTN).exists()).toBe(false) + expect((wrapper.find('.version-picker-select').element as HTMLSelectElement).value).toBe('') + expect(wrapper.get('.version-picker-tip').text()).toContain('无需更新') + }) + + it('已是最新版本:显式挑旧版本仍可回退(按钮出现且提示是回退)', async () => { + const wrapper = mount(VersionPicker, { + props: { versions: VERSIONS, currentVersion: '4.0.14' }, + }) + await wrapper.get('.version-picker-select').setValue('4.0.13') + + expect(wrapper.emitted('select')?.at(-1)).toEqual(['4.0.13']) + expect(wrapper.find(UPDATE_BTN).exists()).toBe(true) + expect(wrapper.get('.version-picker-tip').text()).toContain('属于回退操作') + expect(wrapper.get('.version-picker-tip').classes()).toContain('is-warn') + }) + + it('有新版:默认选中最新版,更新按钮可用', () => { + const wrapper = mount(VersionPicker, { + props: { versions: VERSIONS, currentVersion: '4.0.12' }, + }) + expect((wrapper.find('.version-picker-select').element as HTMLSelectElement).value).toBe('4.0.14') + expect(wrapper.get(UPDATE_BTN).text()).toContain('更新到此版本') + }) + + it('本机版本读不到(旧客户端无版本桥):仍默认选中最新版可一键安装', () => { + const wrapper = mount(VersionPicker, { + props: { versions: VERSIONS, currentVersion: '' }, + }) + expect((wrapper.find('.version-picker-select').element as HTMLSelectElement).value).toBe('4.0.14') + expect(wrapper.find(UPDATE_BTN).exists()).toBe(true) + }) + + it('本机版本后到(桌面桥异步):列表先到时挂上的更新按钮要撤掉', async () => { + const wrapper = mount(VersionPicker, { + props: { versions: VERSIONS, currentVersion: '' }, + }) + expect(wrapper.find(UPDATE_BTN).exists()).toBe(true) + + await wrapper.setProps({ currentVersion: '4.0.14' }) + await nextTick() + + expect(wrapper.find(UPDATE_BTN).exists()).toBe(false) + expect((wrapper.find('.version-picker-select').element as HTMLSelectElement).value).toBe('') + }) +}) diff --git a/frontend-vue/tests/version-picker.test.ts b/frontend-vue/tests/version-picker.test.ts index 52af805cb..a6297b724 100644 --- a/frontend-vue/tests/version-picker.test.ts +++ b/frontend-vue/tests/version-picker.test.ts @@ -5,6 +5,7 @@ import { classifyTargetVersion, describeTargetVersion, parseVersionList, + pickDefaultVersion, } from '../src/shared/utils/version-picker.ts' /** /api/version/list 响应样例:接口按 created_at DESC 返回(旧版本重传会排最前) */ @@ -84,3 +85,30 @@ test('同版与更新文案各自说明动作,本机版本未知时如实说 assert.ok(newer.includes('4.0.12') && newer.includes('4.0.14')) assert.ok(describeTargetVersion('unknown', '', '4.0.14').includes('未读到本机版本')) }) + +const versionList = parseVersionList(listResponse([ + { id: 3, version: '4.0.14', file_url: 'https://oss/4.0.14.zip', created_at: '2026-09-14 10:00' }, + { id: 2, version: '4.0.13', file_url: 'https://oss/4.0.13.zip', created_at: '2026-09-13 10:00' }, +])) + +test('默认选中:只有确实存在更新版本时才默认选中最新版', () => { + assert.equal(pickDefaultVersion('4.0.12', versionList), '4.0.14') +}) + +test('默认选中:本机已是最新版时不默认选中(不出现"更新到此版本"按钮)', () => { + assert.equal(pickDefaultVersion('4.0.14', versionList), '') + // 多段补零后仍是同版 + assert.equal(pickDefaultVersion('4.0.14.0', versionList), '') +}) + +test('默认选中:本机版本高于线上(回滚过/灰度)时也不默认选中,避免把用户往低版本引导', () => { + assert.equal(pickDefaultVersion('4.0.15', versionList), '') +}) + +test('默认选中:本机版本读不到(旧客户端无版本桥)时仍默认选最新版,可一键安装', () => { + assert.equal(pickDefaultVersion('', versionList), '4.0.14') +}) + +test('默认选中:版本列表为空时不出默认目标', () => { + assert.equal(pickDefaultVersion('4.0.12', []), '') +})