root/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-01-29 17:15:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: enhance merge config validation and error handling

Browse Source
This commit is contained in:
wonfen
2025-02-27 14:49:55 +08:00
parent 1a9b0a476b
commit a4dd4bcc8a
5 changed files with 198 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/locales/en.json
View File

@@ -451,5 +451,18 @@
"File Not Found": "File missing, changes reverted",
"Script File Error": "Script file error, changes reverted",
"Core Changed Successfully": "Core changed successfully",
"Failed to Change Core": "Failed to change core"
"Failed to Change Core": "Failed to change core",
"YAML Syntax Error": "YAML syntax error, changes reverted",
"YAML Read Error": "YAML read error, changes reverted",
"YAML Mapping Error": "YAML mapping error, changes reverted",
"YAML Key Error": "YAML key error, changes reverted",
"YAML Error": "YAML error, changes reverted",
"Merge File Syntax Error": "Merge file syntax error, changes reverted",
"Merge File Mapping Error": "Merge file mapping error, changes reverted",
"Merge File Key Error": "Merge file key error, changes reverted",
"Merge File Error": "Merge file error, changes reverted",
"Validate YAML File": "Validate YAML File",
"Validate Merge File": "Validate Merge File",
"Validation Success": "Validation Success",
"Validation Failed": "Validation Failed"
}

19
src/locales/zh.json
View File

@@ -135,9 +135,9 @@
"Hidden": "隐藏代理组",
"Group Name Required": "代理组名称不能为空",
"Group Name Already Exists": "代理组名称已存在",
"Extend Config": "扩展配置",
"Extend Config": "扩展覆写配置",
"Extend Script": "扩展脚本",
"Global Merge": "全局扩展配置",
"Global Merge": "全局扩展覆写配置",
"Global Script": "全局扩展脚本",
"Type": "类型",
"Name": "名称",
@@ -444,5 +444,18 @@
"File Not Found": "文件丢失，变更已撤销",
"Script File Error": "脚本文件错误，变更已撤销",
"Core Changed Successfully": "内核切换成功",
"Failed to Change Core": "无法切换内核"
"Failed to Change Core": "无法切换内核",
"YAML Syntax Error": "YAML语法错误，变更已撤销",
"YAML Read Error": "YAML读取错误，变更已撤销",
"YAML Mapping Error": "YAML映射错误，变更已撤销",
"YAML Key Error": "YAML键错误，变更已撤销",
"YAML Error": "YAML错误，变更已撤销",
"Merge File Syntax Error": "覆写文件语法错误，变更已撤销",
"Merge File Mapping Error": "覆写文件映射错误，变更已撤销",
"Merge File Key Error": "覆写文件键错误，变更已撤销",
"Merge File Error": "覆写文件错误，变更已撤销",
"Validate YAML File": "验证YAML文件",
"Validate Merge File": "验证覆写文件",
"Validation Success": "验证成功",
"Validation Failed": "验证失败"
}

27
src/pages/_layout.tsx
View File

@@ -84,6 +84,33 @@ const handleNoticeMessage = (
case "config_validate::file_not_found":
Notice.error(`${t("File Not Found")} ${msg}`);
break;
case "config_validate::yaml_syntax_error":
Notice.error(`${t("YAML Syntax Error")} ${msg}`);
break;
case "config_validate::yaml_read_error":
Notice.error(`${t("YAML Read Error")} ${msg}`);
break;
case "config_validate::yaml_mapping_error":
Notice.error(`${t("YAML Mapping Error")} ${msg}`);
break;
case "config_validate::yaml_key_error":
Notice.error(`${t("YAML Key Error")} ${msg}`);
break;
case "config_validate::yaml_error":
Notice.error(`${t("YAML Error")} ${msg}`);
break;
case "config_validate::merge_syntax_error":
Notice.error(`${t("Merge File Syntax Error")} ${msg}`);
break;
case "config_validate::merge_mapping_error":
Notice.error(`${t("Merge File Mapping Error")} ${msg}`);
break;
case "config_validate::merge_key_error":
Notice.error(`${t("Merge File Key Error")} ${msg}`);
break;
case "config_validate::merge_error":
Notice.error(`${t("Merge File Error")} ${msg}`);
break;
case "config_core::change_success":
Notice.success(`${t("Core Changed Successfully")}: ${msg}`);
break;