[incubator-dolphinscheduler] branch dev updated (fe30266 -> 1eecbb1)

[ki...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kirs pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.


    from fe30266  [Feature-3985][Datax] Datax supports setting up running memory (#3986)
     add 1eecbb1  [Improvement-3767][api] Task instance supports query by process instance name (#3825)

No new revisions were added by this update.

Summary of changes:
 .../api/controller/TaskInstanceController.java     | 42 ++++++++++---
 .../api/service/TaskInstanceService.java           |  7 +--
 .../api/controller/TaskInstanceControllerTest.java | 72 ++++++++++++----------
 .../api/service/TaskInstanceServiceTest.java       | 23 +++----
 .../dao/mapper/TaskInstanceMapper.java             |  9 ++-
 .../dao/mapper/TaskInstanceMapper.xml              |  3 +
 .../dao/mapper/TaskInstanceMapperTest.java         |  1 +
 .../pages/_source/conditions}/index.vue            |  2 +-
 .../instance}/common.js                            |  0
 .../instance/processInstance.vue}                  |  2 +-
 .../instance/taskInstance.vue}                     | 14 +++--
 .../pages/index/_source/processStateCount.vue      |  2 +-
 .../pages/index/_source/taskCtatusCount.vue        |  2 +-
 .../pages/index/_source/taskStatusCount.vue        |  2 +-
 .../projects/pages/instance/pages/list/index.vue   |  2 +-
 .../pages/projects/pages/taskInstance/index.vue    |  6 +-
 pom.xml                                            |  1 +
 17 files changed, 118 insertions(+), 72 deletions(-)
 copy dolphinscheduler-ui/src/js/conf/home/pages/{resource/pages/udf => projects/pages/_source/conditions}/index.vue (95%)
 rename dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/{instanceConditions => conditions/instance}/common.js (100%)
 copy dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/{instanceConditions/index.vue => conditions/instance/processInstance.vue} (99%)
 rename dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/{instanceConditions/index.vue => conditions/instance/taskInstance.vue} (89%)