fix: 操作日志筛选覆盖所有操作类型

- 按分组筛选：配方/审核/精油/标签/用户/商业认证
- 每组包含所有相关action（含注册、恢复等）

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

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()
@@ -866,7 +868,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 +1040,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/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/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)
@@ -96,16 +101,19 @@ const ACTION_MAP = {
   reject_business: '拒绝商业认证',
   grant_business: '开通商业认证',
   revoke_business: '撤销商业认证',
+  register: '用户注册',
 }
 
-const actionTypes = [
+const actionGroups = {
-  { value: 'recipe', label: '配方' },
+  '配方': ['create_recipe', 'update_recipe', 'delete_recipe', 'undo_delete_recipe'],
-  { value: 'oil', label: '精油' },
+  '审核': ['adopt_recipe', '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)
@@ -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_user', '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>
@@ -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)
+  // 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
 }
 
@@ -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 {

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) {