test: 更新单元测试覆盖智能识别新功能和share_recipe日志

- parseOilChunk: 无数字默认1滴、混合格式、_ml标记
- findOil: 2字不模糊匹配、同音词和子串仍可用
- parseMultiRecipes: 多配方分割、空行/分号、名称识别、去重
- e2e: audit-log create_recipe → share_recipe

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

.gitea/workflows/test.yml

@@ -12,6 +12,7 @@ jobs:
   e2e-test:
     runs-on: test
     needs: unit-test
+    timeout-minutes: 5
     steps:
       - uses: actions/checkout@v4
 
@@ -23,26 +24,43 @@ jobs:
 
       - name: E2E tests
         run: |
+          # Dynamic ports to avoid conflicts
+          BE_PORT=$(shuf -i 9000-9999 -n 1)
+          FE_PORT=$(shuf -i 4000-4999 -n 1)
+          DB_FILE="/tmp/ci_oil_test_${BE_PORT}.db"
+          echo "Using backend=$BE_PORT frontend=$FE_PORT db=$DB_FILE"
+
           # Start backend
-          DB_PATH=/tmp/ci_oil_test.db FRONTEND_DIR=/dev/null \
+          DB_PATH="$DB_FILE" FRONTEND_DIR=/dev/null \
-            /tmp/ci-venv/bin/uvicorn backend.main:app --port 8000 &
+            /tmp/ci-venv/bin/uvicorn backend.main:app --port $BE_PORT &
+          BE_PID=$!
 
-          # Start frontend (in subshell to not change cwd)
+          # Start frontend with proxy to dynamic backend port
-          (cd frontend && npx vite --port 5173) &
+          (cd frontend && VITE_API_PORT=$BE_PORT npx vite --port $FE_PORT) &
+          FE_PID=$!
 
-          # Wait for both servers
+          # Wait for both servers (max 30s, fail fast)
+          READY=0
           for i in $(seq 1 30); do
-            if curl -sf http://localhost:8000/api/version > /dev/null 2>&1 && \
+            if curl -sf http://localhost:$BE_PORT/api/oils > /dev/null 2>&1 && \
-               curl -sf http://localhost:5173/ > /dev/null 2>&1; then
+               curl -sf http://localhost:$FE_PORT/ > /dev/null 2>&1; then
-              echo "Both servers ready"
+              echo "Both servers ready in ${i}s"
+              READY=1
               break
             fi
             sleep 1
           done
 
-          # Run core cypress specs (proven stable)
+          if [ "$READY" = "0" ]; then
+            echo "ERROR: Servers failed to start within 30s"
+            kill $BE_PID $FE_PID 2>/dev/null
+            rm -f "$DB_FILE"
+            exit 1
+          fi
+
+          # Run core cypress specs with hard 3-minute timeout
           cd frontend
-          npx cypress run --spec "\
+          timeout 180 npx cypress run --spec "\
           cypress/e2e/recipe-detail.cy.js,\
           cypress/e2e/oil-reference.cy.js,\
           cypress/e2e/oil-data-integrity.cy.js,\
@@ -50,13 +68,17 @@ jobs:
           cypress/e2e/category-modules.cy.js,\
           cypress/e2e/notification-flow.cy.js,\
           cypress/e2e/registration-flow.cy.js\
-          " --config video=false
+          " --config "video=false,defaultCommandTimeout=5000,pageLoadTimeout=10000,requestTimeout=5000,responseTimeout=10000,baseUrl=http://localhost:$FE_PORT"
           EXIT_CODE=$?
 
           # Cleanup
-          pkill -f "uvicorn backend" || true
+          kill $BE_PID $FE_PID 2>/dev/null
-          pkill -f "node.*vite" || true
+          pkill -f "Cypress" 2>/dev/null || true
-          rm -f /tmp/ci_oil_test.db
+          rm -f "$DB_FILE"
+          if [ $EXIT_CODE -eq 124 ]; then
+            echo "ERROR: Cypress timed out after 3 minutes"
+            exit 1
+          fi
           exit $EXIT_CODE
 
   build-check:

backend/main.py

@@ -355,6 +355,8 @@ def register(body: dict):
             "INSERT INTO users (username, token, role, display_name, password) VALUES (?, ?, ?, ?, ?)",
             (username, token, "viewer", display_name or username, hash_password(password))
         )
+        uid = conn.execute("SELECT id FROM users WHERE username = ?", (username,)).fetchone()
+        log_audit(conn, uid["id"] if uid else None, "register", "user", username, display_name or username, None)
         conn.commit()
     except Exception:
         conn.close()
@@ -798,7 +800,9 @@ def create_recipe(recipe: RecipeIn, user=Depends(get_current_user)):
     for tag in recipe.tags:
         c.execute("INSERT OR IGNORE INTO tags (name) VALUES (?)", (tag,))
         c.execute("INSERT OR IGNORE INTO recipe_tags (recipe_id, tag_name) VALUES (?, ?)", (rid, tag))
-    log_audit(conn, user["id"], "create_recipe", "recipe", rid, recipe.name)
+    # Only log for admin/senior_editor direct adds (share); others wait for adopt
+    if user["role"] in ("admin", "senior_editor"):
+        log_audit(conn, user["id"], "share_recipe", "recipe", rid, recipe.name)
     who = user.get("display_name") or user["username"]
     if user["role"] == "senior_editor":
         # Senior editor adds directly — just inform admin
