From e5f239530c42f3b6efc2567dbbe0661564ec4da4 Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Sat, 1 Aug 2020 14:59:57 +0800 Subject: [PATCH] Remove the new label label function --- .../js/conf/home/pages/dag/_source/dag.vue | 54 +------- .../dag/_source/formModel/formLineModel.vue | 122 ------------------ .../pages/dag/_source/plugIn/jsPlumbHandle.js | 49 ++----- .../src/js/conf/home/store/dag/mutations.js | 8 -- 4 files changed, 14 insertions(+), 219 deletions(-) delete mode 100644 dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formLineModel.vue diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue index c40bd19478..2cb7de6e08 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue @@ -166,7 +166,7 @@ }, methods: { ...mapActions('dag', ['saveDAGchart', 'updateInstance', 'updateDefinition', 'getTaskState']), - ...mapMutations('dag', ['addTasks', 'cacheTasks', 'resetParams', 'setIsEditDag', 'setName', 'addConnects']), + ...mapMutations('dag', ['addTasks', 'cacheTasks', 'resetParams', 'setIsEditDag', 'setName']), // DAG automatic layout dagAutomaticLayout() { @@ -195,14 +195,9 @@ length: 12, foldback: 0.8 } - ], - ['Label', { - location: 0.5, - id: 'label' - }] + ] ], - Container: 'canvas', - ConnectionsDetachable: true + Container: 'canvas' }) }) if (this.tasks.length) { @@ -508,40 +503,6 @@ * Create a node popup layer * @param Object id */ - _createLineLabel({id, sourceId, targetId}) { - // $('#jsPlumb_2_50').text('111') - let self = this - self.$modal.destroy() - const removeNodesEvent = (fromThis) => { - // Manually destroy events inside the component - fromThis.$destroy() - // Close the popup - eventModel.remove() - } - eventModel = this.$drawer({ - className: 'dagMask', - render (h) { - return h(mFormLineModel,{ - on: { - addLineInfo ({ item, fromThis }) { - self.addConnects(item) - setTimeout(() => { - removeNodesEvent(fromThis) - }, 100) - }, - cancel ({fromThis}) { - removeNodesEvent(fromThis) - } - }, - props: { - id: id, - sourceId: sourceId, - targetId: targetId - } - }) - } - }) - }, _createNodes ({ id, type }) { let self = this self.$modal.destroy() @@ -676,14 +637,9 @@ length: 12, foldback: 0.8 } - ], - ['Label', { - location: 0.5, - id: 'label' - }] + ] ], - Container: 'canvas', - ConnectionsDetachable: true + Container: 'canvas' }) }) }, diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formLineModel.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formLineModel.vue deleted file mode 100644 index 2864b3c720..0000000000 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formLineModel.vue +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - - - diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js index 5212484aab..fc91f6ebd4 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js @@ -83,11 +83,8 @@ JSP.prototype.init = function ({ dag, instance, options }) { // Monitor line click this.JspInstance.bind('click', e => { - // Untie event if (this.config.isClick) { this.connectClick(e) - } else { - findComponentDownward(this.dag.$root, 'dag-chart')._createLineLabel({id: e._jsPlumb.overlays.label.canvas.id, sourceId: e.sourceId, targetId: e.targetId}) } }) @@ -654,39 +651,13 @@ JSP.prototype.saveStore = function () { tasks.push(tasksParam) } }) - if(store.state.dag.connects.length ===this.JspInstance.getConnections().length) { - _.map(store.state.dag.connects, u => { - connects.push({ - endPointSourceId: u.endPointSourceId, - endPointTargetId: u.endPointTargetId, - label: u.label - }) - }) - } else if(store.state.dag.connects.length>0 && store.state.dag.connects.length < this.JspInstance.getConnections().length) { - _.map(this.JspInstance.getConnections(), v => { - connects.push({ - endPointSourceId: v.sourceId, - endPointTargetId: v.targetId, - label: v._jsPlumb.overlays.label.canvas.innerText - }) - }) - _.map(store.state.dag.connects, u => { - _.map(connects, v => { - if(u.label && u.endPointSourceId === v.endPointSourceId && u.endPointTargetId===v.endPointTargetId) { - v.label = u.label - } - }) - }) - } else if(store.state.dag.connects.length===0) { - _.map(this.JspInstance.getConnections(), v => { - connects.push({ - endPointSourceId: v.sourceId, - endPointTargetId: v.targetId, - label: v._jsPlumb.overlays.label.canvas.innerText - }) - }) - } + _.map(this.JspInstance.getConnections(), v => { + connects.push({ + endPointSourceId: v.sourceId, + endPointTargetId: v.targetId + }) + }) _.map(tasksAll(), v => { locations[v.id] = { name: v.name, @@ -779,7 +750,6 @@ JSP.prototype.jspBackfill = function ({ connects, locations, largeJson }) { _.map(connects, v => { let sourceId = v.endPointSourceId.split('-') let targetId = v.endPointTargetId.split('-') - let labels = v.label if (sourceId.length === 4 && targetId.length === 4) { sourceId = `${sourceId[0]}-${sourceId[1]}-${sourceId[2]}` targetId = `${targetId[0]}-${targetId[1]}-${targetId[2]}` @@ -795,7 +765,7 @@ JSP.prototype.jspBackfill = function ({ connects, locations, largeJson }) { type: 'basic', paintStyle: { strokeWidth: 2, stroke: '#4caf50' }, HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3}, - overlays:[["Label", { label: labels} ]] + overlays:[["Label", { label: i18n.$t('success'), location:0.5, id:"label"} ]] }) } else if($(`#${sourceId}`).attr('data-tasks-type') === 'CONDITIONS' && $(`#${sourceId}`).attr('data-failednode') === $(`#${targetId}`).find('.name-p').text()) { this.JspInstance.connect({ @@ -804,7 +774,7 @@ JSP.prototype.jspBackfill = function ({ connects, locations, largeJson }) { type: 'basic', paintStyle: { strokeWidth: 2, stroke: '#252d39' }, HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3}, - overlays:[["Label", { label: labels} ]] + overlays:[["Label", { label: i18n.$t('failed'), location:0.5, id:"label"} ]] }) } else { this.JspInstance.connect({ @@ -812,8 +782,7 @@ JSP.prototype.jspBackfill = function ({ connects, locations, largeJson }) { target: targetId, type: 'basic', paintStyle: { strokeWidth: 2, stroke: '#2d8cf0' }, - HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3}, - overlays:[["Label", { label: labels} ]] + HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3} }) } }) diff --git a/dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js b/dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js index 11395dbc5d..509ae3c103 100755 --- a/dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js +++ b/dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js @@ -140,14 +140,6 @@ export default { y: parseInt(dom.css('top'), 10) }) }, - addConnects(state, payload) { - state.connects = _.map(state.connects, v => { - if(v.endPointSourceId===payload.sourceId && v.endPointTargetId===payload.targetId) { - v.label = payload.labelName - } - return v - }) - }, /** * Cache the input * @param state