improvement (#15018)

dolphinscheduler-ui/src/views/projects/workflow/definition/components/table-action.tsx

@@ -184,13 +184,6 @@ export default defineComponent({
                 ? t('project.workflow.down_line')
                 : t('project.workflow.up_line'),
             trigger: () => (
-              <NButton
-                size='small'
-                type={releaseState === 'ONLINE' ? 'warning' : 'error'}
-                tag='div'
-                circle
-                class='btn-publish'
-              >
               <NPopconfirm onPositiveClick={this.handleReleaseWorkflow}>
                 {{
                   default: () =>
@@ -198,6 +191,13 @@ export default defineComponent({
                       ? t('project.workflow.confirm_to_offline')
                       : t('project.workflow.confirm_to_online'),
                   trigger: () => (
+                    <NButton
+                      size='small'
+                      type={releaseState === 'ONLINE' ? 'warning' : 'error'}
+                      tag='div'
+                      circle
+                      class='btn-publish'
+                    >
                       <NIcon>
                         {releaseState === 'ONLINE' ? (
                           <DownloadOutlined />
@@ -205,10 +205,10 @@ export default defineComponent({
                           <UploadOutlined />
                         )}
                       </NIcon>
+                    </NButton>
                   )
                 }}
               </NPopconfirm>
-              </NButton>
             )
           }}
         </NTooltip>
@@ -252,6 +252,13 @@ export default defineComponent({
         <NTooltip trigger={'hover'}>
           {{
             default: () => t('project.workflow.delete'),
+            trigger: () => (
+              <NPopconfirm
+                disabled={releaseState === 'ONLINE'}
+                onPositiveClick={this.handleDeleteWorkflow}
+              >
+                {{
+                  default: () => t('project.workflow.delete_confirm'),
                   trigger: () => (
                     <NButton
                       size='small'
@@ -261,25 +268,13 @@ export default defineComponent({
                       disabled={releaseState === 'ONLINE'}
                       class='btn-delete'
                     >
-                <NPopconfirm
-                  disabled={releaseState === 'ONLINE'}
-                  onPositiveClick={this.handleDeleteWorkflow}
-                >
-                  {{
-                    default: () => t('project.workflow.delete_confirm'),
-                    icon: () => (
-                      <NIcon>
-                        <InfoCircleFilled />
-                      </NIcon>
-                    ),
-                    trigger: () => (
                       <NIcon>
                         <DeleteOutlined />
                       </NIcon>
+                    </NButton>
                   )
                 }}
               </NPopconfirm>
-              </NButton>
             )
           }}
         </NTooltip>

dolphinscheduler-ui/src/views/projects/workflow/instance/components/table-action.tsx

@@ -20,7 +20,6 @@ import { NSpace, NTooltip, NButton, NIcon, NPopconfirm } from 'naive-ui'
 import {
   DeleteOutlined,
   FormOutlined,
-  InfoCircleFilled,
   SyncOutlined,
   CloseOutlined,
   CloseCircleOutlined,
@@ -249,6 +248,10 @@ export default defineComponent({
         <NTooltip trigger={'hover'}>
           {{
             default: () => t('project.workflow.delete'),
+            trigger: () => (
+              <NPopconfirm onPositiveClick={this.handleDeleteInstance}>
+                {{
+                  default: () => t('project.workflow.delete_confirm'),
                   trigger: () => (
                     <NButton
                       tag='div'
@@ -263,22 +266,13 @@ export default defineComponent({
                         this.row?.disabled
                       }
                     >
-                <NPopconfirm onPositiveClick={this.handleDeleteInstance}>
-                  {{
-                    default: () => t('project.workflow.delete_confirm'),
-                    icon: () => (
-                      <NIcon>
-                        <InfoCircleFilled />
-                      </NIcon>
-                    ),
-                    trigger: () => (
                       <NIcon>
                         <DeleteOutlined />
                       </NIcon>
+                    </NButton>
                   )
                 }}
               </NPopconfirm>
-              </NButton>
             )
           }}
         </NTooltip>

dolphinscheduler-ui/src/views/projects/workflow/instance/index.tsx

@@ -127,6 +127,10 @@ export default defineComponent({
           <NTooltip>
             {{
               default: () => t('project.workflow.delete'),
+              trigger: () => (
+                <NPopconfirm onPositiveClick={this.handleBatchDelete}>
+                  {{
+                    default: () => t('project.workflow.delete_confirm'),
                     trigger: () => (
                       <NButton
                         tag='div'
@@ -135,13 +139,11 @@ export default defineComponent({
                         style='position: absolute; bottom: 10px; left: 10px;'
                         class='btn-delete-all'
                       >
-                  <NPopconfirm onPositiveClick={this.handleBatchDelete}>
+                        t('project.workflow.delete')
-                    {{
+                      </NButton>
-                      default: () => t('project.workflow.delete_confirm'),
+                    )
-                      trigger: () => t('project.workflow.delete')
                   }}
                 </NPopconfirm>
-                </NButton>
               )
             }}
           </NTooltip>

dolphinscheduler-ui/src/views/resource/components/resource/table/table-action.tsx

@@ -23,7 +23,6 @@ import {
   DownloadOutlined,
   FormOutlined,
   EditOutlined,
-  InfoCircleFilled,
   UploadOutlined
 } from '@vicons/antd'
 import _ from 'lodash'
@@ -222,7 +221,6 @@ export default defineComponent({
           {{
             default: () => t('resource.file.delete'),
             trigger: () => (
-              <NButton size='tiny' type='error' circle class='btn-delete'>
               <NPopconfirm
                 positive-text={t('resource.file.confirm')}
                 negative-text={t('resource.file.cancel')}
@@ -235,19 +233,15 @@ export default defineComponent({
               >
                 {{
                   default: () => t('resource.file.delete_confirm'),
-                    icon: () => (
-                      <NIcon>
-                        <InfoCircleFilled />
-                      </NIcon>
-                    ),
                   trigger: () => (
+                    <NButton size='tiny' type='error' circle class='btn-delete'>
                       <NIcon>
                         <DeleteOutlined />
                       </NIcon>
+                    </NButton>
                   )
                 }}
               </NPopconfirm>
-              </NButton>
             )
           }}
         </NTooltip>