Compare commits

...

24 Commits

Author SHA1 Message Date
sagit 79c28103d5 fix(frontend): prevent font blur in sortable card components (#185)
Add backface-visibility: hidden and font-smoothing properties to SortableItem components in tunnel, forward, and node pages to prevent GPU subpixel rendering blur during drag operations.

- tunnel.tsx: SortableItem wrapper anti-blur fix
- forward.tsx: SortableCard wrapper anti-blur fix
- node.tsx: SortableItem component anti-blur fix

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
2026-02-22 15:11:47 +08:00
sagit f36bf1437c fix(frontend): prevent font blurriness caused by scale animations (#183)
Remove scale transforms from Framer Motion animations that cause subpixel rendering issues on text elements. Replace with opacity + translateY for smooth animations without blur.

- Remove scale from FadeIn component (animated-page.tsx)
- Remove scale from login page entrance animation (index.tsx)
- Remove scale from search bar button animation (search-bar.tsx)
- Remove whileTap scale from sidebar menu buttons (admin.tsx)
- Remove scale from captcha modal animation (globals.css)
- Add .gpu-accelerated utility class for future use

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-opencode)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
2026-02-22 13:28:47 +08:00
sagit 4ad3aa2c06 feat: redesign forward card view completely syncing filters and sorti… (#179)
…ng logic
2026-02-21 21:19:53 +08:00
sagitchu 357a4b165e Merge remote-tracking branch 'origin/main' into card-view 2026-02-21 21:18:20 +08:00
sagitchu a15be253f5 feat: add framer-motion animations (page transitions, modals, dropdowns, buttons, search bar) 2026-02-21 21:16:42 +08:00
sagitchu 572d1c16a6 feat: Implement toggleable search input and data filtering across tunnel, user, and forward pages. 2026-02-21 20:43:32 +08:00
sagit 39e22c07de feat(backend): auto redeploy tunnel and forward config after node upgrade (#180) 2026-02-21 12:29:34 +00:00
sagitchu ca24573803 feat: redesign forward card view completely syncing filters and sorting logic 2026-02-21 20:08:29 +08:00
sagit 0cb3263a2e feat(frontend): support markdown in dashboard announcements (#176)
## Summary
- render dashboard announcements with Markdown using `react-markdown` +
`remark-gfm` while sanitizing output with `rehype-sanitize`
- add styled Markdown element mappings in the announcement banner for
links, lists, code blocks, and blockquotes
- update announcement management hint text to communicate Markdown
support in the config page

## Verification
- npm run build (vite-frontend)
2026-02-21 16:50:19 +08:00
sagit fb2189c924 Merge branch 'main' into feat/announcement-markdown-support 2026-02-21 16:36:51 +08:00
sagitchu 1383174b31 refactor: Standardize empty state UI for tunnel and user pages, update announcement banner styling, and add new entries to .gitignore. 2026-02-21 16:36:36 +08:00
sagitchu c95bde7055 style: space out provider and consumer share panel title cards from tabs 2026-02-21 16:36:05 +08:00
Sagit 57f5e3a1a3 feat(frontend): support markdown in dashboard announcements 2026-02-21 05:48:24 +00:00
sagit 66ad52c199 feat(node): add stable/test release channels for install and upgrade (#175)
## Summary
- classify release tags by channel: pure numeric tags are treated as
stable, while tags containing alpha/beta/rc (or other non-numeric
formats) are treated as test releases
- add channel-aware backend APIs for install/upgrade/release listing and
pin install commands to the selected tag via `VERSION=<tag>`
- update node page UI and API clients to let users pick stable vs test
channel for install and upgrade workflows

## Verification
- `go test ./internal/http/handler/...`
- `npm run build`
2026-02-21 13:23:20 +08:00
Sagit 2081dc9658 feat(node): support stable and test release channels 2026-02-21 04:17:20 +00:00
sagit b93255df3d feat: improve forward page grouped view (#165)
Added drag-and-drop sorting and filtering to grouped view.
2026-02-20 19:52:26 +08:00
sagitchu e1aef8700e style: make filter button icon-only 2026-02-20 19:49:57 +08:00
sagitchu d5b3a39774 feat: replace inline filters with modal dialog 2026-02-20 19:45:48 +08:00
sagitchu 022e9e3807 style: tightly pack user and tunnel filters 2026-02-20 19:39:12 +08:00
sagitchu d333d463f6 style: fix dropdown filter spacing 2026-02-20 19:33:56 +08:00
sagitchu abc9f21ab9 feat: improve forward page grouped view 2026-02-20 19:27:40 +08:00
sagit d216567c02 fix(frontend): switch grouped forward view to full list (#161)
* fix(frontend): left-align announcement logo in homepage banner

* fix(frontend): keep multiselect panels floating and preserve summaries

* fix(frontend): rebalance config card header spacing

* fix(frontend): normalize formatting and fix multiselect modal behavior

* fix(frontend): polish batch actions and sharing page guidance

* fix(frontend): switch grouped forward view to full list

* fix(backend): switch diagnosis internet target to bing

* style(frontend): beautify forward group view list display

* style: remove 'x' suffix from traffic ratio input and center config alert

* fix(ui): expand exit node select upwards in modal

* style: fix vertical alignment of logo and title in announcement banner
2026-02-20 10:31:39 +00:00
sagit 45bfd35a20 fix(backend): respect tunnel IP preference in forward diagnosis (#160)
Forward diagnosis chain-hop probes now inherit the tunnel ipPreference so v6-priority tunnels test IPv6 targets instead of defaulting to IPv4. Add a contract test to lock IPv6 target selection for entry->chain and chain->exit diagnostics.
2026-02-20 05:56:12 +00:00
sagit 5a1b72387d fix(frontend): polish batch actions and sharing page guidance (#157)
* fix(frontend): polish batch actions and sharing page guidance

* fix(frontend): add top spacing above sharing section banners

* fix(frontend): allow manual and calendar expiry date input

* fix(frontend): switch batch action buttons to warning tone

* fix(frontend): switch batch action buttons to default tone
2026-02-20 12:50:17 +08:00
35 changed files with 2356 additions and 1200 deletions
+3
View File
@@ -268,3 +268,6 @@ sql/
!go-backend/internal/store/postgres/sql/ !go-backend/internal/store/postgres/sql/
!go-backend/internal/store/postgres/sql/schema.sql !go-backend/internal/store/postgres/sql/schema.sql
!go-backend/internal/store/postgres/sql/data.sql !go-backend/internal/store/postgres/sql/data.sql
go-backend/gost.db-shm
.gitignore
go-backend/gost.db-wal
@@ -360,6 +360,8 @@ func (h *Handler) diagnoseForwardRuntime(forward *forwardRecord) (map[string]int
return nil, errors.New("隧道配置不完整") return nil, errors.New("隧道配置不完整")
} }
ipPreference := h.repo.GetTunnelIPPreference(forward.TunnelID)
inNodes, chainHops, outNodes := splitChainNodeGroups(chainRows) inNodes, chainHops, outNodes := splitChainNodeGroups(chainRows)
results := make([]map[string]interface{}, 0, len(chainRows)*2+len(targets)) results := make([]map[string]interface{}, 0, len(chainRows)*2+len(targets))
nodeCache := map[int64]*nodeRecord{} nodeCache := map[int64]*nodeRecord{}
@@ -383,7 +385,7 @@ func (h *Handler) diagnoseForwardRuntime(forward *forwardRecord) (map[string]int
"fromChainType": 1, "fromChainType": 1,
"toChainType": 2, "toChainType": 2,
"toInx": firstNode.Inx, "toInx": firstNode.Inx,
}, "") }, ipPreference)
} }
} else { } else {
for _, outNode := range outNodes { for _, outNode := range outNodes {
@@ -391,7 +393,7 @@ func (h *Handler) diagnoseForwardRuntime(forward *forwardRecord) (map[string]int
h.appendChainHopDiagnosis(&results, nodeCache, inNode.NodeID, outNode, description, map[string]interface{}{ h.appendChainHopDiagnosis(&results, nodeCache, inNode.NodeID, outNode, description, map[string]interface{}{
"fromChainType": 1, "fromChainType": 1,
"toChainType": 3, "toChainType": 3,
}, "") }, ipPreference)
} }
} }
} }
@@ -406,7 +408,7 @@ func (h *Handler) diagnoseForwardRuntime(forward *forwardRecord) (map[string]int
"fromInx": currentNode.Inx, "fromInx": currentNode.Inx,
"toChainType": 2, "toChainType": 2,
"toInx": nextNode.Inx, "toInx": nextNode.Inx,
}, "") }, ipPreference)
} }
} else { } else {
for _, outNode := range outNodes { for _, outNode := range outNodes {
@@ -415,7 +417,7 @@ func (h *Handler) diagnoseForwardRuntime(forward *forwardRecord) (map[string]int
"fromChainType": 2, "fromChainType": 2,
"fromInx": currentNode.Inx, "fromInx": currentNode.Inx,
"toChainType": 3, "toChainType": 3,
}, "") }, ipPreference)
} }
} }
} }
@@ -479,7 +481,7 @@ func (h *Handler) diagnoseTunnelRuntime(tunnelID int64) (map[string]interface{},
case 1: case 1:
for _, inNode := range inNodes { for _, inNode := range inNodes {
description := fmt.Sprintf("入口(%s)->外网", inNode.NodeName) description := fmt.Sprintf("入口(%s)->外网", inNode.NodeName)
h.appendPathDiagnosis(&results, nodeCache, inNode.NodeID, "www.google.com", 443, description, map[string]interface{}{ h.appendPathDiagnosis(&results, nodeCache, inNode.NodeID, "www.bing.com", 443, description, map[string]interface{}{
"fromChainType": 1, "fromChainType": 1,
}) })
} }
@@ -532,14 +534,14 @@ func (h *Handler) diagnoseTunnelRuntime(tunnelID int64) (map[string]interface{},
for _, outNode := range outNodes { for _, outNode := range outNodes {
description := fmt.Sprintf("出口(%s)->外网", outNode.NodeName) description := fmt.Sprintf("出口(%s)->外网", outNode.NodeName)
h.appendPathDiagnosis(&results, nodeCache, outNode.NodeID, "www.google.com", 443, description, map[string]interface{}{ h.appendPathDiagnosis(&results, nodeCache, outNode.NodeID, "www.bing.com", 443, description, map[string]interface{}{
"fromChainType": 3, "fromChainType": 3,
}) })
} }
default: default:
for _, inNode := range inNodes { for _, inNode := range inNodes {
description := fmt.Sprintf("入口(%s)->外网", inNode.NodeName) description := fmt.Sprintf("入口(%s)->外网", inNode.NodeName)
h.appendPathDiagnosis(&results, nodeCache, inNode.NodeID, "www.google.com", 443, description, map[string]interface{}{ h.appendPathDiagnosis(&results, nodeCache, inNode.NodeID, "www.bing.com", 443, description, map[string]interface{}{
"fromChainType": 1, "fromChainType": 1,
}) })
} }
+11 -5
View File
@@ -34,6 +34,9 @@ type Handler struct {
jobsCancel context.CancelFunc jobsCancel context.CancelFunc
jobsStarted bool jobsStarted bool
jobsWG sync.WaitGroup jobsWG sync.WaitGroup
upgradeMu sync.Mutex
pendingUpgradeRedeploy map[int64]struct{}
} }
type loginRequest struct { type loginRequest struct {
@@ -70,12 +73,15 @@ type flowItem struct {
} }
func New(repo *repo.Repository, jwtSecret string) *Handler { func New(repo *repo.Repository, jwtSecret string) *Handler {
return &Handler{ h := &Handler{
repo: repo, repo: repo,
jwtSecret: jwtSecret, jwtSecret: jwtSecret,
wsServer: ws.NewServer(repo, jwtSecret), wsServer: ws.NewServer(repo, jwtSecret),
captchaTokens: make(map[string]int64), captchaTokens: make(map[string]int64),
pendingUpgradeRedeploy: make(map[int64]struct{}),
} }
h.wsServer.SetNodeOnlineHook(h.onNodeOnline)
return h
} }
func (h *Handler) WebSocketHandler() http.Handler { func (h *Handler) WebSocketHandler() http.Handler {
+75 -67
View File
@@ -355,11 +355,28 @@ func (h *Handler) nodeInstall(w http.ResponseWriter, r *http.Request) {
response.WriteJSON(w, response.ErrDefault("请求失败")) response.WriteJSON(w, response.ErrDefault("请求失败"))
return return
} }
id := idFromBody(r, w)
if id <= 0 { var req struct {
ID int64 `json:"id"`
Channel string `json:"channel"`
}
if err := decodeJSON(r.Body, &req); err != nil {
response.WriteJSON(w, response.ErrDefault("请求参数错误"))
return return
} }
secret, err := h.repo.GetNodeSecret(id) if req.ID <= 0 {
response.WriteJSON(w, response.ErrDefault("参数错误"))
return
}
channel := normalizeReleaseChannel(req.Channel)
version, err := resolveLatestReleaseByChannel(channel)
if err != nil {
response.WriteJSON(w, response.Err(-2, fmt.Sprintf("获取最新%s失败: %v", releaseChannelLabel(channel), err)))
return
}
secret, err := h.repo.GetNodeSecret(req.ID)
if err != nil { if err != nil {
response.WriteJSON(w, response.ErrDefault("节点不存在")) response.WriteJSON(w, response.ErrDefault("节点不存在"))
return return
@@ -373,7 +390,7 @@ func (h *Handler) nodeInstall(w http.ResponseWriter, r *http.Request) {
response.WriteJSON(w, response.Err(-2, err.Error())) response.WriteJSON(w, response.Err(-2, err.Error()))
return return
} }
cmd := fmt.Sprintf("curl -L https://gcode.hostcentral.cc/https://github.com/Sagit-chu/flvx/releases/latest/download/install.sh -o ./install.sh && chmod +x ./install.sh && ./install.sh -a %s -s %s", processServerAddress(panelAddr), secret) cmd := fmt.Sprintf("curl -L https://gcode.hostcentral.cc/https://github.com/Sagit-chu/flvx/releases/download/%s/install.sh -o ./install.sh && chmod +x ./install.sh && VERSION=%s ./install.sh -a %s -s %s", version, version, processServerAddress(panelAddr), secret)
response.WriteJSON(w, response.OK(cmd)) response.WriteJSON(w, response.OK(cmd))
} }
@@ -901,6 +918,58 @@ func (h *Handler) reconstructTunnelState(tunnelID int64) (*tunnelCreateState, er
return state, nil return state, nil
} }
func (h *Handler) redeployTunnelAndForwards(tunnelID int64) error {
tunnel, err := h.getTunnelRecord(tunnelID)
if err != nil {
return err
}
if tunnel.Type == 2 {
h.cleanupTunnelRuntime(tunnelID)
h.cleanupFederationRuntime(tunnelID)
state, err := h.reconstructTunnelState(tunnelID)
if err != nil {
return err
}
federationBindings, federationReleaseRefs, fedErr := h.applyFederationRuntime(state, h.federationLocalDomain())
if fedErr != nil {
return fedErr
}
tx := h.repo.BeginTx()
if tx.Error != nil {
h.releaseFederationRuntimeRefs(federationReleaseRefs)
return tx.Error
}
if replaceErr := h.repo.ReplaceFederationTunnelBindingsTx(tx, tunnelID, federationBindings); replaceErr != nil {
tx.Rollback()
h.releaseFederationRuntimeRefs(federationReleaseRefs)
return replaceErr
}
if commitErr := tx.Commit().Error; commitErr != nil {
h.releaseFederationRuntimeRefs(federationReleaseRefs)
return commitErr
}
_, _, applyErr := h.applyTunnelRuntime(state)
if applyErr != nil {
h.releaseFederationRuntimeRefs(federationReleaseRefs)
_ = h.repo.DeleteFederationTunnelBindingsByTunnel(tunnelID)
return applyErr
}
}
forwards, err := h.listForwardsByTunnel(tunnelID)
if err != nil {
return err
}
for i := range forwards {
if err := h.syncForwardServices(&forwards[i], "UpdateService", true); err != nil {
return err
}
}
return nil
}
func (h *Handler) tunnelBatchRedeploy(w http.ResponseWriter, r *http.Request) { func (h *Handler) tunnelBatchRedeploy(w http.ResponseWriter, r *http.Request) {
ids := idsFromBody(r, w) ids := idsFromBody(r, w)
if ids == nil { if ids == nil {
@@ -909,72 +978,11 @@ func (h *Handler) tunnelBatchRedeploy(w http.ResponseWriter, r *http.Request) {
success := 0 success := 0
fail := 0 fail := 0
for _, tunnelID := range ids { for _, tunnelID := range ids {
tunnel, err := h.getTunnelRecord(tunnelID) if err := h.redeployTunnelAndForwards(tunnelID); err != nil {
if err != nil {
fail++ fail++
continue continue
} }
success++
if tunnel.Type == 2 {
h.cleanupTunnelRuntime(tunnelID)
h.cleanupFederationRuntime(tunnelID)
state, err := h.reconstructTunnelState(tunnelID)
if err != nil {
fail++
continue
}
federationBindings, federationReleaseRefs, fedErr := h.applyFederationRuntime(state, h.federationLocalDomain())
if fedErr != nil {
fail++
continue
}
tx := h.repo.BeginTx()
if tx.Error != nil {
h.releaseFederationRuntimeRefs(federationReleaseRefs)
fail++
continue
}
if replaceErr := h.repo.ReplaceFederationTunnelBindingsTx(tx, tunnelID, federationBindings); replaceErr != nil {
tx.Rollback()
h.releaseFederationRuntimeRefs(federationReleaseRefs)
fail++
continue
}
if commitErr := tx.Commit().Error; commitErr != nil {
h.releaseFederationRuntimeRefs(federationReleaseRefs)
fail++
continue
}
_, _, applyErr := h.applyTunnelRuntime(state)
if applyErr != nil {
h.releaseFederationRuntimeRefs(federationReleaseRefs)
_ = h.repo.DeleteFederationTunnelBindingsByTunnel(tunnelID)
fail++
continue
}
}
forwards, err := h.listForwardsByTunnel(tunnelID)
if err != nil {
fail++
continue
}
if len(forwards) == 0 {
success++
continue
}
ok := true
for i := range forwards {
if err := h.syncForwardServices(&forwards[i], "UpdateService", true); err != nil {
ok = false
break
}
}
if ok {
success++
} else {
fail++
}
} }
response.WriteJSON(w, response.OK(map[string]interface{}{"successCount": success, "failCount": fail})) response.WriteJSON(w, response.OK(map[string]interface{}{"successCount": success, "failCount": fail}))
} }
+195 -79
View File
@@ -5,6 +5,7 @@ import (
"fmt" "fmt"
"io" "io"
"net/http" "net/http"
"regexp"
"strings" "strings"
"sync" "sync"
"time" "time"
@@ -19,8 +20,104 @@ const (
githubHTMLBase = "https://github.com" githubHTMLBase = "https://github.com"
upgradeTimeout = 5 * time.Minute upgradeTimeout = 5 * time.Minute
batchWorkers = 5 batchWorkers = 5
releaseChannelStable = "stable"
releaseChannelDev = "dev"
) )
var (
stableVersionPattern = regexp.MustCompile(`^\d+(?:\.\d+)+$`)
testKeywordPattern = regexp.MustCompile(`(?i)(alpha|beta|rc)`)
)
type githubRelease struct {
TagName string `json:"tag_name"`
Name string `json:"name"`
PublishedAt string `json:"published_at"`
Prerelease bool `json:"prerelease"`
Draft bool `json:"draft"`
}
func normalizeReleaseChannel(channel string) string {
switch strings.ToLower(strings.TrimSpace(channel)) {
case releaseChannelDev:
return releaseChannelDev
default:
return releaseChannelStable
}
}
func releaseChannelFromTag(tag string) string {
normalized := strings.ToLower(strings.TrimSpace(tag))
if normalized == "" {
return releaseChannelDev
}
if testKeywordPattern.MatchString(normalized) {
return releaseChannelDev
}
if stableVersionPattern.MatchString(normalized) {
return releaseChannelStable
}
return releaseChannelDev
}
func releaseChannelLabel(channel string) string {
if normalizeReleaseChannel(channel) == releaseChannelDev {
return "测试版"
}
return "正式版"
}
func fetchGitHubReleases(perPage int) ([]githubRelease, error) {
if perPage <= 0 {
perPage = 20
}
client := &http.Client{Timeout: 15 * time.Second}
resp, err := client.Get(fmt.Sprintf("%s/repos/%s/releases?per_page=%d", githubAPIBase, githubRepo, perPage))
if err != nil {
return nil, fmt.Errorf("请求GitHub API失败: %v", err)
}
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
body, _ := io.ReadAll(io.LimitReader(resp.Body, 512))
return nil, fmt.Errorf("GitHub API返回 %d: %s", resp.StatusCode, string(body))
}
var releases []githubRelease
if err := json.NewDecoder(resp.Body).Decode(&releases); err != nil {
return nil, fmt.Errorf("解析GitHub API响应失败: %v", err)
}
return releases, nil
}
func resolveLatestReleaseByChannel(channel string) (string, error) {
normalizedChannel := normalizeReleaseChannel(channel)
releases, err := fetchGitHubReleases(50)
if err != nil {
return "", err
}
for _, r := range releases {
if r.Draft {
continue
}
tag := strings.TrimSpace(r.TagName)
if tag == "" {
continue
}
if releaseChannelFromTag(tag) == normalizedChannel {
return tag, nil
}
}
return "", fmt.Errorf("未找到%s版本号", releaseChannelLabel(normalizedChannel))
}
func (h *Handler) nodeUpgrade(w http.ResponseWriter, r *http.Request) { func (h *Handler) nodeUpgrade(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodPost { if r.Method != http.MethodPost {
response.WriteJSON(w, response.ErrDefault("请求失败")) response.WriteJSON(w, response.ErrDefault("请求失败"))
@@ -30,6 +127,7 @@ func (h *Handler) nodeUpgrade(w http.ResponseWriter, r *http.Request) {
var req struct { var req struct {
ID int64 `json:"id"` ID int64 `json:"id"`
Version string `json:"version"` Version string `json:"version"`
Channel string `json:"channel"`
} }
if err := decodeJSON(r.Body, &req); err != nil { if err := decodeJSON(r.Body, &req); err != nil {
response.WriteJSON(w, response.ErrDefault("请求参数错误")) response.WriteJSON(w, response.ErrDefault("请求参数错误"))
@@ -40,12 +138,13 @@ func (h *Handler) nodeUpgrade(w http.ResponseWriter, r *http.Request) {
return return
} }
channel := normalizeReleaseChannel(req.Channel)
version := strings.TrimSpace(req.Version) version := strings.TrimSpace(req.Version)
if version == "" { if version == "" {
var err error var err error
version, err = resolveLatestRelease() version, err = resolveLatestReleaseByChannel(channel)
if err != nil { if err != nil {
response.WriteJSON(w, response.Err(-2, fmt.Sprintf("获取最新版本失败: %v", err))) response.WriteJSON(w, response.Err(-2, fmt.Sprintf("获取最新%s失败: %v", releaseChannelLabel(channel), err)))
return return
} }
} }
@@ -67,6 +166,7 @@ func (h *Handler) nodeUpgrade(w http.ResponseWriter, r *http.Request) {
response.WriteJSON(w, response.Err(-2, fmt.Sprintf("升级失败: %v", err))) response.WriteJSON(w, response.Err(-2, fmt.Sprintf("升级失败: %v", err)))
return return
} }
h.markNodePendingUpgradeRedeploy(req.ID)
response.WriteJSON(w, response.OK(map[string]interface{}{ response.WriteJSON(w, response.OK(map[string]interface{}{
"version": version, "version": version,
@@ -75,61 +175,11 @@ func (h *Handler) nodeUpgrade(w http.ResponseWriter, r *http.Request) {
} }
func resolveLatestRelease() (string, error) { func resolveLatestRelease() (string, error) {
client := &http.Client{ return resolveLatestReleaseByChannel(releaseChannelStable)
CheckRedirect: func(req *http.Request, via []*http.Request) error {
return http.ErrUseLastResponse
},
Timeout: 10 * time.Second,
}
resp, err := client.Get(githubProxy + "/" + githubHTMLBase + "/" + githubRepo + "/releases/latest")
if err != nil {
return "", fmt.Errorf("请求GitHub失败: %v", err)
}
defer resp.Body.Close()
if resp.StatusCode != http.StatusFound && resp.StatusCode != http.StatusMovedPermanently {
return resolveLatestReleaseAPI()
}
location := resp.Header.Get("Location")
if location == "" {
return resolveLatestReleaseAPI()
}
parts := strings.Split(location, "/")
tag := parts[len(parts)-1]
if tag == "" || tag == "latest" {
return resolveLatestReleaseAPI()
}
return tag, nil
} }
func resolveLatestReleaseAPI() (string, error) { func resolveLatestReleaseAPI() (string, error) {
client := &http.Client{Timeout: 10 * time.Second} return resolveLatestReleaseByChannel(releaseChannelStable)
resp, err := client.Get(githubAPIBase + "/repos/" + githubRepo + "/releases/latest")
if err != nil {
return "", fmt.Errorf("请求GitHub API失败: %v", err)
}
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
body, _ := io.ReadAll(io.LimitReader(resp.Body, 512))
return "", fmt.Errorf("GitHub API返回 %d: %s", resp.StatusCode, string(body))
}
var release struct {
TagName string `json:"tag_name"`
}
if err := json.NewDecoder(resp.Body).Decode(&release); err != nil {
return "", fmt.Errorf("解析GitHub API响应失败: %v", err)
}
if strings.TrimSpace(release.TagName) == "" {
return "", fmt.Errorf("无法从GitHub获取最新版本号")
}
return release.TagName, nil
} }
func (h *Handler) nodeBatchUpgrade(w http.ResponseWriter, r *http.Request) { func (h *Handler) nodeBatchUpgrade(w http.ResponseWriter, r *http.Request) {
@@ -141,6 +191,7 @@ func (h *Handler) nodeBatchUpgrade(w http.ResponseWriter, r *http.Request) {
var req struct { var req struct {
IDs []int64 `json:"ids"` IDs []int64 `json:"ids"`
Version string `json:"version"` Version string `json:"version"`
Channel string `json:"channel"`
} }
if err := json.NewDecoder(r.Body).Decode(&req); err != nil { if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
response.WriteJSON(w, response.ErrDefault("请求参数错误")) response.WriteJSON(w, response.ErrDefault("请求参数错误"))
@@ -151,12 +202,13 @@ func (h *Handler) nodeBatchUpgrade(w http.ResponseWriter, r *http.Request) {
return return
} }
channel := normalizeReleaseChannel(req.Channel)
version := strings.TrimSpace(req.Version) version := strings.TrimSpace(req.Version)
if version == "" { if version == "" {
var err error var err error
version, err = resolveLatestRelease() version, err = resolveLatestReleaseByChannel(channel)
if err != nil { if err != nil {
response.WriteJSON(w, response.Err(-2, fmt.Sprintf("获取最新版本失败: %v", err))) response.WriteJSON(w, response.Err(-2, fmt.Sprintf("获取最新%s失败: %v", releaseChannelLabel(channel), err)))
return return
} }
} }
@@ -195,6 +247,7 @@ func (h *Handler) nodeBatchUpgrade(w http.ResponseWriter, r *http.Request) {
results[index] = upgradeResult{ID: nodeID, Success: false, Message: err.Error()} results[index] = upgradeResult{ID: nodeID, Success: false, Message: err.Error()}
return return
} }
h.markNodePendingUpgradeRedeploy(nodeID)
results[index] = upgradeResult{ID: nodeID, Success: true, Message: result.Message} results[index] = upgradeResult{ID: nodeID, Success: true, Message: result.Message}
}(i, id) }(i, id)
} }
@@ -212,37 +265,28 @@ func (h *Handler) listReleases(w http.ResponseWriter, r *http.Request) {
return return
} }
client := &http.Client{Timeout: 15 * time.Second} var req struct {
resp, err := client.Get(githubAPIBase + "/repos/" + githubRepo + "/releases?per_page=20") Channel string `json:"channel"`
}
if err := decodeJSON(r.Body, &req); err != nil && err != io.EOF {
response.WriteJSON(w, response.ErrDefault("请求参数错误"))
return
}
channel := normalizeReleaseChannel(req.Channel)
releases, err := fetchGitHubReleases(50)
if err != nil { if err != nil {
response.WriteJSON(w, response.Err(-2, fmt.Sprintf("获取版本列表失败: %v", err))) response.WriteJSON(w, response.Err(-2, fmt.Sprintf("获取版本列表失败: %v", err)))
return return
} }
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
body, _ := io.ReadAll(io.LimitReader(resp.Body, 512))
response.WriteJSON(w, response.Err(-2, fmt.Sprintf("获取版本列表失败: GitHub API返回 %d: %s", resp.StatusCode, string(body))))
return
}
var releases []struct {
TagName string `json:"tag_name"`
Name string `json:"name"`
PublishedAt string `json:"published_at"`
Prerelease bool `json:"prerelease"`
Draft bool `json:"draft"`
}
if err := json.NewDecoder(resp.Body).Decode(&releases); err != nil {
response.WriteJSON(w, response.Err(-2, fmt.Sprintf("解析版本列表失败: %v", err)))
return
}
type releaseItem struct { type releaseItem struct {
Version string `json:"version"` Version string `json:"version"`
Name string `json:"name"` Name string `json:"name"`
PublishedAt string `json:"publishedAt"` PublishedAt string `json:"publishedAt"`
Prerelease bool `json:"prerelease"` Prerelease bool `json:"prerelease"`
Channel string `json:"channel"`
} }
items := make([]releaseItem, 0, len(releases)) items := make([]releaseItem, 0, len(releases))
@@ -250,11 +294,20 @@ func (h *Handler) listReleases(w http.ResponseWriter, r *http.Request) {
if r.Draft { if r.Draft {
continue continue
} }
tag := strings.TrimSpace(r.TagName)
if tag == "" {
continue
}
itemChannel := releaseChannelFromTag(tag)
if itemChannel != channel {
continue
}
items = append(items, releaseItem{ items = append(items, releaseItem{
Version: r.TagName, Version: tag,
Name: r.Name, Name: r.Name,
PublishedAt: r.PublishedAt, PublishedAt: r.PublishedAt,
Prerelease: r.Prerelease, Prerelease: itemChannel == releaseChannelDev,
Channel: itemChannel,
}) })
} }
@@ -289,3 +342,66 @@ func (h *Handler) nodeRollback(w http.ResponseWriter, r *http.Request) {
"message": result.Message, "message": result.Message,
})) }))
} }
func (h *Handler) markNodePendingUpgradeRedeploy(nodeID int64) {
if h == nil || nodeID <= 0 {
return
}
h.upgradeMu.Lock()
h.pendingUpgradeRedeploy[nodeID] = struct{}{}
h.upgradeMu.Unlock()
}
func (h *Handler) consumeNodePendingUpgradeRedeploy(nodeID int64) bool {
if h == nil || nodeID <= 0 {
return false
}
h.upgradeMu.Lock()
_, ok := h.pendingUpgradeRedeploy[nodeID]
if ok {
delete(h.pendingUpgradeRedeploy, nodeID)
}
h.upgradeMu.Unlock()
return ok
}
func (h *Handler) onNodeOnline(nodeID int64) {
if !h.consumeNodePendingUpgradeRedeploy(nodeID) {
return
}
h.redeployNodeRuntimeAfterUpgrade(nodeID)
}
func (h *Handler) redeployNodeRuntimeAfterUpgrade(nodeID int64) {
tunnelIDs, err := h.repo.ListActiveTunnelIDsByNode(nodeID)
if err != nil {
fmt.Printf("post-upgrade redeploy: list tunnels for node %d failed: %v\n", nodeID, err)
return
}
forwardIDs, err := h.repo.ListActiveForwardIDsByNode(nodeID)
if err != nil {
fmt.Printf("post-upgrade redeploy: list forwards for node %d failed: %v\n", nodeID, err)
return
}
tunnelFailed := make(map[int64]struct{})
for _, tunnelID := range tunnelIDs {
if err := h.redeployTunnelAndForwards(tunnelID); err != nil {
tunnelFailed[tunnelID] = struct{}{}
fmt.Printf("post-upgrade redeploy: tunnel %d failed on node %d: %v\n", tunnelID, nodeID, err)
}
}
for _, forwardID := range forwardIDs {
forward, getErr := h.getForwardRecord(forwardID)
if getErr != nil || forward == nil {
continue
}
if _, skipped := tunnelFailed[forward.TunnelID]; skipped {
continue
}
if err := h.syncForwardServices(forward, "UpdateService", true); err != nil {
fmt.Printf("post-upgrade redeploy: forward %d failed on node %d: %v\n", forwardID, nodeID, err)
}
}
}
@@ -0,0 +1,46 @@
package handler
import "testing"
func TestReleaseChannelFromTag(t *testing.T) {
tests := []struct {
name string
tag string
expects string
}{
{name: "stable semantic version", tag: "2.1.4", expects: releaseChannelStable},
{name: "v prefix should be dev", tag: "v2.1.4", expects: releaseChannelDev},
{name: "rc release", tag: "2.1.4-rc2", expects: releaseChannelDev},
{name: "beta release", tag: "2.1.4-beta.1", expects: releaseChannelDev},
{name: "alpha release", tag: "2.1.4-alpha", expects: releaseChannelDev},
{name: "non numeric tag", tag: "nightly", expects: releaseChannelDev},
{name: "empty tag", tag: "", expects: releaseChannelDev},
}
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
if got := releaseChannelFromTag(tc.tag); got != tc.expects {
t.Fatalf("releaseChannelFromTag(%q) = %q, want %q", tc.tag, got, tc.expects)
}
})
}
}
func TestNormalizeReleaseChannel(t *testing.T) {
tests := []struct {
input string
expects string
}{
{input: "", expects: releaseChannelStable},
{input: "stable", expects: releaseChannelStable},
{input: "dev", expects: releaseChannelDev},
{input: "DEV", expects: releaseChannelDev},
{input: "preview", expects: releaseChannelStable},
}
for _, tc := range tests {
if got := normalizeReleaseChannel(tc.input); got != tc.expects {
t.Fatalf("normalizeReleaseChannel(%q) = %q, want %q", tc.input, got, tc.expects)
}
}
}
@@ -56,6 +56,40 @@ func (r *Repository) ListForwardsByTunnel(tunnelID int64) ([]model.ForwardRecord
return rows, nil return rows, nil
} }
func (r *Repository) ListActiveTunnelIDsByNode(nodeID int64) ([]int64, error) {
if r == nil || r.db == nil {
return nil, errors.New("repository not initialized")
}
var ids []int64
err := r.db.Model(&model.ChainTunnel{}).
Joins("JOIN tunnel ON tunnel.id = chain_tunnel.tunnel_id").
Where("chain_tunnel.node_id = ? AND tunnel.status = 1", nodeID).
Select("DISTINCT chain_tunnel.tunnel_id").
Order("chain_tunnel.tunnel_id ASC").
Pluck("chain_tunnel.tunnel_id", &ids).Error
if err != nil {
return nil, err
}
return ids, nil
}
func (r *Repository) ListActiveForwardIDsByNode(nodeID int64) ([]int64, error) {
if r == nil || r.db == nil {
return nil, errors.New("repository not initialized")
}
var ids []int64
err := r.db.Model(&model.ForwardPort{}).
Joins("JOIN forward ON forward.id = forward_port.forward_id").
Where("forward_port.node_id = ? AND forward.status = 1", nodeID).
Select("DISTINCT forward_port.forward_id").
Order("forward_port.forward_id ASC").
Pluck("forward_port.forward_id", &ids).Error
if err != nil {
return nil, err
}
return ids, nil
}
func (r *Repository) ListForwardPorts(forwardID int64) ([]model.ForwardPortRecord, error) { func (r *Repository) ListForwardPorts(forwardID int64) ([]model.ForwardPortRecord, error) {
if r == nil || r.db == nil { if r == nil || r.db == nil {
return nil, errors.New("repository not initialized") return nil, errors.New("repository not initialized")
+20 -3
View File
@@ -68,9 +68,10 @@ type CommandResult struct {
} }
type Server struct { type Server struct {
repo *repo.Repository repo *repo.Repository
jwtSecret string jwtSecret string
upgrader websocket.Upgrader upgrader websocket.Upgrader
onNodeOnline func(nodeID int64)
mu sync.RWMutex mu sync.RWMutex
admins map[*connWrap]struct{} admins map[*connWrap]struct{}
@@ -79,6 +80,15 @@ type Server struct {
pending map[string]pendingRequest pending map[string]pendingRequest
} }
func (s *Server) SetNodeOnlineHook(fn func(nodeID int64)) {
if s == nil {
return
}
s.mu.Lock()
s.onNodeOnline = fn
s.mu.Unlock()
}
func NewServer(repo *repo.Repository, jwtSecret string) *Server { func NewServer(repo *repo.Repository, jwtSecret string) *Server {
return &Server{ return &Server{
repo: repo, repo: repo,
@@ -183,6 +193,13 @@ func (s *Server) handleNode(w http.ResponseWriter, r *http.Request, nodeID int64
_ = s.repo.UpdateNodeOnline(nodeID, 1, version, httpVal, tlsVal, socksVal) _ = s.repo.UpdateNodeOnline(nodeID, 1, version, httpVal, tlsVal, socksVal)
s.broadcastStatus(nodeID, 1) s.broadcastStatus(nodeID, 1)
s.mu.RLock()
onlineHook := s.onNodeOnline
s.mu.RUnlock()
if onlineHook != nil {
go onlineHook(nodeID)
}
defer func() { defer func() {
close(done) close(done)
needOfflineBroadcast := false needOfflineBroadcast := false
@@ -193,6 +193,126 @@ func TestDiagnosisChainCoverageContracts(t *testing.T) {
}) })
} }
func TestForwardDiagnosisRespectsTunnelIPPreferenceContract(t *testing.T) {
secret := "contract-jwt-secret"
router, r := setupDiagnosisContractRouter(t, secret)
now := time.Now().UnixMilli()
if err := r.DB().Exec(`
INSERT INTO user(id, user, pwd, role_id, exp_time, flow, in_flow, out_flow, flow_reset_time, num, created_time, updated_time, status)
VALUES(2, 'normal_user', '3c85cdebade1c51cf64ca9f3c09d182d', 1, 2727251700000, 99999, 0, 0, 1, 99999, ?, ?, 1)
`, now, now).Error; err != nil {
t.Fatalf("insert user: %v", err)
}
if err := r.DB().Exec(`
INSERT INTO tunnel(name, traffic_ratio, type, protocol, flow, created_time, updated_time, status, in_ip, inx, ip_preference)
VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
`, "diagnose-ip-pref-forward", 1.0, 2, "tls", 99999, now, now, 1, nil, 0, "v6").Error; err != nil {
t.Fatalf("insert tunnel: %v", err)
}
tunnelID := mustLastInsertID(t, r, "diagnose-ip-pref-forward")
insertNode := func(name, v4, v6 string) int64 {
if err := r.DB().Exec(`
INSERT INTO node(name, secret, server_ip, server_ip_v4, server_ip_v6, port, interface_name, version, http, tls, socks, created_time, updated_time, status, tcp_listen_addr, udp_listen_addr, inx)
VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
`, name, name+"-secret", v4, v4, v6, "30000-30010", "", "v1", 1, 1, 1, now, now, 1, "[::]", "[::]", 0).Error; err != nil {
t.Fatalf("insert node %s: %v", name, err)
}
return mustLastInsertID(t, r, name)
}
entryNodeID := insertNode("entry-node-v6", "10.10.1.10", "2001:db8:10::10")
chainNodeID := insertNode("chain-node-v6", "10.10.1.20", "2001:db8:10::20")
exitNodeID := insertNode("exit-node-v6", "10.10.1.30", "2001:db8:10::30")
if err := r.DB().Exec(`
INSERT INTO chain_tunnel(tunnel_id, chain_type, node_id, port, strategy, inx, protocol)
VALUES(?, 1, ?, 30001, 'round', 1, 'tls')
`, tunnelID, entryNodeID).Error; err != nil {
t.Fatalf("insert entry chain: %v", err)
}
if err := r.DB().Exec(`
INSERT INTO chain_tunnel(tunnel_id, chain_type, node_id, port, strategy, inx, protocol)
VALUES(?, 2, ?, 30002, 'round', 1, 'tls')
`, tunnelID, chainNodeID).Error; err != nil {
t.Fatalf("insert middle chain: %v", err)
}
if err := r.DB().Exec(`
INSERT INTO chain_tunnel(tunnel_id, chain_type, node_id, port, strategy, inx, protocol)
VALUES(?, 3, ?, 30003, 'round', 1, 'tls')
`, tunnelID, exitNodeID).Error; err != nil {
t.Fatalf("insert exit chain: %v", err)
}
if err := r.DB().Exec(`
INSERT INTO forward(user_id, user_name, name, tunnel_id, remote_addr, strategy, in_flow, out_flow, created_time, updated_time, status, inx)
VALUES(?, ?, ?, ?, ?, ?, 0, 0, ?, ?, 1, ?)
`, 2, "normal_user", "ip-pref-forward", tunnelID, "8.8.8.8:53", "fifo", now, now, 0).Error; err != nil {
t.Fatalf("insert forward: %v", err)
}
forwardID := mustLastInsertID(t, r, "ip-pref-forward")
userToken, err := auth.GenerateToken(2, "normal_user", 1, secret)
if err != nil {
t.Fatalf("generate user token: %v", err)
}
req := httptest.NewRequest(http.MethodPost, "/api/v1/forward/diagnose", bytes.NewBufferString(`{"forwardId":`+strconv.FormatInt(forwardID, 10)+`}`))
req.Header.Set("Authorization", userToken)
res := httptest.NewRecorder()
router.ServeHTTP(res, req)
var out response.R
if err := json.NewDecoder(res.Body).Decode(&out); err != nil {
t.Fatalf("decode response: %v", err)
}
if out.Code != 0 {
t.Fatalf("expected code 0, got %d (%s)", out.Code, out.Msg)
}
payload, ok := out.Data.(map[string]interface{})
if !ok {
t.Fatalf("expected object payload, got %T", out.Data)
}
results, ok := payload["results"].([]interface{})
if !ok || len(results) == 0 {
t.Fatalf("expected non-empty results, got %v", payload["results"])
}
hasEntryToChain := false
hasChainToExit := false
for _, raw := range results {
item, ok := raw.(map[string]interface{})
if !ok {
continue
}
from := valueAsInt(item["fromChainType"])
to := valueAsInt(item["toChainType"])
targetIP := strings.TrimSpace(valueAsString(item["targetIp"]))
if from == 1 && to == 2 {
hasEntryToChain = true
if targetIP != "2001:db8:10::20" {
t.Fatalf("expected entry->chain diagnosis target to use IPv6, got %q", targetIP)
}
}
if from == 2 && to == 3 {
hasChainToExit = true
if targetIP != "2001:db8:10::30" {
t.Fatalf("expected chain->exit diagnosis target to use IPv6, got %q", targetIP)
}
}
}
if !hasEntryToChain || !hasChainToExit {
t.Fatalf("expected entry->chain and chain->exit steps, got entry=%v chain=%v", hasEntryToChain, hasChainToExit)
}
}
func TestDiagnosisUsesFederationRuntimeForRemoteNodes(t *testing.T) { func TestDiagnosisUsesFederationRuntimeForRemoteNodes(t *testing.T) {
secret := "contract-jwt-secret" secret := "contract-jwt-secret"
router, r := setupDiagnosisContractRouter(t, secret) router, r := setupDiagnosisContractRouter(t, secret)
+5 -2
View File
@@ -13,6 +13,8 @@
"@dnd-kit/core": "^6.3.1", "@dnd-kit/core": "^6.3.1",
"@dnd-kit/sortable": "^10.0.0", "@dnd-kit/sortable": "^10.0.0",
"@dnd-kit/utilities": "^3.2.2", "@dnd-kit/utilities": "^3.2.2",
"@internationalized/date": "^3.10.0",
"@marsidev/react-turnstile": "^1.1.0",
"@radix-ui/react-accordion": "^1.2.0", "@radix-ui/react-accordion": "^1.2.0",
"@radix-ui/react-checkbox": "^1.1.0", "@radix-ui/react-checkbox": "^1.1.0",
"@radix-ui/react-dialog": "^1.1.0", "@radix-ui/react-dialog": "^1.1.0",
@@ -25,8 +27,6 @@
"@radix-ui/react-slot": "^1.1.0", "@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-switch": "^1.1.0", "@radix-ui/react-switch": "^1.1.0",
"@radix-ui/react-tabs": "^1.1.0", "@radix-ui/react-tabs": "^1.1.0",
"@marsidev/react-turnstile": "^1.1.0",
"@internationalized/date": "^3.10.0",
"@react-aria/i18n": "^3.12.12", "@react-aria/i18n": "^3.12.12",
"@react-aria/visually-hidden": "3.8.25", "@react-aria/visually-hidden": "3.8.25",
"@react-types/shared": "3.30.0", "@react-types/shared": "3.30.0",
@@ -43,8 +43,11 @@
"react-dom": "18.3.1", "react-dom": "18.3.1",
"react-hot-toast": "^2.5.2", "react-hot-toast": "^2.5.2",
"react-is": "^19.2.4", "react-is": "^19.2.4",
"react-markdown": "^10.1.0",
"react-router-dom": "6.30.3", "react-router-dom": "6.30.3",
"recharts": "^3.1.1", "recharts": "^3.1.1",
"rehype-sanitize": "^6.0.0",
"remark-gfm": "^4.0.1",
"sonner": "^2.0.6", "sonner": "^2.0.6",
"tailwind-merge": "^2.5.5", "tailwind-merge": "^2.5.5",
"tailwind-variants": "1.0.0", "tailwind-variants": "1.0.0",
+20 -8
View File
@@ -31,6 +31,8 @@ import axios from "axios";
import Network from "./network"; import Network from "./network";
export type ReleaseChannel = "stable" | "dev";
// 登陆相关接口 // 登陆相关接口
export interface LoginData { export interface LoginData {
username: string; username: string;
@@ -66,8 +68,10 @@ export const getNodeList = () => Network.post<NodeApiItem[]>("/node/list");
export const updateNode = (data: NodeMutationPayload) => export const updateNode = (data: NodeMutationPayload) =>
Network.post("/node/update", data); Network.post("/node/update", data);
export const deleteNode = (id: number) => Network.post("/node/delete", { id }); export const deleteNode = (id: number) => Network.post("/node/delete", { id });
export const getNodeInstallCommand = (id: number) => export const getNodeInstallCommand = (
Network.post<string>("/node/install", { id }); id: number,
channel: ReleaseChannel = "stable",
) => Network.post<string>("/node/install", { id, channel });
export const updateNodeOrder = (data: { export const updateNodeOrder = (data: {
nodes: Array<{ id: number; inx: number }>; nodes: Array<{ id: number; inx: number }>;
}) => Network.post("/node/update-order", data); }) => Network.post("/node/update-order", data);
@@ -77,20 +81,28 @@ export const checkNodeStatus = (nodeId?: number) => {
return Network.post("/node/check-status", params); return Network.post("/node/check-status", params);
}; };
export const upgradeNode = (id: number, version?: string) => export const upgradeNode = (
id: number,
version?: string,
channel: ReleaseChannel = "stable",
) =>
Network.post( Network.post(
"/node/upgrade", "/node/upgrade",
{ id, version: version || "" }, { id, version: version || "", channel },
{ timeout: 5 * 60 * 1000 }, { timeout: 5 * 60 * 1000 },
); );
export const batchUpgradeNodes = (ids: number[], version?: string) => export const batchUpgradeNodes = (
ids: number[],
version?: string,
channel: ReleaseChannel = "stable",
) =>
Network.post( Network.post(
"/node/batch-upgrade", "/node/batch-upgrade",
{ ids, version: version || "" }, { ids, version: version || "", channel },
{ timeout: 15 * 60 * 1000 }, { timeout: 15 * 60 * 1000 },
); );
export const getNodeReleases = () => export const getNodeReleases = (channel: ReleaseChannel = "stable") =>
Network.post<NodeReleaseApiItem[]>("/node/releases"); Network.post<NodeReleaseApiItem[]>("/node/releases", { channel });
export const rollbackNode = (id: number) => export const rollbackNode = (id: number) =>
Network.post("/node/rollback", { id }); Network.post("/node/rollback", { id });
+1
View File
@@ -172,6 +172,7 @@ export interface NodeReleaseApiItem {
name: string; name: string;
publishedAt: string; publishedAt: string;
prerelease: boolean; prerelease: boolean;
channel: "stable" | "dev";
} }
export interface UserPackageInfoApiData { export interface UserPackageInfoApiData {
@@ -0,0 +1,122 @@
import { motion } from "framer-motion";
import React from "react";
/**
* Wraps page content with a smooth fade-in + slide-up entrance animation.
* Use this as the outermost wrapper inside each page component.
*/
export const AnimatedPage = ({
children,
className,
}: {
children: React.ReactNode;
className?: string;
}) => (
<motion.div
animate={{ opacity: 1, y: 0 }}
className={className}
exit={{ opacity: 0, y: -8 }}
initial={{ opacity: 0, y: 16 }}
transition={{ duration: 0.28, ease: [0.25, 0.46, 0.45, 0.94] }}
>
{children}
</motion.div>
);
/**
* Stagger container — apply to the parent of a list/grid of animated items.
* Children should use `staggerItem` as their `variants` prop.
*/
export const staggerContainer = {
hidden: { opacity: 0 },
show: {
opacity: 1,
transition: {
staggerChildren: 0.05,
delayChildren: 0.05,
},
},
};
/**
* Individual stagger item variant — fade-in + slide-up.
*/
export const staggerItem = {
hidden: { opacity: 0, y: 12 },
show: {
opacity: 1,
y: 0,
transition: { duration: 0.25, ease: [0.25, 0.46, 0.45, 0.94] },
},
};
/**
* Convenience wrapper for a stagger list.
* Renders a `motion.div` (or `motion.ul/motion.tbody`) with stagger behaviour.
*/
export const StaggerList = ({
children,
className,
as = "div",
}: {
children: React.ReactNode;
className?: string;
as?: "div" | "ul" | "tbody";
}) => {
const Component = motion[as] as React.ElementType;
return (
<Component
animate="show"
className={className}
initial="hidden"
variants={staggerContainer}
>
{children}
</Component>
);
};
/**
* Individual animated item for use inside StaggerList.
*/
export const StaggerItem = ({
children,
className,
as = "div",
}: {
children: React.ReactNode;
className?: string;
as?: "div" | "li" | "tr";
}) => {
const Component = motion[as] as React.ElementType;
return (
<Component className={className} variants={staggerItem}>
{children}
</Component>
);
};
/**
* Simple fade-in animation for standalone elements (chips, badges, counters, etc.)
* Uses opacity + translateY to avoid font blurriness caused by scale transforms.
*/
export const FadeIn = ({
children,
delay = 0,
className,
}: {
children: React.ReactNode;
delay?: number;
className?: string;
}) => (
<motion.div
animate={{ opacity: 1, y: 0 }}
className={className}
initial={{ opacity: 0, y: 8 }}
transition={{ duration: 0.2, delay, ease: "easeOut" }}
>
{children}
</motion.div>
);
+101
View File
@@ -0,0 +1,101 @@
import { motion, AnimatePresence } from "framer-motion";
import { Button } from "@/shadcn-bridge/heroui/button";
import { Input } from "@/shadcn-bridge/heroui/input";
import { SearchIcon } from "@/components/icons";
interface SearchBarProps {
isVisible: boolean;
value: string;
placeholder?: string;
onOpen: () => void;
onClose: () => void;
onChange: (value: string) => void;
}
export function SearchBar({
isVisible,
value,
placeholder = "搜索",
onOpen,
onClose,
onChange,
}: SearchBarProps) {
return (
// Fixed h-8 so the container never changes height — eliminates the vertical jitter
<div className="flex items-center gap-2 h-8 overflow-hidden">
<AnimatePresence mode="wait" initial={false}>
{!isVisible ? (
<motion.div
key="search-btn"
animate={{ opacity: 1, scale: 1 }}
exit={{ opacity: 0 }}
initial={{ opacity: 0 }}
transition={{ duration: 0.12 }}
>
<Button
isIconOnly
aria-label="搜索"
className="text-default-600"
color="default"
size="sm"
variant="flat"
onPress={onOpen}
>
<SearchIcon className="w-4 h-4" />
</Button>
</motion.div>
) : (
<motion.div
key="search-input"
animate={{ opacity: 1, x: 0 }}
className="flex w-full items-center gap-2"
exit={{ opacity: 0, x: -8 }}
initial={{ opacity: 0, x: -16 }}
transition={{ duration: 0.18, ease: [0.25, 0.46, 0.45, 0.94] }}
>
<Input
autoFocus
classNames={{
base: "bg-default-100",
input: "bg-transparent text-sm focus-visible:ring-0 focus-visible:ring-offset-0 focus-visible:outline-none",
inputWrapper:
"bg-default-100 border-0 shadow-none h-8 min-h-8",
}}
placeholder={placeholder}
value={value}
onChange={(e) => onChange(e.target.value)}
/>
<Button
isIconOnly
aria-label="关闭搜索"
className="text-default-600 shrink-0"
color="default"
size="sm"
variant="light"
onPress={() => {
onClose();
onChange("");
}}
>
<svg
aria-hidden="true"
className="w-4 h-4"
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
>
<path
d="M6 18L18 6M6 6l12 12"
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
/>
</svg>
</Button>
</motion.div>
)}
</AnimatePresence>
</div>
);
}
+1 -1
View File
@@ -5,7 +5,7 @@ import { cva, type VariantProps } from "class-variance-authority";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils";
const buttonVariants = cva( const buttonVariants = cva(
"inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50", "inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors transition-transform duration-100 active:scale-95 disabled:active:scale-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50",
{ {
variants: { variants: {
variant: { variant: {
+2 -2
View File
@@ -11,14 +11,14 @@ function Checkbox({
return ( return (
<CheckboxPrimitive.Root <CheckboxPrimitive.Root
className={cn( className={cn(
"peer h-4 w-4 shrink-0 rounded-sm border border-primary shadow focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground", "peer h-4 w-4 shrink-0 rounded-sm border border-primary shadow transition-transform duration-100 active:scale-90 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground",
className, className,
)} )}
data-slot="checkbox" data-slot="checkbox"
{...props} {...props}
> >
<CheckboxPrimitive.Indicator <CheckboxPrimitive.Indicator
className="flex items-center justify-center text-current" className="flex items-center justify-center text-current data-[state=checked]:animate-in data-[state=checked]:zoom-in-75 data-[state=checked]:duration-150"
data-slot="checkbox-indicator" data-slot="checkbox-indicator"
> >
<CheckIcon className="h-3.5 w-3.5" /> <CheckIcon className="h-3.5 w-3.5" />
+1 -1
View File
@@ -57,7 +57,7 @@ function DialogContent({
<DialogOverlay /> <DialogOverlay />
<DialogPrimitive.Content <DialogPrimitive.Content
className={cn( className={cn(
"fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border border-default-200 bg-white p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 sm:rounded-lg dark:bg-default-50", "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border border-default-200 bg-white p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=open]:slide-in-from-bottom-4 data-[state=closed]:slide-out-to-bottom-2 sm:rounded-lg dark:bg-default-50",
className, className,
)} )}
data-slot="dialog-content" data-slot="dialog-content"
@@ -85,7 +85,7 @@ function DropdownMenuSubContent({
return ( return (
<DropdownMenuPrimitive.SubContent <DropdownMenuPrimitive.SubContent
className={cn( className={cn(
"z-50 min-w-32 overflow-hidden rounded-md border border-default-200 bg-white p-1 text-foreground shadow-lg data-[state=open]:animate-in data-[state=closed]:animate-out dark:bg-default-50", "z-50 min-w-32 overflow-hidden rounded-md border border-default-200 bg-white p-1 text-foreground shadow-lg data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=top]:slide-in-from-bottom-2 data-[side=bottom]:slide-in-from-top-2 dark:bg-default-50",
className, className,
)} )}
data-slot="dropdown-menu-sub-content" data-slot="dropdown-menu-sub-content"
@@ -103,7 +103,7 @@ function DropdownMenuContent({
<DropdownMenuPrimitive.Portal> <DropdownMenuPrimitive.Portal>
<DropdownMenuPrimitive.Content <DropdownMenuPrimitive.Content
className={cn( className={cn(
"z-50 min-w-32 overflow-hidden rounded-md border border-default-200 bg-white p-1 text-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out dark:bg-default-50", "z-50 min-w-32 overflow-hidden rounded-md border border-default-200 bg-white p-1 text-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=top]:slide-in-from-bottom-2 data-[side=bottom]:slide-in-from-top-2 dark:bg-default-50",
className, className,
)} )}
data-slot="dropdown-menu-content" data-slot="dropdown-menu-content"
+3 -3
View File
@@ -90,9 +90,9 @@ function SelectContent({
<SelectPrimitive.Portal> <SelectPrimitive.Portal>
<SelectPrimitive.Content <SelectPrimitive.Content
className={cn( className={cn(
"relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border border-default-200 bg-white text-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out dark:bg-default-50", "relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border border-default-200 bg-white text-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=top]:slide-in-from-bottom-2 data-[side=bottom]:slide-in-from-top-2 dark:bg-default-50",
position === "popper" && position === "popper" &&
"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1", "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
className, className,
)} )}
data-slot="select-content" data-slot="select-content"
@@ -104,7 +104,7 @@ function SelectContent({
className={cn( className={cn(
"p-1", "p-1",
position === "popper" && position === "popper" &&
"h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]", "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]",
)} )}
> >
{children} {children}
+38 -12
View File
@@ -1,6 +1,7 @@
import React, { useState, useEffect } from "react"; import React, { useState, useEffect } from "react";
import { useNavigate, useLocation } from "react-router-dom"; import { useNavigate, useLocation } from "react-router-dom";
import { toast } from "react-hot-toast"; import { toast } from "react-hot-toast";
import { AnimatePresence, motion } from "framer-motion";
import { Button } from "@/shadcn-bridge/heroui/button"; import { Button } from "@/shadcn-bridge/heroui/button";
import { import {
@@ -335,21 +336,35 @@ export default function AdminLayout({
return ( return (
<li key={item.path}> <li key={item.path}>
<button <motion.button
className={` className={`
w-full flex items-center gap-3 px-4 py-3 rounded-lg text-left w-full flex items-center gap-3 px-4 py-3 rounded-lg text-left
transition-colors duration-200 min-h-[44px] relative min-h-[44px]
${ ${isActive
isActive ? "text-primary-600 dark:text-primary-300"
? "bg-primary-100 dark:bg-primary-600/20 text-primary-600 dark:text-primary-300" : "text-gray-700 dark:text-gray-200"
: "text-gray-700 dark:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-900" }
}
`} `}
transition={{ duration: 0.15 }}
onClick={() => handleMenuClick(item.path)} onClick={() => handleMenuClick(item.path)}
> >
<div className="flex-shrink-0">{item.icon}</div> {isActive && (
<span className="font-medium text-sm">{item.label}</span> <motion.div
</button> className="absolute inset-0 rounded-lg bg-primary-100 dark:bg-primary-600/20"
layoutId="sidebar-active"
transition={{ type: "spring", stiffness: 380, damping: 30 }}
/>
)}
{!isActive && (
<motion.div
className="absolute inset-0 rounded-lg bg-gray-100 dark:bg-gray-900 opacity-0"
transition={{ duration: 0.15 }}
whileHover={{ opacity: 1 }}
/>
)}
<div className="flex-shrink-0 relative z-10">{item.icon}</div>
<span className="font-medium text-sm relative z-10">{item.label}</span>
</motion.button>
</li> </li>
); );
})} })}
@@ -476,9 +491,20 @@ export default function AdminLayout({
{/* 主内容 */} {/* 主内容 */}
<main <main
className={`flex-1 bg-gray-100 dark:bg-black ${isMobile ? "" : "overflow-y-auto"}`} className={`flex-1 bg-gray-100 dark:bg-black overflow-hidden ${isMobile ? "" : "overflow-y-scroll"}`}
> >
{children} <AnimatePresence mode="wait">
<motion.div
key={location.pathname}
animate={{ opacity: 1, y: 0 }}
className="h-full"
exit={{ opacity: 0, y: -6 }}
initial={{ opacity: 0, y: 10 }}
transition={{ duration: 0.22, ease: [0.25, 0.46, 0.45, 0.94] }}
>
{children}
</motion.div>
</AnimatePresence>
</main> </main>
</div> </div>
+15 -14
View File
@@ -149,7 +149,7 @@ const getInitialConfigs = (): Record<string, string> => {
initialConfigs[key] = cachedValue; initialConfigs[key] = cachedValue;
} }
}); });
} catch {} } catch { }
return initialConfigs; return initialConfigs;
}; };
@@ -528,11 +528,10 @@ export default function ConfigPage() {
<button <button
key={option.value} key={option.value}
aria-pressed={isSelected} aria-pressed={isSelected}
className={`w-full px-4 py-3 rounded-lg border transition-all duration-200 cursor-pointer text-left ${ className={`w-full px-4 py-3 rounded-lg border transition-all duration-200 cursor-pointer text-left ${isSelected
isSelected ? "bg-primary-50 dark:bg-primary-900/20 border-primary-300 dark:border-primary-500/50 shadow-sm"
? "bg-primary-50 dark:bg-primary-900/20 border-primary-300 dark:border-primary-500/50 shadow-sm" : "bg-white dark:bg-default-50 border-default-200 dark:border-default-100/30 hover:border-primary-200 dark:hover:border-primary-500/30 hover:shadow-sm"
: "bg-white dark:bg-default-50 border-default-200 dark:border-default-100/30 hover:border-primary-200 dark:hover:border-primary-500/30 hover:shadow-sm" }`}
}`}
type="button" type="button"
onClick={() => toggleTypeSelection(option.value, setTypes)} onClick={() => toggleTypeSelection(option.value, setTypes)}
> >
@@ -546,11 +545,10 @@ export default function ConfigPage() {
size="md" size="md"
/> />
<span <span
className={`font-medium ${ className={`font-medium ${isSelected
isSelected ? "text-default-900 dark:text-default-100"
? "text-default-900 dark:text-default-100" : "text-default-700 dark:text-default-500"
: "text-default-700 dark:text-default-500" }`}
}`}
> >
{option.label} {option.label}
</span> </span>
@@ -649,9 +647,9 @@ export default function ConfigPage() {
{hasChanges && ( {hasChanges && (
<Card className="mt-4 bg-warning-50 dark:bg-warning-900/20 border-warning-200 dark:border-warning-800"> <Card className="mt-4 bg-warning-50 dark:bg-warning-900/20 border-warning-200 dark:border-warning-800">
<CardBody className="py-3"> <CardBody className="py-3">
<div className="flex items-center gap-2 text-warning-700 dark:text-warning-300"> <div className="w-full flex items-center justify-center gap-2 text-warning-700 dark:text-warning-300">
<div className="w-2 h-2 bg-warning-500 rounded-full animate-pulse" /> <div className="w-2 h-2 bg-warning-500 rounded-full animate-pulse" />
<span className="text-sm"> <span className="text-sm font-medium">
检测到配置变更,请记得保存您的修改 检测到配置变更,请记得保存您的修改
</span> </span>
</div> </div>
@@ -702,13 +700,16 @@ export default function ConfigPage() {
<Textarea <Textarea
label="公告内容" label="公告内容"
minRows={4} minRows={4}
placeholder="请输入公告内容" placeholder="支持 Markdown,例如:**加粗**、[链接](https://example.com)、- 列表"
value={announcement.content} value={announcement.content}
variant="bordered" variant="bordered"
onChange={(e) => onChange={(e) =>
setAnnouncement({ ...announcement, content: e.target.value }) setAnnouncement({ ...announcement, content: e.target.value })
} }
/> />
<p className="text-xs text-gray-500 dark:text-gray-400">
公告支持 Markdown 语法,链接会在新标签页打开
</p>
<div className="flex justify-end"> <div className="flex justify-end">
<Button <Button
+3 -2
View File
@@ -1,5 +1,6 @@
import { useState } from "react"; import { useState } from "react";
import toast from "react-hot-toast"; import toast from "react-hot-toast";
import { AnimatedPage } from "@/components/animated-page";
import { Card, CardBody, CardHeader } from "@/shadcn-bridge/heroui/card"; import { Card, CardBody, CardHeader } from "@/shadcn-bridge/heroui/card";
import { Button } from "@/shadcn-bridge/heroui/button"; import { Button } from "@/shadcn-bridge/heroui/button";
@@ -524,7 +525,7 @@ export default function DashboardPage() {
} }
return ( return (
<div className="px-3 lg:px-6 py-2 lg:py-4"> <AnimatedPage className="px-3 lg:px-6 py-2 lg:py-4">
{announcement && <AnnouncementBanner announcement={announcement} />} {announcement && <AnnouncementBanner announcement={announcement} />}
<div className="grid grid-cols-2 lg:grid-cols-4 gap-3 lg:gap-4 mb-6 lg:mb-8"> <div className="grid grid-cols-2 lg:grid-cols-4 gap-3 lg:gap-4 mb-6 lg:mb-8">
<MetricCard <MetricCard
@@ -978,6 +979,6 @@ export default function DashboardPage() {
</ModalBody> </ModalBody>
</ModalContent> </ModalContent>
</Modal> </Modal>
</div> </AnimatedPage>
); );
} }
@@ -1,4 +1,7 @@
import type { AnnouncementData } from "@/api"; import type { AnnouncementData } from "@/api";
import ReactMarkdown from "react-markdown";
import rehypeSanitize from "rehype-sanitize";
import remarkGfm from "remark-gfm";
import { Card, CardBody } from "@/shadcn-bridge/heroui/card"; import { Card, CardBody } from "@/shadcn-bridge/heroui/card";
@@ -14,13 +17,13 @@ export const AnnouncementBanner = ({
} }
return ( return (
<Card className="mb-4 lg:mb-6 border border-blue-200 dark:border-blue-500/30 bg-gradient-to-r from-blue-50 to-purple-50 dark:from-blue-500/10 dark:to-purple-500/10"> <Card className="mb-4 lg:mb-6 border border-blue-100 dark:border-blue-500/20 bg-gradient-to-br from-blue-50/80 to-indigo-50/80 dark:from-blue-500/5 dark:to-indigo-500/5 shadow-sm">
<CardBody className="p-4"> <CardBody className="p-4 sm:p-5">
<div className="flex items-center justify-start gap-3"> <div className="flex items-center gap-3.5 sm:gap-4">
<div className="p-2 bg-blue-100 dark:bg-blue-500/20 rounded-lg flex-shrink-0"> <div className="w-10 h-10 sm:w-11 sm:h-11 bg-white dark:bg-blue-500/10 rounded-full flex-shrink-0 flex items-center justify-center shadow-sm border border-blue-100 dark:border-blue-500/20">
<svg <svg
aria-hidden="true" aria-hidden="true"
className="w-5 h-5 text-blue-600 dark:text-blue-400" className="w-5 h-5 sm:w-5 sm:h-5 text-blue-500 dark:text-blue-400"
fill="currentColor" fill="currentColor"
viewBox="0 0 20 20" viewBox="0 0 20 20"
> >
@@ -32,12 +35,51 @@ export const AnnouncementBanner = ({
</svg> </svg>
</div> </div>
<div className="flex-1 min-w-0"> <div className="flex-1 min-w-0">
<h3 className="text-sm lg:text-base font-semibold text-blue-900 dark:text-blue-100 mb-1"> <h3 className="text-[15px] font-semibold text-blue-900 dark:text-blue-100 tracking-wide mb-1 sm:mb-1.5 mt-1.5">
公告 公告
</h3> </h3>
<p className="text-xs lg:text-sm text-blue-800 dark:text-blue-200 whitespace-pre-wrap break-words"> <div className="text-sm text-blue-800/90 dark:text-blue-100/90 break-words leading-relaxed">
{announcement.content} <ReactMarkdown
</p> rehypePlugins={[rehypeSanitize]}
remarkPlugins={[remarkGfm]}
components={{
p: ({ children }) => <p className="mb-2 last:mb-0">{children}</p>,
a: ({ children, href }) => (
<a
className="underline decoration-blue-500/70 underline-offset-2 hover:text-blue-700 dark:hover:text-blue-100"
href={href}
rel="noopener noreferrer"
target="_blank"
>
{children}
</a>
),
ul: ({ children }) => (
<ul className="list-disc pl-5 space-y-1 mb-2 last:mb-0">{children}</ul>
),
ol: ({ children }) => (
<ol className="list-decimal pl-5 space-y-1 mb-2 last:mb-0">{children}</ol>
),
code: ({ children }) => (
<code className="rounded bg-blue-100/80 dark:bg-blue-900/40 px-1 py-0.5 text-[0.92em]">
{children}
</code>
),
pre: ({ children }) => (
<pre className="mb-2 overflow-x-auto rounded-md bg-blue-100/70 dark:bg-blue-900/40 p-2.5 text-xs leading-relaxed">
{children}
</pre>
),
blockquote: ({ children }) => (
<blockquote className="mb-2 border-l-2 border-blue-300/80 dark:border-blue-500/60 pl-3 italic">
{children}
</blockquote>
),
}}
>
{announcement.content}
</ReactMarkdown>
</div>
</div> </div>
</div> </div>
</CardBody> </CardBody>
File diff suppressed because it is too large Load Diff
+2 -1
View File
@@ -645,9 +645,10 @@ export default function GroupPage() {
{(item) => <SelectItem key={item.id}>{item.name}</SelectItem>} {(item) => <SelectItem key={item.id}>{item.name}</SelectItem>}
</Select> </Select>
<Button <Button
className="md:self-end" className="md:self-end md:justify-self-start whitespace-nowrap px-4"
color="primary" color="primary"
isLoading={savingPermission} isLoading={savingPermission}
size="sm"
onPress={handleAssignPermission} onPress={handleAssignPermission}
> >
分配权限 分配权限
+10 -4
View File
@@ -2,6 +2,7 @@ import { useState } from "react";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import toast from "react-hot-toast"; import toast from "react-hot-toast";
import { Turnstile } from "@marsidev/react-turnstile"; import { Turnstile } from "@marsidev/react-turnstile";
import { motion } from "framer-motion";
import { Card, CardBody, CardHeader } from "@/shadcn-bridge/heroui/card"; import { Card, CardBody, CardHeader } from "@/shadcn-bridge/heroui/card";
import { Input } from "@/shadcn-bridge/heroui/input"; import { Input } from "@/shadcn-bridge/heroui/input";
@@ -152,7 +153,12 @@ export default function IndexPage() {
return ( return (
<DefaultLayout> <DefaultLayout>
<section className="flex flex-col items-center justify-center gap-4 py-4 sm:py-8 md:py-10 pb-20 min-h-[calc(100dvh-120px)] sm:min-h-[calc(100dvh-200px)]"> <section className="flex flex-col items-center justify-center gap-4 py-4 sm:py-8 md:py-10 pb-20 min-h-[calc(100dvh-120px)] sm:min-h-[calc(100dvh-200px)]">
<div className="w-full max-w-md px-4 sm:px-0"> <motion.div
animate={{ opacity: 1, y: 0 }}
className="w-full max-w-md px-4 sm:px-0"
initial={{ opacity: 0, y: 24 }}
transition={{ duration: 0.35, ease: [0.25, 0.46, 0.45, 0.94] }}
>
<Card className="w-full"> <Card className="w-full">
<CardHeader className="pb-0 pt-6 px-6 flex-col items-center"> <CardHeader className="pb-0 pt-6 px-6 flex-col items-center">
<h1 className={title({ size: "sm" })}>登陆</h1> <h1 className={title({ size: "sm" })}>登陆</h1>
@@ -203,7 +209,7 @@ export default function IndexPage() {
</div> </div>
</CardBody> </CardBody>
</Card> </Card>
</div> </motion.div>
{/* 版权信息 - 固定在底部,不占据布局空间 */} {/* 版权信息 - 固定在底部,不占据布局空间 */}
@@ -253,9 +259,9 @@ export default function IndexPage() {
theme: (document.documentElement.classList.contains( theme: (document.documentElement.classList.contains(
"dark", "dark",
) || ) ||
document.documentElement.getAttribute("data-theme") === document.documentElement.getAttribute("data-theme") ===
"dark" || "dark" ||
window.matchMedia("(prefers-color-scheme: dark)").matches window.matchMedia("(prefers-color-scheme: dark)").matches
? "dark" ? "dark"
: "light") as "light" | "dark" | "auto", : "light") as "light" | "dark" | "auto",
}} }}
+131 -130
View File
@@ -1,5 +1,7 @@
import { useState, useEffect } from "react"; import { useState, useEffect, useMemo } from "react";
import toast from "react-hot-toast"; import toast from "react-hot-toast";
import { AnimatedPage, StaggerList, StaggerItem } from "@/components/animated-page";
import { SearchBar } from "@/components/search-bar";
import { Card, CardBody, CardHeader } from "@/shadcn-bridge/heroui/card"; import { Card, CardBody, CardHeader } from "@/shadcn-bridge/heroui/card";
import { Button } from "@/shadcn-bridge/heroui/button"; import { Button } from "@/shadcn-bridge/heroui/button";
@@ -51,6 +53,18 @@ export default function LimitPage() {
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
const [rules, setRules] = useState<SpeedLimitRule[]>([]); const [rules, setRules] = useState<SpeedLimitRule[]>([]);
const [tunnels, setTunnels] = useState<Tunnel[]>([]); const [tunnels, setTunnels] = useState<Tunnel[]>([]);
const [searchKeyword, setSearchKeyword] = useState("");
const [isSearchVisible, setIsSearchVisible] = useState(false);
const filteredRules = useMemo(() => {
if (!searchKeyword.trim()) return rules;
const lowerKeyword = searchKeyword.toLowerCase();
return rules.filter(r =>
(r.name && r.name.toLowerCase().includes(lowerKeyword)) ||
(r.tunnelName && r.tunnelName.toLowerCase().includes(lowerKeyword))
);
}, [rules, searchKeyword]);
// 模态框状态 // 模态框状态
const [modalOpen, setModalOpen] = useState(false); const [modalOpen, setModalOpen] = useState(false);
@@ -219,10 +233,18 @@ export default function LimitPage() {
} }
return ( return (
<div className="px-3 lg:px-6 py-8"> <AnimatedPage className="px-3 lg:px-6 py-8">
{/* 页面头部 */} <div className="flex flex-col sm:flex-row items-stretch sm:items-center justify-between mb-6 gap-3">
<div className="flex items-center justify-between mb-6"> <div className="flex-1 max-w-sm flex items-center gap-2">
<div className="flex-1" /> <SearchBar
isVisible={isSearchVisible}
placeholder="搜索规则名称或绑定隧道"
value={searchKeyword}
onChange={setSearchKeyword}
onClose={() => setIsSearchVisible(false)}
onOpen={() => setIsSearchVisible(true)}
/>
</div>
<Button color="primary" size="sm" variant="flat" onPress={handleAdd}> <Button color="primary" size="sm" variant="flat" onPress={handleAdd}>
新增 新增
@@ -230,138 +252,117 @@ export default function LimitPage() {
</div> </div>
{/* 统一卡片网格 */} {/* 统一卡片网格 */}
{rules.length > 0 ? ( {filteredRules.length > 0 ? (
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5 gap-4"> <StaggerList className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5 gap-4">
{rules.map((rule) => ( {filteredRules.map((rule) => (
<Card <StaggerItem key={rule.id}>
key={rule.id} <Card className="shadow-sm border border-gray-200 dark:border-gray-700 overflow-hidden h-full">
className="shadow-sm border border-gray-200 dark:border-gray-700 overflow-hidden" <CardHeader className="pb-2 md:pb-2">
> <div className="flex justify-between items-start w-full">
<CardHeader className="pb-2 md:pb-2"> <div>
<div className="flex justify-between items-start w-full"> <h3 className="font-semibold text-foreground">
<div> {rule.name}
<h3 className="font-semibold text-foreground"> </h3>
{rule.name} </div>
</h3> <Chip
</div> color={rule.status === 1 ? "success" : "danger"}
<Chip size="sm"
color={rule.status === 1 ? "success" : "danger"} variant="flat"
size="sm" >
variant="flat" {rule.status === 1 ? "运行" : "异常"}
>
{rule.status === 1 ? "运行" : "异常"}
</Chip>
</div>
</CardHeader>
<CardBody className="pt-0 pb-3 md:pt-0 md:pb-3">
<div className="space-y-3">
<div className="flex justify-between items-center">
<span className="text-small text-default-600">
速度限制
</span>
<Chip color="secondary" size="sm" variant="flat">
{rule.speed} Mbps
</Chip> </Chip>
</div> </div>
<div className="flex justify-between items-center"> </CardHeader>
<span className="text-small text-default-600"> <CardBody className="pt-0 pb-3 md:pt-0 md:pb-3">
绑定隧道 <div className="space-y-3">
</span> <div className="flex justify-between items-center">
{rule.tunnelName ? ( <span className="text-small text-default-600">
<Chip color="primary" size="sm" variant="flat"> 速度限制
{rule.tunnelName}
</Chip>
) : (
<span className="text-default-400 text-small">
未绑定
</span> </span>
)} <Chip color="secondary" size="sm" variant="flat">
{rule.speed} Mbps
</Chip>
</div>
<div className="flex justify-between items-center">
<span className="text-small text-default-600">
绑定隧道
</span>
{rule.tunnelName ? (
<Chip color="primary" size="sm" variant="flat">
{rule.tunnelName}
</Chip>
) : (
<span className="text-default-400 text-small">
未绑定
</span>
)}
</div>
</div> </div>
</div>
<div className="flex gap-2 mt-4"> <div className="flex gap-2 mt-4">
<Button <Button
className="flex-1" className="flex-1"
color="primary" color="primary"
size="sm" size="sm"
startContent={ startContent={
<svg <svg
aria-hidden="true" aria-hidden="true"
className="w-4 h-4" className="w-4 h-4"
fill="currentColor" fill="currentColor"
viewBox="0 0 20 20" viewBox="0 0 20 20"
> >
<path d="M13.586 3.586a2 2 0 112.828 2.828l-.793.793-2.828-2.828.793-.793zM11.379 5.793L3 14.172V17h2.828l8.38-8.379-2.83-2.828z" /> <path d="M13.586 3.586a2 2 0 112.828 2.828l-.793.793-2.828-2.828.793-.793zM11.379 5.793L3 14.172V17h2.828l8.38-8.379-2.83-2.828z" />
</svg> </svg>
} }
variant="flat" variant="flat"
onPress={() => handleEdit(rule)} onPress={() => handleEdit(rule)}
> >
编辑 编辑
</Button> </Button>
<Button <Button
className="flex-1" className="flex-1"
color="danger" color="danger"
size="sm" size="sm"
startContent={ startContent={
<svg <svg
aria-hidden="true" aria-hidden="true"
className="w-4 h-4" className="w-4 h-4"
fill="currentColor" fill="currentColor"
viewBox="0 0 20 20" viewBox="0 0 20 20"
> >
<path <path
clipRule="evenodd" clipRule="evenodd"
d="M9 2a1 1 0 000 2h2a1 1 0 100-2H9z" d="M9 2a1 1 0 000 2h2a1 1 0 100-2H9z"
fillRule="evenodd" fillRule="evenodd"
/> />
<path <path
clipRule="evenodd" clipRule="evenodd"
d="M10 18a8 8 0 100-16 8 8 0 000 16zM8 7a1 1 0 012 0v4a1 1 0 11-2 0V7zM12 7a1 1 0 012 0v4a1 1 0 11-2 0V7z" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8 7a1 1 0 012 0v4a1 1 0 11-2 0V7zM12 7a1 1 0 012 0v4a1 1 0 11-2 0V7z"
fillRule="evenodd" fillRule="evenodd"
/> />
</svg> </svg>
} }
variant="flat" variant="flat"
onPress={() => handleDelete(rule)} onPress={() => handleDelete(rule)}
> >
删除 删除
</Button> </Button>
</div> </div>
</CardBody> </CardBody>
</Card> </Card>
</StaggerItem>
))} ))}
</div> </StaggerList>
) : ( ) : (
/* 空状态 */ /* 空状态 */
<Card className="shadow-sm border border-gray-200 dark:border-gray-700"> <Card className="shadow-sm border border-gray-200 dark:border-gray-700 bg-default-50/50">
<CardBody className="text-center py-16"> <CardBody className="text-center py-20 flex flex-col items-center justify-center min-h-[240px]">
<div className="flex flex-col items-center gap-4"> <h3 className="text-xl font-medium text-foreground tracking-tight mb-2">
<div className="w-16 h-16 bg-default-100 rounded-full flex items-center justify-center"> 暂无限速规则
<svg </h3>
aria-hidden="true" <p className="text-default-500 text-sm max-w-xs mx-auto leading-relaxed">
className="w-8 h-8 text-default-400" 还没有创建任何限速规则,点击上方按钮开始创建
fill="none" </p>
stroke="currentColor"
viewBox="0 0 24 24"
>
<path
d="M12 6v6l4 2m6-6a9 9 0 11-18 0 9 9 0 0118 0z"
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={1.5}
/>
</svg>
</div>
<div>
<h3 className="text-lg font-semibold text-foreground">
暂无限速规则
</h3>
<p className="text-default-500 text-sm mt-1">
还没有创建任何限速规则,点击上方按钮开始创建
</p>
</div>
</div>
</CardBody> </CardBody>
</Card> </Card>
)} )}
@@ -524,6 +525,6 @@ export default function LimitPage() {
)} )}
</ModalContent> </ModalContent>
</Modal> </Modal>
</div> </AnimatedPage>
); );
} }
+202 -66
View File
@@ -1,5 +1,7 @@
import { useState, useEffect, useMemo, useCallback } from "react"; import { useState, useEffect, useMemo, useCallback } from "react";
import toast from "react-hot-toast"; import toast from "react-hot-toast";
import { AnimatedPage } from "@/components/animated-page";
import { SearchBar } from "@/components/search-bar";
import { import {
DndContext, DndContext,
KeyboardSensor, KeyboardSensor,
@@ -49,6 +51,7 @@ import {
batchUpgradeNodes, batchUpgradeNodes,
getNodeReleases, getNodeReleases,
rollbackNode, rollbackNode,
type ReleaseChannel,
} from "@/api"; } from "@/api";
import { PageEmptyState, PageLoadingState } from "@/components/page-state"; import { PageEmptyState, PageLoadingState } from "@/components/page-state";
import { import {
@@ -126,11 +129,14 @@ const SortableItem = ({
isDragging, isDragging,
} = useSortable({ id }); } = useSortable({ id });
const style = { const style: React.CSSProperties = {
transform: transform ? CSS.Transform.toString(transform) : undefined, transform: transform ? CSS.Transform.toString(transform) : undefined,
transition: isDragging ? undefined : transition || undefined, transition: isDragging ? undefined : transition || undefined,
opacity: isDragging ? 0.5 : 1, opacity: isDragging ? 0.5 : 1,
willChange: "transform", willChange: "transform",
backfaceVisibility: "hidden",
WebkitFontSmoothing: "antialiased",
MozOsxFontSmoothing: "grayscale",
}; };
return ( return (
@@ -149,6 +155,8 @@ export default function NodePage() {
const [nodeList, setNodeList] = useState<Node[]>([]); const [nodeList, setNodeList] = useState<Node[]>([]);
const [nodeOrder, setNodeOrder] = useState<number[]>([]); const [nodeOrder, setNodeOrder] = useState<number[]>([]);
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const [searchKeyword, setSearchKeyword] = useState("");
const [isSearchVisible, setIsSearchVisible] = useState(false);
const [dialogVisible, setDialogVisible] = useState(false); const [dialogVisible, setDialogVisible] = useState(false);
const [dialogTitle, setDialogTitle] = useState(""); const [dialogTitle, setDialogTitle] = useState("");
const [isEdit, setIsEdit] = useState(false); const [isEdit, setIsEdit] = useState(false);
@@ -183,6 +191,10 @@ export default function NodePage() {
const [installCommandModal, setInstallCommandModal] = useState(false); const [installCommandModal, setInstallCommandModal] = useState(false);
const [installCommand, setInstallCommand] = useState(""); const [installCommand, setInstallCommand] = useState("");
const [currentNodeName, setCurrentNodeName] = useState(""); const [currentNodeName, setCurrentNodeName] = useState("");
const [installSelectorOpen, setInstallSelectorOpen] = useState(false);
const [installTargetNode, setInstallTargetNode] = useState<Node | null>(null);
const [installChannel, setInstallChannel] =
useState<ReleaseChannel>("stable");
// 升级相关状态 // 升级相关状态
const [upgradeModalOpen, setUpgradeModalOpen] = useState(false); const [upgradeModalOpen, setUpgradeModalOpen] = useState(false);
@@ -198,9 +210,12 @@ export default function NodePage() {
name: string; name: string;
publishedAt: string; publishedAt: string;
prerelease: boolean; prerelease: boolean;
channel: ReleaseChannel;
}> }>
>([]); >([]);
const [releasesLoading, setReleasesLoading] = useState(false); const [releasesLoading, setReleasesLoading] = useState(false);
const [releaseChannel, setReleaseChannel] =
useState<ReleaseChannel>("stable");
const [selectedVersion, setSelectedVersion] = useState(""); const [selectedVersion, setSelectedVersion] = useState("");
const [batchUpgradeLoading, setBatchUpgradeLoading] = useState(false); const [batchUpgradeLoading, setBatchUpgradeLoading] = useState(false);
const [upgradeProgress, setUpgradeProgress] = useState< const [upgradeProgress, setUpgradeProgress] = useState<
@@ -609,20 +624,31 @@ export default function NodePage() {
} }
}; };
const openInstallSelector = (node: Node) => {
setInstallTargetNode(node);
setInstallChannel("stable");
setInstallSelectorOpen(true);
};
// 复制安装命令 // 复制安装命令
const handleCopyInstallCommand = async (node: Node) => { const handleCopyInstallCommand = async (
node: Node,
channel: ReleaseChannel,
) => {
setNodeList((prev) => setNodeList((prev) =>
prev.map((n) => (n.id === node.id ? { ...n, copyLoading: true } : n)), prev.map((n) => (n.id === node.id ? { ...n, copyLoading: true } : n)),
); );
try { try {
const res = await getNodeInstallCommand(node.id); const res = await getNodeInstallCommand(node.id, channel);
if (res.code === 0 && res.data) { if (res.code === 0 && res.data) {
const copied = await tryCopyInstallCommand(res.data); const copied = await tryCopyInstallCommand(res.data);
if (copied) { if (copied) {
toast.success("安装命令已复制到剪贴板"); toast.success(
`${channel === "stable" ? "正式版" : "测试版"}安装命令已复制到剪贴板`,
);
} else { } else {
setInstallCommand(res.data); setInstallCommand(res.data);
setCurrentNodeName(node.name); setCurrentNodeName(node.name);
@@ -640,6 +666,13 @@ export default function NodePage() {
} }
}; };
const handleConfirmInstallCommand = async () => {
if (!installTargetNode) return;
setInstallSelectorOpen(false);
await handleCopyInstallCommand(installTargetNode, installChannel);
};
// 手动复制安装命令 // 手动复制安装命令
const handleManualCopy = async () => { const handleManualCopy = async () => {
try { try {
@@ -651,18 +684,10 @@ export default function NodePage() {
} }
}; };
// 打开版本选择弹窗 const loadReleasesByChannel = useCallback(async (channel: ReleaseChannel) => {
const openUpgradeModal = async (
target: "single" | "batch",
nodeId?: number,
) => {
setUpgradeTarget(target);
setUpgradeTargetNodeId(nodeId || null);
setSelectedVersion("");
setUpgradeModalOpen(true);
setReleasesLoading(true); setReleasesLoading(true);
try { try {
const res = await getNodeReleases(); const res = await getNodeReleases(channel);
if (res.code === 0 && Array.isArray(res.data)) { if (res.code === 0 && Array.isArray(res.data)) {
setReleases(res.data); setReleases(res.data);
@@ -674,6 +699,21 @@ export default function NodePage() {
} finally { } finally {
setReleasesLoading(false); setReleasesLoading(false);
} }
}, []);
// 打开版本选择弹窗
const openUpgradeModal = async (
target: "single" | "batch",
nodeId?: number,
) => {
const defaultChannel: ReleaseChannel = "stable";
setUpgradeTarget(target);
setUpgradeTargetNodeId(nodeId || null);
setReleaseChannel(defaultChannel);
setSelectedVersion("");
setUpgradeModalOpen(true);
await loadReleasesByChannel(defaultChannel);
}; };
// 确认升级(从版本弹窗) // 确认升级(从版本弹窗)
@@ -692,7 +732,11 @@ export default function NodePage() {
), ),
); );
try { try {
const res = await upgradeNode(upgradeTargetNodeId, version); const res = await upgradeNode(
upgradeTargetNodeId,
version,
releaseChannel,
);
if (res.code === 0) { if (res.code === 0) {
toast.success(`节点升级命令已发送,节点将自动重启`); toast.success(`节点升级命令已发送,节点将自动重启`);
@@ -712,7 +756,11 @@ export default function NodePage() {
setBatchUpgradeLoading(true); setBatchUpgradeLoading(true);
setUpgradeModalOpen(false); setUpgradeModalOpen(false);
try { try {
const res = await batchUpgradeNodes(Array.from(selectedIds), version); const res = await batchUpgradeNodes(
Array.from(selectedIds),
version,
releaseChannel,
);
if (res.code === 0) { if (res.code === 0) {
toast.success(`批量升级命令已发送到 ${selectedIds.size} 个节点`); toast.success(`批量升级命令已发送到 ${selectedIds.size} 个节点`);
@@ -780,23 +828,23 @@ export default function NodePage() {
prev.map((n) => prev.map((n) =>
n.id === form.id n.id === form.id
? { ? {
...n, ...n,
name: form.name, name: form.name,
serverIp: serverIp:
form.serverIpV4?.trim() || form.serverIpV4?.trim() ||
form.serverIpV6?.trim() || form.serverIpV6?.trim() ||
form.serverHost?.trim() || form.serverHost?.trim() ||
"", "",
serverIpV4: form.serverIpV4, serverIpV4: form.serverIpV4,
serverIpV6: form.serverIpV6, serverIpV6: form.serverIpV6,
port: form.port, port: form.port,
tcpListenAddr: form.tcpListenAddr, tcpListenAddr: form.tcpListenAddr,
udpListenAddr: form.udpListenAddr, udpListenAddr: form.udpListenAddr,
interfaceName: form.interfaceName, interfaceName: form.interfaceName,
http: form.http, http: form.http,
tls: form.tls, tls: form.tls,
socks: form.socks, socks: form.socks,
} }
: n, : n,
), ),
); );
@@ -953,7 +1001,19 @@ export default function NodePage() {
const sortedNodes = useMemo((): Node[] => { const sortedNodes = useMemo((): Node[] => {
if (!nodeList || nodeList.length === 0) return []; if (!nodeList || nodeList.length === 0) return [];
const sortedByDb = [...nodeList].sort((a, b) => { let filteredNodes = nodeList;
if (searchKeyword.trim()) {
const lowerKeyword = searchKeyword.toLowerCase();
filteredNodes = filteredNodes.filter(n =>
(n.name && n.name.toLowerCase().includes(lowerKeyword)) ||
(n.serverIp && n.serverIp.toLowerCase().includes(lowerKeyword)) ||
(n.serverIpV4 && n.serverIpV4.toLowerCase().includes(lowerKeyword)) ||
(n.serverIpV6 && n.serverIpV6.toLowerCase().includes(lowerKeyword))
);
}
const sortedByDb = [...filteredNodes].sort((a, b) => {
const aInx = a.inx ?? 0; const aInx = a.inx ?? 0;
const bInx = b.inx ?? 0; const bInx = b.inx ?? 0;
@@ -966,7 +1026,7 @@ export default function NodePage() {
nodeOrder.length > 0 && nodeOrder.length > 0 &&
sortedByDb.every((n) => n.inx === undefined || n.inx === 0) sortedByDb.every((n) => n.inx === undefined || n.inx === 0)
) { ) {
const nodeMap = new Map(nodeList.map((n) => [n.id, n] as const)); const nodeMap = new Map(filteredNodes.map((n) => [n.id, n] as const));
const localSorted: Node[] = []; const localSorted: Node[] = [];
nodeOrder.forEach((id) => { nodeOrder.forEach((id) => {
@@ -975,7 +1035,7 @@ export default function NodePage() {
if (node) localSorted.push(node); if (node) localSorted.push(node);
}); });
nodeList.forEach((node) => { filteredNodes.forEach((node) => {
if (!nodeOrder.includes(node.id)) { if (!nodeOrder.includes(node.id)) {
localSorted.push(node); localSorted.push(node);
} }
@@ -985,7 +1045,7 @@ export default function NodePage() {
} }
return sortedByDb; return sortedByDb;
}, [nodeList, nodeOrder]); }, [nodeList, nodeOrder, searchKeyword]);
const sortableNodeIds = useMemo( const sortableNodeIds = useMemo(
() => sortedNodes.map((n) => n.id), () => sortedNodes.map((n) => n.id),
@@ -993,14 +1053,22 @@ export default function NodePage() {
); );
return ( return (
<div className="px-3 lg:px-6 py-8"> <AnimatedPage className="px-3 lg:px-6 py-8">
{/* 页面头部 */} <div className="flex flex-col sm:flex-row items-stretch sm:items-center justify-between mb-6 gap-3">
<div className="flex items-center justify-between mb-6"> <div className="flex-1 max-w-sm flex items-center gap-2">
<div className="flex-1" /> <SearchBar
isVisible={isSearchVisible}
placeholder="搜索节点名称或IP"
value={searchKeyword}
onChange={setSearchKeyword}
onClose={() => setIsSearchVisible(false)}
onOpen={() => setIsSearchVisible(true)}
/>
</div>
<div className="flex gap-2 items-center"> <div className="flex gap-2 items-center">
<Button <Button
color={selectMode ? "warning" : "primary"} color={selectMode ? "secondary" : "default"}
size="sm" size="sm"
variant={selectMode ? "solid" : "flat"} variant={selectMode ? "solid" : "flat"}
onPress={toggleSelectMode} onPress={toggleSelectMode}
@@ -1167,7 +1235,7 @@ export default function NodePage() {
</span> </span>
<div className="text-right text-xs min-w-0 flex-1 ml-2 min-h-[2.125rem]"> <div className="text-right text-xs min-w-0 flex-1 ml-2 min-h-[2.125rem]">
{node.serverIpV4?.trim() || {node.serverIpV4?.trim() ||
node.serverIpV6?.trim() ? ( node.serverIpV6?.trim() ? (
<div className="space-y-0.5"> <div className="space-y-0.5">
{node.serverIpV4?.trim() && ( {node.serverIpV4?.trim() && (
<span <span
@@ -1223,7 +1291,7 @@ export default function NodePage() {
</span> </span>
<span className="text-xs"> <span className="text-xs">
{node.connectionStatus === "online" && {node.connectionStatus === "online" &&
node.systemInfo node.systemInfo
? formatUptime(node.systemInfo.uptime) ? formatUptime(node.systemInfo.uptime)
: "-"} : "-"}
</span> </span>
@@ -1242,7 +1310,7 @@ export default function NodePage() {
<span>CPU</span> <span>CPU</span>
<span className="font-mono"> <span className="font-mono">
{node.connectionStatus === "online" && {node.connectionStatus === "online" &&
node.systemInfo node.systemInfo
? `${node.systemInfo.cpuUsage.toFixed(1)}%` ? `${node.systemInfo.cpuUsage.toFixed(1)}%`
: "-"} : "-"}
</span> </span>
@@ -1259,7 +1327,7 @@ export default function NodePage() {
size="sm" size="sm"
value={ value={
node.connectionStatus === "online" && node.connectionStatus === "online" &&
node.systemInfo node.systemInfo
? node.systemInfo.cpuUsage ? node.systemInfo.cpuUsage
: 0 : 0
} }
@@ -1270,7 +1338,7 @@ export default function NodePage() {
<span>内存</span> <span>内存</span>
<span className="font-mono"> <span className="font-mono">
{node.connectionStatus === "online" && {node.connectionStatus === "online" &&
node.systemInfo node.systemInfo
? `${node.systemInfo.memoryUsage.toFixed(1)}%` ? `${node.systemInfo.memoryUsage.toFixed(1)}%`
: "-"} : "-"}
</span> </span>
@@ -1287,7 +1355,7 @@ export default function NodePage() {
size="sm" size="sm"
value={ value={
node.connectionStatus === "online" && node.connectionStatus === "online" &&
node.systemInfo node.systemInfo
? node.systemInfo.memoryUsage ? node.systemInfo.memoryUsage
: 0 : 0
} }
@@ -1302,10 +1370,10 @@ export default function NodePage() {
</div> </div>
<div className="font-mono"> <div className="font-mono">
{node.connectionStatus === "online" && {node.connectionStatus === "online" &&
node.systemInfo node.systemInfo
? formatSpeed( ? formatSpeed(
node.systemInfo.uploadSpeed, node.systemInfo.uploadSpeed,
) )
: "-"} : "-"}
</div> </div>
</div> </div>
@@ -1315,10 +1383,10 @@ export default function NodePage() {
</div> </div>
<div className="font-mono"> <div className="font-mono">
{node.connectionStatus === "online" && {node.connectionStatus === "online" &&
node.systemInfo node.systemInfo
? formatSpeed( ? formatSpeed(
node.systemInfo.downloadSpeed, node.systemInfo.downloadSpeed,
) )
: "-"} : "-"}
</div> </div>
</div> </div>
@@ -1332,10 +1400,10 @@ export default function NodePage() {
</div> </div>
<div className="font-mono text-primary-700 dark:text-primary-300"> <div className="font-mono text-primary-700 dark:text-primary-300">
{node.connectionStatus === "online" && {node.connectionStatus === "online" &&
node.systemInfo node.systemInfo
? formatTraffic( ? formatTraffic(
node.systemInfo.uploadTraffic, node.systemInfo.uploadTraffic,
) )
: "-"} : "-"}
</div> </div>
</div> </div>
@@ -1345,10 +1413,10 @@ export default function NodePage() {
</div> </div>
<div className="font-mono text-success-700 dark:text-success-300"> <div className="font-mono text-success-700 dark:text-success-300">
{node.connectionStatus === "online" && {node.connectionStatus === "online" &&
node.systemInfo node.systemInfo
? formatTraffic( ? formatTraffic(
node.systemInfo.downloadTraffic, node.systemInfo.downloadTraffic,
) )
: "-"} : "-"}
</div> </div>
</div> </div>
@@ -1367,7 +1435,7 @@ export default function NodePage() {
isLoading={node.copyLoading} isLoading={node.copyLoading}
size="sm" size="sm"
variant="flat" variant="flat"
onPress={() => handleCopyInstallCommand(node)} onPress={() => openInstallSelector(node)}
> >
安装 安装
</Button> </Button>
@@ -1811,6 +1879,55 @@ export default function NodePage() {
</ModalContent> </ModalContent>
</Modal> </Modal>
<Modal
backdrop="blur"
isOpen={installSelectorOpen}
placement="center"
size="md"
onOpenChange={setInstallSelectorOpen}
>
<ModalContent>
{(onClose) => (
<>
<ModalHeader className="flex flex-col gap-1">
<h2 className="text-xl font-bold">
选择安装通道
{installTargetNode ? ` - ${installTargetNode.name}` : ""}
</h2>
</ModalHeader>
<ModalBody>
<div className="space-y-4">
<Select
label="版本通道"
selectedKeys={[installChannel]}
onSelectionChange={(keys) => {
const selected = Array.from(keys)[0] as ReleaseChannel;
setInstallChannel(selected || "stable");
}}
>
<SelectItem key="stable" textValue="stable">
正式版(纯数字版本,如 2.1.4)
</SelectItem>
<SelectItem key="dev" textValue="dev">
测试版(含 alpha / beta / rc)
</SelectItem>
</Select>
</div>
</ModalBody>
<ModalFooter>
<Button variant="light" onPress={onClose}>
取消
</Button>
<Button color="primary" onPress={handleConfirmInstallCommand}>
生成命令
</Button>
</ModalFooter>
</>
)}
</ModalContent>
</Modal>
{/* 安装命令模态框 */} {/* 安装命令模态框 */}
<Modal <Modal
backdrop="blur" backdrop="blur"
@@ -1891,9 +2008,28 @@ export default function NodePage() {
</div> </div>
) : ( ) : (
<div className="space-y-4"> <div className="space-y-4">
<Select
label="版本通道"
selectedKeys={[releaseChannel]}
onSelectionChange={(keys) => {
const selected =
(Array.from(keys)[0] as ReleaseChannel) || "stable";
setReleaseChannel(selected);
setSelectedVersion("");
void loadReleasesByChannel(selected);
}}
>
<SelectItem key="stable" textValue="stable">
正式版(纯数字版本,如 2.1.4)
</SelectItem>
<SelectItem key="dev" textValue="dev">
测试版(含 alpha / beta / rc)
</SelectItem>
</Select>
<Select <Select
label="选择版本" label="选择版本"
placeholder="留空则使用最新版本" placeholder="留空则使用当前通道最新版本"
selectedKeys={selectedVersion ? [selectedVersion] : []} selectedKeys={selectedVersion ? [selectedVersion] : []}
onSelectionChange={(keys) => { onSelectionChange={(keys) => {
const selected = Array.from(keys)[0] as string; const selected = Array.from(keys)[0] as string;
@@ -1909,14 +2045,14 @@ export default function NodePage() {
{r.publishedAt {r.publishedAt
? new Date(r.publishedAt).toLocaleDateString() ? new Date(r.publishedAt).toLocaleDateString()
: ""} : ""}
{r.prerelease && ( {r.channel === "dev" && (
<Chip <Chip
className="ml-1" className="ml-1"
color="warning" color="warning"
size="sm" size="sm"
variant="flat" variant="flat"
> >
预览 测试
</Chip> </Chip>
)} )}
</span> </span>
@@ -1927,7 +2063,7 @@ export default function NodePage() {
<p className="text-sm text-default-500"> <p className="text-sm text-default-500">
{selectedVersion {selectedVersion
? `将升级到版本 ${selectedVersion}` ? `将升级到版本 ${selectedVersion}`
: "未选择版本,将自动使用最新稳定版"} : `未选择版本,将自动使用最新${releaseChannel === "stable" ? "正式" : "测试"}版`}
</p> </p>
</div> </div>
)} )}
@@ -1989,6 +2125,6 @@ export default function NodePage() {
)} )}
</ModalContent> </ModalContent>
</Modal> </Modal>
</div> </AnimatedPage>
); );
} }
+77 -12
View File
@@ -397,11 +397,30 @@ export default function PanelSharingPage() {
selectedKey={selectedTab} selectedKey={selectedTab}
onSelectionChange={(k) => setSelectedTab(k as string)} onSelectionChange={(k) => setSelectedTab(k as string)}
> >
<Tab key="my-shares" title="我分享的 (Provider)"> <Tab
key="my-shares"
title={
<div className="flex items-center gap-2">
<span className="text-sm font-semibold text-foreground">
Provider
</span>
<span className="text-xs text-default-500">我分享的</span>
</div>
}
>
<Card> <Card>
<CardBody> <CardBody className="space-y-5">
<div className="mb-4"> <div className="mt-4 flex flex-col gap-4 rounded-lg border border-divider bg-default-50/60 dark:bg-default-100/20 p-4 md:flex-row md:items-center md:justify-between">
<div className="space-y-1">
<h2 className="text-lg font-semibold text-foreground">
Provider 共享
</h2>
<p className="text-sm text-default-500">
将本地节点分享给其他面板,统一管理 Token、端口范围和到期策略。
</p>
</div>
<Button <Button
className="self-start md:self-auto"
color="primary" color="primary"
onPress={() => setCreateShareOpen(true)} onPress={() => setCreateShareOpen(true)}
> >
@@ -410,9 +429,25 @@ export default function PanelSharingPage() {
</div> </div>
{loading ? ( {loading ? (
<div className="text-center py-10 text-gray-500">加载中...</div> <div className="text-center py-12 text-default-500">加载中...</div>
) : shares.length === 0 ? ( ) : shares.length === 0 ? (
<div className="text-center py-10 text-gray-500">暂无分享</div> <div className="rounded-lg border border-dashed border-divider bg-default-50/60 dark:bg-default-100/20 px-6 py-10 text-center">
<p className="text-base font-semibold text-foreground">
暂无分享
</p>
<p className="mt-2 text-sm text-default-500">
先创建一个分享,把本地节点开放给其他面板使用。
</p>
<div className="mt-5 flex justify-center">
<Button
color="primary"
variant="flat"
onPress={() => setCreateShareOpen(true)}
>
创建第一个分享
</Button>
</div>
</div>
) : ( ) : (
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4"> <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
{shares.map((share) => ( {shares.map((share) => (
@@ -507,11 +542,30 @@ export default function PanelSharingPage() {
</CardBody> </CardBody>
</Card> </Card>
</Tab> </Tab>
<Tab key="remote-nodes" title="远程节点 (Consumer)"> <Tab
key="remote-nodes"
title={
<div className="flex items-center gap-2">
<span className="text-sm font-semibold text-foreground">
Consumer
</span>
<span className="text-xs text-default-500">远程节点</span>
</div>
}
>
<Card> <Card>
<CardBody> <CardBody className="space-y-5">
<div className="mb-4"> <div className="mt-4 flex flex-col gap-4 rounded-lg border border-divider bg-default-50/60 dark:bg-default-100/20 p-4 md:flex-row md:items-center md:justify-between">
<div className="space-y-1">
<h2 className="text-lg font-semibold text-foreground">
Consumer 接入
</h2>
<p className="text-sm text-default-500">
导入远程节点后,可在这里查看端口占用和同步状态。
</p>
</div>
<Button <Button
className="self-start md:self-auto"
color="secondary" color="secondary"
onPress={() => setImportNodeOpen(true)} onPress={() => setImportNodeOpen(true)}
> >
@@ -520,13 +574,24 @@ export default function PanelSharingPage() {
</div> </div>
{remoteUsageLoading ? ( {remoteUsageLoading ? (
<div className="text-center py-10 text-gray-500">加载中...</div> <div className="text-center py-12 text-default-500">加载中...</div>
) : remoteUsageNodes.length === 0 ? ( ) : remoteUsageNodes.length === 0 ? (
<div className="text-center py-10 text-gray-500"> <div className="rounded-lg border border-dashed border-divider bg-default-50/60 dark:bg-default-100/20 px-6 py-10 text-center">
<p>暂无远程节点占用记录。</p> <p className="text-base font-semibold text-foreground">
<p className="mt-2"> 暂无远程节点占用记录
</p>
<p className="mt-2 text-sm text-default-500">
导入远程节点并创建隧道后,这里会显示远端端口占用情况。 导入远程节点并创建隧道后,这里会显示远端端口占用情况。
</p> </p>
<div className="mt-5 flex justify-center">
<Button
color="secondary"
variant="flat"
onPress={() => setImportNodeOpen(true)}
>
去导入远程节点
</Button>
</div>
</div> </div>
) : ( ) : (
<div className="grid grid-cols-1 md:grid-cols-2 gap-4"> <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+107 -111
View File
@@ -1,5 +1,7 @@
import { useState, useEffect, useMemo } from "react"; import { useState, useEffect, useMemo } from "react";
import toast from "react-hot-toast"; import toast from "react-hot-toast";
import { AnimatedPage } from "@/components/animated-page";
import { SearchBar } from "@/components/search-bar";
import { import {
DndContext, DndContext,
KeyboardSensor, KeyboardSensor,
@@ -111,6 +113,8 @@ export default function TunnelPage() {
const [tunnels, setTunnels] = useState<Tunnel[]>([]); const [tunnels, setTunnels] = useState<Tunnel[]>([]);
const [tunnelOrder, setTunnelOrder] = useState<number[]>([]); const [tunnelOrder, setTunnelOrder] = useState<number[]>([]);
const [nodes, setNodes] = useState<Node[]>([]); const [nodes, setNodes] = useState<Node[]>([]);
const [searchKeyword, setSearchKeyword] = useState("");
const [isSearchVisible, setIsSearchVisible] = useState(false);
// 模态框状态 // 模态框状态
const [modalOpen, setModalOpen] = useState(false); const [modalOpen, setModalOpen] = useState(false);
@@ -226,9 +230,9 @@ export default function TunnelPage() {
trafficRatio: tunnel.trafficRatio, trafficRatio: tunnel.trafficRatio,
inIp: tunnel.inIp inIp: tunnel.inIp
? tunnel.inIp ? tunnel.inIp
.split(",") .split(",")
.map((ip: string) => ip.trim()) .map((ip: string) => ip.trim())
.join("\n") .join("\n")
: "", : "",
ipPreference: tunnel.ipPreference || "", ipPreference: tunnel.ipPreference || "",
status: tunnel.status, status: tunnel.status,
@@ -597,7 +601,17 @@ export default function TunnelPage() {
const sortedTunnels = useMemo((): Tunnel[] => { const sortedTunnels = useMemo((): Tunnel[] => {
if (!tunnels || tunnels.length === 0) return []; if (!tunnels || tunnels.length === 0) return [];
const sortedByDb = [...tunnels].sort((a, b) => { let filteredTunnels = tunnels;
if (searchKeyword.trim()) {
const lowerKeyword = searchKeyword.toLowerCase();
filteredTunnels = filteredTunnels.filter(t =>
(t.name && t.name.toLowerCase().includes(lowerKeyword)) ||
(t.inIp && t.inIp.toLowerCase().includes(lowerKeyword))
);
}
const sortedByDb = [...filteredTunnels].sort((a, b) => {
const aInx = a.inx ?? 0; const aInx = a.inx ?? 0;
const bInx = b.inx ?? 0; const bInx = b.inx ?? 0;
@@ -610,7 +624,7 @@ export default function TunnelPage() {
tunnelOrder.length > 0 && tunnelOrder.length > 0 &&
sortedByDb.every((t) => t.inx === undefined || t.inx === 0) sortedByDb.every((t) => t.inx === undefined || t.inx === 0)
) { ) {
const tunnelMap = new Map(tunnels.map((t) => [t.id, t] as const)); const tunnelMap = new Map(filteredTunnels.map((t) => [t.id, t] as const));
const localSorted: Tunnel[] = []; const localSorted: Tunnel[] = [];
tunnelOrder.forEach((id) => { tunnelOrder.forEach((id) => {
@@ -619,7 +633,7 @@ export default function TunnelPage() {
if (tunnel) localSorted.push(tunnel); if (tunnel) localSorted.push(tunnel);
}); });
tunnels.forEach((tunnel) => { filteredTunnels.forEach((tunnel) => {
if (!tunnelOrder.includes(tunnel.id)) { if (!tunnelOrder.includes(tunnel.id)) {
localSorted.push(tunnel); localSorted.push(tunnel);
} }
@@ -629,7 +643,7 @@ export default function TunnelPage() {
} }
return sortedByDb; return sortedByDb;
}, [tunnels, tunnelOrder]); }, [tunnels, tunnelOrder, searchKeyword]);
const sortableTunnelIds = useMemo( const sortableTunnelIds = useMemo(
() => sortedTunnels.map((t) => t.id), () => sortedTunnels.map((t) => t.id),
@@ -652,11 +666,14 @@ export default function TunnelPage() {
isDragging, isDragging,
} = useSortable({ id }); } = useSortable({ id });
const style = { const style: React.CSSProperties = {
transform: transform ? CSS.Transform.toString(transform) : undefined, transform: transform ? CSS.Transform.toString(transform) : undefined,
transition: isDragging ? undefined : transition || undefined, transition: isDragging ? undefined : transition || undefined,
opacity: isDragging ? 0.5 : 1, opacity: isDragging ? 0.5 : 1,
willChange: "transform", willChange: "transform",
backfaceVisibility: "hidden",
WebkitFontSmoothing: "antialiased",
MozOsxFontSmoothing: "grayscale",
}; };
return ( return (
@@ -671,14 +688,22 @@ export default function TunnelPage() {
} }
return ( return (
<div className="px-3 lg:px-6 py-8"> <AnimatedPage className="px-3 lg:px-6 py-8">
{/* 页面头部 */} <div className="flex flex-col sm:flex-row items-stretch sm:items-center justify-between mb-6 gap-3">
<div className="flex items-center justify-between mb-6"> <div className="flex-1 max-w-sm flex items-center gap-2">
<div className="flex-1" /> <SearchBar
isVisible={isSearchVisible}
placeholder="搜索隧道名称或IP"
value={searchKeyword}
onChange={setSearchKeyword}
onClose={() => setIsSearchVisible(false)}
onOpen={() => setIsSearchVisible(true)}
/>
</div>
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<Button <Button
color={selectMode ? "warning" : "primary"} color={selectMode ? "secondary" : "default"}
size="sm" size="sm"
variant={selectMode ? "solid" : "flat"} variant={selectMode ? "solid" : "flat"}
onPress={toggleSelectMode} onPress={toggleSelectMode}
@@ -1014,34 +1039,14 @@ export default function TunnelPage() {
</DndContext> </DndContext>
) : ( ) : (
/* 空状态 */ /* 空状态 */
<Card className="shadow-sm border border-gray-200 dark:border-gray-700"> <Card className="shadow-sm border border-gray-200 dark:border-gray-700 bg-default-50/50">
<CardBody className="text-center py-16"> <CardBody className="text-center py-20 flex flex-col items-center justify-center min-h-[240px]">
<div className="flex flex-col items-center gap-4"> <h3 className="text-xl font-medium text-foreground tracking-tight mb-2">
<div className="w-16 h-16 bg-default-100 rounded-full flex items-center justify-center"> 暂无隧道配置
<svg </h3>
aria-hidden="true" <p className="text-default-500 text-sm max-w-xs mx-auto leading-relaxed">
className="w-8 h-8 text-default-400" 还没有创建任何隧道配置,点击上方按钮开始创建
fill="none" </p>
stroke="currentColor"
viewBox="0 0 24 24"
>
<path
d="M8.111 16.404a5.5 5.5 0 017.778 0M12 20h.01m-7.08-7.071c3.904-3.905 10.236-3.905 14.141 0M1.394 9.393c5.857-5.857 15.355-5.857 21.213 0"
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={1.5}
/>
</svg>
</div>
<div>
<h3 className="text-lg font-semibold text-foreground">
暂无隧道配置
</h3>
<p className="text-default-500 text-sm mt-1">
还没有创建任何隧道配置,点击上方按钮开始创建
</p>
</div>
</div>
</CardBody> </CardBody>
</Card> </Card>
)} )}
@@ -1127,11 +1132,6 @@ export default function TunnelPage() {
</Select> </Select>
<Input <Input
endContent={
<div className="pointer-events-none flex items-center">
<span className="text-default-400 text-small">x</span>
</div>
}
errorMessage={errors.trafficRatio} errorMessage={errors.trafficRatio}
isInvalid={!!errors.trafficRatio} isInvalid={!!errors.trafficRatio}
label="流量倍率" label="流量倍率"
@@ -1386,6 +1386,7 @@ export default function TunnelPage() {
]} ]}
label="节点" label="节点"
placeholder="选择节点(可多选)" placeholder="选择节点(可多选)"
dropdownPlacement="top"
selectedKeys={groupNodes selectedKeys={groupNodes
.filter((ct) => ct.nodeId !== -1) .filter((ct) => ct.nodeId !== -1)
.map((ct) => ct.nodeId.toString())} .map((ct) => ct.nodeId.toString())}
@@ -1452,14 +1453,14 @@ export default function TunnelPage() {
{form.inNodeId.some( {form.inNodeId.some(
(ct) => ct.nodeId === node.id, (ct) => ct.nodeId === node.id,
) && ( ) && (
<Chip <Chip
color="warning" color="warning"
size="sm" size="sm"
variant="flat" variant="flat"
> >
已选为入口 已选为入口
</Chip> </Chip>
)} )}
{form.outNodeId && {form.outNodeId &&
form.outNodeId.some( form.outNodeId.some(
(ct) => ct.nodeId === node.id, (ct) => ct.nodeId === node.id,
@@ -1482,14 +1483,14 @@ export default function TunnelPage() {
ct.nodeId !== -1, ct.nodeId !== -1,
), ),
) && ( ) && (
<Chip <Chip
color="primary" color="primary"
size="sm" size="sm"
variant="flat" variant="flat"
> >
已选为其他跳 已选为其他跳
</Chip> </Chip>
)} )}
</div> </div>
</div> </div>
</SelectItem> </SelectItem>
@@ -1603,11 +1604,12 @@ export default function TunnelPage() {
isInvalid={!!errors.outNodeId} isInvalid={!!errors.outNodeId}
label="节点" label="节点"
placeholder="请选择出口节点(可多选)" placeholder="请选择出口节点(可多选)"
dropdownPlacement="top"
selectedKeys={ selectedKeys={
form.outNodeId form.outNodeId
? form.outNodeId ? form.outNodeId
.filter((ct) => ct.nodeId !== -1) .filter((ct) => ct.nodeId !== -1)
.map((ct) => ct.nodeId.toString()) .map((ct) => ct.nodeId.toString())
: [] : []
} }
selectionMode="multiple" selectionMode="multiple"
@@ -1674,25 +1676,25 @@ export default function TunnelPage() {
{form.inNodeId.some( {form.inNodeId.some(
(ct) => ct.nodeId === node.id, (ct) => ct.nodeId === node.id,
) && ( ) && (
<Chip <Chip
color="warning" color="warning"
size="sm" size="sm"
variant="flat" variant="flat"
> >
已选为入口 已选为入口
</Chip> </Chip>
)} )}
{getSelectedChainNodeIds().includes( {getSelectedChainNodeIds().includes(
node.id, node.id,
) && ( ) && (
<Chip <Chip
color="primary" color="primary"
size="sm" size="sm"
variant="flat" variant="flat"
> >
已选为转发链 已选为转发链
</Chip> </Chip>
)} )}
</div> </div>
</div> </div>
</SelectItem> </SelectItem>
@@ -2055,20 +2057,18 @@ export default function TunnelPage() {
return ( return (
<tr <tr
key={index} key={index}
className={`hover:bg-default-50 dark:hover:bg-gray-700/50 ${ className={`hover:bg-default-50 dark:hover:bg-gray-700/50 ${result.success
result.success ? "bg-white dark:bg-gray-800"
? "bg-white dark:bg-gray-800" : "bg-danger-50 dark:bg-danger-900/30"
: "bg-danger-50 dark:bg-danger-900/30" }`}
}`}
> >
<td className="px-3 py-2"> <td className="px-3 py-2">
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<span <span
className={`w-5 h-5 rounded-full flex items-center justify-center text-xs ${ className={`w-5 h-5 rounded-full flex items-center justify-center text-xs ${result.success
result.success ? "bg-success text-white"
? "bg-success text-white" : "bg-danger text-white"
: "bg-danger text-white" }`}
}`}
> >
{result.success ? "✓" : "✗"} {result.success ? "✓" : "✗"}
</span> </span>
@@ -2110,11 +2110,10 @@ export default function TunnelPage() {
<td className="px-3 py-2 text-center"> <td className="px-3 py-2 text-center">
{result.success ? ( {result.success ? (
<span <span
className={`font-semibold ${ className={`font-semibold ${(result.packetLoss || 0) > 0
(result.packetLoss || 0) > 0 ? "text-warning"
? "text-warning" : "text-success"
: "text-success" }`}
}`}
> >
{result.packetLoss?.toFixed(1)}% {result.packetLoss?.toFixed(1)}%
</span> </span>
@@ -2227,19 +2226,17 @@ export default function TunnelPage() {
return ( return (
<div <div
key={index} key={index}
className={`border rounded-lg p-3 ${ className={`border rounded-lg p-3 ${result.success
result.success ? "border-divider bg-white dark:bg-gray-800"
? "border-divider bg-white dark:bg-gray-800" : "border-danger-200 dark:border-danger-300/30 bg-danger-50 dark:bg-danger-900/30"
: "border-danger-200 dark:border-danger-300/30 bg-danger-50 dark:bg-danger-900/30" }`}
}`}
> >
<div className="flex items-start gap-2 mb-2"> <div className="flex items-start gap-2 mb-2">
<span <span
className={`w-6 h-6 rounded-full flex items-center justify-center text-xs flex-shrink-0 ${ className={`w-6 h-6 rounded-full flex items-center justify-center text-xs flex-shrink-0 ${result.success
result.success ? "bg-success text-white"
? "bg-success text-white" : "bg-danger text-white"
: "bg-danger text-white" }`}
}`}
> >
{result.success ? "✓" : "✗"} {result.success ? "✓" : "✗"}
</span> </span>
@@ -2275,11 +2272,10 @@ export default function TunnelPage() {
</div> </div>
<div className="text-center"> <div className="text-center">
<div <div
className={`text-lg font-bold ${ className={`text-lg font-bold ${(result.packetLoss || 0) > 0
(result.packetLoss || 0) > 0 ? "text-warning"
? "text-warning" : "text-success"
: "text-success" }`}
}`}
> >
{result.packetLoss?.toFixed(1)}% {result.packetLoss?.toFixed(1)}%
</div> </div>
@@ -2444,6 +2440,6 @@ export default function TunnelPage() {
)} )}
</ModalContent> </ModalContent>
</Modal> </Modal>
</div> </AnimatedPage>
); );
} }
+271 -245
View File
@@ -1,5 +1,6 @@
import { useState, useEffect } from "react"; import { useState, useEffect } from "react";
import toast from "react-hot-toast"; import toast from "react-hot-toast";
import { AnimatedPage, StaggerList, StaggerItem } from "@/components/animated-page";
import { parseDate } from "@internationalized/date"; import { parseDate } from "@internationalized/date";
import { Button } from "@/shadcn-bridge/heroui/button"; import { Button } from "@/shadcn-bridge/heroui/button";
@@ -57,7 +58,6 @@ import {
SearchIcon, SearchIcon,
EditIcon, EditIcon,
DeleteIcon, DeleteIcon,
UserIcon,
SettingsIcon, SettingsIcon,
} from "@/components/icons"; } from "@/components/icons";
import { PageLoadingState } from "@/components/page-state"; import { PageLoadingState } from "@/components/page-state";
@@ -122,6 +122,7 @@ export default function UserPage() {
const [users, setUsers] = useState<User[]>([]); const [users, setUsers] = useState<User[]>([]);
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const [searchKeyword, setSearchKeyword] = useState(""); const [searchKeyword, setSearchKeyword] = useState("");
const [isSearchVisible, setIsSearchVisible] = useState(false);
const [pagination, setPagination] = useState<PaginationType>({ const [pagination, setPagination] = useState<PaginationType>({
current: 1, current: 1,
size: 10, size: 10,
@@ -247,7 +248,7 @@ export default function UserPage() {
if (response.code === 0) { if (response.code === 0) {
setTunnels(Array.isArray(response.data) ? response.data : []); setTunnels(Array.isArray(response.data) ? response.data : []);
} }
} catch {} } catch { }
}; };
const loadSpeedLimits = async () => { const loadSpeedLimits = async () => {
@@ -257,15 +258,15 @@ export default function UserPage() {
if (response.code === 0) { if (response.code === 0) {
const speedLimitList = Array.isArray(response.data) const speedLimitList = Array.isArray(response.data)
? response.data.map((item) => ({ ? response.data.map((item) => ({
...item, ...item,
uploadSpeed: item.uploadSpeed ?? item.speed ?? 0, uploadSpeed: item.uploadSpeed ?? item.speed ?? 0,
downloadSpeed: item.downloadSpeed ?? item.speed ?? 0, downloadSpeed: item.downloadSpeed ?? item.speed ?? 0,
})) }))
: []; : [];
setSpeedLimits(speedLimitList); setSpeedLimits(speedLimitList);
} }
} catch {} } catch { }
}; };
const loadUserGroups = async () => { const loadUserGroups = async () => {
@@ -275,7 +276,7 @@ export default function UserPage() {
if (response.code === 0) { if (response.code === 0) {
setUserGroups(Array.isArray(response.data) ? response.data : []); setUserGroups(Array.isArray(response.data) ? response.data : []);
} }
} catch {} } catch { }
}; };
const loadUserTunnels = async (userId: number) => { const loadUserTunnels = async (userId: number) => {
@@ -326,7 +327,7 @@ export default function UserPage() {
if (groupRes.code === 0) { if (groupRes.code === 0) {
currentGroupIds = groupRes.data || []; currentGroupIds = groupRes.data || [];
} }
} catch {} } catch { }
setUserForm({ setUserForm({
id: user.id, id: user.id,
@@ -610,67 +611,89 @@ export default function UserPage() {
}; };
return ( return (
<div className="px-3 lg:px-6 py-8"> <AnimatedPage className="px-3 lg:px-6 py-8">
{/* 页面头部 */} {/* 页面头部 */}
<div className="flex flex-col gap-4 mb-6"> <div className="flex flex-col sm:flex-row items-stretch sm:items-center justify-between mb-6 gap-3">
<div className="flex items-center gap-3" /> <div className="flex-1 max-w-sm flex items-center gap-2">
{!isSearchVisible ? (
<div className="flex flex-col sm:flex-row gap-3 items-stretch sm:items-center justify-between">
<div className="flex items-center gap-3 flex-1 max-w-md">
<Input
className="flex-1"
classNames={{
base: "bg-default-100",
input: "bg-transparent",
inputWrapper:
"bg-default-100 border-2 border-default-200 hover:border-default-300 data-[hover=true]:border-default-300",
}}
placeholder="搜索用户名"
value={searchKeyword}
onChange={(e) => setSearchKeyword(e.target.value)}
onKeyDown={(e) => e.key === "Enter" && handleSearch()}
/>
<Button <Button
isIconOnly isIconOnly
aria-label="搜索用户" aria-label="搜索"
className="min-h-10 w-10" className="text-default-600"
color="primary" color="default"
variant="solid" size="sm"
onPress={handleSearch} variant="flat"
onPress={() => setIsSearchVisible(true)}
> >
<SearchIcon className="w-4 h-4" /> <SearchIcon className="w-4 h-4" />
</Button> </Button>
</div> ) : (
<div className="flex w-full items-center gap-2 animate-appearance-in">
<Button color="primary" variant="flat" onPress={handleAdd}> <Input
新增 autoFocus
</Button> classNames={{
base: "bg-default-100",
input: "bg-transparent",
inputWrapper:
"bg-default-100 border-2 border-default-200 hover:border-default-300 data-[hover=true]:border-default-300",
}}
placeholder="搜索用户名"
value={searchKeyword}
onChange={(e) => setSearchKeyword(e.target.value)}
onKeyDown={(e) => e.key === "Enter" && handleSearch()}
/>
<Button
isIconOnly
aria-label="关闭搜索"
className="text-default-600 shrink-0"
color="default"
size="sm"
variant="light"
onPress={() => {
setIsSearchVisible(false);
setSearchKeyword("");
}}
>
<svg
aria-hidden="true"
className="w-4 h-4"
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
>
<path
d="M6 18L18 6M6 6l12 12"
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth={2}
/>
</svg>
</Button>
</div>
)}
</div> </div>
<Button color="primary" size="sm" variant="flat" onPress={handleAdd}>
新增
</Button>
</div> </div>
{/* 用户列表 */} {/* 用户列表 */}
{loading ? ( {loading ? (
<PageLoadingState message="正在加载..." /> <PageLoadingState message="正在加载..." />
) : users.length === 0 ? ( ) : users.length === 0 ? (
<Card className="shadow-sm border border-gray-200 dark:border-gray-700"> <Card className="shadow-sm border border-gray-200 dark:border-gray-700 bg-default-50/50">
<CardBody className="text-center py-16"> <CardBody className="text-center py-20 flex flex-col items-center justify-center min-h-[240px]">
<div className="flex flex-col items-center gap-4"> <h3 className="text-xl font-medium text-foreground tracking-tight mb-2">
<div className="w-16 h-16 bg-default-100 rounded-full flex items-center justify-center"> 暂无用户数据
<UserIcon className="w-8 h-8 text-default-400" /> </h3>
</div> <p className="text-default-500 text-sm max-w-xs mx-auto leading-relaxed">
<div> 还没有创建任何用户,点击上方按钮开始创建
<h3 className="text-lg font-semibold text-foreground"> </p>
暂无用户数据
</h3>
<p className="text-default-500 text-sm mt-1">
还没有创建任何用户,点击上方按钮开始创建
</p>
</div>
</div>
</CardBody> </CardBody>
</Card> </Card>
) : ( ) : (
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5 gap-4"> <StaggerList className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5 gap-4">
{users.map((user) => { {users.map((user) => {
const userStatus = getUserStatus(user); const userStatus = getUserStatus(user);
const expStatus = user.expTime const expStatus = user.expTime
@@ -680,179 +703,180 @@ export default function UserPage() {
const flowPercent = const flowPercent =
user.flow > 0 user.flow > 0
? Math.min( ? Math.min(
(usedFlow / (user.flow * 1024 * 1024 * 1024)) * 100, (usedFlow / (user.flow * 1024 * 1024 * 1024)) * 100,
100, 100,
) )
: 0; : 0;
return ( return (
<Card <StaggerItem key={user.id}>
key={user.id} <Card
className="shadow-sm border border-divider hover:shadow-md transition-shadow duration-200 overflow-hidden" className="shadow-sm border border-divider hover:shadow-md transition-shadow duration-200 overflow-hidden h-full"
> >
<CardHeader className="pb-2 md:pb-2"> <CardHeader className="pb-2 md:pb-2">
<div className="flex justify-between items-start w-full"> <div className="flex justify-between items-start w-full">
<div className="flex-1 min-w-0"> <div className="flex-1 min-w-0">
<h3 className="font-semibold text-foreground truncate text-sm"> <h3 className="font-semibold text-foreground truncate text-sm">
{user.name || user.user} {user.name || user.user}
</h3> </h3>
<p className="text-xs text-default-500 truncate"> <p className="text-xs text-default-500 truncate">
@{user.user} @{user.user}
</p> </p>
</div>
<div className="flex items-center gap-1.5 ml-2">
<Chip
className="text-xs"
color={userStatus.color}
size="sm"
variant="flat"
>
{userStatus.text}
</Chip>
</div>
</div> </div>
<div className="flex items-center gap-1.5 ml-2"> </CardHeader>
<Chip
className="text-xs"
color={userStatus.color}
size="sm"
variant="flat"
>
{userStatus.text}
</Chip>
</div>
</div>
</CardHeader>
<CardBody className="pt-0 pb-3 md:pt-0 md:pb-3"> <CardBody className="pt-0 pb-3 md:pt-0 md:pb-3">
<div className="space-y-2"> <div className="space-y-2">
{/* 流量信息 */} {/* 流量信息 */}
<div className="space-y-1.5"> <div className="space-y-1.5">
<div className="flex justify-between text-sm">
<span className="text-default-600">流量限制</span>
<span className="font-medium text-xs">
{formatFlow(user.flow, "gb")}
</span>
</div>
<div className="flex justify-between text-sm">
<span className="text-default-600">已使用</span>
<span className="font-medium text-xs text-danger">
{formatFlow(usedFlow)}
</span>
</div>
<Progress
aria-label={`流量使用 ${flowPercent.toFixed(1)}%`}
className="mt-1"
color={
flowPercent > 90
? "danger"
: flowPercent > 70
? "warning"
: "success"
}
size="sm"
value={flowPercent}
/>
</div>
{/* 其他信息 */}
<div className="space-y-1.5 pt-2 border-t border-divider">
<div className="flex justify-between text-sm">
<span className="text-default-600">转发数量</span>
<span className="font-medium text-xs">{user.num}</span>
</div>
<div className="flex justify-between text-sm">
<span className="text-default-600">重置日期</span>
<span className="text-xs">
{user.flowResetTime === 0
? "不重置"
: `每月${user.flowResetTime}号`}
</span>
</div>
{user.expTime && (
<div className="flex justify-between text-sm"> <div className="flex justify-between text-sm">
<span className="text-default-600">过期时间</span> <span className="text-default-600">流量限制</span>
<div className="text-right"> <span className="font-medium text-xs">
{expStatus && expStatus.color === "success" ? ( {formatFlow(user.flow, "gb")}
<div className="text-xs"> </span>
{formatDate(user.expTime)}
</div>
) : (
<Chip
className="text-xs"
color={expStatus?.color || "default"}
size="sm"
variant="flat"
>
{expStatus?.text || "未知状态"}
</Chip>
)}
</div>
</div> </div>
)} <div className="flex justify-between text-sm">
</div> <span className="text-default-600">已使用</span>
</div> <span className="font-medium text-xs text-danger">
{formatFlow(usedFlow)}
</span>
</div>
<Progress
aria-label={`流量使用 ${flowPercent.toFixed(1)}%`}
className="mt-1"
color={
flowPercent > 90
? "danger"
: flowPercent > 70
? "warning"
: "success"
}
size="sm"
value={flowPercent}
/>
</div>
<div className="space-y-1.5 mt-3"> {/* 其他信息 */}
{/* 第一行:编辑和重置 */} <div className="space-y-1.5 pt-2 border-t border-divider">
<div className="flex gap-1.5"> <div className="flex justify-between text-sm">
<Button <span className="text-default-600">转发数量</span>
className="flex-1 min-h-8" <span className="font-medium text-xs">{user.num}</span>
color="primary" </div>
size="sm" <div className="flex justify-between text-sm">
startContent={<EditIcon className="w-3 h-3" />} <span className="text-default-600">重置日期</span>
variant="flat" <span className="text-xs">
onPress={() => handleEdit(user)} {user.flowResetTime === 0
> ? "不重置"
编辑 : `每月${user.flowResetTime}号`}
</Button> </span>
<Button </div>
className="flex-1 min-h-8" {user.expTime && (
color="warning" <div className="flex justify-between text-sm">
size="sm" <span className="text-default-600">过期时间</span>
startContent={ <div className="text-right">
<svg {expStatus && expStatus.color === "success" ? (
aria-hidden="true" <div className="text-xs">
className="w-3 h-3" {formatDate(user.expTime)}
fill="currentColor" </div>
viewBox="0 0 20 20" ) : (
> <Chip
<path className="text-xs"
clipRule="evenodd" color={expStatus?.color || "default"}
d="M4 2a1 1 0 011 1v2.101a7.002 7.002 0 0111.601 2.566 1 1 0 11-1.885.666A5.002 5.002 0 005.999 7H9a1 1 0 010 2H4a1 1 0 01-1-1V3a1 1 0 011-1zm.008 9.057a1 1 0 011.276.61A5.002 5.002 0 0014.001 13H11a1 1 0 110-2h5a1 1 0 011 1v5a1 1 0 11-2 0v-2.101a7.002 7.002 0 01-11.601-2.566 1 1 0 01.61-1.276z" size="sm"
fillRule="evenodd" variant="flat"
/> >
</svg> {expStatus?.text || "未知状态"}
} </Chip>
variant="flat" )}
onPress={() => handleResetFlow(user)} </div>
> </div>
重置 )}
</Button> </div>
</div> </div>
{/* 第二行:权限和删除 */} <div className="space-y-1.5 mt-3">
<div className="flex gap-1.5"> {/* 第一行:编辑和重置 */}
<Button <div className="flex gap-1.5">
className="flex-1 min-h-8" <Button
color="success" className="flex-1 min-h-8"
size="sm" color="primary"
startContent={<SettingsIcon className="w-3 h-3" />} size="sm"
variant="flat" startContent={<EditIcon className="w-3 h-3" />}
onPress={() => handleManageTunnels(user)} variant="flat"
> onPress={() => handleEdit(user)}
权限 >
</Button> 编辑
<Button </Button>
className="flex-1 min-h-8" <Button
color="danger" className="flex-1 min-h-8"
size="sm" color="warning"
startContent={<DeleteIcon className="w-3 h-3" />} size="sm"
variant="flat" startContent={
onPress={() => handleDelete(user)} <svg
> aria-hidden="true"
删除 className="w-3 h-3"
</Button> fill="currentColor"
viewBox="0 0 20 20"
>
<path
clipRule="evenodd"
d="M4 2a1 1 0 011 1v2.101a7.002 7.002 0 0111.601 2.566 1 1 0 11-1.885.666A5.002 5.002 0 005.999 7H9a1 1 0 010 2H4a1 1 0 01-1-1V3a1 1 0 011-1zm.008 9.057a1 1 0 011.276.61A5.002 5.002 0 0014.001 13H11a1 1 0 110-2h5a1 1 0 011 1v5a1 1 0 11-2 0v-2.101a7.002 7.002 0 01-11.601-2.566 1 1 0 01.61-1.276z"
fillRule="evenodd"
/>
</svg>
}
variant="flat"
onPress={() => handleResetFlow(user)}
>
重置
</Button>
</div>
{/* 第二行:权限和删除 */}
<div className="flex gap-1.5">
<Button
className="flex-1 min-h-8"
color="success"
size="sm"
startContent={<SettingsIcon className="w-3 h-3" />}
variant="flat"
onPress={() => handleManageTunnels(user)}
>
权限
</Button>
<Button
className="flex-1 min-h-8"
color="danger"
size="sm"
startContent={<DeleteIcon className="w-3 h-3" />}
variant="flat"
onPress={() => handleDelete(user)}
>
删除
</Button>
</div>
</div> </div>
</div> </CardBody>
</CardBody> </Card>
</Card> </StaggerItem>
); );
})} })}
</div> </StaggerList>
)} )}
{/* 用户表单模态框 */} {/* 用户表单模态框 */}
<Modal < Modal
backdrop="blur" backdrop="blur"
isOpen={isUserModalOpen} isOpen={isUserModalOpen}
placement="center" placement="center"
@@ -943,13 +967,12 @@ export default function UserPage() {
<DatePicker <DatePicker
isRequired isRequired
showMonthAndYearPickers showMonthAndYearPickers
className="cursor-pointer"
label="过期时间" label="过期时间"
value={ value={
userForm.expTime userForm.expTime
? (parseDate( ? (parseDate(
userForm.expTime.toISOString().split("T")[0], userForm.expTime.toISOString().split("T")[0],
) as any) ) as any)
: null : null
} }
onChange={(date) => { onChange={(date) => {
@@ -1055,12 +1078,11 @@ export default function UserPage() {
aria-disabled={isAssigned} aria-disabled={isAssigned}
className={` className={`
px-4 py-3 rounded-lg border transition-all duration-200 cursor-pointer px-4 py-3 rounded-lg border transition-all duration-200 cursor-pointer
${ ${isAssigned
isAssigned ? "bg-default-100/50 dark:bg-default-50/50 border-default-200/50 dark:border-default-100/20 opacity-60 cursor-not-allowed"
? "bg-default-100/50 dark:bg-default-50/50 border-default-200/50 dark:border-default-100/20 opacity-60 cursor-not-allowed" : isSelected
: isSelected ? "bg-primary-50 dark:bg-primary-900/20 border-primary-300 dark:border-primary-500/50 shadow-sm"
? "bg-primary-50 dark:bg-primary-900/20 border-primary-300 dark:border-primary-500/50 shadow-sm" : "bg-white dark:bg-default-50 border-default-200 dark:border-default-100/30 hover:border-primary-200 dark:hover:border-primary-500/30 hover:shadow-sm"
: "bg-white dark:bg-default-50 border-default-200 dark:border-default-100/30 hover:border-primary-200 dark:hover:border-primary-500/30 hover:shadow-sm"
} }
`} `}
role="button" role="button"
@@ -1120,13 +1142,13 @@ export default function UserPage() {
selectedKeys={ selectedKeys={
batchTunnelSelections.get(tunnel.id) !== batchTunnelSelections.get(tunnel.id) !==
null && null &&
batchTunnelSelections.get(tunnel.id) !== batchTunnelSelections.get(tunnel.id) !==
undefined undefined
? [ ? [
batchTunnelSelections batchTunnelSelections
.get(tunnel.id)! .get(tunnel.id)!
.toString(), .toString(),
] ]
: ["null"] : ["null"]
} }
size="sm" size="sm"
@@ -1167,17 +1189,22 @@ export default function UserPage() {
)} )}
</div> </div>
<Button <div className="flex flex-wrap items-center gap-2">
className="w-full sm:w-auto" <Button
color="primary" className="w-full sm:w-auto"
isDisabled={batchTunnelSelections.size === 0} color="primary"
isLoading={assignLoading} isDisabled={batchTunnelSelections.size === 0}
onPress={handleBatchAssignTunnel} isLoading={assignLoading}
> onPress={handleBatchAssignTunnel}
分配权限{" "} >
{batchTunnelSelections.size > 0 && 分配权限
`(${batchTunnelSelections.size}个隧道)`} </Button>
</Button> {batchTunnelSelections.size > 0 && (
<Chip color="primary" size="sm" variant="flat">
已选 {batchTunnelSelections.size} 个隧道
</Chip>
)}
</div>
</div> </div>
</div> </div>
@@ -1381,9 +1408,9 @@ export default function UserPage() {
setEditTunnelForm((prev) => setEditTunnelForm((prev) =>
prev prev
? { ? {
...prev, ...prev,
speedId: value === "null" ? null : Number(value), speedId: value === "null" ? null : Number(value),
} }
: null, : null,
); );
}} }}
@@ -1434,15 +1461,14 @@ export default function UserPage() {
<DatePicker <DatePicker
isRequired isRequired
showMonthAndYearPickers showMonthAndYearPickers
className="cursor-pointer"
label="到期时间" label="到期时间"
value={ value={
editTunnelForm.expTime editTunnelForm.expTime
? (parseDate( ? (parseDate(
new Date(editTunnelForm.expTime) new Date(editTunnelForm.expTime)
.toISOString() .toISOString()
.split("T")[0], .split("T")[0],
) as any) ) as any)
: null : null
} }
onChange={(date) => { onChange={(date) => {
@@ -1764,6 +1790,6 @@ export default function UserPage() {
</ModalFooter> </ModalFooter>
</ModalContent> </ModalContent>
</Modal> </Modal>
</div> </AnimatedPage>
); );
} }
@@ -11,6 +11,50 @@ interface CalendarDateLike {
year: number; year: number;
} }
function isValidCalendarDate(year: number, month: number, day: number) {
if (
!Number.isInteger(year) ||
!Number.isInteger(month) ||
!Number.isInteger(day)
) {
return false;
}
if (month < 1 || month > 12 || day < 1 || day > 31) {
return false;
}
const candidate = new Date(year, month - 1, day);
return (
candidate.getFullYear() === year &&
candidate.getMonth() === month - 1 &&
candidate.getDate() === day
);
}
function parseDateText(value: string) {
const trimmed = value.trim();
if (!trimmed) {
return null;
}
const matched = trimmed.match(/^(\d{4})[-/.](\d{1,2})[-/.](\d{1,2})$/);
if (!matched) {
return null;
}
const year = Number(matched[1]);
const month = Number(matched[2]);
const day = Number(matched[3]);
if (!isValidCalendarDate(year, month, day)) {
return null;
}
return { day, month, year };
}
export interface DatePickerProps extends FieldMetaProps { export interface DatePickerProps extends FieldMetaProps {
className?: string; className?: string;
isDisabled?: boolean; isDisabled?: boolean;
@@ -39,9 +83,80 @@ export function DatePicker({
isRequired, isRequired,
label, label,
onChange, onChange,
showMonthAndYearPickers,
value, value,
}: DatePickerProps) { }: DatePickerProps) {
const id = React.useId(); const id = React.useId();
const formattedValue = React.useMemo(() => formatDateValue(value), [value]);
const [textValue, setTextValue] = React.useState(formattedValue);
React.useEffect(() => {
setTextValue(formattedValue);
}, [formattedValue]);
const shouldUseTextInput = Boolean(showMonthAndYearPickers);
const notifyNativeDateChange = (rawValue: string) => {
if (!onChange) {
return;
}
if (!rawValue) {
onChange(null);
return;
}
const [yearText, monthText, dayText] = rawValue.split("-");
const year = Number(yearText);
const month = Number(monthText);
const day = Number(dayText);
if (!isValidCalendarDate(year, month, day)) {
onChange(null);
return;
}
onChange({ day, month, year });
};
const notifyTextDateChange = (rawValue: string) => {
if (!onChange) {
return;
}
if (!rawValue.trim()) {
onChange(null);
return;
}
const parsed = parseDateText(rawValue);
if (parsed) {
onChange(parsed);
}
};
const commitTextInput = () => {
const parsed = parseDateText(textValue);
if (parsed) {
setTextValue(formatDateValue(parsed));
onChange?.(parsed);
return;
}
if (!textValue.trim()) {
onChange?.(null);
return;
}
setTextValue(formattedValue);
};
return ( return (
<FieldContainer <FieldContainer
@@ -57,37 +172,34 @@ export function DatePicker({
className={cn(className)} className={cn(className)}
disabled={isDisabled} disabled={isDisabled}
id={id} id={id}
inputMode={shouldUseTextInput ? "numeric" : undefined}
placeholder={shouldUseTextInput ? "YYYY-MM-DD" : undefined}
required={isRequired} required={isRequired}
type="date" type={shouldUseTextInput ? "text" : "date"}
value={formatDateValue(value)} value={shouldUseTextInput ? textValue : formattedValue}
onChange={(event) => { onChange={(event) => {
if (!onChange) { const nextValue = event.target.value;
return;
}
if (!event.target.value) { if (shouldUseTextInput) {
onChange(null); setTextValue(nextValue);
notifyTextDateChange(nextValue);
return; return;
} }
const [yearText, monthText, dayText] = event.target.value.split("-"); notifyNativeDateChange(nextValue);
const year = Number(yearText);
const month = Number(monthText);
const day = Number(dayText);
if (
!Number.isFinite(year) ||
!Number.isFinite(month) ||
!Number.isFinite(day)
) {
onChange(null);
return;
}
onChange({ day, month, year });
}} }}
onBlur={shouldUseTextInput ? commitTextInput : undefined}
onKeyDown={
shouldUseTextInput
? (event) => {
if (event.key === "Enter") {
event.preventDefault();
commitTextInput();
}
}
: undefined
}
/> />
</FieldContainer> </FieldContainer>
); );
@@ -37,6 +37,7 @@ export interface SelectProps<T = unknown> extends FieldMetaProps {
selectionMode?: SelectionMode; selectionMode?: SelectionMode;
size?: "sm" | "md" | "lg"; size?: "sm" | "md" | "lg";
variant?: string; variant?: string;
dropdownPlacement?: "bottom" | "top";
} }
export interface SelectItemProps { export interface SelectItemProps {
@@ -163,6 +164,7 @@ export function Select<T>({
selectedKeys, selectedKeys,
selectionMode = "single", selectionMode = "single",
size, size,
dropdownPlacement = "bottom",
}: SelectProps<T>) { }: SelectProps<T>) {
const generatedId = React.useId(); const generatedId = React.useId();
const options = React.useMemo( const options = React.useMemo(
@@ -284,9 +286,16 @@ export function Select<T>({
return null; return null;
} }
const placementClasses = dropdownPlacement === "top"
? "bottom-full mb-1"
: "top-full mt-1";
return ( return (
<div <div
className="absolute left-0 top-full z-50 mt-1 max-h-56 w-full space-y-1 overflow-y-auto rounded-md border border-divider bg-background p-2 shadow-md" className={cn(
"absolute left-0 z-50 w-full space-y-1 overflow-y-auto rounded-md border border-divider bg-background p-2 shadow-md max-h-56",
placementClasses
)}
id={`${generatedId}-listbox`} id={`${generatedId}-listbox`}
ref={listboxRef} ref={listboxRef}
role="listbox" role="listbox"
@@ -4,11 +4,15 @@ import { cn } from "@/lib/utils";
interface TableClassNames { interface TableClassNames {
th?: string; th?: string;
td?: string;
tr?: string;
wrapper?: string; wrapper?: string;
} }
interface TableStyleContextValue { interface TableStyleContextValue {
thClassName?: string; thClassName?: string;
tdClassName?: string;
trClassName?: string;
} }
const TableStyleContext = React.createContext<TableStyleContextValue>({}); const TableStyleContext = React.createContext<TableStyleContextValue>({});
@@ -24,7 +28,13 @@ export function Table({
...props ...props
}: TableProps) { }: TableProps) {
return ( return (
<TableStyleContext.Provider value={{ thClassName: classNames?.th }}> <TableStyleContext.Provider
value={{
thClassName: classNames?.th,
tdClassName: classNames?.td,
trClassName: classNames?.tr,
}}
>
<div <div
className={cn("w-full overflow-auto rounded-md", classNames?.wrapper)} className={cn("w-full overflow-auto rounded-md", classNames?.wrapper)}
> >
@@ -62,18 +72,24 @@ interface TableBodyProps<T>
loadingContent?: React.ReactNode; loadingContent?: React.ReactNode;
} }
export function TableBody<T>({ export const TableBody = React.forwardRef<
children, HTMLTableSectionElement,
className, TableBodyProps<any>
emptyContent, >(function TableBody<T>(
isLoading, {
items, children,
loadingContent, className,
...props emptyContent,
}: TableBodyProps<T>) { isLoading,
items,
loadingContent,
...props
}: TableBodyProps<T>,
ref: React.Ref<HTMLTableSectionElement>,
) {
if (isLoading) { if (isLoading) {
return ( return (
<tbody className={className} {...props}> <tbody ref={ref} className={className} {...props}>
<tr> <tr>
<td className="p-4 text-center text-default-500" colSpan={999}> <td className="p-4 text-center text-default-500" colSpan={999}>
{loadingContent ?? "加载中..."} {loadingContent ?? "加载中..."}
@@ -86,7 +102,7 @@ export function TableBody<T>({
if (items && typeof children === "function") { if (items && typeof children === "function") {
if (items.length === 0) { if (items.length === 0) {
return ( return (
<tbody className={className} {...props}> <tbody ref={ref} className={className} {...props}>
<tr> <tr>
<td className="p-4 text-center text-default-500" colSpan={999}> <td className="p-4 text-center text-default-500" colSpan={999}>
{emptyContent ?? "暂无数据"} {emptyContent ?? "暂无数据"}
@@ -97,7 +113,7 @@ export function TableBody<T>({
} }
return ( return (
<tbody className={className} {...props}> <tbody ref={ref} className={className} {...props}>
{items.map((item) => { {items.map((item) => {
const key = const key =
typeof item === "object" && item !== null && "id" in item typeof item === "object" && item !== null && "id" in item
@@ -115,7 +131,7 @@ export function TableBody<T>({
if (staticChildren.length === 0) { if (staticChildren.length === 0) {
return ( return (
<tbody className={className} {...props}> <tbody ref={ref} className={className} {...props}>
<tr> <tr>
<td className="p-4 text-center text-default-500" colSpan={999}> <td className="p-4 text-center text-default-500" colSpan={999}>
{emptyContent ?? "暂无数据"} {emptyContent ?? "暂无数据"}
@@ -126,11 +142,11 @@ export function TableBody<T>({
} }
return ( return (
<tbody className={className} {...props}> <tbody ref={ref} className={className} {...props}>
{typeof children === "function" ? null : children} {typeof children === "function" ? null : children}
</tbody> </tbody>
); );
} });
export function TableColumn({ export function TableColumn({
className, className,
@@ -150,12 +166,29 @@ export function TableColumn({
); );
} }
export function TableRow({ className, ...props }: React.ComponentProps<"tr">) { export const TableRow = React.forwardRef<
HTMLTableRowElement,
React.ComponentProps<"tr">
>(({ className, ...props }, ref) => {
const { trClassName } = React.useContext(TableStyleContext);
return ( return (
<tr className={cn("border-b last:border-b-0", className)} {...props} /> <tr
ref={ref}
className={cn("border-b last:border-b-0", trClassName, className)}
{...props}
/>
); );
} });
TableRow.displayName = "TableRow";
export function TableCell({ className, ...props }: React.ComponentProps<"td">) { export function TableCell({ className, ...props }: React.ComponentProps<"td">) {
return <td className={cn("px-3 py-2 align-middle", className)} {...props} />; const { tdClassName } = React.useContext(TableStyleContext);
return (
<td
className={cn("px-3 py-2 align-middle", tdClassName, className)}
{...props}
/>
);
} }
+10 -2
View File
@@ -2,6 +2,14 @@
@import "tw-animate-css"; @import "tw-animate-css";
@import "./tailwind-theme.pcss"; @import "./tailwind-theme.pcss";
/* GPU acceleration helper - prevents font blurriness during transforms */
.gpu-accelerated {
will-change: transform;
backface-visibility: hidden;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
:root { :root {
--safe-area-top: env(safe-area-inset-top, 0px); --safe-area-top: env(safe-area-inset-top, 0px);
--safe-area-bottom: env(safe-area-inset-bottom, 0px); --safe-area-bottom: env(safe-area-inset-bottom, 0px);
@@ -181,12 +189,12 @@ body {
@keyframes captchaModalIn { @keyframes captchaModalIn {
from { from {
opacity: 0; opacity: 0;
transform: scale(0.9) translateY(-20px); transform: translateY(-20px);
} }
to { to {
opacity: 1; opacity: 1;
transform: scale(1) translateY(0); transform: translateY(0);
} }
} }