feat(web): C4 conditional nav with when and media columns
Filter nav/sidebar/footer by auth/guest/hide and emit responsive media CSS; stamp _logged_in from session on listen. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
7670673a39
commit
027b19c5db
9 files changed
+523
-77
No files matched your search
@@ -12,6 +12,7 @@
|
||||
- **`ext/web` C1**:门禁段边界匹配(不再误伤 `/admin-publish`);`gate` 支持 `match` / `on_deny` / `exclude`;`auth` 默认 `on_deny=redirect` + `login_path`;金样 `web-c1-gates`。
|
||||
- **`ext/web` C2**:`shell_css=full|minimal|off`;`layout=sidebar|stacked|bare|rail`;full 壳含小屏单列 media;金样 `web-c2-shell-layout`。
|
||||
- **`ext/web` C3**:样式装配对数字/布尔值单元格告警,`strict`/`strict_css_cells` 硬错误;`page.css` 作 raw CSS;head 表支持 `defer`/`async`/`version`,`asset_version` 统一 `?v=`;金样 `web-c3-style-head`。
|
||||
- **`ext/web` C4**:导航表 `当`/`when`(`auth`/`guest`/`hide`)与 `媒体`/`media`(响应式显隐);listen 注入 `_logged_in`;金样 `web-c4-nav-when`。
|
||||
|
||||
### Changed
|
||||
- `build_step_context`:call site 提前到 task 之后;开场白强调 code-as-documentation。
|
||||
|
||||
@@ -64,4 +64,22 @@
|
||||
|
||||
## 6. 过渡期 → 已落地
|
||||
|
||||
**C2 已落地(2026-09):** `layout=sidebar|stacked|bare|rail`;有 side 时 `stacked`/`bare` 不再强制 `has-sidebar`。金样同上。
|
||||
**C2 已落地(2026-09):** `layout=sidebar|stacked|bare|rail`;有 side 时 `stacked`/`bare` 不再强制 `has-sidebar`。金样 `web-c2-shell-layout`。
|
||||
|
||||
**C4 已落地(2026-09):** 导航 / 侧栏 / 页脚绑定表可选列:
|
||||
|
||||
| 列 | 说明 |
|
||||
|----|------|
|
||||
| `媒体` / `media` | CSS media;不匹配时 `display:none`(生成 `nav-mq-*` + `@media not …`) |
|
||||
| `当` / `when` | `hide` 省略;`auth` / `guest` 按登录态过滤;空 = 总是显示 |
|
||||
|
||||
```markdown
|
||||
| 属性 | 值 | 样式 | 媒体 | 当 |
|
||||
|------|-----|------|------|-----|
|
||||
| Home | / | | | |
|
||||
| Menu | /m | | (max-width: 720px) | |
|
||||
| Admin | /admin | | | auth |
|
||||
| Login | /login | | | guest |
|
||||
```
|
||||
|
||||
Listen 渲染时写入 `_logged_in` / `_nav_user`(来自 session)。离线 `page.render` 可自行 `table.put` `_logged_in`。金样 `web-c4-nav-when`。
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
| | |
|
||||
|---|---|
|
||||
| 状态 | **C0–C3 done · C4 planned** |
|
||||
| 状态 | **C0–C4 done** |
|
||||
| 日期 | 2026-09-04 |
|
||||
| 问题盘点 | [../../research/ext-web-customization-limits.md](../../research/ext-web-customization-limits.md) |
|
||||
| 相关 | [../ext-web.md](../ext-web.md) · [../ext-web-net.md](../ext-web-net.md) · [../../roadmap/ext-web.md](../../roadmap/ext-web.md) |
|
||||
@@ -36,7 +36,7 @@
|
||||
| **C1** | gate:统一未登录策略;精确/前缀匹配;登录页自动放行;默认 gate 不再误伤 `/admin-*` | C0 |
|
||||
| **C2** | `shell_css=off\|minimal\|full`;主题在壳前或隔离层;可选 `layout=bare` | — |
|
||||
| **C3** | 样式:校验警告 / `strict`;`page.css` raw;脚本 `defer`/`async`/`version` + `asset_version` | **done** |
|
||||
| **C4** | 壳:`layout` 预设(sidebar / stacked / bare);条件导航钩子(后续) | C2 |
|
||||
| **C4** | 壳:`layout` 预设(C2);条件导航 `when` / `media` | **done** |
|
||||
|
||||
路线图入口可在 [ext-web.md](../../roadmap/ext-web.md) 增补「定制波次 C0–C4」行,落地后再改状态。
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
| **C1** | gate 匹配与未登录策略一致;段边界默认 admin gate | **done** |
|
||||
| **C2** | `shell_css` + `layout` 松绑 | **done** |
|
||||
| **C3** | 样式 strict / 脚本 defer·version | **done** |
|
||||
| **C4** | 壳预设收口与条件导航(后续) | **planned** |
|
||||
| **C4** | 条件导航 when/media(layout 见 C2) | **done** |
|
||||
|
||||
验收金样:`tests/ext/web-smoke.mq.md`、`tests/ext/web-security-smoke.mq.md`、`tests/ext/web-drivers-smoke.mq.md`、`tests/ext/web-upload-smoke.mq.md`、`tests/ext/web-db-w6-smoke.mq.md`、`tests/ext/web-w7-finish-smoke.mq.md`、`tests/ext/web-p3-smoke.mq.md`、`ext_cli_add_web`。
|
||||
|
||||
|
||||
@@ -218,6 +218,8 @@ Default `?v=` bump for head scripts/styles that omit a per-row `version` column.
|
||||
+ `components`
|
||||
|
||||
Assemble nav / sidebar / footer from a page table (`|组件|样式|` or `|src|style|`).
|
||||
Nav bind tables may include optional `媒体`/`media` (responsive show) and `当`/`when`
|
||||
(`auth` / `guest` / `hide`) columns — see C4 conditional nav.
|
||||
|
||||
**> web_compose_components page=`self` components=`components`**
|
||||
|
||||
|
||||
@@ -32,6 +32,24 @@ fn with_site_head(base: &Value, site_head: &[crate::assets::HeadLink]) -> Value
|
||||
page
|
||||
}
|
||||
|
||||
/// Stamp session login state so nav `when=auth|guest` can filter at render time.
|
||||
fn with_nav_auth(base: &Value, cookie: Option<&str>) -> Value {
|
||||
let mut page = base.clone();
|
||||
let Some(obj) = page.as_object_mut() else {
|
||||
return page;
|
||||
};
|
||||
let user = session::session_id_from_cookie(cookie)
|
||||
.and_then(|sid| session::session_get(&sid, "username"));
|
||||
let logged_in = user.is_some();
|
||||
obj.insert("_logged_in".into(), json!(logged_in));
|
||||
if let Some(u) = user {
|
||||
obj.insert("_nav_user".into(), u);
|
||||
} else {
|
||||
obj.remove("_nav_user");
|
||||
}
|
||||
page
|
||||
}
|
||||
|
||||
fn serve_icon_file(path: PathBuf, content_type: String) -> Response {
|
||||
match std::fs::read(&path) {
|
||||
Ok(bytes) => {
|
||||
@@ -365,6 +383,8 @@ pub fn listen(
|
||||
inject_params(&mut p, ¶ms);
|
||||
let p = with_site_head(&p, &st.site_head);
|
||||
let (_, csrf, set_cookie) = resolve_session(&headers);
|
||||
let cookie = cookie_from_headers(&headers);
|
||||
let p = with_nav_auth(&p, cookie);
|
||||
let mut resp = Html(render::render_page(&p, st.db_url.as_deref(), Some(&csrf))).into_response();
|
||||
append_set_cookie(&mut resp, set_cookie);
|
||||
resp
|
||||
@@ -388,6 +408,7 @@ pub fn listen(
|
||||
get(async move |State(st): State<Arc<AppState>>, headers: axum::http::HeaderMap| {
|
||||
let (_, csrf, set_cookie) = resolve_session(&headers);
|
||||
let p = with_site_head(&page_for_render, &st.site_head);
|
||||
let p = with_nav_auth(&p, cookie_from_headers(&headers));
|
||||
let mut resp = Html(render::render_page(&p, st.db_url.as_deref(), Some(&csrf)))
|
||||
.into_response();
|
||||
append_set_cookie(&mut resp, set_cookie);
|
||||
@@ -668,6 +689,7 @@ fn rss_feed(st: &AppState, _path: &str, cfg: &Value) -> Response {
|
||||
async fn home(State(st): State<Arc<AppState>>, headers: axum::http::HeaderMap) -> Response {
|
||||
let (_, csrf, set_cookie) = resolve_session(&headers);
|
||||
let page = with_site_head(&st.page, &st.site_head);
|
||||
let page = with_nav_auth(&page, cookie_from_headers(&headers));
|
||||
let html = render::render_page(&page, st.db_url.as_deref(), Some(&csrf));
|
||||
let mut resp = Html(html).into_response();
|
||||
append_set_cookie(&mut resp, set_cookie);
|
||||
|
||||
+320
-70
@@ -4,7 +4,10 @@ use serde_json::{json, Map, Value};
|
||||
|
||||
use crate::db;
|
||||
use crate::markdown;
|
||||
use crate::table::{as_bind, normalize_ref, normalize_slot, parse_site_path, project_rows, SitePath};
|
||||
use crate::table::{
|
||||
as_bind, as_nav_rows, nav_label_href, nav_media_when_class, normalize_ref, normalize_slot,
|
||||
parse_site_path, project_rows, SitePath,
|
||||
};
|
||||
|
||||
fn esc(s: &str) -> String {
|
||||
s.replace('&', "&")
|
||||
@@ -58,71 +61,244 @@ fn is_db_bind_back(back: &str) -> bool {
|
||||
}
|
||||
}
|
||||
|
||||
fn resolve_links(raw: Option<&Value>, db_url: Option<&str>) -> Vec<(String, String)> {
|
||||
#[derive(Clone, Debug)]
|
||||
struct NavLink {
|
||||
label: String,
|
||||
href: String,
|
||||
class: String,
|
||||
media: String,
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||
enum NavWhen {
|
||||
Always,
|
||||
Hide,
|
||||
Auth,
|
||||
Guest,
|
||||
}
|
||||
|
||||
fn parse_nav_when(raw: &str) -> NavWhen {
|
||||
let t = raw.trim();
|
||||
if t.is_empty()
|
||||
|| matches!(
|
||||
t,
|
||||
"*" | "always" | "Always" | "真" | "yes" | "on" | "show" | "all"
|
||||
)
|
||||
{
|
||||
return NavWhen::Always;
|
||||
}
|
||||
if matches!(
|
||||
t,
|
||||
"hide" | "never" | "off" | "no" | "假" | "否" | "0" | "false" | "False"
|
||||
) {
|
||||
return NavWhen::Hide;
|
||||
}
|
||||
if matches!(
|
||||
t,
|
||||
"auth" | "user" | "登录" | "已登录" | "logged_in" | "logged-in"
|
||||
) {
|
||||
return NavWhen::Auth;
|
||||
}
|
||||
if matches!(
|
||||
t,
|
||||
"guest" | "anon" | "anonymous" | "访客" | "匿名" | "未登录"
|
||||
) {
|
||||
return NavWhen::Guest;
|
||||
}
|
||||
// Unknown token: keep visible (forward-compatible).
|
||||
NavWhen::Always
|
||||
}
|
||||
|
||||
/// `Some(true)` logged in, `Some(false)` guest, `None` unknown (do not filter auth/guest).
|
||||
fn page_auth_state(page: Option<&Value>) -> Option<bool> {
|
||||
let page = page?;
|
||||
if let Some(v) = page
|
||||
.get("_nav_user")
|
||||
.or_else(|| page.get("user"))
|
||||
.or_else(|| page.get("username"))
|
||||
.or_else(|| page.get("_user"))
|
||||
{
|
||||
match v {
|
||||
Value::Null => Some(false),
|
||||
Value::Bool(b) => Some(*b),
|
||||
Value::String(s) => Some(!s.trim().is_empty()),
|
||||
Value::Number(n) => Some(n.as_i64().unwrap_or(0) != 0),
|
||||
_ => Some(true),
|
||||
}
|
||||
} else if let Some(v) = page.get("_logged_in").or_else(|| page.get("logged_in")) {
|
||||
match v {
|
||||
Value::Bool(b) => Some(*b),
|
||||
Value::String(s) => Some(matches!(
|
||||
s.trim(),
|
||||
"1" | "true" | "True" | "yes" | "on" | "真" | "是"
|
||||
)),
|
||||
Value::Number(n) => Some(n.as_i64().unwrap_or(0) != 0),
|
||||
_ => None,
|
||||
}
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
fn nav_when_visible(when: NavWhen, auth: Option<bool>) -> bool {
|
||||
match when {
|
||||
NavWhen::Always => true,
|
||||
NavWhen::Hide => false,
|
||||
NavWhen::Auth => auth.unwrap_or(true), // unknown → keep (compat)
|
||||
NavWhen::Guest => match auth {
|
||||
Some(logged_in) => !logged_in,
|
||||
None => true,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
fn resolve_links(raw: Option<&Value>, db_url: Option<&str>, page: Option<&Value>) -> Vec<NavLink> {
|
||||
let Some(raw) = raw else {
|
||||
return Vec::new();
|
||||
};
|
||||
let auth = page_auth_state(page);
|
||||
let binds = as_bind(raw);
|
||||
let arr = binds.as_array().cloned().unwrap_or_default();
|
||||
if arr.is_empty() {
|
||||
return Vec::new();
|
||||
}
|
||||
let has_db = arr
|
||||
.iter()
|
||||
.any(|b| b.get("back").and_then(|v| v.as_str()).is_some_and(is_db_bind_back));
|
||||
if has_db {
|
||||
let Some(url) = db_url else {
|
||||
return Vec::new();
|
||||
};
|
||||
let table = crate::table::bind_table_name(&arr);
|
||||
let Some(table) = table else {
|
||||
return Vec::new();
|
||||
};
|
||||
let data = select_page_data(url, &table, raw, 200, 0);
|
||||
let rows = data
|
||||
.get("rows")
|
||||
.and_then(|v| v.as_array())
|
||||
.cloned()
|
||||
.unwrap_or_default();
|
||||
let projected = project_rows(&arr, &rows);
|
||||
let mut out = Vec::new();
|
||||
for it in projected.as_array().cloned().unwrap_or_default() {
|
||||
let m = it.as_object().cloned().unwrap_or_default();
|
||||
let label = m
|
||||
.get("title")
|
||||
.or_else(|| m.get("label"))
|
||||
.map(text)
|
||||
.unwrap_or_default();
|
||||
let href = m
|
||||
.get("href")
|
||||
.or_else(|| m.get("path"))
|
||||
.map(text)
|
||||
.unwrap_or_else(|| "#".into());
|
||||
if !label.is_empty() {
|
||||
out.push((label, href));
|
||||
}
|
||||
let rows: Vec<Map<String, Value>> = if !arr.is_empty() {
|
||||
let has_db = arr
|
||||
.iter()
|
||||
.any(|b| b.get("back").and_then(|v| v.as_str()).is_some_and(is_db_bind_back));
|
||||
if has_db {
|
||||
let Some(url) = db_url else {
|
||||
return Vec::new();
|
||||
};
|
||||
let table = crate::table::bind_table_name(&arr);
|
||||
let Some(table) = table else {
|
||||
return Vec::new();
|
||||
};
|
||||
let data = select_page_data(url, &table, raw, 200, 0);
|
||||
let projected = project_rows(
|
||||
&arr,
|
||||
&data
|
||||
.get("rows")
|
||||
.and_then(|v| v.as_array())
|
||||
.cloned()
|
||||
.unwrap_or_default(),
|
||||
);
|
||||
projected
|
||||
.as_array()
|
||||
.cloned()
|
||||
.unwrap_or_default()
|
||||
.into_iter()
|
||||
.filter_map(|it| it.as_object().cloned())
|
||||
.collect()
|
||||
} else {
|
||||
arr.into_iter()
|
||||
.filter_map(|b| b.as_object().cloned())
|
||||
.collect()
|
||||
}
|
||||
return out;
|
||||
} else {
|
||||
as_nav_rows(raw)
|
||||
};
|
||||
|
||||
let mut out = Vec::new();
|
||||
for m in rows {
|
||||
let (label, href) = nav_label_href(&m);
|
||||
if label.is_empty() {
|
||||
continue;
|
||||
}
|
||||
let (media, when_raw, class) = nav_media_when_class(&m);
|
||||
// DB-projected rows may use title/href without media keys on bind.
|
||||
let when_raw = if when_raw.is_empty() {
|
||||
m.get("when")
|
||||
.or_else(|| m.get("当"))
|
||||
.map(text)
|
||||
.unwrap_or_default()
|
||||
} else {
|
||||
when_raw
|
||||
};
|
||||
let media = if media.is_empty() {
|
||||
m.get("media")
|
||||
.or_else(|| m.get("媒体"))
|
||||
.map(text)
|
||||
.unwrap_or_default()
|
||||
} else {
|
||||
media
|
||||
};
|
||||
let when = parse_nav_when(&when_raw);
|
||||
if !nav_when_visible(when, auth) {
|
||||
continue;
|
||||
}
|
||||
out.push(NavLink {
|
||||
label,
|
||||
href,
|
||||
class,
|
||||
media,
|
||||
});
|
||||
}
|
||||
// static: front=label back=href (URLs with `.` must stay here)
|
||||
arr.into_iter()
|
||||
.map(|b| {
|
||||
let label = b.get("front").map(text).unwrap_or_default();
|
||||
let href = b.get("back").map(text).unwrap_or_else(|| "#".into());
|
||||
(label, href)
|
||||
})
|
||||
.filter(|(l, _)| !l.is_empty())
|
||||
.collect()
|
||||
out
|
||||
}
|
||||
|
||||
fn render_ul(links: &[(String, String)], class: &str) -> String {
|
||||
fn nav_media_class_map(links: &[NavLink]) -> (String, Vec<(String, String)>) {
|
||||
nav_media_class_map_many(&[links])
|
||||
}
|
||||
|
||||
fn nav_media_class_map_many(groups: &[&[NavLink]]) -> (String, Vec<(String, String)>) {
|
||||
let mut pairs: Vec<(String, String)> = Vec::new();
|
||||
let mut css = String::new();
|
||||
for links in groups {
|
||||
for link in *links {
|
||||
let media = link.media.trim();
|
||||
if media.is_empty() || pairs.iter().any(|(m, _)| m == media) {
|
||||
continue;
|
||||
}
|
||||
let class = format!("nav-mq-{}", pairs.len());
|
||||
css.push_str(&format!(
|
||||
"@media not {media} {{ li.{class} {{ display:none !important; }} }}\n"
|
||||
));
|
||||
pairs.push((media.to_string(), class));
|
||||
}
|
||||
}
|
||||
(css, pairs)
|
||||
}
|
||||
|
||||
fn render_ul(links: &[NavLink], class: &str) -> String {
|
||||
let (_css, mq_pairs) = nav_media_class_map(links);
|
||||
render_ul_with_mq(links, class, &mq_pairs)
|
||||
}
|
||||
|
||||
fn render_ul_with_mq(links: &[NavLink], class: &str, mq_pairs: &[(String, String)]) -> String {
|
||||
let mut s = format!("<ul class=\"{}\">", esc(class));
|
||||
for (label, href) in links {
|
||||
s.push_str(&format!(
|
||||
"<li><a href=\"{}\">{}</a></li>",
|
||||
esc(href),
|
||||
esc(label)
|
||||
));
|
||||
for link in links {
|
||||
let mq = link.media.trim();
|
||||
let mq_class = if mq.is_empty() {
|
||||
""
|
||||
} else {
|
||||
mq_pairs
|
||||
.iter()
|
||||
.find(|(m, _)| m == mq)
|
||||
.map(|(_, c)| c.as_str())
|
||||
.unwrap_or("")
|
||||
};
|
||||
let mut li_class = String::new();
|
||||
if !link.class.is_empty() {
|
||||
li_class.push_str(&link.class);
|
||||
}
|
||||
if !mq_class.is_empty() {
|
||||
if !li_class.is_empty() {
|
||||
li_class.push(' ');
|
||||
}
|
||||
li_class.push_str(mq_class);
|
||||
}
|
||||
if li_class.is_empty() {
|
||||
s.push_str(&format!(
|
||||
"<li><a href=\"{}\">{}</a></li>",
|
||||
esc(&link.href),
|
||||
esc(&link.label)
|
||||
));
|
||||
} else {
|
||||
s.push_str(&format!(
|
||||
"<li class=\"{}\"><a href=\"{}\">{}</a></li>",
|
||||
esc(&li_class),
|
||||
esc(&link.href),
|
||||
esc(&link.label)
|
||||
));
|
||||
}
|
||||
}
|
||||
s.push_str("</ul>");
|
||||
s
|
||||
@@ -539,10 +715,6 @@ pub fn render_page_ex(
|
||||
.get("title")
|
||||
.and_then(|v| v.as_str())
|
||||
.unwrap_or("Marqdo Web");
|
||||
let extra = args
|
||||
.get("styles_css")
|
||||
.and_then(|v| v.as_str())
|
||||
.unwrap_or("");
|
||||
let shell = resolve_shell_css(args);
|
||||
let layout = resolve_layout(args);
|
||||
let parts = args
|
||||
@@ -550,11 +722,23 @@ pub fn render_page_ex(
|
||||
.and_then(|v| v.as_object())
|
||||
.cloned()
|
||||
.unwrap_or_default();
|
||||
|
||||
let nav = resolve_links(args.get("nav"), db_url);
|
||||
let side = resolve_links(args.get("sidebar"), db_url);
|
||||
let foot = resolve_links(args.get("footer"), db_url);
|
||||
let nav = resolve_links(args.get("nav"), db_url, Some(args));
|
||||
let side = resolve_links(args.get("sidebar"), db_url, Some(args));
|
||||
let foot = resolve_links(args.get("footer"), db_url, Some(args));
|
||||
let (intro, items, total) = resolve_main(args, db_url);
|
||||
let (nav_css, mq_pairs) = nav_media_class_map_many(&[&nav, &side, &foot]);
|
||||
let extra_owned = {
|
||||
let base = args
|
||||
.get("styles_css")
|
||||
.and_then(|v| v.as_str())
|
||||
.unwrap_or("");
|
||||
if nav_css.is_empty() {
|
||||
base.to_string()
|
||||
} else {
|
||||
format!("{base}\n{nav_css}")
|
||||
}
|
||||
};
|
||||
let extra = extra_owned.as_str();
|
||||
|
||||
let has_side = args.get("sidebar").is_some() || !side.is_empty();
|
||||
let bare = layout == "bare";
|
||||
@@ -638,7 +822,7 @@ pub fn render_page_ex(
|
||||
"<aside class=\"{}\"{}><span class=\"side-label\">侧栏</span>{}</aside>",
|
||||
slot_class(args, "sidebar", "side"),
|
||||
slot_attrs("sidebar", &parts, args),
|
||||
render_ul(&side, "side-nav")
|
||||
render_ul_with_mq(&side, "side-nav", &mq_pairs)
|
||||
)
|
||||
} else {
|
||||
String::new()
|
||||
@@ -648,7 +832,7 @@ pub fn render_page_ex(
|
||||
"<header class=\"{}\"{}>{}</header>",
|
||||
slot_class(args, "nav", "topnav"),
|
||||
slot_attrs("nav", &parts, args),
|
||||
render_ul(&nav, "nav")
|
||||
render_ul_with_mq(&nav, "nav", &mq_pairs)
|
||||
)
|
||||
} else {
|
||||
String::new()
|
||||
@@ -658,7 +842,7 @@ pub fn render_page_ex(
|
||||
"<footer class=\"{}\"{}>{}</footer>",
|
||||
slot_class(args, "footer", "foot"),
|
||||
slot_attrs("footer", &parts, args),
|
||||
render_ul(&foot, "foot-nav")
|
||||
render_ul_with_mq(&foot, "foot-nav", &mq_pairs)
|
||||
)
|
||||
} else {
|
||||
String::new()
|
||||
@@ -693,21 +877,21 @@ pub fn render_fragment(args: &Value, db_url: Option<&str>) -> String {
|
||||
.unwrap_or_else(|| "main".into());
|
||||
match slot.as_str() {
|
||||
"nav" => {
|
||||
let links = resolve_links(args.get("nav"), db_url);
|
||||
let links = resolve_links(args.get("nav"), db_url, Some(args));
|
||||
format!(
|
||||
"<header class=\"topnav\" data-slot=\"nav\">{}</header>",
|
||||
render_ul(&links, "nav")
|
||||
)
|
||||
}
|
||||
"sidebar" => {
|
||||
let links = resolve_links(args.get("sidebar"), db_url);
|
||||
let links = resolve_links(args.get("sidebar"), db_url, Some(args));
|
||||
format!(
|
||||
"<aside class=\"side\" data-slot=\"sidebar\"><span class=\"side-label\">侧栏</span>{}</aside>",
|
||||
render_ul(&links, "side-nav")
|
||||
)
|
||||
}
|
||||
"footer" => {
|
||||
let links = resolve_links(args.get("footer"), db_url);
|
||||
let links = resolve_links(args.get("footer"), db_url, Some(args));
|
||||
format!(
|
||||
"<footer class=\"foot\" data-slot=\"footer\">{}</footer>",
|
||||
render_ul(&links, "foot-nav")
|
||||
@@ -874,3 +1058,69 @@ mod shell_tests {
|
||||
assert!(html.contains("grid-template-columns:14rem"));
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod nav_tests {
|
||||
use super::*;
|
||||
use serde_json::json;
|
||||
|
||||
#[test]
|
||||
fn when_hide_omits_item() {
|
||||
let page = json!({
|
||||
"title": "t",
|
||||
"shell_css": "off",
|
||||
"nav": [
|
||||
{"label": "Home", "href": "/"},
|
||||
{"label": "Secret", "href": "/x", "when": "hide"},
|
||||
],
|
||||
});
|
||||
let html = render_page(&page, None, None);
|
||||
assert!(html.contains(">Home<"), "{html}");
|
||||
assert!(!html.contains("/x"), "{html}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn when_auth_guest_respects_logged_in() {
|
||||
let nav = json!([
|
||||
{"front": "Public", "back": "/"},
|
||||
{"front": "Admin", "back": "/admin", "when": "auth"},
|
||||
{"front": "Login", "back": "/login", "when": "guest"},
|
||||
]);
|
||||
let guest = json!({
|
||||
"title": "t",
|
||||
"shell_css": "off",
|
||||
"_logged_in": false,
|
||||
"nav": nav,
|
||||
});
|
||||
let g = render_page(&guest, None, None);
|
||||
assert!(g.contains("/login"), "{g}");
|
||||
assert!(!g.contains("/admin"), "{g}");
|
||||
|
||||
let user = json!({
|
||||
"title": "t",
|
||||
"shell_css": "off",
|
||||
"_logged_in": true,
|
||||
"_nav_user": "alice",
|
||||
"nav": nav,
|
||||
});
|
||||
let u = render_page(&user, None, None);
|
||||
assert!(u.contains("/admin"), "{u}");
|
||||
assert!(!u.contains("/login"), "{u}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn media_emits_class_and_css() {
|
||||
let page = json!({
|
||||
"title": "t",
|
||||
"shell_css": "off",
|
||||
"nav": [
|
||||
{"label": "Wide", "href": "/w", "media": "(min-width: 900px)"},
|
||||
{"label": "Home", "href": "/"},
|
||||
],
|
||||
});
|
||||
let html = render_page(&page, None, None);
|
||||
assert!(html.contains("nav-mq-0"), "{html}");
|
||||
assert!(html.contains("@media not (min-width: 900px)"), "{html}");
|
||||
assert!(html.contains(">Home<"), "{html}");
|
||||
}
|
||||
}
|
||||
@@ -14,6 +14,10 @@ const PROP_KEYS: &[&str] = &["属性", "property", "prop", "名", "name"];
|
||||
const VAL_KEYS: &[&str] = &["值", "value"];
|
||||
const SEL_KEYS: &[&str] = &["选择器", "selector", "sel"];
|
||||
const MEDIA_KEYS: &[&str] = &["媒体", "media", "mq", "@media"];
|
||||
const WHEN_KEYS: &[&str] = &["当", "when", "if", "条件", "visible"];
|
||||
const NAV_LABEL_KEYS: &[&str] = &["标签", "label", "title", "text", "名"];
|
||||
const NAV_HREF_KEYS: &[&str] = &["链接", "href", "url", "path", "地址"];
|
||||
|
||||
|
||||
pub fn normalize_ref(s: &str) -> String {
|
||||
let s = s.trim();
|
||||
@@ -214,7 +218,7 @@ pub fn as_rows(table: &Value) -> Value {
|
||||
}
|
||||
}
|
||||
|
||||
/// Bind table → `[{front,back,css}, …]`
|
||||
/// Bind table → `[{front,back,css,media,when}, …]`
|
||||
pub fn as_bind(table: &Value) -> Value {
|
||||
match table {
|
||||
Value::Array(rows) => {
|
||||
@@ -224,8 +228,17 @@ pub fn as_bind(table: &Value) -> Value {
|
||||
let front = normalize_ref(&pick(m, FRONT_KEYS).map(cell_str).unwrap_or_default());
|
||||
let back = normalize_ref(&pick(m, BACK_KEYS).map(cell_str).unwrap_or_default());
|
||||
let css = normalize_ref(&pick(m, CSS_KEYS).map(cell_str).unwrap_or_default());
|
||||
let media =
|
||||
normalize_ref(&pick(m, MEDIA_KEYS).map(cell_str).unwrap_or_default());
|
||||
let when = normalize_ref(&pick(m, WHEN_KEYS).map(cell_str).unwrap_or_default());
|
||||
if !front.is_empty() || !back.is_empty() {
|
||||
out.push(json!({ "front": front, "back": back, "css": css }));
|
||||
out.push(json!({
|
||||
"front": front,
|
||||
"back": back,
|
||||
"css": css,
|
||||
"media": media,
|
||||
"when": when,
|
||||
}));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -235,14 +248,24 @@ pub fn as_bind(table: &Value) -> Value {
|
||||
let fronts = pick(m, FRONT_KEYS).map(as_str_list).unwrap_or_default();
|
||||
let backs = pick(m, BACK_KEYS).map(as_str_list).unwrap_or_default();
|
||||
let csses = pick(m, CSS_KEYS).map(as_str_list).unwrap_or_default();
|
||||
let medias = pick(m, MEDIA_KEYS).map(as_str_list).unwrap_or_default();
|
||||
let whens = pick(m, WHEN_KEYS).map(as_str_list).unwrap_or_default();
|
||||
let n = fronts.len().max(backs.len());
|
||||
let mut out = Vec::new();
|
||||
for i in 0..n {
|
||||
let front = normalize_ref(&fronts.get(i).cloned().unwrap_or_default());
|
||||
let back = normalize_ref(&backs.get(i).cloned().unwrap_or_default());
|
||||
let css = normalize_ref(&csses.get(i).cloned().unwrap_or_default());
|
||||
let media = normalize_ref(&medias.get(i).cloned().unwrap_or_default());
|
||||
let when = normalize_ref(&whens.get(i).cloned().unwrap_or_default());
|
||||
if !front.is_empty() || !back.is_empty() {
|
||||
out.push(json!({ "front": front, "back": back, "css": css }));
|
||||
out.push(json!({
|
||||
"front": front,
|
||||
"back": back,
|
||||
"css": css,
|
||||
"media": media,
|
||||
"when": when,
|
||||
}));
|
||||
}
|
||||
}
|
||||
Value::Array(out)
|
||||
@@ -251,6 +274,61 @@ pub fn as_bind(table: &Value) -> Value {
|
||||
}
|
||||
}
|
||||
|
||||
/// Nav / link table → row maps with label/href (and optional media/when/class).
|
||||
/// Accepts bind rows (`front`/`back`) or author tables (`标签`/`链接`).
|
||||
pub fn as_nav_rows(table: &Value) -> Vec<Map<String, Value>> {
|
||||
let binds = as_bind(table);
|
||||
let bind_arr = binds.as_array().cloned().unwrap_or_default();
|
||||
if !bind_arr.is_empty() {
|
||||
return bind_arr
|
||||
.into_iter()
|
||||
.filter_map(|v| v.as_object().cloned())
|
||||
.collect();
|
||||
}
|
||||
as_rows(table)
|
||||
.as_array()
|
||||
.cloned()
|
||||
.unwrap_or_default()
|
||||
.into_iter()
|
||||
.filter_map(|v| v.as_object().cloned())
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// Pick label/href from a nav row (bind or 标签/链接 shape).
|
||||
pub fn nav_label_href(m: &Map<String, Value>) -> (String, String) {
|
||||
let label = pick(m, NAV_LABEL_KEYS)
|
||||
.or_else(|| m.get("front"))
|
||||
.map(cell_str)
|
||||
.map(|s| normalize_ref(&s))
|
||||
.unwrap_or_default();
|
||||
let href = pick(m, NAV_HREF_KEYS)
|
||||
.or_else(|| m.get("back"))
|
||||
.map(cell_str)
|
||||
.map(|s| normalize_ref(&s))
|
||||
.filter(|s| !s.is_empty())
|
||||
.unwrap_or_else(|| "#".into());
|
||||
(label, href)
|
||||
}
|
||||
|
||||
pub fn nav_media_when_class(m: &Map<String, Value>) -> (String, String, String) {
|
||||
let media = pick(m, MEDIA_KEYS)
|
||||
.or_else(|| m.get("media"))
|
||||
.map(cell_str)
|
||||
.map(|s| normalize_ref(&s))
|
||||
.unwrap_or_default();
|
||||
let when = pick(m, WHEN_KEYS)
|
||||
.or_else(|| m.get("when"))
|
||||
.map(cell_str)
|
||||
.map(|s| normalize_ref(&s))
|
||||
.unwrap_or_default();
|
||||
let class = pick(m, CSS_KEYS)
|
||||
.or_else(|| m.get("css"))
|
||||
.map(cell_str)
|
||||
.map(|s| normalize_ref(&s))
|
||||
.unwrap_or_default();
|
||||
(media, when, class)
|
||||
}
|
||||
|
||||
/// Page table → `[{src,style,slot}, …]`
|
||||
pub fn as_compose(table: &Value) -> Value {
|
||||
match table {
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
---
|
||||
title: web C4 conditional nav when/media
|
||||
description: Offline render markers for nav when= and media= columns.
|
||||
import web:ext/web/web.mq.md
|
||||
import table:lib/table.mq.md
|
||||
import sys:lib/sys.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
`链` =
|
||||
| 属性 | 值 | 样式 | 媒体 | 当 |
|
||||
|------|-----|------|------|-----|
|
||||
| Home | / | | | |
|
||||
| Desk | /desk | | (max-width: 720px) | |
|
||||
| Admin | /admin | | | auth |
|
||||
| Login | /login | | | guest |
|
||||
| Gone | /gone | | | hide |
|
||||
|
||||
*客 = > web.page title="c4-guest" shell_css="off"*
|
||||
*`客` = > table.put in=`客` at="nav" value=`链`*
|
||||
*`客` = > table.put in=`客` at="_logged_in" value=False*
|
||||
*hg = > `客`.render*
|
||||
|
||||
*a = > split value=`hg` sep="/login"*
|
||||
*na = > len value=`a`*
|
||||
*b = > split value=`hg` sep="/admin"*
|
||||
*nb = > len value=`b`*
|
||||
*c = > split value=`hg` sep="/gone"*
|
||||
*nc = > len value=`c`*
|
||||
*d = > split value=`hg` sep="nav-mq-0"*
|
||||
*nd = > len value=`d`*
|
||||
*e = > split value=`hg` sep="@media not (max-width: 720px)"*
|
||||
*ne = > len value=`e`*
|
||||
1. `na` > 1
|
||||
1. `nb` == 1
|
||||
1. `nc` == 1
|
||||
1. `nd` > 1
|
||||
1. `ne` > 1
|
||||
> print text=guest-media-ok
|
||||
2. *
|
||||
> print text=media-css-missing
|
||||
> sys.exit code=1
|
||||
2. *
|
||||
> print text=media-class-missing
|
||||
> sys.exit code=1
|
||||
2. *
|
||||
> print text=hide-leaked
|
||||
> sys.exit code=1
|
||||
2. *
|
||||
> print text=auth-leaked-for-guest
|
||||
> sys.exit code=1
|
||||
2. *
|
||||
> print text=guest-login-missing
|
||||
> sys.exit code=1
|
||||
|
||||
*户 = > web.page title="c4-user" shell_css="off"*
|
||||
*`户` = > table.put in=`户` at="nav" value=`链`*
|
||||
*`户` = > table.put in=`户` at="_logged_in" value=True*
|
||||
*hu = > `户`.render*
|
||||
*f = > split value=`hu` sep="/admin"*
|
||||
*nf = > len value=`f`*
|
||||
*g = > split value=`hu` sep="/login"*
|
||||
*ng = > len value=`g`*
|
||||
1. `nf` > 1
|
||||
1. `ng` == 1
|
||||
> print text=auth-ok
|
||||
2. *
|
||||
> print text=guest-leaked-for-user
|
||||
> sys.exit code=1
|
||||
2. *
|
||||
> print text=auth-admin-missing
|
||||
> sys.exit code=1
|
||||
|
||||
> print text=c4-nav-ok
|
||||
Reference in new issue
Block a user