Merge pull request #3372 from break60/1.3.2-release

Remove the new label label function

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue

@@ -131,7 +131,6 @@
   import { allNodesId } from './plugIn/util'
   import { toolOper, tasksType } from './config'
   import mFormModel from './formModel/formModel'
-  import mFormLineModel from './formModel/formLineModel'
   import { formatDate } from '@/module/filter/filter'
   import { findComponentDownward } from '@/module/util/'
   import disabledState from '@/module/mixin/disabledState'
@@ -166,7 +165,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 +194,9 @@
                 length: 12,
                 foldback: 0.8
               }
+            ]
           ],
-            ['Label', {
+          Container: 'canvas'
-                location: 0.5,
-                id: 'label'
-            }]
-          ],
-          Container: 'canvas',
-          ConnectionsDetachable: true
         })
       })
         if (this.tasks.length) {
@@ -508,40 +502,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 +636,9 @@
                 length: 12,
                 foldback: 0.8
               }
+            ]
           ],
-            ['Label', {
+          Container: 'canvas'
-                location: 0.5,
-                id: 'label'
-            }]
-          ],
-          Container: 'canvas',
-          ConnectionsDetachable: true
         })
       })
     },

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formLineModel.vue

@@ -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.
- */
-<template>
-  <div class="form-model-model" v-clickoutside="_handleClose">
-    <div class="title-box">
-      <span class="name">{{$t('Current connection settings')}}</span>
-    </div>
-    <div class="content-box">
-      <div class="from-model">
-        <!-- Node name -->
-        <div class="clearfix list">
-          <div class="text-box"><span>{{$t('Connection name')}}</span></div>
-          <div class="cont-box">
-            <label class="label-box">
-              <x-input
-                type="text"
-                v-model="labelName"
-                :disabled="isDetails"
-                :placeholder="$t('Please enter name')"
-                maxlength="100"
-                autocomplete="off">
-              </x-input>
-            </label>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="bottom-box">
-      <div class="submit" style="background: #fff;">
-        <x-button type="text" @click="cancel()"> {{$t('Cancel')}} </x-button>
-        <x-button type="primary" shape="circle" :loading="spinnerLoading" @click="ok()" :disabled="isDetails">{{spinnerLoading ? 'Loading...' : $t('Confirm add')}} </x-button>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-  import _ from 'lodash'
-  import { mapActions } from 'vuex'
-  import i18n from '@/module/i18n'
-  import JSP from './../plugIn/jsPlumbHandle'
-  import disabledState from '@/module/mixin/disabledState'
-
-  export default {
-    name: 'form-line-model',
-    data () {
-      return {
-          // loading
-        spinnerLoading: false,
-        // node name
-        labelName: '',
-      }
-    },
-    mixins: [disabledState],
-    props: {
-      id: String,
-      sourceId: String,
-      targetId: String
-    },
-    methods: {
-        cancel() {
-            this.$emit('cancel', {
-                fromThis: this
-            })
-        },
-        ok() {
-          if($(`#${this.id}`).prev().attr('class')==='jtk-overlay') {
-            $(`#${this.id}`).prev().empty()
-          }
-          $(`#${this.id}`).text(this.labelName)
-            this.$emit('addLineInfo', {
-              item: {
-                labelName: this.labelName,
-                sourceId: this.sourceId,
-                targetId: this.targetId
-              },
-              fromThis: this
-            })
-        }
-    }, 
-    watch: {
-      
-    },
-    created () {
-      if($(`#${this.id}`).prev().attr('class').indexOf('jtk-overlay')!==-1) {
-        this.labelName = $(`#${this.id}`).prev().text()
-      } else {
-        this.labelName = $(`#${this.id}`).text()
-      }
-    },
-    mounted () {
-      
-    },
-    updated () {
-    },
-    beforeDestroy () {
-    },
-    destroyed () {
-    },
-    computed: {
-      
-    },
-    components: {}
-  }
-</script>
-
-<style lang="scss" rel="stylesheet/scss">
-
-</style>

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,
+        endPointTargetId: v.targetId
-          label: v._jsPlumb.overlays.label.canvas.innerText
       })
     })
-    }
-    
     _.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},
+          HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3}
-          overlays:[["Label", { label: labels} ]]
         })
       }
     })

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