mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-10-10 07:55:00 +03:00
fix(clients): balance renewal form layout and mode guidance (#6672)
* fix(clients): balance renewal form layout and mode guidance Move renewal out of the traffic-reset half-column so its help and preview no longer leave a tall empty area beside the reset selector. Keep the mode, active schedule field and renewal limit in equal desktop columns, stack them on small screens, and preserve the bulk form's stacked layout. Keep monthly traffic-reset controls together in their own row and allow the first-cutoff button to wrap without shrinking its click target. Show fixed-duration guidance only for interval renewal and the month-end boundary note only for monthly renewal. Synchronize all thirteen locales and the client docs, remove obsolete zero-value mode-switching tooltips, and cover the help transitions through the real client form. Keep preview markup and existing monthly copy intact so the independent date-display work in #6662 can merge without overlapping these edits. This is presentation-only: saved values, expiry selection, renewal and traffic-reset calculations, APIs and database formats are unchanged. * refactor(clients): drop the renewal CSS that #6662 made redundant #6662 landed the full-width preview Space and the wrapping first-cutoff Button as inline styles, so ClientRenewalFields.css and its wrapper div styled the same two elements a second time; both are removed. * test(tuic): wait for downstream association activity refresh The UDP lifecycle regression can receive its QUIC response before the server's sending goroutine updates the association timestamp. Reading the protected field once then mistakes a valid scheduling order for a missing refresh, intermittently failing the race-enabled CI job. Wait for lastActive to advance under the registry mutex, bounded by a one-second deadline, before checking idle reaping. Retain the payload, association ID, idle-survival and shutdown assertions so a missing activity update still fails the test. This only changes test synchronization. Production relay behavior, renewal logic, network timeouts and CI configuration remain unchanged. --------- Co-authored-by: JacktheRanger <219502738+JacktheRanger@users.noreply.github.com> Co-authored-by: MHSanaei <ho3ein.sanaei@gmail.com>
This commit is contained in:
@@ -46,6 +46,12 @@ inbounds** at once, with per-client traffic accounting.
|
||||
|
||||
The individual and bulk-create forms offer one renewal mode at a time:
|
||||
|
||||
In the individual form, the mode, its day/weekday setting, and the renewal limit
|
||||
share a row on desktop and stack on mobile. Help and the read-only preview use
|
||||
the full width below them. The bulk-create form keeps its stacked fields. Help
|
||||
follows the selected mode; the day-1/month-end note appears only for monthly
|
||||
renewal. Independent traffic-reset settings remain separate.
|
||||
|
||||
| Mode | API fields | Schedule |
|
||||
| --- | --- | --- |
|
||||
| Disabled | `reset=0`, `resetDay=0`, `resetWeekday=0` | The expiry is not renewed. |
|
||||
|
||||
@@ -43,6 +43,11 @@ icon: Users
|
||||
|
||||
单个客户端和批量创建表单使用统一的续期模式选择:
|
||||
|
||||
单个客户端表单在桌面端将模式、天数或星期参数及次数上限排在同一行,
|
||||
手机端则纵向排列;说明与只读预览在下方占满宽度。批量创建表单保留
|
||||
纵向字段布局。说明随模式切换,仅每月续期显示 1 日与月末的边界提示。
|
||||
独立流量重置仍单独设置。
|
||||
|
||||
| 模式 | API 字段 | 续期规则 |
|
||||
| --- | --- | --- |
|
||||
| 关闭 | `reset=0`、`resetDay=0`、`resetWeekday=0` | 不自动延长到期时间。 |
|
||||
|
||||
Reference in New Issue
Block a user