From 79b5c588cd89fd0df12e2170a0d2f4421dea99ac Mon Sep 17 00:00:00 2001 From: dhb52 Date: Sat, 22 Jun 2024 20:04:24 +0800 Subject: [PATCH] =?UTF-8?q?refactor(sj=5F1.1.0-beta1):=20=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9=20notify/scene=20?= =?UTF-8?q?=3D>=20notify/config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/langs/en-us.ts | 2 +- src/locales/langs/zh-cn.ts | 2 +- src/router/elegant/imports.ts | 2 +- src/router/elegant/routes.ts | 20 +++++++++---------- src/views/notify/{scene => config}/index.vue | 6 +++--- .../modules/notify-config-detail-drawer.vue | 0 .../modules/notify-config-operate-drawer.vue | 0 .../modules/notify-config-search.vue | 0 8 files changed, 16 insertions(+), 16 deletions(-) rename src/views/notify/{scene => config}/index.vue (96%) rename src/views/notify/{scene => config}/modules/notify-config-detail-drawer.vue (100%) rename src/views/notify/{scene => config}/modules/notify-config-operate-drawer.vue (100%) rename src/views/notify/{scene => config}/modules/notify-config-search.vue (100%) diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts index c2be41f..9fb826b 100644 --- a/src/locales/langs/en-us.ts +++ b/src/locales/langs/en-us.ts @@ -303,7 +303,7 @@ const local: App.I18n.Schema = { namespace: 'Namespace', notify: 'Notify', notify_recipient: 'Notify Recipient', - notify_scene: 'Notify Scene', + notify_config: 'Notify Config', retry: 'Retry Task', retry_task: 'Retry Task', retry_scene: 'Retry Scene', diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index f49e79a..c0c7303 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -304,7 +304,7 @@ const local: App.I18n.Schema = { group: '组管理', notify: '告警通知', notify_recipient: '通知人', - notify_scene: '通知场景', + notify_config: '通知配置', retry: '重试任务', retry_task: '任务管理', 'retry_dead-letter': '死信任务', diff --git a/src/router/elegant/imports.ts b/src/router/elegant/imports.ts index 953936a..0f5bca2 100644 --- a/src/router/elegant/imports.ts +++ b/src/router/elegant/imports.ts @@ -26,8 +26,8 @@ export const views: Record Promise import("@/views/job/batch/index.vue"), job_task: () => import("@/views/job/task/index.vue"), namespace: () => import("@/views/namespace/index.vue"), + notify_config: () => import("@/views/notify/config/index.vue"), notify_recipient: () => import("@/views/notify/recipient/index.vue"), - notify_scene: () => import("@/views/notify/scene/index.vue"), pods: () => import("@/views/pods/index.vue"), "retry_dead-letter": () => import("@/views/retry/dead-letter/index.vue"), retry_log: () => import("@/views/retry/log/index.vue"), diff --git a/src/router/elegant/routes.ts b/src/router/elegant/routes.ts index f518d7a..12f43c2 100644 --- a/src/router/elegant/routes.ts +++ b/src/router/elegant/routes.ts @@ -155,6 +155,16 @@ export const generatedRoutes: GeneratedRoute[] = [ icon: 'material-symbols:notifications-active-outline-rounded' }, children: [ + { + name: 'notify_config', + path: '/notify/config', + component: 'view.notify_config', + meta: { + title: 'notify_config', + i18nKey: 'route.notify_config', + icon: 'cbi:scene-dynamic' + } + }, { name: 'notify_recipient', path: '/notify/recipient', @@ -164,16 +174,6 @@ export const generatedRoutes: GeneratedRoute[] = [ i18nKey: 'route.notify_recipient', icon: 'fluent:people-call-20-filled' } - }, - { - name: 'notify_scene', - path: '/notify/scene', - component: 'view.notify_scene', - meta: { - title: 'notify_scene', - i18nKey: 'route.notify_scene', - icon: 'cbi:scene-dynamic' - } } ] }, diff --git a/src/views/notify/scene/index.vue b/src/views/notify/config/index.vue similarity index 96% rename from src/views/notify/scene/index.vue rename to src/views/notify/config/index.vue index e1102b5..fe1bfd5 100644 --- a/src/views/notify/scene/index.vue +++ b/src/views/notify/config/index.vue @@ -6,9 +6,9 @@ import { fetchBatchDeleteNotify, fetchGetNotifyConfigList, fetchUpdateNotifyStat import { $t } from '@/locales'; import { useAppStore } from '@/store/modules/app'; import { useTable, useTableOperate } from '@/hooks/common/table'; -import NotifyConfigOperateDrawer from '@/views/notify/scene/modules/notify-config-operate-drawer.vue'; -import NotifyConfigSearch from '@/views/notify/scene/modules/notify-config-search.vue'; -import NotifyConfigDetailDrawer from '@/views/notify/scene/modules/notify-config-detail-drawer.vue'; +import NotifyConfigOperateDrawer from '@/views/notify/config/modules/notify-config-operate-drawer.vue'; +import NotifyConfigSearch from '@/views/notify/config/modules/notify-config-search.vue'; +import NotifyConfigDetailDrawer from '@/views/notify/config/modules/notify-config-detail-drawer.vue'; import StatusSwitch from '@/components/common/status-switch.vue'; import { jobNotifyScene, retryNotifyScene, systemTaskType, workflowNotifyScene } from '@/constants/business'; import { tagColor } from '@/utils/common'; diff --git a/src/views/notify/scene/modules/notify-config-detail-drawer.vue b/src/views/notify/config/modules/notify-config-detail-drawer.vue similarity index 100% rename from src/views/notify/scene/modules/notify-config-detail-drawer.vue rename to src/views/notify/config/modules/notify-config-detail-drawer.vue diff --git a/src/views/notify/scene/modules/notify-config-operate-drawer.vue b/src/views/notify/config/modules/notify-config-operate-drawer.vue similarity index 100% rename from src/views/notify/scene/modules/notify-config-operate-drawer.vue rename to src/views/notify/config/modules/notify-config-operate-drawer.vue diff --git a/src/views/notify/scene/modules/notify-config-search.vue b/src/views/notify/config/modules/notify-config-search.vue similarity index 100% rename from src/views/notify/scene/modules/notify-config-search.vue rename to src/views/notify/config/modules/notify-config-search.vue