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 1c5084a Repair data cannot be echoed
new e9acb29 Merge pull request #2247 from break60/dev-resource-tree
1c5084a is described below
commit 1c5084ac3fb9a5123d6c8884ce4c0468b63d831c
Author: break60 <[email protected]>
AuthorDate: Fri Mar 20 16:03:53 2020 +0800
Repair data cannot be echoed
---
.../src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue | 2 +-
.../src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue | 3 +--
.../src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue | 2 +-
.../src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue | 2 +-
.../src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue | 2 +-
dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue | 4 +++-
6 files changed, 8 insertions(+), 7 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 fa6a304..762b0ec 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
@@ -338,7 +338,7 @@
res: this.mainJar
},
deployMode: this.deployMode,
- resourceList: this.cacheResourceList,
+ resourceList: this.resourceList,
localParams: this.localParams,
slot: this.slot,
taskManager: this.taskManager,
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 08b894e..f2f5353 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
@@ -184,7 +184,6 @@
if (!this.$refs.refLocalParams._verifProp()) {
return false
}
-
// storage
this.$emit('on-params', {
mainClass: this.mainClass,
@@ -222,7 +221,7 @@
mainJar: {
res: this.mainJar
},
- resourceList: this.cacheResourceList,
+ resourceList: this.resourceList,
localParams: this.localParams,
mainArgs: this.mainArgs,
others: this.others,
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 5f7aba5..bc81798 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
@@ -156,7 +156,7 @@
computed: {
cacheParams () {
return {
- resourceList: this.cacheResourceList,
+ resourceList: this.resourceList,
localParams: this.localParams,
rawScript: editor ? editor.getValue() : ''
}
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 1f68e18..4ba42da 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,7 @@
computed: {
cacheParams () {
return {
- // resourceList: this.cacheResourceList,
+ resourceList: this.resourceList,
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 7ed1a56..3956122 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
@@ -386,7 +386,7 @@
res: this.mainJar
},
deployMode: this.deployMode,
- resourceList: this.cacheResourceList,
+ resourceList: this.resourceList,
localParams: this.localParams,
driverCores: this.driverCores,
driverMemory: this.driverMemory,
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue
index 22acfba..daa30d7 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue
@@ -43,7 +43,7 @@
props: {},
methods: {
...mapMutations('dag', ['setIsDetails', 'resetParams']),
- ...mapActions('dag', ['getProcessList','getProjectList',
'getResourcesList', 'getInstancedetail']),
+ ...mapActions('dag', ['getProcessList','getProjectList',
'getResourcesList', 'getInstancedetail','getResourcesListJar']),
...mapActions('security', ['getTenantList','getWorkerGroupsAll']),
/**
* init
@@ -62,6 +62,8 @@
this.getProjectList(),
// get resources
this.getResourcesList(),
+ // get jar
+ this.getResourcesListJar(),
// get worker group list
this.getWorkerGroupsAll(),
this.getTenantList()
