From 08e0d6a34ab86d65bec8fb912f5f54985d19f446 Mon Sep 17 00:00:00 2001 From: dongchengjie <37543964+dongchengjie@users.noreply.github.com> Date: Mon, 20 May 2024 12:38:41 +0800 Subject: [PATCH] chore: text overflow word-wrap & cleanup --- src/components/log/log-item.tsx | 1 + src/components/setting/mods/hotkey-viewer.tsx | 2 +- .../setting/mods/sysproxy-viewer.tsx | 20 ++++++++++++++----- src/components/setting/mods/theme-viewer.tsx | 2 +- src/components/setting/setting-system.tsx | 1 - src/pages/logs.tsx | 10 +--------- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/components/log/log-item.tsx b/src/components/log/log-item.tsx index 1aa08040..012eb2e3 100644 --- a/src/components/log/log-item.tsx +++ b/src/components/log/log-item.tsx @@ -30,6 +30,7 @@ const Item = styled(Box)(({ theme: { palette, typography } }) => ({ }, "& .data": { color: palette.text.primary, + overflowWrap: "anywhere", }, })); diff --git a/src/components/setting/mods/hotkey-viewer.tsx b/src/components/setting/mods/hotkey-viewer.tsx index edca6c49..27e2ac4b 100644 --- a/src/components/setting/mods/hotkey-viewer.tsx +++ b/src/components/setting/mods/hotkey-viewer.tsx @@ -79,7 +79,7 @@ export const HotkeyViewer = forwardRef((props, ref) => { return ( ((props, ref) => { + + @@ -155,9 +157,17 @@ export const SysproxyViewer = forwardRef((props, ref) => { {t("Bypass")} - - {sysproxy?.bypass || "-"} - + + + diff --git a/src/components/setting/mods/theme-viewer.tsx b/src/components/setting/mods/theme-viewer.tsx index daa7e533..7aa8424a 100644 --- a/src/components/setting/mods/theme-viewer.tsx +++ b/src/components/setting/mods/theme-viewer.tsx @@ -1,4 +1,4 @@ -import { forwardRef, useImperativeHandle, useRef, useState } from "react"; +import { forwardRef, useImperativeHandle, useState } from "react"; import { useLockFn } from "ahooks"; import { useTranslation } from "react-i18next"; import { diff --git a/src/components/setting/setting-system.tsx b/src/components/setting/setting-system.tsx index 44b67f8f..a742d42e 100644 --- a/src/components/setting/setting-system.tsx +++ b/src/components/setting/setting-system.tsx @@ -11,7 +11,6 @@ import { GuardState } from "./mods/guard-state"; import { ServiceViewer } from "./mods/service-viewer"; import { SysproxyViewer } from "./mods/sysproxy-viewer"; import { TunViewer } from "./mods/tun-viewer"; -import getSystem from "@/utils/get-system"; interface Props { onError?: (err: Error) => void; diff --git a/src/pages/logs.tsx b/src/pages/logs.tsx index f88ee51a..e76a5fc7 100644 --- a/src/pages/logs.tsx +++ b/src/pages/logs.tsx @@ -1,14 +1,6 @@ import { useMemo, useState } from "react"; import { useRecoilState } from "recoil"; -import { - Box, - Button, - IconButton, - MenuItem, - Select, - SelectProps, - styled, -} from "@mui/material"; +import { Box, Button, IconButton, MenuItem } from "@mui/material"; import { Virtuoso } from "react-virtuoso"; import { useTranslation } from "react-i18next"; import {