6 changed files with 164 additions and 29 deletions
--- a/backend/main.py
+++ b/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}
--- a/frontend/src/components/RecipeCard.vue
+++ b/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;
--- a/frontend/src/composables/useSmartPaste.js
+++ b/frontend/src/composables/useSmartPaste.js
@@ -144,12 +144,16 @@ 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] || ''
@@ -164,7 +168,7 @@ 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 })
    } else {
@@ -177,9 +181,41 @@ export function parseOilChunk(text, oilNames) {
      }
    }
  }
+
+  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).
@@ -266,8 +302,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
--- a/frontend/src/views/AuditLog.vue
+++ b/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 = [
-  { value: 'recipe', label: '配方' },
-  { value: 'oil', label: '精油' },
-  { value: 'user', label: '用户' },
-  { value: 'tag', label: '标签' },
-  { value: 'adopt', label: '审核' },
-  { value: 'business', label: '商业认证' },
-]
+const actionGroups = {
+  '配方': ['share_recipe', 'adopt_recipe', 'update_recipe', 'delete_recipe', 'undo_delete_recipe'],
+  '审核': ['reject_recipe'],
+  '精油': ['upsert_oil', 'delete_oil', 'undo_delete_oil'],
+  '标签': ['create_tag', 'delete_tag'],
+  '用户': ['create_user', 'update_user', 'delete_user', 'undo_delete_user', 'register'],
+  '商业认证': ['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 {
--- a/frontend/src/views/RecipeManager.vue
+++ b/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()">
@@ -1303,6 +1305,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 +1324,10 @@ function diaryMatchesPublic(d) {
 }

 function getDiaryShareStatus(d) {
-  // Check pending (owned by user in public library, not yet adopted)
-  if (sharedCount.value.pendingNames.includes(d.name)) return 'pending'
-  // Check if public library has same recipe with same content
+  // Admin/senior_editor share directly — check public match first
  if (diaryMatchesPublic(d)) return 'shared'
-  // Check adopted names from audit log
-  if (sharedCount.value.adoptedNames.includes(d.name) && diaryMatchesPublic(d)) return 'shared'
+  // Non-admin: check pending (owned by user, not yet adopted)
+  if (!auth.isAdmin && !auth.canManage && sharedCount.value.pendingNames.includes(d.name)) return 'pending'
  return null
 }

@@ -1790,6 +1800,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 {
--- a/frontend/src/views/RecipeSearch.vue
+++ b/frontend/src/views/RecipeSearch.vue
@@ -239,6 +239,8 @@ onMounted(async () => {

 function selectCategory(cat) {
  selectedCategory.value = cat.tag_name || cat.name
+  searchQuery.value = ''
+  reportedMissing.value = false
 }

 function slideCat(dir) {