Bladeren bron

[BUG][UI Next]fix the problem about Batch delete not working (#9080)

* fix the problem about Batch delete not working while click the border of the button

* try to fix e2e

Co-authored-by: Jiajie Zhong <zhongjiajie955@hotmail.com>
labbomb 3 jaren geleden
bovenliggende
commit
da2e85e9ec

+ 0 - 1
dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/pages/project/workflow/WorkflowDefinitionTab.java

@@ -47,7 +47,6 @@ public final class WorkflowDefinitionTab extends NavBarPage implements ProjectDe
     @FindBys({
             @FindBy(className = "btn-delete-all"),
             @FindBy(className = "n-button__content"),
-            @FindBy(tagName = "span")
     })
     private WebElement buttonDeleteAll;
 

+ 8 - 8
dolphinscheduler-ui-next/src/views/projects/workflow/definition/index.tsx

@@ -176,19 +176,19 @@ export default defineComponent({
               {{
                 default: () => t('project.workflow.delete'),
                 trigger: () => (
-                  <NButton
-                    tag='div'
-                    type='primary'
-                    disabled={this.checkedRowKeys.length <= 0}
-                    class='btn-delete-all'
-                  >
                     <NPopconfirm onPositiveClick={this.batchDeleteWorkflow}>
                       {{
                         default: () => t('project.workflow.delete_confirm'),
-                        trigger: () => t('project.workflow.delete')
+                        trigger: () => (
+                          <NButton
+                            tag='div'
+                            type='primary'
+                            disabled={this.checkedRowKeys.length <= 0}
+                            class='btn-delete-all'
+                          >{t('project.workflow.delete')}</NButton>
+                        )
                       }}
                     </NPopconfirm>
-                  </NButton>
                 )
               }}
             </NTooltip>