Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
pentaLiker
DolphinScheduler
提交
b7851639
DolphinScheduler
项目概览
pentaLiker
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b7851639
编写于
4月 01, 2020
作者:
B
break60
提交者:
gaojun2048
6月 29, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Corrections to historical jar packages and resource data
上级
54f04a37
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
139 addition
and
18 deletion
+139
-18
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
.../js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
+33
-3
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
...src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
+33
-3
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
...js/conf/home/pages/dag/_source/formModel/tasks/python.vue
+13
-2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
.../js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
+14
-3
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
.../js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
+34
-4
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
...pages/projects/pages/instance/pages/list/_source/list.vue
+1
-1
dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
+11
-2
未找到文件。
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
浏览文件 @
b7851639
...
@@ -218,6 +218,19 @@
...
@@ -218,6 +218,19 @@
},
},
mixins
:
[
disabledState
],
mixins
:
[
disabledState
],
methods
:
{
methods
:
{
/**
* getResourceId
*/
marjarId
(
name
)
{
this
.
store
.
dispatch
(
'
dag/getResourceId
'
,{
type
:
'
FILE
'
,
fullName
:
'
/
'
+
name
}).
then
(
res
=>
{
this
.
mainJar
=
res
.
id
}).
catch
(
e
=>
{
this
.
$message
.
error
(
e
.
msg
||
''
)
})
},
/**
/**
* return localParams
* return localParams
*/
*/
...
@@ -366,7 +379,13 @@
...
@@ -366,7 +379,13 @@
// Non-null objects represent backfill
// Non-null objects represent backfill
if
(
!
_
.
isEmpty
(
o
))
{
if
(
!
_
.
isEmpty
(
o
))
{
this
.
mainClass
=
o
.
params
.
mainClass
||
''
this
.
mainClass
=
o
.
params
.
mainClass
||
''
this
.
mainJar
=
o
.
params
.
mainJar
&&
o
.
params
.
mainJar
.
id
?
o
.
params
.
mainJar
.
id
:
''
if
(
o
.
params
.
mainJar
.
res
)
{
this
.
marjarId
(
o
.
params
.
mainJar
.
res
)
}
else
if
(
o
.
params
.
mainJar
.
res
==
''
)
{
this
.
mainJar
=
''
}
else
{
this
.
mainJar
=
o
.
params
.
mainJar
.
id
||
''
}
this
.
deployMode
=
o
.
params
.
deployMode
||
''
this
.
deployMode
=
o
.
params
.
deployMode
||
''
this
.
slot
=
o
.
params
.
slot
||
1
this
.
slot
=
o
.
params
.
slot
||
1
this
.
taskManager
=
o
.
params
.
taskManager
||
'
2
'
this
.
taskManager
=
o
.
params
.
taskManager
||
'
2
'
...
@@ -380,8 +399,19 @@
...
@@ -380,8 +399,19 @@
// backfill resourceList
// backfill resourceList
let
resourceList
=
o
.
params
.
resourceList
||
[]
let
resourceList
=
o
.
params
.
resourceList
||
[]
if
(
resourceList
.
length
)
{
if
(
resourceList
.
length
)
{
this
.
resourceList
=
_
.
map
(
resourceList
,
v
=>
{
_
.
map
(
resourceList
,
v
=>
{
return
v
.
id
if
(
v
.
res
)
{
this
.
store
.
dispatch
(
'
dag/getResourceId
'
,{
type
:
'
FILE
'
,
fullName
:
'
/
'
+
v
.
res
}).
then
(
res
=>
{
this
.
resourceList
.
push
(
res
.
id
)
}).
catch
(
e
=>
{
this
.
$message
.
error
(
e
.
msg
||
''
)
})
}
else
{
this
.
resourceList
.
push
(
v
.
id
)
}
})
})
this
.
cacheResourceList
=
resourceList
this
.
cacheResourceList
=
resourceList
}
}
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
浏览文件 @
b7851639
...
@@ -142,6 +142,19 @@
...
@@ -142,6 +142,19 @@
},
},
mixins
:
[
disabledState
],
mixins
:
[
disabledState
],
methods
:
{
methods
:
{
/**
* getResourceId
*/
marjarId
(
name
)
{
this
.
store
.
dispatch
(
'
dag/getResourceId
'
,{
type
:
'
FILE
'
,
fullName
:
'
/
'
+
name
}).
then
(
res
=>
{
this
.
mainJar
=
res
.
id
}).
catch
(
e
=>
{
this
.
$message
.
error
(
e
.
msg
||
''
)
})
},
/**
/**
* return localParams
* return localParams
*/
*/
...
@@ -245,7 +258,13 @@
...
@@ -245,7 +258,13 @@
// Non-null objects represent backfill
// Non-null objects represent backfill
if
(
!
_
.
isEmpty
(
o
))
{
if
(
!
_
.
isEmpty
(
o
))
{
this
.
mainClass
=
o
.
params
.
mainClass
||
''
this
.
mainClass
=
o
.
params
.
mainClass
||
''
this
.
mainJar
=
o
.
params
.
mainJar
.
id
||
''
if
(
o
.
params
.
mainJar
.
res
)
{
this
.
marjarId
(
o
.
params
.
mainJar
.
res
)
}
else
if
(
o
.
params
.
mainJar
.
res
==
''
)
{
this
.
mainJar
=
''
}
else
{
this
.
mainJar
=
o
.
params
.
mainJar
.
id
||
''
}
this
.
mainArgs
=
o
.
params
.
mainArgs
||
''
this
.
mainArgs
=
o
.
params
.
mainArgs
||
''
this
.
others
=
o
.
params
.
others
this
.
others
=
o
.
params
.
others
this
.
programType
=
o
.
params
.
programType
||
'
JAVA
'
this
.
programType
=
o
.
params
.
programType
||
'
JAVA
'
...
@@ -253,8 +272,19 @@
...
@@ -253,8 +272,19 @@
// backfill resourceList
// backfill resourceList
let
resourceList
=
o
.
params
.
resourceList
||
[]
let
resourceList
=
o
.
params
.
resourceList
||
[]
if
(
resourceList
.
length
)
{
if
(
resourceList
.
length
)
{
this
.
resourceList
=
_
.
map
(
resourceList
,
v
=>
{
_
.
map
(
resourceList
,
v
=>
{
return
v
.
id
if
(
v
.
res
)
{
this
.
store
.
dispatch
(
'
dag/getResourceId
'
,{
type
:
'
FILE
'
,
fullName
:
'
/
'
+
v
.
res
}).
then
(
res
=>
{
this
.
resourceList
.
push
(
res
.
id
)
}).
catch
(
e
=>
{
this
.
$message
.
error
(
e
.
msg
||
''
)
})
}
else
{
this
.
resourceList
.
push
(
v
.
id
)
}
})
})
this
.
cacheResourceList
=
resourceList
this
.
cacheResourceList
=
resourceList
}
}
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
浏览文件 @
b7851639
...
@@ -176,8 +176,19 @@
...
@@ -176,8 +176,19 @@
// backfill resourceList
// backfill resourceList
let
resourceList
=
o
.
params
.
resourceList
||
[]
let
resourceList
=
o
.
params
.
resourceList
||
[]
if
(
resourceList
.
length
)
{
if
(
resourceList
.
length
)
{
this
.
resourceList
=
_
.
map
(
resourceList
,
v
=>
{
_
.
map
(
resourceList
,
v
=>
{
return
v
.
id
if
(
v
.
res
)
{
this
.
store
.
dispatch
(
'
dag/getResourceId
'
,{
type
:
'
FILE
'
,
fullName
:
'
/
'
+
v
.
res
}).
then
(
res
=>
{
this
.
resourceList
.
push
(
res
.
id
)
}).
catch
(
e
=>
{
this
.
$message
.
error
(
e
.
msg
||
''
)
})
}
else
{
this
.
resourceList
.
push
(
v
.
id
)
}
})
})
this
.
cacheResourceList
=
resourceList
this
.
cacheResourceList
=
resourceList
}
}
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
浏览文件 @
b7851639
...
@@ -96,6 +96,7 @@
...
@@ -96,6 +96,7 @@
label
:
node
.
name
label
:
node
.
name
}
}
},
},
id
:
null
}
}
},
},
mixins
:
[
disabledState
],
mixins
:
[
disabledState
],
...
@@ -238,12 +239,22 @@
...
@@ -238,12 +239,22 @@
// backfill resourceList
// backfill resourceList
let
resourceList
=
o
.
params
.
resourceList
||
[]
let
resourceList
=
o
.
params
.
resourceList
||
[]
if
(
resourceList
.
length
)
{
if
(
resourceList
.
length
)
{
this
.
resourceList
=
_
.
map
(
resourceList
,
v
=>
{
_
.
map
(
resourceList
,
v
=>
{
return
v
.
id
if
(
v
.
res
)
{
this
.
store
.
dispatch
(
'
dag/getResourceId
'
,{
type
:
'
FILE
'
,
fullName
:
'
/
'
+
v
.
res
}).
then
(
res
=>
{
this
.
resourceList
.
push
(
res
.
id
)
}).
catch
(
e
=>
{
this
.
$message
.
error
(
e
.
msg
||
''
)
})
}
else
{
this
.
resourceList
.
push
(
v
.
id
)
}
})
})
this
.
cacheResourceList
=
resourceList
this
.
cacheResourceList
=
resourceList
}
}
// backfill localParams
// backfill localParams
let
localParams
=
o
.
params
.
localParams
||
[]
let
localParams
=
o
.
params
.
localParams
||
[]
if
(
localParams
.
length
)
{
if
(
localParams
.
length
)
{
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
浏览文件 @
b7851639
...
@@ -261,6 +261,19 @@
...
@@ -261,6 +261,19 @@
},
},
mixins
:
[
disabledState
],
mixins
:
[
disabledState
],
methods
:
{
methods
:
{
/**
* getResourceId
*/
marjarId
(
name
)
{
this
.
store
.
dispatch
(
'
dag/getResourceId
'
,{
type
:
'
FILE
'
,
fullName
:
'
/
'
+
name
}).
then
(
res
=>
{
this
.
mainJar
=
res
.
id
}).
catch
(
e
=>
{
this
.
$message
.
error
(
e
.
msg
||
''
)
})
},
/**
/**
* return localParams
* return localParams
*/
*/
...
@@ -414,7 +427,13 @@
...
@@ -414,7 +427,13 @@
// Non-null objects represent backfill
// Non-null objects represent backfill
if
(
!
_
.
isEmpty
(
o
))
{
if
(
!
_
.
isEmpty
(
o
))
{
this
.
mainClass
=
o
.
params
.
mainClass
||
''
this
.
mainClass
=
o
.
params
.
mainClass
||
''
this
.
mainJar
=
o
.
params
.
mainJar
&&
o
.
params
.
mainJar
.
id
?
o
.
params
.
mainJar
.
id
:
''
if
(
o
.
params
.
mainJar
.
res
)
{
this
.
marjarId
(
o
.
params
.
mainJar
.
res
)
}
else
if
(
o
.
params
.
mainJar
.
res
==
''
)
{
this
.
mainJar
=
''
}
else
{
this
.
mainJar
=
o
.
params
.
mainJar
.
id
||
''
}
this
.
deployMode
=
o
.
params
.
deployMode
||
''
this
.
deployMode
=
o
.
params
.
deployMode
||
''
this
.
driverCores
=
o
.
params
.
driverCores
||
1
this
.
driverCores
=
o
.
params
.
driverCores
||
1
this
.
driverMemory
=
o
.
params
.
driverMemory
||
'
512M
'
this
.
driverMemory
=
o
.
params
.
driverMemory
||
'
512M
'
...
@@ -429,9 +448,20 @@
...
@@ -429,9 +448,20 @@
// backfill resourceList
// backfill resourceList
let
resourceList
=
o
.
params
.
resourceList
||
[]
let
resourceList
=
o
.
params
.
resourceList
||
[]
if
(
resourceList
.
length
)
{
if
(
resourceList
.
length
)
{
this
.
resourceList
=
_
.
map
(
resourceList
,
v
=>
{
_
.
map
(
resourceList
,
v
=>
{
return
v
.
id
if
(
v
.
res
)
{
})
this
.
store
.
dispatch
(
'
dag/getResourceId
'
,{
type
:
'
FILE
'
,
fullName
:
'
/
'
+
v
.
res
}).
then
(
res
=>
{
this
.
resourceList
.
push
(
res
.
id
)
}).
catch
(
e
=>
{
this
.
$message
.
error
(
e
.
msg
||
''
)
})
}
else
{
this
.
resourceList
.
push
(
v
.
id
)
}
})
this
.
cacheResourceList
=
resourceList
this
.
cacheResourceList
=
resourceList
}
}
...
...
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
浏览文件 @
b7851639
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
<th
scope=
"col"
width=
"50"
>
<th
scope=
"col"
width=
"50"
>
<x-checkbox
@
on-change=
"_topCheckBoxClick"
v-model=
"checkAll"
></x-checkbox>
<x-checkbox
@
on-change=
"_topCheckBoxClick"
v-model=
"checkAll"
></x-checkbox>
</th>
</th>
<th
scope=
"col"
>
<th
scope=
"col"
width=
"30"
>
<span>
{{
$t
(
'
#
'
)
}}
</span>
<span>
{{
$t
(
'
#
'
)
}}
</span>
</th>
</th>
<th
scope=
"col"
width=
"70"
>
<th
scope=
"col"
width=
"70"
>
...
...
dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
浏览文件 @
b7851639
...
@@ -715,5 +715,14 @@ export default {
...
@@ -715,5 +715,14 @@ export default {
reject
(
e
)
reject
(
e
)
})
})
})
})
}
},
}
getResourceId
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`resources/queryResource`
,
payload
,
res
=>
{
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
reject
(
e
)
})
})
},
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录