diff --git a/src/layout/components/Page/LicenseRelatedTip.vue b/src/layout/components/Page/LicenseRelatedTip.vue index f90b4c3b6..4b09401cb 100644 --- a/src/layout/components/Page/LicenseRelatedTip.vue +++ b/src/layout/components/Page/LicenseRelatedTip.vue @@ -26,12 +26,29 @@ export default { 'currentUser' ]), licenseMsg() { - if (this.expireMsg) { + if (this.jdmcMsg) { + return this.jdmcMsg + } else if (this.expireMsg) { return this.expireMsg } else { return this.reachLimitsMsg } }, + jdmcMsg() { + if (!this.publicSettings['XPACK_ENABLED'] || !this.$hasPerm('settings.change_license')) { + return false + } + if (this.licenseData.message === 'license_expired') { + return this.$t('LicenseExpired') + } + if (this.licenseData.message === 'license_maintenance_expired') { + return this.$t('LicenseMaintenanceExpired') + } + if (this.licenseData.message === 'license_will_expire') { + return this.$t('LicenseWillExpire') + } + return false + }, expireMsg() { if (!this.publicSettings['XPACK_ENABLED'] || !this.$hasPerm('settings.change_license')) { return false diff --git a/src/layout/components/Page/PageHeading.vue b/src/layout/components/Page/PageHeading.vue index c20938ecf..615a389ec 100644 --- a/src/layout/components/Page/PageHeading.vue +++ b/src/layout/components/Page/PageHeading.vue @@ -2,7 +2,7 @@