This is an automated email from the ASF dual-hosted git repository. leonbao pushed a commit to branch json_split in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit f19b472eb888022ad3b0ddc41508ec5b3ebeddfe Merge: e1e48d7 4795a11 Author: lenboo <[email protected]> AuthorDate: Thu Jan 28 17:56:51 2021 +0800 Merge remote-tracking branch 'upstream/dev' into spilit .../dolphinscheduler/alert/runner/AlertSender.java | 4 +- .../server/worker/WorkerServer.java | 8 +- .../src/js/conf/home/pages/dag/_source/dag.vue | 90 +++++++++++----------- .../conf/home/pages/dag/_source/formModel/log.vue | 2 +- .../home/pages/dag/_source/plugIn/jsPlumbHandle.js | 11 ++- .../pages/servers/_source/zookeeperList.vue | 2 +- .../pages/definition/pages/list/_source/list.vue | 4 +- .../pages/index/_source/taskStatusCount.vue | 6 -- .../pages/instance/pages/list/_source/list.vue | 18 +---- .../projects/pages/instance/pages/list/index.vue | 7 +- .../projects/pages/taskInstance/_source/list.vue | 2 +- .../components/secondaryMenu/_source/menu.js | 4 +- dolphinscheduler-ui/src/sass/common/index.scss | 3 + 13 files changed, 81 insertions(+), 80 deletions(-)
