Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
e03f1e2d
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 1 年多
通知
706
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,发现更多精彩内容 >>
未验证
提交
e03f1e2d
编写于
7月 21, 2020
作者:
X
xingchun-chen
提交者:
GitHub
7月 21, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3255 from break60/dev
[bugFix][ui]Click Cancel, the node data is restored to the original data
上级
a03d5483
edf1115f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
5 addition
and
21 deletion
+5
-21
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
...rc/js/conf/home/pages/dag/_source/formModel/formModel.vue
+2
-19
e2e/src/test/java/org/apache/dolphinscheduler/page/project/ProcessInstancePage.java
...he/dolphinscheduler/page/project/ProcessInstancePage.java
+1
-0
e2e/testng.xml
e2e/testng.xml
+2
-2
未找到文件。
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
浏览文件 @
e03f1e2d
...
@@ -580,25 +580,8 @@
...
@@ -580,25 +580,8 @@
}
}
this
.
isContentBox
=
false
this
.
isContentBox
=
false
// flag Whether to delete a node this.$destroy()
// flag Whether to delete a node this.$destroy()
this
.
$emit
(
'
close
'
,
{
this
.
$emit
(
'
close
'
,
{
item
:
{
item
:
this
.
cacheBackfillItem
,
type
:
this
.
cacheBackfillItem
.
type
,
id
:
this
.
cacheBackfillItem
.
id
,
name
:
this
.
cacheBackfillItem
.
name
,
params
:
this
.
cacheBackfillItem
.
params
,
description
:
this
.
cacheBackfillItem
.
description
,
runFlag
:
this
.
cacheBackfillItem
.
runFlag
,
conditionResult
:
this
.
cacheBackfillItem
.
conditionResult
,
dependence
:
this
.
cacheBackfillItem
.
dependence
,
maxRetryTimes
:
this
.
cacheBackfillItem
.
maxRetryTimes
,
retryInterval
:
this
.
cacheBackfillItem
.
retryInterval
,
timeout
:
this
.
cacheBackfillItem
.
timeout
,
taskInstancePriority
:
this
.
cacheBackfillItem
.
taskInstancePriority
,
workerGroup
:
this
.
cacheBackfillItem
.
workerGroup
,
status
:
this
.
cacheBackfillItem
.
status
,
branch
:
this
.
cacheBackfillItem
.
branch
},
flag
:
flag
,
flag
:
flag
,
fromThis
:
this
fromThis
:
this
})
})
...
@@ -672,7 +655,7 @@
...
@@ -672,7 +655,7 @@
}
else
{
}
else
{
this
.
workerGroup
=
this
.
store
.
state
.
security
.
workerGroupsListAll
[
0
].
id
this
.
workerGroup
=
this
.
store
.
state
.
security
.
workerGroupsListAll
[
0
].
id
}
}
this
.
cacheBackfillItem
=
o
this
.
cacheBackfillItem
=
JSON
.
parse
(
JSON
.
stringify
(
o
))
this
.
isContentBox
=
true
this
.
isContentBox
=
true
},
},
mounted
()
{
mounted
()
{
...
...
e2e/src/test/java/org/apache/dolphinscheduler/page/project/ProcessInstancePage.java
浏览文件 @
e03f1e2d
...
@@ -32,6 +32,7 @@ public class ProcessInstancePage extends PageCommon {
...
@@ -32,6 +32,7 @@ public class ProcessInstancePage extends PageCommon {
* rerun workflow page
* rerun workflow page
*/
*/
public
boolean
rerunWorkflowPage
()
throws
InterruptedException
{
public
boolean
rerunWorkflowPage
()
throws
InterruptedException
{
Thread
.
sleep
(
2000
);
clickTopElement
(
ProcessInstanceLocator
.
CLICK_PROCESS_INSTANCE_NAME
);
clickTopElement
(
ProcessInstanceLocator
.
CLICK_PROCESS_INSTANCE_NAME
);
clickTopElement
(
ProcessInstanceLocator
.
CLICK_RERUN_BUTTON
);
clickTopElement
(
ProcessInstanceLocator
.
CLICK_RERUN_BUTTON
);
return
ifTitleContains
(
ProcessInstanceData
.
PROCESS_INSTANCE_TITLE
);
return
ifTitleContains
(
ProcessInstanceData
.
PROCESS_INSTANCE_TITLE
);
...
...
e2e/testng.xml
浏览文件 @
e03f1e2d
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
<class
name=
"org.apache.dolphinscheduler.testcase.testProject.TestRunWorkflow"
></class>
<class
name=
"org.apache.dolphinscheduler.testcase.testProject.TestRunWorkflow"
></class>
<class
name=
"org.apache.dolphinscheduler.testcase.testProject.TestTiming"
>
<
!-- <
class name="org.apache.dolphinscheduler.testcase.testProject.TestTiming">
<methods>
<methods>
<include name="testCreateTiming" />
<include name="testCreateTiming" />
<include name="testEditTiming" />
<include name="testEditTiming" />
...
@@ -61,7 +61,7 @@
...
@@ -61,7 +61,7 @@
<include name="testOfflineTiming" />
<include name="testOfflineTiming" />
<include name="testDeleteTiming" />
<include name="testDeleteTiming" />
</methods>
</methods>
</class>
</class>
-->
<class
name=
"org.apache.dolphinscheduler.testcase.testProject.TestProcessInstance"
>
<class
name=
"org.apache.dolphinscheduler.testcase.testProject.TestProcessInstance"
>
<methods>
<methods>
<include
name=
"testRerun"
/>
<include
name=
"testRerun"
/>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录