From eff4332aaebac4f38238e85f232acc047c4f5d3d Mon Sep 17 00:00:00 2001 From: Hera Zhao Date: Fri, 10 Apr 2026 21:34:16 +0000 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=9D=E5=AD=98=E9=85=8D=E6=96=B9?= =?UTF-8?q?=E5=90=8E0=E5=85=83bug=20+=20=E6=A0=87=E7=AD=BE=E5=AD=97?= =?UTF-8?q?=E6=AF=8D=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 保存公共配方后reload从服务器重新获取（修复oil_name覆盖oil导致显示0元） - 配方卡片标签按字母排序 Co-Authored-By: Claude Opus 4.6 (1M context) --- frontend/src/components/RecipeCard.vue | 4 ++-- frontend/src/stores/recipes.js | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/frontend/src/components/RecipeCard.vue b/frontend/src/components/RecipeCard.vue index 3e8b1de..5471295 100644 --- a/frontend/src/components/RecipeCard.vue +++ b/frontend/src/components/RecipeCard.vue @@ -36,8 +36,8 @@ const auth = useAuthStore() const visibleTags = computed(() => { if (!props.recipe.tags) return [] - if (auth.canEdit) return props.recipe.tags - return props.recipe.tags.filter(t => !EDITOR_ONLY_TAGS.includes(t)) + const tags = auth.canEdit ? [...props.recipe.tags] : props.recipe.tags.filter(t => !EDITOR_ONLY_TAGS.includes(t)) + return tags.sort((a, b) => a.localeCompare(b, 'zh')) }) const oilNames = computed(() => diff --git a/frontend/src/stores/recipes.js b/frontend/src/stores/recipes.js index 8e6f736..76729fe 100644 --- a/frontend/src/stores/recipes.js +++ b/frontend/src/stores/recipes.js @@ -48,10 +48,8 @@ export const useRecipesStore = defineStore('recipes', () => { async function saveRecipe(recipe) { if (recipe._id) { const data = await api.put(`/api/recipes/${recipe._id}`, recipe) - const idx = recipes.value.findIndex((r) => r._id === recipe._id) - if (idx !== -1) { - recipes.value[idx] = { ...recipes.value[idx], ...recipe, _version: data._version ?? data.version ?? recipe._version } - } + // Reload from server to get properly formatted data (oil_name → oil mapping) + await loadRecipes() return data } else { const data = await api.post('/api/recipes', recipe) -- 2.49.1 From 476d8bbd6e24d6201f5758682a1d248e6a033f8a Mon Sep 17 00:00:00 2001 From: Hera Zhao Date: Fri, 10 Apr 2026 21:58:59 +0000 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E6=97=A0=E6=A4=B0=E5=AD=90=E6=B2=B9?= =?UTF-8?q?=E9=85=8D=E6=96=B9=E7=BC=96=E8=BE=91=E6=97=B6=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=AE=B9=E9=87=8F/=E6=A4=B0=E5=AD=90=E6=B2=B9/?= =?UTF-8?q?=E6=91=98=E8=A6=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 无椰子油：容量不选中，摘要不显示，椰子油行不出现 - 有椰子油：自动匹配容量和稀释比例 - 新增配方默认无椰子油 Co-Authored-By: Claude Opus 4.6 (1M context) --- frontend/src/views/RecipeManager.vue | 54 ++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 7 deletions(-) diff --git a/frontend/src/views/RecipeManager.vue b/frontend/src/views/RecipeManager.vue index 531c098..bc784bc 100644 --- a/frontend/src/views/RecipeManager.vue +++ b/frontend/src/views/RecipeManager.vue @@ -317,8 +317,8 @@ - -
+ +
{{ recipeSummaryText }}
@@ -749,10 +749,31 @@ function editRecipe(recipe) { const ings = recipe.ingredients || [] formIngredients.value = ings.filter(i => i.oil !== '椰子油').map(i => ({ ...i, _search: i.oil, _open: false })) const coco = ings.find(i => i.oil === '椰子油') - formCocoRow.value = coco ? { ...coco, _search: '椰子油', _open: false } : { oil: '椰子油', drops: 10, _search: '椰子油', _open: false } + if (coco) { + formCocoRow.value = { ...coco, _search: '椰子油', _open: false } + // Guess volume from total drops + const eoDrops = ings.filter(i => i.oil && i.oil !== '椰子油').reduce((s, i) => s + (i.drops || 0), 0) + const totalDrops = eoDrops + coco.drops + const ml = totalDrops / DROPS_PER_ML + if (ml <= 2) formVolume.value = 'single' + else if (Math.abs(ml - 5) < 1.5) formVolume.value = '5' + else if (Math.abs(ml - 10) < 2.5) formVolume.value = '10' + else if (Math.abs(ml - 15) < 2.5) formVolume.value = '15' + else if (Math.abs(ml - 20) < 3) formVolume.value = '20' + else if (Math.abs(ml - 30) < 6) formVolume.value = '30' + else { formVolume.value = 'custom'; formCustomVolume.value = Math.round(ml) } + // Guess dilution + if (eoDrops > 0 && coco.drops > 0) { + const ratio = Math.round(coco.drops / eoDrops) + const options = [3,4,5,6,7,8,9,10,12,15,20] + formDilution.value = options.reduce((a, b) => Math.abs(b - ratio) < Math.abs(a - ratio) ? b : a) + } + } else { + formCocoRow.value = null + formVolume.value = '' + } formNote.value = recipe.note || '' formTags.value = [...(recipe.tags || [])] - calcDilutionFromIngs(recipe.ingredients) showAddOverlay.value = true } @@ -765,7 +786,7 @@ function closeOverlay() { function resetForm() { formName.value = '' formIngredients.value = [{ oil: '', drops: 1, _search: '', _open: false }] - formCocoRow.value = { oil: '椰子油', drops: 10, _search: '椰子油', _open: false } + formCocoRow.value = null formNote.value = '' formTags.value = [] smartPasteText.value = '' @@ -1218,10 +1239,29 @@ function editDiaryRecipe(diary) { const ings = diary.ingredients || [] formIngredients.value = ings.filter(i => i.oil !== '椰子油').map(i => ({ ...i, _search: i.oil, _open: false })) const coco = ings.find(i => i.oil === '椰子油') - formCocoRow.value = coco ? { ...coco, _search: '椰子油', _open: false } : { oil: '椰子油', drops: 10, _search: '椰子油', _open: false } + if (coco) { + formCocoRow.value = { ...coco, _search: '椰子油', _open: false } + const eoDrops = ings.filter(i => i.oil && i.oil !== '椰子油').reduce((s, i) => s + (i.drops || 0), 0) + const totalDrops = eoDrops + coco.drops + const ml = totalDrops / DROPS_PER_ML + if (ml <= 2) formVolume.value = 'single' + else if (Math.abs(ml - 5) < 1.5) formVolume.value = '5' + else if (Math.abs(ml - 10) < 2.5) formVolume.value = '10' + else if (Math.abs(ml - 15) < 2.5) formVolume.value = '15' + else if (Math.abs(ml - 20) < 3) formVolume.value = '20' + else if (Math.abs(ml - 30) < 6) formVolume.value = '30' + else { formVolume.value = 'custom'; formCustomVolume.value = Math.round(ml) } + if (eoDrops > 0 && coco.drops > 0) { + const ratio = Math.round(coco.drops / eoDrops) + const options = [3,4,5,6,7,8,9,10,12,15,20] + formDilution.value = options.reduce((a, b) => Math.abs(b - ratio) < Math.abs(a - ratio) ? b : a) + } + } else { + formCocoRow.value = null + formVolume.value = '' + } formNote.value = diary.note || '' formTags.value = [...(diary.tags || [])] - calcDilutionFromIngs(diary.ingredients) showAddOverlay.value = true } -- 2.49.1 From 9635cfe8ef8c8232a401ec2d951398af2745a85a Mon Sep 17 00:00:00 2001 From: Hera Zhao Date: Fri, 10 Apr 2026 22:03:29 +0000 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E9=80=89=E6=8B=A9=E5=AE=B9=E9=87=8F?= =?UTF-8?q?=E6=97=B6=E8=87=AA=E5=8A=A8=E6=98=BE=E7=A4=BA=E6=A4=B0=E5=AD=90?= =?UTF-8?q?=E6=B2=B9=E8=A1=8C=20+=20=E6=94=B6=E5=9B=9E=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=B8=85=E9=99=A4=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 选容量后椰子油行自动出现（单次默认10滴，其他默认填满） - 收回标签栏时清除所有标签筛选 Co-Authored-By: Claude Opus 4.6 (1M context) --- frontend/src/views/RecipeManager.vue | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/RecipeManager.vue b/frontend/src/views/RecipeManager.vue index bc784bc..d28c917 100644 --- a/frontend/src/views/RecipeManager.vue +++ b/frontend/src/views/RecipeManager.vue @@ -42,7 +42,7 @@ - + @@ -443,7 +443,13 @@ const formCustomVolume = ref(null) const formCustomUnit = ref('drops') const formDilution = ref(6) -const formCocoRow = ref({ oil: '椰子油', drops: 10, _search: '椰子油', _open: false }) +const formCocoRow = ref(null) + +watch(() => formVolume.value, (vol) => { + if (vol && !formCocoRow.value) { + formCocoRow.value = { oil: '椰子油', drops: vol === 'single' ? 10 : 0, _search: '椰子油', _open: false } + } +}) // EO ingredients (everything except coconut) const formEoIngredients = computed(() => @@ -562,6 +568,15 @@ async function deleteGlobalTag(tag) { } } +function toggleTagFilter() { + if (showTagFilter.value) { + showTagFilter.value = false + selectedTags.value = [] + } else { + showTagFilter.value = true + } +} + function toggleTag(tag) { const idx = selectedTags.value.indexOf(tag) if (idx >= 0) selectedTags.value.splice(idx, 1) -- 2.49.1 From 76c9316ede0ab1061fc3bd3cf4f4341f6014e1f5 Mon Sep 17 00:00:00 2001 From: Hera Zhao Date: Fri, 10 Apr 2026 22:11:05 +0000 Subject: [PATCH 4/4] =?UTF-8?q?test:=20=E6=96=B0=E5=A2=9EPR#22=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增12个测试: - 标签排序和EDITOR_ONLY_TAGS过滤 - Recipe数据格式（oil_name覆盖oil的bug验证） - loadRecipes映射验证 - 容量检测（single/5/10/15/20/30/custom） - 稀释比例计算和snap到最近选项 全部通过: 191 unit + 36 e2e Co-Authored-By: Claude Opus 4.6 (1M context) --- frontend/src/__tests__/polishFeatures.test.js | 126 ++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 frontend/src/__tests__/polishFeatures.test.js diff --git a/frontend/src/__tests__/polishFeatures.test.js b/frontend/src/__tests__/polishFeatures.test.js new file mode 100644 index 0000000..05e4a04 --- /dev/null +++ b/frontend/src/__tests__/polishFeatures.test.js @@ -0,0 +1,126 @@ +import { describe, it, expect } from 'vitest' +import { EDITOR_ONLY_TAGS } from '../stores/recipes' + +// --------------------------------------------------------------------------- +// Tag sorting +// --------------------------------------------------------------------------- +describe('Tag sorting', () => { + it('sorts tags alphabetically with localeCompare zh', () => { + const tags = ['香水', '呼吸', '消化', '美容'] + const sorted = [...tags].sort((a, b) => a.localeCompare(b, 'zh')) + expect(sorted[0]).toBe('呼吸') + // All sorted + for (let i = 1; i < sorted.length; i++) { + expect(sorted[i - 1].localeCompare(sorted[i], 'zh')).toBeLessThanOrEqual(0) + } + }) + + it('EDITOR_ONLY_TAGS filters correctly', () => { + const allTags = ['呼吸', '已审核', '消化', '香水'] + const visible = allTags.filter(t => !EDITOR_ONLY_TAGS.includes(t)) + expect(visible).not.toContain('已审核') + expect(visible).toContain('呼吸') + expect(visible).toHaveLength(3) + }) +}) + +// --------------------------------------------------------------------------- +// Recipe save data format +// --------------------------------------------------------------------------- +describe('Recipe data format', () => { + it('oil_name format overwrites oil format when spread', () => { + // This test documents the bug that was fixed + const localRecipe = { + ingredients: [{ oil: '薰衣草', drops: 3 }], + } + const payload = { + ingredients: [{ oil_name: '薰衣草', drops: 3 }], + } + const merged = { ...localRecipe, ...payload } + // After merge, ingredients have oil_name not oil — this was the bug + expect(merged.ingredients[0]).toHaveProperty('oil_name') + expect(merged.ingredients[0]).not.toHaveProperty('oil') + }) + + it('loadRecipes mapping converts oil_name to oil', () => { + // Simulate what loadRecipes does + const apiData = [ + { id: 1, name: 'test', ingredients: [{ oil_name: '薰衣草', drops: 3 }], tags: [] } + ] + const mapped = apiData.map(r => ({ + ...r, + ingredients: r.ingredients.map(ing => ({ + oil: ing.oil_name ?? ing.oil, + drops: ing.drops, + })) + })) + expect(mapped[0].ingredients[0].oil).toBe('薰衣草') + expect(mapped[0].ingredients[0]).not.toHaveProperty('oil_name') + }) +}) + +// --------------------------------------------------------------------------- +// Volume detection from ingredients +// --------------------------------------------------------------------------- +describe('Volume detection', () => { + const DROPS_PER_ML = 18.6 + + function guessVolume(eoDrops, cocoDrops) { + const totalDrops = eoDrops + cocoDrops + const ml = totalDrops / DROPS_PER_ML + if (ml <= 2) return 'single' + if (Math.abs(ml - 5) < 1.5) return '5' + if (Math.abs(ml - 10) < 2.5) return '10' + if (Math.abs(ml - 15) < 2.5) return '15' + if (Math.abs(ml - 20) < 3) return '20' + if (Math.abs(ml - 30) < 6) return '30' + return 'custom' + } + + it('detects single use (small amounts)', () => { + expect(guessVolume(5, 10)).toBe('single') + }) + + it('detects 5ml', () => { + expect(guessVolume(15, Math.round(5 * DROPS_PER_ML) - 15)).toBe('5') + }) + + it('detects 10ml', () => { + expect(guessVolume(20, Math.round(10 * DROPS_PER_ML) - 20)).toBe('10') + }) + + it('detects 30ml', () => { + expect(guessVolume(50, Math.round(30 * DROPS_PER_ML) - 50)).toBe('30') + }) + + it('no coconut returns no volume', () => { + // When cocoDrops is 0, function still returns based on total + // But in real code, no coconut → formVolume = '' + expect(guessVolume(10, 0)).toBe('single') + }) + + it('detects custom for large volumes', () => { + expect(guessVolume(100, 1000)).toBe('custom') + }) +}) + +// --------------------------------------------------------------------------- +// Dilution ratio calculation +// --------------------------------------------------------------------------- +describe('Dilution ratio', () => { + it('calculates ratio correctly', () => { + expect(Math.round(60 / 10)).toBe(6) // 1:6 + expect(Math.round(30 / 10)).toBe(3) // 1:3 + expect(Math.round(100 / 10)).toBe(10) // 1:10 + }) + + it('snaps to nearest option', () => { + const options = [3, 4, 5, 6, 7, 8, 9, 10, 12, 15, 20] + const snap = (ratio) => options.reduce((a, b) => Math.abs(b - ratio) < Math.abs(a - ratio) ? b : a) + expect(snap(6)).toBe(6) + expect([10, 12]).toContain(snap(11)) // equidistant + expect(snap(13)).toBe(12) + expect([12, 15]).toContain(snap(14)) + expect(snap(18)).toBe(20) + }) +}) -- 2.49.1