diff --git a/frontend/src/views/cronjob/cronjob/operate/index.vue b/frontend/src/views/cronjob/cronjob/operate/index.vue index 95573c092272..67279027a60e 100644 --- a/frontend/src/views/cronjob/cronjob/operate/index.vue +++ b/frontend/src/views/cronjob/cronjob/operate/index.vue @@ -747,7 +747,7 @@ /> @@ -871,7 +871,7 @@ import { routerToName, routerToPath } from '@/utils/router'; import { loadBaseDir } from '@/api/modules/setting'; const router = useRouter(); -const { docsUrl, isFxplay, isIntl, isProductPro } = useGlobalStore(); +const { docsUrl, isFxplay, isIntl, isEE, isProductPro } = useGlobalStore(); const licenseRef = ref(); const scriptFileRef = ref(); const dirRef = ref(); diff --git a/frontend/src/views/setting/alert/dash/index.vue b/frontend/src/views/setting/alert/dash/index.vue index 29fec4e84d1b..572073c7d235 100644 --- a/frontend/src/views/setting/alert/dash/index.vue +++ b/frontend/src/views/setting/alert/dash/index.vue @@ -18,7 +18,11 @@ @@ -152,7 +156,7 @@ import AddTask from '@/views/setting/alert/dash/task/index.vue'; import { Alert } from '@/api/interface/alert'; import { UpdateAlertStatus, SearchAlerts, DeleteAlert } from '@/api/modules/alert'; -const { isMobile, isMaster, isProductPro } = useGlobalStore(); +const { isMobile, isMaster, isProductPro, isEE } = useGlobalStore(); const { t } = i18n.global; const loading = ref(false); @@ -197,7 +201,7 @@ const buttons = [ const openView = async ( title: string, rowData: Partial = { - type: isMaster.value ? 'panelPwdEndTime' : 'sshLogin', + type: isMaster.value && !isEE.value ? 'panelPwdEndTime' : 'sshLogin', cycle: 15, count: 0, sendCount: 3, diff --git a/frontend/src/views/setting/alert/dash/task/index.vue b/frontend/src/views/setting/alert/dash/task/index.vue index ad0113c7a47a..149df4ae2d77 100644 --- a/frontend/src/views/setting/alert/dash/task/index.vue +++ b/frontend/src/views/setting/alert/dash/task/index.vue @@ -25,7 +25,7 @@ /> - + {{ $t('xpack.alert.panelPwdEndTimeRulesHelper') }} @@ -388,7 +388,7 @@ import { routerToName } from '@/utils/router'; import { checkCidr, checkCidrV6, checkIpV4V6 } from '@/utils/validate'; import { useGlobalStore } from '@/composables/useGlobalStore'; -const { isMaster, isProductPro, isIntl } = useGlobalStore(); +const { isMaster, isProductPro, isIntl, isEE } = useGlobalStore(); interface DialogProps { title: string; @@ -454,20 +454,20 @@ const rules = reactive({ }); const allTaskOptions = [ - { value: 'panelPwdEndTime', label: 'xpack.alert.panelPwdEndTime', show: isMaster.value }, - { value: 'panelLogin', label: 'xpack.alert.panelLogin', show: isMaster.value }, + { value: 'panelPwdEndTime', label: 'xpack.alert.panelPwdEndTime', show: isMaster.value && !isEE.value }, { value: 'sshLogin', label: 'xpack.alert.sshLogin', show: true }, + { value: 'panelLogin', label: 'xpack.alert.panelLogin', show: isMaster.value }, { value: 'licenseException', label: 'xpack.alert.licenseException', show: isMaster.value && isProductPro.value }, { value: 'ssl', label: 'xpack.alert.ssl', show: true }, { value: 'siteEndTime', label: 'xpack.alert.siteEndTime', show: true }, - { value: 'nodeException', label: 'xpack.alert.nodeException', show: isMaster.value && isProductPro.value }, + { value: 'nodeException', label: 'xpack.alert.nodeException', show: isMaster.value && isProductPro.value && !isEE.value }, { value: 'cpu', label: 'xpack.alert.cpu', show: true }, { value: 'memory', label: 'xpack.alert.memory', show: true }, { value: 'disk', label: 'xpack.alert.disk', show: true }, { value: 'load', label: 'xpack.alert.load', show: true }, { value: 'cronJob', label: 'xpack.alert.cronjob', show: true }, { value: 'clams', label: 'xpack.alert.clams', show: true }, - { value: 'panelUpdate', label: 'xpack.alert.panelUpdate', show: isMaster.value }, + { value: 'panelUpdate', label: 'xpack.alert.panelUpdate', show: isMaster.value && !isEE.value }, ]; function checkRange(value: any, min: number, max: number, callback: any) { diff --git a/frontend/src/views/toolbox/clam/operate/index.vue b/frontend/src/views/toolbox/clam/operate/index.vue index 9ebc9c8274e9..da727668c45b 100644 --- a/frontend/src/views/toolbox/clam/operate/index.vue +++ b/frontend/src/views/toolbox/clam/operate/index.vue @@ -180,7 +180,7 @@ @@ -245,7 +245,7 @@ import { createClam, updateClam } from '@/api/modules/toolbox'; import { useGlobalStore } from '@/composables/useGlobalStore'; import { specOptions, transObjToSpec, transSpecToObj, weekOptions } from '@/views/cronjob/cronjob/helper'; import { splitTimeFromSecond, transferTimeToSecond } from '@/utils/validate'; -const { isIntl, isProductPro } = useGlobalStore(); +const { isIntl, isProductPro, isEE } = useGlobalStore(); const licenseRef = ref(); const scanDirRef = ref(); const infectedDirRef = ref();