From 2e3dd18356bb5c8c003c2f0e7091f10274a214ac Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Fri, 24 May 2024 13:18:27 +0800
Subject: [PATCH 1/4] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E6=8A=98?=
 =?UTF-8?q?=E5=8F=A0=E6=8C=89=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/workflow/task/index.vue | 64 ++++++++++++++++++++-----------
 1 file changed, 42 insertions(+), 22 deletions(-)

diff --git a/src/views/workflow/task/index.vue b/src/views/workflow/task/index.vue
index 6c23fb9..53f83b9 100644
--- a/src/views/workflow/task/index.vue
+++ b/src/views/workflow/task/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="tsx">
-import { NButton, NButtonGroup, NPopconfirm, NPopover, NTag } from 'naive-ui';
+import { NButton, NDropdown, NPopconfirm, NTag } from 'naive-ui';
 import { useRouter } from 'vue-router';
 import {
   fetchDelWorkflow,
@@ -129,17 +129,50 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
       fixed: 'right',
       width: 200,
       render: row => {
+        const options = [
+          {
+            label: $t('common.execute'),
+            key: 'execute',
+            click: () => execute(row.id!)
+          },
+          {
+            type: 'divider',
+            key: 'd1'
+          },
+          {
+            label: $t('common.copy'),
+            key: 'copy',
+            click: () => copy(row.id!)
+          },
+          {
+            type: 'divider',
+            key: 'd2'
+          },
+          {
+            label: $t('common.batchList'),
+            key: 'batchList',
+            click: () => batch(row.id!)
+          }
+        ];
+
+        function onSelect(key: string) {
+          options.filter(o => o.key === key)[0].click!();
+        }
+
         return (
           <div class="flex-center gap-8px">
-            <NButton type="warning" ghost size="small" onClick={() => edit(row.id!)}>
+            <NButton text type="warning" ghost size="small" onClick={() => edit(row.id!)}>
               {$t('common.edit')}
             </NButton>
+
+            <n-divider vertical />
+
             {hasAuth('R_ADMIN') ? (
               <NPopconfirm onPositiveClick={() => handleDelete(row.id!)}>
                 {{
                   default: () => $t('common.confirmDelete'),
                   trigger: () => (
-                    <NButton type="error" ghost size="small">
+                    <NButton text type="error" ghost size="small">
                       {$t('common.delete')}
                     </NButton>
                   )
@@ -149,30 +182,17 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
               ''
             )}
 
-            <NPopover trigger="click" placement="bottom" raw show-arrow={false} class="b-rd-6px bg-#fff dark:bg-#000">
+            <n-divider vertical />
+
+            <NDropdown trigger="click" show-arrow={false} options={options} size="small" on-select={onSelect}>
               {{
-                trigger: () => (
-                  <NButton type="primary" ghost size="small">
+                default: () => (
+                  <NButton text type="primary" ghost size="small">
                     更多
                   </NButton>
-                ),
-                default: () => (
-                  <div>
-                    <NButtonGroup vertical>
-                      <NButton type="primary" ghost size="small" onClick={() => execute(row.id!)}>
-                        {$t('common.execute')}
-                      </NButton>
-                      <NButton type="primary" ghost size="small" onClick={() => copy(row.id!)}>
-                        {$t('common.copy')}
-                      </NButton>
-                      <NButton type="success" ghost size="small" onClick={() => batch(row.id!)}>
-                        {$t('common.batchList')}
-                      </NButton>
-                    </NButtonGroup>
-                  </div>
                 )
               }}
-            </NPopover>
+            </NDropdown>
           </div>
         );
       }

From 3d2c6bc3010ac98d1c88800aa0f8d8217b7e0ee9 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Fri, 24 May 2024 13:22:24 +0800
Subject: [PATCH 2/4] =?UTF-8?q?style:=20=E4=BF=AE=E5=A4=8D=E5=86=85?=
 =?UTF-8?q?=E8=BE=B9=E8=B7=9D=E6=B6=88=E5=A4=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cron-input/src/components/cron-input.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/cron-input/src/components/cron-input.vue b/packages/cron-input/src/components/cron-input.vue
index 1436bbb..db832af 100644
--- a/packages/cron-input/src/components/cron-input.vue
+++ b/packages/cron-input/src/components/cron-input.vue
@@ -40,7 +40,7 @@ defineExpose({
 </script>
 
 <template>
-  <NPopover trigger="click" placement="bottom-start">
+  <NPopover class="cron-popover" trigger="click" placement="bottom-start">
     <template #trigger>
       <NInput v-bind="attrs" v-model:value="cron" />
     </template>
@@ -49,10 +49,7 @@ defineExpose({
 </template>
 
 <style>
-.n-popover {
+.cron-popover {
   padding: 0 !important;
 }
-
-.n-popover .n-popover-shared .n-popover-arrow-wrapper .n-popover-arrow {
-}
 </style>

From e1f063bb3dc58f38edc23927ae6e55059e9f0572 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Fri, 24 May 2024 15:43:55 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E6=97=A0=E6=B3=95=E8=AE=BF=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workflow/form/modules/workflow-iframe.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/workflow/form/modules/workflow-iframe.vue b/src/views/workflow/form/modules/workflow-iframe.vue
index 4cd0405..6a7c9c7 100644
--- a/src/views/workflow/form/modules/workflow-iframe.vue
+++ b/src/views/workflow/form/modules/workflow-iframe.vue
@@ -81,7 +81,7 @@ onActivated(() => {
     <iframe
       ref="iframeRef"
       class="size-full"
-      :src="`${mode === 'prod' ? baseUrl : ''}/lib/index.html?id=${id}&mode=${mode}&x1c2Hdd6=${value}`"
+      :src="`${mode === 'prod' ? baseUrl : '/'}lib/index.html?id=${id}&mode=${mode}&x1c2Hdd6=${value}`"
     />
   </NSpin>
 </template>

From 6ce84996cf1763a0701ebb0c8e671647cac05efd Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Sat, 25 May 2024 10:38:38 +0800
Subject: [PATCH 4/4] =?UTF-8?q?style:=20=E4=BF=AE=E5=A4=8D=E6=8A=98?=
 =?UTF-8?q?=E5=8F=A0=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow/form/modules/workflow-iframe.vue |  2 +-
 src/views/workflow/task/index.vue             | 29 +++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/views/workflow/form/modules/workflow-iframe.vue b/src/views/workflow/form/modules/workflow-iframe.vue
index 6a7c9c7..f703c54 100644
--- a/src/views/workflow/form/modules/workflow-iframe.vue
+++ b/src/views/workflow/form/modules/workflow-iframe.vue
@@ -81,7 +81,7 @@ onActivated(() => {
     <iframe
       ref="iframeRef"
       class="size-full"
-      :src="`${mode === 'prod' ? baseUrl : '/'}lib/index.html?id=${id}&mode=${mode}&x1c2Hdd6=${value}`"
+      :src="`${mode === 'prod' ? baseUrl + '/' : '/'}lib/index.html?id=${id}&mode=${mode}&x1c2Hdd6=${value}`"
     />
   </NSpin>
 </template>
diff --git a/src/views/workflow/task/index.vue b/src/views/workflow/task/index.vue
index 53f83b9..59ad1f9 100644
--- a/src/views/workflow/task/index.vue
+++ b/src/views/workflow/task/index.vue
@@ -165,22 +165,21 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
               {$t('common.edit')}
             </NButton>
 
-            <n-divider vertical />
-
             {hasAuth('R_ADMIN') ? (
-              <NPopconfirm onPositiveClick={() => handleDelete(row.id!)}>
-                {{
-                  default: () => $t('common.confirmDelete'),
-                  trigger: () => (
-                    <NButton text type="error" ghost size="small">
-                      {$t('common.delete')}
-                    </NButton>
-                  )
-                }}
-              </NPopconfirm>
-            ) : (
-              ''
-            )}
+              <>
+                <n-divider vertical />
+                <NPopconfirm onPositiveClick={() => handleDelete(row.id!)}>
+                  {{
+                    default: () => $t('common.confirmDelete'),
+                    trigger: () => (
+                      <NButton text type="error" ghost size="small">
+                        {$t('common.delete')}
+                      </NButton>
+                    )
+                  }}
+                </NPopconfirm>
+              </>
+            ) : null}
 
             <n-divider vertical />