Add marqdo-blog example with GFM-table style assembly
Introduce web_style ABI (样式装配) so themes are GFM style tables
(|选择器|属性|值|, optional |媒体| column for @media) assembled by
functions instead of hand-written CSS strings — 文档即代码. The new
examples/marqdo-blog shows a full blog: card grid, dynamic /post/{slug},
tag archive, WebSocket live widget, and session-gated admin CRUD, plus a
smoke test (15 checks) and README.
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
7645dd4c1f
commit
da9fc75b1e
20 files changed
+1518
-93
No files matched your search
@@ -2,6 +2,9 @@
|
||||
|
||||
## Unreleased
|
||||
|
||||
### Added
|
||||
- **`ext/web` 样式装配(`web_style` / `网页.样式装配`)**: 样式即数据表格 —— GFM 样式表(`|选择器|属性|值|`,可用 `|媒体|` 列分组进 `@media` 块)经 `样式装配` 函数转成 CSS 文本,再拼装成完整主题。替代"整段手写 CSS 字符串"的写法,贯彻 文档即代码。见 [marqdo-blog](examples/marqdo-blog/styles/theme.mq.md)。
|
||||
|
||||
### Changed
|
||||
- **Frontmatter import syntax**: `import bind:target` / `导入 bind:target` (file `.mq.md` or short name `lib.member`). Removed legacy `> path.mq.md` / `> use` imports. See [module-namespace.md](doc/design/module-namespace.md).
|
||||
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
# examples/marqdo-blog
|
||||
|
||||
一个用 Marqdo 的 `ext/web` 网络扩展库搭建的博客系统示例:美观大气的现代化主题、
|
||||
SQLite 驱动的文章/标签、动态路由、WebSocket 实时终端、以及受会话门禁保护的后台 CRUD。
|
||||
|
||||
## 运行
|
||||
|
||||
```bash
|
||||
cargo build -p marqdo_plugin_web
|
||||
cargo run -- examples/marqdo-blog/index.mq.md
|
||||
```
|
||||
|
||||
打开 http://127.0.0.1:18085/:
|
||||
|
||||
- `/` — 首页:文章卡片网格 + 实时 WebSocket 终端
|
||||
- `/post/{slug}` — 动态路由渲染单篇文章(标题/日期/标签/正文)
|
||||
- `/tags` — 标签归档;`/tag/{slug}` 查看某标签下的文章
|
||||
- `/about` — 关于页
|
||||
- `/admin` — 会话门禁后台,登录 `admin` / `marqdo`,可增删改文章与标签
|
||||
- `/live` — WebSocket 回显端点
|
||||
- `/static/*` — 静态资源(`public/` 下的 `live.js`)
|
||||
|
||||
## 设计亮点(文档即代码)
|
||||
|
||||
- **样式即数据表格,装配即函数**(`styles/theme.mq.md`):
|
||||
主题不再是一大段手写 CSS 字符串,而是由一张张 GFM 样式表组成 ——
|
||||
`|选择器|属性|值|` 规则行(同一选择器多行自动合并成一条规则),
|
||||
响应式用 `|媒体|选择器|属性|值|` 分组进 `@media` 块。
|
||||
每个 `## 段`(基础/顶栏/侧栏/主体/卡片/页脚/表单/响应式)导出一张样式表,
|
||||
`## 全局` 用 `网页.样式装配` 函数把每张表装配成 CSS 文本,再 `text.str_join` 拼成完整样式表,
|
||||
最后经 `页面.样式` 注入页面。样式保持可读的数据表格,不写胶水代码。
|
||||
- **页面 = 组件装配 + 主体绑定**(`index.mq.md`):
|
||||
导航/侧栏/页脚用 `|组件|样式|` 表装配,文章列表用 `|属性|值|` 绑定 SQLite 字段。
|
||||
- **动态路由**:`/post/{slug}` 的 `slug` 注入查询条件,`页面.详情` 把首行渲染成文章。
|
||||
- **数据模型**(`db/`):`schema.mq.md` 定义 `posts`/`tags`/`post_tags` 三张表,
|
||||
`seed.mq.md` 提供种子数据,`index.mq.md` 幂等建表 + 灌数据。
|
||||
|
||||
## 冒烟测试
|
||||
|
||||
服务器启动后(端口 18085),运行:
|
||||
|
||||
```bash
|
||||
bash examples/marqdo-blog/smoke.sh
|
||||
```
|
||||
|
||||
覆盖:首页/卡片/主题 CSS/媒体查询、静态资源、动态路由详情、标签归档、鉴权门禁、
|
||||
登录会话、后台表单、WebSocket 回显。全部通过时输出 `通过 N / N`。
|
||||
|
||||
可从仓库根目录或本目录运行:相对 `static_dir`(`public`)与相对数据库路径
|
||||
(`data/marqdo-blog.db`)都按**入口脚本所在目录**解析,不依赖终端工作目录。
|
||||
@@ -0,0 +1,13 @@
|
||||
## 页脚
|
||||
|
||||
站点页脚。放版权与概览链接。
|
||||
|
||||
`页脚` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| © 2026 Marqdo 博客 | / | |
|
||||
| 关于 | /about | |
|
||||
| 后台 | /admin | |
|
||||
|
||||
**`页脚`**
|
||||
@@ -0,0 +1,15 @@
|
||||
## 导航
|
||||
|
||||
站点顶部导航。首项是站点名(渐变 Logo 由主题 CSS 处理),`后台` 指向需要登录的 `/admin`。
|
||||
|
||||
`导航` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| Marqdo 博客 | / | |
|
||||
| 首页 | / | |
|
||||
| 标签 | /tags | |
|
||||
| 关于 | /about | |
|
||||
| 后台 | /admin | |
|
||||
|
||||
**`导航`**
|
||||
@@ -0,0 +1,15 @@
|
||||
## 侧栏
|
||||
|
||||
右侧归档面板:文章入口、标签、实时小部件。
|
||||
|
||||
`侧栏` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| 全部文章 | / | |
|
||||
| 标签归档 | /tags | |
|
||||
| 关于本站 | /about | |
|
||||
| 发布文章 | /admin/new | |
|
||||
| 实时终端 | /#live | |
|
||||
|
||||
**`侧栏`**
|
||||
@@ -0,0 +1,28 @@
|
||||
---
|
||||
title: db/index
|
||||
description: 打开 sqlite、建三张表、幂等种子。
|
||||
导入 网页:ext/web/网页.mq.md
|
||||
import schema:schema.mq.md
|
||||
import seed:seed.mq.md
|
||||
---
|
||||
|
||||
## 打开
|
||||
|
||||
*store = > 网页.数据库 地址="sqlite:data/marqdo-blog.db"*
|
||||
*字段 = > schema.posts*
|
||||
*标签字段 = > schema.tags*
|
||||
*关联字段 = > schema.post_tags*
|
||||
> `store`.初始化 名=posts 字段=`字段`
|
||||
> `store`.初始化 名=tags 字段=`标签字段`
|
||||
> `store`.初始化 名=post_tags 字段=`关联字段`
|
||||
*行 = > store.查询 表="posts" 上限=1*
|
||||
1. `行`
|
||||
**store**
|
||||
2. *
|
||||
*文章 = > seed.posts*
|
||||
*标签 = > seed.tags*
|
||||
*关联 = > seed.post_tags*
|
||||
> `store`.插入 表=posts 行=`文章`
|
||||
> `store`.插入 表=tags 行=`标签`
|
||||
> `store`.插入 表=post_tags 行=`关联`
|
||||
**store**
|
||||
@@ -0,0 +1,46 @@
|
||||
## posts
|
||||
|
||||
文章主表结构。`slug` 用于详情页 `/post/{slug}` 的动态路由;`content` 存 Markdown 正文;`tag` 是主标签(tags 表 slug)。
|
||||
|
||||
`schema` =
|
||||
|
||||
| 字段 | 类型 | 可空 |
|
||||
|------|------|------|
|
||||
| id | integer | false |
|
||||
| title | text | false |
|
||||
| slug | text | false |
|
||||
| summary | text | true |
|
||||
| content | text | true |
|
||||
| tag | text | true |
|
||||
| created_at | text | true |
|
||||
| updated_at | text | true |
|
||||
|
||||
**`schema`**
|
||||
|
||||
## tags
|
||||
|
||||
标签表结构。
|
||||
|
||||
`tags` =
|
||||
|
||||
| 字段 | 类型 | 可空 |
|
||||
|------|------|------|
|
||||
| id | integer | false |
|
||||
| name | text | false |
|
||||
| slug | text | false |
|
||||
|
||||
**`tags`**
|
||||
|
||||
## post_tags
|
||||
|
||||
文章-标签关联表结构。
|
||||
|
||||
`post_tags` =
|
||||
|
||||
| 字段 | 类型 | 可空 |
|
||||
|------|------|------|
|
||||
| id | integer | false |
|
||||
| post_id | integer | false |
|
||||
| tag_id | integer | false |
|
||||
|
||||
**`post_tags`**
|
||||
@@ -0,0 +1,53 @@
|
||||
## posts
|
||||
|
||||
种子文章。首页与详情页的初始数据。created_at 用于按时间倒序展示;tag 是主标签 slug。
|
||||
|
||||
`posts` =
|
||||
|
||||
| 行 | title | slug | summary | content | tag | created_at | updated_at |
|
||||
|----|-------|------|---------|---------|-----|------------|------------|
|
||||
| 1 | 你好,Marqdo 博客 | hello-marqdo | 用 Marqdo 的 web 扩展库搭建的第一个博客。表格即组件、文档即代码。 | 这是一篇介绍博客系统的文章。它由 Marqdo 脚本在启动时写入 SQLite,通过 ext/web 的组件装配渲染成页面。 | marqdo | 2026-08-01 | 2026-08-02 |
|
||||
| 2 | 动态路由与文章详情 | dynamic-routing | 如何用 /post/{slug} 动态路由渲染单篇文章。 | 本文说明动态路由机制:作者面注册带 {slug} 占位符的路由,请求时把路径参数注入页面查询条件。 | web | 2026-08-05 | 2026-08-05 |
|
||||
| 3 | 用 GFM 表格表达数据 | gfm-tables | Marqdo 的字典操作不依赖 json 库,GFM 表格即可完成。 | 表格即数据、表格即组件。这篇文章展示如何在 .mq.md 里用横向表写种子数据,用脚注索引读取字段。 | tutorial | 2026-08-10 | 2026-08-11 |
|
||||
| 4 | WebSocket 实时小部件 | websocket-live | 给博客加一个实时回显的 WebSocket 端点。 | 通过 app.路由实时 注册 /live 端点,配合 public/live.js 在首页显示实时连接状态。 | realtime | 2026-08-15 | 2026-08-15 |
|
||||
| 5 | 会话与登录鉴权 | session-auth | 后台用 session 门禁保护,只有登录用户能发布文章。 | 用 app.鉴权 配置管理员用户表,/admin 下的 CRUD 页面都需要有效会话。 | web | 2026-08-18 | 2026-08-20 |
|
||||
| 6 | 数据库与 CRUD | database-crud | 博客的文章、标签、关联全部由 SQLite 支撑。 | db.初始化 建表、db.插入 写种子、后台表单增删改。文章与标签通过 post_tags 关联。 | database | 2026-08-20 | 2026-08-21 |
|
||||
|
||||
**`posts`**
|
||||
|
||||
## tags
|
||||
|
||||
种子标签。
|
||||
|
||||
`tags` =
|
||||
|
||||
| 行 | name | slug |
|
||||
|----|------|------|
|
||||
| 1 | Marqdo | marqdo |
|
||||
| 2 | Web | web |
|
||||
| 3 | 教程 | tutorial |
|
||||
| 4 | 数据库 | database |
|
||||
| 5 | 实时 | realtime |
|
||||
|
||||
**`tags`**
|
||||
|
||||
## post_tags
|
||||
|
||||
种子文章-标签关联。
|
||||
|
||||
`post_tags` =
|
||||
|
||||
| 行 | post_id | tag_id |
|
||||
|----|---------|--------|
|
||||
| 1 | 1 | 1 |
|
||||
| 2 | 1 | 2 |
|
||||
| 3 | 2 | 2 |
|
||||
| 4 | 3 | 1 |
|
||||
| 5 | 3 | 3 |
|
||||
| 6 | 4 | 5 |
|
||||
| 7 | 4 | 2 |
|
||||
| 8 | 5 | 2 |
|
||||
| 9 | 6 | 4 |
|
||||
| 10 | 6 | 1 |
|
||||
|
||||
**`post_tags`**
|
||||
@@ -0,0 +1,109 @@
|
||||
---
|
||||
title: Marqdo 博客
|
||||
description: 用 web 扩展库搭建的博客系统示例:首页列表、动态文章详情、标签归档、登录门禁后台。
|
||||
导入 网页:ext/web/网页.mq.md
|
||||
import theme:styles/theme.mq.md
|
||||
import nav:components/nav.mq.md
|
||||
import side:components/side.mq.md
|
||||
import foot:components/foot.mq.md
|
||||
import db:db/index.mq.md
|
||||
---
|
||||
|
||||
# main
|
||||
|
||||
`首页` =
|
||||
|
||||
| 组件 | 样式 |
|
||||
|------|------|
|
||||
| nav.`导航` | |
|
||||
| side.`侧栏` | |
|
||||
| foot.`页脚` | |
|
||||
|
||||
`列表` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| title | posts.title | |
|
||||
| body | posts.summary | |
|
||||
| meta | posts.created_at | |
|
||||
| tag | posts.tag | |
|
||||
| href | posts.slug | |
|
||||
|
||||
`详情绑定` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| title | posts.title | |
|
||||
| meta | posts.created_at | |
|
||||
| tag | posts.tag | |
|
||||
| body | posts.content | |
|
||||
|
||||
`标签列表` =
|
||||
|
||||
| 属性 | 值 | 样式 |
|
||||
|------|-----|------|
|
||||
| title | tags.name | |
|
||||
| meta | 点击查看该标签下的文章 | |
|
||||
| href | tags.slug | |
|
||||
|
||||
`文章条件` =
|
||||
|
||||
| 字段 | 操作 | 值 |
|
||||
|------|------|-----|
|
||||
| slug | = | {slug} |
|
||||
|
||||
`标签条件` =
|
||||
|
||||
| 字段 | 操作 | 值 |
|
||||
|------|------|-----|
|
||||
| tag | = | {slug} |
|
||||
|
||||
`管理员` =
|
||||
|
||||
| 行 | 用户名 | 密码 |
|
||||
|----|--------|------|
|
||||
| 1 | admin | marqdo |
|
||||
|
||||
*store = > db.打开*
|
||||
|
||||
*首页CSS = > theme.全局*
|
||||
|
||||
*page = > 网页.页面 标题="Marqdo 博客" 引言="<h1>Marqdo 博客</h1><p>用 web 扩展库搭建的博客:表格装配页面、SQLite 数据、动态路由、实时终端。</p><h2 id=\"live\">实时终端</h2><p id=\"live-status\" class=\"live-pill\">connecting…</p><input id=\"live-msg\" placeholder=\"输入一条消息…\"><button id=\"live-send\" disabled>发送</button><div id=\"live-out\"></div><script src=\"/static/live.js\"></script>"*
|
||||
*page = > page.组件装配 组件=`首页`*
|
||||
*page = > page.主体装配 主体=`列表`*
|
||||
*page = > page.排序 排序="-created_at"*
|
||||
*page = > page.样式 样式=`首页CSS`*
|
||||
|
||||
*about = > 网页.页面 标题="关于" 引言="<h1>关于本站</h1><p>一个用 Marqdo 的 web 扩展库(ext/web)写成的博客系统。</p><p>它演示了:GFM 表格装配导航与侧栏、SQLite 驱动的主体绑定、动态路由 /post/{slug}、标签归档、以及受 session 保护的后台 CRUD。</p>"*
|
||||
*about = > about.组件装配 组件=`首页`*
|
||||
*about = > about.样式 样式=`首页CSS`*
|
||||
|
||||
*post = > 网页.页面 标题="文章"*
|
||||
*post = > post.组件装配 组件=`首页`*
|
||||
*post = > post.主体装配 主体=`详情绑定`*
|
||||
*post = > post.查询条件 条件=`文章条件`*
|
||||
*post = > post.详情 详情=True*
|
||||
*post = > post.样式 样式=`首页CSS`*
|
||||
|
||||
*tags = > 网页.页面 标题="标签归档" 引言="<h1>标签归档</h1><p>点击标签查看该主题下的文章。</p>"*
|
||||
*tags = > tags.组件装配 组件=`首页`*
|
||||
*tags = > tags.主体装配 主体=`标签列表`*
|
||||
*tags = > tags.链接前缀 前缀="/tag/"*
|
||||
*tags = > tags.样式 样式=`首页CSS`*
|
||||
|
||||
*tagged = > 网页.页面 标题="标签"*
|
||||
*tagged = > tagged.组件装配 组件=`首页`*
|
||||
*tagged = > tagged.主体装配 主体=`列表`*
|
||||
*tagged = > tagged.查询条件 条件=`标签条件`*
|
||||
*tagged = > tagged.排序 排序="-created_at"*
|
||||
*tagged = > tagged.样式 样式=`首页CSS`*
|
||||
|
||||
*app = > 网页.应用 页面=page 数据库=store 后台=True 主机="127.0.0.1" 端口=18085*
|
||||
*app = > app.路由 路径="/about" 页面=about*
|
||||
*app = > app.路由 路径="/post/{slug}" 页面=post*
|
||||
*app = > app.路由 路径="/tags" 页面=tags*
|
||||
*app = > app.路由 路径="/tag/{slug}" 页面=tagged*
|
||||
*app = > app.静态 目录="public" 挂载="/static"*
|
||||
*app = > app.路由实时 路径="/live" 回显=True*
|
||||
*app = > app.鉴权 用户表=`管理员` 会话时长=3600*
|
||||
> `app`.监听
|
||||
@@ -0,0 +1,40 @@
|
||||
// 实时 WebSocket 小部件(连接 /live 端点)。
|
||||
// 连接 ws://host/live,发送输入,展示服务器回显。
|
||||
(function () {
|
||||
var out = document.getElementById("live-out");
|
||||
var input = document.getElementById("live-msg");
|
||||
var btn = document.getElementById("live-send");
|
||||
var status = document.getElementById("live-status");
|
||||
if (!out || !input || !btn || !status) return;
|
||||
|
||||
var proto = location.protocol === "https:" ? "wss" : "ws";
|
||||
var ws = new WebSocket(proto + "://" + location.host + "/live");
|
||||
status.textContent = "connecting…";
|
||||
|
||||
ws.onopen = function () {
|
||||
status.textContent = "connected";
|
||||
btn.disabled = false;
|
||||
};
|
||||
ws.onmessage = function (ev) {
|
||||
var p = document.createElement("p");
|
||||
p.textContent = "echo: " + ev.data;
|
||||
out.appendChild(p);
|
||||
out.scrollTop = out.scrollHeight;
|
||||
};
|
||||
ws.onclose = function () {
|
||||
status.textContent = "closed";
|
||||
btn.disabled = true;
|
||||
};
|
||||
ws.onerror = function () {
|
||||
status.textContent = "error";
|
||||
btn.disabled = true;
|
||||
};
|
||||
|
||||
btn.onclick = function () {
|
||||
var m = input.value.trim();
|
||||
if (m) ws.send(m);
|
||||
};
|
||||
input.addEventListener("keydown", function (e) {
|
||||
if (e.key === "Enter") btn.onclick();
|
||||
});
|
||||
})();
|
||||
Executable
+68
@@ -0,0 +1,68 @@
|
||||
#!/usr/bin/env bash
|
||||
# 冒烟测试:marqdo-blog 全功能验证。
|
||||
# 用法:bash examples/marqdo-blog/smoke.sh
|
||||
set -uo pipefail
|
||||
BASE="http://127.0.0.1:18085"
|
||||
PASS=0; FAIL=0
|
||||
ok() { echo " ok: $1"; PASS=$((PASS+1)); }
|
||||
bad() { echo " FAIL: $1"; FAIL=$((FAIL+1)); }
|
||||
|
||||
echo "== 首页 =="
|
||||
code=$(curl -s -o /dev/null -w "%{http_code}" "$BASE/")
|
||||
[ "$code" = "200" ] && ok "GET / -> $code" || bad "GET / -> $code"
|
||||
curl -s "$BASE/" | grep -q '<title>Marqdo 博客</title>' && ok "title" || bad "title"
|
||||
curl -s "$BASE/" | grep -q 'class="card"' && ok "卡片渲染" || bad "卡片缺失"
|
||||
curl -s "$BASE/" | grep -q 'aside.side' && ok "主题 CSS 注入" || bad "主题 CSS 缺失"
|
||||
curl -s "$BASE/" | grep -q '@media (max-width: 860px)' && ok "响应式媒体查询" || bad "媒体查询缺失"
|
||||
|
||||
echo "== 静态 =="
|
||||
code=$(curl -s -o /dev/null -w "%{http_code}" "$BASE/static/live.js")
|
||||
[ "$code" = "200" ] && ok "GET /static/live.js -> $code" || bad "static -> $code"
|
||||
|
||||
echo "== 动态路由 =="
|
||||
code=$(curl -s -o /dev/null -w "%{http_code}" "$BASE/post/hello-marqdo")
|
||||
[ "$code" = "200" ] && ok "GET /post/hello-marqdo -> $code" || bad "post detail -> $code"
|
||||
curl -s "$BASE/post/hello-marqdo" | grep -q 'article-title' && ok "文章详情渲染" || bad "文章详情缺失"
|
||||
|
||||
echo "== 标签 =="
|
||||
curl -s "$BASE/tags" | grep -q 'href="/tag/marqdo"' && ok "标签归档链接" || bad "标签链接缺失"
|
||||
code=$(curl -s -o /dev/null -w "%{http_code}" "$BASE/tag/web")
|
||||
[ "$code" = "200" ] && ok "GET /tag/web -> $code" || bad "tag page -> $code"
|
||||
|
||||
echo "== 鉴权门禁 =="
|
||||
code=$(curl -s -o /dev/null -w "%{http_code}" "$BASE/admin")
|
||||
[ "$code" = "303" ] && ok "未登录 /admin -> $code (重定向登录)" || bad "未登录 /admin -> $code"
|
||||
|
||||
echo "== 登录 =="
|
||||
rm -f /tmp/mq_smoke_cookies.txt /tmp/mq_smoke_headers.txt
|
||||
curl -s -D /tmp/mq_smoke_headers.txt -o /dev/null -d "username=admin&password=marqdo" "$BASE/admin/login"
|
||||
sid=$(grep -i "set-cookie" /tmp/mq_smoke_headers.txt | sed 's/.*marqdo_sid=\([^;]*\).*/\1/')
|
||||
[ -n "$sid" ] && ok "登录获取会话 cookie" || bad "登录未返回 cookie"
|
||||
code=$(curl -s -b "marqdo_sid=$sid" -o /dev/null -w "%{http_code}" "$BASE/admin")
|
||||
[ "$code" = "200" ] && ok "带会话访问 /admin -> $code" || bad "带会话 /admin -> $code"
|
||||
|
||||
echo "== 发布文章 (CRUD) =="
|
||||
code=$(curl -s -b "marqdo_sid=$sid" -o /dev/null -w "%{http_code}" "$BASE/admin/posts/new")
|
||||
[ "$code" = "200" ] && ok "GET /admin/posts/new -> $code" || bad "new form -> $code"
|
||||
|
||||
echo "== WebSocket =="
|
||||
wsok=$(python3 -c "
|
||||
import socket, base64, os
|
||||
s = socket.create_connection(('127.0.0.1', 18085), timeout=3)
|
||||
key = base64.b64encode(os.urandom(16)).decode()
|
||||
s.sendall((f'GET /live HTTP/1.1\r\nHost: x\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Key: {key}\r\nSec-WebSocket-Version: 13\r\n\r\n').encode())
|
||||
r = s.recv(1024).decode(errors='replace')
|
||||
if '101' not in r.split('\r\n')[0]:
|
||||
print('NO'); s.close(); raise SystemExit
|
||||
mask = os.urandom(4); payload = b'ping'
|
||||
m = bytes(b ^ mask[i%4] for i, b in enumerate(payload))
|
||||
s.sendall(bytes([0x81, 0x80|len(payload)]) + mask + m)
|
||||
d = s.recv(1024)
|
||||
print('OK' if b'ping' in d else 'NO')
|
||||
s.close()
|
||||
" 2>/dev/null)
|
||||
[ "$wsok" = "OK" ] && ok "WebSocket /live 回显" || bad "WebSocket 回显 $wsok"
|
||||
|
||||
echo
|
||||
echo "通过 $PASS / $((PASS+FAIL))"
|
||||
[ "$FAIL" = "0" ] || exit 1
|
||||
@@ -0,0 +1,405 @@
|
||||
---
|
||||
title: styles/theme
|
||||
description: 博客主题:样式即数据表格,装配即函数。
|
||||
import 网页:ext/web/网页.mq.md
|
||||
import text:lib/text.mq.md
|
||||
---
|
||||
|
||||
博客主题的样式即数据表格:每个 `## 段` 导出一张 GFM 样式表(`|选择器|属性|值|`,
|
||||
或用 `|媒体|选择器|属性|值|` 表达响应式),`## 全局` 用 `样式装配` 函数把它们
|
||||
装配成一份完整 CSS。这符合 文档即代码 —— 样式是可读的表格,装配是显式调用。
|
||||
|
||||
## 基础
|
||||
|
||||
配色与字体变量、页面骨架。衬线标题 + 无衬线正文,暖白纸感背景。
|
||||
|
||||
`基础` =
|
||||
|
||||
| 选择器 | 属性 | 值 |
|
||||
|--------|------|-----|
|
||||
| :root | --ink | #1c1917 |
|
||||
| :root | --ink-soft | #44403c |
|
||||
| :root | --muted | #78716c |
|
||||
| :root | --faint | #a8a29e |
|
||||
| :root | --paper | #f7f5f2 |
|
||||
| :root | --card | #ffffff |
|
||||
| :root | --line | #e7e5e4 |
|
||||
| :root | --accent | #4f46e5 |
|
||||
| :root | --accent-2 | #7c3aed |
|
||||
| :root | --accent-ink | #ffffff |
|
||||
| :root | --radius | 16px |
|
||||
| :root | --shadow | 0 1px 2px rgba(28,25,23,.05), 0 8px 24px rgba(28,25,23,.06) |
|
||||
| :root | --shadow-lg | 0 4px 12px rgba(28,25,23,.08), 0 20px 48px rgba(28,25,23,.12) |
|
||||
| :root | --serif | "Noto Serif SC", Georgia, "Songti SC", serif |
|
||||
| :root | --sans | "Noto Sans SC", "IBM Plex Sans", system-ui, -apple-system, sans-serif |
|
||||
| html | scroll-behavior | smooth |
|
||||
| * | box-sizing | border-box |
|
||||
| ::selection | background | rgba(79,70,229,.18) |
|
||||
| body | margin | 0 |
|
||||
| body | font-family | var(--sans) |
|
||||
| body | background | var(--paper) |
|
||||
| body | color | var(--ink) |
|
||||
| body | display | grid |
|
||||
| body | min-height | 100vh |
|
||||
| body | line-height | 1.7 |
|
||||
| body | grid-template-rows | auto 1fr auto |
|
||||
| body.has-sidebar | grid-template-columns | 15rem 1fr |
|
||||
| body.has-sidebar | grid-template-areas | "top top" "side main" "foot foot" |
|
||||
| body.no-sidebar | grid-template-areas | "top" "main" "foot" |
|
||||
|
||||
**`基础`**
|
||||
|
||||
## 顶栏
|
||||
|
||||
吸顶导航:磨砂玻璃 + 细分隔线,Logo 处用渐变强调。
|
||||
|
||||
`顶栏` =
|
||||
|
||||
| 选择器 | 属性 | 值 |
|
||||
|--------|------|-----|
|
||||
| header.topnav | grid-area | top |
|
||||
| header.topnav | position | sticky |
|
||||
| header.topnav | top | 0 |
|
||||
| header.topnav | z-index | 20 |
|
||||
| header.topnav | background | rgba(255,255,255,.82) |
|
||||
| header.topnav | backdrop-filter | blur(10px) |
|
||||
| header.topnav | -webkit-backdrop-filter | blur(10px) |
|
||||
| header.topnav | border-bottom | 1px solid var(--line) |
|
||||
| header.topnav | padding | .9rem 2rem |
|
||||
| header.topnav | display | flex |
|
||||
| header.topnav | align-items | center |
|
||||
| header.topnav | justify-content | space-between |
|
||||
| ul.nav | list-style | none |
|
||||
| ul.nav | margin | 0 |
|
||||
| ul.nav | padding | 0 |
|
||||
| ul.nav | display | flex |
|
||||
| ul.nav | align-items | center |
|
||||
| ul.nav | gap | .35rem |
|
||||
| ul.nav li | margin | 0 |
|
||||
| ul.nav a | display | inline-block |
|
||||
| ul.nav a | padding | .45rem .9rem |
|
||||
| ul.nav a | border-radius | 999px |
|
||||
| ul.nav a | color | var(--ink-soft) |
|
||||
| ul.nav a | font-weight | 500 |
|
||||
| ul.nav a | text-decoration | none |
|
||||
| ul.nav a | transition | background .18s ease, color .18s ease |
|
||||
| ul.nav a:hover | background | rgba(79,70,229,.1) |
|
||||
| ul.nav a:hover | color | var(--accent) |
|
||||
| ul.nav li:first-child a | font-family | var(--serif) |
|
||||
| ul.nav li:first-child a | font-size | 1.25rem |
|
||||
| ul.nav li:first-child a | font-weight | 700 |
|
||||
| ul.nav li:first-child a | background | linear-gradient(120deg, var(--accent), var(--accent-2)) |
|
||||
| ul.nav li:first-child a | -webkit-background-clip | text |
|
||||
| ul.nav li:first-child a | background-clip | text |
|
||||
| ul.nav li:first-child a | -webkit-text-fill-color | transparent |
|
||||
| ul.nav li:first-child a | color | transparent |
|
||||
| ul.nav li:first-child a | padding-left | .2rem |
|
||||
| ul.nav li:first-child a | padding-right | .2rem |
|
||||
|
||||
**`顶栏`**
|
||||
|
||||
## 侧栏
|
||||
|
||||
归档面板:浅底圆角卡片,链接胶囊化。
|
||||
|
||||
`侧栏` =
|
||||
|
||||
| 选择器 | 属性 | 值 |
|
||||
|--------|------|-----|
|
||||
| aside.side | grid-area | side |
|
||||
| aside.side | padding | 2rem 1.25rem |
|
||||
| aside.side | border-right | 1px solid var(--line) |
|
||||
| aside.side | background | linear-gradient(180deg, #fbfaf8, #f3f1ec) |
|
||||
| ul.side-nav | list-style | none |
|
||||
| ul.side-nav | margin | 0 |
|
||||
| ul.side-nav | padding | 0 |
|
||||
| ul.side-nav | display | flex |
|
||||
| ul.side-nav | flex-direction | column |
|
||||
| ul.side-nav | gap | .25rem |
|
||||
| ul.side-nav li | margin | 0 |
|
||||
| ul.side-nav a | display | block |
|
||||
| ul.side-nav a | padding | .55rem .85rem |
|
||||
| ul.side-nav a | border-radius | 10px |
|
||||
| ul.side-nav a | color | var(--ink-soft) |
|
||||
| ul.side-nav a | text-decoration | none |
|
||||
| ul.side-nav a | font-weight | 500 |
|
||||
| ul.side-nav a | transition | background .15s ease, transform .15s ease, color .15s ease |
|
||||
| ul.side-nav a:hover | background | #fff |
|
||||
| ul.side-nav a:hover | color | var(--accent) |
|
||||
| ul.side-nav a:hover | transform | translateX(4px) |
|
||||
| ul.side-nav a:hover | box-shadow | 0 1px 3px rgba(28,25,23,.08) |
|
||||
|
||||
**`侧栏`**
|
||||
|
||||
## 主体
|
||||
|
||||
内容区留白与节奏。
|
||||
|
||||
`主体` =
|
||||
|
||||
| 选择器 | 属性 | 值 |
|
||||
|--------|------|-----|
|
||||
| main.main | grid-area | main |
|
||||
| main.main | padding | 2.5rem 2.5rem 3.5rem |
|
||||
| main.main | max-width | 76rem |
|
||||
| main.main | width | 100% |
|
||||
| .main-intro | margin-bottom | .5rem |
|
||||
| .main-intro h1 | font-family | var(--serif) |
|
||||
| .main-intro h1 | margin | 0 0 .5rem |
|
||||
| .main-intro h1 | font-size | clamp(2rem, 5vw, 2.9rem) |
|
||||
| .main-intro h1 | line-height | 1.2 |
|
||||
| .main-intro h1 | font-weight | 700 |
|
||||
| .main-intro h1 | letter-spacing | -.01em |
|
||||
| .main-intro p | color | var(--muted) |
|
||||
| .main-intro p | margin | 0 |
|
||||
| .main-intro p | font-size | 1.05rem |
|
||||
|
||||
**`主体`**
|
||||
|
||||
## 卡片
|
||||
|
||||
文章卡片:白底大圆角、柔和阴影、hover 抬升,整卡可点。
|
||||
|
||||
`卡片` =
|
||||
|
||||
| 选择器 | 属性 | 值 |
|
||||
|--------|------|-----|
|
||||
| .content.cards | display | grid |
|
||||
| .content.cards | gap | 1.5rem |
|
||||
| .content.cards | margin-top | 2rem |
|
||||
| .content.cards | grid-template-columns | repeat(auto-fill, minmax(17rem, 1fr)) |
|
||||
| .content.cards article.card | background | var(--card) |
|
||||
| .content.cards article.card | border | 1px solid var(--line) |
|
||||
| .content.cards article.card | border-radius | var(--radius) |
|
||||
| .content.cards article.card | padding | 1.6rem 1.7rem |
|
||||
| .content.cards article.card | box-shadow | var(--shadow) |
|
||||
| .content.cards article.card | transition | transform .22s ease, box-shadow .22s ease, border-color .22s ease |
|
||||
| .content.cards article.card | display | flex |
|
||||
| .content.cards article.card | flex-direction | column |
|
||||
| .content.cards article.card | gap | .55rem |
|
||||
| .content.cards article.card:hover | transform | translateY(-6px) |
|
||||
| .content.cards article.card:hover | box-shadow | var(--shadow-lg) |
|
||||
| .content.cards article.card:hover | border-color | rgba(79,70,229,.35) |
|
||||
| .content.cards a.card-link | text-decoration | none |
|
||||
| .content.cards a.card-link | color | inherit |
|
||||
| .content.cards a.card-link | display | flex |
|
||||
| .content.cards a.card-link | flex-direction | column |
|
||||
| .content.cards a.card-link | gap | .55rem |
|
||||
| .content.cards a.card-link | height | 100% |
|
||||
| .content.cards a.card-link:hover | color | inherit |
|
||||
| .content.cards h2 | font-family | var(--serif) |
|
||||
| .content.cards h2 | margin | 0 |
|
||||
| .content.cards h2 | font-size | 1.35rem |
|
||||
| .content.cards h2 | line-height | 1.35 |
|
||||
| .content.cards h2 | font-weight | 700 |
|
||||
| .content.cards h2 | transition | color .18s ease |
|
||||
| .content.cards a.card-link:hover h2 | color | var(--accent) |
|
||||
| .card-meta | font-size | .82rem |
|
||||
| .card-meta | color | var(--faint) |
|
||||
| .card-meta | letter-spacing | .04em |
|
||||
| .card-meta | text-transform | uppercase |
|
||||
| .card-tag | align-self | flex-start |
|
||||
| .card-tag | font-size | .78rem |
|
||||
| .card-tag | color | var(--accent) |
|
||||
| .card-tag | background | rgba(79,70,229,.08) |
|
||||
| .card-tag | padding | .15rem .65rem |
|
||||
| .card-tag | border-radius | 999px |
|
||||
| .card-tag | font-weight | 600 |
|
||||
| .content.cards p | color | var(--muted) |
|
||||
| .content.cards p | margin | 0 |
|
||||
| .content.cards p | font-size | .95rem |
|
||||
| .content.cards p | flex | 1 |
|
||||
|
||||
**`卡片`**
|
||||
|
||||
## 页脚
|
||||
|
||||
`页脚` =
|
||||
|
||||
| 选择器 | 属性 | 值 |
|
||||
|--------|------|-----|
|
||||
| footer.foot | grid-area | foot |
|
||||
| footer.foot | padding | 1.4rem 2rem |
|
||||
| footer.foot | border-top | 1px solid var(--line) |
|
||||
| footer.foot | color | var(--muted) |
|
||||
| footer.foot | background | #fff |
|
||||
| footer.foot | font-size | .9rem |
|
||||
| footer.foot | display | flex |
|
||||
| footer.foot | justify-content | space-between |
|
||||
| footer.foot | align-items | center |
|
||||
| footer.foot | flex-wrap | wrap |
|
||||
| footer.foot | gap | .5rem |
|
||||
| ul.foot-nav | list-style | none |
|
||||
| ul.foot-nav | margin | 0 |
|
||||
| ul.foot-nav | padding | 0 |
|
||||
| ul.foot-nav | display | flex |
|
||||
| ul.foot-nav | gap | 1rem |
|
||||
| ul.foot-nav | flex-wrap | wrap |
|
||||
| ul.foot-nav li | margin | 0 |
|
||||
| ul.foot-nav a | color | var(--muted) |
|
||||
| ul.foot-nav a | text-decoration | none |
|
||||
| ul.foot-nav a:hover | color | var(--accent) |
|
||||
|
||||
**`页脚`**
|
||||
|
||||
## 表单
|
||||
|
||||
后台表单统一风格。
|
||||
|
||||
`表单` =
|
||||
|
||||
| 选择器 | 属性 | 值 |
|
||||
|--------|------|-----|
|
||||
| .site-form | margin-top | 1.75rem |
|
||||
| .site-form | max-width | 34rem |
|
||||
| .site-form | background | var(--card) |
|
||||
| .site-form | border | 1px solid var(--line) |
|
||||
| .site-form | border-radius | var(--radius) |
|
||||
| .site-form | padding | 1.8rem |
|
||||
| .site-form | box-shadow | var(--shadow) |
|
||||
| .site-form form | display | grid |
|
||||
| .site-form form | gap | 1rem |
|
||||
| .site-form label | display | grid |
|
||||
| .site-form label | gap | .35rem |
|
||||
| .site-form label | font-size | .92rem |
|
||||
| .site-form label | font-weight | 600 |
|
||||
| .site-form label | color | var(--ink-soft) |
|
||||
| .site-form input | padding | .65rem .8rem |
|
||||
| .site-form input | border | 1px solid var(--line) |
|
||||
| .site-form input | border-radius | 10px |
|
||||
| .site-form input | font | inherit |
|
||||
| .site-form input | background | #fdfcfb |
|
||||
| .site-form input | transition | border-color .15s ease, box-shadow .15s ease |
|
||||
| .site-form textarea | padding | .65rem .8rem |
|
||||
| .site-form textarea | border | 1px solid var(--line) |
|
||||
| .site-form textarea | border-radius | 10px |
|
||||
| .site-form textarea | font | inherit |
|
||||
| .site-form textarea | background | #fdfcfb |
|
||||
| .site-form textarea | transition | border-color .15s ease, box-shadow .15s ease |
|
||||
| .site-form select | padding | .65rem .8rem |
|
||||
| .site-form select | border | 1px solid var(--line) |
|
||||
| .site-form select | border-radius | 10px |
|
||||
| .site-form select | font | inherit |
|
||||
| .site-form select | background | #fdfcfb |
|
||||
| .site-form select | transition | border-color .15s ease, box-shadow .15s ease |
|
||||
| .site-form input:focus | outline | none |
|
||||
| .site-form input:focus | border-color | var(--accent) |
|
||||
| .site-form input:focus | box-shadow | 0 0 0 3px rgba(79,70,229,.12) |
|
||||
| .site-form textarea:focus | outline | none |
|
||||
| .site-form textarea:focus | border-color | var(--accent) |
|
||||
| .site-form textarea:focus | box-shadow | 0 0 0 3px rgba(79,70,229,.12) |
|
||||
| .site-form select:focus | outline | none |
|
||||
| .site-form select:focus | border-color | var(--accent) |
|
||||
| .site-form select:focus | box-shadow | 0 0 0 3px rgba(79,70,229,.12) |
|
||||
| .site-form input[readonly] | background | #f5f5f4 |
|
||||
| .site-form input[readonly] | color | var(--muted) |
|
||||
| .site-form textarea | min-height | 10rem |
|
||||
| .site-form textarea | resize | vertical |
|
||||
| .site-form .err | color | #b91c1c |
|
||||
| .site-form .err | font-size | .85rem |
|
||||
| .site-form .actions | display | flex |
|
||||
| .site-form .actions | gap | .75rem |
|
||||
| .site-form .actions | align-items | center |
|
||||
| .site-form .actions | flex-wrap | wrap |
|
||||
| .site-form .actions | padding-top | .25rem |
|
||||
| .site-form button | background | linear-gradient(120deg, var(--accent), var(--accent-2)) |
|
||||
| .site-form button | color | var(--accent-ink) |
|
||||
| .site-form button | border | 0 |
|
||||
| .site-form button | padding | .6rem 1.3rem |
|
||||
| .site-form button | border-radius | 999px |
|
||||
| .site-form button | cursor | pointer |
|
||||
| .site-form button | font-weight | 600 |
|
||||
| .site-form button | font-size | .95rem |
|
||||
| .site-form button | transition | opacity .15s ease, transform .15s ease, box-shadow .15s ease |
|
||||
| .site-form button:hover | opacity | .92 |
|
||||
| .site-form button:hover | transform | translateY(-1px) |
|
||||
| .site-form button:hover | box-shadow | 0 6px 18px rgba(79,70,229,.3) |
|
||||
| .site-form a.btn | display | inline-block |
|
||||
| .site-form a.btn | padding | .6rem 1.3rem |
|
||||
| .site-form a.btn | border-radius | 999px |
|
||||
| .site-form a.btn | border | 1px solid var(--line) |
|
||||
| .site-form a.btn | color | var(--ink-soft) |
|
||||
| .site-form a.btn | text-decoration | none |
|
||||
| .site-form a.btn | font-weight | 500 |
|
||||
| .site-form a.btn | font-size | .95rem |
|
||||
| .site-form .meta | color | var(--muted) |
|
||||
| .site-form .meta | font-size | .9rem |
|
||||
| .site-form .admin-list | margin | 0 |
|
||||
| .site-form .admin-list | padding | 0 |
|
||||
| .site-form .admin-list | list-style | none |
|
||||
| .site-form .admin-list | display | grid |
|
||||
| .site-form .admin-list | gap | .5rem |
|
||||
| .site-form .admin-list li | background | #fdfcfb |
|
||||
| .site-form .admin-list li | border | 1px solid var(--line) |
|
||||
| .site-form .admin-list li | border-radius | 10px |
|
||||
| .site-form .admin-list li | padding | .6rem .9rem |
|
||||
| .site-form .admin-list li | display | flex |
|
||||
| .site-form .admin-list li | justify-content | space-between |
|
||||
| .site-form .admin-list li | align-items | center |
|
||||
| .site-form .admin-list li | gap | 1rem |
|
||||
| .site-form .admin-list a | color | var(--accent) |
|
||||
| .site-form .admin-list a | text-decoration | none |
|
||||
| .site-form .admin-list a | font-size | .9rem |
|
||||
|
||||
**`表单`**
|
||||
|
||||
## 响应式
|
||||
|
||||
窄屏收为单栏,导航换行。
|
||||
|
||||
`响应式` =
|
||||
|
||||
| 媒体 | 选择器 | 属性 | 值 |
|
||||
|------|--------|------|-----|
|
||||
| (max-width: 860px) | body.has-sidebar | grid-template-columns | 1fr |
|
||||
| (max-width: 860px) | body.has-sidebar | grid-template-areas | "top" "main" "side" "foot" |
|
||||
| (max-width: 860px) | aside.side | border-right | 0 |
|
||||
| (max-width: 860px) | aside.side | border-bottom | 1px solid var(--line) |
|
||||
| (max-width: 860px) | aside.side | padding | 1rem 2rem |
|
||||
| (max-width: 860px) | ul.side-nav | flex-direction | row |
|
||||
| (max-width: 860px) | ul.side-nav | flex-wrap | wrap |
|
||||
| (max-width: 860px) | main.main | padding | 1.75rem 1.25rem 2.5rem |
|
||||
| (max-width: 860px) | header.topnav | padding | .75rem 1.25rem |
|
||||
| (max-width: 860px) | footer.foot | padding | 1.2rem 1.25rem |
|
||||
| (max-width: 860px) | .content.cards | grid-template-columns | 1fr |
|
||||
| (max-width: 520px) | ul.nav | flex-wrap | wrap |
|
||||
|
||||
**`响应式`**
|
||||
|
||||
## 全局
|
||||
|
||||
用 样式装配 函数逐个把段落表装配成 CSS,再拼接成完整样式表。
|
||||
|
||||
*基础表 = > 基础*
|
||||
*顶栏表 = > 顶栏*
|
||||
*侧栏表 = > 侧栏*
|
||||
*主体表 = > 主体*
|
||||
*卡片表 = > 卡片*
|
||||
*页脚表 = > 页脚*
|
||||
*表单表 = > 表单*
|
||||
*响应式表 = > 响应式*
|
||||
|
||||
*css基础 = > 网页.样式装配 名="基础" 表=`基础表`*
|
||||
*css顶栏 = > 网页.样式装配 名="顶栏" 表=`顶栏表`*
|
||||
*css侧栏 = > 网页.样式装配 名="侧栏" 表=`侧栏表`*
|
||||
*css主体 = > 网页.样式装配 名="主体" 表=`主体表`*
|
||||
*css卡片 = > 网页.样式装配 名="卡片" 表=`卡片表`*
|
||||
*css页脚 = > 网页.样式装配 名="页脚" 表=`页脚表`*
|
||||
*css表单 = > 网页.样式装配 名="表单" 表=`表单表`*
|
||||
*css响应式 = > 网页.样式装配 名="响应式" 表=`响应式表`*
|
||||
|
||||
`css段` =
|
||||
|
||||
| css |
|
||||
|-----|
|
||||
| `css基础` |
|
||||
| `css顶栏` |
|
||||
| `css侧栏` |
|
||||
| `css主体` |
|
||||
| `css卡片` |
|
||||
| `css页脚` |
|
||||
| `css表单` |
|
||||
| `css响应式` |
|
||||
|
||||
*css = > text.str_join xs=`css段` sep=""*
|
||||
**css**
|
||||
+55
-2
@@ -17,6 +17,19 @@ Load the ABI v2 `web` plugin once.
|
||||
> sys.exit code=1
|
||||
****
|
||||
|
||||
## make_style
|
||||
+ `name`=""
|
||||
+ `table`
|
||||
|
||||
Assemble a GFM style table into a CSS string. Two shapes are accepted:
|
||||
`|选择器|属性|值|` rule rows (arbitrary selectors; rows sharing a selector are
|
||||
merged, and a leading `|媒体|` column groups rows into `@media` blocks), or
|
||||
`|属性|值|` property rows wrapped as `.name { … }`. Styles stay as data tables,
|
||||
`make_style` turns them into CSS — 样式即数据、装配即函数.
|
||||
|
||||
> ensure_plugin
|
||||
**> web_style name=`name` table=`table`**
|
||||
|
||||
# page
|
||||
+ `title`="Marqdo Web"
|
||||
+ `intro`=""
|
||||
@@ -38,6 +51,45 @@ Assemble main from a bind table (`|属性|值|样式|` or `|front|back|css|`).
|
||||
|
||||
**> web_compose_main page=`self` main=`main`**
|
||||
|
||||
## query
|
||||
+ `query`
|
||||
|
||||
Attach a DB where-condition map for the main bind. Values may contain `{param}`
|
||||
placeholders that are resolved from dynamic-route params (e.g. `/post/{slug}`).
|
||||
|
||||
**> web_page_query page=`self` query=`query`**
|
||||
|
||||
## order
|
||||
+ `order`
|
||||
|
||||
Set a default `ORDER BY` for the main bind (e.g. `-created_at` for newest first).
|
||||
|
||||
**> web_page_order page=`self` order=`order`**
|
||||
|
||||
## link_prefix
|
||||
+ `prefix`
|
||||
|
||||
Prefix for card links in the main bind (default `/post/`). Cards whose bind has
|
||||
an `href`/`链接` field become `<a href="{prefix}{href}">`.
|
||||
|
||||
**> web_page_link_prefix page=`self` prefix=`prefix`**
|
||||
|
||||
## css
|
||||
+ `css`
|
||||
|
||||
Append a raw CSS string to the page's stylesheet (`styles_css`). Use it to ship
|
||||
a hand-written theme alongside the assembled shell.
|
||||
|
||||
**> web_page_css page=`self` css=`css`**
|
||||
|
||||
## detail
|
||||
+ `detail`=True
|
||||
|
||||
Render the main bind's first row as a full article (title/meta/tags/body) instead
|
||||
of a list of cards. Set on the dynamic post page so `/post/{slug}` shows one post.
|
||||
|
||||
**> web_page_detail page=`self` detail=`detail`**
|
||||
|
||||
## compose_form
|
||||
+ `form`
|
||||
+ `id`
|
||||
@@ -95,11 +147,12 @@ Style tables live as `##` exports in site style modules; compose resolves them b
|
||||
+ `table`
|
||||
+ `where`=None
|
||||
+ `limit`=200
|
||||
+ `order`=None
|
||||
|
||||
Simple filters: one-row map of column→value (AND `=`), or rows `|字段|操作|值|` (`=` `!=` `>` `>=` `<` `<=` `like`).
|
||||
Simple filters: one-row map of column→value (AND `=`), or rows `|字段|操作|值|` (`=` `!=` `>` `>=` `<` `<=` `like`). `order` is a column name with optional `-` prefix for descending (`"created_at"`, `"-created_at"`), comma-separated for multiple keys.
|
||||
|
||||
*url = self[^url]*
|
||||
*r = > web_db_select url=`url` table=`table` where=`where` limit=`limit`*
|
||||
**> web_db_select url=`url` table=`table` where=`where` limit=`limit` order=`order`**
|
||||
**r[^rows]**
|
||||
|
||||
## get
|
||||
|
||||
+50
-2
@@ -17,6 +17,18 @@ import sys:lib/sys.mq.md
|
||||
> sys.exit code=1
|
||||
****
|
||||
|
||||
## 样式装配
|
||||
+ `名`=""
|
||||
+ `表`
|
||||
|
||||
把 GFM 样式表装配成一段 CSS 文本。支持两种表形:
|
||||
`|选择器|属性|值|` 规则行(选择器任意,同一选择器多行合并成一条规则;
|
||||
加 `|媒体|` 列即可分组进 `@media` 块),或 `|属性|值|` 属性行(按 `.名 { … }` 包裹)。
|
||||
样式即数据、装配即函数 —— 主题模块据此把样式表拼成完整样式表。
|
||||
|
||||
> 确保插件
|
||||
**> web_style name=`名` table=`表`**
|
||||
|
||||
# 页面
|
||||
+ `标题`="站点"
|
||||
+ `引言`=""
|
||||
@@ -34,6 +46,41 @@ import sys:lib/sys.mq.md
|
||||
|
||||
**> web_compose_main page=`self` main=`主体`**
|
||||
|
||||
## 查询条件
|
||||
+ `条件`
|
||||
|
||||
为主主体绑定附加 DB 条件映射。值可含 `{参数}` 占位符,由动态路由参数替换(如 `/post/{slug}`)。
|
||||
|
||||
**> web_page_query page=`self` query=`条件`**
|
||||
|
||||
## 排序
|
||||
+ `排序`
|
||||
|
||||
设置主主体绑定的默认 `ORDER BY`(如 `-created_at` 表示最新在前)。
|
||||
|
||||
**> web_page_order page=`self` order=`排序`**
|
||||
|
||||
## 链接前缀
|
||||
+ `前缀`
|
||||
|
||||
卡片链接前缀(默认 `/post/`)。主体绑定中含 `链接`/`href` 字段时,卡片标题会包成 `<a href="{前缀}{值}">`。
|
||||
|
||||
**> web_page_link_prefix page=`self` prefix=`前缀`**
|
||||
|
||||
## 样式
|
||||
+ `样式`
|
||||
|
||||
把一段手写 CSS 字符串追加到页面样式表(`styles_css`),用于在装配好的外壳上叠加自定义主题。
|
||||
|
||||
**> web_page_css page=`self` css=`样式`**
|
||||
|
||||
## 详情
|
||||
+ `详情`=True
|
||||
|
||||
把主体绑定的首行渲染成完整文章(标题/日期/标签/正文)而非卡片列表。用于动态文章页 `/post/{slug}`。
|
||||
|
||||
**> web_page_detail page=`self` detail=`详情`**
|
||||
|
||||
## 表单装配
|
||||
+ `表单`
|
||||
+ `id`
|
||||
@@ -87,11 +134,12 @@ import sys:lib/sys.mq.md
|
||||
+ `表`
|
||||
+ `条件`=None
|
||||
+ `上限`=200
|
||||
+ `排序`=None
|
||||
|
||||
简单条件:单行列→值映射(AND `=`),或 `|字段|操作|值|` 表(`=` `!=` `>` `>=` `<` `<=` `like`)。
|
||||
简单条件:单行列→值映射(AND `=`),或 `|字段|操作|值|` 表(`=` `!=` `>` `>=` `<` `<=` `like`)。`排序` 是列名,`-` 前缀表示倒序(`"created_at"`、`"-created_at"`),可逗号分隔多列。
|
||||
|
||||
*url = self[^url]*
|
||||
*r = > web_db_select url=`url` table=`表` where=`条件` limit=`上限`*
|
||||
*r = > web_db_select url=`url` table=`表` where=`条件` limit=`上限` order=`排序`*
|
||||
**r[^rows]**
|
||||
|
||||
## 获取
|
||||
|
||||
@@ -134,10 +134,14 @@ pub fn compose_main(
|
||||
SitePath::DbField { table, field } => format!("{table}.{field}"),
|
||||
SitePath::Plain(s) => s,
|
||||
SitePath::LibMember { lib, member } => {
|
||||
let v = call_lib(&format!("{lib}.{member}"))?;
|
||||
match v {
|
||||
Value::String(s) => s,
|
||||
other => other.to_string(),
|
||||
// Try a module member (e.g. `theme.hero`); if the lib is unknown,
|
||||
// treat `a.b` as a DB field `a.b` (table `a`, column `b`).
|
||||
match call_lib(&format!("{lib}.{member}")) {
|
||||
Ok(v) => match v {
|
||||
Value::String(s) => s,
|
||||
other => other.to_string(),
|
||||
},
|
||||
Err(_) => format!("{lib}.{member}"),
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -272,6 +272,20 @@ pub fn select(
|
||||
table: &str,
|
||||
limit: i64,
|
||||
where_v: Option<&Value>,
|
||||
) -> Result<Value, String> {
|
||||
select_order(url, table, limit, where_v, None)
|
||||
}
|
||||
|
||||
/// Like `select`, with an optional `ORDER BY`.
|
||||
///
|
||||
/// `order` is a column name, optionally prefixed with `-` for descending
|
||||
/// (`"created_at"`, `"-created_at"`). Comma-separated lists are allowed.
|
||||
pub fn select_order(
|
||||
url: &str,
|
||||
table: &str,
|
||||
limit: i64,
|
||||
where_v: Option<&Value>,
|
||||
order: Option<&str>,
|
||||
) -> Result<Value, String> {
|
||||
let table = ident(table)?;
|
||||
let (clauses, mut vals) = parse_where(where_v)?;
|
||||
@@ -281,6 +295,28 @@ pub fn select(
|
||||
sql.push_str(" WHERE ");
|
||||
sql.push_str(&clauses.join(" AND "));
|
||||
}
|
||||
if let Some(order) = order {
|
||||
let order = order.trim();
|
||||
if !order.is_empty() {
|
||||
let parts: Vec<&str> = order
|
||||
.split(',')
|
||||
.map(|p| p.trim())
|
||||
.filter(|p| !p.is_empty())
|
||||
.collect();
|
||||
let mut exprs = Vec::new();
|
||||
for part in parts {
|
||||
let (col, dir) = match part.strip_prefix('-') {
|
||||
Some(col) => (col, " DESC"),
|
||||
None => (part, ""),
|
||||
};
|
||||
exprs.push(format!("\"{}\"{}", ident(col)?, dir));
|
||||
}
|
||||
if !exprs.is_empty() {
|
||||
sql.push_str(" ORDER BY ");
|
||||
sql.push_str(&exprs.join(", "));
|
||||
}
|
||||
}
|
||||
}
|
||||
sql.push_str(&format!(" LIMIT ?{}", vals.len() + 1));
|
||||
vals.push(rusqlite::types::Value::Integer(limit));
|
||||
let mut stmt = conn.prepare(&sql).map_err(|e| e.to_string())?;
|
||||
|
||||
+64
-34
@@ -6,7 +6,6 @@ use std::path::PathBuf;
|
||||
use std::sync::Arc;
|
||||
|
||||
use axum::extract::{Form, Path, Query, State};
|
||||
use axum::http::Uri;
|
||||
use axum::response::{Html, IntoResponse, Redirect, Response};
|
||||
use axum::routing::get;
|
||||
use axum::Router;
|
||||
@@ -28,7 +27,6 @@ struct AppState {
|
||||
forms: HashMap<String, Value>,
|
||||
/// Page that owns an embedded form (for re-render on validation errors).
|
||||
form_owners: HashMap<String, Value>,
|
||||
routes: HashMap<String, Value>,
|
||||
/// Admin users table (`|用户名|密码|`) when login-gated admin is configured.
|
||||
auth_users: Option<Value>,
|
||||
session_ttl: u64,
|
||||
@@ -82,7 +80,6 @@ pub fn listen(
|
||||
admin,
|
||||
forms,
|
||||
form_owners,
|
||||
routes: routes.clone(),
|
||||
auth_users,
|
||||
session_ttl,
|
||||
});
|
||||
@@ -103,12 +100,52 @@ pub fn listen(
|
||||
.route("/admin/{table}/{id}/delete", get(admin_delete));
|
||||
|
||||
// Register each author route as an exact GET path + `{path}/_part/{id}`.
|
||||
// Paths containing `{param}` become dynamic routes (e.g. `/post/{slug}`);
|
||||
// the captured params are injected into the page before rendering.
|
||||
let mut paths: Vec<String> = routes.keys().cloned().collect();
|
||||
paths.sort();
|
||||
for path in paths {
|
||||
app = app.route(&path, get(routed_page));
|
||||
let part_path = format!("{path}/_part/{{id}}");
|
||||
app = app.route(&part_path, get(routed_part));
|
||||
let page = routes.get(&path).cloned().unwrap_or_default();
|
||||
let dynamic = path.contains('{');
|
||||
if dynamic {
|
||||
let page_for_render = page.clone();
|
||||
app = app.route(
|
||||
&path,
|
||||
get(async move |State(st): State<Arc<AppState>>, Path(params): Path<HashMap<String, String>>| {
|
||||
let mut p = page_for_render.clone();
|
||||
inject_params(&mut p, ¶ms);
|
||||
Html(render::render_page(&p, st.db_url.as_deref())).into_response()
|
||||
}),
|
||||
);
|
||||
// Dynamic `{path}/_part/{id}` with the same path params.
|
||||
let part_path = format!("{path}/_part/{{id}}");
|
||||
let page_for_part = page.clone();
|
||||
app = app.route(
|
||||
&part_path,
|
||||
get(async move |State(st): State<Arc<AppState>>, Path((params, id)): Path<(HashMap<String, String>, String)>| {
|
||||
let mut p = page_for_part.clone();
|
||||
inject_params(&mut p, ¶ms);
|
||||
render_part_from_page(&p, &id, st.db_url.as_deref())
|
||||
}),
|
||||
);
|
||||
} else {
|
||||
let page_for_render = page.clone();
|
||||
app = app.route(
|
||||
&path,
|
||||
get(async move |State(st): State<Arc<AppState>>| {
|
||||
Html(render::render_page(&page_for_render, st.db_url.as_deref()))
|
||||
.into_response()
|
||||
}),
|
||||
);
|
||||
let part_path = format!("{path}/_part/{{id}}");
|
||||
let page_for_part = page.clone();
|
||||
app = app.route(
|
||||
&part_path,
|
||||
get(async move |State(st): State<Arc<AppState>>, Path(id): Path<String>| {
|
||||
render_part_from_page(&page_for_part, &id, st.db_url.as_deref())
|
||||
}),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// WebSocket endpoints (`ws://…/{path}`), echo-mode by default.
|
||||
@@ -181,15 +218,28 @@ async fn home(State(st): State<Arc<AppState>>) -> Html<String> {
|
||||
Html(html)
|
||||
}
|
||||
|
||||
async fn routed_page(State(st): State<Arc<AppState>>, uri: Uri) -> Response {
|
||||
let mut path = uri.path().to_string();
|
||||
while path.len() > 1 && path.ends_with('/') {
|
||||
path.pop();
|
||||
/// Inject captured dynamic-route params into a page copy as `params` (a map),
|
||||
/// so render can resolve `{param}` placeholders in `query`/`intro`.
|
||||
fn inject_params(page: &mut Value, params: &HashMap<String, String>) {
|
||||
if let Some(obj) = page.as_object_mut() {
|
||||
let mut map = Map::new();
|
||||
for (k, v) in params {
|
||||
map.insert(k.clone(), json!(v));
|
||||
}
|
||||
obj.insert("params".into(), Value::Object(map));
|
||||
// Propagate into every part (fragments render independently).
|
||||
if let Some(parts) = obj.get_mut("parts").and_then(|p| p.as_object_mut()) {
|
||||
for cfg in parts.values_mut() {
|
||||
if let Some(m) = cfg.as_object_mut() {
|
||||
let mut pmap = Map::new();
|
||||
for (k, v) in params {
|
||||
pmap.insert(k.clone(), json!(v));
|
||||
}
|
||||
m.insert("params".into(), Value::Object(pmap));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
let Some(page) = st.routes.get(&path) else {
|
||||
return Html(format!("<p>404 not found: {}</p>", esc(&path))).into_response();
|
||||
};
|
||||
Html(render::render_page(page, st.db_url.as_deref())).into_response()
|
||||
}
|
||||
|
||||
fn render_part_from_page(page: &Value, id: &str, db_url: Option<&str>) -> Response {
|
||||
@@ -206,26 +256,6 @@ async fn home_part(State(st): State<Arc<AppState>>, Path(id): Path<String>) -> R
|
||||
render_part_from_page(&st.page, &id, st.db_url.as_deref())
|
||||
}
|
||||
|
||||
/// `{route}/_part/{id}` — resolve part against the page mounted at `route`.
|
||||
async fn routed_part(
|
||||
State(st): State<Arc<AppState>>,
|
||||
uri: Uri,
|
||||
Path(id): Path<String>,
|
||||
) -> Response {
|
||||
let full = uri.path();
|
||||
let marker = format!("/_part/{id}");
|
||||
let Some(page_path) = full.strip_suffix(&marker) else {
|
||||
return Html(format!("<p>bad part path {}</p>", esc(full))).into_response();
|
||||
};
|
||||
if page_path.is_empty() || page_path == "/" {
|
||||
return render_part_from_page(&st.page, &id, st.db_url.as_deref());
|
||||
}
|
||||
let Some(page) = st.routes.get(page_path) else {
|
||||
return Html(format!("<p>404 not found: {}</p>", esc(page_path))).into_response();
|
||||
};
|
||||
render_part_from_page(page, &id, st.db_url.as_deref())
|
||||
}
|
||||
|
||||
async fn form_get(State(st): State<Arc<AppState>>, Path(id): Path<String>) -> Response {
|
||||
let Some(frm) = st.forms.get(&id) else {
|
||||
return Html(format!("<p>unknown form {id}</p>")).into_response();
|
||||
|
||||
+104
-2
@@ -9,6 +9,8 @@ mod session;
|
||||
mod table;
|
||||
mod ws;
|
||||
|
||||
use crate::table::as_css_named;
|
||||
|
||||
use std::ffi::{CStr, CString};
|
||||
use std::os::raw::{c_char, c_int, c_void};
|
||||
use std::path::PathBuf;
|
||||
@@ -275,6 +277,71 @@ web_ffi!(web_compose_main, |args: &Value| {
|
||||
compose::compose_main(&page, &main, |path| call_lib(path))
|
||||
});
|
||||
|
||||
web_ffi!(web_page_query, |args: &Value| {
|
||||
let page = args.get("page").cloned().unwrap_or(json!({}));
|
||||
let query = args.get("query").cloned().unwrap_or(json!({}));
|
||||
let mut obj = page.as_object().cloned().unwrap_or_default();
|
||||
obj.insert("query".into(), query);
|
||||
Ok(Value::Object(obj))
|
||||
});
|
||||
|
||||
web_ffi!(web_page_order, |args: &Value| {
|
||||
let page = args.get("page").cloned().unwrap_or(json!({}));
|
||||
let order = arg_str(args, "order")?.to_string();
|
||||
let mut obj = page.as_object().cloned().unwrap_or_default();
|
||||
obj.insert("order".into(), json!(order));
|
||||
Ok(Value::Object(obj))
|
||||
});
|
||||
|
||||
web_ffi!(web_page_link_prefix, |args: &Value| {
|
||||
let page = args.get("page").cloned().unwrap_or(json!({}));
|
||||
let prefix = arg_str(args, "prefix")?.to_string();
|
||||
let mut obj = page.as_object().cloned().unwrap_or_default();
|
||||
obj.insert("link_prefix".into(), json!(prefix));
|
||||
Ok(Value::Object(obj))
|
||||
});
|
||||
|
||||
web_ffi!(web_page_css, |args: &Value| {
|
||||
let page = args.get("page").cloned().unwrap_or(json!({}));
|
||||
let css = arg_str_opt(args, "css").unwrap_or("").to_string();
|
||||
let mut obj = page.as_object().cloned().unwrap_or_default();
|
||||
if !css.trim().is_empty() {
|
||||
let prev = obj
|
||||
.get("styles_css")
|
||||
.and_then(|v| v.as_str())
|
||||
.unwrap_or("")
|
||||
.to_string();
|
||||
obj.insert("styles_css".into(), json!(format!("{prev}\n{css}")));
|
||||
}
|
||||
Ok(Value::Object(obj))
|
||||
});
|
||||
|
||||
// Assemble a GFM style table into CSS text.
|
||||
//
|
||||
// Two shapes are accepted:
|
||||
// 1. Rule rows `|选择器|属性|值|` → `selector { prop: value; }`
|
||||
// 2. Property rows `|属性|值|` → `.name { prop: value; }`
|
||||
//
|
||||
// The `name` argument names the CSS class for shape 2, and is ignored for
|
||||
// shape 1. This is how Marqdo-side theme modules turn style tables into a
|
||||
// stylesheet with 文档即代码 — styles are data, assembly is a function.
|
||||
web_ffi!(web_style, |args: &Value| {
|
||||
let name = arg_str_opt(args, "name").unwrap_or("").to_string();
|
||||
let table = args.get("table").cloned().unwrap_or(json!([]));
|
||||
Ok(Value::String(as_css_named(&name, &table)))
|
||||
});
|
||||
|
||||
web_ffi!(web_page_detail, |args: &Value| {
|
||||
let page = args.get("page").cloned().unwrap_or(json!({}));
|
||||
let on = args
|
||||
.get("detail")
|
||||
.and_then(|v| v.as_bool())
|
||||
.unwrap_or(true);
|
||||
let mut obj = page.as_object().cloned().unwrap_or_default();
|
||||
obj.insert("detail".into(), json!(on));
|
||||
Ok(Value::Object(obj))
|
||||
});
|
||||
|
||||
web_ffi!(web_compose_form, |args: &Value| {
|
||||
let page = args.get("page").cloned().unwrap_or(json!({}));
|
||||
let form = args
|
||||
@@ -335,7 +402,12 @@ web_ffi!(web_db_select, |args: &Value| {
|
||||
}
|
||||
Some(v) => Some(v),
|
||||
};
|
||||
db::select(&url, &table, limit, where_v)
|
||||
let order = args.get("order").and_then(|v| v.as_str());
|
||||
if order.is_some_and(|s| !s.trim().is_empty()) {
|
||||
db::select_order(&url, &table, limit, where_v, order)
|
||||
} else {
|
||||
db::select(&url, &table, limit, where_v)
|
||||
}
|
||||
});
|
||||
|
||||
web_ffi!(web_db_get, |args: &Value| {
|
||||
@@ -893,6 +965,36 @@ pub unsafe extern "C" fn marqdo_plugin_init(host: *const MarqdoHostApi) -> c_int
|
||||
web_compose_components as PluginFn,
|
||||
),
|
||||
("web_compose_main", "page,main", web_compose_main as PluginFn),
|
||||
(
|
||||
"web_page_query",
|
||||
"page,query",
|
||||
web_page_query as PluginFn,
|
||||
),
|
||||
(
|
||||
"web_page_order",
|
||||
"page,order",
|
||||
web_page_order as PluginFn,
|
||||
),
|
||||
(
|
||||
"web_page_link_prefix",
|
||||
"page,prefix",
|
||||
web_page_link_prefix as PluginFn,
|
||||
),
|
||||
(
|
||||
"web_page_css",
|
||||
"page,css",
|
||||
web_page_css as PluginFn,
|
||||
),
|
||||
(
|
||||
"web_page_detail",
|
||||
"page,detail",
|
||||
web_page_detail as PluginFn,
|
||||
),
|
||||
(
|
||||
"web_style",
|
||||
"name,table",
|
||||
web_style as PluginFn,
|
||||
),
|
||||
(
|
||||
"web_compose_form",
|
||||
"page,form,id",
|
||||
@@ -904,7 +1006,7 @@ pub unsafe extern "C" fn marqdo_plugin_init(host: *const MarqdoHostApi) -> c_int
|
||||
("web_db_insert", "url,table,rows", web_db_insert as PluginFn),
|
||||
(
|
||||
"web_db_select",
|
||||
"url,table,where,limit",
|
||||
"url,table,where,limit,order",
|
||||
web_db_select as PluginFn,
|
||||
),
|
||||
("web_db_get", "url,table,id", web_db_get as PluginFn),
|
||||
|
||||
+203
-34
@@ -1,6 +1,6 @@
|
||||
//! Minimal HTML shell for assembled pages / parts.
|
||||
|
||||
use serde_json::{Map, Value};
|
||||
use serde_json::{json, Map, Value};
|
||||
|
||||
use crate::db;
|
||||
use crate::table::{as_bind, normalize_ref, normalize_slot, parse_site_path, project_rows, SitePath};
|
||||
@@ -77,9 +77,7 @@ fn resolve_links(raw: Option<&Value>, db_url: Option<&str>) -> Vec<(String, Stri
|
||||
let Some(table) = table else {
|
||||
return Vec::new();
|
||||
};
|
||||
let Ok(data) = db::select(url, &table, 200, None) else {
|
||||
return Vec::new();
|
||||
};
|
||||
let data = select_page_data(url, &table, raw, 200);
|
||||
let rows = data
|
||||
.get("rows")
|
||||
.and_then(|v| v.as_array())
|
||||
@@ -149,9 +147,7 @@ fn resolve_main(args: &Value, db_url: Option<&str>) -> (String, Vec<Map<String,
|
||||
let Some(table) = crate::table::bind_table_name(&arr) else {
|
||||
return (intro, Vec::new());
|
||||
};
|
||||
let Ok(data) = db::select(url, &table, 200, None) else {
|
||||
return (intro, Vec::new());
|
||||
};
|
||||
let data = select_page_data(url, &table, args, 200);
|
||||
let rows = data
|
||||
.get("rows")
|
||||
.and_then(|v| v.as_array())
|
||||
@@ -168,6 +164,66 @@ fn resolve_main(args: &Value, db_url: Option<&str>) -> (String, Vec<Map<String,
|
||||
(intro, items)
|
||||
}
|
||||
|
||||
/// Run the page's DB query: `where` (with `{param}` placeholders resolved from
|
||||
/// `params`) and optional `order`, then project through the bind table.
|
||||
fn select_page_data(
|
||||
url: &str,
|
||||
table: &str,
|
||||
args: &Value,
|
||||
limit: i64,
|
||||
) -> Value {
|
||||
let mut where_v = args.get("query").cloned();
|
||||
if let Some(m) = where_v.as_ref().and_then(|v| v.as_object()) {
|
||||
if m.iter().any(|(_, v)| v.as_str().is_some_and(|s| s.contains('{'))) {
|
||||
let mut resolved = Map::new();
|
||||
for (k, v) in m {
|
||||
let v = match v {
|
||||
Value::String(s) => Value::String(resolve_params(s.as_str(), args)),
|
||||
other => other.clone(),
|
||||
};
|
||||
resolved.insert(k.clone(), v);
|
||||
}
|
||||
where_v = Some(Value::Object(resolved));
|
||||
}
|
||||
}
|
||||
let order = args.get("order").and_then(|v| v.as_str());
|
||||
if order.is_some_and(|s| !s.trim().is_empty()) {
|
||||
db::select_order(url, table, limit, where_v.as_ref(), order)
|
||||
} else {
|
||||
db::select(url, table, limit, where_v.as_ref())
|
||||
}
|
||||
.unwrap_or(json!({ "rows": [] }))
|
||||
}
|
||||
|
||||
/// Replace `{param}` placeholders with values from `args["params"]` (a map).
|
||||
fn resolve_params(s: &str, args: &Value) -> String {
|
||||
let params = args
|
||||
.get("params")
|
||||
.and_then(|v| v.as_object())
|
||||
.cloned()
|
||||
.unwrap_or_default();
|
||||
let mut out = String::new();
|
||||
let mut rest = s;
|
||||
while let Some(start) = rest.find('{') {
|
||||
out.push_str(&rest[..start]);
|
||||
rest = &rest[start + 1..];
|
||||
if let Some(end) = rest.find('}') {
|
||||
let key = &rest[..end];
|
||||
let val = params
|
||||
.get(key)
|
||||
.map(text)
|
||||
.unwrap_or_else(|| format!("{{{key}}}"));
|
||||
out.push_str(&val);
|
||||
rest = &rest[end + 1..];
|
||||
} else {
|
||||
out.push('{');
|
||||
break;
|
||||
}
|
||||
}
|
||||
out.push_str(rest);
|
||||
out
|
||||
}
|
||||
|
||||
fn field_css(obj: &Map<String, Value>, field: &str) -> String {
|
||||
obj.get("_css")
|
||||
.and_then(|v| v.as_object())
|
||||
@@ -255,6 +311,14 @@ a:hover { color:var(--accent); }
|
||||
.site-form .actions { display:flex; gap:.75rem; align-items:center; flex-wrap:wrap; }
|
||||
.site-form button { background:var(--accent); color:#fff; border:0; padding:.55rem 1rem; border-radius:4px; cursor:pointer; }
|
||||
.site-form .meta { color:var(--muted); font-size:.9rem; }
|
||||
.article { background:#fff; border:1px solid var(--line); border-radius:8px; padding:2rem; margin-top:1.5rem; }
|
||||
.article-meta { color:var(--muted); font-size:.85rem; }
|
||||
.article-title { margin:0 0 .75rem; font-size:2rem; }
|
||||
.article-tags { margin-bottom:1rem; }
|
||||
.article-body { line-height:1.75; color:var(--ink); }
|
||||
.article-p { margin:0 0 1rem; white-space:pre-line; }
|
||||
.article-h2 { margin:1.5rem 0 .75rem; }
|
||||
.article-code { background:#f5f5f4; border:1px solid var(--line); border-radius:6px; padding:1rem; overflow-x:auto; font-size:.9rem; }
|
||||
"#;
|
||||
|
||||
pub fn render_page(args: &Value, db_url: Option<&str>) -> String {
|
||||
@@ -311,23 +375,19 @@ pub fn render_page_ex(
|
||||
));
|
||||
}
|
||||
if !items.is_empty() {
|
||||
main_html.push_str("<section class=\"content cards\">");
|
||||
for it in &items {
|
||||
let title = it
|
||||
.get("title")
|
||||
.map(text)
|
||||
.unwrap_or_else(|| "item".into());
|
||||
let body = it.get("body").map(text).unwrap_or_default();
|
||||
let tc = class_attr(&field_css(it, "title"));
|
||||
let bc = class_attr(&field_css(it, "body"));
|
||||
main_html.push_str("<article>");
|
||||
main_html.push_str(&format!("<h2{tc}>{}</h2>", esc(&title)));
|
||||
if !body.is_empty() {
|
||||
main_html.push_str(&format!("<p{bc}>{}</p>", esc(&body)));
|
||||
let is_detail = args
|
||||
.get("detail")
|
||||
.and_then(|v| v.as_bool())
|
||||
.unwrap_or(false);
|
||||
if is_detail {
|
||||
main_html.push_str(&render_article(&items[0]));
|
||||
} else {
|
||||
main_html.push_str("<section class=\"content cards\">");
|
||||
for it in &items {
|
||||
main_html.push_str(&render_card(args, it));
|
||||
}
|
||||
main_html.push_str("</article>");
|
||||
main_html.push_str("</section>");
|
||||
}
|
||||
main_html.push_str("</section>");
|
||||
}
|
||||
|
||||
format!(
|
||||
@@ -409,21 +469,130 @@ pub fn render_fragment(args: &Value, db_url: Option<&str>) -> String {
|
||||
body.push_str(&crate::form::render_body(form, form_id, None, None));
|
||||
}
|
||||
if !items.is_empty() {
|
||||
body.push_str("<section class=\"content cards\">");
|
||||
for it in &items {
|
||||
let title = it.get("title").map(text).unwrap_or_default();
|
||||
let b = it.get("body").map(text).unwrap_or_default();
|
||||
let tc = class_attr(&field_css(it, "title"));
|
||||
let bc = class_attr(&field_css(it, "body"));
|
||||
body.push_str(&format!(
|
||||
"<article><h2{tc}>{}</h2><p{bc}>{}</p></article>",
|
||||
esc(&title),
|
||||
esc(&b)
|
||||
));
|
||||
let is_detail = args
|
||||
.get("detail")
|
||||
.and_then(|v| v.as_bool())
|
||||
.unwrap_or(false);
|
||||
if is_detail {
|
||||
body.push_str(&render_article(&items[0]));
|
||||
} else {
|
||||
body.push_str("<section class=\"content cards\">");
|
||||
for it in &items {
|
||||
body.push_str(&render_card(args, it));
|
||||
}
|
||||
body.push_str("</section>");
|
||||
}
|
||||
body.push_str("</section>");
|
||||
}
|
||||
format!("<main class=\"main\" data-slot=\"main\">{body}</main>")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Render a single list card from a projected DB row.
|
||||
fn render_card(args: &Value, it: &Map<String, Value>) -> String {
|
||||
let title = it.get("title").map(text).unwrap_or_default();
|
||||
let body = it.get("body").map(text).unwrap_or_default();
|
||||
let href = it.get("href").map(text).unwrap_or_default();
|
||||
let meta = it.get("meta").map(text).unwrap_or_default();
|
||||
let tag = it.get("tag").map(text).unwrap_or_default();
|
||||
let tc = class_attr(&field_css(it, "title"));
|
||||
let bc = class_attr(&field_css(it, "body"));
|
||||
let mut card = String::from("<article class=\"card\">");
|
||||
if !href.is_empty() {
|
||||
let prefix = args
|
||||
.get("link_prefix")
|
||||
.and_then(|v| v.as_str())
|
||||
.unwrap_or("/post/");
|
||||
card.push_str(&format!(
|
||||
"<a class=\"card-link\" href=\"{}\">",
|
||||
esc(&format!("{prefix}{href}"))
|
||||
));
|
||||
}
|
||||
if !meta.is_empty() {
|
||||
card.push_str(&format!(
|
||||
"<div class=\"card-meta\">{}</div>",
|
||||
esc(&meta)
|
||||
));
|
||||
}
|
||||
card.push_str(&format!("<h2{tc}>{}</h2>", esc(&title)));
|
||||
if !tag.is_empty() {
|
||||
card.push_str(&format!(
|
||||
"<div class=\"card-tag\">{}</div>",
|
||||
esc(&tag)
|
||||
));
|
||||
}
|
||||
if !body.is_empty() {
|
||||
card.push_str(&format!("<p{bc}>{}</p>", esc(&body)));
|
||||
}
|
||||
if !href.is_empty() {
|
||||
card.push_str("</a>");
|
||||
}
|
||||
card.push_str("</article>");
|
||||
card
|
||||
}
|
||||
|
||||
/// Render a single article (detail page) from a projected DB row.
|
||||
fn render_article(it: &Map<String, Value>) -> String {
|
||||
let title = it.get("title").map(text).unwrap_or_default();
|
||||
let body = it.get("body").map(text).unwrap_or_default();
|
||||
let meta = it.get("meta").map(text).unwrap_or_default();
|
||||
let tag = it.get("tag").map(text).unwrap_or_default();
|
||||
let mut s = String::from("<article class=\"article\">");
|
||||
if !meta.is_empty() {
|
||||
s.push_str(&format!(
|
||||
"<div class=\"article-meta\">{}</div>",
|
||||
esc(&meta)
|
||||
));
|
||||
}
|
||||
s.push_str(&format!("<h1 class=\"article-title\">{}</h1>", esc(&title)));
|
||||
if !tag.is_empty() {
|
||||
s.push_str(&format!(
|
||||
"<div class=\"article-tags\">{}</div>",
|
||||
esc(&tag)
|
||||
));
|
||||
}
|
||||
if !body.is_empty() {
|
||||
s.push_str(&render_article_body(&body));
|
||||
}
|
||||
s.push_str("</article>");
|
||||
s
|
||||
}
|
||||
|
||||
/// Split a Markdown-ish article body into block elements.
|
||||
fn render_article_body(body: &str) -> String {
|
||||
let mut s = String::from("<div class=\"article-body\">");
|
||||
for para in body.split("\n\n") {
|
||||
let para = para.trim();
|
||||
if para.is_empty() {
|
||||
continue;
|
||||
}
|
||||
if let Some(code) = para.strip_prefix("```") {
|
||||
let code = code.strip_suffix("```").unwrap_or(code);
|
||||
s.push_str(&format!(
|
||||
"<pre class=\"article-code\">{}</pre>",
|
||||
esc(code)
|
||||
));
|
||||
continue;
|
||||
}
|
||||
if let Some(h) = para.strip_prefix("## ") {
|
||||
s.push_str(&format!(
|
||||
"<h2 class=\"article-h2\">{}</h2>",
|
||||
esc(h.trim())
|
||||
));
|
||||
continue;
|
||||
}
|
||||
if let Some(h) = para.strip_prefix("# ") {
|
||||
s.push_str(&format!(
|
||||
"<h2 class=\"article-h2\">{}</h2>",
|
||||
esc(h.trim())
|
||||
));
|
||||
continue;
|
||||
}
|
||||
s.push_str(&format!(
|
||||
"<p class=\"article-p\">{}</p>",
|
||||
esc(para).replace('\n', "<br/>")
|
||||
));
|
||||
}
|
||||
s.push_str("</div>");
|
||||
s
|
||||
}
|
||||
+153
-15
@@ -12,6 +12,8 @@ const SRC_KEYS: &[&str] = &["组件", "导入的页面", "src", "page"];
|
||||
const STYLE_KEYS: &[&str] = &["样式", "style", "class"];
|
||||
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"];
|
||||
|
||||
pub fn normalize_ref(s: &str) -> String {
|
||||
let s = s.trim();
|
||||
@@ -270,42 +272,178 @@ pub fn normalize_slot(name: &str) -> String {
|
||||
}
|
||||
}
|
||||
|
||||
/// Style table → CSS text for `.name { … }`
|
||||
/// Style table → CSS text.
|
||||
///
|
||||
/// Three table shapes are supported:
|
||||
/// 1. Rule rows `|媒体|选择器|属性|值|` — rows grouped by `媒体` emit
|
||||
/// `@media { … }` blocks; rows sharing a selector are merged into one rule.
|
||||
/// 2. Rule rows `|选择器|属性|值|` — each row emits `selector { prop: value; }`,
|
||||
/// rows sharing a selector are merged into one rule. `selector` may be any
|
||||
/// CSS selector (`aside.side`, `ul.side-nav a:hover`).
|
||||
/// 3. Plain property rows `|属性|值|` — emitted as `.name { prop: value; }`.
|
||||
///
|
||||
/// Examples (rule shape):
|
||||
/// ```text
|
||||
/// | 媒体 | 选择器 | 属性 | 值 |
|
||||
/// |------|--------|------|-----|
|
||||
/// | (max-width: 860px) | aside.side | padding | 1rem 2rem |
|
||||
///
|
||||
/// | 选择器 | 属性 | 值 |
|
||||
/// |--------|------|-----|
|
||||
/// | aside.side | padding | 2rem 1.25rem |
|
||||
/// | aside.side | background | #f5f5f4 |
|
||||
/// | ul.side-nav a:hover | color | var(--accent) |
|
||||
/// ```
|
||||
pub fn as_css_named(name: &str, table: &Value) -> String {
|
||||
let name = normalize_ref(name);
|
||||
if name.is_empty() {
|
||||
return String::new();
|
||||
}
|
||||
let mut rules = Vec::new();
|
||||
let mut out = String::new();
|
||||
match table {
|
||||
Value::Object(m) => {
|
||||
// Column-first table object: `{选择器:[…], 属性:[…], 值:[…], 媒体:[…]}`
|
||||
// (how GFM tables reach the plugin). Row-major maps (one rule per map)
|
||||
// are handled too: if 选择器 is a scalar, treat it as a single row.
|
||||
let sels = pick(m, SEL_KEYS).map(as_str_list).unwrap_or_default();
|
||||
let props = pick(m, PROP_KEYS).map(as_str_list).unwrap_or_default();
|
||||
let vals = pick(m, VAL_KEYS).map(as_str_list).unwrap_or_default();
|
||||
for (i, p) in props.iter().enumerate() {
|
||||
let medias = pick(m, MEDIA_KEYS).map(as_str_list).unwrap_or_default();
|
||||
let n = props.len().max(sels.len()).max(vals.len());
|
||||
if n == 0 {
|
||||
return String::new();
|
||||
}
|
||||
let rows: Vec<(String, String, String, String)> = (0..n)
|
||||
.map(|i| {
|
||||
(
|
||||
medias.get(i).cloned().unwrap_or_default(),
|
||||
sels.get(i).cloned().unwrap_or_default(),
|
||||
props.get(i).cloned().unwrap_or_default(),
|
||||
vals.get(i).cloned().unwrap_or_default(),
|
||||
)
|
||||
})
|
||||
.collect();
|
||||
// Group by media then selector; or plain `.name { … }` when no selectors.
|
||||
let mut by_media: Vec<(String, Vec<(String, Vec<String>)>)> = Vec::new();
|
||||
let mut plain: Vec<String> = Vec::new();
|
||||
for (media, sel, p, v) in rows {
|
||||
if p.is_empty() {
|
||||
continue;
|
||||
}
|
||||
let v = vals.get(i).cloned().unwrap_or_default();
|
||||
rules.push(format!(" {p}: {v};"));
|
||||
let decl = format!(" {p}: {v};");
|
||||
if !media.is_empty() {
|
||||
let group = match by_media.iter_mut().find(|(mq, _)| *mq == media) {
|
||||
Some((_, g)) => g,
|
||||
None => {
|
||||
by_media.push((media.clone(), Vec::new()));
|
||||
let (_, g) = by_media.last_mut().unwrap();
|
||||
g
|
||||
}
|
||||
};
|
||||
push_rule(group, &sel, decl);
|
||||
} else if !sel.is_empty() {
|
||||
let group = match by_media.iter_mut().find(|(mq, _)| mq.is_empty()) {
|
||||
Some((_, g)) => g,
|
||||
None => {
|
||||
by_media.push((String::new(), Vec::new()));
|
||||
let (_, g) = by_media.last_mut().unwrap();
|
||||
g
|
||||
}
|
||||
};
|
||||
push_rule(group, &sel, decl);
|
||||
} else {
|
||||
plain.push(decl);
|
||||
}
|
||||
}
|
||||
for (media, rules) in by_media {
|
||||
if media.is_empty() {
|
||||
for (sel, decls) in rules {
|
||||
out.push_str(&format!("{} {{\n{}\n}}\n", sel, decls.join("\n")));
|
||||
}
|
||||
} else {
|
||||
let inner = rules
|
||||
.iter()
|
||||
.map(|(sel, decls)| format!("{} {{\n{}\n}}", sel, decls.join("\n")))
|
||||
.collect::<Vec<_>>()
|
||||
.join("\n");
|
||||
out.push_str(&format!("@media {} {{\n{}\n}}\n", media, inner));
|
||||
}
|
||||
}
|
||||
if !plain.is_empty() {
|
||||
out.push_str(&format!(".{} {{\n{}\n}}\n", name, plain.join("\n")));
|
||||
}
|
||||
}
|
||||
Value::Array(rows) => {
|
||||
// Group rule rows by media query and selector; plain rows as `.name { … }`.
|
||||
let mut by_media: Vec<(String, Vec<(String, Vec<String>)>)> = Vec::new();
|
||||
let mut plain: Vec<String> = Vec::new();
|
||||
for row in rows {
|
||||
if let Some(m) = row.as_object() {
|
||||
let p = pick(m, PROP_KEYS).map(cell_str).unwrap_or_default();
|
||||
let v = pick(m, VAL_KEYS).map(cell_str).unwrap_or_default();
|
||||
if !p.is_empty() {
|
||||
rules.push(format!(" {p}: {v};"));
|
||||
}
|
||||
let Some(m) = row.as_object() else { continue };
|
||||
let media = pick(m, MEDIA_KEYS).map(cell_str).unwrap_or_default();
|
||||
let sel = pick(m, SEL_KEYS).map(cell_str).unwrap_or_default();
|
||||
let p = pick(m, PROP_KEYS).map(cell_str).unwrap_or_default();
|
||||
let v = pick(m, VAL_KEYS).map(cell_str).unwrap_or_default();
|
||||
if p.is_empty() {
|
||||
continue;
|
||||
}
|
||||
let decl = format!(" {p}: {v};");
|
||||
if !media.is_empty() {
|
||||
let group = match by_media.iter_mut().find(|(mq, _)| *mq == media) {
|
||||
Some((_, g)) => g,
|
||||
None => {
|
||||
by_media.push((media.clone(), Vec::new()));
|
||||
let (_, g) = by_media.last_mut().unwrap();
|
||||
g
|
||||
}
|
||||
};
|
||||
push_rule(group, &sel, decl);
|
||||
} else if !sel.is_empty() {
|
||||
let group = match by_media.iter_mut().find(|(mq, _)| mq.is_empty()) {
|
||||
Some((_, g)) => g,
|
||||
None => {
|
||||
by_media.push((String::new(), Vec::new()));
|
||||
let (_, g) = by_media.last_mut().unwrap();
|
||||
g
|
||||
}
|
||||
};
|
||||
push_rule(group, &sel, decl);
|
||||
} else {
|
||||
plain.push(decl);
|
||||
}
|
||||
}
|
||||
for (media, rules) in by_media {
|
||||
if media.is_empty() {
|
||||
for (sel, decls) in rules {
|
||||
out.push_str(&format!("{} {{\n{}\n}}\n", sel, decls.join("\n")));
|
||||
}
|
||||
} else {
|
||||
let inner = rules
|
||||
.iter()
|
||||
.map(|(sel, decls)| format!("{} {{\n{}\n}}", sel, decls.join("\n")))
|
||||
.collect::<Vec<_>>()
|
||||
.join("\n");
|
||||
out.push_str(&format!("@media {} {{\n{}\n}}\n", media, inner));
|
||||
}
|
||||
}
|
||||
if !plain.is_empty() {
|
||||
out.push_str(&format!(".{} {{\n{}\n}}\n", name, plain.join("\n")));
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
if rules.is_empty() {
|
||||
return String::new();
|
||||
out
|
||||
}
|
||||
|
||||
/// Push `decl` under `sel` into a `(selector, declarations)` group list,
|
||||
/// merging declarations when the selector already exists.
|
||||
fn push_rule(groups: &mut Vec<(String, Vec<String>)>, sel: &str, decl: String) {
|
||||
if sel.is_empty() {
|
||||
return;
|
||||
}
|
||||
match groups.iter_mut().find(|(s, _)| s == sel) {
|
||||
Some((_, decls)) => decls.push(decl),
|
||||
None => groups.push((sel.to_string(), vec![decl])),
|
||||
}
|
||||
format!(".{} {{\n{}\n}}\n", name, rules.join("\n"))
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
@@ -370,11 +508,11 @@ pub fn project_rows(binds: &[Value], rows: &[Value]) -> Value {
|
||||
let class = b.get("css").and_then(|v| v.as_str()).unwrap_or("");
|
||||
let col = match parse_site_path(back) {
|
||||
SitePath::DbField { field, .. } => field,
|
||||
SitePath::LibMember { member, .. } => member,
|
||||
SitePath::Plain(s) if s.contains('.') => {
|
||||
s.split('.').next_back().unwrap_or(&s).to_string()
|
||||
}
|
||||
SitePath::Plain(s) => s,
|
||||
SitePath::LibMember { .. } => back.to_string(),
|
||||
};
|
||||
if let Some(v) = obj.get(&col).or_else(|| obj.get(front)) {
|
||||
m.insert(front.to_string(), v.clone());
|
||||
|
||||
Reference in new issue
Block a user