feat(lowcode): 低代码元数据引擎第一波 —— 解析 + 校验 + 3 个只读工具
- 新 crate sspf-lowcode(纯计算,AR7 钉住不依赖 DB/HTTP):widget 把 54 种 jnpfKey 归成 11 类 (决定「怎么存、能不能接收入参」)/ form 解析控件树 / model 解析表结构 / validate 9 类诊断码 - DDL:base_visual_dev + base_visual_release 逐字对齐官方(21 → 23 张表) - MCP 3 个只读工具:form.list / form.describe / form.validate,后两个支持 inline JSON - 真实样例落盘为 fixture(官方初始化数据的「应收费用」:主表 6 字段 / 子表 8 字段) - 新增 lowcode-smoke.sh 8 条(含两条反自证:改坏 __vModel__ 必被抓、未知控件只 warn) - 影响:测试 306 → 344;十二闸全绿;三条真实方言已写进注释与测试
This commit is contained in:
1 parent
16c0704c47
commit
f0c77f731c
24 files changed
+4122
-22
No files matched your search
@@ -43,6 +43,8 @@ sspf-store = { path = "../../crates/sspf-store" }
|
||||
|
||||
# MCP 工具层(元工具 + 分层加载)—— 内核实现它的 PlatformAdapter,反向依赖
|
||||
sspf-mcp = { path = "../../crates/sspf-mcp" }
|
||||
# 低代码元数据引擎(纯计算:解析/校验/SQL 生成)
|
||||
sspf-lowcode = { path = "../../crates/sspf-lowcode" }
|
||||
|
||||
# 仅用于 MCP 模式的 `dup2`(把 fd 1 让给 stderr,见 main.rs)
|
||||
libc = { workspace = true }
|
||||
@@ -521,3 +521,92 @@ CREATE TABLE asset_data_resource (
|
||||
f_creator_time TIMESTAMP(0) WITHOUT TIME ZONE,
|
||||
f_delete_mark INTEGER DEFAULT 0
|
||||
);
|
||||
|
||||
-- ============================================================ 低代码(P2)
|
||||
-- 在线开发的功能定义 / 发布版本 —— 列与官方 JNPF 7.0 逐字一致
|
||||
-- (官方 database/PostgreSQL/JNPF-PostgreSQL.sql,`base_visual_dev` / `base_visual_release`)
|
||||
--
|
||||
-- 🔴 这两张表是「不迁前端也能用」的关键:Vue 侧的渲染器读的就是
|
||||
-- `f_form_data`(控件树)/ `f_column_data`(列表列)/ `f_tables_data`(表结构),
|
||||
-- Rust 侧只要**同构存取**这些 JSON,前端一行不改就能渲染。
|
||||
-- 🔴 JSON 字段全是 TEXT(官方如此)⇒ 不能建成 jsonb:官方按字符串整体比对/替换。
|
||||
-- 🔴 `base_visual_release` 比 `base_visual_dev` 多 `f_old_content`(历史版本),
|
||||
-- 其余列逐个相同 —— 发布 = 把 dev 行整体拷进 release。
|
||||
|
||||
CREATE TABLE base_visual_dev (
|
||||
f_id VARCHAR(50) NOT NULL,
|
||||
f_full_name VARCHAR(200),
|
||||
f_en_code VARCHAR(200),
|
||||
f_state INTEGER,
|
||||
f_type INTEGER,
|
||||
f_tables_data TEXT,
|
||||
f_category VARCHAR(50),
|
||||
f_form_data TEXT,
|
||||
f_column_data TEXT,
|
||||
f_db_link_id VARCHAR(50),
|
||||
f_web_type INTEGER,
|
||||
f_app_column_data TEXT,
|
||||
f_enable_flow INTEGER,
|
||||
f_interface_id VARCHAR(50),
|
||||
f_interface_param TEXT,
|
||||
f_description VARCHAR(500),
|
||||
f_enabled_mark INTEGER,
|
||||
f_sort_code BIGINT,
|
||||
f_creator_time TIMESTAMP(0) WITHOUT TIME ZONE,
|
||||
f_creator_user_id VARCHAR(50),
|
||||
f_last_modify_time TIMESTAMP(0) WITHOUT TIME ZONE,
|
||||
f_last_modify_user_id VARCHAR(50),
|
||||
f_delete_time TIMESTAMP(0) WITHOUT TIME ZONE,
|
||||
f_delete_user_id VARCHAR(50),
|
||||
f_delete_mark INTEGER,
|
||||
f_tenant_id VARCHAR(50) DEFAULT '0' NOT NULL,
|
||||
f_platform_release VARCHAR(100),
|
||||
f_url_address VARCHAR(500),
|
||||
f_app_url_address VARCHAR(500),
|
||||
f_interface_url VARCHAR(500),
|
||||
f_web_address VARCHAR(500),
|
||||
f_button_data TEXT,
|
||||
f_app_address VARCHAR(500),
|
||||
f_app_button_data TEXT,
|
||||
f_system_id VARCHAR(50),
|
||||
PRIMARY KEY (f_id, f_tenant_id)
|
||||
);
|
||||
|
||||
CREATE TABLE base_visual_release (
|
||||
f_id VARCHAR(50) NOT NULL,
|
||||
f_full_name VARCHAR(200),
|
||||
f_en_code VARCHAR(200),
|
||||
f_state INTEGER,
|
||||
f_type INTEGER,
|
||||
f_tables_data TEXT,
|
||||
f_category VARCHAR(50),
|
||||
f_form_data TEXT,
|
||||
f_column_data TEXT,
|
||||
f_db_link_id VARCHAR(50),
|
||||
f_web_type INTEGER,
|
||||
f_app_column_data TEXT,
|
||||
f_enable_flow INTEGER,
|
||||
f_interface_id VARCHAR(50),
|
||||
f_interface_param TEXT,
|
||||
f_description VARCHAR(500),
|
||||
f_enabled_mark INTEGER,
|
||||
f_sort_code BIGINT,
|
||||
f_creator_time TIMESTAMP(0) WITHOUT TIME ZONE,
|
||||
f_creator_user_id VARCHAR(50),
|
||||
f_last_modify_time TIMESTAMP(0) WITHOUT TIME ZONE,
|
||||
f_last_modify_user_id VARCHAR(50),
|
||||
f_delete_time TIMESTAMP(0) WITHOUT TIME ZONE,
|
||||
f_delete_user_id VARCHAR(50),
|
||||
f_delete_mark INTEGER,
|
||||
f_tenant_id VARCHAR(50) DEFAULT '0' NOT NULL,
|
||||
f_url_address VARCHAR(500),
|
||||
f_app_url_address VARCHAR(500),
|
||||
f_interface_url VARCHAR(500),
|
||||
f_old_content TEXT,
|
||||
f_web_address VARCHAR(500),
|
||||
f_button_data TEXT,
|
||||
f_app_address VARCHAR(500),
|
||||
f_app_button_data TEXT,
|
||||
f_system_id VARCHAR(50),
|
||||
PRIMARY KEY (f_id, f_tenant_id)
|
||||
);
|
||||
@@ -41,9 +41,9 @@ use ssw_platform::routes;
|
||||
/// (见 [`whitelist_self_check`])⇒ 拼错 / 漏建 / 孤儿 DDL 三种错都抓得到。
|
||||
///
|
||||
/// 多应用 MVP 新增了平台表 `base_system`(`SystemEntity` 注册表,
|
||||
/// 承载 `App-Code` → `systemId` 的映射),故清单现在是 **8 张**
|
||||
/// (原 7 张 + `base_system`)。
|
||||
const BASE_TABLES: [&str; 17] = [
|
||||
/// 承载 `App-Code` → `systemId` 的映射);P2 低代码新增 `base_visual_dev` /
|
||||
/// `base_visual_release`(功能定义与发布快照),故清单现在是 **19 张**。
|
||||
const BASE_TABLES: [&str; 19] = [
|
||||
"base_group",
|
||||
"base_user",
|
||||
"base_role",
|
||||
@@ -61,6 +61,10 @@ const BASE_TABLES: [&str; 17] = [
|
||||
"base_standing",
|
||||
"base_permission_group",
|
||||
"base_action",
|
||||
// 🔴 低代码两张表是**平台表**不是业务表:它们存的是「功能定义」,
|
||||
// 任何业务模块都会用,属于引擎基础设施。
|
||||
"base_visual_dev",
|
||||
"base_visual_release",
|
||||
];
|
||||
|
||||
/// 命令行解析的结果(**纯数据**,便于单测)。
|
||||
|
||||
@@ -1633,6 +1633,289 @@ impl NativeAdapter {
|
||||
"next": "用 permission.effective({account}) 看它实际能访问哪些菜单",
|
||||
}))
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------- 低代码(P2-a)
|
||||
|
||||
/// 读一条低代码功能定义(含三段 JSON)。
|
||||
///
|
||||
/// 🔴 三段 JSON 全是 TEXT:`f_form_data`(控件树)/ `f_tables_data`(表结构)/
|
||||
/// `f_column_data`(列表列)。读取时**不做任何规范化** —— 前端要的就是原文。
|
||||
async fn load_visualdev(&self, args: &Value) -> Result<Value, ToolError> {
|
||||
let id = args.get("id").and_then(Value::as_str).unwrap_or("").trim().to_string();
|
||||
let en_code = args
|
||||
.get("enCode")
|
||||
.and_then(Value::as_str)
|
||||
.unwrap_or("")
|
||||
.trim()
|
||||
.to_string();
|
||||
|
||||
if id.is_empty() && en_code.is_empty() {
|
||||
return Err(ToolError::new(
|
||||
"MISSING_ARG",
|
||||
"id 与 enCode 至少给一个",
|
||||
)
|
||||
.field("enCode")
|
||||
.hint("enCode 比 id 好记(如 salesOrder);不知道就用 form.list 查")
|
||||
.next("form.list", json!({}), "列出全部功能"));
|
||||
}
|
||||
|
||||
let rows = if !id.is_empty() {
|
||||
let v = id.clone();
|
||||
self.state
|
||||
.db
|
||||
.query_json_params(
|
||||
"SELECT f_id AS \"id\", COALESCE(f_full_name,'') AS \"fullName\", \
|
||||
COALESCE(f_en_code,'') AS \"enCode\", \
|
||||
COALESCE(f_type,0) AS \"type\", COALESCE(f_state,0) AS \"state\", \
|
||||
COALESCE(f_form_data,'') AS \"formData\", \
|
||||
COALESCE(f_tables_data,'') AS \"tablesData\", \
|
||||
COALESCE(f_column_data,'') AS \"columnData\" \
|
||||
FROM base_visual_dev WHERE f_id = $1 AND f_delete_mark = 0 LIMIT 1",
|
||||
&[&v],
|
||||
)
|
||||
.await
|
||||
.map_err(db_err)?
|
||||
} else {
|
||||
let v = en_code.clone();
|
||||
self.state
|
||||
.db
|
||||
.query_json_params(
|
||||
"SELECT f_id AS \"id\", COALESCE(f_full_name,'') AS \"fullName\", \
|
||||
COALESCE(f_en_code,'') AS \"enCode\", \
|
||||
COALESCE(f_type,0) AS \"type\", COALESCE(f_state,0) AS \"state\", \
|
||||
COALESCE(f_form_data,'') AS \"formData\", \
|
||||
COALESCE(f_tables_data,'') AS \"tablesData\", \
|
||||
COALESCE(f_column_data,'') AS \"columnData\" \
|
||||
FROM base_visual_dev WHERE f_en_code = $1 AND f_delete_mark = 0 LIMIT 1",
|
||||
&[&v],
|
||||
)
|
||||
.await
|
||||
.map_err(db_err)?
|
||||
};
|
||||
|
||||
let Some(row) = rows.first() else {
|
||||
let what = if id.is_empty() { &en_code } else { &id };
|
||||
return Err(ToolError::new(
|
||||
"FORM_NOT_FOUND",
|
||||
format!("低代码功能不存在或已删除: {what}"),
|
||||
)
|
||||
.field(if id.is_empty() { "enCode" } else { "id" })
|
||||
.hint("base_visual_dev 里没有这条记录;确认是不是在别的应用(f_system_id)")
|
||||
.next("form.list", json!({}), "列出全部功能"));
|
||||
};
|
||||
|
||||
Ok(row.clone())
|
||||
}
|
||||
|
||||
/// `form.list` —— 列低代码功能(不返回 JSON 正文,省 token)。
|
||||
async fn form_list(&self, args: &Value) -> Result<Value, ToolError> {
|
||||
let keyword = args.get("keyword").and_then(Value::as_str).unwrap_or("");
|
||||
let limit = args.get("limit").and_then(Value::as_u64).unwrap_or(50).clamp(1, 200);
|
||||
|
||||
let mut params: Vec<String> = Vec::new();
|
||||
let mut extra = String::new();
|
||||
if !keyword.is_empty() {
|
||||
params.push(format!("%{keyword}%"));
|
||||
let n = params.len();
|
||||
extra.push_str(&format!(" AND (f_full_name ILIKE ${n} OR f_en_code ILIKE ${n})"));
|
||||
}
|
||||
if let Some(t) = args.get("type").and_then(Value::as_i64) {
|
||||
params.push(t.to_string());
|
||||
extra.push_str(&format!(" AND f_type = ${}::text::integer", params.len()));
|
||||
}
|
||||
if let Some(s) = args.get("state").and_then(Value::as_i64) {
|
||||
params.push(s.to_string());
|
||||
extra.push_str(&format!(" AND f_state = ${}::text::integer", params.len()));
|
||||
}
|
||||
|
||||
let sql = format!(
|
||||
"SELECT f_id AS \"id\", COALESCE(f_full_name,'') AS \"fullName\", \
|
||||
COALESCE(f_en_code,'') AS \"enCode\", \
|
||||
COALESCE(f_type,0) AS \"type\", COALESCE(f_state,0) AS \"state\", \
|
||||
COALESCE(f_url_address,'') AS \"urlAddress\", \
|
||||
COALESCE(f_system_id,'') AS \"systemId\" \
|
||||
FROM base_visual_dev WHERE f_delete_mark = 0{extra} \
|
||||
ORDER BY f_sort_code, f_full_name LIMIT {limit}"
|
||||
);
|
||||
let refs: Vec<&(dyn ToSql + Sync)> =
|
||||
params.iter().map(|s| s as &(dyn ToSql + Sync)).collect();
|
||||
let rows = self
|
||||
.state
|
||||
.db
|
||||
.query_json_params(&sql, &refs)
|
||||
.await
|
||||
.map_err(db_err)?;
|
||||
|
||||
Ok(json!({
|
||||
"count": rows.len(),
|
||||
"forms": rows,
|
||||
"note": "type: 1=在线开发 2=流程表单;state: 0=未发布 1=已发布。\
|
||||
运行时读 base_visual_release(发布快照),改 dev 不发布看不到效果",
|
||||
}))
|
||||
}
|
||||
|
||||
/// `form.describe` —— 把表单 JSON 解析成可读结构。
|
||||
async fn form_describe(&self, args: &Value) -> Result<Value, ToolError> {
|
||||
let inline = args
|
||||
.get("formData")
|
||||
.and_then(Value::as_str)
|
||||
.map(str::to_string);
|
||||
|
||||
// inline 模式:直接解析传入的 JSON,不查库
|
||||
if let Some(text) = inline {
|
||||
let parsed: Value = serde_json::from_str(&text).map_err(|e| {
|
||||
ToolError::new("BAD_JSON", format!("formData 不是合法 JSON: {e}"))
|
||||
.field("formData")
|
||||
})?;
|
||||
let form = sspf_lowcode::FormSchema::parse(&parsed).map_err(form_err)?;
|
||||
return Ok(describe_json(&form, None, args));
|
||||
}
|
||||
|
||||
let row = self.load_visualdev(args).await?;
|
||||
let form_text = row["formData"].as_str().unwrap_or("");
|
||||
if form_text.trim().is_empty() {
|
||||
return Err(ToolError::new(
|
||||
"FORM_EMPTY",
|
||||
format!("功能「{}」没有 f_form_data", row["fullName"].as_str().unwrap_or("")),
|
||||
)
|
||||
.hint("可能是流程表单(type=2),它的 f_form_data 是字段映射数组而不是控件树"));
|
||||
}
|
||||
let parsed: Value = serde_json::from_str(form_text).map_err(|e| {
|
||||
ToolError::new("BAD_JSON", format!("f_form_data 不是合法 JSON: {e}"))
|
||||
})?;
|
||||
let form = sspf_lowcode::FormSchema::parse(&parsed).map_err(form_err)?;
|
||||
Ok(describe_json(&form, Some(&row), args))
|
||||
}
|
||||
|
||||
/// `form.validate` —— 表单与表结构的自洽性检查。
|
||||
async fn form_validate(&self, args: &Value) -> Result<Value, ToolError> {
|
||||
let inline_form = args.get("formData").and_then(Value::as_str);
|
||||
let inline_tables = args.get("tablesData").and_then(Value::as_str);
|
||||
|
||||
let (form_text, tables_text, source) = match (inline_form, inline_tables) {
|
||||
(Some(f), Some(t)) => (f.to_string(), t.to_string(), "inline".to_string()),
|
||||
(Some(_), None) => {
|
||||
return Err(ToolError::new(
|
||||
"MISSING_ARG",
|
||||
"inline 模式必须同时给 formData 与 tablesData",
|
||||
)
|
||||
.field("tablesData")
|
||||
.hint("只有表单没有表结构,无法判断字段有没有对应列"));
|
||||
}
|
||||
_ => {
|
||||
let row = self.load_visualdev(args).await?;
|
||||
(
|
||||
row["formData"].as_str().unwrap_or("").to_string(),
|
||||
row["tablesData"].as_str().unwrap_or("").to_string(),
|
||||
row["id"].as_str().unwrap_or("").to_string(),
|
||||
)
|
||||
}
|
||||
};
|
||||
|
||||
if form_text.trim().is_empty() || tables_text.trim().is_empty() {
|
||||
return Err(ToolError::new(
|
||||
"FORM_INCOMPLETE",
|
||||
"该功能缺少 f_form_data 或 f_tables_data,无法校验",
|
||||
)
|
||||
.hint("只有表单没模型 = 不知道该存哪张表;只有模型没表单 = 不知道该展示什么"));
|
||||
}
|
||||
|
||||
let fv: Value = serde_json::from_str(&form_text)
|
||||
.map_err(|e| ToolError::new("BAD_JSON", format!("form 不是合法 JSON: {e}")))?;
|
||||
let tv: Value = serde_json::from_str(&tables_text)
|
||||
.map_err(|e| ToolError::new("BAD_JSON", format!("tables 不是合法 JSON: {e}")))?;
|
||||
|
||||
let form = sspf_lowcode::FormSchema::parse(&fv).map_err(form_err)?;
|
||||
let model = sspf_lowcode::ModelSchema::parse(&tv).map_err(|e| {
|
||||
ToolError::new(e.code(), e.message()).field("tablesData")
|
||||
})?;
|
||||
|
||||
let report = sspf_lowcode::validate(&form, &model);
|
||||
let mut out = report.to_json();
|
||||
out["source"] = json!(source);
|
||||
out["summary"] = json!(format!(
|
||||
"{} 个错误 / {} 个警告;{}",
|
||||
report.error_count(),
|
||||
report.warn_count(),
|
||||
if report.ok() {
|
||||
"设计稿自洽(注意:与真实数据库列的一致性未验)"
|
||||
} else {
|
||||
"设计稿不自洽,上动态 CRUD 前必须修"
|
||||
}
|
||||
));
|
||||
Ok(out)
|
||||
}
|
||||
}
|
||||
|
||||
/// `form_err` —— 把 lowcode 的解析错误转成结构化工具错误。
|
||||
fn form_err(e: sspf_lowcode::FormError) -> ToolError {
|
||||
ToolError::new(e.code(), e.message())
|
||||
.field("formData")
|
||||
.hint("v4 表单的 f_form_data 是 `{formRef, fields:[…]}` 对象;\
|
||||
流程表单是 `[{filedName,filedId,…}]` 数组 —— 后者不属于本引擎处理范围")
|
||||
}
|
||||
|
||||
/// 把解析结果组织成 `form.describe` 的输出。
|
||||
fn describe_json(
|
||||
form: &sspf_lowcode::FormSchema,
|
||||
row: Option<&Value>,
|
||||
args: &Value,
|
||||
) -> Value {
|
||||
let main = form.main_fields();
|
||||
let subs = form.sub_tables();
|
||||
|
||||
let field_brief = |f: &sspf_lowcode::FieldNode| {
|
||||
json!({
|
||||
"vModel": f.v_model,
|
||||
"column": f.column_name(),
|
||||
"label": f.label,
|
||||
"jnpfKey": f.jnpf_key,
|
||||
"widget": f.widget.as_str(),
|
||||
"required": f.required,
|
||||
"acceptsInput": f.widget.accepts_input(),
|
||||
"visibility": f.visibility,
|
||||
})
|
||||
};
|
||||
|
||||
let mut out = json!({
|
||||
"formRef": form.form_ref,
|
||||
"formModel": form.form_model,
|
||||
"labelPosition": form.label_position,
|
||||
"labelWidth": form.label_width,
|
||||
"primaryKeyPolicy": form.primary_key_policy,
|
||||
"mainFields": main.iter().map(|f| field_brief(f)).collect::<Vec<_>>(),
|
||||
"subTables": subs.iter().map(|s| json!({
|
||||
"label": s.label,
|
||||
"tableName": s.table_name,
|
||||
"vModel": s.v_model,
|
||||
"fields": s.children.iter()
|
||||
.filter(|c| c.widget.occupies_column())
|
||||
.map(|c| field_brief(c))
|
||||
.collect::<Vec<_>>(),
|
||||
})).collect::<Vec<_>>(),
|
||||
"unknownWidgets": form.unknown_widgets().iter()
|
||||
.map(|n| json!({"jnpfKey": n.jnpf_key, "label": n.label}))
|
||||
.collect::<Vec<_>>(),
|
||||
"counts": {
|
||||
"mainFields": main.len(),
|
||||
"subTables": subs.len(),
|
||||
},
|
||||
});
|
||||
|
||||
if let Some(r) = row {
|
||||
out["id"] = r["id"].clone();
|
||||
out["fullName"] = r["fullName"].clone();
|
||||
out["enCode"] = r["enCode"].clone();
|
||||
out["type"] = r["type"].clone();
|
||||
out["state"] = r["state"].clone();
|
||||
}
|
||||
|
||||
// 只有明确要求时才回原文(一张表单可能几十 KB)
|
||||
if args.get("withRaw").and_then(Value::as_bool).unwrap_or(false) {
|
||||
out["raw"] = form.raw.clone();
|
||||
}
|
||||
|
||||
out
|
||||
}
|
||||
|
||||
/// 去重并保持稳定顺序(BTreeSet 排序,避免每次调用结果顺序漂移)。
|
||||
@@ -1887,6 +2170,11 @@ impl PlatformAdapter for NativeAdapter {
|
||||
"permission.effective" => self.permission_effective(&args).await,
|
||||
"permission.user.create" => self.user_create(&args).await,
|
||||
|
||||
// ------------------------------------------------ 低代码(P2-a,只读)
|
||||
"form.list" => self.form_list(&args).await,
|
||||
"form.describe" => self.form_describe(&args).await,
|
||||
"form.validate" => self.form_validate(&args).await,
|
||||
|
||||
other => Err(ToolError::new(
|
||||
"OP_NOT_IMPLEMENTED",
|
||||
format!("原生适配器还没实现 op: {other}"),
|
||||
|
||||
@@ -949,7 +949,10 @@ mod tests {
|
||||
let (_, body) = raw.split_once("\r\n\r\n").expect("响应必须有头体分隔");
|
||||
let body: Value = serde_json::from_str(body).expect("响应体必须是合法 JSON");
|
||||
assert_eq!(body["ok"], true);
|
||||
assert_eq!(body["tables"], 21);
|
||||
// 🔴 表数**故意写死**:它同时校验「schema.sql 建了预期的表」与
|
||||
// 「health 报的是真数」。加表要同步改这里 + main.rs 的 BASE_TABLES
|
||||
// + crates/sspf-store 的两条 DDL 断言(共四处,漏一处就红)。
|
||||
assert_eq!(body["tables"], 23);
|
||||
assert_eq!(body["version"], env!("CARGO_PKG_VERSION"));
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user