From 890b3c5fd776cc9dba37ceb6dde9df48649ead6a Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Sun, 26 May 2024 17:52:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0):=20=E8=B0=83=E6=95=B4=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/group/index.vue         |  2 +-
 src/views/job/task/index.vue      | 31 ++++++++++++++++++-------------
 src/views/namespace/index.vue     |  2 +-
 src/views/notify/scene/index.vue  | 28 +++++++++++++++++-----------
 src/views/workflow/task/index.vue |  5 +++--
 5 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/src/views/group/index.vue b/src/views/group/index.vue
index 4800dd8..51d77d8 100644
--- a/src/views/group/index.vue
+++ b/src/views/group/index.vue
@@ -131,7 +131,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
         }
         return (
           <div class="flex-center gap-8px">
-            <NButton type="primary" ghost size="small" onClick={() => edit(row.id!)}>
+            <NButton type="primary" text ghost size="small" onClick={() => edit(row.id!)}>
               {$t('common.edit')}
             </NButton>
           </div>
diff --git a/src/views/job/task/index.vue b/src/views/job/task/index.vue
index 345da1e..04a3298 100644
--- a/src/views/job/task/index.vue
+++ b/src/views/job/task/index.vue
@@ -175,29 +175,34 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP
             {{
               default: () => $t('common.confirmExecute'),
               trigger: () => (
-                <NButton type="error" ghost size="small">
+                <NButton type="error" text ghost size="small">
                   {$t('common.execute')}
                 </NButton>
               )
             }}
           </NPopconfirm>
-          <NButton type="primary" ghost size="small" onClick={() => goToBatch(row.id!)}>
+          <n-divider vertical />
+          <NButton type="primary" ghost text size="small" onClick={() => goToBatch(row.id!)}>
             {$t('common.batchList')}
           </NButton>
-          <NButton type="warning" ghost size="small" onClick={() => edit(row.id!)}>
+          <n-divider vertical />
+          <NButton type="warning" ghost text size="small" onClick={() => edit(row.id!)}>
             {$t('common.edit')}
           </NButton>
           {hasAuth('R_ADMIN') ? (
-            <NPopconfirm onPositiveClick={() => handleDelete(row.id!)}>
-              {{
-                default: () => $t('common.confirmDelete'),
-                trigger: () => (
-                  <NButton type="error" ghost size="small">
-                    {$t('common.delete')}
-                  </NButton>
-                )
-              }}
-            </NPopconfirm>
+            <>
+              <n-divider vertical />
+              <NPopconfirm onPositiveClick={() => handleDelete(row.id!)}>
+                {{
+                  default: () => $t('common.confirmDelete'),
+                  trigger: () => (
+                    <NButton type="error" text ghost size="small">
+                      {$t('common.delete')}
+                    </NButton>
+                  )
+                }}
+              </NPopconfirm>
+            </>
           ) : (
             ''
           )}
diff --git a/src/views/namespace/index.vue b/src/views/namespace/index.vue
index cdb2740..3124484 100644
--- a/src/views/namespace/index.vue
+++ b/src/views/namespace/index.vue
@@ -54,7 +54,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
       width: 64,
       render: row => (
         <div class="flex-center gap-8px">
-          <NButton type="primary" ghost size="small" onClick={() => edit(row.id!)}>
+          <NButton type="primary" text ghost size="small" onClick={() => edit(row.id!)}>
             {$t('common.edit')}
           </NButton>
         </div>
diff --git a/src/views/notify/scene/index.vue b/src/views/notify/scene/index.vue
index d810606..24bba11 100644
--- a/src/views/notify/scene/index.vue
+++ b/src/views/notify/scene/index.vue
@@ -153,22 +153,28 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
       title: $t('common.operate'),
       align: 'center',
       width: 130,
+      fixed: 'right',
       render: row => (
         <div class="flex-center gap-8px">
-          <NButton type="primary" ghost size="small" onClick={() => edit(row.id!)}>
+          <NButton type="primary" ghost text size="small" onClick={() => edit(row.id!)}>
             {$t('common.edit')}
           </NButton>
           {hasAuth('R_ADMIN') ? (
-            <NPopconfirm onPositiveClick={() => handleDelete(row.id!)}>
-              {{
-                default: () => $t('common.confirmDelete'),
-                trigger: () => (
-                  <NButton type="error" ghost size="small">
-                    {$t('common.delete')}
-                  </NButton>
-                )
-              }}
-            </NPopconfirm>
+            <>
+              <n-divider vertical />
+              <NPopconfirm onPositiveClick={() => handleDelete(row.id!)}>
+                {{
+                  default: () => $t('common.confirmDelete'),
+                  trigger: () => (
+                    <span>
+                      <NButton type="error" text ghost size="small">
+                        {$t('common.delete')}
+                      </NButton>
+                    </span>
+                  )
+                }}
+              </NPopconfirm>
+            </>
           ) : (
             ''
           )}
diff --git a/src/views/workflow/task/index.vue b/src/views/workflow/task/index.vue
index 59ad1f9..580b0b5 100644
--- a/src/views/workflow/task/index.vue
+++ b/src/views/workflow/task/index.vue
@@ -164,7 +164,6 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
             <NButton text type="warning" ghost size="small" onClick={() => edit(row.id!)}>
               {$t('common.edit')}
             </NButton>
-
             {hasAuth('R_ADMIN') ? (
               <>
                 <n-divider vertical />
@@ -179,7 +178,9 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
                   }}
                 </NPopconfirm>
               </>
-            ) : null}
+            ) : (
+              ''
+            )}
 
             <n-divider vertical />