diff --git a/src/components/Announcement/index.vue b/src/components/Announcement/index.vue new file mode 100644 index 000000000..057e2b1bc --- /dev/null +++ b/src/components/Announcement/index.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/src/components/index.js b/src/components/index.js index df7aa70b7..75d4f44a9 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -26,3 +26,4 @@ export { default as AccountListTable } from './AccountListTable/index' export { default as AppAccountListTable } from './AppAccountListTable' export { default as AssetRelationCard } from './AssetRelationCard' export { default as MFAVerifyDialog } from './MFAVerifyDialog' +export { default as Announcement } from './Announcement' diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json index cd0d013a5..66eaa0648 100644 --- a/src/i18n/langs/cn.json +++ b/src/i18n/langs/cn.json @@ -233,6 +233,8 @@ "ReLogin": "重新登录" }, "common": { + "ViewMore": "查看更多", + "Announcement": "公告", "Logging": "日志记录", "Database": "数据库记录", "Params": "参数", @@ -778,6 +780,7 @@ } }, "setting": { + "Feature": "功能", "AlibabaCloud": "阿里云", "TencentCloud": "腾讯云", "Radius": "Radius", diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index 056f2ad17..fb8bdb1ba 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -231,6 +231,8 @@ "ReLogin": "Re-Login" }, "common": { + "ViewMore": "View more", + "Announcement": "Announcement", "Logging": "Logging", "Database": "Database", "Params": "Params", @@ -761,6 +763,7 @@ } }, "setting": { + "Feature": "Feature", "SMSProvider": "SMS provider", "SMS": "SMS setting", "AlibabaCloud": "Alibaba cloud", diff --git a/src/userviews/assets/index.vue b/src/userviews/assets/index.vue index a551fc750..52b841d14 100644 --- a/src/userviews/assets/index.vue +++ b/src/userviews/assets/index.vue @@ -1,13 +1,18 @@ + + diff --git a/src/views/settings/Basic.vue b/src/views/settings/Basic/index.vue similarity index 80% rename from src/views/settings/Basic.vue rename to src/views/settings/Basic/index.vue index a3601a054..0213a1b74 100644 --- a/src/views/settings/Basic.vue +++ b/src/views/settings/Basic/index.vue @@ -9,6 +9,7 @@ :submit-method="submitMethod" :has-detail-in-msg="false" :on-perform-success="onPerformSuccess" + class="form" /> @@ -17,6 +18,7 @@ import GenericCreateUpdateForm from '@/layout/components/GenericCreateUpdateForm' import { IBox } from '@/components' import rules from '@/components/DataForm/rules' +import Announcement from './announcement' export default { name: 'Basic', @@ -32,6 +34,11 @@ export default { 'SITE_URL', 'USER_GUIDE_URL', 'GLOBAL_ORG_DISPLAY_NAME' ] + ], + [ + this.$t('setting.Feature'), [ + 'TICKETS_ENABLED', 'ANNOUNCEMENT_ENABLED' + ] ] ], fieldsMeta: { @@ -42,6 +49,10 @@ export default { hidden: () => { return !this.$store.getters.hasValidLicense } + }, + ANNOUNCEMENT_ENABLED: { + // label: '公告', + component: Announcement } }, successUrl: { name: 'Settings', params: { activeMenu: 'Basic' }}, @@ -60,5 +71,8 @@ export default { diff --git a/src/views/settings/Other.vue b/src/views/settings/Other.vue index 296ea1ea8..75891909f 100644 --- a/src/views/settings/Other.vue +++ b/src/views/settings/Other.vue @@ -22,7 +22,7 @@ export default { [ this.$t('common.Basic'), [ - 'EMAIL_SUFFIX', 'TICKETS_ENABLED' + 'EMAIL_SUFFIX' ] ], [ diff --git a/src/views/settings/SMS/index.vue b/src/views/settings/SMS/index.vue index c9a191f9f..82459fab8 100644 --- a/src/views/settings/SMS/index.vue +++ b/src/views/settings/SMS/index.vue @@ -68,7 +68,7 @@ export default { diff --git a/src/views/settings/index.vue b/src/views/settings/index.vue index 1a1a4d05a..54b19ccba 100644 --- a/src/views/settings/index.vue +++ b/src/views/settings/index.vue @@ -12,7 +12,7 @@ import TabPage from '@/layout/components/TabPage' import AutoDataForm from '@/components/AutoDataForm' import IBox from '@/components/IBox' -import Basic from './Basic' +import Basic from './Basic/index' import Email from './Email/index' import Auth from './Auth' import Ldap from './Ldap'