Unverified Commit e03f1e2d authored by xingchun-chen's avatar xingchun-chen Committed by GitHub
Browse files

Merge pull request #3255 from break60/dev 

[bugFix][ui]Click Cancel, the node data is restored to the original data
parents a03d5483 edf1115f

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue

+2 −19
Original line number Diff line number Diff line
@@ -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 () {

e2e/src/test/java/org/apache/dolphinscheduler/page/project/ProcessInstancePage.java

+1 −0
Original line number Diff line number Diff line
@@ -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);

e2e/testng.xml

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 


            <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>

                    <include name="testCreateTiming" />

                    <include name="testEditTiming" />
@@ -61,7 +61,7 @@ 
                    <include name="testOfflineTiming" />

                    <include name="testDeleteTiming" />

                </methods>

            </class>

            </class> -->

            <class name="org.apache.dolphinscheduler.testcase.testProject.TestProcessInstance">

                <methods>

                    <include name="testRerun" />