@@ -866,7 +870,17 @@ def update_recipe(recipe_id: int, update: RecipeUpdate, user=Depends(get_current
                 (recipe_id, tag),
             )
     c.execute("UPDATE recipes SET updated_by = ?, version = COALESCE(version, 1) + 1 WHERE id = ?", (user["id"], recipe_id))
-    log_audit(conn, user["id"], "update_recipe", "recipe", recipe_id, update.name)
+    # Get recipe name for log
+    rname = c.execute("SELECT name FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
+    changed = []
+    if update.name is not None: changed.append("名称")
+    if update.ingredients is not None: changed.append("成分")
+    if update.tags is not None: changed.append("标签")
+    if update.note is not None: changed.append("备注")
+    if update.en_name is not None: changed.append("英文名")
+    log_audit(conn, user["id"], "update_recipe", "recipe", recipe_id,
+              rname["name"] if rname else update.name,
+              json.dumps({"changed": "、".join(changed)}, ensure_ascii=False) if changed else None)
     conn.commit()
     conn.close()
     return {"ok": True}
@@ -1028,7 +1042,7 @@ def create_tag(body: dict, user=Depends(require_role("admin", "senior_editor", "
         raise HTTPException(400, "Tag name required")
     conn = get_db()
     conn.execute("INSERT OR IGNORE INTO tags (name) VALUES (?)", (name,))
-    # Don't log tag creation (too frequent/noisy)
+    log_audit(conn, user["id"], "create_tag", "tag", name, name, None)
     conn.commit()
     conn.close()
     return {"ok": True}

frontend/cypress/e2e/audit-log-advanced.cy.js

@@ -41,7 +41,7 @@ describe('Audit Log Advanced', () => {
       const recipeId = createRes.body.id
       // Check audit log
       cy.request({ url: '/api/audit-log?limit=5&offset=0', headers: authHeaders }).then(res => {
-        const entry = res.body.find(e => e.action === 'create_recipe' && e.target_name === 'Cypress审计测试')
+        const entry = res.body.find(e => e.action === 'share_recipe' && e.target_name === 'Cypress审计测试')
         expect(entry).to.exist
       })
       // Cleanup

frontend/src/__tests__/newFeatures.test.js

@@ -85,3 +85,51 @@ describe('EDITOR_ONLY_TAGS', () => {
     expect(EDITOR_ONLY_TAGS).toContain('已审核')
   })
 })
+
+// ---------------------------------------------------------------------------
+// English search
+// ---------------------------------------------------------------------------
+describe('English search matching', () => {
+  const { oilEn } = require('../composables/useOilTranslation')
+
+  it('oilEn returns English name for known oils', () => {
+    expect(oilEn('薰衣草')).toBe('Lavender')
+    expect(oilEn('茶树')).toBe('Tea Tree')
+    expect(oilEn('乳香')).toBe('Frankincense')
+  })
+
+  it('oilEn returns empty for unknown oils', () => {
+    expect(oilEn('不存在的油')).toBeFalsy()
+  })
+
+  it('English query detection', () => {
+    const isEn = (q) => /^[a-zA-Z\s]+$/.test(q)
+    expect(isEn('lavender')).toBe(true)
+    expect(isEn('Tea Tree')).toBe(true)
+    expect(isEn('薰衣草')).toBe(false)
+    expect(isEn('lav3')).toBe(false)
+  })
+
+  it('English matches oil name in recipe', () => {
+    const recipe = {
+      name: '助眠配方',
+      en_name: 'Sleep Aid Blend',
+      ingredients: [{ oil: '薰衣草', drops: 3 }],
+      tags: []
+    }
+    const q = 'lavender'
+    const isEn = /^[a-zA-Z\s]+$/.test(q)
+    const enNameMatch = isEn && (recipe.en_name || '').toLowerCase().includes(q)
+    const oilEnMatch = isEn && recipe.ingredients.some(ing => (oilEn(ing.oil) || '').toLowerCase().includes(q))
+    expect(oilEnMatch).toBe(true)
+    expect(enNameMatch).toBe(false)
+  })
+
+  it('English matches recipe en_name', () => {
+    const recipe = { name: '助眠', en_name: 'Sleep Aid Blend', ingredients: [], tags: [] }
+    const q = 'sleep'
+    const isEn = /^[a-zA-Z\s]+$/.test(q)
+    const enNameMatch = isEn && (recipe.en_name || '').toLowerCase().includes(q)
+    expect(enNameMatch).toBe(true)
+  })
+})

frontend/src/__tests__/smartPaste.test.js

@@ -6,6 +6,7 @@ import {
   parseOilChunk,
   parseSingleBlock,
   splitRawIntoBlocks,
+  parseMultiRecipes,
   OIL_HOMOPHONES,
 } from '../composables/useSmartPaste'
 import prodData from './fixtures/production-data.json'
@@ -202,22 +203,22 @@ describe('parseOilChunk', () => {
     expect(result[1]).toEqual({ oil: '永久花', drops: 10 })
   })
 
-  it('parses "薰衣草3ml" → [{薰衣草, drops: 60}] (3ml * 20)', () => {
+  it('parses "薰衣草3ml" → [{薰衣草, drops: 60, _ml: 3}] (3ml * 20)', () => {
     const result = parseOilChunk('薰衣草3ml', oilNames)
     expect(result).toHaveLength(1)
-    expect(result[0]).toEqual({ oil: '薰衣草', drops: 60 })
+    expect(result[0]).toMatchObject({ oil: '薰衣草', drops: 60, _ml: 3 })
   })
 
-  it('parses "薰衣草5毫升" → [{薰衣草, drops: 100}] (5 * 20)', () => {
+  it('parses "薰衣草5毫升" → [{薰衣草, drops: 100, _ml: 5}] (5 * 20)', () => {
     const result = parseOilChunk('薰衣草5毫升', oilNames)
     expect(result).toHaveLength(1)
-    expect(result[0]).toEqual({ oil: '薰衣草', drops: 100 })
+    expect(result[0]).toMatchObject({ oil: '薰衣草', drops: 100, _ml: 5 })
   })
 
   it('parses "薰衣草3ML" → case-insensitive ml', () => {
     const result = parseOilChunk('薰衣草3ML', oilNames)
     expect(result).toHaveLength(1)
-    expect(result[0]).toEqual({ oil: '薰衣草', drops: 60 })
+    expect(result[0]).toMatchObject({ oil: '薰衣草', drops: 60, _ml: 3 })
   })
 
   it('handles decimal drops "乳香1.5"', () => {
@@ -233,10 +234,52 @@ describe('parseOilChunk', () => {
     expect(result[0]).toEqual({ oil: '薰衣草', drops: 5 })
   })
 
-  it('returns empty array for text with no numbers', () => {
+  it('parses oil name without number → default 1 drop', () => {
-    // The regex requires a number, so pure text yields nothing
     const result = parseOilChunk('薰衣草', oilNames)
-    expect(result).toHaveLength(0)
+    expect(result).toHaveLength(1)
+    expect(result[0]).toEqual({ oil: '薰衣草', drops: 1 })
+  })
+
+  it('parses multiple oil names without numbers', () => {
+    const result = parseOilChunk('薰衣草 茶树 乳香', oilNames)
+    expect(result).toHaveLength(3)
+    expect(result.map(r => r.oil)).toEqual(['薰衣草', '茶树', '乳香'])
+    expect(result.every(r => r.drops === 1)).toBe(true)
+  })
+
+  it('parses mixed: some with numbers, some without', () => {
+    const result = parseOilChunk('薰衣草3茶树乳香2', oilNames)
+    expect(result).toHaveLength(3)
+    expect(result[0]).toEqual({ oil: '薰衣草', drops: 3 })
+    expect(result[1]).toEqual({ oil: '茶树', drops: 1 })
+    expect(result[2]).toEqual({ oil: '乳香', drops: 2 })
+  })
+
+  it('parses trailing oil after last number', () => {
+    const result = parseOilChunk('薰衣草3茶树2乳香', oilNames)
+    expect(result).toHaveLength(3)
+    expect(result[2]).toEqual({ oil: '乳香', drops: 1 })
+  })
+
+  it('preserves _ml for ml unit (coconut oil)', () => {
+    const result = parseOilChunk('椰子油15ml', oilNames)
+    expect(result).toHaveLength(1)
+    expect(result[0]._ml).toBe(15)
+    expect(result[0].drops).toBe(300)
+  })
+
+  it('no _ml for drops unit', () => {
+    const result = parseOilChunk('椰子油15滴', oilNames)
+    expect(result).toHaveLength(1)
+    expect(result[0]._ml).toBeUndefined()
+    expect(result[0].drops).toBe(15)
+  })
+
+  it('no _ml for no unit', () => {
+    const result = parseOilChunk('椰子油15', oilNames)
+    expect(result).toHaveLength(1)
+    expect(result[0]._ml).toBeUndefined()
+    expect(result[0].drops).toBe(15)
   })
 })
 
@@ -263,7 +306,7 @@ describe('parseSingleBlock', () => {
 
   it('handles recipe with no name (all parts have oils)', () => {
     const result = parseSingleBlock('薰衣草10，茶树5', oilNames)
-    expect(result.name).toBe('未命名配方')
+    expect(result.name).toBe('')
     expect(result.ingredients).toHaveLength(2)
   })
 
@@ -370,3 +413,114 @@ describe('OIL_HOMOPHONES', () => {
     expect(OIL_HOMOPHONES['薰衣草油']).toBe('薰衣草')
   })
 })
+
+// ---------------------------------------------------------------------------
+// findOil — short string fuzzy match restriction
+// ---------------------------------------------------------------------------
+describe('findOil — short string protection', () => {
+  it('does not fuzzy-match 2-char non-oil text', () => {
+    // 美容 should NOT match any oil via edit distance
+    expect(findOil('美容', oilNames)).toBeNull()
+  })
+
+  it('still matches 2-char exact oil names', () => {
+    expect(findOil('乳香', oilNames)).toBe('乳香')
+    expect(findOil('茶树', oilNames)).toBe('茶树')
+  })
+
+  it('still matches 2-char homophones', () => {
+    expect(findOil('如香', oilNames)).toBe('乳香')
+  })
+
+  it('still matches 2-char substrings', () => {
+    // 薄荷 is a substring of 椒样薄荷 etc.
+    const result = findOil('薄荷', oilNames)
+    expect(result).not.toBeNull()
+  })
+
+  it('fuzzy matches 3+ char inputs via edit distance', () => {
+    // 永久化 → 永久花 (1 edit)
+    expect(findOil('永久化', oilNames)).toBe('永久花')
+  })
+})
+
+// ---------------------------------------------------------------------------
+// parseMultiRecipes
+// ---------------------------------------------------------------------------
+describe('parseMultiRecipes', () => {
+  it('parses single recipe with name', () => {
+    const results = parseMultiRecipes('助眠，薰衣草3，茶树2', oilNames)
+    expect(results).toHaveLength(1)
+    expect(results[0].name).toBe('助眠')
+    expect(results[0].ingredients).toHaveLength(2)
+  })
+
+  it('splits two recipes by name detection', () => {
+    const results = parseMultiRecipes('助眠 薰衣草3 茶树2 头疗 柠檬5 椒样薄荷3', oilNames)
+    expect(results).toHaveLength(2)
+    expect(results[0].name).toBe('助眠')
+    expect(results[1].name).toBe('头疗')
+  })
+
+  it('splits by blank lines', () => {
+    const results = parseMultiRecipes('助眠\n薰衣草3\n\n头疗\n柠檬5', oilNames)
+    expect(results).toHaveLength(2)
+    expect(results[0].name).toBe('助眠')
+    expect(results[1].name).toBe('头疗')
+  })
+
+  it('splits by semicolons when both sides have oils', () => {
+    const results = parseMultiRecipes('助眠，薰衣草3，茶树2;头疗，柠檬5', oilNames)
+    expect(results).toHaveLength(2)
+  })
+
+  it('does NOT split by semicolons when one side has no oil', () => {
+    const results = parseMultiRecipes('助眠;薰衣草3，茶树2', oilNames)
+    expect(results).toHaveLength(1)
+    expect(results[0].ingredients.length).toBeGreaterThanOrEqual(2)
+  })
+
+  it('handles oils without numbers (default 1 drop)', () => {
+    const results = parseMultiRecipes('头疗，薰衣草，茶树，乳香', oilNames)
+    expect(results).toHaveLength(1)
+    expect(results[0].name).toBe('头疗')
+    expect(results[0].ingredients).toHaveLength(3)
+    expect(results[0].ingredients.every(i => i.drops === 1)).toBe(true)
+  })
+
+  it('recognizes non-oil text with number as recipe name (first part)', () => {
+    // 美容1 is not an oil, should be treated as name "美容"
+    const results = parseMultiRecipes('美容1 牛至2 乳香3', oilNames)
+    expect(results).toHaveLength(1)
+    expect(results[0].name).toBe('美容')
+    expect(results[0].ingredients).toHaveLength(2)
+  })
+
+  it('returns empty name when no name detected', () => {
+    const results = parseMultiRecipes('薰衣草3，茶树2', oilNames)
+    expect(results).toHaveLength(1)
+    expect(results[0].name).toBe('')
+  })
+
+  it('deduplicates ingredients within a recipe', () => {
+    const results = parseMultiRecipes('测试 薰衣草3 薰衣草2', oilNames)
+    expect(results[0].ingredients).toHaveLength(1)
+    expect(results[0].ingredients[0].drops).toBe(5)
+  })
+
+  it('handles coconut oil with ml unit', () => {
+    const results = parseMultiRecipes('测试 薰衣草3 椰子油15ml', oilNames)
+    const coco = results[0].ingredients.find(i => i.oil === '椰子油')
+    expect(coco).toBeTruthy()
+    expect(coco._ml).toBe(15)
+  })
+
+  it('handles complex real-world multi-recipe input', () => {
+    const input = '美容 牛至2 迷迭香3 乳香4 椰子油15 头疗七八九 檀香3 乳香4 薰衣草3'
+    const results = parseMultiRecipes(input, oilNames)
+    expect(results).toHaveLength(2)
+    expect(results[0].name).toBe('美容')
+    expect(results[0].ingredients.find(i => i.oil === '椰子油')).toBeTruthy()
+    expect(results[1].name).toBe('头疗七八九')
+  })
+})

frontend/src/components/RecipeCard.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="recipe-card" @click="$emit('click', index)">
-    <div class="recipe-card-name">{{ recipe.name }}</div>
+    <div class="recipe-card-name">{{ recipe.name }} <span v-if="volumeLabel" class="recipe-card-volume">{{ volumeLabel }}</span></div>
     <div v-if="visibleTags.length" class="recipe-card-tags">
       <span v-for="tag in visibleTags" :key="tag" class="tag" :class="{ 'tag-reviewed': tag === '已审核' }">{{ tag }}</span>
     </div>
@@ -36,15 +36,26 @@ const auth = useAuthStore()
 
 const visibleTags = computed(() => {
   if (!props.recipe.tags) return []
-  const tags = auth.canEdit ? [...props.recipe.tags] : props.recipe.tags.filter(t => !EDITOR_ONLY_TAGS.includes(t))
+  if (!auth.canEdit) return []
+  const tags = [...props.recipe.tags]
   return tags.sort((a, b) => a.localeCompare(b, 'zh'))
 })
 
 const oilNames = computed(() =>
-  props.recipe.ingredients.map(i => i.oil).join('、')
+  [...props.recipe.ingredients].sort((a, b) => a.oil.localeCompare(b.oil, 'zh')).map(i => i.oil).join('、')
 )
 const priceInfo = computed(() => oilsStore.fmtCostWithRetail(props.recipe.ingredients))
 const isFav = computed(() => recipesStore.isFavorite(props.recipe))
+
+const volumeLabel = computed(() => {
+  const ings = props.recipe.ingredients || []
+  const coco = ings.find(i => i.oil === '椰子油')
+  if (!coco || !coco.drops) return ''
+  const totalDrops = ings.reduce((s, i) => s + (i.drops || 0), 0)
+  const ml = totalDrops / 18.6
+  if (ml <= 2) return '单次'
+  return `${Math.round(ml)}ml`
+})
 </script>
 
 <style scoped>
@@ -98,6 +109,13 @@ const isFav = computed(() => recipesStore.isFavorite(props.recipe))
   line-height: 1.7;
 }
 
+.recipe-card-volume {
+  font-size: 10px;
+  color: #b0aab5;
+  font-weight: 400;
+  margin-left: 4px;
+}
+
 .recipe-card-bottom {
   display: flex;
   justify-content: space-between;

frontend/src/composables/useSmartPaste.js

@@ -86,7 +86,8 @@ export function findOil(input, oilNames) {
     }
   }
 
-  // 5. Edit distance fuzzy match
+  // 5. Edit distance fuzzy match (only for 3+ char inputs to avoid false positives)
+  if (trimmed.length < 3) return null
   let bestMatch = null
   let bestDist = Infinity
   for (const name of oilNames) {
@@ -144,19 +145,25 @@ export function greedyMatchOils(text, oilNames) {
 /**
  * Parse text chunk into [{oil, drops}] pairs.
  * Handles formats like "芳香调理8永久花10" or "薰衣草 3滴 茶树 2ml"
+ * Also handles oil names without numbers, defaulting to 1 drop.
  */
 export function parseOilChunk(text, oilNames) {
   const results = []
+  // Match: name + optional number+unit
   const regex = /([^\d]+?)(\d+\.?\d*)\s*(ml|毫升|ML|mL|滴)?/g
   let match
+  let lastIndex = 0
   while ((match = regex.exec(text)) !== null) {
+    lastIndex = regex.lastIndex
     const namePart = match[1].trim()
     let amount = parseFloat(match[2])
     const unit = match[3] || ''
 
+    const isMl = unit && (unit.toLowerCase() === 'ml' || unit === '毫升')
+    let drops = amount
     // Convert ml to drops
-    if (unit && (unit.toLowerCase() === 'ml' || unit === '毫升')) {
+    if (isMl) {
-      amount = Math.round(amount * 20)
+      drops = Math.round(amount * 20)
     }
 
     // Try greedy match on the name part
@@ -164,22 +171,58 @@ export function parseOilChunk(text, oilNames) {
     if (matched.length > 0) {
       // Last matched oil gets the drops
       for (let i = 0; i < matched.length - 1; i++) {
-        results.push({ oil: matched[i], drops: 0 })
+        results.push({ oil: matched[i], drops: 1 })
       }
-      results.push({ oil: matched[matched.length - 1], drops: amount })
+      const item = { oil: matched[matched.length - 1], drops }
+      if (isMl) { item._ml = amount }
+      results.push(item)
     } else {
       // Try findOil as fallback
       const found = findOil(namePart, oilNames)
       if (found) {
-        results.push({ oil: found, drops: amount })
+        const item = { oil: found, drops }
+        if (isMl) { item._ml = amount }
+        results.push(item)
       } else if (namePart) {
-        results.push({ oil: namePart, drops: amount, notFound: true })
+        results.push({ oil: namePart, drops, notFound: true })
       }
     }
   }
+
+  if (lastIndex === 0) {
+    // Regex matched nothing — try the whole text as oil names without numbers
+    _parseNamesOnly(text.trim(), oilNames, results)
+  } else {
+    // Handle trailing text after last number match
+    const trailing = text.substring(lastIndex).trim()
+    if (trailing) {
+      _parseNamesOnly(trailing, oilNames, results)
+    }
+  }
+
   return results
 }
 
+/** Parse text that contains only oil names (no numbers), default 1 drop each. */
+function _parseNamesOnly(text, oilNames, results) {
+  // Try greedy match first
+  const matched = greedyMatchOils(text, oilNames)
+  if (matched.length > 0) {
+    for (const oil of matched) {
+      results.push({ oil, drops: 1 })
+    }
+    return
+  }
+  // Fallback: try splitting by common delimiters and fuzzy match
+  const parts = text.split(/[\s+、,，]+/).filter(s => s)
+  for (const part of parts) {
+    const found = findOil(part, oilNames)
+    if (found) {
+      results.push({ oil: found, drops: 1 })
+    }
+  }
+}
+
 /**
  * Split multi-recipe input by blank lines or semicolons.
  * Detects recipe boundaries (non-oil text after seeing oils = new recipe).
@@ -255,7 +298,7 @@ export function parseSingleBlock(raw, oilNames) {
   }
 
   return {
-    name: name || '未命名配方',
+    name: name || '',
     ingredients: deduped,
     notFound
   }
@@ -266,8 +309,23 @@ export function parseSingleBlock(raw, oilNames) {
  * appears after some oils have been found, it starts a new recipe.
  */
 export function parseMultiRecipes(raw, oilNames) {
+  // Split by blank lines into major blocks
+  const blankLineSplit = raw.split(/\n\s*\n/).map(s => s.trim()).filter(s => s)
+  if (blankLineSplit.length > 1) {
+    return blankLineSplit.flatMap(block => parseMultiRecipes(block, oilNames))
+  }
+  // Split by semicolons only if both sides contain oil names
+  const semiParts = raw.split(/[;；]/).map(s => s.trim()).filter(s => s)
+  if (semiParts.length > 1) {
+    const hasOilInPart = p => oilNames.some(oil => p.includes(oil)) ||
+      Object.keys(OIL_HOMOPHONES).some(a => p.includes(a))
+    if (semiParts.every(hasOilInPart)) {
+      return semiParts.flatMap(block => parseMultiRecipes(block, oilNames))
+    }
+  }
+
   // First split by lines/commas, then within each part also try space splitting
-  const roughParts = raw.split(/[,，、\n\r]+/).map(s => s.trim()).filter(s => s)
+  const roughParts = raw.split(/[,，、;；\n\r]+/).map(s => s.trim()).filter(s => s)
   const parts = []
   for (const rp of roughParts) {
     // If the part has spaces and contains mixed name+oil, split by spaces too
@@ -307,19 +365,23 @@ export function parseMultiRecipes(raw, oilNames) {
 
   for (const part of parts) {
     const hasNumber = /\d/.test(part)
+    const textPart = part.replace(/\d+\.?\d*/g, '').trim()
     const hasOil = oilNames.some(oil => part.includes(oil)) ||
                    Object.keys(OIL_HOMOPHONES).some(alias => part.includes(alias))
     // Also check fuzzy: 3+ char parts
-    const fuzzyOil = !hasOil && part.replace(/\d+\.?\d*/g, '').length >= 2 &&
+    const fuzzyOil = !hasOil && textPart.length >= 2 &&
-                     findOil(part.replace(/\d+\.?\d*/g, '').trim(), oilNames)
+                     findOil(textPart, oilNames)
+    // First part only: has number but text is not any oil → likely a name like "美容1"
+    const isFirstNameWithNumber = !current.foundOil && current.nameParts.length === 0 &&
+      current.ingredientParts.length === 0 && hasNumber && !hasOil && !fuzzyOil && textPart.length >= 2
 
     if (current.foundOil && !hasOil && !fuzzyOil && !hasNumber && part.length >= 2) {
       // New recipe starts
       recipes.push(current)
       current = { nameParts: [], ingredientParts: [], foundOil: false }
       current.nameParts.push(part)
-    } else if (!current.foundOil && !hasOil && !fuzzyOil && !hasNumber) {
+    } else if ((!current.foundOil && !hasOil && !fuzzyOil && !hasNumber) || isFirstNameWithNumber) {
-      current.nameParts.push(part)
+      current.nameParts.push(isFirstNameWithNumber ? textPart : part)
     } else {
       current.foundOil = true
       current.ingredientParts.push(part)
@@ -350,7 +412,7 @@ export function parseMultiRecipes(raw, oilNames) {
       }
     }
     return {
-      name: r.nameParts.join(' ') || '未命名配方',
+      name: r.nameParts.join(' ') || '',
       ingredients: deduped,
       notFound,
     }

frontend/src/views/AuditLog.vue

@@ -49,6 +49,7 @@
         <div class="log-detail">
           <span v-if="log.target_name" class="log-target-name">{{ log.target_name }}</span>
           <span v-if="parsedDetail(log)" class="log-extra">{{ parsedDetail(log) }}</span>
+          <button v-if="canUndo(log)" class="undo-btn" @click="undoAction(log)">↩ 撤销</button>
         </div>
       </div>
       <div v-if="filteredLogs.length === 0" class="empty-hint">暂无日志记录</div>
@@ -66,6 +67,10 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue'
 import { api } from '../composables/useApi'
+import { showConfirm } from '../composables/useDialog'
+import { useUiStore } from '../stores/ui'
+
+const ui = useUiStore()
 
 const logs = ref([])
 const loading = ref(false)
@@ -77,10 +82,10 @@ const selectedUser = ref('')
 const selectedTarget = ref('')
 
 const ACTION_MAP = {
-  create_recipe: '新增配方',
+  share_recipe: '共享配方',
+  adopt_recipe: '共享配方',
   update_recipe: '编辑配方',
   delete_recipe: '删除配方',
-  adopt_recipe: '采纳配方',
   reject_recipe: '拒绝配方',
   undo_delete_recipe: '恢复配方',
   upsert_oil: '编辑精油',
@@ -96,16 +101,19 @@ const ACTION_MAP = {
   reject_business: '拒绝商业认证',
   grant_business: '开通商业认证',
   revoke_business: '撤销商业认证',
+  register: '用户注册',
 }
 
-const actionTypes = [
+const actionGroups = {
-  { value: 'recipe', label: '配方' },
+  '配方': ['share_recipe', 'adopt_recipe', 'update_recipe', 'delete_recipe', 'undo_delete_recipe'],
-  { value: 'oil', label: '精油' },
+  '审核': ['reject_recipe'],
-  { value: 'user', label: '用户' },
+  '精油': ['upsert_oil', 'delete_oil', 'undo_delete_oil'],
-  { value: 'tag', label: '标签' },
+  '标签': ['create_tag', 'delete_tag'],
-  { value: 'adopt', label: '审核' },
+  '用户': ['create_user', 'update_user', 'delete_user', 'undo_delete_user', 'register'],
-  { value: 'business', label: '商业认证' },
+  '商业认证': ['business_apply', 'approve_business', 'reject_business', 'grant_business', 'revoke_business'],
-]
+}
+
+const actionTypes = Object.keys(actionGroups).map(label => ({ value: label, label }))
 
 const targetTypes = [
   { value: 'recipe', label: '配方' },
@@ -125,7 +133,8 @@ const uniqueUsers = computed(() => {
 const filteredLogs = computed(() => {
   let result = logs.value
   if (selectedAction.value) {
-    result = result.filter(l => l.action.includes(selectedAction.value))
+    const group = actionGroups[selectedAction.value]
+    if (group) result = result.filter(l => group.includes(l.action))
   }
   if (selectedUser.value) {
     result = result.filter(l => (l.user_name || l.username) === selectedUser.value)
@@ -144,7 +153,7 @@ function actionColorClass(action) {
   if (action.includes('create') || action.includes('upsert')) return 'color-create'
   if (action.includes('update')) return 'color-update'
   if (action.includes('delete') || action.includes('reject')) return 'color-delete'
-  if (action.includes('adopt') || action.includes('undo')) return 'color-approve'
+  if (action.includes('adopt') || action.includes('undo') || action.includes('share')) return 'color-approve'
   return ''
 }
 
@@ -157,6 +166,7 @@ function parsedDetail(log) {
     if (d.from_user) parts.push(`来自: ${d.from_user}`)
     if (d.reason) parts.push(`原因: ${d.reason}`)
     if (d.business_name) parts.push(`商户: ${d.business_name}`)
+    if (d.changed) parts.push(`修改: ${d.changed}`)
     if (d.display_name) parts.push(`显示名: ${d.display_name}`)
     if (d.original_log_id) parts.push(`恢复自 #${d.original_log_id}`)
     if (parts.length) return parts.join(' · ')
@@ -168,6 +178,30 @@ function parsedDetail(log) {
   }
 }
 
+function canUndo(log) {
+  return ['delete_recipe', 'delete_oil'].includes(log.action)
+}
+
+async function undoAction(log) {
+  const ok = await showConfirm(`确定撤销此操作？将恢复「${log.target_name}」`)
+  if (!ok) return
+  try {
+    const res = await api(`/api/audit-log/${log.id}/undo`, { method: 'POST' })
+    if (res.ok) {
+      ui.showToast('已撤销')
+      logs.value = []
+      page.value = 0
+      hasMore.value = true
+      await fetchLogs()
+    } else {
+      const err = await res.json().catch(() => ({}))
+      ui.showToast('撤销失败: ' + (err.detail || err.message || ''))
+    }
+  } catch {
+    ui.showToast('撤销失败')
+  }
+}
+
 function formatTime(t) {
   if (!t) return ''
   return new Date(t + 'Z').toLocaleString('zh-CN', {
@@ -235,6 +269,11 @@ onMounted(() => fetchLogs())
 .log-detail { font-size: 13px; color: #6b6375; margin-top: 2px; }
 .log-target-name { font-weight: 500; color: #3e3a44; margin-right: 8px; }
 .log-extra { color: #999; font-size: 12px; }
+.undo-btn {
+  margin-left: 8px; padding: 2px 8px; border: 1px solid #d4cfc7; border-radius: 6px;
+  background: #fff; font-size: 11px; cursor: pointer; color: #6b6375; font-family: inherit;
+}
+.undo-btn:hover { border-color: #7ec6a4; color: #4a9d7e; }
 
 .load-more { text-align: center; margin-top: 16px; }
 .btn-outline {

frontend/src/views/RecipeManager.vue

@@ -125,8 +125,9 @@
           />
           <div class="row-info" @click="editDiaryRecipe(d)">
             <span class="row-name">{{ d.name }}</span>
+            <span v-if="getVolumeLabel(d.ingredients)" class="row-volume">{{ getVolumeLabel(d.ingredients) }}</span>
             <span class="row-tags">
-              <span v-for="t in (d.tags || []).filter(t => auth.canEdit || !EDITOR_ONLY_TAGS.includes(t))" :key="t" class="mini-tag">{{ t }}</span>
+              <span v-for="t in [...(d.tags || [])].sort((a,b)=>a.localeCompare(b,'zh'))" :key="t" class="mini-tag">{{ t }}</span>
             </span>
             <span class="row-cost">{{ oils.fmtPrice(oils.calcCost(d.ingredients || [])) }}</span>
             <span v-if="getDiaryShareStatus(d) === 'shared'" class="share-tag shared">已共享</span>
@@ -164,8 +165,9 @@
           />
           <div class="row-info" @click="editRecipe(r)">
             <span class="row-name">{{ r.name }}</span>
+            <span v-if="getVolumeLabel(r.ingredients)" class="row-volume">{{ getVolumeLabel(r.ingredients) }}</span>
             <span class="row-tags">
-              <span v-for="t in (r.tags || []).filter(t => auth.canEdit || !EDITOR_ONLY_TAGS.includes(t))" :key="t" class="mini-tag">{{ t }}</span>
+              <span v-for="t in [...(r.tags || [])].sort((a,b)=>a.localeCompare(b,'zh'))" :key="t" class="mini-tag">{{ t }}</span>
             </span>
             <span class="row-cost">{{ oils.fmtPrice(oils.calcCost(r.ingredients)) }}</span>
           </div>
@@ -178,7 +180,7 @@
     </div>
 
     <!-- Add/Edit Recipe Overlay -->
-    <div v-if="showAddOverlay" class="overlay" @click.self="closeOverlay">
+    <div v-if="showAddOverlay" class="overlay">
       <div class="overlay-panel">
         <div class="overlay-header">
           <h3>{{ editingRecipe ? '编辑配方' : '添加配方' }}</h3>
@@ -191,7 +193,7 @@
             <textarea
               v-model="smartPasteText"
               class="paste-input"
-              placeholder="直接粘贴配方文本，支持多条配方同时识别&#10;例如: 舒缓放松，薰衣草3，茶树2&#10;提神醒脑，柠檬5，椒样薄荷3"
+              placeholder="直接粘贴配方文本，支持多条配方同时识别&#10;例如: 舒缓放松，薰衣草3，茶树2&#10;提神醒脑，柠檬5，椒样薄荷3&#10;不写数字默认1滴: 薰衣草，茶树，乳香"
               rows="4"
             ></textarea>
             <button class="btn-primary btn-sm" @click="handleSmartPaste" :disabled="!smartPasteText.trim()">
@@ -199,28 +201,24 @@
             </button>
           </div>
 
-          <!-- Parsed results preview -->
+          <!-- Multi-recipe queue indicator -->
-          <div v-if="parsedRecipes.length > 0" class="parsed-results">
+          <div v-if="parsedRecipes.length > 0" class="parsed-queue">
-            <div v-for="(pr, pi) in parsedRecipes" :key="pi" class="parsed-recipe-card">
+            <div class="parsed-queue-header">
-              <div class="parsed-header">
+              <span class="parsed-queue-label">批量识别 ({{ parsedCurrentIndex + 1 }}/{{ parsedRecipes.length }})</span>
-                <input v-model="pr.name" class="form-input parsed-name" placeholder="配方名称" />
+              <button class="btn-outline btn-sm" @click="saveAllParsed">全部保存</button>
-                <button class="btn-icon-sm" @click="parsedRecipes.splice(pi, 1)" title="放弃">✕</button>
+              <button class="btn-outline btn-sm" @click="parsedRecipes = []; parsedCurrentIndex = -1">取消全部</button>
-              </div>
-              <div class="parsed-ings">
-                <div v-for="(ing, ii) in pr.ingredients" :key="ii" class="parsed-ing">
-                  <span class="parsed-oil">{{ ing.oil }}</span>
-                  <input v-model.number="ing.drops" type="number" min="0" class="form-input-sm" />
-                  <button class="btn-icon-sm" @click="pr.ingredients.splice(ii, 1)">✕</button>
-                </div>
-              </div>
-              <div v-if="pr.notFound && pr.notFound.length" class="parsed-warn">
-                ⚠️ 未识别: {{ pr.notFound.join('、') }}
-              </div>
-              <button class="btn-primary btn-sm" @click="saveParsedRecipe(pi)">💾 保存此条</button>
             </div>
-            <div class="parsed-actions">
+            <div class="parsed-queue-list">
-              <button class="btn-primary btn-sm" @click="saveAllParsed" :disabled="parsedRecipes.length === 0">全部保存 ({{ parsedRecipes.length }})</button>
+              <button
-              <button class="btn-outline btn-sm" @click="parsedRecipes = []">取消全部</button>
+                v-for="(pr, pi) in parsedRecipes" :key="pi"
+                class="parsed-queue-item"
+                :class="{ active: pi === parsedCurrentIndex }"
+                @click="loadParsedIntoForm(pi)"
+              >
+                <span class="parsed-queue-name">{{ pr.name || '未命名' }}</span>
+                <span class="parsed-queue-count">{{ pr.ingredients.length }}味</span>
+                <span class="btn-icon-sm" @click.stop="parsedRecipes.splice(pi, 1); if (parsedRecipes.length === 0) parsedCurrentIndex = -1; else if (pi <= parsedCurrentIndex) loadParsedIntoForm(Math.min(parsedCurrentIndex, parsedRecipes.length - 1))">✕</span>
+              </button>
             </div>
           </div>
 
@@ -433,6 +431,7 @@ const formNote = ref('')
 const formTags = ref([])
 const smartPasteText = ref('')
 const parsedRecipes = ref([])
+const parsedCurrentIndex = ref(-1)
 const showAddIngRow = ref(false)
 const newIngOil = ref('')
 const newIngSearch = ref('')
@@ -446,7 +445,7 @@ const formDilution = ref(6)
 const formCocoRow = ref(null)
 
 watch(() => formVolume.value, (vol) => {
-  if (vol && !formCocoRow.value) {
+  if (vol && !formCocoRow.value && parsedCurrentIndex.value < 0) {
     formCocoRow.value = { oil: '椰子油', drops: vol === 'single' ? 10 : 0, _search: '椰子油', _open: false }
   }
 })
@@ -806,6 +805,7 @@ function resetForm() {
   formTags.value = []
   smartPasteText.value = ''
   parsedRecipes.value = []
+  parsedCurrentIndex.value = -1
   showAddIngRow.value = false
   newIngOil.value = ''
   newIngSearch.value = ''
@@ -833,9 +833,10 @@ function handleSmartPaste() {
     }
     parsedRecipes.value = []
   } else {
-    // Multiple recipes: show preview cards
+    // Multiple recipes: store queue, load first into form
     parsedRecipes.value = results
-    ui.showToast(`识别出 ${results.length} 条配方`)
+    loadParsedIntoForm(0)
+    ui.showToast(`识别出 ${results.length} 条配方，逐条编辑保存`)
   }
 }
 
@@ -980,6 +981,44 @@ function toggleFormTag(tag) {
   else formTags.value.push(tag)
 }
 
+/**
+ * Check name against public + personal recipes.
+ * Same name + same content → toast and return false.
+ * Same name + different content → show diff, prompt rename, loop until unique.
+ * Returns final name or false if cancelled.
+ */
+async function checkDupName(name, ings, target = 'diary') {
+  let currentName = name
+  while (true) {
+    const dup = target === 'public'
+      ? recipeStore.recipes.find(r => r.name === currentName)
+      : diaryStore.userDiary.find(d => d.name === currentName)
+    if (!dup) return currentName
+
+    const dupIngs = (dup.ingredients || []).filter(i => i.oil).sort((a, b) => a.oil.localeCompare(b.oil))
+    const myIngs = ings.filter(i => i.oil).sort((a, b) => a.oil.localeCompare(b.oil))
+    const identical = dupIngs.length === myIngs.length && dupIngs.every((d, i) => d.oil === myIngs[i].oil && d.drops === myIngs[i].drops)
+    const where = target === 'public' ? '公共配方库' : '我的配方'
+
+    if (identical) {
+      ui.showToast(`${where}中已有一模一样的配方「${currentName}」，已跳过`)
+      return false
+    }
+
+    const existIngs = dupIngs.map(i => `${i.oil}${i.drops}滴`).join('、')
+    const newIngs = myIngs.map(i => `${i.oil}${i.drops}滴`).join('、')
+    const ok = await showConfirm(
+      `${where}中已有同名配方「${currentName}」，内容不同：\n\n已有：${existIngs}\n新的：${newIngs}\n\n请改名后保存`,
+      { okText: '改名', cancelText: '取消' }
+    )
+    if (!ok) return false
+    const newName = await showPrompt('请输入新名称：', currentName)
+    if (!newName || !newName.trim()) return false
+    currentName = newName.trim()
+    // Loop back to check the new name
+  }
+}
+
 async function saveCurrentRecipe() {
   if (formVolume.value === 'custom' && !formCustomVolume.value) {
     ui.showToast('请输入自定义容量')
@@ -1007,38 +1046,6 @@ async function saveCurrentRecipe() {
     tags: formTags.value,
   }
 
-  // Dedup check for new recipes (not editing)
-  if (!editingRecipe.value) {
-    const name = formName.value.trim()
-    // Check public library
-    const pubDup = recipeStore.recipes.find(r => r.name === name)
-    // Check personal diary
-    const diaryDup = diaryStore.userDiary.find(d => d.name === name)
-    const dup = pubDup || diaryDup
-    if (dup) {
-      const dupIngs = (dup.ingredients || []).filter(i => i.oil).sort((a, b) => a.oil.localeCompare(b.oil))
-      const myIngs = cleanIngs.filter(i => i.oil).sort((a, b) => a.oil.localeCompare(b.oil))
-      const identical = dupIngs.length === myIngs.length && dupIngs.every((ing, i) => ing.oil === myIngs[i].oil && ing.drops === myIngs[i].drops)
-      const where = pubDup ? '公共配方库' : '我的配方'
-      if (identical) {
-        ui.showToast(`${where}中已有一模一样的配方「${name}」`)
-        return
-      }
-      // Show difference
-      const existIngs = dupIngs.map(i => `${i.oil}${i.drops}滴`).join('、')
-      const newIngs = myIngs.map(i => `${i.oil}${i.drops}滴`).join('、')
-      const ok = await showConfirm(
-        `${where}中已有同名配方「${name}」，内容不同：\n\n已有：${existIngs}\n新的：${newIngs}\n\n是否改名后保存？`,
-        { okText: '改名', cancelText: '取消' }
-      )
-      if (!ok) return
-      const newName = await showPrompt('请输入新名称：', name)
-      if (!newName || !newName.trim()) return
-      formName.value = newName.trim()
-      diaryPayload.name = newName.trim()
-    }
-  }
-
   if (editingRecipe.value && editingRecipe.value._diary_id) {
     // Editing an existing diary recipe
     try {
@@ -1080,26 +1087,31 @@ async function saveCurrentRecipe() {
   if (auth.canManage) {
     const toPublic = await showConfirm('保存到哪里？', { okText: '公共配方库', cancelText: '个人配方' })
     if (toPublic) {
+      const finalName = await dedupOrSkip(diaryPayload.name, cleanIngs, 'public')
+      if (!finalName) return
       try {
-        const pubPayload = {
+        await recipeStore.saveRecipe({
-          name: formName.value.trim(),
+          name: finalName,
           ingredients: cleanIngs.map(i => ({ oil_name: i.oil, drops: i.drops })),
           note: formNote.value,
           tags: formTags.value,
-        }
+        })
-        await recipeStore.saveRecipe(pubPayload)
         ui.showToast('已添加到公共配方库')
-        closeOverlay()
+        if (!loadNextParsed()) closeOverlay()
       } catch (e) {
         ui.showToast('保存失败: ' + (e.message || '未知错误'))
       }
       return
     }
   }
+  const finalName = await dedupOrSkip(diaryPayload.name, cleanIngs, 'diary')
+  if (!finalName) return
+  diaryPayload.name = finalName
+  formName.value = finalName
   try {
     await diaryStore.createDiary(diaryPayload)
     ui.showToast('已添加到我的配方')
-    closeOverlay()
+    if (!loadNextParsed()) closeOverlay()
   } catch (e) {
     ui.showToast('保存失败: ' + (e.message || '未知错误'))
   }
@@ -1126,25 +1138,142 @@ async function saveParsedRecipe(index) {
 }
 
 async function saveAllParsed() {
-  let saved = 0
+  // Sync current form edits back first
-  for (let i = parsedRecipes.value.length - 1; i >= 0; i--) {
+  syncFormToParsed()
+  const toPublic = auth.canManage && await showConfirm('全部保存到哪里？', { okText: '公共配方库', cancelText: '个人配方' })
+  let saved = 0, skipped = 0
+  for (let i = 0; i < parsedRecipes.value.length; i++) {
     const r = parsedRecipes.value[i]
     if (!r.name.trim() || r.ingredients.length === 0) continue
+    const ings = r.ingredients.map(ing => ({ oil: ing.oil, drops: ing.drops }))
+    const finalName = await checkDupName(r.name.trim(), ings, toPublic ? 'public' : 'diary')
+    if (finalName === false) { skipped++; continue }
     try {
-      await diaryStore.createDiary({
+      if (toPublic) {
-        name: r.name.trim(),
+        await recipeStore.saveRecipe({
-        ingredients: r.ingredients.map(i => ({ oil: i.oil, drops: i.drops })),
+          name: finalName,
-        note: '',
+          ingredients: ings.map(ing => ({ oil_name: ing.oil, drops: ing.drops })),
-        tags: [],
+          note: '',
-      })
+          tags: [],
+        })
+      } else {
+        await diaryStore.createDiary({ name: finalName, ingredients: ings, note: '', tags: [] })
+      }
       saved++
     } catch {}
   }
   parsedRecipes.value = []
-  ui.showToast(`已保存 ${saved} 条配方到我的配方`)
+  parsedCurrentIndex.value = -1
+  ui.showToast(`已保存 ${saved} 条配方到${toPublic ? '公共配方库' : '我的配方'}`)
   closeOverlay()
 }
 
+/** Skip current parsed recipe and load next, or close if none left. */
+function skipCurrentParsed() {
+  if (parsedCurrentIndex.value < 0) return
+  const skipIdx = parsedCurrentIndex.value
+  parsedCurrentIndex.value = -1
+  parsedRecipes.value.splice(skipIdx, 1)
+  if (parsedRecipes.value.length > 0) {
+    const next = Math.min(skipIdx, parsedRecipes.value.length - 1)
+    parsedCurrentIndex.value = next
+    const r = parsedRecipes.value[next]
+    formName.value = r.name
+    const cocoIng = r.ingredients.find(i => i.oil === '椰子油')
+    const eoIngs = r.ingredients.filter(i => i.oil !== '椰子油')
+    formIngredients.value = eoIngs.length > 0
+      ? eoIngs.map(i => ({ ...i, _search: i.oil, _open: false }))
+      : [{ oil: '', drops: 1, _search: '', _open: false }]
+    if (cocoIng) {
+      formCocoRow.value = { oil: '椰子油', drops: cocoIng.drops, _search: '椰子油', _open: false }
+      formVolume.value = 'single'
+    } else {
+      formCocoRow.value = null
+      formVolume.value = ''
+    }
+  } else {
+    closeOverlay()
+  }
+}
+
+/**
+ * Run dedup check for saveCurrentRecipe. Returns final name or null if should stop.
+ */
+async function dedupOrSkip(name, ings, target) {
+  if (editingRecipe.value) return name
+  const result = await checkDupName(name, ings, target)
+  if (result === false) {
+    if (parsedCurrentIndex.value >= 0) skipCurrentParsed()
+    return null
+  }
+  return result
+}
+
+/** After saving, mark current as done and load next. Returns true if there's a next one. */
+function loadNextParsed() {
+  if (parsedCurrentIndex.value < 0 || parsedRecipes.value.length === 0) return false
+  // Remove the just-saved recipe
+  parsedRecipes.value.splice(parsedCurrentIndex.value, 1)
+  if (parsedRecipes.value.length === 0) {
+    parsedCurrentIndex.value = -1
+    return false
+  }
+  // Load next (same index, or last if was at end)
+  const next = Math.min(parsedCurrentIndex.value, parsedRecipes.value.length - 1)
+  loadParsedIntoForm(next)
+  return true
+}
+
+/** Sync current form edits back to parsedRecipes before switching */
+function syncFormToParsed() {
+  if (parsedCurrentIndex.value < 0) return
+  const r = parsedRecipes.value[parsedCurrentIndex.value]
+  if (!r) return
+  r.name = formName.value
+  // Rebuild ingredients from form (EO + coco)
+  const ings = formIngredients.value.filter(i => i.oil && i.oil !== '椰子油').map(i => ({ oil: i.oil, drops: i.drops }))
+  if (formCocoRow.value && cocoActualDrops.value > 0) {
+    ings.push({ oil: '椰子油', drops: cocoActualDrops.value })
+  }
+  r.ingredients = ings
+}
+
+function loadParsedIntoForm(index) {
+  // Save current edits before switching
+  syncFormToParsed()
+  const r = parsedRecipes.value[index]
+  if (!r) return
+  parsedCurrentIndex.value = index
+  formName.value = r.name
+  const cocoIng = r.ingredients.find(i => i.oil === '椰子油')
+  const eoIngs = r.ingredients.filter(i => i.oil !== '椰子油')
+  formIngredients.value = eoIngs.length > 0
+    ? eoIngs.map(i => ({ ...i, _search: i.oil, _open: false }))
+    : [{ oil: '', drops: 1, _search: '', _open: false }]
+  if (cocoIng) {
+    if (cocoIng._ml) {
+      // Written as ml — use ml volume mode
+      const mlStr = String(cocoIng._ml)
+      const standardMls = ['5', '10', '15', '20', '30']
+      formCocoRow.value = { oil: '椰子油', drops: 0, _search: '椰子油', _open: false }
+      formVolume.value = standardMls.includes(mlStr) ? mlStr : 'custom'
+      if (!standardMls.includes(mlStr)) formCustomVolume.value = cocoIng._ml
+    } else {
+      // Written as drops — use single mode
+      formCocoRow.value = { oil: '椰子油', drops: cocoIng.drops, _search: '椰子油', _open: false }
+      formVolume.value = 'single'
+    }
+  } else {
+    formCocoRow.value = null
+  }
+  formNote.value = ''
+  formTags.value = []
+  if (!cocoIng) formVolume.value = ''
+  if (r.notFound && r.notFound.length > 0) {
+    ui.showToast(`未识别: ${r.notFound.join('、')}`)
+  }
+}
+
 const sharedCount = ref({ adopted: 0, total: 0, adoptedNames: [], pendingNames: [] })
 
 async function loadContribution() {
@@ -1303,6 +1432,16 @@ function openRecipeDetail(recipe) {
   if (idx >= 0) previewRecipeIndex.value = idx
 }
 
+function getVolumeLabel(ingredients) {
+  const ings = ingredients || []
+  const coco = ings.find(i => i.oil === '椰子油')
+  if (!coco || !coco.drops) return ''
+  const totalDrops = ings.reduce((s, i) => s + (i.drops || 0), 0)
+  const ml = totalDrops / 18.6
+  if (ml <= 2) return '单次'
+  return `${Math.round(ml)}ml`
+}
+
 function diaryMatchesPublic(d) {
   const pub = recipeStore.recipes.find(r => r.name === d.name)
   if (!pub) return false
@@ -1312,12 +1451,10 @@ function diaryMatchesPublic(d) {
 }
 
 function getDiaryShareStatus(d) {
-  // Check pending (owned by user in public library, not yet adopted)
+  // Admin/senior_editor share directly — check public match first
-  if (sharedCount.value.pendingNames.includes(d.name)) return 'pending'
-  // Check if public library has same recipe with same content
   if (diaryMatchesPublic(d)) return 'shared'
-  // Check adopted names from audit log
+  // Non-admin: check pending (owned by user, not yet adopted)
-  if (sharedCount.value.adoptedNames.includes(d.name) && diaryMatchesPublic(d)) return 'shared'
+  if (!auth.isAdmin && !auth.canManage && sharedCount.value.pendingNames.includes(d.name)) return 'pending'
   return null
 }
 
@@ -1347,28 +1484,10 @@ async function recommendApprove(recipe) {
 }
 
 async function shareDiaryToPublic(diary) {
-  // Check for duplicates in public library
+  const ings = (diary.ingredients || []).map(i => ({ oil: i.oil, drops: i.drops }))
-  const dup = recipeStore.recipes.find(r => r.name === diary.name)
+  const result = await checkDupName(diary.name, ings, 'public')
-  if (dup) {
+  if (result === false) return
-    const dIngs = (diary.ingredients || []).filter(i => i.oil).sort((a, b) => a.oil.localeCompare(b.oil))
+  if (result !== diary.name) diary = { ...diary, name: result }
-    const pIngs = (dup.ingredients || []).filter(i => i.oil).sort((a, b) => a.oil.localeCompare(b.oil))
-    const identical = dIngs.length === pIngs.length && dIngs.every((ing, i) => ing.oil === pIngs[i].oil && ing.drops === pIngs[i].drops)
-    if (identical) {
-      ui.showToast('公共配方库中已有一模一样的配方「' + diary.name + '」')
-      return
-    }
-    // Same name, different content — show details
-    const existIngs = pIngs.map(i => `${i.oil}${i.drops}滴`).join('、')
-    const newIngs = dIngs.map(i => `${i.oil}${i.drops}滴`).join('、')
-    const action = await showConfirm(
-      `公共配方库中已有同名配方「${diary.name}」，内容不同：\n\n已有：${existIngs}\n新的：${newIngs}\n\n是否改名后共享？`,
-      { okText: '改名', cancelText: '取消' }
-    )
-    if (!action) return
-    const newName = await showPrompt('请输入新名称：', diary.name)
-    if (!newName || !newName.trim()) return
-    diary = { ...diary, name: newName.trim() }
-  }
 
   const ok = await showConfirm(`将「${diary.name}」共享到公共配方库？`)
   if (!ok) return
@@ -1790,6 +1909,7 @@ watch(() => recipeStore.recipes, () => {
 }
 .share-tag.shared { background: #e8f5e9; color: #2e7d32; }
 .share-tag.pending { background: #fff3e0; color: #e65100; }
+.row-volume { font-size: 10px; color: #b0aab5; white-space: nowrap; }
 
 .review-history { max-height: 300px; overflow-y: auto; }
 .review-log-item {
@@ -1912,25 +2032,18 @@ watch(() => recipeStore.recipes, () => {
   border-color: #7ec6a4;
 }
 
-.parsed-results { margin: 12px 0; }
+.parsed-queue { margin: 12px 0; background: #f8faf8; border: 1.5px solid #d4e8d4; border-radius: 10px; padding: 10px 12px; }
-.parsed-recipe-card {
+.parsed-queue-header { display: flex; align-items: center; gap: 8px; margin-bottom: 8px; }
-  background: #f8faf8;
+.parsed-queue-label { font-size: 13px; font-weight: 600; color: #2e7d5a; flex: 1; }
-  border: 1.5px solid #d4e8d4;
+.parsed-queue-list { display: flex; flex-wrap: wrap; gap: 6px; }
-  border-radius: 10px;
+.parsed-queue-item {
-  padding: 12px;
+  display: flex; align-items: center; gap: 4px; padding: 4px 10px; border-radius: 8px;
-  margin-bottom: 10px;
+  border: 1.5px solid #e5e4e7; background: #fff; font-size: 12px; cursor: pointer; font-family: inherit;
 }
-.parsed-header { display: flex; gap: 8px; align-items: center; margin-bottom: 8px; }
+.parsed-queue-item.active { border-color: #7ec6a4; background: #e8f5e9; font-weight: 600; }
-.parsed-name { flex: 1; font-weight: 600; }
+.parsed-queue-item:hover { border-color: #d4cfc7; }
-.parsed-ings { display: flex; flex-wrap: wrap; gap: 6px; margin-bottom: 6px; }
+.parsed-queue-name { color: #3e3a44; max-width: 120px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
-.parsed-ing {
+.parsed-queue-count { color: #b0aab5; font-size: 11px; }
-  display: flex; align-items: center; gap: 4px;
-  background: #fff; border: 1px solid #e5e4e7; border-radius: 8px; padding: 4px 8px; font-size: 13px;
-}
-.parsed-oil { color: #3e3a44; font-weight: 500; }
-.parsed-ing .form-input-sm { width: 50px; padding: 4px 6px; font-size: 12px; }
-.parsed-warn { color: #e65100; font-size: 12px; margin-bottom: 6px; }
-.parsed-actions { display: flex; gap: 8px; justify-content: center; margin-top: 8px; }
 
 .editor-header { display: flex; align-items: center; gap: 10px; margin-bottom: 12px; }
 .editor-name-input { width: 100%; font-size: 17px; font-weight: 600; border: none; border-bottom: 2px solid #e5e4e7; padding: 6px 0; outline: none; font-family: inherit; background: transparent; color: #3e3a44; }

frontend/src/views/RecipeSearch.vue

@@ -175,6 +175,7 @@ import { useUiStore } from '../stores/ui'
 import { api } from '../composables/useApi'
 import RecipeCard from '../components/RecipeCard.vue'
 import RecipeDetailOverlay from '../components/RecipeDetailOverlay.vue'
+import { oilEn } from '../composables/useOilTranslation'
 
 const auth = useAuthStore()
 const oils = useOilsStore()
@@ -238,6 +239,8 @@ onMounted(async () => {
 
 function selectCategory(cat) {
   selectedCategory.value = cat.tag_name || cat.name
+  searchQuery.value = ''
+  reportedMissing.value = false
 }
 
 function slideCat(dir) {
@@ -313,11 +316,14 @@ function expandQuery(q) {
 const exactResults = computed(() => {
   if (!searchQuery.value.trim()) return []
   const q = searchQuery.value.trim().toLowerCase()
+  const isEn = /^[a-zA-Z\s]+$/.test(q)
   return recipeStore.recipes.filter(r => {
     const nameMatch = r.name.toLowerCase().includes(q)
+    const enNameMatch = isEn && (r.en_name || '').toLowerCase().includes(q)
+    const oilEnMatch = isEn && r.ingredients.some(ing => (oilEn(ing.oil) || '').toLowerCase().includes(q))
     const visibleTags = auth.canEdit ? (r.tags || []) : (r.tags || []).filter(t => !EDITOR_ONLY_TAGS.includes(t))
     const tagMatch = visibleTags.some(t => t.toLowerCase().includes(q))
-    return nameMatch || tagMatch
+    return nameMatch || enNameMatch || oilEnMatch || tagMatch
   }).sort((a, b) => a.name.localeCompare(b.name, 'zh'))
 })
 

frontend/src/views/UserManagement.vue

@@ -31,6 +31,7 @@
               <span class="review-name">{{ group.latest.display_name || group.latest.username }}</span>
               <span class="review-reason">商户名：{{ group.latest.business_name }}</span>
               <span class="biz-status-tag" :class="'biz-' + group.effectiveStatus">{{ { pending: '待审核', approved: '已通过', rejected: '已拒绝' }[group.effectiveStatus] }}</span>
+              <img v-if="group.latest.document && group.latest.document.startsWith('data:image')" :src="group.latest.document" class="biz-doc-preview" @click="showDocFull = group.latest.document" />
             </div>
             <div class="review-actions">
               <template v-if="group.effectiveStatus === 'pending'">
@@ -111,6 +112,11 @@
     </div>
 
     <div class="user-count">共 {{ users.length }} 个用户</div>
+
+    <!-- Full-size document preview -->
+    <div v-if="showDocFull" class="doc-overlay" @click="showDocFull = null">
+      <img :src="showDocFull" class="doc-full-img" />
+    </div>
   </div>
 </template>
 
@@ -128,6 +134,7 @@ const users = ref([])
 const searchQuery = ref('')
 const filterRole = ref('')
 const translations = ref([])
+const showDocFull = ref(null)
 const businessApps = ref([])
 import { reactive } from 'vue'
 
@@ -443,6 +450,10 @@ onMounted(() => {
 }
 .biz-reject-reason { color: #c62828; font-size: 11px; }
 .biz-time { color: #bbb; font-size: 11px; margin-left: auto; }
+.biz-doc-preview { width: 60px; height: 60px; object-fit: cover; border-radius: 6px; cursor: pointer; border: 1px solid #e5e4e7; margin-top: 6px; }
+.biz-doc-preview:hover { border-color: #7ec6a4; }
+.doc-overlay { position: fixed; inset: 0; background: rgba(0,0,0,0.7); z-index: 1000; display: flex; align-items: center; justify-content: center; cursor: pointer; }
+.doc-full-img { max-width: 90vw; max-height: 90vh; border-radius: 10px; }
 
 .btn-approve {
   background: #4a9d7e;

frontend/vite.config.js

@@ -10,8 +10,8 @@ export default defineConfig({
   plugins: [vue()],
   server: {
     proxy: {
-      '/api': 'http://localhost:8000',
+      '/api': `http://localhost:${process.env.VITE_API_PORT || 8000}`,
-      '/uploads': 'http://localhost:8000'
+      '/uploads': `http://localhost:${process.env.VITE_API_PORT || 8000}`
     }
   },
   build: {