diff --git a/src/components/formula/HomeFormulaConfig.vue b/src/components/formula/HomeFormulaConfig.vue index 8f37f85..1fed4e5 100644 --- a/src/components/formula/HomeFormulaConfig.vue +++ b/src/components/formula/HomeFormulaConfig.vue @@ -5,9 +5,6 @@ import { inject, onMounted, ref, watchEffect } from 'vue' import { convertValuesToInt, convertValuesToString } from '@/libs/utils' import { useFormulaStore } from '@/stores/formulaStore' -const props = defineProps<{ - formulaNameVisible: boolean -}>() const formulaStore = useFormulaStore() /** * 获取当前表单数据,将值转换为字符串格式 @@ -36,25 +33,13 @@ const labelUnitMap: Record = formulaStore.labelUnitMap * 监听事件 */ watchEffect(() => { - formData.value = formulaStore.selectedFormulaInfo !== null ? convertValuesToInt(formulaStore.selectedFormulaInfo) : convertValuesToInt(formulaStore.defaultFormulaInfo) + formData.value = formulaStore.selectedFormulaInfo !== null ? convertValuesToInt(formulaStore.selectedFormulaInfo) : convertValuesToInt(formulaStore.defaultFormulaInfo as Record) }) /** * 配方配置列表 */ const formulaConfigList = formulaStore.formulaConfigList const size = 'default' -const validatePass = (rule: any, value: any, callback: any, config: Formula.FormulaConfig) => { - if (!value && value !== 0 && value !== '0') { - callback(new Error('此为必填项')) - } - else if (config.val_type === 'int' || config.val_type === 'float') { - const temp = Number(value) - if (temp < config.val_lower_limit || temp > config.val_upper_limit) { - callback(new Error(`输入范围为${config.val_lower_limit}-${config.val_upper_limit}`)) - } - } - callback() -}