Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
2a81b29b
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 1 年多
通知
704
Star
9572
Fork
3514
代码
文件
提交
分支
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
2a81b29b
编写于
4月 19, 2021
作者:
W
wen-hemin
提交者:
GitHub
4月 19, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: process instance version page bug (#5319)
Co-authored-by:
N
wen-hemin
<
wenhemin@apache.com
>
上级
f7a06a03
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
35 addition
and
20 deletion
+35
-20
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java
...scheduler/api/controller/ProcessDefinitionController.java
+6
-6
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
...olphinscheduler/api/service/ProcessDefinitionService.java
+3
-3
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
...eduler/api/service/impl/ProcessDefinitionServiceImpl.java
+4
-4
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java
...cheduler/api/service/impl/ProcessInstanceServiceImpl.java
+5
-1
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
...inscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
+2
-2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue
...projects/pages/definition/pages/list/_source/versions.vue
+3
-2
dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
+8
-2
dolphinscheduler-ui/src/js/conf/home/store/dag/state.js
dolphinscheduler-ui/src/js/conf/home/store/dag/state.js
+4
-0
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java
浏览文件 @
2a81b29b
...
...
@@ -275,14 +275,14 @@ public class ProcessDefinitionController extends BaseController {
* @param projectName the process definition project name
* @param pageNo the process definition version list current page number
* @param pageSize the process definition version list page size
* @param processDefinition
Id the process definition id
* @param processDefinition
Code the process definition code
* @return the process definition version list
*/
@ApiOperation
(
value
=
"queryProcessDefinitionVersions"
,
notes
=
"QUERY_PROCESS_DEFINITION_VERSIONS_NOTES"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"pageNo"
,
value
=
"PAGE_NO"
,
required
=
true
,
dataType
=
"Int"
,
example
=
"100"
),
@ApiImplicitParam
(
name
=
"pageSize"
,
value
=
"PAGE_SIZE"
,
required
=
true
,
dataType
=
"Int"
,
example
=
"100"
),
@ApiImplicitParam
(
name
=
"processDefinition
Id"
,
value
=
"PROCESS_DEFINITION_ID"
,
required
=
true
,
dataType
=
"Int"
,
example
=
"100
"
)
@ApiImplicitParam
(
name
=
"processDefinition
Code"
,
value
=
"PROCESS_DEFINITION_CODE"
,
required
=
true
,
dataType
=
"Long"
,
example
=
"1
"
)
})
@GetMapping
(
value
=
"/versions"
)
@ResponseStatus
(
HttpStatus
.
OK
)
...
...
@@ -291,11 +291,11 @@ public class ProcessDefinitionController extends BaseController {
@ApiParam
(
name
=
"projectName"
,
value
=
"PROJECT_NAME"
,
required
=
true
)
@PathVariable
String
projectName
,
@RequestParam
(
value
=
"pageNo"
)
int
pageNo
,
@RequestParam
(
value
=
"pageSize"
)
int
pageSize
,
@RequestParam
(
value
=
"processDefinition
Id"
)
int
processDefinitionId
)
{
logger
.
info
(
"login user {}, query process versions, project name: {}, pageNo: {}, pageSize: {}, processDefinition
Id
: {}"
,
loginUser
.
getUserName
(),
projectName
,
pageNo
,
pageSize
,
processDefinition
Id
);
@RequestParam
(
value
=
"processDefinition
Code"
)
long
processDefinitionCode
)
{
logger
.
info
(
"login user {}, query process versions, project name: {}, pageNo: {}, pageSize: {}, processDefinition
Code
: {}"
,
loginUser
.
getUserName
(),
projectName
,
pageNo
,
pageSize
,
processDefinition
Code
);
Map
<
String
,
Object
>
result
=
processDefinitionService
.
queryProcessDefinitionVersions
(
loginUser
,
projectName
,
pageNo
,
pageSize
,
processDefinition
Id
);
,
projectName
,
pageNo
,
pageSize
,
processDefinition
Code
);
return
returnDataList
(
result
);
}
...
...
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
浏览文件 @
2a81b29b
...
...
@@ -276,17 +276,17 @@ public interface ProcessDefinitionService {
,
int
processDefinitionId
,
long
version
);
/**
* query the pagination versions info by one certain process definition
id
* query the pagination versions info by one certain process definition
code
*
* @param loginUser login user info to check auth
* @param projectName process definition project name
* @param pageNo page number
* @param pageSize page size
* @param processDefinition
Id process definition id
* @param processDefinition
Code process definition code
* @return the pagination process definition versions info of the certain process definition
*/
Map
<
String
,
Object
>
queryProcessDefinitionVersions
(
User
loginUser
,
String
projectName
,
int
pageNo
,
int
pageSize
,
int
processDefinitionId
);
int
pageNo
,
int
pageSize
,
long
processDefinitionCode
);
/**
* delete one certain process definition by version number and process definition id
...
...
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
浏览文件 @
2a81b29b
...
...
@@ -1726,17 +1726,17 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
}
/**
* query the pagination versions info by one certain process definition
id
* query the pagination versions info by one certain process definition
code
*
* @param loginUser login user info to check auth
* @param projectName process definition project name
* @param pageNo page number
* @param pageSize page size
* @param processDefinition
Id process definition id
* @param processDefinition
Code process definition code
* @return the pagination process definition versions info of the certain process definition
*/
@Override
public
Map
<
String
,
Object
>
queryProcessDefinitionVersions
(
User
loginUser
,
String
projectName
,
int
pageNo
,
int
pageSize
,
int
processDefinitionId
)
{
public
Map
<
String
,
Object
>
queryProcessDefinitionVersions
(
User
loginUser
,
String
projectName
,
int
pageNo
,
int
pageSize
,
long
processDefinitionCode
)
{
Map
<
String
,
Object
>
result
=
new
HashMap
<>();
...
...
@@ -1758,7 +1758,7 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
return
checkResult
;
}
ProcessDefinition
processDefinition
=
processDefinitionMapper
.
queryBy
DefineId
(
processDefinitionId
);
ProcessDefinition
processDefinition
=
processDefinitionMapper
.
queryBy
Code
(
processDefinitionCode
);
PageInfo
<
ProcessDefinitionLog
>
pageInfo
=
new
PageInfo
<>(
pageNo
,
pageSize
);
Page
<
ProcessDefinitionLog
>
page
=
new
Page
<>(
pageNo
,
pageSize
);
...
...
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java
浏览文件 @
2a81b29b
...
...
@@ -463,12 +463,16 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
processDefinition
.
getUserId
());
setProcessInstance
(
processInstance
,
tenant
,
scheduleTime
,
locations
,
connects
,
processInstanceJson
,
processData
);
int
update
=
processService
.
updateProcessInstance
(
processInstance
);
int
updateDefine
=
1
;
if
(
Boolean
.
TRUE
.
equals
(
syncDefine
))
{
updateDefine
=
syncDefinition
(
loginUser
,
project
,
locations
,
connects
,
processInstance
,
processDefinition
,
processData
);
processInstance
.
setProcessDefinitionVersion
(
processDefinitionLogMapper
.
queryMaxVersionForDefinition
(
processInstance
.
getProcessDefinitionCode
()));
}
int
update
=
processService
.
updateProcessInstance
(
processInstance
);
if
(
update
>
0
&&
updateDefine
>
0
)
{
putMsg
(
result
,
Status
.
SUCCESS
);
}
else
{
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
浏览文件 @
2a81b29b
...
...
@@ -153,7 +153,7 @@
:visible.sync=
"drawer"
size=
""
:with-header=
"false"
>
<m-versions
:versionData =
versionData
@
mVersionSwitchProcessDefinitionVersion=
"mVersionSwitchProcessDefinitionVersion"
@
mVersionGetProcessDefinitionVersionsPage=
"mVersionGetProcessDefinitionVersionsPage"
@
mVersionDeleteProcessDefinitionVersion=
"mVersionDeleteProcessDefinitionVersion"
@
closeVersion=
"closeVersion"
></m-versions>
<m-versions
:versionData =
versionData
:isInstance=
"type === 'instance'"
@
mVersionSwitchProcessDefinitionVersion=
"mVersionSwitchProcessDefinitionVersion"
@
mVersionGetProcessDefinitionVersionsPage=
"mVersionGetProcessDefinitionVersionsPage"
@
mVersionDeleteProcessDefinitionVersion=
"mVersionDeleteProcessDefinitionVersion"
@
closeVersion=
"closeVersion"
></m-versions>
</el-drawer>
<el-drawer
:visible.sync=
"nodeDrawer"
...
...
@@ -798,7 +798,7 @@
this
.
getProcessDefinitionVersionsPage
({
pageNo
:
1
,
pageSize
:
10
,
processDefinition
Id
:
this
.
urlParam
.
id
processDefinition
Code
:
this
.
store
.
state
.
dag
.
code
}).
then
(
res
=>
{
let
processDefinitionVersions
=
res
.
data
.
lists
let
total
=
res
.
data
.
totalCount
...
...
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue
浏览文件 @
2a81b29b
...
...
@@ -50,7 +50,7 @@
:title=
"$t('Confirm Switch To This Version?')"
@
onConfirm=
"_mVersionSwitchProcessDefinitionVersion(scope.row)"
>
<el-button
:disabled=
"versionData.processDefinition.releaseState === 'ONLINE' || scope.row.version === versionData.processDefinition.version"
type=
"primary"
size=
"mini"
icon=
"el-icon-warning"
circle
slot=
"reference"
></el-button>
<el-button
:disabled=
"versionData.processDefinition.releaseState === 'ONLINE' || scope.row.version === versionData.processDefinition.version
|| isInstance
"
type=
"primary"
size=
"mini"
icon=
"el-icon-warning"
circle
slot=
"reference"
></el-button>
</el-popconfirm>
</el-tooltip>
<el-tooltip
:content=
"$t('Delete')"
placement=
"top"
>
...
...
@@ -62,7 +62,7 @@
:title=
"$t('Delete?')"
@
onConfirm=
"_mVersionDeleteProcessDefinitionVersion(scope.row,scope.row.id)"
>
<el-button
:disabled=
"scope.row.version === versionData.processDefinition.version"
type=
"danger"
size=
"mini"
icon=
"el-icon-delete"
circle
slot=
"reference"
></el-button>
<el-button
:disabled=
"scope.row.version === versionData.processDefinition.version
|| isInstance
"
type=
"danger"
size=
"mini"
icon=
"el-icon-delete"
circle
slot=
"reference"
></el-button>
</el-popconfirm>
</el-tooltip>
</
template
>
...
...
@@ -110,6 +110,7 @@
}
},
props
:
{
isInstance
:
Boolean
,
versionData
:
Object
},
methods
:
{
...
...
dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
浏览文件 @
2a81b29b
...
...
@@ -158,6 +158,10 @@ export default {
io
.
get
(
`projects/
${
state
.
projectName
}
/process/select-by-id`
,
{
processId
:
payload
},
res
=>
{
// process definition code
state
.
code
=
res
.
data
.
code
// version
state
.
version
=
res
.
data
.
version
// name
state
.
name
=
res
.
data
.
name
// description
...
...
@@ -166,8 +170,6 @@ export default {
state
.
connects
=
JSON
.
parse
(
res
.
data
.
connects
)
// locations
state
.
locations
=
JSON
.
parse
(
res
.
data
.
locations
)
// version
state
.
version
=
res
.
data
.
version
// Process definition
const
processDefinitionJson
=
JSON
.
parse
(
res
.
data
.
processDefinitionJson
)
// tasks info
...
...
@@ -243,6 +245,10 @@ export default {
io
.
get
(
`projects/
${
state
.
projectName
}
/instance/select-by-id`
,
{
processInstanceId
:
payload
},
res
=>
{
// code
state
.
code
=
res
.
data
.
processDefinitionCode
// version
state
.
version
=
res
.
data
.
processDefinitionVersion
// name
state
.
name
=
res
.
data
.
name
// desc
...
...
dolphinscheduler-ui/src/js/conf/home/store/dag/state.js
浏览文件 @
2a81b29b
...
...
@@ -21,6 +21,10 @@ import localStore from '@/module/util/localStorage'
const
projectName
=
localStore
.
getItem
(
'
projectName
'
)
export
default
{
// process definition code
code
:
''
,
// process definition version
version
:
''
,
// name
name
:
''
,
// description
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录