From 9ec1610f34095c1fce1f196236c028769bc38e20 Mon Sep 17 00:00:00 2001 From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com> Date: Mon, 8 Apr 2024 17:06:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E7=BF=BB=E8=AF=91=20(#4428)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/i18n/lang/en.yaml | 2 ++ backend/i18n/lang/zh-Hant.yaml | 2 ++ backend/i18n/lang/zh.yaml | 6 ++++-- frontend/src/components/index.ts | 2 ++ frontend/src/components/msg-info/index.vue | 1 + 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/backend/i18n/lang/en.yaml b/backend/i18n/lang/en.yaml index 231f7a11e..38c1ed9bf 100644 --- a/backend/i18n/lang/en.yaml +++ b/backend/i18n/lang/en.yaml @@ -175,6 +175,8 @@ ErrRuleNotExist: "Rule is not Exist" ErrParseIP: "IP format error" ErrDefaultIP: "default is a reserved name, please change it to another name" ErrGroupInUse: "The IP group is used by the black/white list and cannot be deleted" +ErrGroupExist: "IP group name already exists" +ErrIPRange: "Wrong IP range" #license ErrLicense: "License format error, please check and try again!" diff --git a/backend/i18n/lang/zh-Hant.yaml b/backend/i18n/lang/zh-Hant.yaml index 0a015ca2d..90f96b612 100644 --- a/backend/i18n/lang/zh-Hant.yaml +++ b/backend/i18n/lang/zh-Hant.yaml @@ -176,6 +176,8 @@ ErrRuleNotExist: "規則不存在" ErrParseIP: "IP 格式錯誤" ErrDefaultIP: "default 為保留名稱,請更換其他名稱" ErrGroupInUse: "IP 群組被黑/白名單使用,無法刪除" +ErrGroupExist: "IP 群組名稱已存在" +ErrIPRange: "IP 範圍錯誤" #license ErrLicense: "許可證格式錯誤,請檢查後重試!" diff --git a/backend/i18n/lang/zh.yaml b/backend/i18n/lang/zh.yaml index 9c2c3b9d0..238ca011c 100644 --- a/backend/i18n/lang/zh.yaml +++ b/backend/i18n/lang/zh.yaml @@ -175,11 +175,13 @@ ErrRuleNotExist: "规则不存在" ErrParseIP: "IP 格式错误" ErrDefaultIP: "default 为保留名称,请更换其他名称" ErrGroupInUse: "IP 组被黑/白名单使用,无法删除" +ErrGroupExist: "IP 组名称已存在" +ErrIPRange: "IP 范围错误" #license ErrLicense: "许可证格式错误,请检查后重试!" -ErrLicenseCheck: 许可证校验失败,请检查后重试!" -ErrLicenseSave: 许可证信息保存失败,错误 {{ .err }},请重试!" +ErrLicenseCheck: "许可证校验失败,请检查后重试!" +ErrLicenseSave: "许可证信息保存失败,错误 {{ .err }},请重试!" ErrLicenseSync: "许可证信息同步失败,数据库中未检测到许可证信息!" ErrXpackNotFound: "该部分为专业版功能,请先在 面板设置-许可证 界面导入许可证" ErrXpackNotActive: "该部分为专业版功能,请先在 面板设置-许可证 界面同步许可证状态" diff --git a/frontend/src/components/index.ts b/frontend/src/components/index.ts index 2a8658d96..26da838c1 100644 --- a/frontend/src/components/index.ts +++ b/frontend/src/components/index.ts @@ -8,6 +8,7 @@ import TableSearch from './table-search/index.vue'; import TableSetting from './table-setting/index.vue'; import Tooltip from '@/components/tooltip/index.vue'; import CopyButton from '@/components/copy-button/index.vue'; +import MsgInfo from '@/components/msg-info/index.vue'; export default { install(app: App) { app.component(LayoutContent.name, LayoutContent); @@ -19,5 +20,6 @@ export default { app.component(CopyButton.name, CopyButton); app.component(TableSearch.name, TableSearch); app.component(TableSetting.name, TableSetting); + app.component(MsgInfo.name, MsgInfo); }, }; diff --git a/frontend/src/components/msg-info/index.vue b/frontend/src/components/msg-info/index.vue index 14d3f565a..6815e89bc 100644 --- a/frontend/src/components/msg-info/index.vue +++ b/frontend/src/components/msg-info/index.vue @@ -17,6 +17,7 @@ defineProps({ default: '', }, }); +defineOptions({ name: 'MsgInfo' });