From 8866e865f72cf165eddc89c72b17de3f8ba02d37 Mon Sep 17 00:00:00 2001
From: Hera Zhao <hera@euphon.net>
Date: Fri, 10 Apr 2026 11:37:20 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8B=BC=E9=9F=B3=E5=89=8D=E7=BC=80?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D=E3=80=81=E8=BE=93=E5=85=A5=E6=B3=95enter?=
 =?UTF-8?q?=E3=80=81=E7=A8=80=E9=87=8A=E9=BB=98=E8=AE=A4=E5=80=BC=E3=80=81?=
 =?UTF-8?q?=E5=AE=B9=E9=87=8F=E5=A1=AB=E6=BB=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 拼音搜索改为前缀匹配（s→生姜，不再匹配茶树）
- 精油编辑enter区分输入法组合键
- 新增配方默认30ml+1:6稀释，编辑时自动识别当前比例
- 非单次容量滴数四舍五入为整数
- 容量按钮等宽填满一行
- 搜索时自动展开折叠的配方列表
- 配方编辑器加新增标签功能

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 frontend/src/composables/usePinyinMatch.js |  2 +-
 frontend/src/views/OilReference.vue        |  2 +-
 frontend/src/views/RecipeManager.vue       | 37 ++++++++++++++++++----
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/frontend/src/composables/usePinyinMatch.js b/frontend/src/composables/usePinyinMatch.js
index 47183d9..1b22404 100644
--- a/frontend/src/composables/usePinyinMatch.js
+++ b/frontend/src/composables/usePinyinMatch.js
@@ -69,5 +69,5 @@ export function matchesPinyinInitials(name, query) {
   const initials = getPinyinInitials(name)
   if (!initials) return false
   const q = query.toLowerCase()
-  return initials.includes(q)
+  return initials.startsWith(q)
 }
diff --git a/frontend/src/views/OilReference.vue b/frontend/src/views/OilReference.vue
index 05d1e17..e58b170 100644
--- a/frontend/src/views/OilReference.vue
+++ b/frontend/src/views/OilReference.vue
@@ -260,7 +260,7 @@
     </div>
 
     <!-- Edit Oil Overlay -->
-    <div v-if="editingOilName" class="modal-overlay" @click.self="editingOilName = null" @keydown.enter="saveEditOil">
+    <div v-if="editingOilName" class="modal-overlay" @click.self="editingOilName = null" @keydown.enter="$event.isComposing || saveEditOil()">
       <div class="modal-panel">
         <div class="modal-header">
           <h3>{{ editingOilName }}</h3>
diff --git a/frontend/src/views/RecipeManager.vue b/frontend/src/views/RecipeManager.vue
index b21e544..0e493db 100644
--- a/frontend/src/views/RecipeManager.vue
+++ b/frontend/src/views/RecipeManager.vue
@@ -65,7 +65,7 @@
         <span v-if="!auth.isAdmin" class="contrib-tag">已贡献 {{ sharedCount.adopted }}/{{ sharedCount.total }} 条</span>
         <span class="toggle-icon">{{ showMyRecipes ? '▾' : '▸' }}</span>
       </h3>
-      <template v-if="showMyRecipes">
+      <template v-if="showMyRecipes || manageSearch">
       <div class="recipe-list">
         <div
           v-for="d in myFilteredRecipes"
@@ -106,7 +106,7 @@
         <span>🌿 公共配方库 ({{ publicRecipes.length }})</span>
         <span class="toggle-icon">{{ showPublicRecipes ? '▾' : '▸' }}</span>
       </h3>
-      <div v-if="showPublicRecipes" class="recipe-list">
+      <div v-if="showPublicRecipes || manageSearch" class="recipe-list">
         <div
           v-for="r in publicFilteredRecipes"
           :key="r._id"
@@ -382,10 +382,10 @@ const newIngOil = ref('')
 const newIngSearch = ref('')
 const newIngDrops = ref(1)
 const newIngDropdownOpen = ref(false)
-const formVolume = ref('single')
+const formVolume = ref('30')
 const formCustomVolume = ref(100)
 const formCustomUnit = ref('drops')
