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/Home.vue b/src/views/quest/node/Home.vue
index dbd2c04..e274391 100644
--- a/src/views/quest/node/Home.vue
+++ b/src/views/quest/node/Home.vue
@@ -20,7 +20,7 @@
@@ -85,7 +85,7 @@ export default {
this.$nextTick(() => {
setTimeout(() => {
this.init()
- },1000)
+ },1500)
});
},
methods: {
@@ -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 = []
diff --git a/src/views/quest/node/components/node-item.vue b/src/views/quest/node/components/node-item.vue
index 653cd87..f7654b4 100644
--- a/src/views/quest/node/components/node-item.vue
+++ b/src/views/quest/node/components/node-item.vue
@@ -17,90 +17,9 @@
-
-
-
-
数据库: {{ disposition.formData.dbName }}
-
-
数据表: {{ disposition.formData.table }}
-
-
-
-
-
-
-
-
-
- 确认
- 修改配置
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查找
- 重置
-
-
-
-
-
-
-
- 选择
-
-
-
-
- 选择字段 v
-
-
-
-
-
-
-
-
- 确 定
- 取 消
-
-
+
+
@@ -108,10 +27,20 @@
diff --git a/src/views/quest/node/components/node/dispFind.vue b/src/views/quest/node/components/node/dispFind.vue
new file mode 100644
index 0000000..6f8d583
--- /dev/null
+++ b/src/views/quest/node/components/node/dispFind.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/quest/node/components/node/dispUpd.vue b/src/views/quest/node/components/node/dispUpd.vue
new file mode 100644
index 0000000..a5aaf3f
--- /dev/null
+++ b/src/views/quest/node/components/node/dispUpd.vue
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
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..7e68663
--- /dev/null
+++ b/src/views/quest/node/components/node/type/exporFind.vue
@@ -0,0 +1,344 @@
+
+
+
+
+ 输入表信息:
+
+ {{ db.dbTable }}
+
+
+ 无输入表
+
+
+ 输出表信息:
+ {{ toDb.dbTable }}
+ 更改输出表
+
+
+ 无输出表:
+ 选择输出表
+
+
+
+
+
+
+
+
+
+
+
+ {{ fieldsList.get(scope.row.fieldName).fieldName+ '(' + fieldsList.get(scope.row.fieldName).fieldComment + ')' }}
+
+
+
+
+
+ 返回
+ 确认
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查找
+
+
+
+
+
+
+
+ 选择
+
+
+
+
选择字段 v
+
+
+
+
+
+
+
+
+ 取 消
+ 下一步
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上一步
+ 确认
+
+
+
+
+
+
+
+
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..fc2f196
--- /dev/null
+++ b/src/views/quest/node/components/node/type/tableFind.vue
@@ -0,0 +1,64 @@
+
+
+
配置表信息:
+ {{ disp.formData.db.dbName }}.
+ {{ disp.formData.db.tableName }}
+ ({{ disp.formData.db.tableComment }})
+
+
无配置表
+
+
+
+
+
+
+
+
+
+ 确认
+ 修改配置
+
+
+
+
+
+
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..4f12c72
--- /dev/null
+++ b/src/views/quest/node/components/node/type/tableUpd.vue
@@ -0,0 +1,195 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查找
+ 重置
+
+
+
+
+
+
+
+ 选择
+
+
+
+
选择字段 v
+
+
+
+
+
+
+
+
+ 确 定
+ 取 消
+
+
+
+
+
+
+
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..188ad32
--- /dev/null
+++ b/src/views/quest/node/components/node/type/uniteFind.vue
@@ -0,0 +1,324 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 返回
+ 下一步
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 返回
+ 保存
+
+
+
+
+
+
+
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 => {
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 @@
-
-
-
+
@@ -125,11 +123,13 @@
-
-
-
-
-
+
+
+
+
+
+
+
@@ -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,
diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue
index 2e039ba..c00a281 100644
--- a/src/views/rule/rule/version.vue
+++ b/src/views/rule/rule/version.vue
@@ -32,7 +32,6 @@
-
{{ rule.name }}
@@ -194,7 +193,6 @@
-
@@ -224,9 +222,9 @@
-
+
- 生成版本类
+ 生成版本类
@@ -319,7 +317,7 @@ export default {
data() {
return {
- curCode: '测试',
+ curCode: '测23456789asdad试',
cmOptions: {
lineNumbers: true, // 显示行号
mode: 'text/x-yaml', // 语法model
@@ -328,6 +326,7 @@ export default {
lint: true, // 开启语法检查
},
+
ruleAndEditionList: [],
//版本
ruleAndEdition: {},
@@ -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 = "添加规则";
},