fix: 编辑配方时正确识别容量和稀释比例
Some checks failed
PR Preview / teardown-preview (pull_request) Has been skipped
Test / unit-test (push) Successful in 4s
Test / build-check (push) Successful in 3s
PR Preview / test (pull_request) Successful in 4s
PR Preview / deploy-preview (pull_request) Successful in 14s
Test / e2e-test (push) Failing after 52s
Some checks failed
PR Preview / teardown-preview (pull_request) Has been skipped
Test / unit-test (push) Successful in 4s
Test / build-check (push) Successful in 3s
PR Preview / test (pull_request) Successful in 4s
PR Preview / deploy-preview (pull_request) Successful in 14s
Test / e2e-test (push) Failing after 52s
- 补充15ml/20ml的容量匹配 - 稀释比例取最近的可选值(3-20) - 自定义时显示ml而非drops - 无椰子油时默认单次模式 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -738,17 +738,33 @@ function calcDilutionFromIngs(ingredients) {
|
|||||||
const eoDrops = ings.filter(i => i.oil && i.oil !== '椰子油').reduce((s, i) => s + (i.drops || 0), 0)
|
const eoDrops = ings.filter(i => i.oil && i.oil !== '椰子油').reduce((s, i) => s + (i.drops || 0), 0)
|
||||||
const cocoDrops = coco ? (coco.drops || 0) : 0
|
const cocoDrops = coco ? (coco.drops || 0) : 0
|
||||||
const totalDrops = eoDrops + cocoDrops
|
const totalDrops = eoDrops + cocoDrops
|
||||||
|
|
||||||
|
// Set dilution ratio
|
||||||
if (eoDrops > 0 && cocoDrops > 0) {
|
if (eoDrops > 0 && cocoDrops > 0) {
|
||||||
formDilution.value = Math.round(cocoDrops / eoDrops)
|
const ratio = Math.round(cocoDrops / eoDrops)
|
||||||
|
// Clamp to available options
|
||||||
|
const options = [3,4,5,6,7,8,9,10,12,15,20]
|
||||||
|
formDilution.value = options.reduce((prev, curr) => Math.abs(curr - ratio) < Math.abs(prev - ratio) ? curr : prev)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Set coconut drops for single mode
|
||||||
|
if (coco) {
|
||||||
|
formCocoRow.value.drops = cocoDrops
|
||||||
|
}
|
||||||
|
|
||||||
// Guess volume
|
// Guess volume
|
||||||
const DROPS_PER_ML = 18.6
|
if (!coco || cocoDrops === 0) {
|
||||||
|
formVolume.value = 'single'
|
||||||
|
} else {
|
||||||
const ml = totalDrops / DROPS_PER_ML
|
const ml = totalDrops / DROPS_PER_ML
|
||||||
if (ml <= 1.5) formVolume.value = 'single'
|
if (ml <= 2) formVolume.value = 'single'
|
||||||
else if (Math.abs(ml - 5) < 1.5) formVolume.value = '5'
|
else if (Math.abs(ml - 5) < 1.5) formVolume.value = '5'
|
||||||
else if (Math.abs(ml - 10) < 3) formVolume.value = '10'
|
else if (Math.abs(ml - 10) < 2.5) formVolume.value = '10'
|
||||||
else if (Math.abs(ml - 30) < 8) formVolume.value = '30'
|
else if (Math.abs(ml - 15) < 2.5) formVolume.value = '15'
|
||||||
else { formVolume.value = 'custom'; formCustomVolume.value = Math.round(totalDrops); formCustomUnit.value = 'drops' }
|
else if (Math.abs(ml - 20) < 3) formVolume.value = '20'
|
||||||
|
else if (Math.abs(ml - 30) < 6) formVolume.value = '30'
|
||||||
|
else { formVolume.value = 'custom'; formCustomVolume.value = Math.round(ml) }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function editRecipe(recipe) {
|
function editRecipe(recipe) {
|
||||||
|
|||||||
Reference in New Issue
Block a user