fix: adjust fields order

src-tauri/src/enhance/field.rs

@@ -1,34 +1,34 @@
 use serde_yaml::{Mapping, Value};
 
 pub const HANDLE_FIELDS: [&str; 9] = [
+    "mode",
     "port",
     "socks-port",
     "mixed-port",
-    "mode",
-    "ipv6",
-    "log-level",
     "allow-lan",
-    "external-controller",
+    "log-level",
+    "ipv6",
     "secret",
+    "external-controller",
 ];
 
 pub const DEFAULT_FIELDS: [&str; 5] = [
     "proxies",
     "proxy-groups",
-    "rules",
     "proxy-providers",
+    "rules",
     "rule-providers",
 ];
 
 pub const OTHERS_FIELDS: [&str; 25] = [
-    "tun",
     "dns",
+    "tun",
     "ebpf",
     "hosts",
     "script",
     "profile",
     "payload",
-    "tunnels", // clash dev
+    "tunnels",
     "auto-redir",
     "experimental",
     "interface-name",

src/components/setting/mods/clash-field-viewer.tsx

@@ -13,17 +13,8 @@ import { BaseDialog, DialogRef } from "@/components/base";
 import { useProfiles } from "@/hooks/use-profiles";
 import { Notice } from "@/components/base";
 
-const fieldSorter = (a: string, b: string) => {
+const otherFields = [...OTHERS_FIELDS];
-  if (a.includes("-") === a.includes("-")) {
+const handleFields = [...HANDLE_FIELDS, ...DEFAULT_FIELDS];
-    if (a.length === b.length) return a.localeCompare(b);
-    return a.length - b.length;
-  } else if (a.includes("-")) return 1;
-  else if (b.includes("-")) return -1;
-  return 0;
-};
-
-const otherFields = [...OTHERS_FIELDS].sort(fieldSorter);
-const handleFields = [...HANDLE_FIELDS, ...DEFAULT_FIELDS].sort(fieldSorter);
 
 export const ClashFieldViewer = forwardRef<DialogRef>((props, ref) => {
   const { t } = useTranslation();

src/utils/clash-fields.ts

@@ -1,9 +1,9 @@
 export const HANDLE_FIELDS = [
+  "mode",
   "port",
   "socks-port",
   "mixed-port",
   "allow-lan",
-  "mode",
   "log-level",
   "ipv6",
   "secret",
@@ -11,22 +11,22 @@ export const HANDLE_FIELDS = [
 ];
 
 export const DEFAULT_FIELDS = [
-  "rules",
   "proxies",
   "proxy-groups",
   "proxy-providers",
+  "rules",
   "rule-providers",
 ] as const;
 
 export const OTHERS_FIELDS = [
-  "tun",
   "dns",
+  "tun",
   "ebpf",
   "hosts",
   "script",
   "profile",
   "payload",
-  "tunnels", // clash dev
+  "tunnels",
   "auto-redir",
   "experimental",
   "interface-name",