Browse Source

Merge pull request #2826 from break60/dev-1.3.0

dag download does not refresh, modify the task instance operation wid…
pull/3/MERGE
xingchun-chen 5 years ago committed by GitHub
parent
commit
b1e8bec16e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/downChart.js
  2. 2
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
  3. 4
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue

10
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/downChart.js vendored

@ -19,7 +19,7 @@ import _ from 'lodash'
import canvg from 'canvg'
import { tasksAll } from './util'
import html2canvas from 'html2canvas'
import { findComponentDownward } from '@/module/util/'
// import { findComponentDownward } from '@/module/util/'
const DownChart = function () {
this.dag = {}
@ -111,10 +111,10 @@ DownChart.prototype.download = function ({ dagThis }) {
}, 100)
// To refresh the dag instance, otherwise you can't re-plot
setTimeout(() => {
// Refresh current dag
findComponentDownward(this.dag.$root, `${this.dag.type}-details`).init()
}, 500)
// setTimeout(() => {
// // Refresh current dag
// findComponentDownward(this.dag.$root, `${this.dag.type}-details`).init()
// }, 500)
})
})
}

2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue

@ -57,7 +57,7 @@
<span>{{$t('Retry Count')}}</span>
</div>
</th>
<th scope="col" style="min-width: 50px">
<th scope="col" style="min-width: 60px">
<span>{{$t('Operation')}}</span>
</th>
</tr>

4
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue

@ -171,7 +171,7 @@
tr {
th:last-child,td:last-child {
background: inherit;
width: 50px;
width: 60px;
height: 40px;
line-height: 40px;
border-left:1px solid #ecf3ff;
@ -183,7 +183,7 @@
border-bottom:1px solid #ecf3ff;
}
th:nth-last-child(2) {
padding-right: 80px;
padding-right: 90px;
}
}
}

Loading…
Cancel
Save