fix: 保存配方卡片所有英文翻译(含精油名称)
Some checks failed
Test / unit-test (push) Successful in 7s
Test / build-check (push) Successful in 3s
Test / e2e-test (push) Failing after 1m19s
PR Preview / test (pull_request) Has been skipped
PR Preview / teardown-preview (pull_request) Successful in 14s
PR Preview / deploy-preview (pull_request) Has been skipped

之前保存翻译时只保存了配方名的 en_name,精油的自定义英文名
(customOilNameEn)没有持久化,刷新后丢失。

- backend: recipes 表新增 en_oils(JSON 字符串)列
- RecipeUpdate 模型增加 en_oils 字段,update_recipe 写入 DB
- 所有 SELECT 语句补上 en_oils,_recipe_to_dict 返回该字段
- frontend: applyTranslation() 同时提交 en_oils
- onMounted 优先从 r.en_oils 还原精油译名,再 fallback 静态表
- recipes store 映射 en_oils 字段

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-04-08 19:57:52 +00:00
committed by Hera Zhao
parent dcf516f2de
commit 42aefaab17
4 changed files with 19 additions and 10 deletions

View File

@@ -240,6 +240,8 @@ def init_db():
c.execute("ALTER TABLE recipes ADD COLUMN updated_by INTEGER") c.execute("ALTER TABLE recipes ADD COLUMN updated_by INTEGER")
if "en_name" not in cols: if "en_name" not in cols:
c.execute("ALTER TABLE recipes ADD COLUMN en_name TEXT DEFAULT ''") c.execute("ALTER TABLE recipes ADD COLUMN en_name TEXT DEFAULT ''")
if "en_oils" not in cols:
c.execute("ALTER TABLE recipes ADD COLUMN en_oils TEXT DEFAULT '{}'")
# Seed admin user if no users exist # Seed admin user if no users exist
count = c.execute("SELECT COUNT(*) FROM users").fetchone()[0] count = c.execute("SELECT COUNT(*) FROM users").fetchone()[0]

View File

