From 69dd96cc193010d23ef77bc99cf328ec8c05a7d4 Mon Sep 17 00:00:00 2001 From: "SGK\\17962" <1796293269@qq.com> Date: Fri, 27 Jun 2025 11:27:32 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=EF=BC=88=E8=B6=85=E6=97=B6=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=AD=89=EF=BC=89=E5=A2=9E=E5=8A=A0=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=202=E3=80=81=E5=91=8A=E8=AD=A6=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=A2=9E=E5=8A=A0=E7=9F=AD=E4=BF=A1=E7=9A=84=E6=8A=BD?= =?UTF-8?q?=E8=B1=A1=E6=8E=A5=E5=8F=A3=203=E3=80=81=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- index.html | 2 +- public/time-svgrepo-com.svg | 6 ++ src/assets/svg-icon/logo.svg | 9 +- src/assets/svg-icon/time.svg | 6 ++ src/components/common/system-logo.vue | 2 +- src/constants/business.ts | 3 +- src/locales/langs/en-us.ts | 5 +- src/locales/langs/zh-cn.ts | 5 +- src/theme/settings.ts | 2 +- src/typings/api.d.ts | 11 ++- src/typings/app.d.ts | 3 + .../task/modules/job-task-operate-drawer.vue | 12 +++ .../notify-recipient-operate-drawer.vue | 20 ++-- .../notify/recipient/modules/sms-form.vue | 93 +++++++++++++++++++ 15 files changed, 161 insertions(+), 20 deletions(-) create mode 100644 public/time-svgrepo-com.svg create mode 100644 src/assets/svg-icon/time.svg create mode 100644 src/views/notify/recipient/modules/sms-form.vue diff --git a/.env b/.env index c8baddd..13d131d 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ # if use a sub directory, it must be end with "/", like "/admin/" but not "/admin" VITE_BASE_URL=/ -VITE_APP_TITLE=Snail Job +VITE_APP_TITLE=Task Flux VITE_APP_DESC=A flexible, reliable, and fast platform for distributed task retry and distributed task scheduling. diff --git a/index.html b/index.html index b04ac55..5940922 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + %VITE_APP_TITLE% diff --git a/public/time-svgrepo-com.svg b/public/time-svgrepo-com.svg new file mode 100644 index 0000000..0f38888 --- /dev/null +++ b/public/time-svgrepo-com.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/assets/svg-icon/logo.svg b/src/assets/svg-icon/logo.svg index 7a37355..0f38888 100644 --- a/src/assets/svg-icon/logo.svg +++ b/src/assets/svg-icon/logo.svg @@ -1,3 +1,6 @@ - - - + + + + + + \ No newline at end of file diff --git a/src/assets/svg-icon/time.svg b/src/assets/svg-icon/time.svg new file mode 100644 index 0000000..0f38888 --- /dev/null +++ b/src/assets/svg-icon/time.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/components/common/system-logo.vue b/src/components/common/system-logo.vue index 7f23cc1..419afbb 100644 --- a/src/components/common/system-logo.vue +++ b/src/components/common/system-logo.vue @@ -3,7 +3,7 @@ defineOptions({ name: 'SystemLogo' }); diff --git a/src/constants/business.ts b/src/constants/business.ts index 28aa7a5..1a76698 100644 --- a/src/constants/business.ts +++ b/src/constants/business.ts @@ -28,7 +28,8 @@ export const alarmTypeRecord: Record & NotifyRecipient; + /** SMS Notify */ + type SmsNotify = Common.CommonRecord<{ + /** 短信接收人 */ + phoneNumbers: string[]; + }> & + NotifyRecipient; + /** webhook Notify */ type WebhookNotify = Common.CommonRecord<{ /** 接收人名称 */ @@ -687,8 +694,8 @@ declare namespace Api { /** notifyRecipient list */ type NotifyRecipientList = Common.PaginatingQueryRecord; - /** 1: 钉钉通知 2: 邮件通知 3: 企业通知 4: 飞书 5: Webhook */ - type AlarmType = 1 | 2 | 3 | 4 | 5; + /** 1: 钉钉通知 2: 邮件通知 3: 企业通知 4: 飞书 5: Webhook 6: 短信 */ + type AlarmType = 1 | 2 | 3 | 4 | 5 | 6; type ExportNotifyRecipient = Common.CommonRecord<{ notifyRecipientIds: string[]; diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts index 55258db..563fbae 100644 --- a/src/typings/app.d.ts +++ b/src/typings/app.d.ts @@ -863,12 +863,14 @@ declare namespace App { ats: string; webhookUrl: string; tos: string; + phoneNumbers: string; dingDing: string; email: string; weCom: string; lark: string; secret: string; webhook: string; + sms: string; contentType: string; }; retryDeadLetter: { @@ -1071,6 +1073,7 @@ declare namespace App { description: string; triggerType: string; executorTimeout: string; + timeoutTip: string; triggerInterval: string; triggerInterval_CRON: string; taskType: string; diff --git a/src/views/job/task/modules/job-task-operate-drawer.vue b/src/views/job/task/modules/job-task-operate-drawer.vue index a2ce438..b076420 100644 --- a/src/views/job/task/modules/job-task-operate-drawer.vue +++ b/src/views/job/task/modules/job-task-operate-drawer.vue @@ -653,6 +653,18 @@ const scriptMethodOptions = [ + + {