From 26902d3ba9be2524ee9ff48cda5cb0b5434a8eef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=A2=A6=E8=BF=9C?= <1063331231@qq.com>
Date: Sun, 6 Jul 2025 23:54:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=AF=92=E9=BB=98=E8=AE=A4=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=9B=B4=E6=94=B9=E5=90=8C=E6=AD=A5=E5=88=B0=E6=B6=88?=
 =?UTF-8?q?=E6=AF=92=E6=89=A7=E8=A1=8C=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/formula/HomeFormulaConfig.vue    | 9 +++------
 src/components/formula/SettingFormulaConfig.vue | 4 ++--
 src/stores/formulaStore.ts                      | 9 ++++++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/formula/HomeFormulaConfig.vue b/src/components/formula/HomeFormulaConfig.vue
index 6daffba..2be3f73 100644
--- a/src/components/formula/HomeFormulaConfig.vue
+++ b/src/components/formula/HomeFormulaConfig.vue
@@ -1,8 +1,9 @@
 <script lang="ts" setup>
 import { formulaNameMap } from 'libs/constant'
+import { cloneDeep } from 'lodash'
 import { inject, onMounted, ref, watchEffect } from 'vue'
 
-import { convertValuesToInt, convertValuesToString } from '@/libs/utils'
+import { convertValuesToString } from '@/libs/utils'
 import { useFormulaStore } from '@/stores/formulaStore'
 
 const formulaStore = useFormulaStore()
@@ -18,7 +19,6 @@ const getFormData = () => {
  */
 const registerGrandsonMethods = inject<(methods: any) => void>('registerGrandsonMethods', () => {})
 onMounted(() => {
-  formulaStore.initFormulaList()
   registerGrandsonMethods && registerGrandsonMethods({ getFormData })
 })
 /**
@@ -34,10 +34,7 @@ const labelUnitMap: Record<string, any> = formulaStore.labelUnitMap
  * 监听事件
  */
 watchEffect(() => {
-  formData.value
-    = formulaStore.selectedFormulaInfo !== null
-      ? convertValuesToInt(formulaStore.selectedFormulaInfo as Record<string, any>)
-      : convertValuesToInt(formulaStore.defaultFormulaInfo as Record<string, any>)
+  formData.value = cloneDeep(formulaStore.selectedFormulaInfo)
 })
 /**
  * 配方配置列表
diff --git a/src/components/formula/SettingFormulaConfig.vue b/src/components/formula/SettingFormulaConfig.vue
index 1ae3dc2..56a7b78 100644
--- a/src/components/formula/SettingFormulaConfig.vue
+++ b/src/components/formula/SettingFormulaConfig.vue
@@ -45,13 +45,13 @@ const settingFormRef = ref()
  * 根据不同的type属性值执行不同的保存逻辑
  */
 const handleSubmit = () => {
-  settingFormRef.value.validate((valid: any) => {
+  settingFormRef.value.validate(async (valid: any) => {
     if (valid) {
       // 修改默认值
       const diff = compareJSON(formulaStore.defaultFormulaInfo, formData.value)
       const diffKeys = Object.keys(diff)
       if (diffKeys.length) {
-        Promise.all(
+        await Promise.all(
           diffKeys.map(async (key) => {
             await formulaStore.setSettingFormulaConfig(key, diff[key].newVal || diff[key].obj2)
           }),
diff --git a/src/stores/formulaStore.ts b/src/stores/formulaStore.ts
index a097d8a..dc2a432 100644
--- a/src/stores/formulaStore.ts
+++ b/src/stores/formulaStore.ts
@@ -58,7 +58,7 @@ export const useFormulaStore = defineStore('formula', () => {
   // const resetFormulaInfo = ref<Formula.FormulaItem>(createResetFormulaInfo())
   const pressurOptionList = ref<string[]>(['10%', '20%', '30%', '40%', '50%', '60%', '70%', '80%', '90%', '100%'])
   const currentSelectedFormulaInfo = ref<Formula.FormulaItem>(cloneDeep(defaultFormulaInfo.value)) // 当前列表选中的配方信息
-  const selectedFormulaInfo = ref<Formula.FormulaItem | null>(cloneDeep(defaultFormulaInfo.value)) // 选中执行的配方信息
+  const selectedFormulaInfo = ref<Formula.FormulaItem | null>(defaultFormulaInfo.value) // 选中执行的配方信息
   const formulaConfigList = ref<Formula.FormulaConfig[]>([])
   const formulaList = ref<Formula.FormulaItem[]>([])
   const loglevel = ref<string>('1')
@@ -113,6 +113,9 @@ export const useFormulaStore = defineStore('formula', () => {
     // const visibleConfig = data.filter(item => item.is_visible_in_formula_page)
     formulaConfigList.value = data
     defaultFormulaInfo.value = mapConfigToFormula(data)
+    if (!selectedFormulaInfo.value?.name) {
+      selectedFormulaInfo.value = defaultFormulaInfo.value
+    }
   }
 
   const getFormualDefaultData = async () => {
@@ -236,7 +239,7 @@ export const useFormulaStore = defineStore('formula', () => {
    * @desc 初始化配方数据，重置为默认配方
    */
   const initFormulaData = () => {
-    selectedFormulaInfo.value = cloneDeep(defaultFormulaInfo.value)
+    selectedFormulaInfo.value = defaultFormulaInfo.value
     resetToDefaultFormula()
   }
 
@@ -245,7 +248,7 @@ export const useFormulaStore = defineStore('formula', () => {
    * @desc 重置为默认配方
    */
   const resetToDefaultFormula = () => {
-    currentSelectedFormulaInfo.value = cloneDeep(defaultFormulaInfo.value)
+    // currentSelectedFormulaInfo.value = cloneDeep(defaultFormulaInfo.value)
   }
 
   /**