@@ -96,6 +96,7 @@ class RecipeIn(BaseModel):
class RecipeUpdate(BaseModel): class RecipeUpdate(BaseModel):
name: Optional[str] = None name: Optional[str] = None
en_name: Optional[str] = None en_name: Optional[str] = None
en_oils: Optional[str] = None
note: Optional[str] = None note: Optional[str] = None
ingredients: Optional[list[IngredientIn]] = None ingredients: Optional[list[IngredientIn]] = None
tags: Optional[list[str]] = None tags: Optional[list[str]] = None
@@ -309,7 +310,7 @@ def symptom_search(body: dict, user=Depends(get_current_user)):
conn = get_db() conn = get_db()
# Search in recipe names # Search in recipe names
rows = conn.execute( rows = conn.execute(
"SELECT id, name, note, owner_id, version, en_name FROM recipes ORDER BY id" "SELECT id, name, note, owner_id, version, en_name, en_oils FROM recipes ORDER BY id"
).fetchall() ).fetchall()
exact = [] exact = []
related = [] related = []
@@ -698,6 +699,7 @@ def _recipe_to_dict(conn, row):
"id": rid, "id": rid,
"name": row["name"], "name": row["name"],
"en_name": row["en_name"] if "en_name" in row.keys() else "", "en_name": row["en_name"] if "en_name" in row.keys() else "",
"en_oils": row["en_oils"] if "en_oils" in row.keys() else "{}",
"note": row["note"], "note": row["note"],
"owner_id": row["owner_id"], "owner_id": row["owner_id"],
"owner_name": (owner["display_name"] or owner["username"]) if owner else None, "owner_name": (owner["display_name"] or owner["username"]) if owner else None,
@@ -712,19 +714,19 @@ def list_recipes(user=Depends(get_current_user)):
conn = get_db() conn = get_db()
# Admin sees all; others see admin-owned (adopted) + their own # Admin sees all; others see admin-owned (adopted) + their own
if user["role"] == "admin": if user["role"] == "admin":
rows = conn.execute("SELECT id, name, note, owner_id, version, en_name FROM recipes ORDER BY id").fetchall() rows = conn.execute("SELECT id, name, note, owner_id, version, en_name, en_oils FROM recipes ORDER BY id").fetchall()
else: else:
admin = conn.execute("SELECT id FROM users WHERE role = 'admin' LIMIT 1").fetchone() admin = conn.execute("SELECT id FROM users WHERE role = 'admin' LIMIT 1").fetchone()
admin_id = admin["id"] if admin else 1 admin_id = admin["id"] if admin else 1
user_id = user.get("id") user_id = user.get("id")
if user_id: if user_id:
rows = conn.execute( rows = conn.execute(
"SELECT id, name, note, owner_id, version, en_name FROM recipes WHERE owner_id = ? OR owner_id = ? ORDER BY id", "SELECT id, name, note, owner_id, version, en_name, en_oils FROM recipes WHERE owner_id = ? OR owner_id = ? ORDER BY id",
(admin_id, user_id) (admin_id, user_id)
).fetchall() ).fetchall()
else: else:
rows = conn.execute( rows = conn.execute(
"SELECT id, name, note, owner_id, version, en_name FROM recipes WHERE owner_id = ? ORDER BY id", "SELECT id, name, note, owner_id, version, en_name, en_oils FROM recipes WHERE owner_id = ? ORDER BY id",
(admin_id,) (admin_id,)
).fetchall() ).fetchall()
result = [_recipe_to_dict(conn, r) for r in rows] result = [_recipe_to_dict(conn, r) for r in rows]
@@ -735,7 +737,7 @@ def list_recipes(user=Depends(get_current_user)):
@app.get("/api/recipes/{recipe_id}") @app.get("/api/recipes/{recipe_id}")
def get_recipe(recipe_id: int): def get_recipe(recipe_id: int):
conn = get_db() conn = get_db()
row = conn.execute("SELECT id, name, note, owner_id, version, en_name FROM recipes WHERE id = ?", (recipe_id,)).fetchone() row = conn.execute("SELECT id, name, note, owner_id, version, en_name, en_oils FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
if not row: if not row:
conn.close() conn.close()
raise HTTPException(404, "Recipe not found") raise HTTPException(404, "Recipe not found")
@@ -808,6 +810,8 @@ def update_recipe(recipe_id: int, update: RecipeUpdate, user=Depends(get_current
c.execute("UPDATE recipes SET note = ? WHERE id = ?", (update.note, recipe_id)) c.execute("UPDATE recipes SET note = ? WHERE id = ?", (update.note, recipe_id))
if update.en_name is not None: if update.en_name is not None:
c.execute("UPDATE recipes SET en_name = ? WHERE id = ?", (update.en_name, recipe_id)) c.execute("UPDATE recipes SET en_name = ? WHERE id = ?", (update.en_name, recipe_id))
if update.en_oils is not None:
c.execute("UPDATE recipes SET en_oils = ? WHERE id = ?", (update.en_oils, recipe_id))
if update.ingredients is not None: if update.ingredients is not None:
c.execute("DELETE FROM recipe_ingredients WHERE recipe_id = ?", (recipe_id,)) c.execute("DELETE FROM recipe_ingredients WHERE recipe_id = ?", (recipe_id,))
for ing in update.ingredients: for ing in update.ingredients:
@@ -837,7 +841,7 @@ def delete_recipe(recipe_id: int, user=Depends(get_current_user)):
conn = get_db() conn = get_db()
row = _check_recipe_permission(conn, recipe_id, user) row = _check_recipe_permission(conn, recipe_id, user)
# Save full snapshot for undo # Save full snapshot for undo
full = conn.execute("SELECT id, name, note, owner_id, version, en_name FROM recipes WHERE id = ?", (recipe_id,)).fetchone() full = conn.execute("SELECT id, name, note, owner_id, version, en_name, en_oils FROM recipes WHERE id = ?", (recipe_id,)).fetchone()
snapshot = _recipe_to_dict(conn, full) snapshot = _recipe_to_dict(conn, full)
log_audit(conn, user["id"], "delete_recipe", "recipe", recipe_id, row["name"], log_audit(conn, user["id"], "delete_recipe", "recipe", recipe_id, row["name"],
json.dumps(snapshot, ensure_ascii=False)) json.dumps(snapshot, ensure_ascii=False))
@@ -1340,7 +1344,7 @@ def recipes_by_inventory(user=Depends(get_current_user)):
if not inv: if not inv:
conn.close() conn.close()
return [] return []
rows = conn.execute("SELECT id, name, note, owner_id, version, en_name FROM recipes ORDER BY id").fetchall() rows = conn.execute("SELECT id, name, note, owner_id, version, en_name, en_oils FROM recipes ORDER BY id").fetchall()
result = [] result = []
for r in rows: for r in rows:
recipe = _recipe_to_dict(conn, r) recipe = _recipe_to_dict(conn, r)

View File

@@ -576,11 +576,12 @@ function copyText() {
async function applyTranslation() { async function applyTranslation() {
showTranslationEditor.value = false showTranslationEditor.value = false
// Persist en_name to backend // Persist en_name and en_oils to backend
if (recipe.value._id && customRecipeNameEn.value) { if (recipe.value._id) {
try { try {
await api.put(`/api/recipes/${recipe.value._id}`, { await api.put(`/api/recipes/${recipe.value._id}`, {
en_name: customRecipeNameEn.value, en_name: customRecipeNameEn.value,
en_oils: JSON.stringify(customOilNameEn.value),
version: recipe.value._version, version: recipe.value._version,
}) })
ui.showToast('翻译已保存') ui.showToast('翻译已保存')
@@ -708,9 +709,10 @@ onMounted(() => {
editIngredients.value = (r.ingredients || []).map(i => ({ oil: i.oil, drops: i.drops })) editIngredients.value = (r.ingredients || []).map(i => ({ oil: i.oil, drops: i.drops }))
// Init translation defaults // Init translation defaults
customRecipeNameEn.value = r.en_name || recipeNameEn(r.name) customRecipeNameEn.value = r.en_name || recipeNameEn(r.name)
const savedOilMap = r.en_oils ? (() => { try { return JSON.parse(r.en_oils) } catch { return {} } })() : {}
const enMap = {} const enMap = {}
;(r.ingredients || []).forEach(ing => { ;(r.ingredients || []).forEach(ing => {
enMap[ing.oil] = oilEn(ing.oil) || ing.oil enMap[ing.oil] = savedOilMap[ing.oil] || oilEn(ing.oil) || ing.oil
}) })
customOilNameEn.value = enMap customOilNameEn.value = enMap

View File

@@ -17,6 +17,7 @@ export const useRecipesStore = defineStore('recipes', () => {
_version: r._version ?? r.version ?? 1, _version: r._version ?? r.version ?? 1,
name: r.name, name: r.name,
en_name: r.en_name ?? '', en_name: r.en_name ?? '',
en_oils: r.en_oils ?? '{}',
note: r.note ?? '', note: r.note ?? '',
tags: r.tags ?? [], tags: r.tags ?? [],
ingredients: (r.ingredients ?? []).map((ing) => ({ ingredients: (r.ingredients ?? []).map((ing) => ({