-const formDilution = ref(3)
+const formDilution = ref(6)
 
 const formTotalCost = computed(() => {
   const cost = formIngredients.value
@@ -529,12 +529,32 @@ async function executeBatchAction(action) {
   clearSelection()
 }
 
+function calcDilutionFromIngs(ingredients) {
+  const ings = ingredients || []
+  const coco = ings.find(i => i.oil === '椰子油')
+  const eoDrops = ings.filter(i => i.oil && i.oil !== '椰子油').reduce((s, i) => s + (i.drops || 0), 0)
+  const cocoDrops = coco ? (coco.drops || 0) : 0
+  const totalDrops = eoDrops + cocoDrops
+  if (eoDrops > 0 && cocoDrops > 0) {
+    formDilution.value = Math.round(cocoDrops / eoDrops)
+  }
+  // Guess volume
+  const DROPS_PER_ML = 18.6
+  const ml = totalDrops / DROPS_PER_ML
+  if (ml <= 1.5) formVolume.value = 'single'
+  else if (Math.abs(ml - 5) < 1.5) formVolume.value = '5'
+  else if (Math.abs(ml - 10) < 3) formVolume.value = '10'
+  else if (Math.abs(ml - 30) < 8) formVolume.value = '30'
+  else { formVolume.value = 'custom'; formCustomVolume.value = Math.round(totalDrops); formCustomUnit.value = 'drops' }
+}
+
 function editRecipe(recipe) {
   editingRecipe.value = recipe
   formName.value = recipe.name
   formIngredients.value = recipe.ingredients.map(i => ({ ...i, _search: i.oil, _open: false }))
   formNote.value = recipe.note || ''
   formTags.value = [...(recipe.tags || [])]
+  calcDilutionFromIngs(recipe.ingredients)
   showAddOverlay.value = true
 }
 
@@ -555,6 +575,8 @@ function resetForm() {
   newIngOil.value = ''
   newIngSearch.value = ''
   newIngDrops.value = 1
+  formVolume.value = '30'
+  formDilution.value = 6
 }
 
 function handleSmartPaste() {
@@ -665,7 +687,7 @@ function applyVolumeDilution() {
   const currentEoTotal = eoIngs.reduce((s, i) => s + (i.drops || 0), 0)
   if (currentEoTotal <= 0) return
   const scale = targetEoDrops / currentEoTotal
-  eoIngs.forEach(i => { i.drops = Math.max(0.5, Math.round(i.drops * scale * 2) / 2) })
+  eoIngs.forEach(i => { i.drops = Math.max(1, Math.round(i.drops * scale)) })
   const actualEo = eoIngs.reduce((s, i) => s + i.drops, 0)
   setFormCoconut(targetTotalDrops - actualEo)
   ui.showToast('已应用容量设置')
@@ -845,6 +867,7 @@ function editDiaryRecipe(diary) {
   formIngredients.value = (diary.ingredients || []).map(i => ({ ...i, _search: i.oil, _open: false }))
   formNote.value = diary.note || ''
   formTags.value = [...(diary.tags || [])]
+  calcDilutionFromIngs(diary.ingredients)
   showAddOverlay.value = true
 }
 
@@ -1391,8 +1414,8 @@ watch(() => recipeStore.recipes, () => {
 .action-btn-primary { background: linear-gradient(135deg, #7ec6a4, #4a9d7e); color: #fff; border-color: transparent; }
 .action-btn-primary:hover { opacity: 0.9; }
 .action-btn-sm { padding: 5px 12px; font-size: 12px; }
-.volume-controls { display: flex; gap: 6px; flex-wrap: wrap; margin-bottom: 8px; }
-.volume-btn { padding: 6px 14px; border: 1.5px solid #d4cfc7; border-radius: 8px; background: #fff; font-size: 13px; cursor: pointer; font-family: inherit; color: #6b6375; }
+.volume-controls { display: flex; gap: 6px; margin-bottom: 8px; }
+.volume-btn { flex: 1; padding: 6px 0; border: 1.5px solid #d4cfc7; border-radius: 8px; background: #fff; font-size: 13px; cursor: pointer; font-family: inherit; color: #6b6375; text-align: center; }
 .volume-btn.active { background: #e8f5e9; border-color: #7ec6a4; color: #2e7d5a; font-weight: 600; }
 .volume-btn:hover { border-color: #7ec6a4; }
 .custom-volume-row { display: flex; gap: 6px; align-items: center; margin-bottom: 6px; }