From ba9d9ace9586066c470803d3f33b920a538ab889 Mon Sep 17 00:00:00 2001 From: chentaisen <14615430+chentaisen@user.noreply.gitee.com> Date: Sun, 25 Aug 2024 22:22:12 +0800 Subject: [PATCH 01/23] Changes --- src/views/rule/rule/version.vue | 35 +++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue index 607b087..0cbba1c 100644 --- a/src/views/rule/rule/version.vue +++ b/src/views/rule/rule/version.vue @@ -81,6 +81,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/quest/node/components/node-item.vue b/src/views/quest/node/components/node-item.vue index 4f283b2..1d1e2b6 100644 --- a/src/views/quest/node/components/node-item.vue +++ b/src/views/quest/node/components/node-item.vue @@ -17,6 +17,16 @@
+ + + + + + + + + + @@ -43,6 +53,8 @@ export default { }, data() { return { + // updNameFlag: false, + // newNodeName: '', mouseEnter: false, isActive: false, isSelected: false @@ -58,7 +70,20 @@ export default { onContextmenu() { this.$contextmenu({ items: [{ - label: '删除', + label: '修改名称', + disabled: false, + icon: "", + onClick: () => { + // this.toUpdName(); + this.newNodeName = prompt("请输入新名称："); + if (this.newNodeName !== null) { + this.$emit('setNodeName', this.node.id, this.newNodeName) + } else { + alert("操作取消!"); + } + } + },{ + label: '删除节点', disabled: false, icon: "", onClick: () => { @@ -93,30 +118,35 @@ export default { this.isActive = false }, editNode() { - this.newNodeName = this.node.nodeName - this.$Modal.confirm({ - render: (h) => { - return h('Input', { - props: { - value: this.newNodeName, - autofocus: true - }, - on: { - input: (val) => { - this.newNodeName = val; - } - } - }) - }, - onOk: () => { - console.log(this.newNodeName) - this.$emit('setNodeName', this.node.id, this.newNodeName) - } - }) + this.newNodeName = prompt("请输入新名称："); + if (this.newNodeName !== null) { + this.$emit('setNodeName', this.node.id, this.newNodeName) + } else { + alert("操作取消!"); + } }, deleteNode() { this.$emit("deleteNode", this.node) }, + // toUpdName() { + // this.updNameFlag = true + // }, + // doUpdName() { + // this.$emit('setNodeName', this.node.id, this.newNodeName) + // this.updNameFlag = false + // }, + /** jsPlumb节点类型 --> 数据库节点类型 */ + toMysqlNode(node){ + return { + nodeCode: '', + nodeName: '', + nodeReq: '', + nodeResp: '', + nodePreCode: '', + nodeNextCode: '', + state: '' + } + } } }; diff --git a/src/views/quest/node/config/methods.js b/src/views/quest/node/config/methods.js index 786c0a9..1fc4b23 100644 --- a/src/views/quest/node/config/methods.js +++ b/src/views/quest/node/config/methods.js @@ -11,14 +11,6 @@ const methods = { let res = () => { } //此处可以添加是否创建连接的校验， 返回 false 则不添加； return res }) - // 连线创建成功后，维护本地数据 - this.jsPlumb.bind("connection", evt => { - this.addLine(evt) - }); - //连线双击删除事件 - this.jsPlumb.bind("dblclick",(conn, originalEvent) => { - this.confirmDelLine(conn) - }) //断开连线后，维护本地数据 this.jsPlumb.bind("connectionDetached", evt => { this.deleLine(evt) @@ -26,6 +18,10 @@ const methods = { this.loadEasyFlow(); // 会使整个jsPlumb立即重绘。 this.jsPlumb.setSuspendDrawing(false, true); + // 连线创建成功后，维护本地数据 + this.jsPlumb.bind("connection", evt => { + this.addLine(evt) + }); }); this.initPanZoom(); }, @@ -65,7 +61,12 @@ const methods = { Remark: "" }); }); + //连线双击删除事件 + this.jsPlumb.bind("dblclick",(conn, originalEvent) => { + this.confirmDelLine(conn) + }) }, + // 拖动节点 draggableNode(nodeId) { this.jsPlumb.draggable(nodeId, { grid: this.commonGrid, @@ -98,6 +99,7 @@ const methods = { this.auxiliaryLine.isShowYLine = showYLine this.auxiliaryLine.isShowXLine = showXLine }, + // 检查节点位置 changeNodePosition(nodeId, pos) { this.data.nodeList.some(v => { if(nodeId == v.id) { @@ -126,9 +128,11 @@ const methods = { }; this.addNode(temp); }, + // 连线 addLine(line) { let from = line.source.id; let to = line.target.id; + console.log('连线: ' + from + ' --> ' + to) this.data.lineList.push({ from: from, to: to, @@ -137,18 +141,27 @@ const methods = { Remark: "" }); }, + // 确认删除连线 confirmDelLine(line) { - this.$Modal.confirm({ - title: '删除连线', - content: "

确认删除该连线？

", - onOk: () => { - this.jsPlumb.deleteConnection(line) - } - }) + if (confirm("确认删除该连线？")) { + this.jsPlumb.deleteConnection(line) + } else { + // 用户点击了取消 + alert("操作已取消！"); + } + // this.$Modal.confirm({ + // title: '删除连线', + // content: "

确认删除该连线？

", + // onOk: () => { + // this.jsPlumb.deleteConnection(line) + // } + // }) }, + // 删除连线 deleLine(line) { this.data.lineList.forEach((item, index) => { if(item.from === line.sourceId && item.to === line.targetId) { + console.log('删线: ' + item.from + ' -/- ' + item.to) this.data.lineList.splice(index, 1) } }) @@ -171,6 +184,8 @@ const methods = { }, // 添加新的节点 addNode(temp) { + console.log('新增节点: ') + console.log(temp) this.data.nodeList.push(temp); this.$nextTick(() => { this.jsPlumb.makeSource(temp.id, this.jsplumbSourceOptions); @@ -233,8 +248,9 @@ const methods = { this.style.cursor = "grab"; }); }, - + // 设置节点名称 setNodeName(nodeId, name) { + console.log('设置节点 '+nodeId+' 名称为: ' + name) this.data.nodeList.some((v) => { if(v.id === nodeId) { v.nodeName = name @@ -244,9 +260,10 @@ const methods = { } }) }, - //删除节点 deleteNode(node) { + console.log('删除节点: ') + console.log(node) this.data.nodeList.some((v,index) => { if(v.id === node.id) { this.data.nodeList.splice(index, 1) @@ -257,7 +274,6 @@ const methods = { } }) }, - //更改连线状态 changeLineState(nodeId, val) { console.log(val) From f8328b4dd12c24119dbd32e422286c419c182304 Mon Sep 17 00:00:00 2001 From: chentaisen <14615430+chentaisen@user.noreply.gitee.com> Date: Mon, 26 Aug 2024 08:51:52 +0800 Subject: [PATCH 03/23] Changes --- src/views/rule/rule/index.vue | 2 ++ src/views/rule/rule/version.vue | 40 +++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/src/views/rule/rule/index.vue b/src/views/rule/rule/index.vue index 21251c7..92f0f22 100644 --- a/src/views/rule/rule/index.vue +++ b/src/views/rule/rule/index.vue @@ -129,6 +129,8 @@ + + diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue index 0cbba1c..53951b8 100644 --- a/src/views/rule/rule/version.vue +++ b/src/views/rule/rule/version.vue @@ -173,6 +173,46 @@ @pagination="getList" /> + + + + + + +
+ {{ customer.appName }} + + + + + + + + + + +
+ + + + From 8f800b09e5b2f6a8259aa056c76d9f0213a4d267 Mon Sep 17 00:00:00 2001 From: chentaisen <14615430+chentaisen@user.noreply.gitee.com> Date: Mon, 26 Aug 2024 08:58:55 +0800 Subject: [PATCH 04/23] Changes --- src/views/rule/rule/index.vue | 9 ++++++--- src/views/rule/rule/version.vue | 26 +++++++++++++------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/views/rule/rule/index.vue b/src/views/rule/rule/index.vue index 92f0f22..e3670f9 100644 --- a/src/views/rule/rule/index.vue +++ b/src/views/rule/rule/index.vue @@ -126,10 +126,13 @@ - - - + + + + + + diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue index 53951b8..a9b8f7e 100644 --- a/src/views/rule/rule/version.vue +++ b/src/views/rule/rule/version.vue @@ -175,22 +175,22 @@ - - + +
{{ customer.appName }} - - + + + + + + + + + + - + From 594a9c4d3219b53f3a211d8e40c943b669abb2b5 Mon Sep 17 00:00:00 2001 From: chentaisen <14615430+chentaisen@user.noreply.gitee.com> Date: Mon, 26 Aug 2024 09:06:44 +0800 Subject: [PATCH 05/23] Changes --- src/views/rule/rule/version.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue index a9b8f7e..e5128a6 100644 --- a/src/views/rule/rule/version.vue +++ b/src/views/rule/rule/version.vue @@ -180,7 +180,7 @@
- {{ customer.appName }} + {{ ruleAndVersion.appName }} @@ -198,14 +198,14 @@ icon="el-icon-info" icon-color="red" title="这是一段内容确定删除吗？" - @confirm="handleDelete(customer.id)" + @confirm="handleDelete(ruleAndVersion.id)" > + @click="handleUpdate(ruleAndVersion.id)" circle>
From 9cc3a87592a7e4b2d0a4fc6c86f6822b867e8439 Mon Sep 17 00:00:00 2001 From: chentaisen <14615430+chentaisen@user.noreply.gitee.com> Date: Mon, 26 Aug 2024 14:25:36 +0800 Subject: [PATCH 06/23] Changes --- src/api/rule/ruleEdition.js | 47 +++++ src/views/rule/rule/version.vue | 320 ++++++++++++++++++++------------ 2 files changed, 249 insertions(+), 118 deletions(-) create mode 100644 src/api/rule/ruleEdition.js diff --git a/src/api/rule/ruleEdition.js b/src/api/rule/ruleEdition.js new file mode 100644 index 0000000..60c74fe --- /dev/null +++ b/src/api/rule/ruleEdition.js @@ -0,0 +1,47 @@ +import request from '@/utils/request' + +// // 查询规则列表 +// export function listRule(query) { +// return request({ +// url: '/rule/rule/list', +// method: 'post', +// params: query +// }) +// } + +// 查询规则详细 +export function getEditionList(id) { + return request({ + url: '/rule/ruleEdition/findById/' + id, + method: 'get' + }) +} +// +// // 新增规则 +// export function addRule(data) { +// return request({ +// url: '/rule/rule/insert', +// method: 'post', +// data: data +// }) +// } +// +// // 修改规则 +// export function updateRule(data) { +// return request({ +// url: '/rule/rule/update', +// method: 'put', +// data: data +// }) +// } +// +// +// // 删除规则 +// export function delRule(id) { +// return request({ +// url: '/rule/rule/delete/' + id, +// method: 'delete' +// }) +// } + + diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue index e5128a6..a8e92b7 100644 --- a/src/views/rule/rule/version.vue +++ b/src/views/rule/rule/version.vue @@ -3,26 +3,26 @@ @@ -34,51 +34,51 @@ 新增 - - 修改 - - - - 删除 - - - - 导出 - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -126,91 +126,160 @@ 主键 - {{ ruleAndVersion.id }} + {{ rule.id }} - {{ ruleAndVersion.name }} + {{ rule.name }} - {{ ruleAndVersion.ruleType }} + {{ rule.ruleType }} - {{ ruleAndVersion.isActivate }} + {{ rule.isActivate }} - {{ ruleAndVersion.ruleDesc }} + {{ rule.ruleDesc }} - {{ ruleAndVersion.ruleCode }} + {{ rule.ruleCode }} - - + + + + + + + +

- - + +
- {{ ruleAndVersion.appName }} - - - - - - - - - - - - - +
+ + + + + {{ customer.id }} + + + + {{ customer.ruleKind }} + + + + {{ customer.name }} + + + + {{ customer.ruleCoding }} + + + + {{ customer.ruleActivate }} + + + + {{ customer.status }} + + +
+ +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
- + @@ -239,11 +308,15 @@ + From 85ea300562bb8dfbe054f723d8a94c546ce01fc4 Mon Sep 17 00:00:00 2001 From: chentaisen <14615430+chentaisen@user.noreply.gitee.com> Date: Wed, 28 Aug 2024 20:41:02 +0800 Subject: [PATCH 22/23] Changes --- src/views/rule/rule/version.vue | 83 ++------------------------------- 1 file changed, 3 insertions(+), 80 deletions(-) diff --git a/src/views/rule/rule/version.vue b/src/views/rule/rule/version.vue index d2b19dc..2e039ba 100644 --- a/src/views/rule/rule/version.vue +++ b/src/views/rule/rule/version.vue @@ -31,84 +31,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ rule.name }} @@ -329,6 +252,7 @@ + @@ -338,7 +262,6 @@
- @@ -396,7 +319,7 @@ export default { data() { return { - curCode: '测---------------------------------------试', + curCode: '测试', cmOptions: { lineNumbers: true, // 显示行号 mode: 'text/x-yaml', // 语法model @@ -562,7 +485,7 @@ export default { /** 新增按钮操作 */ handleAdd() { this.reset(); - this.open = true; + this.open = true;2 this.form.ruleId = this.ruleAndVersion.id this.title = "添加规则"; }, From 6a182345e2eb5f26a9948c7f84d45dff2ad21264 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: Wed, 28 Aug 2024 21:38:21 +0800 Subject: [PATCH 23/23] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/quest/node.js | 16 +- src/views/quest/node/Home.vue | 58 ++++-- src/views/quest/node/components/node-item.vue | 180 ++++++++++-------- src/views/quest/node/config/methods.js | 13 +- src/views/quest/task/index.vue | 2 +- 5 files changed, 168 insertions(+), 101 deletions(-) diff --git a/src/api/quest/node.js b/src/api/quest/node.js index 256d934..f070b95 100644 --- a/src/api/quest/node.js +++ b/src/api/quest/node.js @@ -37,17 +37,25 @@ export function updateNode(data) { } // 删除节点管理 -export function delNode(id, taskCode) { +export function delNodeByIds(ids) { return request({ - url: '/quest/node/' + id + '/' + taskCode, + url: '/quest/node/' + ids, + method: 'delete' + }) +} + +// 删除节点管理 +export function delNodeByTaskCodeAndNodeCodes(taskCode,nodeCodes) { + return request({ + url: '/quest/node/' + taskCode + '/' + nodeCodes, method: 'delete' }) } // 批量删除新增节点管理 -export function batch(data) { +export function batch(data,taskCode) { return request({ - url: '/quest/node/batch', + url: '/quest/node/batch/'+taskCode, method: 'post', data: data }) diff --git a/src/views/quest/node/Home.vue b/src/views/quest/node/Home.vue index d425138..dbd2c04 100644 --- a/src/views/quest/node/Home.vue +++ b/src/views/quest/node/Home.vue @@ -6,7 +6,7 @@ type="primary" @click="save">保存修改 返回 + @click="returnBack">返回
@@ -53,6 +53,10 @@ export default { nodeList:[], lineList:[] }, + checkData: { + nodeList:[], + lineList:[] + }, selectedList: [], jsplumbSetting: jsplumbSetting, jsplumbConnectOptions: jsplumbConnectOptions, @@ -70,7 +74,8 @@ export default { height: 0, width: 0 }, - taskCode: this.$route.query.taskCode + taskCode: this.$route.query.taskCode, + flag: true }; }, mounted() { @@ -120,9 +125,8 @@ export default { } }) }) - // console.log(data) - console.log(this.data) }) + this.flag = true }, // 保存修改按钮 save() { @@ -147,16 +151,42 @@ export default { preLine = line.from } }) - let newNode = flowNode.methods.toMysqlNode(node,preLine,nextLine) - newNode.taskCode = this.$route.query.taskCode - nodeData.push(newNode) + nodeData.push(flowNode.methods.toMysqlNode(node,preLine,nextLine,this.taskCode)) + }) + // 3. 激活接口将参数传递到后端 + batch(nodeData,this.$route.query.taskCode).then(res => { + this.$message.success(res.msg) + this.flag = true }) console.log(nodeData) - // 3. 激活接口将参数传递到后端 - batch(nodeData).then(res => { - alert(res.msg) - }) }, + returnBack() { + if (this.flag){ + this.$router.push({path: '/quest/task'}) + }else{ + this.checkReturn() + } + + }, + checkReturn() { + this.$confirm('更改未保存,是否保存?', '未保存提示', { + confirmButtonText: '保存', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.save() + }).catch(() => { + this.$message({ + type: 'success', + message: '返回成功' + }); + }); + this.$router.push({path: '/quest/task'}) + }, + // 修改状态更新 + checkFlag(){ + this.flag = false + } } }; @@ -209,12 +239,12 @@ export default { .auxiliary-line-x { position: absolute; border: .5px dashed #2ab1e8; - z-index: 1008; + z-index: 998; } .auxiliary-line-y { position: absolute; border: .5px dashed #2ab1e8; - z-index: 1008; + z-index: 998; } } } @@ -223,7 +253,7 @@ export default {