From 7534f8fc37539aa3bda549adf6efbd4ac3a5479b Mon Sep 17 00:00:00 2001 From: Pylogmon Date: Tue, 5 Dec 2023 08:34:57 +0800 Subject: [PATCH] refactor: Hide Clash Field Option when Disable Filter (#63) --- src-tauri/src/config/verge.rs | 4 ++-- src/components/setting/setting-clash.tsx | 28 ++++++++++++++---------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src-tauri/src/config/verge.rs b/src-tauri/src/config/verge.rs index 64668839..a5ea8a33 100644 --- a/src-tauri/src/config/verge.rs +++ b/src-tauri/src/config/verge.rs @@ -77,7 +77,7 @@ pub struct IVerge { /// 默认的延迟测试连接 pub default_latency_test: Option, - /// 支持关闭字段过滤,避免meta的新字段都被过滤掉,默认为真 + /// 支持关闭字段过滤,避免meta的新字段都被过滤掉,默认为关闭 pub enable_clash_fields: Option, /// 是否使用内部的脚本支持,默认为真 @@ -151,7 +151,7 @@ impl IVerge { proxy_guard_duration: Some(30), auto_close_connection: Some(true), enable_builtin_enhanced: Some(true), - enable_clash_fields: Some(true), + enable_clash_fields: Some(false), auto_log_clean: Some(3), ..Self::default() } diff --git a/src/components/setting/setting-clash.tsx b/src/components/setting/setting-clash.tsx index f64d48ee..d56adeca 100644 --- a/src/components/setting/setting-clash.tsx +++ b/src/components/setting/setting-clash.tsx @@ -38,7 +38,11 @@ const SettingClash = ({ onError }: Props) => { const { ipv6, "allow-lan": allowLan, "log-level": logLevel } = clash ?? {}; - const { enable_random_port = false, verge_mixed_port } = verge ?? {}; + const { + enable_random_port = false, + verge_mixed_port, + enable_clash_fields = false, + } = verge ?? {}; const webRef = useRef(null); const fieldRef = useRef(null); @@ -162,16 +166,18 @@ const SettingClash = ({ onError }: Props) => { - - fieldRef.current?.open()} - > - - - + {enable_clash_fields && ( + + fieldRef.current?.open()} + > + + + + )}