This is an automated email from the ASF dual-hosted git repository.
chenxingchun pushed a commit to branch dev-resource-tree
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev-resource-tree by this push:
new 2640ccc Repair data cannot be echoed
new 9d81a28 Merge pull request #2249 from break60/dev-resource-tree
2640ccc is described below
commit 2640cccd233a13573f774ec98ba3e52c3d7f20f3
Author: break60 <[email protected]>
AuthorDate: Fri Mar 20 17:28:17 2020 +0800
Repair data cannot be echoed
---
.../home/pages/dag/_source/formModel/tasks/flink.vue | 16 +++++++++++-----
.../conf/home/pages/dag/_source/formModel/tasks/mr.vue | 16 +++++++++++-----
.../home/pages/dag/_source/formModel/tasks/python.vue | 12 +++++++++---
.../home/pages/dag/_source/formModel/tasks/shell.vue | 4 +++-
.../home/pages/dag/_source/formModel/tasks/spark.vue | 8 +++++---
5 files changed, 39 insertions(+), 17 deletions(-)
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
index 762b0ec..4ce88d6 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
@@ -295,10 +295,12 @@
this.$emit('on-params', {
mainClass: this.mainClass,
mainJar: {
- res: this.mainJar
+ id: this.mainJar
},
deployMode: this.deployMode,
- resourceList: this.resourceList,
+ resourceList: _.map(this.resourceList, v => {
+ return {id: v}
+ }),
localParams: this.localParams,
slot: this.slot,
taskManager: this.taskManager,
@@ -335,10 +337,12 @@
return {
mainClass: this.mainClass,
mainJar: {
- res: this.mainJar
+ id: this.mainJar
},
deployMode: this.deployMode,
- resourceList: this.resourceList,
+ resourceList: _.map(this.resourceList, v => {
+ return {id: v}
+ }),
localParams: this.localParams,
slot: this.slot,
taskManager: this.taskManager,
@@ -376,7 +380,9 @@
// backfill resourceList
let resourceList = o.params.resourceList || []
if (resourceList.length) {
- this.resourceList = resourceList
+ this.resourceList = _.map(resourceList, v => {
+ return v.id
+ })
this.cacheResourceList = resourceList
}
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
index f2f5353..8e22071 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
@@ -188,9 +188,11 @@
this.$emit('on-params', {
mainClass: this.mainClass,
mainJar: {
- res: this.mainJar
+ id: this.mainJar
},
- resourceList: this.resourceList,
+ resourceList: _.map(this.resourceList, v => {
+ return {id: v}
+ }),
localParams: this.localParams,
mainArgs: this.mainArgs,
others: this.others,
@@ -219,9 +221,11 @@
return {
mainClass: this.mainClass,
mainJar: {
- res: this.mainJar
+ id: this.mainJar
},
- resourceList: this.resourceList,
+ resourceList: _.map(this.resourceList, v => {
+ return {id: v}
+ }),
localParams: this.localParams,
mainArgs: this.mainArgs,
others: this.others,
@@ -249,7 +253,9 @@
// backfill resourceList
let resourceList = o.params.resourceList || []
if (resourceList.length) {
- this.resourceList = resourceList
+ this.resourceList = _.map(resourceList, v => {
+ return v.id
+ })
this.cacheResourceList = resourceList
}
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
index bc81798..e8e7e58 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
@@ -115,7 +115,9 @@
// storage
this.$emit('on-params', {
- resourceList: this.resourceList,
+ resourceList: _.map(this.resourceList, v => {
+ return {id: v}
+ }),
localParams: this.localParams,
rawScript: editor.getValue()
})
@@ -156,7 +158,9 @@
computed: {
cacheParams () {
return {
- resourceList: this.resourceList,
+ resourceList: _.map(this.resourceList, v => {
+ return {id: v}
+ }),
localParams: this.localParams,
rawScript: editor ? editor.getValue() : ''
}
@@ -172,7 +176,9 @@
// backfill resourceList
let resourceList = o.params.resourceList || []
if (resourceList.length) {
- this.resourceList = resourceList
+ this.resourceList = _.map(resourceList, v => {
+ return v.id
+ })
this.cacheResourceList = resourceList
}
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
index 4ba42da..952fd3a 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
@@ -218,7 +218,9 @@
computed: {
cacheParams () {
return {
- resourceList: this.resourceList,
+ resourceList: _.map(this.resourceList, v => {
+ return {id: v}
+ }),
localParams: this.localParams,
rawScript: editor ? editor.getValue() : ''
}
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
index 3956122..f71e2ee 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
@@ -348,7 +348,7 @@
this.$emit('on-params', {
mainClass: this.mainClass,
mainJar: {
- res: this.mainJar
+ id: this.mainJar
},
deployMode: this.deployMode,
resourceList: dataProcessing,
@@ -383,10 +383,12 @@
return {
mainClass: this.mainClass,
mainJar: {
- res: this.mainJar
+ id: this.mainJar
},
deployMode: this.deployMode,
- resourceList: this.resourceList,
+ resourceList: _.map(this.resourceList, v => {
+ return {id: v}
+ }),
localParams: this.localParams,
driverCores: this.driverCores,
driverMemory: this.driverMemory,
