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 a63157d8091943b28299228c8fe50df59636710f..fbb4f418d03b4547248889fd099046a0802d812a 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
@@ -159,6 +159,9 @@
border-radius: 0 3px 0 0;
.ans-btn-text {
color: #337ab7;
+ .ans-icon {
+ font-size: 16px;
+ }
}
.assist-btn {
position: absolute;
@@ -206,7 +209,7 @@
color: #333;
}
&.active {
- background: #e1e2e3;
+ // background: #e1e2e3;
i {
color: #2d8cf0;
}
@@ -234,7 +237,9 @@
border-radius: 3px 3px 0px 0px;
}
}
-
+#screen {
+ margin-right: 5px;
+}
.v-modal-custom-log {
z-index: 101;
}
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 feb756dabe7b40419e773fe5d5e779d3a97b2663..40b6d851981785e806fdd7f40de98f2b76fcd0df 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
@@ -61,20 +61,28 @@
-
+
-
+
+
{})
- // Round robin acquisition status
- this.setIntervalP = setInterval(() => {
- this._getTaskState(true).then(res => {})
- }, 90000)
}
} else {
Dag.create()
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
index d6c865716a4ba1d240e0b50e35c04fa248160b80..00c550374bec33551d6e976ac4832c5ba3eb6aae 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
@@ -22,7 +22,7 @@
-
+
@@ -64,7 +64,6 @@
data () {
return {
list: [],
- definitionList: [],
projectList: [],
cycleList: cycleList,
isInstance: false,
@@ -88,16 +87,19 @@
_add () {
// btn loading
this.isLoading = true
- // dependItemList index
- let is = (value) => _.some(this.dependItemList, { definitionId: value })
- let noArr = _.filter(this.definitionList, v => !is(v.value))
- let value = noArr[0] && noArr[0].value || null
- let val = value || this.definitionList[0].value
+ // // dependItemList index
+ // let is = (value) => _.some(this.dependItemList, { definitionId: value })
+ // let noArr = _.filter(this.definitionList, v => !is(v.value))
+ // let value = noArr[0] && noArr[0].value || null
+ // let val = value || this.definitionList[0].value
// add task list
let projectId = this.projectList[0].value
- this._getDependItemList(val).then(depTasksList => {
- this.$nextTick(() => {
- this.$emit('dependItemListEvent', _.concat(this.dependItemList, this._rtNewParams(val, depTasksList,projectId)))
+ this._getProcessByProjectId(projectId).then(definitionList => {
+ let val = definitionList[0].value
+ this._getDependItemList(val).then(depTasksList => {
+ this.$nextTick(() => {
+ this.$emit('dependItemListEvent', _.concat(this.dependItemList, this._rtNewParams(val, definitionList, depTasksList, projectId)))
+ })
})
})
// remove tooltip
@@ -143,13 +145,13 @@
_getProcessByProjectId (id) {
return new Promise((resolve, reject) => {
this.store.dispatch('dag/getProcessByProjectId', { projectId: id }).then(res => {
- this.definitionList = _.map(_.cloneDeep(res), v => {
+ let definitionList = _.map(_.cloneDeep(res), v => {
return {
value: v.id,
label: v.name
}
})
- resolve(res)
+ resolve(definitionList)
})
})
},
@@ -175,7 +177,7 @@
_onChangeProjectId ({ value }) {
this._getProcessByProjectId(value).then(definitionList => {
/*this.$set(this.dependItemList, this.itemIndex, this._dlOldParams(value, definitionList, item))*/
- let definitionId = definitionList[0].id
+ let definitionId = definitionList[0].value
this._getDependItemList(definitionId).then(depTasksList => {
let item = this.dependItemList[this.itemIndex]
// init set depTasks All
@@ -191,8 +193,6 @@
let item = this.dependItemList[this.itemIndex]
// init set depTasks All
item.depTasks = 'ALL'
- // set dependItemList item data
- this.$set(this.dependItemList, this.itemIndex, this._rtOldParams(value, depTasksList, item))
})
},
_onChangeCycle ({ value }) {
@@ -200,10 +200,11 @@
this.$set(this.dependItemList[this.itemIndex], 'dateValue', list[0].value)
this.$set(this.dependItemList[this.itemIndex], 'dateValueList', list)
},
- _rtNewParams (value, depTasksList,projectId) {
+ _rtNewParams (value, definitionList, depTasksList, projectId) {
return {
projectId: projectId,
definitionId: value,
+ definitionList: definitionList,
depTasks: 'ALL',
depTasksList: depTasksList,
cycle: 'day',
@@ -212,10 +213,11 @@
state: ''
}
},
- _rtOldParams (value,depTasksList, item) {
+ _rtOldParams (value, definitionList, depTasksList, item) {
return {
projectId: item.projectId,
definitionId: value,
+ definitionList: definitionList,
depTasks: item.depTasks || 'ALL',
depTasksList: depTasksList,
cycle: item.cycle,
@@ -257,9 +259,9 @@
let projectId = this.projectList[0].value
if (!this.dependItemList.length) {
this._getProcessByProjectId(projectId).then(definitionList => {
- let value = this.definitionList[0].value
+ let value = definitionList[0].value
this._getDependItemList(value).then(depTasksList => {
- this.$emit('dependItemListEvent', _.concat(this.dependItemList, this._rtNewParams(value, depTasksList,projectId)))
+ this.$emit('dependItemListEvent', _.concat(this.dependItemList, this._rtNewParams(value, definitionList, depTasksList, projectId)))
})
})
} else {
@@ -269,7 +271,7 @@
this._getDependItemList(ids, false).then(res => {
_.map(this.dependItemList, (v, i) => {
this._getProcessByProjectId(v.projectId).then(definitionList => {
- this.$set(this.dependItemList, i, this._rtOldParams(v.definitionId, ['ALL'].concat(_.map(res[v.definitionId] || [], v => v.name)), v))
+ this.$set(this.dependItemList, i, this._rtOldParams(v.definitionId, definitionList, ['ALL'].concat(_.map(res[v.definitionId] || [], v => v.name)), v))
})
})
})
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index 64c6376a6b1bf04f847209c5068fd20745b73416..a77585e91fef4da3f6e8c61198d319333157f8f2 100644
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -374,6 +374,7 @@ export default {
'All_1': 'All',
'Toolbar': 'Toolbar',
'View variables': 'View variables',
+ 'Format DAG': 'Format DAG',
'Refresh DAG status': 'Refresh DAG status',
'Return_1': 'Return',
'Please enter format': 'Please enter format',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index 8c7fac6c500c5a591362bfe2ccbdba8787dc54ea..6784498cf1404568c014965d54d67de9707b3698 100644
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -369,6 +369,7 @@ export default {
'All_1': '成功或失败都发',
'Toolbar': '工具栏',
'View variables': '查看变量',
+ 'Format DAG': '格式化DAG',
'Refresh DAG status': '刷新DAG状态',
'Return_1': '返回上一节点',
'Please enter format': '请输入格式为',