mirror of
https://github.com/clash-verge-rev/clash-verge-rev
synced 2025-05-05 04:53:44 +08:00
chore: use search-box in logs and connections
This commit is contained in:
parent
2cc9b91895
commit
4f740acabd
@ -11,9 +11,8 @@ type SearchProps = {
|
|||||||
placeholder?: string;
|
placeholder?: string;
|
||||||
onSearch: (
|
onSearch: (
|
||||||
match: (content: string) => boolean,
|
match: (content: string) => boolean,
|
||||||
search: (contents: string[]) => string[],
|
|
||||||
state: {
|
state: {
|
||||||
input: string;
|
text: string;
|
||||||
matchCase: boolean;
|
matchCase: boolean;
|
||||||
matchWholeWord: boolean;
|
matchWholeWord: boolean;
|
||||||
useRegularExpression: boolean;
|
useRegularExpression: boolean;
|
||||||
@ -41,9 +40,8 @@ export const BaseSearchBox = styled((props: SearchProps) => {
|
|||||||
const onChange = (e: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {
|
const onChange = (e: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => {
|
||||||
props.onSearch(
|
props.onSearch(
|
||||||
(content) => doSearch([content], e.target?.value ?? "").length > 0,
|
(content) => doSearch([content], e.target?.value ?? "").length > 0,
|
||||||
(contents: string[]) => doSearch(contents, e.target?.value ?? ""),
|
|
||||||
{
|
{
|
||||||
input: e.target?.value ?? "",
|
text: e.target?.value ?? "",
|
||||||
matchCase,
|
matchCase,
|
||||||
matchWholeWord,
|
matchWholeWord,
|
||||||
useRegularExpression,
|
useRegularExpression,
|
||||||
@ -74,8 +72,8 @@ export const BaseSearchBox = styled((props: SearchProps) => {
|
|||||||
} else {
|
} else {
|
||||||
return item.includes(searchItemCopy);
|
return item.includes(searchItemCopy);
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (err) {
|
||||||
setErrorMessage(`${e}`);
|
setErrorMessage(`${err}`);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
@ -18,7 +18,7 @@ import {
|
|||||||
} from "@/components/connection/connection-detail";
|
} from "@/components/connection/connection-detail";
|
||||||
import parseTraffic from "@/utils/parse-traffic";
|
import parseTraffic from "@/utils/parse-traffic";
|
||||||
import { useCustomTheme } from "@/components/layout/use-custom-theme";
|
import { useCustomTheme } from "@/components/layout/use-custom-theme";
|
||||||
import { BaseStyledTextField } from "@/components/base/base-styled-text-field";
|
import { BaseSearchBox } from "@/components/base/base-search-box";
|
||||||
|
|
||||||
const initConn = { uploadTotal: 0, downloadTotal: 0, connections: [] };
|
const initConn = { uploadTotal: 0, downloadTotal: 0, connections: [] };
|
||||||
|
|
||||||
@ -29,7 +29,7 @@ const ConnectionsPage = () => {
|
|||||||
const { clashInfo } = useClashInfo();
|
const { clashInfo } = useClashInfo();
|
||||||
const { theme } = useCustomTheme();
|
const { theme } = useCustomTheme();
|
||||||
const isDark = theme.palette.mode === "dark";
|
const isDark = theme.palette.mode === "dark";
|
||||||
const [filterText, setFilterText] = useState("");
|
const [match, setMatch] = useState(() => (_: string) => true);
|
||||||
const [curOrderOpt, setOrderOpt] = useState("Default");
|
const [curOrderOpt, setOrderOpt] = useState("Default");
|
||||||
const [connData, setConnData] = useState<IConnections>(initConn);
|
const [connData, setConnData] = useState<IConnections>(initConn);
|
||||||
|
|
||||||
@ -52,7 +52,7 @@ const ConnectionsPage = () => {
|
|||||||
const [filterConn, download, upload] = useMemo(() => {
|
const [filterConn, download, upload] = useMemo(() => {
|
||||||
const orderFunc = orderOpts[curOrderOpt];
|
const orderFunc = orderOpts[curOrderOpt];
|
||||||
let connections = connData.connections.filter((conn) =>
|
let connections = connData.connections.filter((conn) =>
|
||||||
(conn.metadata.host || conn.metadata.destinationIP)?.includes(filterText)
|
match(conn.metadata.host || conn.metadata.destinationIP || "")
|
||||||
);
|
);
|
||||||
|
|
||||||
if (orderFunc) connections = orderFunc(connections);
|
if (orderFunc) connections = orderFunc(connections);
|
||||||
@ -63,7 +63,7 @@ const ConnectionsPage = () => {
|
|||||||
upload += x.upload;
|
upload += x.upload;
|
||||||
});
|
});
|
||||||
return [connections, download, upload];
|
return [connections, download, upload];
|
||||||
}, [connData, filterText, curOrderOpt]);
|
}, [connData, match, curOrderOpt]);
|
||||||
|
|
||||||
const { connect, disconnect } = useWebsocket(
|
const { connect, disconnect } = useWebsocket(
|
||||||
(event) => {
|
(event) => {
|
||||||
@ -182,11 +182,7 @@ const ConnectionsPage = () => {
|
|||||||
))}
|
))}
|
||||||
</Select>
|
</Select>
|
||||||
)}
|
)}
|
||||||
|
<BaseSearchBox onSearch={(match) => setMatch(() => match)} />
|
||||||
<BaseStyledTextField
|
|
||||||
value={filterText}
|
|
||||||
onChange={(e) => setFilterText(e.target.value)}
|
|
||||||
/>
|
|
||||||
</Box>
|
</Box>
|
||||||
|
|
||||||
<Box
|
<Box
|
||||||
|
@ -8,18 +8,18 @@ import { BaseEmpty, BasePage } from "@/components/base";
|
|||||||
import RuleItem from "@/components/rule/rule-item";
|
import RuleItem from "@/components/rule/rule-item";
|
||||||
import { ProviderButton } from "@/components/rule/provider-button";
|
import { ProviderButton } from "@/components/rule/provider-button";
|
||||||
import { useCustomTheme } from "@/components/layout/use-custom-theme";
|
import { useCustomTheme } from "@/components/layout/use-custom-theme";
|
||||||
import { BaseStyledTextField } from "@/components/base/base-styled-text-field";
|
import { BaseSearchBox } from "@/components/base/base-search-box";
|
||||||
|
|
||||||
const RulesPage = () => {
|
const RulesPage = () => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const { data = [] } = useSWR("getRules", getRules);
|
const { data = [] } = useSWR("getRules", getRules);
|
||||||
const { theme } = useCustomTheme();
|
const { theme } = useCustomTheme();
|
||||||
const isDark = theme.palette.mode === "dark";
|
const isDark = theme.palette.mode === "dark";
|
||||||
const [filterText, setFilterText] = useState("");
|
const [match, setMatch] = useState(() => (_: string) => true);
|
||||||
|
|
||||||
const rules = useMemo(() => {
|
const rules = useMemo(() => {
|
||||||
return data.filter((each) => each.payload.includes(filterText));
|
return data.filter((item) => match(item.payload));
|
||||||
}, [data, filterText]);
|
}, [data, match]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<BasePage
|
<BasePage
|
||||||
@ -42,10 +42,7 @@ const RulesPage = () => {
|
|||||||
alignItems: "center",
|
alignItems: "center",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<BaseStyledTextField
|
<BaseSearchBox onSearch={(match) => setMatch(() => match)} />
|
||||||
value={filterText}
|
|
||||||
onChange={(e) => setFilterText(e.target.value)}
|
|
||||||
/>
|
|
||||||
</Box>
|
</Box>
|
||||||
|
|
||||||
<Box
|
<Box
|
||||||
|
Loading…
x
Reference in New Issue
Block a user