ZaiZai 3 months ago
parent
commit
a6e7f5f400
1 changed files with 16 additions and 3 deletions
  1. 16 3
      src/views/project/list/edit-formula.vue

+ 16 - 3
src/views/project/list/edit-formula.vue

@@ -1159,7 +1159,7 @@ const handWritClick = () => {
     try {
         let { text, eleMap } = formulaArrayToString(processFormula.value, resultFormula.value)
         handWritText.value = text
-        handWritEleMap.value = eleMap
+        handWritEleMap.value = JSON.stringify(eleMap)
         isHandWritEle.value = true
     } catch (error) {
         console.log(error)
@@ -1169,13 +1169,26 @@ const handWritClick = () => {
 
 //手写模式转换
 const handWritTransform = () => {
-
-    handWritEleClose()
+    try {
+        let formula = formulaStringToArray(handWritText.value, handWritEleMap.value, formulaMenuMap.value)
+        processFormula.value = getArrValue(formula.processFormula)
+        const results = resultFormula.value
+        formula.resultFormula[0].id = results[0].id
+        formula.resultFormula[0].name = results[0].name
+        formula.resultFormula[0].tableElementKey = results[0].tableElementKey
+        resultFormula.value[0].children = formula.resultFormula[0].children
+        handWritEleClose()
+    } catch (error) {
+        console.log(error)
+        window?.$message.error('转成配置用的数组失败')
+    }
 }
 
 //手写模式关闭
 const handWritEleClose = () => {
     isHandWritEle.value = false
+    handWritText.value = ''
+    handWritEleMap.value = {}
 }
 
 //保存