diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index abd84ec..2fdcc9e 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -4,7 +4,11 @@ body { "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; -webkit-font-smoothing: antialiased; + user-select: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; } :root { @@ -37,3 +41,10 @@ body { background-color: rgba(18, 18, 18, 1); } } + +.user-none { + user-select: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; +} diff --git a/src/assets/styles/layout.scss b/src/assets/styles/layout.scss index 1dd22bd..0727042 100644 --- a/src/assets/styles/layout.scss +++ b/src/assets/styles/layout.scss @@ -14,6 +14,9 @@ flex-direction: column; box-sizing: border-box; user-select: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; overflow: hidden; $maxLogo: 100px; diff --git a/src/components/setting/mods/core-switch.tsx b/src/components/setting/mods/core-switch.tsx index d54e678..00f1706 100644 --- a/src/components/setting/mods/core-switch.tsx +++ b/src/components/setting/mods/core-switch.tsx @@ -1,9 +1,10 @@ import { mutate } from "swr"; import { useState } from "react"; import { useLockFn } from "ahooks"; -import { Menu, MenuItem } from "@mui/material"; +import { IconButton, Menu, MenuItem } from "@mui/material"; import { Settings } from "@mui/icons-material"; import { changeClashCore } from "@/services/cmds"; +import { closeAllConnections } from "@/services/api"; import { useVerge } from "@/hooks/use-verge"; import { Notice } from "@/components/base"; @@ -24,6 +25,7 @@ export const CoreSwitch = () => { if (core === clash_core) return; try { + closeAllConnections(); await changeClashCore(core); mutateVerge(); setTimeout(() => { @@ -39,15 +41,20 @@ export const CoreSwitch = () => { return ( <> - { const { clientX, clientY } = event; setPosition({ top: clientY, left: clientX }); setAnchorEl(event.currentTarget); }} - /> + > + + = (props) => { label ) : ( - {label} + {label} {extra} ); diff --git a/src/components/setting/setting-verge.tsx b/src/components/setting/setting-verge.tsx index 12cf47b..7cf8313 100644 --- a/src/components/setting/setting-verge.tsx +++ b/src/components/setting/setting-verge.tsx @@ -167,7 +167,7 @@ const SettingVerge = ({ onError }: Props) => { - v{version} + v{version} ); diff --git a/src/pages/logs.tsx b/src/pages/logs.tsx index f7326f2..1e6fb5b 100644 --- a/src/pages/logs.tsx +++ b/src/pages/logs.tsx @@ -65,7 +65,14 @@ const LogPage = () => { } > - +