diff --git a/UPDATELOG.md b/UPDATELOG.md index 057b015..8f818f6 100644 --- a/UPDATELOG.md +++ b/UPDATELOG.md @@ -1,3 +1,38 @@ +## v1.7.0 + +### Break Changes + +- 此版本重构了 Merge/Script，更新前请先备份好自定义 Merge 和 Script（更新并不会删除配置文件，但是旧版 Merge 和 Script 在更新后无法从前端访问，备份以防万一） +- Merge 改名为 `扩展配置`，分为 `全局扩展配置` 和 `订阅扩展配置`，全局扩展配置对所有订阅生效，订阅扩展配置只对关联的订阅生效 +- Script 改名为 `扩展脚本`，同样分为 `全局扩展脚本` 和 `订阅扩展脚本` +- 执行优先级为： 全局扩展配置 -> 全局扩展脚本 -> 订阅扩展配置 ->订阅扩展脚本 +- MacOS 用户更新后请重新安装服务模式 + +### Features + +- 移除内核授权，改为服务模式实现 +- 自动填充本地订阅名称 +- 添加重大更新处理逻辑 +- 订阅单独指定扩展配置/脚本（需要重新导入订阅） +- 添加可视化规则编辑器（需要重新导入订阅） +- 编辑器新增工具栏按钮（格式化、最大化/最小化） +- WEBUI 使用最新版 metacubex，并解决无法自动登陆问问题 +- 禁用部分 Webview2 快捷键 +- 热键配置新增连接符 + 号 +- 新增部分悬浮提示按钮，用于解释说明 +- 当日志等级为`Debug`时（更改需重启软件生效），支持点击内存主动内存回收（绿色文字） +- 设置页面右上角新增 TG 频道链接 + +### Bugs Fixes + +- 修复代理绕过格式检查 +- 通过进程名称关闭进程 +- 退出软件时恢复 DNS 设置 +- 修复创建本地订阅时更新间隔无法保存 +- 连接页面列宽无法调整 + +--- + ## v1.6.6 ### Features diff --git a/package.json b/package.json index ec521a0..042bf26 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "clash-verge", - "version": "1.6.6", + "version": "1.7.0", "license": "GPL-3.0-only", "scripts": { "dev": "tauri dev", @@ -37,14 +37,14 @@ "i18next": "^23.11.5", "js-yaml": "^4.1.0", "lodash-es": "^4.17.21", - "meta-json-schema": "1.18.5-alpha7", + "meta-json-schema": "1.18.6", "monaco-editor": "^0.49.0", "monaco-yaml": "^5.2.0", "nanoid": "^5.0.7", "react": "^18.3.1", "react-dom": "^18.3.1", "react-error-boundary": "^3.1.4", - "react-hook-form": "^7.52.0", + "react-hook-form": "^7.52.1", "react-i18next": "^13.5.0", "react-markdown": "^9.0.1", "react-monaco-editor": "^0.55.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8c79bb5..4953e61 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -65,8 +65,8 @@ importers: specifier: ^4.17.21 version: 4.17.21 meta-json-schema: - specifier: 1.18.5-alpha7 - version: 1.18.5-alpha7 + specifier: 1.18.6 + version: 1.18.6 monaco-editor: specifier: ^0.49.0 version: 0.49.0 @@ -86,8 +86,8 @@ importers: specifier: ^3.1.4 version: 3.1.4(react@18.3.1) react-hook-form: - specifier: ^7.52.0 - version: 7.52.0(react@18.3.1) + specifier: ^7.52.1 + version: 7.52.1(react@18.3.1) react-i18next: specifier: ^13.5.0 version: 13.5.0(i18next@23.11.5)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -3311,10 +3311,10 @@ packages: integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==, } - meta-json-schema@1.18.5-alpha7: + meta-json-schema@1.18.6: resolution: { - integrity: sha512-VhlrRXgtzZFIg6VAuipDfQ9cuBxUlondbwRHzB8++OkXWD9HZYp4wXYZPTNa7pcTIr1rMWsg+0llvBlGGp/Z5w==, + integrity: sha512-HMDu+1lcVsgEsa4kPlyo2ZNgOEbaQJhOzU4ll4qJahwx5TIw8NkcbXgxnKEW6NieqL4AOWWtoNgw3EKeuHg4+A==, } micromark-core-commonmark@2.0.1: @@ -3800,10 +3800,10 @@ packages: integrity: sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==, } - react-hook-form@7.52.0: + react-hook-form@7.52.1: resolution: { - integrity: sha512-mJX506Xc6mirzLsmXUJyqlAI3Kj9Ph2RhplYhUVffeOQSnubK2uVqBFOBJmvKikvbFV91pxVXmDiR+QMF19x6A==, + integrity: sha512-uNKIhaoICJ5KQALYZ4TOaOLElyM+xipord+Ha3crEFhTntdLvWZqVY49Wqd/0GiVCA/f9NjemLeiNPjG7Hpurg==, } engines: { node: ">=12.22.0" } peerDependencies: @@ -6639,7 +6639,7 @@ snapshots: merge-stream@2.0.0: {} - meta-json-schema@1.18.5-alpha7: {} + meta-json-schema@1.18.6: {} micromark-core-commonmark@2.0.1: dependencies: @@ -6967,7 +6967,7 @@ snapshots: react-fast-compare@3.2.2: {} - react-hook-form@7.52.0(react@18.3.1): + react-hook-form@7.52.1(react@18.3.1): dependencies: react: 18.3.1 diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 16c97b8..ef122ce 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -784,7 +784,7 @@ dependencies = [ [[package]] name = "clash-verge" -version = "1.6.6" +version = "1.7.0" dependencies = [ "anyhow", "auto-launch", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index d384207..677df46 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clash-verge" -version = "1.6.6" +version = "1.7.0" description = "clash verge" authors = ["zzzgydi", "wonfen", "MystiPanda"] license = "GPL-3.0-only" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 7db1115..7d294ea 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -2,7 +2,7 @@ "$schema": "../node_modules/@tauri-apps/cli/schema.json", "package": { "productName": "Clash Verge", - "version": "1.6.6" + "version": "1.7.0" }, "build": { "distDir": "../dist", diff --git a/src/components/profile/profile-item.tsx b/src/components/profile/profile-item.tsx index 9c80305..0ecaed6 100644 --- a/src/components/profile/profile-item.tsx +++ b/src/components/profile/profile-item.tsx @@ -213,16 +213,16 @@ export const ProfileItem = (props: Props) => { handler: onEditRules, disabled: option?.rules === null, }, - { - label: "Edit Proxies", - handler: onEditProxies, - disabled: option?.proxies === null, - }, - { - label: "Edit Groups", - handler: onEditGroups, - disabled: option?.groups === null, - }, + // { + // label: "Edit Proxies", + // handler: onEditProxies, + // disabled: option?.proxies === null, + // }, + // { + // label: "Edit Groups", + // handler: onEditGroups, + // disabled: option?.groups === null, + // }, { label: "Extend Config", handler: onEditMerge, @@ -254,16 +254,16 @@ export const ProfileItem = (props: Props) => { handler: onEditRules, disabled: option?.rules === null, }, - { - label: "Edit Proxies", - handler: onEditProxies, - disabled: option?.proxies === null, - }, - { - label: "Edit Groups", - handler: onEditGroups, - disabled: option?.groups === null, - }, + // { + // label: "Edit Proxies", + // handler: onEditProxies, + // disabled: option?.proxies === null, + // }, + // { + // label: "Edit Groups", + // handler: onEditGroups, + // disabled: option?.groups === null, + // }, { label: "Extend Config", handler: onEditMerge,