Unverified Commit 8205e7e2 authored by millionfor's avatar millionfor Committed by GitHub
Browse files

Merge pull request #225 from millionfor/dev-20190415 

Dev 20190415
parents 92862dc8 9da5ca9d

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

+8 −1
Original line number Diff line number Diff line
@@ -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

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

+2 −2
Original line number Diff line number Diff line
@@ -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"

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

+2 −2
Original line number Diff line number Diff line
@@ -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