You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ki...@apache.org on 2021/06/18 11:19:17 UTC
[dolphinscheduler] branch dev updated: [Feature-#5565][UI] Global
Param passed by sense dependencies (#5628)
This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new a768214 [Feature-#5565][UI] Global Param passed by sense dependencies (#5628)
a768214 is described below
commit a7682143ac70ab1aee6d1fd79c008ba9d48408dd
Author: myangle1120 <94...@qq.com>
AuthorDate: Fri Jun 18 19:19:07 2021 +0800
[Feature-#5565][UI] Global Param passed by sense dependencies (#5628)
* modify-globalParams
* del comment
Co-authored-by: liangfengjie <li...@hetao101.com>
---
.../src/js/conf/home/pages/dag/_source/dag.vue | 2 +-
.../dag/_source/formModel/tasks/_source/commcon.js | 5 ++++
.../src/js/conf/home/pages/dag/_source/udp/udp.vue | 32 +---------------------
3 files changed, 7 insertions(+), 32 deletions(-)
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 9a90658..6f35956 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
@@ -388,7 +388,7 @@
taskList.forEach(item => {
if (item.name === v1.name) {
depState = item.state
- const params = item.taskJson ? JSON.parse(item.taskJson).params : ''
+ const params = item.taskParams ? JSON.parse(item.taskParams) : ''
let localParam = params.localParams || []
newTask.push({
id: v2.id,
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/commcon.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/commcon.js
index 64c5fcd..ea9fea6 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/commcon.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/commcon.js
@@ -209,6 +209,11 @@ const typeList = [
id: 9,
code: 'BOOLEAN',
disabled: false
+ },
+ {
+ id: 10,
+ code: 'LIST',
+ disabled: false
}
]
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
index 91b2ca3..4ed90d7 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
@@ -202,38 +202,8 @@
*/
reloadParam () {
const dag = _.cloneDeep(this.store.state.dag)
- let fixedParam = []
- const tasks = this.store.state.dag.tasks
- for (const task of tasks) {
- const localParam = task.params ? task.params.localParams : []
- localParam.forEach(l => {
- if (!fixedParam.some(f => { return f.prop === l.prop })) {
- fixedParam.push(Object.assign({
- ifFixed: true
- }, l))
- }
- })
- }
-
let globalParams = _.cloneDeep(dag.globalParams)
-
- globalParams = globalParams.map(g => {
- if (fixedParam.some(f => { return g.prop === f.prop })) {
- fixedParam = fixedParam.filter(f => { return g.prop !== f.prop })
- return Object.assign(g, {
- ifFixed: true
- })
- } else {
- return g
- }
- })
- let udpList = [...fixedParam, ...globalParams].sort(s => {
- if (s.ifFixed) {
- return -1
- } else {
- return 1
- }
- })
+ let udpList = [...globalParams]
this.udpList = udpList
this.udpListCache = udpList
}