Browse Source

Merge pull request #225 from millionfor/dev-20190415

Dev 20190415
pull/2/head
millionfor 6 years ago committed by GitHub
parent
commit
8205e7e2e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
  2. 4
      escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
  3. 4
      escheduler-ui/src/js/conf/home/store/dag/mutations.js

9
escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js

@ -489,6 +489,9 @@ JSP.prototype.removeNodes = function ($id) {
})
// delete node
this.JspInstance.remove($id)
// delete dom
$(`#${$id}`).remove()
}
/**
@ -557,7 +560,7 @@ JSP.prototype.copyNodes = function ($id) {
// Add new node
store.commit('dag/addTasks', newNodeInfo)
// Add node location information
store.commit('dag/setLocations', {
store.commit('dag/addLocations', {
[newId]: {
name: newName,
targetarr: '',
@ -642,6 +645,8 @@ JSP.prototype.saveStore = function () {
})
})
console.log(tasksAll())
_.map(tasksAll(), v => {
locations[v.id] = {
name: v.name,
@ -651,6 +656,8 @@ JSP.prototype.saveStore = function () {
}
})
console.log(locations)
// Storage node
store.commit('dag/setTasks', tasks)
// Store coordinate information

4
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue

@ -9,7 +9,7 @@
</div>
<div class="cont">
<x-datepicker
style="width: 300px;"
style="width: 360px;"
:panel-num="2"
placement="bottom-start"
@on-change="_datepicker"
@ -32,7 +32,7 @@
</div>
<template slot="reference">
<x-input
style="width: 300px;"
style="width: 360px;"
type="text"
readonly
:value="crontab"

4
escheduler-ui/src/js/conf/home/store/dag/mutations.js

@ -32,13 +32,13 @@ export default {
* set locations
* */
setLocations (state, payload) {
state.locations = Object.assign(state.locations, {}, payload)
state.locations = payload
},
/**
* add locations
* */
addLocations (state, payload) {
state.locations = payload
state.locations = Object.assign(state.locations, {}, payload)
},
/**
* set connects

Loading…
Cancel
Save