diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue index 1e2cbd3ba6ec14322c4e1ea91b1ec85beba49623..d3df6adb77842edc913701a05eb2d981759b4fde 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue @@ -580,25 +580,8 @@ } this.isContentBox = false // flag Whether to delete a node this.$destroy() - this.$emit('close', { - item: { - 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 - }, + item: this.cacheBackfillItem, flag: flag, fromThis: this }) @@ -672,7 +655,7 @@ } else { this.workerGroup = this.store.state.security.workerGroupsListAll[0].id } - this.cacheBackfillItem = o + this.cacheBackfillItem = JSON.parse(JSON.stringify(o)) this.isContentBox = true }, mounted () { diff --git a/e2e/src/test/java/org/apache/dolphinscheduler/page/project/ProcessInstancePage.java b/e2e/src/test/java/org/apache/dolphinscheduler/page/project/ProcessInstancePage.java index f8503e51b90f6e96cec60f9f33fcd324ac6fe9b7..4d1a1c253007e0891207bdd7b3e1c35e05e9f1e2 100644 --- a/e2e/src/test/java/org/apache/dolphinscheduler/page/project/ProcessInstancePage.java +++ b/e2e/src/test/java/org/apache/dolphinscheduler/page/project/ProcessInstancePage.java @@ -32,6 +32,7 @@ public class ProcessInstancePage extends PageCommon { * rerun workflow page */ public boolean rerunWorkflowPage() throws InterruptedException { + Thread.sleep(2000); clickTopElement(ProcessInstanceLocator.CLICK_PROCESS_INSTANCE_NAME); clickTopElement(ProcessInstanceLocator.CLICK_RERUN_BUTTON); return ifTitleContains(ProcessInstanceData.PROCESS_INSTANCE_TITLE); diff --git a/e2e/testng.xml b/e2e/testng.xml index 32bd0c60091e7c2f7019ef1fdf359ba996cd2882..499fe113bcb5a90d2b207458a79786513254da1d 100644 --- a/e2e/testng.xml +++ b/e2e/testng.xml @@ -53,7 +53,7 @@ - +