Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/rule/rule/version.vue

src/api/quest/task.js

@@ -50,3 +50,12 @@ export function execute(taskCode) {
     method: 'post'
   })
 }
+
+// 测试执行
+export function testExecute(data) {
+  return request({
+    url: '/quest/task/testExecute',
+    method: 'post',
+    data: data
+  })
+}

src/views/quest/node/Home.vue

@@ -3,10 +3,14 @@
     <div class="nodes-wrap" align="center">
       <el-button
         style="width: 75%;margin-top: 5px;margin-bottom: 5px;"
-        type="primary" @click="save">保存修改</el-button>
+        type="primary" @click="save">保存</el-button>
+      <el-button
+        style="width: 75%;margin-left: 0;margin-top: 5px;margin-bottom: 5px;"
+        type="info" @click="test">测试</el-button>
       <el-button
         style="width: 75%;margin-left: 0;margin-bottom: 5px;"
         @click="returnBack">返回</el-button>
+
       <div>
         <el-divider content-position="left">基础</el-divider>
         <div v-for="item in nodeTypeList.filter(node => node.partition === 'basis')" :key="item.type" class="node" draggable="true" @dragstart="drag($event, item)">
@@ -60,6 +64,7 @@ import {batch, listNode} from "../../../api/quest/node";
 import {GenNonDuplicateID} from "../../../common/until";
 import panzoom from "panzoom";
 import methods from "./config/methods";
+import {execute, testExecute} from "../../../api/quest/task";
 
 export default {
   name: "FlowEdit",
@@ -181,13 +186,13 @@ export default {
       });
       return Array.from(map.values());
     },
-    // 保存修改按钮
+    /** 参数处理 */
-    save() {
+    handleSubmit() {
       // 1. 获取所有节点与连线信息
       const nodeList = this.data.nodeList
       const lineList = this.lineHandle(this.data.lineList)
-      this.checkData.nodeList = nodeList
+      this.checkData.nodeList = this.data.nodeList
-      this.checkData.lineList = lineList
+      this.checkData.lineList = this.data.lineList
 
       console.log(this.data)
       // 2. 处理所有信息,将jsPlumb类型 ==> 数据表类型
@@ -209,11 +214,22 @@ export default {
         })
         nodeData.push(flowNode.methods.toMysqlNode(node,preLine,nextLine,this.taskCode))
       })
-      // 3. 激活接口将参数传递到后端
+      return nodeData;
+    },
+    // 测试按钮
+    test() {
+      const nodeData = this.handleSubmit();
+      testExecute(nodeData).then(res => {
+        this.$message.success(res.data)
+      })
+    },
+    // 保存按钮
+    save() {
+      const nodeData = this.handleSubmit();
+      // 激活接口将参数保存到数据库
       batch(nodeData,this.$route.query.taskCode).then(res => {
         this.$message.success(res.msg)
       })
-      console.log(nodeData)
     },
     // 返回校验
     returnBack() {

src/views/source/index.vue

@@ -178,14 +178,12 @@
         <el-form-item label="最大等待次数" prop="maxWaitSize">
           <el-input v-model="form.maxWaitSize" placeholder="请输入最大等待次数" />
         </el-form-item>
+        <el-form-item label="驱动" prop="driverName">
+          <el-input v-model="form.driverName" placeholder="请输入驱动名称" />
+        </el-form-item>
         <el-form-item label="是否初始化" prop="isInit">
-<!--          <el-input v-model="form.isInit" placeholder="请输入是否初始化" />-->
           <el-radio v-model="form.isInit" label="Y">是</el-radio>
           <el-radio v-model="form.isInit" label="N">否</el-radio>
-<!--          <el-radio-group v-model="form.isInit">-->
-<!--            <el-radio label="Y"></el-radio>-->
-<!--            <el-radio label="N"></el-radio>-->
-<!--          </el-radio-group>-->
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入是否初始化" />
@@ -285,6 +283,7 @@ export default {
         maxNum: null,
         maxWaitTime: null,
         maxWaitSize: null,
+        driverName: null,
         createBy: null,
         createTime: null,
         updateBy: null,