diff --git a/README.md b/README.md
index c662ae5..c5b7c46 100644
--- a/README.md
+++ b/README.md
@@ -41,18 +41,18 @@ A Clash Meta GUI based on Tauri section {
+ padding: 0;
+ overflow: visible;
+
+ .base-content {
+ width: 100%;
+ }
+ }
+ }
}
}
diff --git a/src/components/base/base-page.tsx b/src/components/base/base-page.tsx
index e18611f..4a7defa 100644
--- a/src/components/base/base-page.tsx
+++ b/src/components/base/base-page.tsx
@@ -8,10 +8,11 @@ interface Props {
header?: React.ReactNode; // something behind title
contentStyle?: React.CSSProperties;
children?: ReactNode;
+ full?: boolean;
}
export const BasePage: React.FC = (props) => {
- const { title, header, contentStyle, children } = props;
+ const { title, header, contentStyle, full, children } = props;
const { theme } = useCustomTheme();
const isDark = theme.palette.mode === "dark";
@@ -28,7 +29,7 @@ export const BasePage: React.FC = (props) => {
{
return (
{
}
>
-
-
- {!isTableLayout && (
-
- )}
-
-
+ {!isTableLayout && (
+
+ value={curOrderOpt}
+ onChange={(e) => setOrderOpt(e.target.value)}
+ sx={{
+ mr: 1,
+ width: i18n.language === "en" ? 190 : 120,
+ '[role="button"]': { py: 0.65 },
+ }}
+ >
+ {Object.keys(orderOpts).map((opt) => (
+
+ ))}
+
+ )}
-
- {filterConn.length === 0 ? (
-
- ) : isTableLayout ? (
- detailRef.current?.open(detail)}
- />
- ) : (
- (
- detailRef.current?.open(item)}
- />
- )}
- />
- )}
-
-
-
+ setFilterText(e.target.value)}
+ sx={{ input: { py: 0.65, px: 1.25 } }}
+ />
+
+
+ {filterConn.length === 0 ? (
+
+ ) : isTableLayout ? (
+ detailRef.current?.open(detail)}
+ />
+ ) : (
+ (
+ detailRef.current?.open(item)}
+ />
+ )}
+ />
+ )}
+
+
);
};
diff --git a/src/pages/logs.tsx b/src/pages/logs.tsx
index 8b7c0f2..acd9486 100644
--- a/src/pages/logs.tsx
+++ b/src/pages/logs.tsx
@@ -38,6 +38,7 @@ const LogPage = () => {
return (
{
>
- setLogState(e.target.value)}
+ sx={{ width: 120, mr: 1, '[role="button"]': { py: 0.65 } }}
>
-
+
+
+
+
+
- setFilterText(e.target.value)}
- sx={{ input: { py: 0.65, px: 1.25 } }}
+ setFilterText(e.target.value)}
+ sx={{ input: { py: 0.65, px: 1.25 } }}
+ />
+
+
+
+ {filterLogs.length > 0 ? (
+ }
+ followOutput={"smooth"}
/>
-
-
-
- {filterLogs.length > 0 ? (
- }
- followOutput={"smooth"}
- />
- ) : (
-
- )}
-
+ ) : (
+
+ )}
);
diff --git a/src/pages/proxies.tsx b/src/pages/proxies.tsx
index 6a71a4a..6c99d0b 100644
--- a/src/pages/proxies.tsx
+++ b/src/pages/proxies.tsx
@@ -51,6 +51,7 @@ const ProxyPage = () => {
return (
{
}
>
-
-
-
+
);
};
diff --git a/src/pages/rules.tsx b/src/pages/rules.tsx
index dd7ba29..feab034 100644
--- a/src/pages/rules.tsx
+++ b/src/pages/rules.tsx
@@ -18,45 +18,43 @@ const RulesPage = () => {
}, [data, filterText]);
return (
-
-
-
- setFilterText(e.target.value)}
- sx={{ input: { py: 0.65, px: 1.25 } }}
- />
-
+
+
+ setFilterText(e.target.value)}
+ sx={{ input: { py: 0.65, px: 1.25 } }}
+ />
+
-
- {rules.length > 0 ? (
- (
-
- )}
- followOutput={"smooth"}
- />
- ) : (
-
- )}
-
+
+ {rules.length > 0 ? (
+ (
+
+ )}
+ followOutput={"smooth"}
+ />
+ ) : (
+
+ )}
);