fix: 新增配方去重+编辑者权限+共享去重统一
Some checks failed
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 4s
PR Preview / deploy-preview (pull_request) Successful in 15s
Test / e2e-test (push) Failing after 52s

新增去重:
- 新增配方保存前检查公共库和个人配方同名
- 完全相同提示已有,内容不同显示差异可改名

编辑者权限:
- editor可编辑所有公共配方(前端+后端)
- editor不能编辑精油价目(已有)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-04-10 20:12:10 +00:00
parent 480e843316
commit 6d2620eb6a
3 changed files with 35 additions and 7 deletions

View File

@@ -824,9 +824,7 @@ def _check_recipe_permission(conn, recipe_id, user):
row = conn.execute("SELECT owner_id, name FROM recipes WHERE id = ?", (recipe_id,)).fetchone() row = conn.execute("SELECT owner_id, name FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
if not row: if not row:
raise HTTPException(404, "Recipe not found") raise HTTPException(404, "Recipe not found")
if user["role"] in ("admin", "senior_editor"): if user["role"] in ("admin", "senior_editor", "editor"):
return row
if user["role"] in ("editor",) and row["owner_id"] == user.get("id"):
return row return row
raise HTTPException(403, "权限不足") raise HTTPException(403, "权限不足")

View File

@@ -73,10 +73,8 @@ export const useAuthStore = defineStore('auth', () => {
user.value = { ...DEFAULT_USER } user.value = { ...DEFAULT_USER }
} }
function canEditRecipe(recipe) { function canEditRecipe() {
if (isAdmin.value || user.value.role === 'senior_editor') return true return canEdit.value
if (canEdit.value && recipe._owner_id === user.value.id) return true
return false
} }
return { return {

View File

@@ -964,6 +964,38 @@ async function saveCurrentRecipe() {
tags: formTags.value, 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) { if (editingRecipe.value && editingRecipe.value._diary_id) {
// Editing an existing diary recipe // Editing an existing diary recipe
try { try {