diff --git a/packages/core/pipeline/src/context/index.ts b/packages/core/pipeline/src/context/index.ts index 0dd6b147..5679590e 100644 --- a/packages/core/pipeline/src/context/index.ts +++ b/packages/core/pipeline/src/context/index.ts @@ -11,6 +11,7 @@ export type PageSearch = { // sortOrder?: "asc" | "desc"; }; + export type PageRes = { pageNo?: number; pageSize?: number; diff --git a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts index 42fc22f7..a43e1e5d 100644 --- a/packages/ui/certd-client/src/locales/langs/en-US/certd.ts +++ b/packages/ui/certd-client/src/locales/langs/en-US/certd.ts @@ -264,6 +264,18 @@ export default { bulkImport: "Bulk Import", basicLimitError: "Basic version allows only one monitoring site. Please upgrade to the Pro version.", limitExceeded: "Sorry, you can only create up to {max} monitoring records. Please purchase or upgrade your plan.", + setting: { + siteMonitorSettings: "Site Monitor Settings", + notificationChannel: "Notification Channel", + setNotificationChannel: "Set the notification channel", + retryTimes: "Retry Times", + monitorRetryTimes: "Number of retry attempts for monitoring requests", + monitorCronSetting: "Monitoring Schedule", + cronTrigger: "Scheduled trigger for monitoring", + dnsServer: "DNS Server", + // dnsServerHelper: "使用自定义的域名解析服务器，如：1.1.1.1,8.8.8.8", + dnsServerHelper: "Use a custom domain name resolution server, such as: 1.1.1.1,8.8.8.8", + }, }, checkStatus: { success: "Success", @@ -302,13 +314,6 @@ export default { nickName: "Nickname", max50Chars: "Maximum 50 characters", myInfo: "My Information", - siteMonitorSettings: "Site Monitor Settings", - notificationChannel: "Notification Channel", - setNotificationChannel: "Set the notification channel", - retryTimes: "Retry Times", - monitorRetryTimes: "Number of retry attempts for monitoring requests", - monitorCronSetting: "Monitoring Schedule", - cronTrigger: "Scheduled trigger for monitoring", save: "Save", editSchedule: "Edit Schedule", timerTrigger: "Timer Trigger", @@ -692,10 +697,16 @@ export default { useTemplate: "Use This Template", batchCreate: "Batch Create Pipeline", singleCreate: "Create Single Pipeline", - importCreate: "Batch Import Create", templateName: "Template Name", enterTemplateName: "Please enter template name", copyPipelineConfig: "Copy this pipeline configuration as template source", pipeline: "Pipeline", }, + + sys: { + setting: { + showRunStrategy: "Show RunStrategy", + showRunStrategyHelper: "Allow modify the run strategy of the task", + }, + }, }; diff --git a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts index 3f47f5b0..696acd15 100644 --- a/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts +++ b/packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts @@ -269,6 +269,17 @@ export default { bulkImport: "批量导入", basicLimitError: "基础版只能添加一个监控站点，请赞助升级专业版", limitExceeded: "对不起，您最多只能创建条{max}监控记录，请购买或升级套餐", + setting: { + siteMonitorSettings: "站点监控设置", + notificationChannel: "通知渠道", + setNotificationChannel: "设置通知渠道", + retryTimes: "重试次数", + monitorRetryTimes: "监控请求重试次数", + monitorCronSetting: "监控定时设置", + cronTrigger: "定时触发监控", + dnsServer: "DNS服务器", + dnsServerHelper: "使用自定义的域名解析服务器，如：1.1.1.1,8.8.8.8", + }, }, checkStatus: { success: "成功", @@ -307,13 +318,7 @@ export default { nickName: "昵称", max50Chars: "最大50个字符", myInfo: "我的信息", - siteMonitorSettings: "站点监控设置", - notificationChannel: "通知渠道", - setNotificationChannel: "设置通知渠道", - retryTimes: "重试次数", - monitorRetryTimes: "监控请求重试次数", - monitorCronSetting: "监控定时设置", - cronTrigger: "定时触发监控", + save: "保存", editSchedule: "修改定时", timerTrigger: "定时触发", @@ -695,10 +700,15 @@ export default { useTemplate: "使用此模板", batchCreate: "批量创建流水线", singleCreate: "创建单个流水线", - importCreate: "批量导入创建", templateName: "模板名称", enterTemplateName: "请输入模板名称", copyPipelineConfig: "复制该流水线配置作为模板来源", pipeline: "流水线", }, + sys: { + setting: { + showRunStrategy: "显示运行策略选择", + showRunStrategyHelper: "任务设置中是否允许选择运行策略", + }, + }, }; diff --git a/packages/ui/certd-client/src/store/settings/api.basic.ts b/packages/ui/certd-client/src/store/settings/api.basic.ts index d7a32866..2df0c02b 100644 --- a/packages/ui/certd-client/src/store/settings/api.basic.ts +++ b/packages/ui/certd-client/src/store/settings/api.basic.ts @@ -43,6 +43,8 @@ export type SysPublicSetting = { mpsNo?: string; robots?: boolean; aiChatEnabled?: boolean; + + showRunStrategy?: boolean; }; export type SuiteSetting = { enabled?: boolean; diff --git a/packages/ui/certd-client/src/views/certd/monitor/site/setting/api.ts b/packages/ui/certd-client/src/views/certd/monitor/site/setting/api.ts index f873f765..ffe79de9 100644 --- a/packages/ui/certd-client/src/views/certd/monitor/site/setting/api.ts +++ b/packages/ui/certd-client/src/views/certd/monitor/site/setting/api.ts @@ -5,6 +5,7 @@ export type UserSiteMonitorSetting = { notificationId?: number; retryTimes?: number; cron?: string; + dnsServer?: string[]; }; export async function SiteMonitorSettingsGet() { diff --git a/packages/ui/certd-client/src/views/certd/monitor/site/setting/index.vue b/packages/ui/certd-client/src/views/certd/monitor/site/setting/index.vue index 46160e12..178be300 100644 --- a/packages/ui/certd-client/src/views/certd/monitor/site/setting/index.vue +++ b/packages/ui/certd-client/src/views/certd/monitor/site/setting/index.vue @@ -1,28 +1,34 @@ - +