You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by lg...@apache.org on 2020/01/03 09:50:12 UTC
[incubator-dolphinscheduler] branch dev updated: Fixed DAG zoom in
and zoom out nodes separated from arrows #1679 (#1680)
This is an automated email from the ASF dual-hosted git repository.
lgcareer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 3477d28 Fixed DAG zoom in and zoom out nodes separated from arrows #1679 (#1680)
3477d28 is described below
commit 3477d28de872c7a7a7d05146665a1dc9f095cb64
Author: break60 <79...@qq.com>
AuthorDate: Fri Jan 3 17:50:05 2020 +0800
Fixed DAG zoom in and zoom out nodes separated from arrows #1679 (#1680)
* Fix api url
* Fixed DAG zoom in and zoom out nodes separated from arrows
---
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss | 2 +-
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
index 7fdb5e6..88a8bda 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
@@ -309,13 +309,13 @@ svg path:hover {
//min-width: calc(100% - 220px);
width: 8000px;
height: 5000px;
- position: relative;
svg:not(:root){
z-index: 11;
}
}
.jtk-demo-canvas {
+ position: relative;
height: 100%;
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
index 8b1c353..3b70f01 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
@@ -161,7 +161,7 @@
// DAG automatic layout
dagAutomaticLayout() {
$('#canvas').html('')
-
+
// Destroy round robin
Dag.init({
dag: this,
@@ -187,6 +187,13 @@
})
if (this.tasks.length) {
Dag.backfill(true)
+ if (this.type === 'instance') {
+ this._getTaskState(false).then(res => {})
+ // Round robin acquisition status
+ this.setIntervalP = setInterval(() => {
+ this._getTaskState(true).then(res => {})
+ }, 90000)
+ }
} else {
Dag.create()
}