From 60102643ae35e2541a2aaef0c172be3d26fd420a Mon Sep 17 00:00:00 2001
From: chentaisen <14615430+chentaisen@user.noreply.gitee.com>
Date: Thu, 29 Aug 2024 22:04:15 +0800
Subject: [PATCH 01/13] Changes

---
 src/views/rule/rule/version.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index 2e039ba..0f30d5d 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -32,7 +32,6 @@
     </el-form>
 
 
-
     {{ rule.name }}
     <el-descriptions class="margin-top" :column="3" border>
       <template slot="extra">
@@ -226,7 +225,7 @@
 
     <!-- 添加或修改规则对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
-      <el-button type="primary" @click="generate">生成版本类</el-button>
+      <el-button type="primary" @click="generate" style="margin-bottom:20px;">生成版本类</el-button>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="版本类" prop="ruleKind">
           <el-input v-model="form.ruleKind" placeholder="请输入版本类"/>
@@ -319,7 +318,7 @@ export default {
   data() {
     return {
 
-      curCode: '测试',
+      curCode: '测23456789asdad试',
       cmOptions: {
         lineNumbers: true, // 显示行号
         mode: 'text/x-yaml', // 语法model
@@ -398,6 +397,10 @@ export default {
     this.findById();
   },
   methods: {
+    //生成版本类
+    generate() {
+
+    },
     //版本card
     findList() {
       getEditionList(this.ruleAndVersion.id).then(res => {
@@ -485,7 +488,8 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.open = true;2
+      this.open = true;
+      2
       this.form.ruleId = this.ruleAndVersion.id
       this.title = "添加规则";
     },

From b386d873e632aaf448bd30517fc2771fd55f5702 Mon Sep 17 00:00:00 2001
From: chentaisen <14615430+chentaisen@user.noreply.gitee.com>
Date: Thu, 29 Aug 2024 22:04:51 +0800
Subject: [PATCH 02/13] Changes

---
 src/views/rule/rule/version.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index 0f30d5d..8d12e09 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -327,6 +327,7 @@ export default {
         lint: true, // 开启语法检查
       },
 
+
       ruleAndEditionList: [],
       //版本
       ruleAndEdition: {},

From beca5cc501644041ca2a80a8fed351a62e7f5bd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Fri, 30 Aug 2024 09:43:07 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E6=8B=86=E5=88=86=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8A=9F=E8=83=BD,=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quest/disposition.js                  |  53 ++++
 src/api/quest/param.js                        |  53 ----
 src/views/quest/node/components/node-item.vue | 266 +++---------------
 .../node/components/node/type-exportation.vue |  59 ++++
 .../node/components/node/type-table-upd.vue   |  99 +++++++
 .../quest/node/components/node/type-table.vue |  68 +++++
 .../node/components/node/type/tableFind.vue   |  51 ++++
 .../node/components/node/type/tableUpd.vue    | 148 ++++++++++
 src/views/quest/node/config/methods.js        |   9 +-
 9 files changed, 529 insertions(+), 277 deletions(-)
 create mode 100644 src/api/quest/disposition.js
 delete mode 100644 src/api/quest/param.js
 create mode 100644 src/views/quest/node/components/node/type-exportation.vue
 create mode 100644 src/views/quest/node/components/node/type-table-upd.vue
 create mode 100644 src/views/quest/node/components/node/type-table.vue
 create mode 100644 src/views/quest/node/components/node/type/tableFind.vue
 create mode 100644 src/views/quest/node/components/node/type/tableUpd.vue

diff --git a/src/api/quest/disposition.js b/src/api/quest/disposition.js
new file mode 100644
index 0000000..d26092a
--- /dev/null
+++ b/src/api/quest/disposition.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询节点配置列表
+export function listDisposition(query) {
+  return request({
+    url: '/quest/disposition/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询节点配置详细
+export function getDisposition(id) {
+  return request({
+    url: '/quest/disposition/' + id,
+    method: 'get'
+  })
+}
+
+
+// 新增节点配置
+export function addDisposition(data) {
+  return request({
+    url: '/quest/disposition',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改节点配置
+export function updateDisposition(data) {
+  return request({
+    url: '/quest/disposition',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除节点配置
+export function delDisposition(id) {
+  return request({
+    url: '/quest/disposition/' + id,
+    method: 'delete'
+  })
+}
+// 批量操作节点配置
+export function batchAddUpd(data,nodeCode) {
+  return request({
+    url: '/quest/disposition/batch/'+nodeCode,
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/api/quest/param.js b/src/api/quest/param.js
deleted file mode 100644
index 2dfe3a1..0000000
--- a/src/api/quest/param.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import request from '@/utils/request'
-
-// 查询节点参数列表
-export function listParam(query) {
-  return request({
-    url: '/quest/param/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询节点参数详细
-export function getParam(id) {
-  return request({
-    url: '/quest/param/' + id,
-    method: 'get'
-  })
-}
-
-// 新增节点参数
-export function addParam(data) {
-  return request({
-    url: '/quest/param',
-    method: 'post',
-    data: data
-  })
-}
-
-// 批量新增
-export function batchAdd(data) {
-  return request({
-    url: '/quest/param/batchAdd',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改节点参数
-export function updateParam(data) {
-  return request({
-    url: '/quest/param',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除节点参数
-export function delParam(id) {
-  return request({
-    url: '/quest/param/' + id,
-    method: 'delete'
-  })
-}
diff --git a/src/views/quest/node/components/node-item.vue b/src/views/quest/node/components/node-item.vue
index 653cd87..7cc65ea 100644
--- a/src/views/quest/node/components/node-item.vue
+++ b/src/views/quest/node/components/node-item.vue
@@ -17,90 +17,9 @@
     <div class="node-anchor anchor-right" v-show="mouseEnter"></div>
     <div class="node-anchor anchor-bottom" v-show="mouseEnter"></div>
     <div class="node-anchor anchor-left" v-show="mouseEnter"></div>
-    <!-- 节点配置-->
     <div align="center">
-      <el-drawer
-        :visible.sync="disposition.findFlag"
-        direction="rtl"
-        title="配置信息"
-        append-to-body
-        size="60%">
-        <div style="padding-left: 10px;padding-right: 10px;">
-          <h5>数据库:&nbsp;&nbsp;{{ disposition.formData.dbName }}</h5>
-          <br>
-          <h5>数据表:&nbsp;&nbsp;{{ disposition.formData.table }}</h5>
-          <span>
-          <el-table ref="table" :data="disposition.formData.fields" height="300px">
-            <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="columnName" />
-            <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="columnComment" />
-            <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="columnType" />
-          </el-table>
-        </span>
-          <br><br>
-          <div align="center">
-            <el-button @click="disposition.findFlag = false">确认</el-button>
-            <el-button type="primary" @click="editDisposition">修改配置</el-button>
-          </div>
-        </div>
-      </el-drawer>
-      <!-- 自定义表单对话框 -->
-      <el-drawer
-        :modal="false"
-        :visible.sync="disposition.updFlag"
-        direction="rtl"
-        title="节点配置"
-        append-to-body
-        size="60%">
-        <div style="padding-left: 10px;padding-right: 10px;">
-          <el-form ref="queryForm" :inline="true" :model="queryParams" size="small">
-            <el-form-item label="数据库名称" prop="dbName">
-              <el-select v-model="queryParams.dbName" placeholder="请选择数据库" clearable @change="handleQuery">
-                <el-option v-for="item in dbNameOptions" :key="item" :label="item" :value="item"/>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="表名称" prop="tableName">
-              <el-input
-                v-model="queryParams.tableName"
-                clearable
-                @change="handleQuery"
-                placeholder="请输入表名称" />
-            </el-form-item>
-            <el-form-item label="表描述" prop="tableComment">
-              <el-input
-                v-model="queryParams.tableComment"
-                clearable
-                @change="handleQuery"
-                placeholder="请输入表描述" />
-            </el-form-item>
-            <el-form-item>
-              <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">查找</el-button>
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-          <el-table ref="table" :data="tableOptions" height="300px">
-            <el-table-column :show-overflow-tooltip="true" label="表名称" prop="tableName" />
-            <el-table-column :show-overflow-tooltip="true" label="表描述" prop="tableComment" />
-            <el-table-column label="操作" width="50px">
-              <template slot-scope="scope">
-                <el-button type="text" @click="selectTable(scope.row)">选择</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <el-divider content-position="left">选择字段 v</el-divider>
-        <el-table ref="table" v-show="fieldsOptions" :data="fieldsOptions" height="300px"
-                  @row-click="clickRow" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" />
-          <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="columnName" />
-          <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="columnComment" />
-          <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="columnType" />
-        </el-table>
-        <el-divider />
-        <div align="center">
-          <el-button type="primary" @click="saveDisposition">确 定</el-button>
-          <el-button @click="disposition.updFlag = false">取 消</el-button>
-        </div>
-      </el-drawer>
+      <TypeTable :node="node" :disp="disp" />
+      <TypeTableUpd :node="node" :disp="disp" />
     </div>
   </div>
 </template>
@@ -108,9 +27,18 @@
 <script>
 import ClickOutside from 'vue-click-outside'
 import Home from '../Home.vue'
-import {listDbTableAll, selDbNameAll, selectDbTableColumnsByName} from "../../../../api/tool/gen";
+import {listDbTableAll, selDbNameAll, selectDbTableColumnsByName} from "@/api/tool/gen";
+import {listDisposition} from "@/api/quest/disposition";
+import TypeTable from "./node/type-table.vue";
+import TypeTableUpd from "./node/type-table-upd.vue";
+
+
 export default {
   name: "nodeItem",
+  components: {
+    TypeTable,
+    TypeTableUpd,
+  },
   props: {
     node: Object
   },
@@ -133,32 +61,16 @@ export default {
       mouseEnter: false,
       isActive: false,
       isSelected: false,
-      disposition: {
+      disp: {
+        nodeCode: undefined,
+        nodeType: undefined,
         findFlag: false,
         updFlag: false,
         formData: {
-          nodeId: undefined,
-          dbName: undefined,
-          table: {},
+          db: {},
           fields: []
         }
-      },
-      total: 0,
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        dbName: undefined,
-        tableName: undefined,
-        tableComment: undefined
-      },
-      // 数据库列表
-      dbNameOptions: [],
-      // 展示数据表列表
-      tableOptions: [],
-      // 所有数据库列表
-      tableList: [],
-      // 字段列表
-      fieldsOptions: []
+      }
     };
   },
   methods: {
@@ -168,6 +80,7 @@ export default {
     hideAnchor() {
       this.mouseEnter = false
     },
+    // 右击菜单
     onContextmenu() {
       this.$contextmenu({
         items: [
@@ -183,7 +96,7 @@ export default {
             disabled: false,
             icon: "",
             onClick: () => {
-              this.disposition.updFlag = true;
+              this.disp.type.findFlag = true;
             }
           },{
             label: '删除节点',
@@ -259,6 +172,15 @@ export default {
         });
       });
     },
+    // 双击触发-查看配置
+    findDisposition() {
+      // 查询节点配置信息
+      this.disp.nodeCode = this.node.id
+      this.disp.findFlag = true
+      listDisposition({nodeCode: this.node.id}).then(res => {
+        this.disp.formData = this.getVueDisp(res.data.rows)
+      })
+    },
     /** jsPlumb节点类型 --> 数据库节点类型 */
     toMysqlNode(node,preLine,nextLine,taskCode){
       return {
@@ -304,122 +226,26 @@ export default {
         line: line
       }
     },
-    // 双击触发-查看配置
-    findDisposition() {
-      // 查询节点配置信息
-      this.disposition.formData.nodeId = this.node.id
-      this.disposition.findFlag = true
-    },
-    // 编辑配置
-    editDisposition() {
-      this.selDbNameList()
-      this.getListAll()
-      this.disposition.updFlag = true
-    },
-    // 查询所有数据库名称
-    selDbNameList() {
-      selDbNameAll().then(res => {
-        this.dbNameOptions = res.data
-      })
-    },
-    // 查询表字段
-    getFields(dbName, tableName) {
-      selectDbTableColumnsByName(dbName, tableName).then(res => {
-        this.fieldsOptions = res.data
-      })
-    },
-    // 保存配置按钮
-    saveDisposition() {
-      const dispositionData = this.disposition.formData
-      const addData = []
-      /**
-       * {
-       *   key: '',
-       *   name: '',
-       *   type: ''
-       *   value: ''
-       * }
-       */
-      // // 处理数据库信息
-      // addData.push({
-      //   nodeCode: dispositionData.nodeId,
-      //   atom: {
-      //     key: 'dbName',
-      //     name: '数据库名称',
-      //     type: 'String',
-      //     value: dispositionData.dbName
-      //   }
-      // })
-      // // 处理数据表信息
-      // addData.push({
-      //   nodeCode: dispositionData.nodeId,
-      //   atom: {
-      //     key: 'typeName',
-      //     name: '数据表名称',
-      //     type: 'String',
-      //     value: dispositionData.dbName
-      //   }
-      // })
-      // addData.push({
-      //   key: dispositionData.nodeId,
-      //   name: '数据表名称',
-      //   type: 'String',
-      //   value: dispositionData.table
-      // })
-      // // 处理数据字段信息
-      //   addData.push({
-      //     nodeInfoCode: dispositionData.nodeId,
-      //     nodeType: 'fields',
-      //     nodeValue: dispositionData.fields
-      // })
-      // console.log(addData)
-      this.disposition.updFlag = false
-      this.disposition.findFlag = false
-
-    },
-    getListAll() {
-      listDbTableAll().then(res => {
-        this.tableList = res.data;
-        this.tableOptions = res.data;
-      });
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.tableOptions = []
-      this.tableList.forEach(table => {
-        const params = this.queryParams
-        if ((table.dbName === params.dbName || !params.dbName) &&
-          (table.tableName.includes(params.tableName) || !params.tableName) &&
-          (table.tableComment.includes(params.tableComment) || !params.tableComment)){
-          this.tableOptions.push(table)
+    /** 类型转换 mysql -> vue */
+    getVueDisp(dispList) {
+      const db = {
+        dbName: dispList.find(disp => disp.dispKey === 'db').dispValue,
+        tableName: dispList.find(disp => disp.dispKey === 'table').dispValue,
+        tableComment: dispList.find(disp => disp.dispKey === 'table').dispLabel
+      }
+      const fields = []
+      dispList.forEach(disp => {
+        if (disp.dispKey === 'fields'){
+          fields.push({
+            fieldName: disp.dispValue,
+            fieldType: disp.dispType,
+            fieldComment: disp.dispLabel
+          })
         }
       })
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 选择表信息*/
-    selectTable(row) {
-      this.disposition.formData.table = row.tableName
-      this.disposition.formData.dbName = row.dbName
-      this.getFields(row.dbName, row.tableName)
-    },
-    clickRow(row) {
-      this.$refs.table.toggleRowSelection(row);
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.disposition.formData.fields = selection.map(item => {
-        return {
-          fieldName: item.columnName,
-          fieldType: item.columnType,
-          fieldComment: item.columnComment
-        };
-      });
-    },
-  }
+      return {db, fields}
+    }
+  },
 };
 </script>
 
diff --git a/src/views/quest/node/components/node/type-exportation.vue b/src/views/quest/node/components/node/type-exportation.vue
new file mode 100644
index 0000000..1361888
--- /dev/null
+++ b/src/views/quest/node/components/node/type-exportation.vue
@@ -0,0 +1,59 @@
+<template>
+  <div>
+    <el-drawer title="节点配置" :visible.sync="disp.type.findFlag" direction="rtl" size="50%">
+      <el-table ref="table" :data="disp.formData.fields" height="300px">
+        <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="fieldName" />
+        <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="fieldComment" />
+        <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="fieldType" />
+        <el-table-column :show-overflow-tooltip="true" label="所属数据表">
+          <template slot-scope="scope">
+
+          </template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="true" label="所属数据库">
+          <template slot-scope="scope">
+
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+// 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
+// 例如：import 《组件名称》 from '《组件路径》,
+export default {
+  // import引入的组件需要注入到对象中才能使用"
+  name: 'type-exportation',
+  props: {
+    disp: {
+      nodeCode: undefined,
+      nodeType: undefined,
+      type:{
+        typeName: '',
+        findFlag: false,
+        updFlag: false,
+      },
+      formData: {
+        db: {},
+        fields: []
+      }
+    }
+  },
+  data() {
+    // 这里存放数据"
+    return {}
+  },
+  // 计算属性 类似于data概念",
+  computed: {},
+  // 生命周期 - 创建完成（可以访问当前this实例）",
+  created() {
+  },
+  // 方法集合",
+  methods: {}
+}
+</script>
+<style scoped>
+
+</style>
diff --git a/src/views/quest/node/components/node/type-table-upd.vue b/src/views/quest/node/components/node/type-table-upd.vue
new file mode 100644
index 0000000..daec97a
--- /dev/null
+++ b/src/views/quest/node/components/node/type-table-upd.vue
@@ -0,0 +1,99 @@
+<template>
+  <!-- 修改节点配置-->
+  <div align="center">
+    <!-- 自定义表单对话框 -->
+    <el-drawer :modal="false" :visible.sync="disp.updFlag" direction="rtl" title="节点配置" append-to-body size="60%">
+      <div align="center">
+
+        <span v-if="node.type === 'table'">
+          <TableUpd :disp="disp" />
+        </span>
+
+        <br><br>
+        <el-button type="primary" @click="saveDisposition">确 定</el-button>
+        <el-button @click="disp.updFlag = false">取 消</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+// 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
+// 例如：import 《组件名称》 from '《组件路径》,
+import TableUpd from './type/tableUpd.vue'
+import {selectDbTableColumnsByName, listDbTableAll, selDbNameAll} from "@/api/tool/gen";
+import {batchAddUpd} from "@/api/quest/disposition";
+
+export default {
+  // import引入的组件需要注入到对象中才能使用"
+  name: 'type-table',
+  components: {TableUpd},
+  props: {
+    node: {},
+    disp: {
+      nodeCode: undefined,
+      nodeType: undefined,
+      findFlag: false,
+      updFlag: false,
+      formData: {
+        db: {},
+        fields: []
+      }
+    },
+
+  },
+  data() {
+    // 这里存放数据"
+    return {
+
+    }
+  },
+  // 计算属性 类似于data概念",
+  computed: {},
+  // 方法集合",
+  methods: {
+    // 保存配置按钮
+    saveDisposition() {
+      const dispData = this.disp.formData
+      const dispList = this.getMysqlDisp(dispData.db,dispData.fields)
+      console.log(dispData)
+      console.log(dispList)
+      batchAddUpd(dispList, this.disp.nodeCode).then(res => {
+        this.$message.success(res.msg)
+        this.disp.updFlag = false
+      })
+    },
+    /** 类型转换 vue -> mysql*/
+    getMysqlDisp(db, fields) {
+      const dispList = []
+      dispList.push({
+        nodeCode: this.disp.nodeCode,
+        dispKey: 'db',
+        dispLabel: '数据库',
+        dispValue: db.dbName,
+        dispType: 'string'
+      },{
+        nodeCode: this.disp.nodeCode,
+        dispKey: 'table',
+        dispLabel: db.tableComment,
+        dispValue: db.tableName,
+        dispType: 'string'
+      })
+      fields.forEach(field => {
+        dispList.push({
+          nodeCode: this.disp.nodeCode,
+          dispKey: 'fields',
+          dispLabel: field.fieldComment,
+          dispValue: field.fieldName,
+          dispType: field.fieldType
+        })
+      })
+      return dispList;
+    },
+
+  }
+}
+</script>
+<style scoped>
+
+</style>
diff --git a/src/views/quest/node/components/node/type-table.vue b/src/views/quest/node/components/node/type-table.vue
new file mode 100644
index 0000000..7581e24
--- /dev/null
+++ b/src/views/quest/node/components/node/type-table.vue
@@ -0,0 +1,68 @@
+<template>
+  <!-- 节点配置-->
+  <div align="center">
+    <el-drawer :visible.sync="disp.findFlag" direction="rtl" title="配置信息" append-to-body size="60%">
+      {{ node }}
+      <div style="padding-left: 20px;padding-right: 20px;">
+
+        <span v-if="node.type === 'table'">
+          <TableFind :disp="disp" />
+        </span>
+
+        <br><br>
+        <div align="center">
+          <el-button @click="disp.findFlag = false">确认</el-button>
+          <el-button type="primary" @click="editDisposition">修改配置</el-button>
+        </div>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+// 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
+// 例如：import 《组件名称》 from '《组件路径》,
+import TableFind from './type/tableFind.vue'
+import TableUpd from "./type/tableUpd.vue";
+
+
+export default {
+  // import引入的组件需要注入到对象中才能使用"
+  name: 'type-table',
+  components: {TableUpd, TableFind},
+  props: {
+    node: {},
+    disp: {
+      nodeCode: undefined,
+      nodeType: undefined,
+      findFlag: false,
+      updFlag: false,
+      formData: {
+        db: {},
+        fields: []
+      }
+    }
+  },
+  data() {
+    // 这里存放数据"
+    return {
+      xx: ''
+    }
+  },
+  // 计算属性 类似于data概念",
+  computed: {},
+  // 生命周期 - 创建完成（可以访问当前this实例）",
+  created() {
+
+  },
+  // 方法集合",
+  methods: {
+    editDisposition() {
+      this.disp.updFlag = true
+    },
+  }
+}
+</script>
+<style scoped>
+
+</style>
diff --git a/src/views/quest/node/components/node/type/tableFind.vue b/src/views/quest/node/components/node/type/tableFind.vue
new file mode 100644
index 0000000..e66b296
--- /dev/null
+++ b/src/views/quest/node/components/node/type/tableFind.vue
@@ -0,0 +1,51 @@
+<template>
+  <div>
+    <h5>数据库:&nbsp;&nbsp;{{ disp.formData.db.dbName }}</h5>
+    <br>
+    <h5>数据表:&nbsp;&nbsp;{{ disp.formData.db.tableName }}</h5>
+    <span>
+          <el-table ref="table" :data="disp.formData.fields" height="300px">
+            <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="fieldName" />
+            <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="fieldComment" />
+            <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="fieldType" />
+          </el-table>
+      </span>
+  </div>
+</template>
+
+<script>
+// 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
+// 例如：import 《组件名称》 from '《组件路径》,
+export default {
+  // import引入的组件需要注入到对象中才能使用"
+  name: 'tableFind',
+  props: {
+    disp: {
+      nodeCode: undefined,
+      nodeType: undefined,
+      findFlag: false,
+      updFlag: false,
+      formData: {
+        db: {},
+        fields: []
+      }
+    }
+  },
+  data() {
+    // 这里存放数据"
+    return {
+
+    }
+  },
+  // 计算属性 类似于data概念",
+  computed: {},
+  // 生命周期 - 创建完成（可以访问当前this实例）",
+  created() {
+  },
+  // 方法集合",
+  methods: {}
+}
+</script>
+<style scoped>
+
+</style>
diff --git a/src/views/quest/node/components/node/type/tableUpd.vue b/src/views/quest/node/components/node/type/tableUpd.vue
new file mode 100644
index 0000000..5c3b9d5
--- /dev/null
+++ b/src/views/quest/node/components/node/type/tableUpd.vue
@@ -0,0 +1,148 @@
+<template>
+  <div>
+    <div style="padding-left: 10px;padding-right: 10px;">
+      <el-form ref="queryForm" :inline="true" :model="queryParams" size="small">
+        <el-form-item label="数据库名称" prop="dbName">
+          <el-select v-model="queryParams.dbName" placeholder="请选择数据库" clearable @change="handleQuery">
+            <el-option v-for="item in dbNameOptions" :key="item" :label="item" :value="item"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="表名称" prop="tableName">
+          <el-input
+            v-model="queryParams.tableName"
+            clearable
+            @change="handleQuery"
+            placeholder="请输入表名称" />
+        </el-form-item>
+        <el-form-item label="表描述" prop="tableComment">
+          <el-input
+            v-model="queryParams.tableComment"
+            clearable
+            @change="handleQuery"
+            placeholder="请输入表描述" />
+        </el-form-item>
+        <el-form-item>
+          <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">查找</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table ref="table" :data="tableOptions" height="300px">
+        <el-table-column :show-overflow-tooltip="true" label="表名称" prop="tableName" />
+        <el-table-column :show-overflow-tooltip="true" label="表描述" prop="tableComment" />
+        <el-table-column label="操作" width="50px">
+          <template slot-scope="scope">
+            <el-button type="text" @click="selectTable(scope.row)">选择</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-divider content-position="left">选择字段 v</el-divider>
+      <el-table ref="table" :data="fieldsOptions" height="300px"
+                @row-click="clickRow" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" />
+        <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="columnName" />
+        <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="columnComment" />
+        <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="columnType" />
+      </el-table>
+    </div>
+  </div>
+</template>
+
+<script>
+// 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
+// 例如：import 《组件名称》 from '《组件路径》,
+import {listDbTableAll, selDbNameAll, selectDbTableColumnsByName} from "@/api/tool/gen";
+
+export default {
+  // import引入的组件需要注入到对象中才能使用"
+  name: 'tableUpd',
+  props: {
+    disp: {
+      nodeCode: undefined,
+      nodeType: undefined,
+      findFlag: false,
+      updFlag: false,
+      formData: {
+        db: {},
+        fields: []
+      }
+    }
+  },
+  data() {
+    // 这里存放数据"
+    return {
+      // 数据库列表
+      dbNameOptions: [],
+      // 展示数据表列表
+      tableOptions: [],
+      // 字段列表
+      fieldsOptions: [],
+      // 所有数据库列表
+      tableList: [],
+      queryParams: {}
+    }
+  },
+  // 计算属性 类似于data概念",
+  computed: {},
+  // 生命周期 - 创建完成（可以访问当前this实例）",
+  created() {
+    this.selDbNameList()
+    this.getListAll()
+  },
+  // 方法集合",
+  methods: {
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.tableOptions = []
+      this.tableList.forEach(table => {
+        const params = this.queryParams
+        if ((table.dbName === params.dbName || !params.dbName) &&
+          (table.tableName.includes(params.tableName) || !params.tableName) &&
+          (table.tableComment.includes(params.tableComment) || !params.tableComment)){
+          this.tableOptions.push(table)
+        }
+      })
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 表字段查询*/
+    selectTable(row) {
+      this.disp.formData.db = row
+      selectDbTableColumnsByName(row.dbName, row.tableName).then(res => {
+        this.fieldsOptions = res.data
+      })
+    },
+    clickRow(row) {
+      this.$refs.table.toggleRowSelection(row);
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.disp.formData.fields = selection.map(item => {
+        return {
+          fieldName: item.columnName,
+          fieldType: item.columnType,
+          fieldComment: item.columnComment
+        };
+      });
+    },
+    // 查询所有数据库名称
+    selDbNameList() {
+      selDbNameAll().then(res => {
+        this.dbNameOptions = res.data
+      })
+    },
+    // 查询所有表名称信息
+    getListAll() {
+      listDbTableAll().then(res => {
+        this.tableList = res.data;
+        this.tableOptions = res.data;
+      });
+    },
+  }
+}
+</script>
+<style scoped>
+
+</style>
diff --git a/src/views/quest/node/config/methods.js b/src/views/quest/node/config/methods.js
index 1390fa9..3f6454b 100644
--- a/src/views/quest/node/config/methods.js
+++ b/src/views/quest/node/config/methods.js
@@ -1,7 +1,6 @@
 import panzoom from "panzoom";
-import { GenNonDuplicateID } from "@/common/until";
+import {GenNonDuplicateID} from "@/common/until";
 import item from "../components/node-item"
-import Home from "../Home.vue"
 
 const methods = {
   init() {
@@ -10,8 +9,10 @@ const methods = {
       this.jsPlumb.importDefaults(this.jsplumbSetting);
       //完成连线前的校验
       this.jsPlumb.bind("beforeDrop", evt => {
-        let res = () => { } //此处可以添加是否创建连接的校验， 返回 false 则不添加；
-        return res
+         //此处可以添加是否创建连接的校验， 返回 false 则不添加；
+        return () => {
+          console.log(evt)
+        }
       })
       //断开连线后，维护本地数据
       this.jsPlumb.bind("connectionDetached", evt => {

From 1ddc02252b635be059ff5117b69eb790bf0fe801 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Fri, 30 Aug 2024 09:48:52 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quest/node/components/node-item.vue | 12 ++--
 .../node/{type-table.vue => dispFind.vue}     |  0
 .../node/{type-table-upd.vue => dispUpd.vue}  |  0
 .../node/components/node/type-exportation.vue | 59 -------------------
 4 files changed, 6 insertions(+), 65 deletions(-)
 rename src/views/quest/node/components/node/{type-table.vue => dispFind.vue} (100%)
 rename src/views/quest/node/components/node/{type-table-upd.vue => dispUpd.vue} (100%)
 delete mode 100644 src/views/quest/node/components/node/type-exportation.vue

diff --git a/src/views/quest/node/components/node-item.vue b/src/views/quest/node/components/node-item.vue
index 7cc65ea..9bf2b02 100644
--- a/src/views/quest/node/components/node-item.vue
+++ b/src/views/quest/node/components/node-item.vue
@@ -18,8 +18,8 @@
     <div class="node-anchor anchor-bottom" v-show="mouseEnter"></div>
     <div class="node-anchor anchor-left" v-show="mouseEnter"></div>
     <div align="center">
-      <TypeTable :node="node" :disp="disp" />
-      <TypeTableUpd :node="node" :disp="disp" />
+      <DispFind :node="node" :disp="disp" />
+      <DispUpd :node="node" :disp="disp" />
     </div>
   </div>
 </template>
@@ -29,15 +29,15 @@ import ClickOutside from 'vue-click-outside'
 import Home from '../Home.vue'
 import {listDbTableAll, selDbNameAll, selectDbTableColumnsByName} from "@/api/tool/gen";
 import {listDisposition} from "@/api/quest/disposition";
-import TypeTable from "./node/type-table.vue";
-import TypeTableUpd from "./node/type-table-upd.vue";
+import DispFind from "./node/dispFind.vue";
+import DispUpd from "./node/dispUpd.vue";
 
 
 export default {
   name: "nodeItem",
   components: {
-    TypeTable,
-    TypeTableUpd,
+    DispFind,
+    DispUpd,
   },
   props: {
     node: Object
diff --git a/src/views/quest/node/components/node/type-table.vue b/src/views/quest/node/components/node/dispFind.vue
similarity index 100%
rename from src/views/quest/node/components/node/type-table.vue
rename to src/views/quest/node/components/node/dispFind.vue
diff --git a/src/views/quest/node/components/node/type-table-upd.vue b/src/views/quest/node/components/node/dispUpd.vue
similarity index 100%
rename from src/views/quest/node/components/node/type-table-upd.vue
rename to src/views/quest/node/components/node/dispUpd.vue
diff --git a/src/views/quest/node/components/node/type-exportation.vue b/src/views/quest/node/components/node/type-exportation.vue
deleted file mode 100644
index 1361888..0000000
--- a/src/views/quest/node/components/node/type-exportation.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-<template>
-  <div>
-    <el-drawer title="节点配置" :visible.sync="disp.type.findFlag" direction="rtl" size="50%">
-      <el-table ref="table" :data="disp.formData.fields" height="300px">
-        <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="fieldName" />
-        <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="fieldComment" />
-        <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="fieldType" />
-        <el-table-column :show-overflow-tooltip="true" label="所属数据表">
-          <template slot-scope="scope">
-
-          </template>
-        </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" label="所属数据库">
-          <template slot-scope="scope">
-
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-drawer>
-  </div>
-</template>
-
-<script>
-// 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
-// 例如：import 《组件名称》 from '《组件路径》,
-export default {
-  // import引入的组件需要注入到对象中才能使用"
-  name: 'type-exportation',
-  props: {
-    disp: {
-      nodeCode: undefined,
-      nodeType: undefined,
-      type:{
-        typeName: '',
-        findFlag: false,
-        updFlag: false,
-      },
-      formData: {
-        db: {},
-        fields: []
-      }
-    }
-  },
-  data() {
-    // 这里存放数据"
-    return {}
-  },
-  // 计算属性 类似于data概念",
-  computed: {},
-  // 生命周期 - 创建完成（可以访问当前this实例）",
-  created() {
-  },
-  // 方法集合",
-  methods: {}
-}
-</script>
-<style scoped>
-
-</style>

From fcfa05f98a6e64cb6c0eef4c7968efe05c510b11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Fri, 30 Aug 2024 11:03:18 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quest/node/Home.vue                 |   4 +-
 src/views/quest/node/components/node-item.vue |  75 ++++++++---
 .../quest/node/components/node/dispFind.vue   |   8 +-
 .../quest/node/components/node/dispUpd.vue    |   8 +-
 .../node/components/node/type/exporFind.vue   | 119 ++++++++++++++++++
 .../node/components/node/type/exporUpd.vue    |  42 +++++++
 .../node/components/node/type/tableUpd.vue    |   9 +-
 7 files changed, 240 insertions(+), 25 deletions(-)
 create mode 100644 src/views/quest/node/components/node/type/exporFind.vue
 create mode 100644 src/views/quest/node/components/node/type/exporUpd.vue

diff --git a/src/views/quest/node/Home.vue b/src/views/quest/node/Home.vue
index dbd2c04..84b3b5e 100644
--- a/src/views/quest/node/Home.vue
+++ b/src/views/quest/node/Home.vue
@@ -20,7 +20,7 @@
       <div id="flow">
         <div v-show="auxiliaryLine.isShowXLine" class="auxiliary-line-x" :style="{width: auxiliaryLinePos.width, top:auxiliaryLinePos.y + 'px', left: auxiliaryLinePos.offsetX + 'px'}" />
         <div v-show="auxiliaryLine.isShowYLine" class="auxiliary-line-y" :style="{height: auxiliaryLinePos.height, left:auxiliaryLinePos.x + 'px', top: auxiliaryLinePos.offsetY + 'px'}" />
-        <flowNode v-for="item in data.nodeList" :id="item.id" :key="item.id" :node="item" @setNodeName="setNodeName" @deleteNode = "deleteNode" @changeLineState="changeLineState" />
+        <flowNode v-for="item in data.nodeList" :id="item.id" :key="item.id" :node="item" :data="data" @setNodeName="setNodeName" @deleteNode = "deleteNode" @changeLineState="changeLineState" />
       </div>
     </div>
 
@@ -85,7 +85,7 @@ export default {
     this.$nextTick(() => {
       setTimeout(() => {
         this.init()
-      },1000)
+      },1500)
     });
   },
   methods: {
diff --git a/src/views/quest/node/components/node-item.vue b/src/views/quest/node/components/node-item.vue
index 9bf2b02..f7654b4 100644
--- a/src/views/quest/node/components/node-item.vue
+++ b/src/views/quest/node/components/node-item.vue
@@ -18,8 +18,8 @@
     <div class="node-anchor anchor-bottom" v-show="mouseEnter"></div>
     <div class="node-anchor anchor-left" v-show="mouseEnter"></div>
     <div align="center">
-      <DispFind :node="node" :disp="disp" />
-      <DispUpd :node="node" :disp="disp" />
+      <DispFind :data="data" :node="node" :disp="disp" />
+      <DispUpd :data="data" :node="node" :disp="disp" />
     </div>
   </div>
 </template>
@@ -40,6 +40,7 @@ export default {
     DispUpd,
   },
   props: {
+    data: {},
     node: Object
   },
   directives: {
@@ -228,21 +229,63 @@ export default {
     },
     /** 类型转换 mysql -> vue */
     getVueDisp(dispList) {
-      const db = {
-        dbName: dispList.find(disp => disp.dispKey === 'db').dispValue,
-        tableName: dispList.find(disp => disp.dispKey === 'table').dispValue,
-        tableComment: dispList.find(disp => disp.dispKey === 'table').dispLabel
-      }
+      let type = this.node.type
+      const db = {}
       const fields = []
-      dispList.forEach(disp => {
-        if (disp.dispKey === 'fields'){
-          fields.push({
-            fieldName: disp.dispValue,
-            fieldType: disp.dispType,
-            fieldComment: disp.dispLabel
-          })
-        }
-      })
+      if (type === 'table'){
+        dispList.forEach(disp => {
+          if (disp.dispKey === 'db'){
+            db.dbName = disp.dispValue
+          }
+          if (disp.dispKey === 'table'){
+            db.tableName = disp.dispValue
+            db.tableComment = disp.dispLabel
+          }
+          if (disp.dispKey === 'fields'){
+            fields.push({
+              fieldName: disp.dispValue,
+              fieldType: disp.dispType,
+              fieldComment: disp.dispLabel
+            })
+          }
+        })
+      }
+      if (type === 'exportation') {
+        let i = 0
+        let j = 0
+        dispList.forEach(disp => {
+          if (disp.dispKey === 'formDb'){
+            db.formDb = disp.dispValue
+          }
+          if (disp.dispKey === 'formTable'){
+            db.formTable = disp.dispValue
+            db.formTableComment = disp.dispLabel
+          }
+          if (disp.dispKey === 'toDb'){
+            db.toDb = disp.dispValue
+          }
+          if (disp.dispKey === 'toTable'){
+            db.toTable = disp.dispValue
+            db.toTableComment = disp.dispLabel
+          }
+          if (disp.dispKey === 'formFields'){
+            fields.push({
+              id: i++,
+              fieldName: disp.dispValue,
+              fieldType: disp.dispType,
+              fieldComment: disp.dispLabel
+            })
+          }
+          if (disp.dispKey === 'toFields'){
+            fields.push({
+              id: j++,
+              fieldName: disp.dispValue,
+              fieldType: disp.dispType,
+              fieldComment: disp.dispLabel
+            })
+          }
+        })
+      }
       return {db, fields}
     }
   },
diff --git a/src/views/quest/node/components/node/dispFind.vue b/src/views/quest/node/components/node/dispFind.vue
index 7581e24..eaab885 100644
--- a/src/views/quest/node/components/node/dispFind.vue
+++ b/src/views/quest/node/components/node/dispFind.vue
@@ -8,6 +8,9 @@
         <span v-if="node.type === 'table'">
           <TableFind :disp="disp" />
         </span>
+        <span v-else-if="node.type === 'exportation'">
+          <ExporFind :disp="disp" :data="data" :node="node" />
+        </span>
 
         <br><br>
         <div align="center">
@@ -23,14 +26,15 @@
 // 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 // 例如：import 《组件名称》 from '《组件路径》,
 import TableFind from './type/tableFind.vue'
-import TableUpd from "./type/tableUpd.vue";
+import ExporFind from "./type/exporFind.vue";
 
 
 export default {
   // import引入的组件需要注入到对象中才能使用"
   name: 'type-table',
-  components: {TableUpd, TableFind},
+  components: {ExporFind, TableFind},
   props: {
+    data: {},
     node: {},
     disp: {
       nodeCode: undefined,
diff --git a/src/views/quest/node/components/node/dispUpd.vue b/src/views/quest/node/components/node/dispUpd.vue
index daec97a..d278a62 100644
--- a/src/views/quest/node/components/node/dispUpd.vue
+++ b/src/views/quest/node/components/node/dispUpd.vue
@@ -8,6 +8,9 @@
         <span v-if="node.type === 'table'">
           <TableUpd :disp="disp" />
         </span>
+        <span v-else-if="node.type === 'exportation'">
+          <ExporUpd :disp="disp" :data="data" :node="node" />
+        </span>
 
         <br><br>
         <el-button type="primary" @click="saveDisposition">确 定</el-button>
@@ -21,14 +24,15 @@
 // 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 // 例如：import 《组件名称》 from '《组件路径》,
 import TableUpd from './type/tableUpd.vue'
-import {selectDbTableColumnsByName, listDbTableAll, selDbNameAll} from "@/api/tool/gen";
+import ExporUpd from './type/exporUpd.vue'
 import {batchAddUpd} from "@/api/quest/disposition";
 
 export default {
   // import引入的组件需要注入到对象中才能使用"
   name: 'type-table',
-  components: {TableUpd},
+  components: {TableUpd, ExporUpd},
   props: {
+    data: {},
     node: {},
     disp: {
       nodeCode: undefined,
diff --git a/src/views/quest/node/components/node/type/exporFind.vue b/src/views/quest/node/components/node/type/exporFind.vue
new file mode 100644
index 0000000..4977c10
--- /dev/null
+++ b/src/views/quest/node/components/node/type/exporFind.vue
@@ -0,0 +1,119 @@
+<template>
+  <div @click="getInfo">
+    <div>
+      <span v-if="disp.formData.db.formDb && disp.formData.db.formTable">输入表信息:
+        {{ disp.formData.db.formDb }}.
+        {{ disp.formData.db.formTable }}
+        ({{ disp.formData.db.formTableComment }})
+      </span>
+      <span v-else>无输入表</span>
+      <br><br>
+      <span v-if="disp.formData.db.toDb && disp.formData.db.toTable">输出表信息:
+        {{ disp.formData.db.toDb }}.
+        {{ disp.formData.db.toTable }}
+        ({{ disp.formData.db.toTableComment }})
+      </span>
+      <span v-else>无输出表</span>
+      <br><br>
+    </div>
+    <div align="center">
+      <el-table v-model="disp.formData.fields">
+        <el-table-column label="输入字段" prop="formFields" />
+        <el-table-column label="输出字段" prop="toFields" />
+      </el-table>
+    </div>
+
+  </div>
+</template>
+
+<script>
+// 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
+// 例如：import 《组件名称》 from '《组件路径》,
+export default {
+  // import引入的组件需要注入到对象中才能使用"
+  name: 'exporFind',
+  props: {
+    data: {},
+    node: {},
+    disp: {
+      nodeCode: undefined,
+      nodeType: undefined,
+      findFlag: false,
+      updFlag: false,
+      formData: {
+        db: {},
+        fields: []
+      }
+    }
+  },
+  data() {
+    // 这里存放数据"
+    return {}
+  },
+  // 计算属性 类似于data概念",
+  computed: {},
+  // 生命周期 - 创建完成（可以访问当前this实例）",
+  created() {
+  },
+  // 方法集合",
+  methods: {
+    // 根据节点编码获取节点的所有信息,包括参数配置
+    getInfo() {
+      console.log(this.data)
+      console.log(this.node)
+      /** 1.查询该结点的上一级节点,并获取其信息*/
+      // this.data.lineList.forEach(line => {
+      //   if (line.to === this.node.id){
+      //
+      //   }
+      // })
+    },
+    /** 类型转换 mysql -> vue */
+    getVueDisp(dispList) {
+      let type = this.node.type
+      const db = {}
+      const fields = []
+      if (type === 'exportation') {
+        let i = 0
+        let j = 0
+        dispList.forEach(disp => {
+          if (disp.dispKey === 'formDb'){
+            db.formDb = disp.dispValue
+          }
+          if (disp.dispKey === 'formTable'){
+            db.formTable = disp.dispValue
+            db.formTableComment = disp.dispLabel
+          }
+          if (disp.dispKey === 'toDb'){
+            db.toDb = disp.dispValue
+          }
+          if (disp.dispKey === 'toTable'){
+            db.toTable = disp.dispValue
+            db.toTableComment = disp.dispLabel
+          }
+          if (disp.dispKey === 'formFields'){
+            fields.push({
+              id: i++,
+              fieldName: disp.dispValue,
+              fieldType: disp.dispType,
+              fieldComment: disp.dispLabel
+            })
+          }
+          if (disp.dispKey === 'toFields'){
+            fields.push({
+              id: j++,
+              fieldName: disp.dispValue,
+              fieldType: disp.dispType,
+              fieldComment: disp.dispLabel
+            })
+          }
+        })
+      }
+      return {db, fields}
+    }
+  }
+}
+</script>
+<style scoped>
+
+</style>
diff --git a/src/views/quest/node/components/node/type/exporUpd.vue b/src/views/quest/node/components/node/type/exporUpd.vue
new file mode 100644
index 0000000..76c0b9b
--- /dev/null
+++ b/src/views/quest/node/components/node/type/exporUpd.vue
@@ -0,0 +1,42 @@
+<template>
+  <div>
+
+  </div>
+</template>
+
+<script>
+// 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
+// 例如：import 《组件名称》 from '《组件路径》,
+export default {
+  // import引入的组件需要注入到对象中才能使用"
+  name: 'exporUpd',
+  props: {
+    data: {},
+    node: {},
+    disp: {
+      nodeCode: undefined,
+      nodeType: undefined,
+      findFlag: false,
+      updFlag: false,
+      formData: {
+        db: {},
+        fields: []
+      }
+    }
+  },
+  data() {
+    // 这里存放数据"
+    return {}
+  },
+  // 计算属性 类似于data概念",
+  computed: {},
+  // 生命周期 - 创建完成（可以访问当前this实例）",
+  created() {
+  },
+  // 方法集合",
+  methods: {}
+}
+</script>
+<style scoped>
+
+</style>
diff --git a/src/views/quest/node/components/node/type/tableUpd.vue b/src/views/quest/node/components/node/type/tableUpd.vue
index 5c3b9d5..0f791ef 100644
--- a/src/views/quest/node/components/node/type/tableUpd.vue
+++ b/src/views/quest/node/components/node/type/tableUpd.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div @click="csh">
     <div style="padding-left: 10px;padding-right: 10px;">
       <el-form ref="queryForm" :inline="true" :model="queryParams" size="small">
         <el-form-item label="数据库名称" prop="dbName">
@@ -85,8 +85,7 @@ export default {
   computed: {},
   // 生命周期 - 创建完成（可以访问当前this实例）",
   created() {
-    this.selDbNameList()
-    this.getListAll()
+
   },
   // 方法集合",
   methods: {
@@ -140,6 +139,10 @@ export default {
         this.tableOptions = res.data;
       });
     },
+    csh() {
+      this.selDbNameList()
+      this.getListAll()
+    }
   }
 }
 </script>

From 1f0323ac390a917c24e495c66d274945a25ffb83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Fri, 30 Aug 2024 11:30:09 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quest/node/components/node/dispFind.vue       | 1 -
 src/views/quest/node/components/node/dispUpd.vue        | 4 +---
 src/views/quest/node/components/node/type/tableFind.vue | 9 ++++++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/quest/node/components/node/dispFind.vue b/src/views/quest/node/components/node/dispFind.vue
index eaab885..6cd618a 100644
--- a/src/views/quest/node/components/node/dispFind.vue
+++ b/src/views/quest/node/components/node/dispFind.vue
@@ -2,7 +2,6 @@
   <!-- 节点配置-->
   <div align="center">
     <el-drawer :visible.sync="disp.findFlag" direction="rtl" title="配置信息" append-to-body size="60%">
-      {{ node }}
       <div style="padding-left: 20px;padding-right: 20px;">
 
         <span v-if="node.type === 'table'">
diff --git a/src/views/quest/node/components/node/dispUpd.vue b/src/views/quest/node/components/node/dispUpd.vue
index d278a62..f7a94a4 100644
--- a/src/views/quest/node/components/node/dispUpd.vue
+++ b/src/views/quest/node/components/node/dispUpd.vue
@@ -48,9 +48,7 @@ export default {
   },
   data() {
     // 这里存放数据"
-    return {
-
-    }
+    return {}
   },
   // 计算属性 类似于data概念",
   computed: {},
diff --git a/src/views/quest/node/components/node/type/tableFind.vue b/src/views/quest/node/components/node/type/tableFind.vue
index e66b296..1520eee 100644
--- a/src/views/quest/node/components/node/type/tableFind.vue
+++ b/src/views/quest/node/components/node/type/tableFind.vue
@@ -1,8 +1,11 @@
 <template>
   <div>
-    <h5>数据库:&nbsp;&nbsp;{{ disp.formData.db.dbName }}</h5>
-    <br>
-    <h5>数据表:&nbsp;&nbsp;{{ disp.formData.db.tableName }}</h5>
+    <span v-if="disp.formData.db.dbName && disp.formData.db.tableName">配置表信息:
+        {{ disp.formData.db.dbName }}.
+        {{ disp.formData.db.tableName }}
+        ({{ disp.formData.db.tableComment }})
+      </span>
+    <span v-else>无配置表</span>
     <span>
           <el-table ref="table" :data="disp.formData.fields" height="300px">
             <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="fieldName" />

From 735c66193694ff763586f00eb76ba1e8ab8e87ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Fri, 30 Aug 2024 21:31:28 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quest/node/Home.vue | 41 ++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/views/quest/node/Home.vue b/src/views/quest/node/Home.vue
index 84b3b5e..e274391 100644
--- a/src/views/quest/node/Home.vue
+++ b/src/views/quest/node/Home.vue
@@ -96,6 +96,7 @@ export default {
         const rows = res.data.rows
         for (let i = 0; i < rows.length; i++) {
           const r = flowNode.methods.toJsPlumbNode(rows[i])
+          // 节点添加
           this.data.nodeList.push({
             id: r.node.id,
             type: r.node.type,
@@ -104,6 +105,7 @@ export default {
             top: r.node.top,
             left: r.node.left
           })
+          // 连线添加
           if (r.line) {
             r.line.forEach(v => {
               this.data.lineList.push({
@@ -116,23 +118,42 @@ export default {
             })
           }
         }
-        this.data.nodeList.forEach(node => {
-          nodeTypeList.forEach(v => {
-            if (node.type === v.type) {
-              node.typeName = v.typeName
-              node.logImg = v.logImg
-              node.log_bg_color = v.log_bg_color
-            }
-          })
-        })
+        // 节点图片配置添加
+        this.nodeHandle()
+        // 连线去重
+        this.data.lineList = this.lineHandle(this.data.lineList)
       })
       this.flag = true
     },
+    // 节点批量处理-初始化
+    nodeHandle() {
+      // 节点图片配置添加
+      this.data.nodeList.forEach(node => {
+        nodeTypeList.forEach(v => {
+          if (node.type === v.type) {
+            node.typeName = v.typeName
+            node.logImg = v.logImg
+            node.log_bg_color = v.log_bg_color
+          }
+        })
+      })
+    },
+    // 连线去重
+    lineHandle(lineList) {
+      let map = new Map();
+      lineList.forEach(item => {
+        const key = item.from + '->' + item.to;
+        if (!map.has(key)) {
+          map.set(key, item);
+        }
+      });
+      return Array.from(map.values());
+    },
     // 保存修改按钮
     save() {
       // 1. 获取所有节点与连线信息
       const nodeList = this.data.nodeList
-      const lineList = this.data.lineList
+      const lineList = this.lineHandle(this.data.lineList)
       console.log(this.data)
       // 2. 处理所有信息,将jsPlumb类型 ==> 数据表类型
       const nodeData = []

From 8d7145d3b14411ab3c5b05bab5d4a27d45a7b1a5 Mon Sep 17 00:00:00 2001
From: chentaisen <14615430+chentaisen@user.noreply.gitee.com>
Date: Fri, 30 Aug 2024 21:48:13 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/rule/rule/version.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index 8d12e09..c00a281 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -193,7 +193,6 @@
 
                 </el-descriptions-item>
 
-
                 <el-descriptions-item>
                   <div>
                     <editor v-model="customer.ruleContent" :min-height="192"/>
@@ -223,7 +222,7 @@
       </el-col>
     </el-row>
 
-    <!-- 添加或修改规则对话框 -->
+    <!-- 添加或修改规则版本对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
       <el-button type="primary" @click="generate" style="margin-bottom:20px;">生成版本类</el-button>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">

From aae80d6113348bf062e31cf5a6e288bdce156d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Fri, 30 Aug 2024 22:30:08 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quest/node/components/node/dispUpd.vue    |  46 +----
 .../node/components/node/type/exporFind.vue   |   6 -
 .../node/components/node/type/exporUpd.vue    | 125 ++++++++++-
 .../node/components/node/type/exporUpd2.vue   | 194 ++++++++++++++++++
 .../node/components/node/type/tableUpd.vue    |  49 ++++-
 5 files changed, 364 insertions(+), 56 deletions(-)
 create mode 100644 src/views/quest/node/components/node/type/exporUpd2.vue

diff --git a/src/views/quest/node/components/node/dispUpd.vue b/src/views/quest/node/components/node/dispUpd.vue
index f7a94a4..0a629fc 100644
--- a/src/views/quest/node/components/node/dispUpd.vue
+++ b/src/views/quest/node/components/node/dispUpd.vue
@@ -1,9 +1,9 @@
 <template>
   <!-- 修改节点配置-->
-  <div align="center">
+  <div>
     <!-- 自定义表单对话框 -->
     <el-drawer :modal="false" :visible.sync="disp.updFlag" direction="rtl" title="节点配置" append-to-body size="60%">
-      <div align="center">
+      <div>
 
         <span v-if="node.type === 'table'">
           <TableUpd :disp="disp" />
@@ -12,9 +12,7 @@
           <ExporUpd :disp="disp" :data="data" :node="node" />
         </span>
 
-        <br><br>
-        <el-button type="primary" @click="saveDisposition">确 定</el-button>
-        <el-button @click="disp.updFlag = false">取 消</el-button>
+
       </div>
     </el-drawer>
   </div>
@@ -54,44 +52,6 @@ export default {
   computed: {},
   // 方法集合",
   methods: {
-    // 保存配置按钮
-    saveDisposition() {
-      const dispData = this.disp.formData
-      const dispList = this.getMysqlDisp(dispData.db,dispData.fields)
-      console.log(dispData)
-      console.log(dispList)
-      batchAddUpd(dispList, this.disp.nodeCode).then(res => {
-        this.$message.success(res.msg)
-        this.disp.updFlag = false
-      })
-    },
-    /** 类型转换 vue -> mysql*/
-    getMysqlDisp(db, fields) {
-      const dispList = []
-      dispList.push({
-        nodeCode: this.disp.nodeCode,
-        dispKey: 'db',
-        dispLabel: '数据库',
-        dispValue: db.dbName,
-        dispType: 'string'
-      },{
-        nodeCode: this.disp.nodeCode,
-        dispKey: 'table',
-        dispLabel: db.tableComment,
-        dispValue: db.tableName,
-        dispType: 'string'
-      })
-      fields.forEach(field => {
-        dispList.push({
-          nodeCode: this.disp.nodeCode,
-          dispKey: 'fields',
-          dispLabel: field.fieldComment,
-          dispValue: field.fieldName,
-          dispType: field.fieldType
-        })
-      })
-      return dispList;
-    },
 
   }
 }
diff --git a/src/views/quest/node/components/node/type/exporFind.vue b/src/views/quest/node/components/node/type/exporFind.vue
index 4977c10..14b62d6 100644
--- a/src/views/quest/node/components/node/type/exporFind.vue
+++ b/src/views/quest/node/components/node/type/exporFind.vue
@@ -61,12 +61,6 @@ export default {
     getInfo() {
       console.log(this.data)
       console.log(this.node)
-      /** 1.查询该结点的上一级节点,并获取其信息*/
-      // this.data.lineList.forEach(line => {
-      //   if (line.to === this.node.id){
-      //
-      //   }
-      // })
     },
     /** 类型转换 mysql -> vue */
     getVueDisp(dispList) {
diff --git a/src/views/quest/node/components/node/type/exporUpd.vue b/src/views/quest/node/components/node/type/exporUpd.vue
index 76c0b9b..3efd69e 100644
--- a/src/views/quest/node/components/node/type/exporUpd.vue
+++ b/src/views/quest/node/components/node/type/exporUpd.vue
@@ -1,12 +1,35 @@
 <template>
   <div>
-
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <span v-if="reqDispData && reqDispData.dbTableName">输入表信息:
+          <span v-for="item in reqDispData.dbTableName">{{ item }} &nbsp; &nbsp; </span>
+        </span>
+        <span v-else>无输入表</span>
+      </el-col>
+    </el-row>
+    <span>
+          <el-table ref="table" :data="reqDispData.fields" height="300px"
+                    @row-click="clickRow" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" />
+            <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="fieldName" />
+            <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="fieldComment" />
+            <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="fieldType" />
+          </el-table>
+    </span>
+    <br><br>
+    <div align="center">
+      <el-button type="primary" @click="toSelectResp">确 定</el-button>
+      <el-button @click="disp.updFlag = false">取 消</el-button>
+    </div>
   </div>
 </template>
 
 <script>
 // 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 // 例如：import 《组件名称》 from '《组件路径》,
+import {listDisposition} from "@/api/quest/disposition";
+
 export default {
   // import引入的组件需要注入到对象中才能使用"
   name: 'exporUpd',
@@ -22,19 +45,113 @@ export default {
         db: {},
         fields: []
       }
-    }
+    },
+
   },
   data() {
     // 这里存放数据"
-    return {}
+    return {
+      // 上一级节点编码
+      preNodeId: [],
+      // 上一级节点配置信息
+      preNodeDisp: [],
+      // 最终选择的配置
+      selectDisp: [],
+      // 上一级节点配置信息整合
+      reqDispData: {
+        dbTableName: [],
+        fields: []
+      },
+      respDispData: {
+        dbTableName: [],
+        fields: []
+      }
+    }
   },
   // 计算属性 类似于data概念",
   computed: {},
   // 生命周期 - 创建完成（可以访问当前this实例）",
   created() {
+    this.init()
   },
   // 方法集合",
-  methods: {}
+  methods: {
+    init() {
+      /** 1.查询该节点的上一级节点*/
+      this.data.lineList.forEach(line => {
+        if (line.to === this.node.id){
+          this.preNodeId.push(line.from)
+        }
+      })
+      this.preNodeId = [...new Set(this.preNodeId)]
+      console.log(1,this.preNodeId)
+      /** 2.获取上一级节点的配置参数*/
+      if (this.preNodeId){
+        this.preNodeId.forEach(id => {
+          this.findDisp(id)
+        })
+      }
+      setTimeout(() => {
+        this.init2()
+      },1000)
+    },
+    init2() {
+      console.log(2,this.preNodeDisp)
+      this.preNodeDisp.forEach(nodeDisp => {
+        console.log(3, nodeDisp)
+        let dbTableName = nodeDisp.db.dbName + '.' +
+          nodeDisp.db.tableName + '(' + nodeDisp.db.tableComment + ')';
+        this.reqDispData.dbTableName.push(dbTableName)
+        nodeDisp.fields.forEach(field => this.reqDispData.fields.push(field))
+      })
+      console.log(4, this.reqDispData)
+    },
+    findDisp(nodeCode) {
+      listDisposition({nodeCode: nodeCode}).then(res => {
+        this.preNodeDisp.push(this.getVueDisp(res.data.rows))
+      })
+    },
+    // 选择多选
+    clickRow(row) {
+      this.$refs.table.toggleRowSelection(row);
+    },
+    // 输入表多选框选中数据
+    handleSelectionChange(selection) {
+      this.selectDisp.formFields = selection.map(item => {
+        return {
+          fieldName: item.fieldName,
+          fieldType: item.fieldComment,
+          fieldComment: item.fieldType
+        };
+      });
+    },
+    // 选择完成输入表字段
+    toSelectResp() {
+      console.log(this.selectDisp)
+    },
+    /** 类型转换 mysql -> vue */
+    getVueDisp(dispList) {
+      const db = {}
+      const fields = []
+      dispList.forEach(disp => {
+        if (disp.dispKey === 'db') {
+          db.dbName = disp.dispValue
+        }
+        if (disp.dispKey === 'table') {
+          db.tableName = disp.dispValue
+          db.tableComment = disp.dispLabel
+        }
+        if (disp.dispKey === 'fields') {
+          fields.push({
+            fieldName: disp.dispValue,
+            fieldType: disp.dispType,
+            fieldComment: disp.dispLabel
+          })
+        }
+      })
+      return {db, fields}
+    }
+  }
 }
 </script>
 <style scoped>
diff --git a/src/views/quest/node/components/node/type/exporUpd2.vue b/src/views/quest/node/components/node/type/exporUpd2.vue
new file mode 100644
index 0000000..9b80938
--- /dev/null
+++ b/src/views/quest/node/components/node/type/exporUpd2.vue
@@ -0,0 +1,194 @@
+<template>
+  <div @click="csh">
+    <div style="padding-left: 10px;padding-right: 10px;">
+      <el-form ref="queryForm" :inline="true" :model="queryParams" size="small">
+        <el-form-item label="数据库名称" prop="dbName">
+          <el-select v-model="queryParams.dbName" placeholder="请选择数据库" clearable @change="handleQuery">
+            <el-option v-for="item in dbNameOptions" :key="item" :label="item" :value="item"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="表名称" prop="tableName">
+          <el-input
+            v-model="queryParams.tableName"
+            clearable
+            @change="handleQuery"
+            placeholder="请输入表名称" />
+        </el-form-item>
+        <el-form-item label="表描述" prop="tableComment">
+          <el-input
+            v-model="queryParams.tableComment"
+            clearable
+            @change="handleQuery"
+            placeholder="请输入表描述" />
+        </el-form-item>
+        <el-form-item>
+          <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">查找</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table ref="table" :data="tableOptions" height="300px">
+        <el-table-column :show-overflow-tooltip="true" label="表名称" prop="tableName" />
+        <el-table-column :show-overflow-tooltip="true" label="表描述" prop="tableComment" />
+        <el-table-column label="操作" width="50px">
+          <template slot-scope="scope">
+            <el-button type="text" @click="selectTable(scope.row)">选择</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-divider content-position="left">选择字段 v</el-divider>
+      <el-table ref="table" :data="fieldsOptions" height="300px"
+                @row-click="clickRow" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" />
+        <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="columnName" />
+        <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="columnComment" />
+        <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="columnType" />
+      </el-table>
+      <br><br>
+      <div align="center">
+        <el-button type="primary" @click="saveDisposition">确 定</el-button>
+        <el-button @click="disp.updFlag = false">取 消</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+// 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
+// 例如：import 《组件名称》 from '《组件路径》,
+import {listDbTableAll, selDbNameAll, selectDbTableColumnsByName} from "@/api/tool/gen";
+import {batchAddUpd} from "@/api/quest/disposition";
+
+export default {
+  // import引入的组件需要注入到对象中才能使用"
+  name: 'tableUpd',
+  props: {
+    disp: {
+      nodeCode: undefined,
+      nodeType: undefined,
+      findFlag: false,
+      updFlag: false,
+      formData: {
+        db: {},
+        fields: []
+      }
+    }
+  },
+  data() {
+    // 这里存放数据"
+    return {
+      // 数据库列表
+      dbNameOptions: [],
+      // 展示数据表列表
+      tableOptions: [],
+      // 字段列表
+      fieldsOptions: [],
+      // 所有数据库列表
+      tableList: [],
+      queryParams: {}
+    }
+  },
+  // 计算属性 类似于data概念",
+  computed: {},
+  // 生命周期 - 创建完成（可以访问当前this实例）",
+  created() {
+
+  },
+  // 方法集合",
+  methods: {
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.tableOptions = []
+      this.tableList.forEach(table => {
+        const params = this.queryParams
+        if ((table.dbName === params.dbName || !params.dbName) &&
+          (table.tableName.includes(params.tableName) || !params.tableName) &&
+          (table.tableComment.includes(params.tableComment) || !params.tableComment)){
+          this.tableOptions.push(table)
+        }
+      })
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 表字段查询*/
+    selectTable(row) {
+      this.disp.formData.db = row
+      selectDbTableColumnsByName(row.dbName, row.tableName).then(res => {
+        this.fieldsOptions = res.data
+      })
+    },
+    clickRow(row) {
+      this.$refs.table.toggleRowSelection(row);
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.disp.formData.fields = selection.map(item => {
+        return {
+          fieldName: item.columnName,
+          fieldType: item.columnType,
+          fieldComment: item.columnComment
+        };
+      });
+    },
+    // 查询所有数据库名称
+    selDbNameList() {
+      selDbNameAll().then(res => {
+        this.dbNameOptions = res.data
+      })
+    },
+    // 查询所有表名称信息
+    getListAll() {
+      listDbTableAll().then(res => {
+        this.tableList = res.data;
+        this.tableOptions = res.data;
+      });
+    },
+    // csh() {
+    //   this.selDbNameList()
+    //   this.getListAll()
+    // },
+    // 保存配置按钮
+    saveDisposition() {
+      const dispData = this.disp.formData
+      const dispList = this.getMysqlDisp(dispData.db,dispData.fields)
+      batchAddUpd(dispList, this.disp.nodeCode).then(res => {
+        this.$message.success(res.msg)
+        this.disp.updFlag = false
+      })
+    },
+    /** 类型转换 vue -> mysql*/
+    getMysqlDisp(db, fields) {
+      const dispList = []
+      dispList.push({
+        nodeCode: this.disp.nodeCode,
+        dispKey: 'db',
+        dispLabel: '数据库',
+        dispValue: db.dbName,
+        dispType: 'string'
+      },{
+        nodeCode: this.disp.nodeCode,
+        dispKey: 'table',
+        dispLabel: db.tableComment,
+        dispValue: db.tableName,
+        dispType: 'string'
+      })
+      fields.forEach(field => {
+        dispList.push({
+          nodeCode: this.disp.nodeCode,
+          dispKey: 'fields',
+          dispLabel: field.fieldComment,
+          dispValue: field.fieldName,
+          dispType: field.fieldType
+        })
+      })
+      return dispList;
+    },
+
+  }
+}
+</script>
+<style scoped>
+
+</style>
diff --git a/src/views/quest/node/components/node/type/tableUpd.vue b/src/views/quest/node/components/node/type/tableUpd.vue
index 0f791ef..f652df3 100644
--- a/src/views/quest/node/components/node/type/tableUpd.vue
+++ b/src/views/quest/node/components/node/type/tableUpd.vue
@@ -1,5 +1,5 @@
 <template>
-  <div @click="csh">
+  <div>
     <div style="padding-left: 10px;padding-right: 10px;">
       <el-form ref="queryForm" :inline="true" :model="queryParams" size="small">
         <el-form-item label="数据库名称" prop="dbName">
@@ -43,6 +43,11 @@
         <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="columnComment" />
         <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="columnType" />
       </el-table>
+      <br><br>
+      <div align="center">
+        <el-button type="primary" @click="saveDisposition">确 定</el-button>
+        <el-button @click="disp.updFlag = false">取 消</el-button>
+      </div>
     </div>
   </div>
 </template>
@@ -51,6 +56,7 @@
 // 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 // 例如：import 《组件名称》 from '《组件路径》,
 import {listDbTableAll, selDbNameAll, selectDbTableColumnsByName} from "@/api/tool/gen";
+import {batchAddUpd} from "@/api/quest/disposition";
 
 export default {
   // import引入的组件需要注入到对象中才能使用"
@@ -85,7 +91,7 @@ export default {
   computed: {},
   // 生命周期 - 创建完成（可以访问当前this实例）",
   created() {
-
+    this.csh()
   },
   // 方法集合",
   methods: {
@@ -142,7 +148,44 @@ export default {
     csh() {
       this.selDbNameList()
       this.getListAll()
-    }
+    },
+    // 保存配置按钮
+    saveDisposition() {
+      const dispData = this.disp.formData
+      const dispList = this.getMysqlDisp(dispData.db,dispData.fields)
+      batchAddUpd(dispList, this.disp.nodeCode).then(res => {
+        this.$message.success(res.msg)
+        this.disp.updFlag = false
+      })
+    },
+    /** 类型转换 vue -> mysql*/
+    getMysqlDisp(db, fields) {
+      const dispList = []
+      dispList.push({
+        nodeCode: this.disp.nodeCode,
+        dispKey: 'db',
+        dispLabel: '数据库',
+        dispValue: db.dbName,
+        dispType: 'string'
+      },{
+        nodeCode: this.disp.nodeCode,
+        dispKey: 'table',
+        dispLabel: db.tableComment,
+        dispValue: db.tableName,
+        dispType: 'string'
+      })
+      fields.forEach(field => {
+        dispList.push({
+          nodeCode: this.disp.nodeCode,
+          dispKey: 'fields',
+          dispLabel: field.fieldComment,
+          dispValue: field.fieldName,
+          dispType: field.fieldType
+        })
+      })
+      return dispList;
+    },
+
   }
 }
 </script>

From 27e54fef8eec82523e79a777edf698be2a4278e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Sat, 31 Aug 2024 21:03:45 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quest/node/components/node/dispFind.vue   |  17 +-
 .../node/components/node/type/exporFind.vue   |   5 +-
 .../node/components/node/type/exporUpd.vue    | 223 ++++++++++++++----
 .../node/components/node/type/tableFind.vue   |   9 +-
 .../node/components/node/type/uniteFind.vue   | 175 ++++++++++++++
 5 files changed, 375 insertions(+), 54 deletions(-)
 create mode 100644 src/views/quest/node/components/node/type/uniteFind.vue

diff --git a/src/views/quest/node/components/node/dispFind.vue b/src/views/quest/node/components/node/dispFind.vue
index 6cd618a..6f8d583 100644
--- a/src/views/quest/node/components/node/dispFind.vue
+++ b/src/views/quest/node/components/node/dispFind.vue
@@ -10,12 +10,11 @@
         <span v-else-if="node.type === 'exportation'">
           <ExporFind :disp="disp" :data="data" :node="node" />
         </span>
+        <span v-else-if="node.type === 'unite'">
+          <UniteFind :disp="disp" :data="data" :node="node" />
+        </span>
+
 
-        <br><br>
-        <div align="center">
-          <el-button @click="disp.findFlag = false">确认</el-button>
-          <el-button type="primary" @click="editDisposition">修改配置</el-button>
-        </div>
       </div>
     </el-drawer>
   </div>
@@ -26,12 +25,13 @@
 // 例如：import 《组件名称》 from '《组件路径》,
 import TableFind from './type/tableFind.vue'
 import ExporFind from "./type/exporFind.vue";
+import UniteFind from "./type/uniteFind.vue";
 
 
 export default {
   // import引入的组件需要注入到对象中才能使用"
   name: 'type-table',
-  components: {ExporFind, TableFind},
+  components: {ExporFind, TableFind, UniteFind},
   props: {
     data: {},
     node: {},
@@ -49,7 +49,6 @@ export default {
   data() {
     // 这里存放数据"
     return {
-      xx: ''
     }
   },
   // 计算属性 类似于data概念",
@@ -60,9 +59,7 @@ export default {
   },
   // 方法集合",
   methods: {
-    editDisposition() {
-      this.disp.updFlag = true
-    },
+
   }
 }
 </script>
diff --git a/src/views/quest/node/components/node/type/exporFind.vue b/src/views/quest/node/components/node/type/exporFind.vue
index 14b62d6..1b8a873 100644
--- a/src/views/quest/node/components/node/type/exporFind.vue
+++ b/src/views/quest/node/components/node/type/exporFind.vue
@@ -22,7 +22,10 @@
         <el-table-column label="输出字段" prop="toFields" />
       </el-table>
     </div>
-
+    <div align="center">
+      <el-button @click="disp.findFlag = false">确认</el-button>
+      <el-button type="primary" @click="this.disp.updFlag = true">修改配置</el-button>
+    </div>
   </div>
 </template>
 
diff --git a/src/views/quest/node/components/node/type/exporUpd.vue b/src/views/quest/node/components/node/type/exporUpd.vue
index 3efd69e..f5899e0 100644
--- a/src/views/quest/node/components/node/type/exporUpd.vue
+++ b/src/views/quest/node/components/node/type/exporUpd.vue
@@ -1,26 +1,64 @@
 <template>
   <div>
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <span v-if="reqDispData && reqDispData.dbTableName">输入表信息:
-          <span v-for="item in reqDispData.dbTableName">{{ item }} &nbsp; &nbsp; </span>
-        </span>
-        <span v-else>无输入表</span>
-      </el-col>
-    </el-row>
-    <span>
-          <el-table ref="table" :data="reqDispData.fields" height="300px"
-                    @row-click="clickRow" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" />
-            <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="fieldName" />
-            <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="fieldComment" />
-            <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="fieldType" />
-          </el-table>
-    </span>
-    <br><br>
-    <div align="center">
-      <el-button type="primary" @click="toSelectResp">确 定</el-button>
-      <el-button @click="disp.updFlag = false">取 消</el-button>
+    <div style="padding-left: 10px;padding-right: 10px;">
+      <h3>选择输出数据库</h3>
+      <el-form ref="queryForm" :inline="true" :model="queryParams" size="small">
+        <el-form-item label="数据库名称" prop="dbName">
+          <el-select v-model="queryParams.dbName" placeholder="请选择数据库" clearable @change="handleQuery">
+            <el-option v-for="item in dbNameOptions" :key="item" :label="item" :value="item"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="表名称" prop="tableName">
+          <el-input
+            v-model="queryParams.tableName"
+            clearable
+            @change="handleQuery"
+            placeholder="请输入表名称" />
+        </el-form-item>
+        <el-form-item label="表描述" prop="tableComment">
+          <el-input
+            v-model="queryParams.tableComment"
+            clearable
+            @change="handleQuery"
+            placeholder="请输入表描述" />
+        </el-form-item>
+      </el-form>
+      <el-table ref="table" :data="tableOptions" height="300px">
+        <el-table-column :show-overflow-tooltip="true" label="表名称" prop="tableName" />
+        <el-table-column :show-overflow-tooltip="true" label="表描述" prop="tableComment" />
+        <el-table-column label="操作" width="50px">
+          <template slot-scope="scope">
+            <el-button type="text" @click="selectTable(scope.row)">选择</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <br><br>
+      <div align="center">
+        <el-button type="primary" @click="checkFields">确 定</el-button>
+        <el-button @click="disp.updFlag = false">取 消</el-button>
+      </div>
+    </div>
+    <div>
+      <el-dialog title="字段选择" :visible.sync="fieldsFlag" width="60%" append-to-body>
+        <el-table ref="table" :data="reqDispData.fields" height="300px">
+          <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="fieldName" />
+          <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="fieldComment" />
+          <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="fieldType" />
+          <el-table-column :show-overflow-tooltip="true" label="输出字段">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.toName" placeholder="请选择输出字段">
+                <el-option v-for="item in respDispData.fields"
+                           :key="item.columnName"
+                           :label="item.columnName+'('+item.columnComment+')'"
+                           :value="item.columnName"
+                />
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+        <br><br>
+        <el-button type="primary" @click="saveDisposition">确 定</el-button>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -28,11 +66,13 @@
 <script>
 // 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 // 例如：import 《组件名称》 from '《组件路径》,
-import {listDisposition} from "@/api/quest/disposition";
+import {listDbTableAll, selDbNameAll, selectDbTableColumnsByName} from "@/api/tool/gen";
+import {batchAddUpd} from "@/api/quest/disposition";
+import {listDisposition} from "../../../../../../api/quest/disposition";
 
 export default {
   // import引入的组件需要注入到对象中才能使用"
-  name: 'exporUpd',
+  name: 'tableUpd',
   props: {
     data: {},
     node: {},
@@ -45,12 +85,20 @@ export default {
         db: {},
         fields: []
       }
-    },
-
+    }
   },
   data() {
     // 这里存放数据"
     return {
+      // 数据库列表
+      dbNameOptions: [],
+      // 展示数据表列表
+      tableOptions: [],
+      // 字段列表
+      fieldsOptions: [],
+      // 所有数据库列表
+      tableList: [],
+      queryParams: {},
       // 上一级节点编码
       preNodeId: [],
       // 上一级节点配置信息
@@ -65,17 +113,118 @@ export default {
       respDispData: {
         dbTableName: [],
         fields: []
-      }
+      },
+      fieldsFlag: false,
     }
   },
   // 计算属性 类似于data概念",
   computed: {},
   // 生命周期 - 创建完成（可以访问当前this实例）",
   created() {
-    this.init()
+    this.csh()
   },
   // 方法集合",
   methods: {
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.tableOptions = []
+      this.tableList.forEach(table => {
+        const params = this.queryParams
+        if ((table.dbName === params.dbName || !params.dbName) &&
+          (table.tableName.includes(params.tableName) || !params.tableName) &&
+          (table.tableComment.includes(params.tableComment) || !params.tableComment)){
+          this.tableOptions.push(table)
+        }
+      })
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 表字段查询*/
+    selectTable(row) {
+      this.respDispData.dbTableName = row.dbName+'.'+row.tableName+'('+row.tableComment+')'
+      selectDbTableColumnsByName(row.dbName, row.tableName).then(res => {
+        this.respDispData.fields = res.data
+      })
+    },
+    clickRow(row) {
+      this.$refs.table.toggleRowSelection(row);
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.disp.formData.fields = selection.map(item => {
+        return {
+          fieldName: item.columnName,
+          fieldType: item.columnType,
+          fieldComment: item.columnComment
+        };
+      });
+    },
+    // 查询所有数据库名称
+    selDbNameList() {
+      selDbNameAll().then(res => {
+        this.dbNameOptions = res.data
+      })
+    },
+    // 查询所有表名称信息
+    getListAll() {
+      listDbTableAll().then(res => {
+        this.tableList = res.data;
+        this.tableOptions = res.data;
+      });
+    },
+    csh() {
+      this.selDbNameList()
+      this.getListAll()
+      this.init()
+    },
+    // 启动按钮
+    checkFields() {
+      this.fieldsFlag = true
+      this.saveDisposition()
+    },
+    // 保存配置按钮
+    saveDisposition() {
+      console.log('dbNameOptions',this.dbNameOptions)
+      console.log('tableOptions',this.tableOptions)
+      console.log('fieldsOptions',this.fieldsOptions)
+      console.log('tableList',this.tableList)
+      console.log('queryParams',this.queryParams)
+      console.log('preNodeId',this.preNodeId)
+      console.log('preNodeDisp',this.preNodeDisp)
+      console.log('selectDisp',this.selectDisp)
+      console.log('reqDispData',this.reqDispData)
+      console.log('respDispData',this.respDispData)
+    },
+    /** 类型转换 vue -> mysql*/
+    getMysqlDisp(db, fields) {
+      const dispList = []
+      dispList.push({
+        nodeCode: this.disp.nodeCode,
+        dispKey: 'db',
+        dispLabel: '数据库',
+        dispValue: db.dbName,
+        dispType: 'string'
+      },{
+        nodeCode: this.disp.nodeCode,
+        dispKey: 'table',
+        dispLabel: db.tableComment,
+        dispValue: db.tableName,
+        dispType: 'string'
+      })
+      fields.forEach(field => {
+        dispList.push({
+          nodeCode: this.disp.nodeCode,
+          dispKey: 'fields',
+          dispLabel: field.fieldComment,
+          dispValue: field.fieldName,
+          dispType: field.fieldType
+        })
+      })
+      return dispList;
+    },
     init() {
       /** 1.查询该节点的上一级节点*/
       this.data.lineList.forEach(line => {
@@ -96,13 +245,17 @@ export default {
       },1000)
     },
     init2() {
+      let i = 1
       console.log(2,this.preNodeDisp)
       this.preNodeDisp.forEach(nodeDisp => {
         console.log(3, nodeDisp)
         let dbTableName = nodeDisp.db.dbName + '.' +
           nodeDisp.db.tableName + '(' + nodeDisp.db.tableComment + ')';
         this.reqDispData.dbTableName.push(dbTableName)
-        nodeDisp.fields.forEach(field => this.reqDispData.fields.push(field))
+        nodeDisp.fields.forEach(field => {
+          field.id = i++
+          this.reqDispData.fields.push(field)
+        })
       })
       console.log(4, this.reqDispData)
     },
@@ -111,20 +264,6 @@ export default {
         this.preNodeDisp.push(this.getVueDisp(res.data.rows))
       })
     },
-    // 选择多选
-    clickRow(row) {
-      this.$refs.table.toggleRowSelection(row);
-    },
-    // 输入表多选框选中数据
-    handleSelectionChange(selection) {
-      this.selectDisp.formFields = selection.map(item => {
-        return {
-          fieldName: item.fieldName,
-          fieldType: item.fieldComment,
-          fieldComment: item.fieldType
-        };
-      });
-    },
     // 选择完成输入表字段
     toSelectResp() {
       console.log(this.selectDisp)
diff --git a/src/views/quest/node/components/node/type/tableFind.vue b/src/views/quest/node/components/node/type/tableFind.vue
index 1520eee..8efd307 100644
--- a/src/views/quest/node/components/node/type/tableFind.vue
+++ b/src/views/quest/node/components/node/type/tableFind.vue
@@ -13,6 +13,11 @@
             <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="fieldType" />
           </el-table>
       </span>
+    <br><br>
+    <div align="center">
+      <el-button @click="disp.findFlag = false">确认</el-button>
+      <el-button type="primary" @click="this.disp.updFlag = true">修改配置</el-button>
+    </div>
   </div>
 </template>
 
@@ -44,9 +49,11 @@ export default {
   computed: {},
   // 生命周期 - 创建完成（可以访问当前this实例）",
   created() {
+
   },
   // 方法集合",
-  methods: {}
+  methods: {
+  }
 }
 </script>
 <style scoped>
diff --git a/src/views/quest/node/components/node/type/uniteFind.vue b/src/views/quest/node/components/node/type/uniteFind.vue
new file mode 100644
index 0000000..0af5889
--- /dev/null
+++ b/src/views/quest/node/components/node/type/uniteFind.vue
@@ -0,0 +1,175 @@
+<template>
+  <div>
+    <div>
+      <el-form :model="formData" label-width="100px" label-position="left" style="width: 80%">
+        <el-form-item label="一号表">
+          <el-input v-model="reqDispData.db[0].dbTable" placeholder="请选择表" disabled />
+        </el-form-item>
+        <el-form-item label="二号表">
+          <el-input v-model="reqDispData.db[1].dbTable" placeholder="请选择表" disabled />
+        </el-form-item>
+        <el-form-item label="连接方式">
+          <el-select v-model="respDispData.join" placeholder="请选择连接方式">
+            <el-option label="左连接" value="LEFT JOIN" />
+            <el-option label="右连接" value="RIGHT JOIN" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="连接条件">
+          <el-select v-model="respDispData.joinData.form" placeholder="请选择一号表字段">
+            <el-option v-for="item in reqDispData.fieldList[0]" :label="item.columnName+'('+item.columnComment+')'" :value="item.columnName" />
+          </el-select>
+          &nbsp;&nbsp;
+          <el-select v-model="respDispData.joinData.to" placeholder="请选择二号表字段">
+            <el-option v-for="item in reqDispData.fieldList[1]" :label="item.columnName+'('+item.columnComment+')'" :value="item.columnName" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+            <el-button @click="disp.findFlag = false">返回</el-button>
+            <el-button type="primary" @click="checkFieldsFlag = true">下一步</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+// 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
+// 例如：import 《组件名称》 from '《组件路径》,
+import {listDisposition} from "@/api/quest/disposition";
+import {selectDbTableColumnsByName} from "../../../../../../api/tool/gen";
+
+export default {
+  // import引入的组件需要注入到对象中才能使用"
+  name: 'uniteFind',
+  props: {
+    data: {},
+    node: {},
+    disp: {
+      nodeCode: undefined,
+      nodeType: undefined,
+      findFlag: false,
+      updFlag: false,
+      formData: {
+        db: {},
+        fields: []
+      }
+    }
+  },
+  data() {
+    // 这里存放数据"
+    return {
+      reqDispData: {
+        db: [],
+        fields: [],
+        fieldList: []
+      },
+      respDispData: {
+        db: [],
+        fields: [],
+        join: '',
+        joinData: {
+          form: '',
+          to: ''
+        }
+      },
+      formData: {},
+      checkFieldsFlag: false,
+      i: 0
+    }
+  },
+  // 计算属性 类似于data概念",
+  computed: {},
+  // 生命周期 - 创建完成（可以访问当前this实例）",
+  created() {
+    this.init()
+  },
+  // 方法集合",
+  methods: {
+    init() {
+      // 查询上级的所有节点
+      /** 1.查询该节点的上一级节点*/
+      let preNodeId = []
+      this.data.lineList.forEach(line => {
+        if (line.to === this.node.id){
+          preNodeId.push(line.from)
+        }
+      })
+      // 去重
+      preNodeId = [...new Set(preNodeId)]
+      preNodeId.push(this.node.id)
+      /** 2.获取节点的配置参数*/
+      if (preNodeId){
+        preNodeId.forEach(id => {
+          this.findDisp(id)
+        })
+      }
+      /** 3.查询表字段 */
+      console.log('reqDispData',this.reqDispData)
+      console.log('respDispData',this.respDispData)
+
+    },
+    // 根据节点编码查询节点的配置参数
+    findDisp(nodeCode) {
+      listDisposition({nodeCode: nodeCode}).then(res => {
+        if (!res.data.rows){
+          return
+        }
+        let data = this.getVueDisp(res.data.rows);
+        if (this.node.id === nodeCode){
+          this.respDispData.db.push(data.db)
+          this.respDispData.fields.push(data.fields)
+          this.respDispData.join = data.join
+        }else{
+          this.reqDispData.db.push(data.db)
+          this.respDispData.fields.push(data.fields)
+          selectDbTableColumnsByName(data.db.dbName,data.db.tableName).then(res => {
+            this.reqDispData.fieldList.push(res.data)
+          })
+        }
+      })
+    },
+    /** 节点配置 类型转换 mysql -> vue */
+    getVueDisp(dispList) {
+      const db = {}
+      const fields = []
+      let join = ''
+      let joinData = {
+        form: '',
+        to: ''
+      }
+      dispList.forEach(disp => {
+        if (disp.dispKey === 'db') {
+          db.dbName = disp.dispValue
+        }
+        if (disp.dispKey === 'table') {
+          db.tableName = disp.dispValue
+          db.tableComment = disp.dispLabel
+        }
+        if (disp.dispKey === 'fields') {
+          fields.push({
+            fieldName: disp.dispValue,
+            fieldType: disp.dispType,
+            fieldComment: disp.dispLabel
+          })
+        }
+        db.dbTable = db.dbName+'.'+db.tableName+'('+db.tableComment +')'
+        if (disp.dispKey === 'joinDataForm') {
+          joinData.form = disp.dispValue
+        }
+        if (disp.dispKey === 'joinDataTo') {
+          joinData.to = disp.dispValue
+        }
+        if (disp.dispKey === 'join') {
+          join = disp.dispValue
+          return {db, fields, join, joinData}
+        }
+      })
+      return {db, fields}
+    },
+
+  }
+}
+</script>
+<style scoped>
+
+</style>

From 8434767a7ae25a7d8d7a686417a2bf406167c339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Sat, 31 Aug 2024 21:09:49 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../node/components/node/type/uniteFind.vue   | 36 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/views/quest/node/components/node/type/uniteFind.vue b/src/views/quest/node/components/node/type/uniteFind.vue
index 0af5889..aa4de1f 100644
--- a/src/views/quest/node/components/node/type/uniteFind.vue
+++ b/src/views/quest/node/components/node/type/uniteFind.vue
@@ -29,6 +29,20 @@
         </el-form-item>
       </el-form>
     </div>
+    <el-dialog title="选择字段" :visible.sync="checkFieldsFlag" width="60%" append-to-body>
+      <el-table ref="table" :data="reqDispData.fields" height="300px"
+                @row-click="clickRow" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" />
+        <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="columnName" />
+        <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="columnComment" />
+        <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="columnType" />
+      </el-table>
+      <br><br>
+      <div align="center">
+        <el-button @click="checkFieldsFlag = false">返回</el-button>
+        <el-button type="primary" @click="save">保存</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -36,7 +50,7 @@
 // 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 // 例如：import 《组件名称》 from '《组件路径》,
 import {listDisposition} from "@/api/quest/disposition";
-import {selectDbTableColumnsByName} from "../../../../../../api/tool/gen";
+import {selectDbTableColumnsByName} from "@/api/tool/gen";
 
 export default {
   // import引入的组件需要注入到对象中才能使用"
@@ -128,6 +142,26 @@ export default {
         }
       })
     },
+    // 保存选择
+    save() {
+      console.log('reqDispData',this.reqDispData)
+      console.log('respDispData',this.respDispData)
+      this.checkFieldsFlag = false
+      this.disp.findFlag = false
+    },
+    clickRow(row) {
+      this.$refs.table.toggleRowSelection(row);
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.respDispData.fields = selection.map(item => {
+        return {
+          fieldName: item.columnName,
+          fieldType: item.columnType,
+          fieldComment: item.columnComment
+        };
+      });
+    },
     /** 节点配置 类型转换 mysql -> vue */
     getVueDisp(dispList) {
       const db = {}

From 0a302cb1d995cdbc17a566310cb4761941ae54ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Sun, 1 Sep 2024 10:43:34 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=A1=A8=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E5=92=8C=E8=81=94=E5=90=88=E6=9F=A5=E8=AF=A2=E7=9A=84?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../node/components/node/type/exporFind.vue   |   7 +-
 .../node/components/node/type/exporUpd2.vue   | 197 ++++--------------
 .../node/components/node/type/tableFind.vue   |   5 +-
 .../node/components/node/type/tableUpd.vue    |   1 +
 .../node/components/node/type/uniteFind.vue   | 155 +++++++++++---
 5 files changed, 182 insertions(+), 183 deletions(-)

diff --git a/src/views/quest/node/components/node/type/exporFind.vue b/src/views/quest/node/components/node/type/exporFind.vue
index 1b8a873..b5084bf 100644
--- a/src/views/quest/node/components/node/type/exporFind.vue
+++ b/src/views/quest/node/components/node/type/exporFind.vue
@@ -24,7 +24,7 @@
     </div>
     <div align="center">
       <el-button @click="disp.findFlag = false">确认</el-button>
-      <el-button type="primary" @click="this.disp.updFlag = true">修改配置</el-button>
+      <el-button type="primary" @click="disp.updFlag = true">修改配置</el-button>
     </div>
   </div>
 </template>
@@ -57,11 +57,12 @@ export default {
   computed: {},
   // 生命周期 - 创建完成（可以访问当前this实例）",
   created() {
+    this.init()
   },
   // 方法集合",
   methods: {
-    // 根据节点编码获取节点的所有信息,包括参数配置
-    getInfo() {
+    // 初始化
+    info() {
       console.log(this.data)
       console.log(this.node)
     },
diff --git a/src/views/quest/node/components/node/type/exporUpd2.vue b/src/views/quest/node/components/node/type/exporUpd2.vue
index 9b80938..2a4a2be 100644
--- a/src/views/quest/node/components/node/type/exporUpd2.vue
+++ b/src/views/quest/node/components/node/type/exporUpd2.vue
@@ -1,53 +1,26 @@
 <template>
-  <div @click="csh">
-    <div style="padding-left: 10px;padding-right: 10px;">
-      <el-form ref="queryForm" :inline="true" :model="queryParams" size="small">
-        <el-form-item label="数据库名称" prop="dbName">
-          <el-select v-model="queryParams.dbName" placeholder="请选择数据库" clearable @change="handleQuery">
-            <el-option v-for="item in dbNameOptions" :key="item" :label="item" :value="item"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="表名称" prop="tableName">
-          <el-input
-            v-model="queryParams.tableName"
-            clearable
-            @change="handleQuery"
-            placeholder="请输入表名称" />
-        </el-form-item>
-        <el-form-item label="表描述" prop="tableComment">
-          <el-input
-            v-model="queryParams.tableComment"
-            clearable
-            @change="handleQuery"
-            placeholder="请输入表描述" />
-        </el-form-item>
-        <el-form-item>
-          <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">查找</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-      <el-table ref="table" :data="tableOptions" height="300px">
-        <el-table-column :show-overflow-tooltip="true" label="表名称" prop="tableName" />
-        <el-table-column :show-overflow-tooltip="true" label="表描述" prop="tableComment" />
-        <el-table-column label="操作" width="50px">
-          <template slot-scope="scope">
-            <el-button type="text" @click="selectTable(scope.row)">选择</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-divider content-position="left">选择字段 v</el-divider>
-      <el-table ref="table" :data="fieldsOptions" height="300px"
-                @row-click="clickRow" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" />
-        <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="columnName" />
-        <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="columnComment" />
-        <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="columnType" />
-      </el-table>
-      <br><br>
-      <div align="center">
-        <el-button type="primary" @click="saveDisposition">确 定</el-button>
-        <el-button @click="disp.updFlag = false">取 消</el-button>
-      </div>
+  <div>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <span v-if="reqDispData && reqDispData.dbTableName">输入表信息:
+          <span v-for="item in reqDispData.dbTableName">{{ item }} &nbsp; &nbsp; </span>
+        </span>
+        <span v-else>无输入表</span>
+      </el-col>
+    </el-row>
+    <span>
+          <el-table ref="table" :data="reqDispData.fields" height="300px"
+                    @row-click="clickRow" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" />
+            <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="fieldName" />
+            <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="fieldComment" />
+            <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="fieldType" />
+          </el-table>
+    </span>
+    <br><br>
+    <div align="center">
+      <el-button type="primary" @click="toSelectResp">确 定</el-button>
+      <el-button @click="disp.updFlag = false">取 消</el-button>
     </div>
   </div>
 </template>
@@ -55,13 +28,14 @@
 <script>
 // 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 // 例如：import 《组件名称》 from '《组件路径》,
-import {listDbTableAll, selDbNameAll, selectDbTableColumnsByName} from "@/api/tool/gen";
-import {batchAddUpd} from "@/api/quest/disposition";
+import {listDisposition} from "@/api/quest/disposition";
 
 export default {
   // import引入的组件需要注入到对象中才能使用"
-  name: 'tableUpd',
+  name: 'exporUpd',
   props: {
+    data: {},
+    node: {},
     disp: {
       nodeCode: undefined,
       nodeType: undefined,
@@ -71,120 +45,37 @@ export default {
         db: {},
         fields: []
       }
-    }
+    },
+
   },
   data() {
     // 这里存放数据"
     return {
-      // 数据库列表
-      dbNameOptions: [],
-      // 展示数据表列表
-      tableOptions: [],
-      // 字段列表
-      fieldsOptions: [],
-      // 所有数据库列表
-      tableList: [],
-      queryParams: {}
+      // 上一级节点编码
+      preNodeId: [],
+      // 上一级节点配置信息
+      preNodeDisp: [],
+      // 最终选择的配置
+      selectDisp: [],
+      // 上一级节点配置信息整合
+      reqDispData: {
+        dbTableName: [],
+        fields: []
+      },
+      respDispData: {
+        dbTableName: [],
+        fields: []
+      }
     }
   },
   // 计算属性 类似于data概念",
   computed: {},
   // 生命周期 - 创建完成（可以访问当前this实例）",
   created() {
-
+    this.init()
   },
   // 方法集合",
   methods: {
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.tableOptions = []
-      this.tableList.forEach(table => {
-        const params = this.queryParams
-        if ((table.dbName === params.dbName || !params.dbName) &&
-          (table.tableName.includes(params.tableName) || !params.tableName) &&
-          (table.tableComment.includes(params.tableComment) || !params.tableComment)){
-          this.tableOptions.push(table)
-        }
-      })
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 表字段查询*/
-    selectTable(row) {
-      this.disp.formData.db = row
-      selectDbTableColumnsByName(row.dbName, row.tableName).then(res => {
-        this.fieldsOptions = res.data
-      })
-    },
-    clickRow(row) {
-      this.$refs.table.toggleRowSelection(row);
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.disp.formData.fields = selection.map(item => {
-        return {
-          fieldName: item.columnName,
-          fieldType: item.columnType,
-          fieldComment: item.columnComment
-        };
-      });
-    },
-    // 查询所有数据库名称
-    selDbNameList() {
-      selDbNameAll().then(res => {
-        this.dbNameOptions = res.data
-      })
-    },
-    // 查询所有表名称信息
-    getListAll() {
-      listDbTableAll().then(res => {
-        this.tableList = res.data;
-        this.tableOptions = res.data;
-      });
-    },
-    // csh() {
-    //   this.selDbNameList()
-    //   this.getListAll()
-    // },
-    // 保存配置按钮
-    saveDisposition() {
-      const dispData = this.disp.formData
-      const dispList = this.getMysqlDisp(dispData.db,dispData.fields)
-      batchAddUpd(dispList, this.disp.nodeCode).then(res => {
-        this.$message.success(res.msg)
-        this.disp.updFlag = false
-      })
-    },
-    /** 类型转换 vue -> mysql*/
-    getMysqlDisp(db, fields) {
-      const dispList = []
-      dispList.push({
-        nodeCode: this.disp.nodeCode,
-        dispKey: 'db',
-        dispLabel: '数据库',
-        dispValue: db.dbName,
-        dispType: 'string'
-      },{
-        nodeCode: this.disp.nodeCode,
-        dispKey: 'table',
-        dispLabel: db.tableComment,
-        dispValue: db.tableName,
-        dispType: 'string'
-      })
-      fields.forEach(field => {
-        dispList.push({
-          nodeCode: this.disp.nodeCode,
-          dispKey: 'fields',
-          dispLabel: field.fieldComment,
-          dispValue: field.fieldName,
-          dispType: field.fieldType
-        })
-      })
-      return dispList;
-    },
 
   }
 }
diff --git a/src/views/quest/node/components/node/type/tableFind.vue b/src/views/quest/node/components/node/type/tableFind.vue
index 8efd307..fc2f196 100644
--- a/src/views/quest/node/components/node/type/tableFind.vue
+++ b/src/views/quest/node/components/node/type/tableFind.vue
@@ -16,7 +16,7 @@
     <br><br>
     <div align="center">
       <el-button @click="disp.findFlag = false">确认</el-button>
-      <el-button type="primary" @click="this.disp.updFlag = true">修改配置</el-button>
+      <el-button type="primary" @click="disp.updFlag = true">修改配置</el-button>
     </div>
   </div>
 </template>
@@ -53,6 +53,9 @@ export default {
   },
   // 方法集合",
   methods: {
+    toUpd() {
+      this.disp.updFlag = true
+    }
   }
 }
 </script>
diff --git a/src/views/quest/node/components/node/type/tableUpd.vue b/src/views/quest/node/components/node/type/tableUpd.vue
index f652df3..4f12c72 100644
--- a/src/views/quest/node/components/node/type/tableUpd.vue
+++ b/src/views/quest/node/components/node/type/tableUpd.vue
@@ -114,6 +114,7 @@ export default {
     },
     /** 表字段查询*/
     selectTable(row) {
+      this.disp.formData.fields = []
       this.disp.formData.db = row
       selectDbTableColumnsByName(row.dbName, row.tableName).then(res => {
         this.fieldsOptions = res.data
diff --git a/src/views/quest/node/components/node/type/uniteFind.vue b/src/views/quest/node/components/node/type/uniteFind.vue
index aa4de1f..db2c1f0 100644
--- a/src/views/quest/node/components/node/type/uniteFind.vue
+++ b/src/views/quest/node/components/node/type/uniteFind.vue
@@ -15,27 +15,28 @@
           </el-select>
         </el-form-item>
         <el-form-item label="连接条件">
-          <el-select v-model="respDispData.joinData.form" placeholder="请选择一号表字段">
-            <el-option v-for="item in reqDispData.fieldList[0]" :label="item.columnName+'('+item.columnComment+')'" :value="item.columnName" />
+          <el-select v-model="respDispData.joinData.form.fieldName" placeholder="请选择一号表字段">
+            <el-option v-for="item in reqDispData.fields[0]" :label="item.tableName+'.'+item.fieldName+'('+item.fieldComment+')'" :value="item.fieldName" />
           </el-select>
           &nbsp;&nbsp;
-          <el-select v-model="respDispData.joinData.to" placeholder="请选择二号表字段">
-            <el-option v-for="item in reqDispData.fieldList[1]" :label="item.columnName+'('+item.columnComment+')'" :value="item.columnName" />
+          <el-select v-model="respDispData.joinData.to.fieldName" placeholder="请选择二号表字段">
+            <el-option v-for="item in reqDispData.fields[1]" :label="item.tableName+'.'+item.fieldName+'('+item.fieldComment+')'" :value="item.fieldName" />
           </el-select>
         </el-form-item>
         <el-form-item>
             <el-button @click="disp.findFlag = false">返回</el-button>
-            <el-button type="primary" @click="checkFieldsFlag = true">下一步</el-button>
+            <el-button type="primary" @click="checkFields">下一步</el-button>
         </el-form-item>
       </el-form>
     </div>
-    <el-dialog title="选择字段" :visible.sync="checkFieldsFlag" width="60%" append-to-body>
-      <el-table ref="table" :data="reqDispData.fields" height="300px"
+    <el-dialog title="选择字段" :visible.sync="checkFieldsFlag" width="70%" append-to-body>
+      <el-table ref="table" :data="reqDispData.fieldList" height="450px"
                 @row-click="clickRow" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" />
-        <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="columnName" />
-        <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="columnComment" />
-        <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="columnType" />
+        <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="fieldName" />
+        <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="fieldComment" />
+        <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="fieldType" />
+        <el-table-column :show-overflow-tooltip="true" label="字段所属表" prop="tableName" />
       </el-table>
       <br><br>
       <div align="center">
@@ -51,6 +52,7 @@
 // 例如：import 《组件名称》 from '《组件路径》,
 import {listDisposition} from "@/api/quest/disposition";
 import {selectDbTableColumnsByName} from "@/api/tool/gen";
+import {batchAddUpd} from "@/api/quest/disposition";
 
 export default {
   // import引入的组件需要注入到对象中才能使用"
@@ -82,8 +84,8 @@ export default {
         fields: [],
         join: '',
         joinData: {
-          form: '',
-          to: ''
+          form: {},
+          to: {}
         }
       },
       formData: {},
@@ -135,19 +137,39 @@ export default {
           this.respDispData.join = data.join
         }else{
           this.reqDispData.db.push(data.db)
-          this.respDispData.fields.push(data.fields)
-          selectDbTableColumnsByName(data.db.dbName,data.db.tableName).then(res => {
-            this.reqDispData.fieldList.push(res.data)
-          })
+          this.reqDispData.fields.push(data.fields)
         }
       })
     },
+    // 下一步按钮
+    checkFields() {
+      this.respDispData.db = this.reqDispData.db
+      this.reqDispData.fieldList = []
+      this.reqDispData.fieldList.push(...this.reqDispData.fields[0])
+      this.reqDispData.fieldList.push(...this.reqDispData.fields[1])
+      // 查询表字段
+      this.reqDispData.fields[0].forEach(field => {
+        if (this.respDispData.joinData.form.fieldName === field.fieldName){
+          this.respDispData.joinData.form = field
+        }
+      })
+      this.reqDispData.fields[1].forEach(field => {
+        if (this.respDispData.joinData.to.fieldName === field.fieldName){
+          this.respDispData.joinData.to = field
+        }
+      })
+      this.checkFieldsFlag = true
+    },
     // 保存选择
     save() {
       console.log('reqDispData',this.reqDispData)
       console.log('respDispData',this.respDispData)
-      this.checkFieldsFlag = false
-      this.disp.findFlag = false
+      const dispList = this.getMysqlDisp(this.respDispData)
+      batchAddUpd(dispList, this.disp.nodeCode).then(res => {
+        this.$message.success(res.msg)
+        this.checkFieldsFlag = false
+      })
+      // this.disp.findFlag = false
     },
     clickRow(row) {
       this.$refs.table.toggleRowSelection(row);
@@ -156,9 +178,11 @@ export default {
     handleSelectionChange(selection) {
       this.respDispData.fields = selection.map(item => {
         return {
-          fieldName: item.columnName,
-          fieldType: item.columnType,
-          fieldComment: item.columnComment
+          tableName: item.tableName,
+          fieldName: item.fieldName,
+          fieldType: item.fieldType,
+          fieldComment: item.fieldComment,
+          fieldDesc: item.fieldDesc
         };
       });
     },
@@ -166,6 +190,7 @@ export default {
     getVueDisp(dispList) {
       const db = {}
       const fields = []
+      let tableName = ''
       let join = ''
       let joinData = {
         form: '',
@@ -179,27 +204,105 @@ export default {
           db.tableName = disp.dispValue
           db.tableComment = disp.dispLabel
         }
+        tableName = db.dbName+'.'+db.tableName
+        db.dbTable = db.dbName+'.'+db.tableName+'('+db.tableComment +')'
         if (disp.dispKey === 'fields') {
           fields.push({
+            tableName: tableName,
             fieldName: disp.dispValue,
             fieldType: disp.dispType,
-            fieldComment: disp.dispLabel
+            fieldComment: disp.dispLabel,
+            fieldDesc: disp.fieldDesc
           })
         }
-        db.dbTable = db.dbName+'.'+db.tableName+'('+db.tableComment +')'
         if (disp.dispKey === 'joinDataForm') {
-          joinData.form = disp.dispValue
+          joinData.form.push({
+            tableName: tableName,
+            fieldName: disp.dispValue,
+            fieldType: disp.dispType,
+            fieldComment: disp.dispLabel,
+            fieldDesc: disp.fieldDesc
+          })
         }
         if (disp.dispKey === 'joinDataTo') {
-          joinData.to = disp.dispValue
+          joinData.to.push({
+            tableName: tableName,
+            fieldName: disp.dispValue,
+            fieldType: disp.dispType,
+            fieldComment: disp.dispLabel,
+            fieldDesc: disp.fieldDesc
+          })
         }
         if (disp.dispKey === 'join') {
           join = disp.dispValue
-          return {db, fields, join, joinData}
         }
       })
+      if (join !== '') {
+        return {db, fields, join, joinData}
+      }
       return {db, fields}
     },
+    /** 节点配置--unite 类型转换 vue -> mysql*/
+    getMysqlDisp(resp) {
+      const db = resp.db
+      const fields = resp.fields
+      const join = resp.join
+      const form = resp.joinData.form
+      const to = resp.joinData.to
+      // 处理数据库
+      const dispList = []
+      // 数据库
+      db.forEach(item => {
+        dispList.push({
+          nodeCode: this.node.id, // 节点编码
+          dispKey: 'db',  // 存储编码
+          dispLabel: item.tableComment, // 显示名称
+          dispValue: item.dbName, // 存储值
+          dispType: 'string',  // 存储类型
+          dispDesc: item.dbTable // 备注信息
+        })
+      })
+      // 表结构
+      fields.forEach(field => {
+        dispList.push({
+          nodeCode: this.node.id,
+          dispKey: 'fields',
+          dispLabel: field.fieldComment,
+          dispValue: field.fieldName,
+          dispType: field.fieldType,
+          dispDesc: field.tableName
+        })
+      })
+      // 连接方式
+      dispList.push({
+        nodeCode: this.node.id,
+        dispKey: 'join',
+        dispLabel: join,
+        dispValue: join,
+        dispType: 'String',
+        dispDesc: ''
+      })
+      // 连接字段1
+      dispList.push({
+        nodeCode: this.node.id,
+        dispKey: 'joinDataForm',
+        dispLabel: form.fieldComment,
+        dispValue: form.fieldName,
+        dispType: form.fieldType,
+        dispDesc: form.tableName
+      })
+      // 连接字段2
+      dispList.push({
+        nodeCode: this.node.id,
+        dispKey: 'joinDataTo',
+        dispLabel: to.fieldComment,
+        dispValue: to.fieldName,
+        dispType: to.fieldType,
+        dispDesc: to.tableName
+      })
+
+      return dispList
+    }
 
   }
 }

From 2755da368fd48e5d9e53d6f71bca5b0ff06687f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Sun, 1 Sep 2024 15:27:30 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=A1=A8=E7=BB=93=E6=9E=84,=E8=81=94?=
 =?UTF-8?q?=E5=90=88=E6=9F=A5=E8=AF=A2,=E6=95=B0=E6=8D=AE=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA=E7=9A=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quest/node/components/node/dispUpd.vue    |   4 +-
 .../node/components/node/type/exporFind.vue   | 345 +++++++++++++++---
 .../node/components/node/type/exporUpd.vue    | 298 ---------------
 .../node/components/node/type/exporUpd2.vue   |  85 -----
 .../node/components/node/type/uniteFind.vue   |  14 +-
 src/views/quest/task/index.vue                |  25 +-
 6 files changed, 314 insertions(+), 457 deletions(-)
 delete mode 100644 src/views/quest/node/components/node/type/exporUpd.vue
 delete mode 100644 src/views/quest/node/components/node/type/exporUpd2.vue

diff --git a/src/views/quest/node/components/node/dispUpd.vue b/src/views/quest/node/components/node/dispUpd.vue
index 0a629fc..a5aaf3f 100644
--- a/src/views/quest/node/components/node/dispUpd.vue
+++ b/src/views/quest/node/components/node/dispUpd.vue
@@ -22,13 +22,11 @@
 // 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 // 例如：import 《组件名称》 from '《组件路径》,
 import TableUpd from './type/tableUpd.vue'
-import ExporUpd from './type/exporUpd.vue'
-import {batchAddUpd} from "@/api/quest/disposition";
 
 export default {
   // import引入的组件需要注入到对象中才能使用"
   name: 'type-table',
-  components: {TableUpd, ExporUpd},
+  components: {TableUpd},
   props: {
     data: {},
     node: {},
diff --git a/src/views/quest/node/components/node/type/exporFind.vue b/src/views/quest/node/components/node/type/exporFind.vue
index b5084bf..7e68663 100644
--- a/src/views/quest/node/components/node/type/exporFind.vue
+++ b/src/views/quest/node/components/node/type/exporFind.vue
@@ -1,37 +1,123 @@
 <template>
-  <div @click="getInfo">
+  <div>
     <div>
-      <span v-if="disp.formData.db.formDb && disp.formData.db.formTable">输入表信息:
-        {{ disp.formData.db.formDb }}.
-        {{ disp.formData.db.formTable }}
-        ({{ disp.formData.db.formTableComment }})
+      <span v-if="formDb">
+        输入表信息: <br><br>
+        <span v-for="db in formDb">
+          <el-tag type="primary" v-if="db.dbTable">{{ db.dbTable }}</el-tag><br><br>
+        </span>
       </span>
       <span v-else>无输入表</span>
       <br><br>
-      <span v-if="disp.formData.db.toDb && disp.formData.db.toTable">输出表信息:
-        {{ disp.formData.db.toDb }}.
-        {{ disp.formData.db.toTable }}
-        ({{ disp.formData.db.toTableComment }})
+      <span v-if="toDb && toDb.dbTable">
+        输出表信息: <br><br>
+        <el-tag type="primary" v-if="toDb.dbTable">{{ toDb.dbTable }}</el-tag>
+        <el-button type="text" @click="checkFields">更改输出表</el-button>
+      </span>
+      <span v-else>
+        无输出表:
+        <el-button type="text" @click="checkFields">选择输出表</el-button>
       </span>
-      <span v-else>无输出表</span>
       <br><br>
     </div>
     <div align="center">
-      <el-table v-model="disp.formData.fields">
-        <el-table-column label="输入字段" prop="formFields" />
-        <el-table-column label="输出字段" prop="toFields" />
-      </el-table>
+        <el-table ref="table" :data="formFields" height="450px">
+          <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="fieldName" />
+          <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="fieldComment" />
+          <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="fieldType" />
+          <el-table-column :show-overflow-tooltip="true" label="字段所属表" prop="tableName" />
+          <el-table-column :show-overflow-tooltip="true" label="输出字段">
+            <span slot-scope="scope" v-if="fieldsList && fieldsList.get(scope.row.fieldName)">
+              {{ fieldsList.get(scope.row.fieldName).fieldName+ '(' + fieldsList.get(scope.row.fieldName).fieldComment + ')' }}
+            </span>
+          </el-table-column>
+        </el-table>
     </div>
     <div align="center">
-      <el-button @click="disp.findFlag = false">确认</el-button>
-      <el-button type="primary" @click="disp.updFlag = true">修改配置</el-button>
+      <el-button @click="disp.findFlag = false">返回</el-button>
+      <el-button type="primary" disp.findFlag = false>确认</el-button>
     </div>
+
+    <el-dialog title="选择输出表" :visible.sync="checkFieldsFlag" width="60%">
+      <div style="padding-left: 10px;padding-right: 10px;">
+        <el-form ref="queryForm" :inline="true" :model="queryParams" size="small">
+          <el-form-item label="数据库名称" prop="dbName">
+            <el-select v-model="queryParams.dbName" placeholder="请选择数据库" clearable @change="handleQuery">
+              <el-option v-for="item in dbNameOptions" :key="item" :label="item" :value="item"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="表名称" prop="tableName">
+            <el-input
+              v-model="queryParams.tableName"
+              clearable
+              @change="handleQuery"
+              placeholder="请输入表名称" />
+          </el-form-item>
+          <el-form-item label="表描述" prop="tableComment">
+            <el-input
+              v-model="queryParams.tableComment"
+              clearable
+              @change="handleQuery"
+              placeholder="请输入表描述" />
+          </el-form-item>
+          <el-form-item>
+            <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">查找</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table ref="table" :data="tableOptions" height="300px">
+          <el-table-column :show-overflow-tooltip="true" label="表名称" prop="tableName" />
+          <el-table-column :show-overflow-tooltip="true" label="表描述" prop="tableComment" />
+          <el-table-column label="操作" width="50px">
+            <template slot-scope="scope">
+              <el-button type="text" @click="selectTable(scope.row)">选择</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-divider content-position="left">选择字段 v</el-divider>
+        <el-table ref="table" :data="fieldsOptions" height="280px"
+                  @row-click="clickRow" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" />
+          <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="columnName" />
+          <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="columnComment" />
+          <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="columnType" />
+        </el-table>
+        <br><br>
+        <div align="center">
+          <el-button @click="checkFieldsFlag = false">取 消</el-button>
+          <el-button type="primary" @click="checkFieldsFlag = false;checkFieldsMapFlag = true">下一步</el-button>
+        </div>
+      </div>
+    </el-dialog>
+    <el-dialog title="选择字段" :visible.sync="checkFieldsMapFlag" width="60%">
+      <div style="padding-left: 10px;padding-right: 10px;">
+        <el-table ref="table" :data="formFields" height="500px">
+          <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="fieldName" />
+          <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="fieldComment" />
+          <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="fieldType" />
+          <el-table-column :show-overflow-tooltip="true" label="字段所属表" prop="tableName" />
+          <el-table-column :show-overflow-tooltip="true" label="目标字段">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.toFidlesName" placeholder="请选择字段">
+                <el-option v-for="field in toFields" :label="field.fieldName+'('+field.fieldComment+')'" :value="field.fieldName"/>
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div align="center">
+          <el-button @click="checkFieldsMapFlag = false;checkFieldsFlag = true;">上一步</el-button>
+          <el-button type="primary" @click="save">确认</el-button>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 // 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 // 例如：import 《组件名称》 from '《组件路径》,
+import {batchAddUpd, listDisposition} from "../../../../../../api/quest/disposition";
+import {listDbTableAll, selDbNameAll, selectDbTableColumnsByName} from "../../../../../../api/tool/gen";
+
 export default {
   // import引入的组件需要注入到对象中才能使用"
   name: 'exporFind',
@@ -51,7 +137,24 @@ export default {
   },
   data() {
     // 这里存放数据"
-    return {}
+    return {
+      formDb: [],
+      toDb: {},
+      formFields: [],
+      toFields: [],
+      fieldsList: new Map(),
+      checkFieldsFlag: false,
+      checkFieldsMapFlag: false,
+      // 数据库列表
+      dbNameOptions: [],
+      // 展示数据表列表
+      tableOptions: [],
+      // 字段列表
+      fieldsOptions: [],
+      // 所有数据库列表
+      tableList: [],
+      queryParams: {}
+    }
   },
   // 计算属性 类似于data概念",
   computed: {},
@@ -62,52 +165,176 @@ export default {
   // 方法集合",
   methods: {
     // 初始化
-    info() {
-      console.log(this.data)
-      console.log(this.node)
+    init() {
+      // 查询上级的所有节点
+      /** 1.查询该节点的上一级节点*/
+      this.data.lineList.forEach(line => {
+        if (line.to === this.node.id){
+          listDisposition({nodeCode: line.from}).then(res => {
+            const data = this.getVueDisp(res.data.rows)
+            this.formDb = data.db
+            this.formFields = data.fields
+          })
+        }
+      })
+      // 查询自身
+      listDisposition({nodeCode: this.node.id}).then(res => {
+        const data = this.getVueDisp(res.data.rows)
+        console.log(data)
+        this.toDb = data.toDb
+        this.fieldsList = data.fieldsMap
+      })
     },
-    /** 类型转换 mysql -> vue */
-    getVueDisp(dispList) {
-      let type = this.node.type
-      const db = {}
-      const fields = []
-      if (type === 'exportation') {
-        let i = 0
-        let j = 0
-        dispList.forEach(disp => {
-          if (disp.dispKey === 'formDb'){
-            db.formDb = disp.dispValue
-          }
-          if (disp.dispKey === 'formTable'){
-            db.formTable = disp.dispValue
-            db.formTableComment = disp.dispLabel
-          }
-          if (disp.dispKey === 'toDb'){
-            db.toDb = disp.dispValue
-          }
-          if (disp.dispKey === 'toTable'){
-            db.toTable = disp.dispValue
-            db.toTableComment = disp.dispLabel
-          }
-          if (disp.dispKey === 'formFields'){
-            fields.push({
-              id: i++,
-              fieldName: disp.dispValue,
-              fieldType: disp.dispType,
-              fieldComment: disp.dispLabel
-            })
-          }
-          if (disp.dispKey === 'toFields'){
-            fields.push({
-              id: j++,
-              fieldName: disp.dispValue,
-              fieldType: disp.dispType,
-              fieldComment: disp.dispLabel
-            })
+    // 选择数据库按钮
+    checkFields() {
+      this.selDbNameList()
+      this.getListAll()
+      this.checkFieldsFlag = true
+    },
+    // 保存目标数据库
+    save() {
+      console.log('formDb',this.formDb)
+      console.log('toDb',this.toDb)
+      console.log('formFields',this.formFields)
+      console.log('toFields',this.toFields)
+      console.log('fieldsList',this.fieldsList)
+      // 处理输入字段与输出字段
+      const field = this.formFields
+      let map = field.map(item => [item.fieldName, item.toFidlesName]);
+      this.fieldsList = new Map()
+      map.forEach(item => {
+        this.toFields.forEach(toField => {
+          if (toField.fieldName === item[1]){
+            this.fieldsList.set(item[0], toField)
           }
         })
+      })
+      // 格式转换
+      let mysqlDisp = this.getMysqlDisp(this.toDb,this.fieldsList);
+      // 保存数据库
+      batchAddUpd(mysqlDisp, this.disp.nodeCode).then(res => {
+        this.$message.success(res.msg)
+        this.checkFieldsFlag = false
+        this.checkFieldsMapFlag = false
+      })
+
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.tableOptions = []
+      this.tableList.forEach(table => {
+        const params = this.queryParams
+        if ((table.dbName === params.dbName || !params.dbName) &&
+          (table.tableName.includes(params.tableName) || !params.tableName) &&
+          (table.tableComment.includes(params.tableComment) || !params.tableComment)){
+          this.tableOptions.push(table)
+        }
+      })
+    },
+    /** 表字段查询*/
+    selectTable(row) {
+      this.toFields.fields = []
+      this.toDb = {
+        dbName: row.dbName,
+        tableName: row.tableName,
+        tableComment: row.tableComment,
+        dbTable: row.dbName+'.'+row.tableName+'('+ row.tableComment +')'
       }
-      return {db, fields}
+      selectDbTableColumnsByName(row.dbName, row.tableName).then(res => {
+        this.fieldsOptions = res.data
+      })
+    },
+    clickRow(row) {
+      this.$refs.table.toggleRowSelection(row);
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.toFields = selection.map(item => {
+        return {
+          dbTable: this.toDb.dbName+'.'+this.toDb.tableName,
+          fieldName: item.columnName,
+          fieldType: item.columnType,
+          fieldComment: item.columnComment
+        };
+      });
+    },
+    // 查询所有数据库名称
+    selDbNameList() {
+      selDbNameAll().then(res => {
+        this.dbNameOptions = res.data
+      })
+    },
+    // 查询所有表名称信息
+    getListAll() {
+      listDbTableAll().then(res => {
+        this.tableList = res.data;
+        this.tableOptions = res.data;
+      });
+    },
+    /** 节点配置 类型转换 mysql -> vue */
+    getVueDisp(dispList) {
+      const db = []
+      const fields = []
+      const fieldsMap = new Map()
+      let toDb = {}
+      dispList.forEach(disp => {
+        if (disp.dispKey === 'table') {
+          db.push({
+            dbName: disp.dispDesc,
+            tableName: disp.dispValue,
+            tableComment: disp.dispLabel,
+            dbTable: disp.dispDesc+'.'+disp.dispValue+'('+disp.dispLabel+')'
+          })
+        }
+        if (disp.dispKey === 'fields') {
+          fields.push({
+            tableName: disp.dispDesc,
+            fieldName: disp.dispValue,
+            fieldType: disp.dispType,
+            fieldComment: disp.dispLabel
+          })
+        }
+        // 输出调整
+        if (disp.dispKey === 'toDb'){
+          toDb = {
+            dbName: disp.dispDesc,
+            tableName: disp.dispValue,
+            tableComment: disp.dispLabel,
+            dbTable: disp.dispDesc+'.'+disp.dispValue+'('+disp.dispLabel+')'
+          }
+        }
+        if (disp.dispKey === 'toFields'){
+          fieldsMap.set(disp.dispDesc, {
+            fieldName: disp.dispValue,
+            fieldType: disp.dispType,
+            fieldComment: disp.dispLabel
+          })
+        }
+      })
+      return {db, fields, toDb, fieldsMap}
+    },
+    /** 节点配置 expor vue 转 mysql */
+    getMysqlDisp(db, fields) {
+      const dispList = []
+      dispList.push({
+        nodeCode: this.node.id,
+        dispKey: 'toDb',
+        dispDesc: db.dbName,
+        dispValue: db.tableName,
+        dispLabel: db.tableComment,
+        dispType: 'String'
+      })
+      fields.keys().forEach(key => {
+        dispList.push({
+          nodeCode: this.node.id,
+          dispKey: 'toFields',
+          dispDesc: key,
+          dispValue: fields.get(key).fieldName,
+          dispLabel: fields.get(key).fieldComment,
+          dispType: fields.get(key).fieldType
+        })
+      })
+      return dispList;
     }
   }
 }
diff --git a/src/views/quest/node/components/node/type/exporUpd.vue b/src/views/quest/node/components/node/type/exporUpd.vue
deleted file mode 100644
index f5899e0..0000000
--- a/src/views/quest/node/components/node/type/exporUpd.vue
+++ /dev/null
@@ -1,298 +0,0 @@
-<template>
-  <div>
-    <div style="padding-left: 10px;padding-right: 10px;">
-      <h3>选择输出数据库</h3>
-      <el-form ref="queryForm" :inline="true" :model="queryParams" size="small">
-        <el-form-item label="数据库名称" prop="dbName">
-          <el-select v-model="queryParams.dbName" placeholder="请选择数据库" clearable @change="handleQuery">
-            <el-option v-for="item in dbNameOptions" :key="item" :label="item" :value="item"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="表名称" prop="tableName">
-          <el-input
-            v-model="queryParams.tableName"
-            clearable
-            @change="handleQuery"
-            placeholder="请输入表名称" />
-        </el-form-item>
-        <el-form-item label="表描述" prop="tableComment">
-          <el-input
-            v-model="queryParams.tableComment"
-            clearable
-            @change="handleQuery"
-            placeholder="请输入表描述" />
-        </el-form-item>
-      </el-form>
-      <el-table ref="table" :data="tableOptions" height="300px">
-        <el-table-column :show-overflow-tooltip="true" label="表名称" prop="tableName" />
-        <el-table-column :show-overflow-tooltip="true" label="表描述" prop="tableComment" />
-        <el-table-column label="操作" width="50px">
-          <template slot-scope="scope">
-            <el-button type="text" @click="selectTable(scope.row)">选择</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <br><br>
-      <div align="center">
-        <el-button type="primary" @click="checkFields">确 定</el-button>
-        <el-button @click="disp.updFlag = false">取 消</el-button>
-      </div>
-    </div>
-    <div>
-      <el-dialog title="字段选择" :visible.sync="fieldsFlag" width="60%" append-to-body>
-        <el-table ref="table" :data="reqDispData.fields" height="300px">
-          <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="fieldName" />
-          <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="fieldComment" />
-          <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="fieldType" />
-          <el-table-column :show-overflow-tooltip="true" label="输出字段">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.toName" placeholder="请选择输出字段">
-                <el-option v-for="item in respDispData.fields"
-                           :key="item.columnName"
-                           :label="item.columnName+'('+item.columnComment+')'"
-                           :value="item.columnName"
-                />
-              </el-select>
-            </template>
-          </el-table-column>
-        </el-table>
-        <br><br>
-        <el-button type="primary" @click="saveDisposition">确 定</el-button>
-      </el-dialog>
-    </div>
-  </div>
-</template>
-
-<script>
-// 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
-// 例如：import 《组件名称》 from '《组件路径》,
-import {listDbTableAll, selDbNameAll, selectDbTableColumnsByName} from "@/api/tool/gen";
-import {batchAddUpd} from "@/api/quest/disposition";
-import {listDisposition} from "../../../../../../api/quest/disposition";
-
-export default {
-  // import引入的组件需要注入到对象中才能使用"
-  name: 'tableUpd',
-  props: {
-    data: {},
-    node: {},
-    disp: {
-      nodeCode: undefined,
-      nodeType: undefined,
-      findFlag: false,
-      updFlag: false,
-      formData: {
-        db: {},
-        fields: []
-      }
-    }
-  },
-  data() {
-    // 这里存放数据"
-    return {
-      // 数据库列表
-      dbNameOptions: [],
-      // 展示数据表列表
-      tableOptions: [],
-      // 字段列表
-      fieldsOptions: [],
-      // 所有数据库列表
-      tableList: [],
-      queryParams: {},
-      // 上一级节点编码
-      preNodeId: [],
-      // 上一级节点配置信息
-      preNodeDisp: [],
-      // 最终选择的配置
-      selectDisp: [],
-      // 上一级节点配置信息整合
-      reqDispData: {
-        dbTableName: [],
-        fields: []
-      },
-      respDispData: {
-        dbTableName: [],
-        fields: []
-      },
-      fieldsFlag: false,
-    }
-  },
-  // 计算属性 类似于data概念",
-  computed: {},
-  // 生命周期 - 创建完成（可以访问当前this实例）",
-  created() {
-    this.csh()
-  },
-  // 方法集合",
-  methods: {
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.tableOptions = []
-      this.tableList.forEach(table => {
-        const params = this.queryParams
-        if ((table.dbName === params.dbName || !params.dbName) &&
-          (table.tableName.includes(params.tableName) || !params.tableName) &&
-          (table.tableComment.includes(params.tableComment) || !params.tableComment)){
-          this.tableOptions.push(table)
-        }
-      })
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 表字段查询*/
-    selectTable(row) {
-      this.respDispData.dbTableName = row.dbName+'.'+row.tableName+'('+row.tableComment+')'
-      selectDbTableColumnsByName(row.dbName, row.tableName).then(res => {
-        this.respDispData.fields = res.data
-      })
-    },
-    clickRow(row) {
-      this.$refs.table.toggleRowSelection(row);
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.disp.formData.fields = selection.map(item => {
-        return {
-          fieldName: item.columnName,
-          fieldType: item.columnType,
-          fieldComment: item.columnComment
-        };
-      });
-    },
-    // 查询所有数据库名称
-    selDbNameList() {
-      selDbNameAll().then(res => {
-        this.dbNameOptions = res.data
-      })
-    },
-    // 查询所有表名称信息
-    getListAll() {
-      listDbTableAll().then(res => {
-        this.tableList = res.data;
-        this.tableOptions = res.data;
-      });
-    },
-    csh() {
-      this.selDbNameList()
-      this.getListAll()
-      this.init()
-    },
-    // 启动按钮
-    checkFields() {
-      this.fieldsFlag = true
-      this.saveDisposition()
-    },
-    // 保存配置按钮
-    saveDisposition() {
-      console.log('dbNameOptions',this.dbNameOptions)
-      console.log('tableOptions',this.tableOptions)
-      console.log('fieldsOptions',this.fieldsOptions)
-      console.log('tableList',this.tableList)
-      console.log('queryParams',this.queryParams)
-      console.log('preNodeId',this.preNodeId)
-      console.log('preNodeDisp',this.preNodeDisp)
-      console.log('selectDisp',this.selectDisp)
-      console.log('reqDispData',this.reqDispData)
-      console.log('respDispData',this.respDispData)
-    },
-    /** 类型转换 vue -> mysql*/
-    getMysqlDisp(db, fields) {
-      const dispList = []
-      dispList.push({
-        nodeCode: this.disp.nodeCode,
-        dispKey: 'db',
-        dispLabel: '数据库',
-        dispValue: db.dbName,
-        dispType: 'string'
-      },{
-        nodeCode: this.disp.nodeCode,
-        dispKey: 'table',
-        dispLabel: db.tableComment,
-        dispValue: db.tableName,
-        dispType: 'string'
-      })
-      fields.forEach(field => {
-        dispList.push({
-          nodeCode: this.disp.nodeCode,
-          dispKey: 'fields',
-          dispLabel: field.fieldComment,
-          dispValue: field.fieldName,
-          dispType: field.fieldType
-        })
-      })
-      return dispList;
-    },
-    init() {
-      /** 1.查询该节点的上一级节点*/
-      this.data.lineList.forEach(line => {
-        if (line.to === this.node.id){
-          this.preNodeId.push(line.from)
-        }
-      })
-      this.preNodeId = [...new Set(this.preNodeId)]
-      console.log(1,this.preNodeId)
-      /** 2.获取上一级节点的配置参数*/
-      if (this.preNodeId){
-        this.preNodeId.forEach(id => {
-          this.findDisp(id)
-        })
-      }
-      setTimeout(() => {
-        this.init2()
-      },1000)
-    },
-    init2() {
-      let i = 1
-      console.log(2,this.preNodeDisp)
-      this.preNodeDisp.forEach(nodeDisp => {
-        console.log(3, nodeDisp)
-        let dbTableName = nodeDisp.db.dbName + '.' +
-          nodeDisp.db.tableName + '(' + nodeDisp.db.tableComment + ')';
-        this.reqDispData.dbTableName.push(dbTableName)
-        nodeDisp.fields.forEach(field => {
-          field.id = i++
-          this.reqDispData.fields.push(field)
-        })
-      })
-      console.log(4, this.reqDispData)
-    },
-    findDisp(nodeCode) {
-      listDisposition({nodeCode: nodeCode}).then(res => {
-        this.preNodeDisp.push(this.getVueDisp(res.data.rows))
-      })
-    },
-    // 选择完成输入表字段
-    toSelectResp() {
-      console.log(this.selectDisp)
-    },
-    /** 类型转换 mysql -> vue */
-    getVueDisp(dispList) {
-      const db = {}
-      const fields = []
-      dispList.forEach(disp => {
-        if (disp.dispKey === 'db') {
-          db.dbName = disp.dispValue
-        }
-        if (disp.dispKey === 'table') {
-          db.tableName = disp.dispValue
-          db.tableComment = disp.dispLabel
-        }
-        if (disp.dispKey === 'fields') {
-          fields.push({
-            fieldName: disp.dispValue,
-            fieldType: disp.dispType,
-            fieldComment: disp.dispLabel
-          })
-        }
-      })
-      return {db, fields}
-    }
-  }
-}
-</script>
-<style scoped>
-
-</style>
diff --git a/src/views/quest/node/components/node/type/exporUpd2.vue b/src/views/quest/node/components/node/type/exporUpd2.vue
deleted file mode 100644
index 2a4a2be..0000000
--- a/src/views/quest/node/components/node/type/exporUpd2.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<template>
-  <div>
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <span v-if="reqDispData && reqDispData.dbTableName">输入表信息:
-          <span v-for="item in reqDispData.dbTableName">{{ item }} &nbsp; &nbsp; </span>
-        </span>
-        <span v-else>无输入表</span>
-      </el-col>
-    </el-row>
-    <span>
-          <el-table ref="table" :data="reqDispData.fields" height="300px"
-                    @row-click="clickRow" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" />
-            <el-table-column :show-overflow-tooltip="true" label="字段名称" prop="fieldName" />
-            <el-table-column :show-overflow-tooltip="true" label="字段描述" prop="fieldComment" />
-            <el-table-column :show-overflow-tooltip="true" label="字段类型" prop="fieldType" />
-          </el-table>
-    </span>
-    <br><br>
-    <div align="center">
-      <el-button type="primary" @click="toSelectResp">确 定</el-button>
-      <el-button @click="disp.updFlag = false">取 消</el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-// 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
-// 例如：import 《组件名称》 from '《组件路径》,
-import {listDisposition} from "@/api/quest/disposition";
-
-export default {
-  // import引入的组件需要注入到对象中才能使用"
-  name: 'exporUpd',
-  props: {
-    data: {},
-    node: {},
-    disp: {
-      nodeCode: undefined,
-      nodeType: undefined,
-      findFlag: false,
-      updFlag: false,
-      formData: {
-        db: {},
-        fields: []
-      }
-    },
-
-  },
-  data() {
-    // 这里存放数据"
-    return {
-      // 上一级节点编码
-      preNodeId: [],
-      // 上一级节点配置信息
-      preNodeDisp: [],
-      // 最终选择的配置
-      selectDisp: [],
-      // 上一级节点配置信息整合
-      reqDispData: {
-        dbTableName: [],
-        fields: []
-      },
-      respDispData: {
-        dbTableName: [],
-        fields: []
-      }
-    }
-  },
-  // 计算属性 类似于data概念",
-  computed: {},
-  // 生命周期 - 创建完成（可以访问当前this实例）",
-  created() {
-    this.init()
-  },
-  // 方法集合",
-  methods: {
-
-  }
-}
-</script>
-<style scoped>
-
-</style>
diff --git a/src/views/quest/node/components/node/type/uniteFind.vue b/src/views/quest/node/components/node/type/uniteFind.vue
index db2c1f0..188ad32 100644
--- a/src/views/quest/node/components/node/type/uniteFind.vue
+++ b/src/views/quest/node/components/node/type/uniteFind.vue
@@ -245,6 +245,7 @@ export default {
     /** 节点配置--unite 类型转换 vue -> mysql*/
     getMysqlDisp(resp) {
       const db = resp.db
+      const table = resp.db
       const fields = resp.fields
       const join = resp.join
       const form = resp.joinData.form
@@ -256,12 +257,23 @@ export default {
         dispList.push({
           nodeCode: this.node.id, // 节点编码
           dispKey: 'db',  // 存储编码
-          dispLabel: item.tableComment, // 显示名称
+          dispLabel: '数据库', // 显示名称
           dispValue: item.dbName, // 存储值
           dispType: 'string',  // 存储类型
           dispDesc: item.dbTable // 备注信息
         })
       })
+      // 数据表
+      table.forEach(item => {
+        dispList.push({
+          nodeCode: this.node.id,
+          dispKey: 'table',
+          dispLabel: item.tableComment,
+          dispValue: item.tableName,
+          dispType: 'string',
+          dispDesc: item.dbTable
+        })
+      })
       // 表结构
       fields.forEach(field => {
         dispList.push({
diff --git a/src/views/quest/task/index.vue b/src/views/quest/task/index.vue
index 1057a47..9d27593 100644
--- a/src/views/quest/task/index.vue
+++ b/src/views/quest/task/index.vue
@@ -75,9 +75,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="任务编码" align="center" prop="taskCode" />
       <el-table-column label="任务名称" align="center" prop="taskName" />
-      <el-table-column label="任务触发器" align="center" prop="taskWebhook" />
-      <el-table-column label="规则编码" align="center" prop="ruleCode" />
-      <el-table-column label="任务类型" align="center" prop="taskType" />
+      <el-table-column label="任务优先级" align="center" prop="taskType" />
       <el-table-column label="任务内容" align="center" prop="taskData" />
       <el-table-column label="启用状态" align="center" prop="state">
         <template slot-scope="scope">
@@ -125,11 +123,13 @@
         <el-form-item label="任务名称" prop="taskName">
           <el-input v-model="form.taskName" placeholder="请输入任务名称" />
         </el-form-item>
-        <el-form-item label="任务触发器" prop="taskWebhook">
-          <el-input v-model="form.taskWebhook" placeholder="请输入任务触发器" />
-        </el-form-item>
-        <el-form-item label="规则编码" prop="ruleCode">
-          <el-input v-model="form.ruleCode" placeholder="请输入规则编码" />
+        <el-form-item label="任务优先级" prop="taskType">
+          <el-select v-model="form.taskType" placeholder="请选择任务类型">
+            <el-option label="低"/>
+            <el-option label="中"/>
+            <el-option label="高"/>
+            <el-option label="紧急"/>
+          </el-select>
         </el-form-item>
         <el-form-item label="任务内容">
           <editor v-model="form.taskData" :min-height="192"/>
@@ -184,7 +184,10 @@ export default {
         state: null,
       },
       // 表单参数
-      form: {},
+      form: {
+        taskType: '低',
+        state: "Y"
+      },
       // 表单校验
       rules: {
         taskCode: [
@@ -220,9 +223,9 @@ export default {
         taskName: null,
         taskWebhook: null,
         ruleCode: null,
-        taskType: null,
+        taskType: '低',
         taskData: null,
-        state: null,
+        state: 'Y',
         createBy: null,
         createTime: null,
         updateBy: null,