fix(app-iced, presenter): M114 r2 —— 登录失败走结构化错误码 + i18n,修 4 条 p2 与 3 条看图意见
p1(语言泄漏):后端诊断串不再上屏
- presenter 新增 LoginFailure 原因码(denied / whitelist_pending / unreachable /
not_authlib_server / bad_credentials / no_profile / store_failed / other)
- 页面按码查 i18n 出标题+正文+「Code: …」,原文只进日志/详细信息
- 进行中(Requesting)也走 i18n,不再复读后端中文状态串
- presenter/state 不再发中文 toast(成败由页面按 i18n 画)
- 新增守门测试:注入带 AADSTS 的失败事件,断言英文视图无 CJK 且含 code
p2-1 复制:on_account 返回 Task,page_messages 把 iced::clipboard::write 交回 runtime
p2-2 可见失败态:新增 AccountNotice(added/removed/switched/名字非法/重名/落盘失败/
找不到),页面用 M3 内联 alert 画(不是 toast);离线名字先按 3–16 位规则校验,
失败不再清空输入
p2-3 重新登录按账户类型分派:微软→授权码流;第三方→预填服务器/登录名并提示补密码;
离线→明确说明没有可重登的服务器账户
p2-4 入口收敛:删 chip 行;空态=三卡片;有账号时三卡收进 Add an account(按钮不再绑死微软轨)
看图意见/tower 三条:
- 失败横幅改成 M3 alert(SurfaceContainerHigh + 描边,errorContainer 只作图标块,
不再通栏实心红);色值本身经复审像素采样确认是 90/30 档,未改角色
- 当前账户卡补齐与列表一致的「服务器/登录名」行;无皮肤时明说 No skin available
- 页面级 scrollable 加 8px 右 gutter,滚动条不再压卡片
- 倒计时改 mm:ss(15:00 left),数字与冒号语言无关
p3(顺带):AuthlibRequest / Form 手写 Debug 脱敏密码;HTTP 响应体与 base64 输出加上限;
离线提示文案与行为对齐;删除无人使用的 key;皮肤测试断言帽子层真的 blend
测试:app-iced lib 418 绿、presenter 151 / i18n 24 绿(workspace 全量另跑)
This commit is contained in:
1 parent
1ff00bbe50
commit
8d8552113a
31 files changed
+1540
-497
No files matched your search
@@ -38,10 +38,10 @@ pub mod widgets;
|
||||
#[cfg(test)]
|
||||
mod tests;
|
||||
|
||||
pub use model::{Form, Page, Panel, Track};
|
||||
pub use model::{Form, Hint, Notice, Page, Panel, Track};
|
||||
|
||||
use iced::widget::{column, scrollable};
|
||||
use iced::{Element, Length};
|
||||
use iced::widget::{column, container, scrollable};
|
||||
use iced::{Element, Length, Padding};
|
||||
|
||||
use unlucky_design::spacing::Space;
|
||||
use unlucky_i18n::{Key, Lang};
|
||||
@@ -84,8 +84,12 @@ pub enum Message {
|
||||
Switch(String),
|
||||
/// 删除账户
|
||||
Remove(String),
|
||||
/// 重新登录(微软轨 → 授权码流)
|
||||
Relogin,
|
||||
/// 重新登录(按账户类型分派:微软 → 授权码流;第三方 → 预填表单;离线 → 明确说明)
|
||||
Relogin(String),
|
||||
/// 展开/收起「Add an account」的三张轨道卡(复审 r1 P2-4)
|
||||
ToggleAdd,
|
||||
/// 关掉横幅
|
||||
DismissNotice,
|
||||
}
|
||||
|
||||
impl Message {
|
||||
@@ -109,7 +113,7 @@ pub fn view<'a>(
|
||||
.subtitle(subtitle)
|
||||
.action(buttons::tonal(
|
||||
ui,
|
||||
Button::new(add, Message::Open(Track::Microsoft).into_page()),
|
||||
Button::new(add, Message::ToggleAdd.into_page()),
|
||||
));
|
||||
|
||||
let top = if page.rows.is_empty() {
|
||||
@@ -131,17 +135,36 @@ pub fn view<'a>(
|
||||
};
|
||||
|
||||
let mut content = column![].spacing(ui.space(Space::X6)).width(Length::Fill);
|
||||
if let Some(notice) = &page.notice {
|
||||
content = content.push(widgets::banner(ui, notice, text));
|
||||
}
|
||||
if let Some(hint) = page.hint {
|
||||
content = content.push(widgets::hint(ui, hint, page, text));
|
||||
}
|
||||
// 三张轨道卡:空态**总是**画(那就是空态的入口);有账号时收在「Add an account」后面
|
||||
let show_tracks = page.panel == Panel::None && (page.rows.is_empty() || page.form.section_open);
|
||||
content = if page.panel == Panel::None {
|
||||
content.push(top).push(flows)
|
||||
if show_tracks {
|
||||
content.push(top).push(flows)
|
||||
} else {
|
||||
content.push(top)
|
||||
}
|
||||
} else {
|
||||
content.push(flows).push(top)
|
||||
};
|
||||
|
||||
// 右缘留 8px gutter:全局 `frame::scroll_style` 的滚动条是 6px + 2px 内缩,
|
||||
// 满宽卡片会被它压住(tower 看图意见 ②)。页面级留白是这条的最小修法。
|
||||
let padded = container(content).width(Length::Fill).padding(Padding {
|
||||
right: ui.space(Space::X2),
|
||||
..Padding::default()
|
||||
});
|
||||
|
||||
frame::page(
|
||||
ui,
|
||||
metrics,
|
||||
header,
|
||||
scrollable(content)
|
||||
scrollable(padded)
|
||||
.style(frame::scroll_style(ui))
|
||||
.width(Length::Fill)
|
||||
.height(Length::Fill),
|
||||
|
||||
Reference in new issue
Block a user