diff --git a/frontend/src/api/interface/cronjob.ts b/frontend/src/api/interface/cronjob.ts index 340f3ffbdbae..3e425bf74ef7 100644 --- a/frontend/src/api/interface/cronjob.ts +++ b/frontend/src/api/interface/cronjob.ts @@ -65,7 +65,7 @@ export namespace Cronjob { alertMethod: string; alertMethodItems: Array; - scopes?: string[]; + scopes: string[]; } export interface Item { val: string; @@ -110,6 +110,8 @@ export namespace Cronjob { alertCount: number; alertTitle: string; alertMethod: string; + + scopes: string[]; } export interface CronjobTrans { name: string; diff --git a/frontend/src/global/form-rules.ts b/frontend/src/global/form-rules.ts index 3b017f19f3ae..2200f8f9549e 100644 --- a/frontend/src/global/form-rules.ts +++ b/frontend/src/global/form-rules.ts @@ -279,11 +279,11 @@ const checkVolumeName = (rule: any, value: any, callback: any) => { const checkLinuxName = (rule: any, value: any, callback: any) => { if (value === '' || typeof value === 'undefined' || value == null) { - callback(new Error(i18n.global.t('commons.rule.linuxName', ['/\\:*?\'"<>|']))); + callback(new Error(i18n.global.t('commons.rule.linuxName', ['/\\:*?\'"()<>|']))); } else { - const reg = /^[^/\\\"'|<>?*]{1,128}$/; + const reg = /^[^/\\\"'|<>()?*]{1,128}$/; if (!reg.test(value) && value !== '') { - callback(new Error(i18n.global.t('commons.rule.linuxName', ['/\\:*?\'"<>|']))); + callback(new Error(i18n.global.t('commons.rule.linuxName', ['/\\:*?\'"()<>|']))); } else { callback(); } diff --git a/frontend/src/views/container/template/index.vue b/frontend/src/views/container/template/index.vue index 87e16da6d54c..e086dbd0064e 100644 --- a/frontend/src/views/container/template/index.vue +++ b/frontend/src/views/container/template/index.vue @@ -140,7 +140,7 @@ const onExport = () => { cancelButtonText: i18n.global.t('commons.button.cancel'), }, ).then(async () => { - const exportData = data.value.map((item: Container.TemplateInfo) => ({ + const exportData = selects.value.map((item: Container.TemplateInfo) => ({ name: item.name, description: item.description, content: item.content,