审批流优化

admin/src/components/flow/Approver.vue

@@ -172,7 +172,7 @@ export default {
                         basicSetting: res[0].formData,
                         flowFormData: res[1].formData,
                         flowProcessData: res[2].formData,
-                        flowProcessTreeData: res[2].TreeNode
+                        flowProcessDataList: res[2].treeToList
 
                         // advancedSetting: getCmpData("advancedSetting"),
                     }

admin/src/components/flow/XForm/view.vue

@@ -19,8 +19,8 @@
 
         <template #footer>
             <span class="dialog-footer">
-                <el-button @click="dialogVisible = false">Cancel</el-button>
-                <el-button type="primary" @click="getData"> Confirm </el-button>
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="getData"> 确定 </el-button>
             </span>
         </template>
     </el-dialog>

admin/src/components/flow/flowEdit/Diagram.vue

@@ -228,9 +228,23 @@ export default {
                     return newArr
                 }
                 const TreeNode = handel(findStartNode, 0)
+
+                // tree转list
+                function treeToList(tree) {
+                    const arr = []
+                    tree.forEach((item) => {
+                        arr.push(item)
+                        if (item.children) {
+                            arr.push(...treeToList(item.children))
+                        }
+                    })
+                    return arr
+                }
+
                 console.log('TreeNode', TreeNode)
+                console.log('treeToList', treeToList(TreeNode))
                 // 检查连线方向是否正确;
-                resolve({ formData: data, TreeNode })
+                resolve({ formData: data, treeToList: treeToList(TreeNode) })
             })
         }
     }