feat: 活动日志撤销+详情+排版优化
All checks were successful
PR Preview / teardown-preview (pull_request) Has been skipped
Test / unit-test (push) Successful in 5s
Test / build-check (push) Successful in 4s
PR Preview / test (pull_request) Successful in 6s
PR Preview / deploy-preview (pull_request) Successful in 16s
Test / e2e-test (push) Successful in 50s
All checks were successful
PR Preview / teardown-preview (pull_request) Has been skipped
Test / unit-test (push) Successful in 5s
Test / build-check (push) Successful in 4s
PR Preview / test (pull_request) Successful in 6s
PR Preview / deploy-preview (pull_request) Successful in 16s
Test / e2e-test (push) Successful in 50s
活动日志: - 删除配方/用户/精油加撤销按钮 - 编辑配方记录修改了哪些字段(名称/成分/标签/备注/英文名) - 创建标签记入日志 - 注册记入日志(已有) 配方卡片: - 精油按字母排序 - 容量移到名字后面 - 标签对viewer不可见 - 管理配方标签排序+容量显示 其他: - 管理员共享直接显示已共享 - 点击轮播清除搜索 - 编辑overlay防误关 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -868,7 +868,17 @@ def update_recipe(recipe_id: int, update: RecipeUpdate, user=Depends(get_current
|
|||||||
(recipe_id, tag),
|
(recipe_id, tag),
|
||||||
)
|
)
|
||||||
c.execute("UPDATE recipes SET updated_by = ?, version = COALESCE(version, 1) + 1 WHERE id = ?", (user["id"], recipe_id))
|
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.commit()
|
||||||
conn.close()
|
conn.close()
|
||||||
return {"ok": True}
|
return {"ok": True}
|
||||||
@@ -1030,7 +1040,7 @@ def create_tag(body: dict, user=Depends(require_role("admin", "senior_editor", "
|
|||||||
raise HTTPException(400, "Tag name required")
|
raise HTTPException(400, "Tag name required")
|
||||||
conn = get_db()
|
conn = get_db()
|
||||||
conn.execute("INSERT OR IGNORE INTO tags (name) VALUES (?)", (name,))
|
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.commit()
|
||||||
conn.close()
|
conn.close()
|
||||||
return {"ok": True}
|
return {"ok": True}
|
||||||
|
|||||||
@@ -1,11 +1,10 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="recipe-card" @click="$emit('click', index)">
|
<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">
|
<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>
|
<span v-for="tag in visibleTags" :key="tag" class="tag" :class="{ 'tag-reviewed': tag === '已审核' }">{{ tag }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="recipe-card-oils">{{ oilNames }}</div>
|
<div class="recipe-card-oils">{{ oilNames }}</div>
|
||||||
<span v-if="volumeLabel" class="recipe-card-volume">{{ volumeLabel }}</span>
|
|
||||||
<div class="recipe-card-bottom">
|
<div class="recipe-card-bottom">
|
||||||
<div class="recipe-card-price">💰 {{ priceInfo.cost }}</div>
|
<div class="recipe-card-price">💰 {{ priceInfo.cost }}</div>
|
||||||
<button
|
<button
|
||||||
@@ -37,7 +36,8 @@ const auth = useAuthStore()
|
|||||||
|
|
||||||
const visibleTags = computed(() => {
|
const visibleTags = computed(() => {
|
||||||
if (!props.recipe.tags) return []
|
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'))
|
return tags.sort((a, b) => a.localeCompare(b, 'zh'))
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -112,8 +112,8 @@ const volumeLabel = computed(() => {
|
|||||||
.recipe-card-volume {
|
.recipe-card-volume {
|
||||||
font-size: 10px;
|
font-size: 10px;
|
||||||
color: #b0aab5;
|
color: #b0aab5;
|
||||||
display: block;
|
font-weight: 400;
|
||||||
margin-bottom: 4px;
|
margin-left: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.recipe-card-bottom {
|
.recipe-card-bottom {
|
||||||
|
|||||||
@@ -49,6 +49,7 @@
|
|||||||
<div class="log-detail">
|
<div class="log-detail">
|
||||||
<span v-if="log.target_name" class="log-target-name">{{ log.target_name }}</span>
|
<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>
|
<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>
|
</div>
|
||||||
<div v-if="filteredLogs.length === 0" class="empty-hint">暂无日志记录</div>
|
<div v-if="filteredLogs.length === 0" class="empty-hint">暂无日志记录</div>
|
||||||
@@ -66,6 +67,10 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import { ref, computed, onMounted } from 'vue'
|
import { ref, computed, onMounted } from 'vue'
|
||||||
import { api } from '../composables/useApi'
|
import { api } from '../composables/useApi'
|
||||||
|
import { showConfirm } from '../composables/useDialog'
|
||||||
|
import { useUiStore } from '../stores/ui'
|
||||||
|
|
||||||
|
const ui = useUiStore()
|
||||||
|
|
||||||
const logs = ref([])
|
const logs = ref([])
|
||||||
const loading = ref(false)
|
const loading = ref(false)
|
||||||
@@ -158,6 +163,7 @@ function parsedDetail(log) {
|
|||||||
if (d.from_user) parts.push(`来自: ${d.from_user}`)
|
if (d.from_user) parts.push(`来自: ${d.from_user}`)
|
||||||
if (d.reason) parts.push(`原因: ${d.reason}`)
|
if (d.reason) parts.push(`原因: ${d.reason}`)
|
||||||
if (d.business_name) parts.push(`商户: ${d.business_name}`)
|
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.display_name) parts.push(`显示名: ${d.display_name}`)
|
||||||
if (d.original_log_id) parts.push(`恢复自 #${d.original_log_id}`)
|
if (d.original_log_id) parts.push(`恢复自 #${d.original_log_id}`)
|
||||||
if (parts.length) return parts.join(' · ')
|
if (parts.length) return parts.join(' · ')
|
||||||
@@ -169,6 +175,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) {
|
function formatTime(t) {
|
||||||
if (!t) return ''
|
if (!t) return ''
|
||||||
return new Date(t + 'Z').toLocaleString('zh-CN', {
|
return new Date(t + 'Z').toLocaleString('zh-CN', {
|
||||||
@@ -236,6 +266,11 @@ onMounted(() => fetchLogs())
|
|||||||
.log-detail { font-size: 13px; color: #6b6375; margin-top: 2px; }
|
.log-detail { font-size: 13px; color: #6b6375; margin-top: 2px; }
|
||||||
.log-target-name { font-weight: 500; color: #3e3a44; margin-right: 8px; }
|
.log-target-name { font-weight: 500; color: #3e3a44; margin-right: 8px; }
|
||||||
.log-extra { color: #999; font-size: 12px; }
|
.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; }
|
.load-more { text-align: center; margin-top: 16px; }
|
||||||
.btn-outline {
|
.btn-outline {
|
||||||
|
|||||||
@@ -125,8 +125,9 @@
|
|||||||
/>
|
/>
|
||||||
<div class="row-info" @click="editDiaryRecipe(d)">
|
<div class="row-info" @click="editDiaryRecipe(d)">
|
||||||
<span class="row-name">{{ d.name }}</span>
|
<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 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>
|
||||||
<span class="row-cost">{{ oils.fmtPrice(oils.calcCost(d.ingredients || [])) }}</span>
|
<span class="row-cost">{{ oils.fmtPrice(oils.calcCost(d.ingredients || [])) }}</span>
|
||||||
<span v-if="getDiaryShareStatus(d) === 'shared'" class="share-tag shared">已共享</span>
|
<span v-if="getDiaryShareStatus(d) === 'shared'" class="share-tag shared">已共享</span>
|
||||||
@@ -164,8 +165,9 @@
|
|||||||
/>
|
/>
|
||||||
<div class="row-info" @click="editRecipe(r)">
|
<div class="row-info" @click="editRecipe(r)">
|
||||||
<span class="row-name">{{ r.name }}</span>
|
<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 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>
|
||||||
<span class="row-cost">{{ oils.fmtPrice(oils.calcCost(r.ingredients)) }}</span>
|
<span class="row-cost">{{ oils.fmtPrice(oils.calcCost(r.ingredients)) }}</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -1303,6 +1305,16 @@ function openRecipeDetail(recipe) {
|
|||||||
if (idx >= 0) previewRecipeIndex.value = idx
|
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) {
|
function diaryMatchesPublic(d) {
|
||||||
const pub = recipeStore.recipes.find(r => r.name === d.name)
|
const pub = recipeStore.recipes.find(r => r.name === d.name)
|
||||||
if (!pub) return false
|
if (!pub) return false
|
||||||
@@ -1788,6 +1800,7 @@ watch(() => recipeStore.recipes, () => {
|
|||||||
}
|
}
|
||||||
.share-tag.shared { background: #e8f5e9; color: #2e7d32; }
|
.share-tag.shared { background: #e8f5e9; color: #2e7d32; }
|
||||||
.share-tag.pending { background: #fff3e0; color: #e65100; }
|
.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-history { max-height: 300px; overflow-y: auto; }
|
||||||
.review-log-item {
|
.review-log-item {
|
||||||
|
|||||||
@@ -239,6 +239,8 @@ onMounted(async () => {
|
|||||||
|
|
||||||
function selectCategory(cat) {
|
function selectCategory(cat) {
|
||||||
selectedCategory.value = cat.tag_name || cat.name
|
selectedCategory.value = cat.tag_name || cat.name
|
||||||
|
searchQuery.value = ''
|
||||||
|
reportedMissing.value = false
|
||||||
}
|
}
|
||||||
|
|
||||||
function slideCat(dir) {
|
function slideCat(dir) {
|
||||||
|
|||||||
Reference in New Issue
Block a user