Merge branch 'main' into cloudflare

This commit is contained in:
hamster1963 2024-11-30 23:37:59 +08:00
commit 8d72338552
9 changed files with 53 additions and 20 deletions

View File

@ -2,9 +2,8 @@
name: Bug 提交 name: Bug 提交
about: 提交 bug让面板变得更好。 about: 提交 bug让面板变得更好。
title: "[BUG]" title: "[BUG]"
labels: '' labels: ""
assignees: '' assignees: ""
--- ---
**面板版本(二选一)** **面板版本(二选一)**
@ -16,6 +15,5 @@ V0 | V1
**屏幕截图** **屏幕截图**
有屏幕截图可以帮助更快定位到问题 有屏幕截图可以帮助更快定位到问题
**额外信息** **额外信息**
可附上其他需要的额外信息 可附上其他需要的额外信息

View File

@ -2,9 +2,8 @@
name: 功能申请 name: 功能申请
about: 描述需求 about: 描述需求
title: "[FEAT]" title: "[FEAT]"
labels: '' labels: ""
assignees: '' assignees: ""
--- ---
**面板版本(二选一)** **面板版本(二选一)**

View File

@ -2,13 +2,13 @@
name: 改善建议 name: 改善建议
about: 交流面板需要改进的地方 about: 交流面板需要改进的地方
title: "[SUGGEST]" title: "[SUGGEST]"
labels: '' labels: ""
assignees: '' assignees: ""
--- ---
**面板版本(二选一)** **面板版本(二选一)**
V0 | V1 V0 | V1
**需要改进的?** **需要改进的?**
*
-

View File

@ -199,6 +199,34 @@ export default function ServerDetailClient({
</CardContent> </CardContent>
</Card> </Card>
</section> </section>
<section className="flex flex-wrap gap-2 mt-1">
<Card className="rounded-[10px] bg-transparent border-none shadow-none">
<CardContent className="px-1.5 py-1">
<section className="flex flex-col items-start gap-0.5">
<p className="text-xs text-muted-foreground">{t("Upload")}</p>
{data.status.NetOutTransfer ? (
<div className="text-xs">
{" "}
{formatBytes(data.status.NetOutTransfer)}{" "}
</div>
) : null}
</section>
</CardContent>
</Card>
<Card className="rounded-[10px] bg-transparent border-none shadow-none">
<CardContent className="px-1.5 py-1">
<section className="flex flex-col items-start gap-0.5">
<p className="text-xs text-muted-foreground">{t("Download")}</p>
{data.status.NetInTransfer ? (
<div className="text-xs">
{" "}
{formatBytes(data.status.NetInTransfer)}{" "}
</div>
) : null}
</section>
</CardContent>
</Card>
</section>
</div> </div>
); );
} }

View File

@ -61,7 +61,9 @@
"Disk": "Disk", "Disk": "Disk",
"Region": "Region", "Region": "Region",
"System": "System", "System": "System",
"CPU": "CPU" "CPU": "CPU",
"Upload": "Upload",
"Download": "Download"
}, },
"ServerDetailChartClient": { "ServerDetailChartClient": {
"chart_fetch_error_message": "Please check your environment variables and review the server console", "chart_fetch_error_message": "Please check your environment variables and review the server console",

View File

@ -61,7 +61,9 @@
"Disk": "ディスク", "Disk": "ディスク",
"Region": "地域", "Region": "地域",
"System": "システム", "System": "システム",
"CPU": "CPU" "CPU": "CPU",
"Upload": "Upload",
"Download": "Download"
}, },
"ServerDetailChartClient": { "ServerDetailChartClient": {
"chart_fetch_error_message": "環境変数を確認し、サーバーコンソールを確認してください", "chart_fetch_error_message": "環境変数を確認し、サーバーコンソールを確認してください",

View File

@ -61,7 +61,9 @@
"Disk": "磁碟", "Disk": "磁碟",
"Region": "地區", "Region": "地區",
"System": "系統", "System": "系統",
"CPU": "CPU" "CPU": "CPU",
"Upload": "上傳",
"Download": "下載"
}, },
"ServerDetailChartClient": { "ServerDetailChartClient": {
"chart_fetch_error_message": "獲取伺服器詳情失敗,請檢查您的環境變數並檢查伺服器控制台", "chart_fetch_error_message": "獲取伺服器詳情失敗,請檢查您的環境變數並檢查伺服器控制台",

View File

@ -61,7 +61,9 @@
"Disk": "磁盘", "Disk": "磁盘",
"Region": "地区", "Region": "地区",
"System": "系统", "System": "系统",
"CPU": "CPU" "CPU": "CPU",
"Upload": "上传",
"Download": "下载"
}, },
"ServerDetailChartClient": { "ServerDetailChartClient": {
"chart_fetch_error_message": "获取服务器详情失败,请检查您的环境变量并检查服务器控制台", "chart_fetch_error_message": "获取服务器详情失败,请检查您的环境变量并检查服务器控制台",

View File

@ -1,6 +1,6 @@
{ {
"name": "nezha-dash", "name": "nezha-dash",
"version": "1.5.6-fix", "version": "1.5.7",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev -p 3040", "dev": "next dev -p 3040",
@ -56,18 +56,18 @@
}, },
"devDependencies": { "devDependencies": {
"@next/bundle-analyzer": "^15.0.3", "@next/bundle-analyzer": "^15.0.3",
"@tailwindcss/postcss": "^4.0.0-beta.3", "@tailwindcss/postcss": "^4.0.0-beta.4",
"@types/node": "^22.10.0", "@types/node": "^22.10.1",
"@types/react": "npm:types-react@19.0.0-rc.1", "@types/react": "npm:types-react@19.0.0-rc.1",
"@types/react-dom": "npm:types-react-dom@19.0.0-rc.1", "@types/react-dom": "npm:types-react-dom@19.0.0-rc.1",
"eslint": "^9.15.0", "eslint": "^9.16.0",
"eslint-config-next": "^15.0.3", "eslint-config-next": "^15.0.3",
"eslint-plugin-turbo": "^2.3.3", "eslint-plugin-turbo": "^2.3.3",
"eslint-plugin-unused-imports": "^4.1.4", "eslint-plugin-unused-imports": "^4.1.4",
"postcss": "^8.4.49", "postcss": "^8.4.49",
"prettier": "^3.4.1", "prettier": "^3.4.1",
"prettier-plugin-tailwindcss": "^0.6.9", "prettier-plugin-tailwindcss": "^0.6.9",
"tailwindcss": "^4.0.0-beta.3", "tailwindcss": "^4.0.0-beta.4",
"typescript": "^5.7.2", "typescript": "^5.7.2",
"vercel": "39.1.1" "vercel": "39.1.1"
}, },