diff --git a/src/components/common/FTKeyboard/index.vue b/src/components/common/FTInput/index.vue similarity index 96% rename from src/components/common/FTKeyboard/index.vue rename to src/components/common/FTInput/index.vue index 8d60f01..d237730 100644 --- a/src/components/common/FTKeyboard/index.vue +++ b/src/components/common/FTInput/index.vue @@ -19,11 +19,6 @@ const props = defineProps({ type: Number, default: 2, }, - // 获取焦点打开键盘 - isOpen: { - type: Boolean, - default: true, - }, }) const emits = defineEmits(['onChange', 'enter', 'close', 'focus']) const deviceStore = useDeviceStore() @@ -64,25 +59,18 @@ const open = () => { const focusInput = (e: any) => { const rect = e.target.getBoundingClientRect() - console.log('元素位置信息:', { - top: rect.top + window.scrollY, - left: rect.left + window.scrollX, - width: rect.width, - height: rect.height, - }) if (rect.top + window.scrollY > 800) { placement.value = 'top' } else { placement.value = 'bottom' } - console.log(rect) if (visible.value) return - emits('focus') if (deviceType.value !== deviceStore.deviceTypeMap.LargeSpaceDM_B) visible.value = true } +emits('focus') // const blurInput = debounce(() => { // if (!entering.value) { diff --git a/src/components/formula/FormulaConfig.vue b/src/components/formula/FormulaConfig.vue index aba56eb..1911cb3 100644 --- a/src/components/formula/FormulaConfig.vue +++ b/src/components/formula/FormulaConfig.vue @@ -105,43 +105,46 @@ watch( }, { deep: true }, ) -const formRef = ref(null) +const formRef = ref() /** * 处理表单提交 * 根据不同的type属性值执行不同的保存逻辑 */ -const handleSubmit = () => { +const handleSubmit = async () => { // 表单验证 - if (formData.value.name === '') { - FtMessage.warning('请输入配方名称') - return - } - if (formData.value.name && formData.value.name.length > 20) { - FtMessage.warning('配方名称1-20字符') - return - } - if (formData.value.formula_id) { // 修改配方 - // 判断消毒是否正在执行 且正在执行配方是当前修改配方 - if (!deviceState.value && formulaStore.selectedFormulaInfo?.formula_id === formData.value.formula_id) { - ElMessage.warning('禁止修改正在执行的配方信息!') + try { + const valid = await formRef.value.validate() + if (!valid) { return } - const formulaForm: Record = convertValuesToString(formData.value, 'name') - formulaStore.editFormula(formulaForm.formula_id, formulaForm as Formula.FormulaItem) - } - else { // 新增配方 - formulaStore.onAddFormula().then((res) => { - if (res.ackcode === 0) { - const item = res.rely - const formulaForm: Record = convertValuesToString(formData.value, 'name') - formulaForm.formula_id = item.formula_id - formulaStore.editFormula(item.formula_id, formulaForm as Formula.FormulaItem).then(() => { - FtMessage.success('操作成功') - formulaStore.initFormulaList() - }) + if (formData.value.formula_id) { + // 修改配方 + // 判断消毒是否正在执行 且正在执行配方是当前修改配方 + if (!deviceState.value && formulaStore.selectedFormulaInfo?.formula_id === formData.value.formula_id) { + ElMessage.warning('禁止修改正在执行的配方信息!') + return } - }) + const formulaForm: Record = convertValuesToString(formData.value, 'name') + formulaStore.editFormula(formulaForm.formula_id, formulaForm as Formula.FormulaItem) + } + else { + // 新增配方 + formulaStore.onAddFormula().then((res) => { + if (res.ackcode === 0) { + const item = res.rely + const formulaForm: Record = convertValuesToString(formData.value, 'name') + formulaForm.formula_id = item.formula_id + formulaStore.editFormula(item.formula_id, formulaForm as Formula.FormulaItem).then(() => { + FtMessage.success('操作成功') + formulaStore.initFormulaList() + }) + } + }) + } + } + catch (e) { + console.log(e) } } /** @@ -192,16 +195,12 @@ const validatePass = (rule: any, value: any, callback: any, config: Formula.Form