diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/flow/RecipeArithmeticEvaluator.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/flow/RecipeArithmeticEvaluator.java
new file mode 100644
index 0000000..d0879f0
--- /dev/null
+++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/flow/RecipeArithmeticEvaluator.java
@@ -0,0 +1,197 @@
+package com.eip4.platform.metadata.flow;
+
+import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
+import java.util.Map;
+
+/**
+ * 极小安全算术求值器——recipe 派生字段服务端 compute-on-save 专用(如 金额=数量×单价)。
+ *
+ *
只支持 {@code + - * / ( )}、数字字面量、列名(标识符,从当前行 map 解析)。无任意代码执行
+ * (不走 Groovy/JS/EL 引擎,杜绝注入面),故公式来源即便最终来自设计者输入也安全。递归下降解析,
+ * BigDecimal 计算(金额场景精度安全)。
+ *
+ *
取值约定:列名 → 行 map 同名值,{@code null}/空白当 {@code 0}(缺失操作数=0,合理);
+ * 数字(Number)精确转 BigDecimal;非空非数字字符串 → 抛 {@link NumberFormatException}
+ * (交由调用方逐行兜底跳过,绝不静默写错值)。除零、畸形表达式均抛异常。
+ */
+public final class RecipeArithmeticEvaluator {
+
+ private static final MathContext MC = MathContext.DECIMAL64;
+ /** 表达式长度上限:防超长合法表达式 × 大子表逐行求值的 CPU 放大 DoS。 */
+ private static final int MAX_EXPR_LEN = 512;
+ /** 递归嵌套深度上限:防深嵌套括号/连续一元符触发 StackOverflowError(Error 会逃过逐行兜底→500 DoS)。 */
+ private static final int MAX_DEPTH = 64;
+
+ /** 求值 {@code expr},列名从 {@code row} 解析。空/超长/畸形/嵌套过深/除零/非数字操作数 → 抛运行时异常。 */
+ public BigDecimal eval(String expr, Map row) {
+ if (expr == null || expr.isBlank()) {
+ throw new IllegalArgumentException("空表达式");
+ }
+ if (expr.length() > MAX_EXPR_LEN) {
+ throw new IllegalArgumentException("表达式过长(>" + MAX_EXPR_LEN + ")");
+ }
+ Parser p = new Parser(expr, row == null ? Map.of() : row);
+ BigDecimal result = p.parseExpression();
+ p.expectEnd();
+ return result;
+ }
+
+ /** 递归下降:expression = term (('+'|'-') term)* ; term = factor (('*'|'/') factor)* 。 */
+ private static final class Parser {
+ private final String s;
+ private final Map row;
+ private int pos;
+ private int depth;
+
+ Parser(String s, Map row) {
+ this.s = s;
+ this.row = row;
+ }
+
+ BigDecimal parseExpression() {
+ BigDecimal v = parseTerm();
+ while (true) {
+ char op = peekOp();
+ if (op == '+') {
+ pos++;
+ v = v.add(parseTerm(), MC);
+ } else if (op == '-') {
+ pos++;
+ v = v.subtract(parseTerm(), MC);
+ } else {
+ return v;
+ }
+ }
+ }
+
+ private BigDecimal parseTerm() {
+ BigDecimal v = parseFactor();
+ while (true) {
+ char op = peekOp();
+ if (op == '*') {
+ pos++;
+ v = v.multiply(parseFactor(), MC);
+ } else if (op == '/') {
+ pos++;
+ BigDecimal d = parseFactor();
+ if (d.signum() == 0) {
+ throw new ArithmeticException("除零");
+ }
+ v = v.divide(d, 10, RoundingMode.HALF_UP).stripTrailingZeros();
+ } else {
+ return v;
+ }
+ }
+ }
+
+ private BigDecimal parseFactor() {
+ // 嵌套深度护栏:递增进、try/finally 递出,反映当前栈深而非总调用数;超限抛 RuntimeException
+ // (会被 RecipeDerivedFieldComputer 逐行兜底吞掉),避免 StackOverflowError(Error)逃过兜底致 500。
+ if (++depth > MAX_DEPTH) {
+ throw new IllegalArgumentException("表达式嵌套过深(>" + MAX_DEPTH + ")");
+ }
+ try {
+ skipWs();
+ if (pos >= s.length()) {
+ throw new IllegalArgumentException("表达式提前结束: " + s);
+ }
+ char c = s.charAt(pos);
+ if (c == '-') {
+ pos++;
+ return parseFactor().negate();
+ }
+ if (c == '+') {
+ pos++;
+ return parseFactor();
+ }
+ if (c == '(') {
+ pos++;
+ BigDecimal v = parseExpression();
+ skipWs();
+ if (pos >= s.length() || s.charAt(pos) != ')') {
+ throw new IllegalArgumentException("缺右括号: " + s);
+ }
+ pos++;
+ return v;
+ }
+ if (c == '.' || Character.isDigit(c)) {
+ return parseNumber();
+ }
+ if (Character.isLetter(c) || c == '_') {
+ return resolve(parseIdentifier());
+ }
+ throw new IllegalArgumentException("非法字符 '" + c + "' @ " + pos + " in " + s);
+ } finally {
+ depth--;
+ }
+ }
+
+ private BigDecimal parseNumber() {
+ int start = pos;
+ while (pos < s.length() && (Character.isDigit(s.charAt(pos)) || s.charAt(pos) == '.')) {
+ pos++;
+ }
+ return new BigDecimal(s.substring(start, pos));
+ }
+
+ private String parseIdentifier() {
+ int start = pos;
+ while (pos < s.length()
+ && (Character.isLetterOrDigit(s.charAt(pos)) || s.charAt(pos) == '_')) {
+ pos++;
+ }
+ return s.substring(start, pos);
+ }
+
+ /** 列名 → 行值 → BigDecimal。null/空白当 0;Number 精确;非空非数字字符串抛 NumberFormatException。 */
+ private BigDecimal resolve(String name) {
+ Object v = row.get(name);
+ if (v == null) {
+ // 大小写兜底(保真层有时回大写键)。
+ for (Map.Entry e : row.entrySet()) {
+ if (name.equalsIgnoreCase(e.getKey())) {
+ v = e.getValue();
+ break;
+ }
+ }
+ }
+ if (v == null) {
+ return BigDecimal.ZERO;
+ }
+ if (v instanceof BigDecimal bd) {
+ return bd;
+ }
+ if (v instanceof Number n) {
+ return new BigDecimal(n.toString());
+ }
+ String str = v.toString().trim();
+ if (str.isEmpty()) {
+ return BigDecimal.ZERO;
+ }
+ return new BigDecimal(str); // 非数字 → NumberFormatException,交由调用方逐行兜底
+ }
+
+ private char peekOp() {
+ skipWs();
+ if (pos >= s.length()) {
+ return 0;
+ }
+ return s.charAt(pos);
+ }
+
+ private void skipWs() {
+ while (pos < s.length() && Character.isWhitespace(s.charAt(pos))) {
+ pos++;
+ }
+ }
+
+ void expectEnd() {
+ skipWs();
+ if (pos != s.length()) {
+ throw new IllegalArgumentException("表达式有多余内容 @ " + pos + ": " + s);
+ }
+ }
+ }
+}
diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/flow/RecipeDerivedFieldComputer.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/flow/RecipeDerivedFieldComputer.java
new file mode 100644
index 0000000..af763f7
--- /dev/null
+++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/flow/RecipeDerivedFieldComputer.java
@@ -0,0 +1,96 @@
+package com.eip4.platform.metadata.flow;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * recipe 主子表写流 compute-on-save:落库前对提交 map 的子表数组逐行补算派生字段
+ * (如 金额=数量×单价),服务端权威,绕开 amis input-table 前端 onEvent 的 React setState 竞态。
+ *
+ * 与 {@link EditGridDerivedFieldComputer}(迁移页·读 view_page XML 跑 Groovy)不同:本组件服务
+ * 新建 recipe 页——派生公式由设计中心编译时以 {@code ?__derive=} 透传,无 view_page 依赖、无
+ * 存储改造。求值走 {@link RecipeArithmeticEvaluator}(纯算术、无任意代码执行)。
+ *
+ *
spec 格式(Spring @RequestParam 已 URL 解码):{@code "LISTCOL|TARGET1=EXPR1|TARGET2=EXPR2"}。
+ * 首段为子表列名(amis input-table 的 name,如 DETAILS),其后每段 {@code 目标列=公式}。同一行内
+ * 按声明顺序应用,后者可引用前者刚算出的结果(如 含税=金额*1.13)。
+ *
+ *
纪律:任一行任一列求值失败(非数字操作数/除零/畸形)只跳过该格并告警,绝不静默写错值、绝不阻断
+ * 保存(派生字段缺失好过保存失败)。零改 {@code com.dsasp}。
+ */
+@Component
+public class RecipeDerivedFieldComputer {
+
+ private static final Logger log = LoggerFactory.getLogger(RecipeDerivedFieldComputer.class);
+
+ private final RecipeArithmeticEvaluator evaluator = new RecipeArithmeticEvaluator();
+
+ /** 就地为提交 map 补算 recipe 派生字段。spec 空 / 无子表数组 → 无操作。 */
+ @SuppressWarnings("unchecked")
+ public void enrich(Map map, String deriveSpec) {
+ if (map == null || deriveSpec == null || deriveSpec.isBlank()) {
+ return;
+ }
+ try {
+ String[] parts = deriveSpec.split("\\|");
+ if (parts.length < 2) {
+ return; // 无 target=expr 段
+ }
+ String listColumn = parts[0].trim();
+ Object listObj = caseInsensitiveGet(map, listColumn);
+ if (!(listObj instanceof List> rawRows) || rawRows.isEmpty()) {
+ return;
+ }
+ List specs = new ArrayList<>();
+ for (int i = 1; i < parts.length; i++) {
+ String seg = parts[i];
+ int eq = seg.indexOf('=');
+ if (eq <= 0) {
+ continue;
+ }
+ String target = seg.substring(0, eq).trim();
+ String expr = seg.substring(eq + 1).trim();
+ if (!target.isEmpty() && !expr.isEmpty()) {
+ specs.add(new String[] {target, expr});
+ }
+ }
+ if (specs.isEmpty()) {
+ return;
+ }
+ for (Object r : rawRows) {
+ if (!(r instanceof Map)) {
+ continue;
+ }
+ Map rowMap = (Map) r;
+ for (String[] sp : specs) {
+ try {
+ BigDecimal val = evaluator.eval(sp[1], rowMap);
+ rowMap.put(sp[0], val); // 写回:后续派生列可引用本列结果
+ } catch (RuntimeException ex) {
+ log.warn("[RecipeDerived] 跳过 {}={} : {}", sp[0], sp[1], ex.toString());
+ }
+ }
+ }
+ } catch (Exception e) {
+ log.warn("[RecipeDerived] compute-on-save 跳过 spec={}: {}", deriveSpec, e.toString());
+ }
+ }
+
+ private static Object caseInsensitiveGet(Map map, String key) {
+ if (map.containsKey(key)) {
+ return map.get(key);
+ }
+ for (Map.Entry e : map.entrySet()) {
+ if (key.equalsIgnoreCase(e.getKey())) {
+ return e.getValue();
+ }
+ }
+ return null;
+ }
+}
diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintChild.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintChild.java
index 68555b7..2ffcea7 100644
--- a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintChild.java
+++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintChild.java
@@ -10,18 +10,51 @@ import java.util.List;
* 保真层默认流 _ADD/_UPDATE 经 LIST 属性级联落子表(已实测)。编辑态经 _LOAD 回显
* data.result.{@code listColumn} 的子行。
*
+ * {@link #derived} 声明派生列(如 金额=数量×单价):编译器把这些列渲染成只读 {@code tpl} 计算单元格
+ * (amis 实时预览),并在写流表单 api 上以 {@code ?__derive=} 透传公式,由
+ * {@code RecipeDerivedFieldComputer} 落库前服务端逐行权威求值(绕开前端竞态)。
+ *
* @param childTable 子表表名(普通实体 tabletype=1)
* @param listColumn 主表 LIST 属性列名(amis input-table 的 name,如 DETAILS)
* @param displayField 子表显示字段(预留;当前仅作元信息)
* @param fields 子表可编辑列(每列经 controlType 映射为 quickEdit 控件)
+ * @param derived 派生列(目标列名 + 算术公式,公式引用同行其它子列)
*/
public record PageBlueprintChild(
String childTable,
String listColumn,
String displayField,
- List fields) {
+ List fields,
+ List derived) {
public PageBlueprintChild {
fields = fields == null ? List.of() : List.copyOf(fields);
+ derived = derived == null ? List.of() : List.copyOf(derived);
+ }
+
+ /** 4-arg 兼容构造:无派生列。保持既有调用方/测试零改。 */
+ public PageBlueprintChild(String childTable, String listColumn, String displayField,
+ List fields) {
+ this(childTable, listColumn, displayField, fields, List.of());
+ }
+
+ /** 某子列名是否为派生列(编译器据此渲染只读 tpl 而非 quickEdit 输入)。 */
+ public DerivedColumn derivedFor(String column) {
+ if (column == null) {
+ return null;
+ }
+ for (DerivedColumn d : derived) {
+ if (column.equalsIgnoreCase(d.column())) {
+ return d;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 单个派生列:{@code column} 目标列名(须为子表真实列),{@code formula} 算术公式
+ * (引用同行其它子列名,如 {@code ITEMQTY*ITEMPRICE})。
+ */
+ public record DerivedColumn(String column, String formula) {
}
}
diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java
index 6436ab2..6ac2eaf 100644
--- a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java
+++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java
@@ -1,5 +1,7 @@
package com.eip4.platform.metadata.schema.blueprint;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.util.Locale;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -87,7 +89,7 @@ public final class PageBlueprintCompiler {
addDialog.put("size", "lg");
ObjectNode addForm = addDialog.putObject("body");
addForm.put("type", "form");
- addForm.put("api", "post:/api/flow/" + blueprint.tableName() + "_ADD");
+ addForm.put("api", masterDetailFormApi(blueprint, "_ADD"));
addForm.put("reload", crudName);
ArrayNode controls = formControls(blueprint, false);
controls.add(childInputTable(blueprint.child()));
@@ -108,7 +110,7 @@ public final class PageBlueprintCompiler {
dialog.put("size", "lg");
ObjectNode editForm = dialog.putObject("body");
editForm.put("type", "form");
- editForm.put("api", "post:/api/flow/" + blueprint.tableName() + "_UPDATE");
+ editForm.put("api", masterDetailFormApi(blueprint, "_UPDATE"));
editForm.put("reload", crudName);
// 经 _LOAD 回显主+子行(data.result.=子行,已实测)。
ObjectNode initApi = editForm.putObject("initApi");
@@ -144,13 +146,54 @@ public final class PageBlueprintCompiler {
ObjectNode col = columns.addObject();
col.put("name", field.name());
col.put("label", field.label());
- ObjectNode quickEdit = col.putObject("quickEdit");
- quickEdit.put("type", controlType(field.type()));
- quickEdit.put("name", field.name());
+ PageBlueprintChild.DerivedColumn derived = child.derivedFor(field.name());
+ if (derived != null) {
+ // 派生列:只读 tpl 计算单元格,amis 按 ${公式} 实时预览(非表单项→不提交);
+ // 落库由写流 ?__derive= 服务端权威逐行求值(绕开 input-table 前端竞态)。
+ // ★ quickEdit:false 必加:amis input-table 在 needConfirm:false 下会给「每一列」强注默认
+ // quickEdit(input-text),把列自带 type:tpl 丢弃→新增/编辑态渲染成可编辑空框而非只读预览;
+ // 仅当列显式 quickEdit===false 才跳过强注,保留 tpl 实时预览(对抗评审 HIGH 揪出)。
+ col.put("type", "tpl");
+ col.put("tpl", "${" + derived.formula() + "}");
+ col.put("quickEdit", false);
+ } else {
+ ObjectNode quickEdit = col.putObject("quickEdit");
+ quickEdit.put("type", controlType(field.type()));
+ quickEdit.put("name", field.name());
+ }
}
return table;
}
+ /**
+ * 主子表写流表单 api:基础 {@code post:/api/flow/};子表声明派生列时追加 URL 编码的
+ * {@code ?__derive=|<目标列>=<公式>|...},由 {@code RecipeDerivedFieldComputer} 落库前
+ * 服务端逐行权威求算(如 金额=数量×单价),与 UI tpl 预览同源公式。
+ */
+ private static String masterDetailFormApi(PageBlueprint blueprint, String verb) {
+ String api = "post:/api/flow/" + blueprint.tableName() + verb;
+ String derive = deriveSpec(blueprint.child());
+ if (derive != null) {
+ api += "?__derive=" + URLEncoder.encode(derive, StandardCharsets.UTF_8);
+ }
+ return api;
+ }
+
+ /** 派生 spec:{@code DETAILS|MONEY=QTY*PRICE|TAXED=MONEY*1.13};无派生列返回 null。公式去空白保 URL 安全。 */
+ private static String deriveSpec(PageBlueprintChild child) {
+ if (child == null || child.derived().isEmpty()) {
+ return null;
+ }
+ StringBuilder sb = new StringBuilder(child.listColumn());
+ for (PageBlueprintChild.DerivedColumn d : child.derived()) {
+ if (d.column() == null || d.column().isBlank() || d.formula() == null || d.formula().isBlank()) {
+ continue;
+ }
+ sb.append('|').append(d.column().trim()).append('=').append(d.formula().replaceAll("\\s+", ""));
+ }
+ return sb.toString();
+ }
+
/**
* 单表维护页,对齐转换器 house-style:
*
diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/RecipePageComposer.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/RecipePageComposer.java
index 2814e5c..1cea5db 100644
--- a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/RecipePageComposer.java
+++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/RecipePageComposer.java
@@ -66,7 +66,8 @@ public final class RecipePageComposer {
a.required(), false, true,
a.referenceTable(), a.displayColumn()));
}
- return new PageBlueprintChild(spec.childTable().trim(), spec.listColumn().trim(), null, childFields);
+ return new PageBlueprintChild(spec.childTable().trim(), spec.listColumn().trim(), null,
+ childFields, spec.childDerived());
}
private static String deriveDisplayField(List attrs) {
@@ -101,17 +102,27 @@ public final class RecipePageComposer {
List attributes,
String childTable,
String listColumn,
- List childAttributes) {
+ List childAttributes,
+ List childDerived) {
public Spec {
attributes = attributes == null ? List.of() : List.copyOf(attributes);
childAttributes = childAttributes == null ? List.of() : List.copyOf(childAttributes);
+ childDerived = childDerived == null ? List.of() : List.copyOf(childDerived);
}
/** 7-arg 兼容构造:单表/树 recipe 无子表。保持既有调用方/测试零改。 */
public Spec(String tableName, String entityName, String recipe, String title,
String displayField, int pageSize, List attributes) {
this(tableName, entityName, recipe, title, displayField, pageSize, attributes,
- null, null, List.of());
+ null, null, List.of(), List.of());
+ }
+
+ /** 10-arg 兼容构造:master-detail 无派生列。保持既有调用方/测试零改。 */
+ public Spec(String tableName, String entityName, String recipe, String title,
+ String displayField, int pageSize, List attributes,
+ String childTable, String listColumn, List childAttributes) {
+ this(tableName, entityName, recipe, title, displayField, pageSize, attributes,
+ childTable, listColumn, childAttributes, List.of());
}
}
diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/DesignFeatureController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/DesignFeatureController.java
index 391d273..7ee9266 100644
--- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/DesignFeatureController.java
+++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/DesignFeatureController.java
@@ -3,10 +3,12 @@ package com.eip4.platform.metadata.web;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Set;
import java.util.UUID;
import org.slf4j.Logger;
@@ -27,6 +29,7 @@ import com.eip4.platform.metadata.schema.PageSchemaWriter;
import com.eip4.platform.metadata.schema.TypedPageSchemaReport;
import com.eip4.platform.metadata.schema.TypedPageSchemaValidator;
import com.eip4.platform.metadata.schema.blueprint.PageBlueprint;
+import com.eip4.platform.metadata.schema.blueprint.PageBlueprintChild;
import com.eip4.platform.metadata.schema.blueprint.RecipePageComposer;
import com.eip4.platform.metadata.web.EntityAttributeReader.EntityAttribute;
import com.eip4.platform.metadata.web.EntityAttributeReader.EntityAttributes;
@@ -51,6 +54,9 @@ public class DesignFeatureController {
private static final Logger log = LoggerFactory.getLogger(DesignFeatureController.class);
private static final ObjectMapper MAPPER = new ObjectMapper();
+ /** 派生公式字符白名单:列名/数字/+ - * / ( ) . 与空白。拒 '|' '=' 等防 __derive 段切分被破坏。 */
+ private static final java.util.regex.Pattern DERIVED_FORMULA =
+ java.util.regex.Pattern.compile("[A-Za-z0-9_+\\-*/(). ]+");
private final PageSchemaWriter pageSchemaWriter;
private final EntityAttributeReader attributeReader;
@@ -141,6 +147,7 @@ public class DesignFeatureController {
String childTable = null;
String listColumn = null;
List childSpecAttrs = new ArrayList<>();
+ List childDerivedCols = new ArrayList<>();
if (masterDetail) {
childTable = req.childTable.trim();
String linkColumn = req.linkColumn.trim();
@@ -161,7 +168,9 @@ public class DesignFeatureController {
if (childAttrs == null || childAttrs.columns().isEmpty()) {
return ResponseEntity.badRequest().body(fail("子表无可用属性: " + childTable));
}
+ Set childCols = new HashSet<>();
for (EntityAttribute a : childAttrs.columns()) {
+ childCols.add(a.column().toUpperCase(Locale.ROOT));
// 子表的外键引用列(指回主表)不作为可编辑子列展示。
if (linkColumn.equalsIgnoreCase(a.column())) {
continue;
@@ -169,11 +178,38 @@ public class DesignFeatureController {
childSpecAttrs.add(new RecipePageComposer.AttrSpec(
a.column(), a.display(), a.type(), a.required(), a.referenceTable(), null));
}
+ // 派生列:目标列须为子表真实列(否则引擎落库会因未知列报错),公式非空;非法项静默忽略。
+ // childDerived 容错按 Object 接(见 CompileRequest):仅当为 List<{column,formula}> 才解析,
+ // 其余形态(未解析占位串/空串/null)一律忽略——装饰性可选字段绝不 400 掉核心编译。
+ if (req.childDerived instanceof List> derivedList) {
+ for (Object item : derivedList) {
+ if (!(item instanceof Map, ?> m)) {
+ continue;
+ }
+ Object colObj = m.get("column");
+ Object fObj = m.get("formula");
+ if (colObj == null || fObj == null
+ || isBlank(colObj.toString()) || isBlank(fObj.toString())) {
+ continue;
+ }
+ String col = colObj.toString().trim().toUpperCase(Locale.ROOT);
+ String formula = fObj.toString().trim();
+ // 公式字符白名单:仅列名/数字/+ - * / ( ) . 与空白。拒 '|' '=' ';' 等——'|' 会破坏
+ // __derive 段切分致「部分公式」被静默当完整公式求值落库(违反「绝不静默写错值」红线)。
+ if (!DERIVED_FORMULA.matcher(formula).matches()) {
+ return ResponseEntity.badRequest().body(fail(
+ "派生公式含非法字符(仅允许列名/数字/+ - * / ( ) .): " + formula));
+ }
+ if (childCols.contains(col)) {
+ childDerivedCols.add(new PageBlueprintChild.DerivedColumn(col, formula));
+ }
+ }
+ }
}
ObjectNode schema = composer.compose(new RecipePageComposer.Spec(
req.tableName.trim(), entityNameOf(req), recipe, req.title.trim(),
- displayField, pageSize, specAttrs, childTable, listColumn, childSpecAttrs));
+ displayField, pageSize, specAttrs, childTable, listColumn, childSpecAttrs, childDerivedCols));
String schemaJson;
try {
@@ -366,5 +402,9 @@ public class DesignFeatureController {
public String linkColumn;
public String listColumn;
public String listLabel;
+ // master-detail-v1 派生列:如 [{column:"MONEY",formula:"QTY*PRICE"}],编译为只读 tpl + 写流 __derive。
+ // 按 Object 容错接收:前端 combo 未触碰时 amis 可能发未解析占位串/空串,那种情况 Jackson 映射进
+ // List 会 400 掉整个编译;用 Object 接、控制器仅在确为 List<{column,formula}> 时解析,其余忽略。
+ public Object childDerived;
}
}
diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FlowController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FlowController.java
index 9825b2c..48046ec 100644
--- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FlowController.java
+++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FlowController.java
@@ -34,6 +34,7 @@ import com.dsasp.server.common.util.UserSession;
import com.eip4.platform.metadata.flow.EditGridDerivedFieldComputer;
import com.eip4.platform.metadata.flow.FlowInputCoercer;
import com.eip4.platform.metadata.flow.FlowNameResolver;
+import com.eip4.platform.metadata.flow.RecipeDerivedFieldComputer;
import com.eip4.platform.metadata.flow.FlowNameResolver.ResolvedFlow;
import com.eip4.platform.metadata.flow.FlowReadWriteClassifier;
import com.eip4.platform.metadata.flow.UserColumnResolver;
@@ -80,17 +81,20 @@ public class FlowController {
private final FlowInputCoercer inputCoercer;
/** A1 compute-on-save:写流执行前为 editgrid 子表补算派生字段(金额/总额)。可空(老单测构造)。 */
private final EditGridDerivedFieldComputer editGridComputer;
+ /** recipe 主子表写流 compute-on-save:?__derive= 透传时落库前逐行补派生字段。可空(老单测构造)。 */
+ private final RecipeDerivedFieldComputer recipeDerivedComputer;
/** 编辑弹窗 load:把 picker 默认值裸 id 解析成 {_id,_label}。可空(老单测构造)。 */
private final JdbcTemplate jdbcTemplate;
private final PickerController pickerController;
- /** Spring 注入入口(8 参:读写分类器 + 类型强制器 + editgrid 派生字段补算器 + picker 默认值解析)。
+ /** Spring 注入入口(9 参:读写分类器 + 类型强制器 + editgrid/recipe 派生补算器 + picker 默认值解析)。
* 多构造器场景须显式 @Autowired 指明注入构造,否则 Spring 回退无参构造致启动失败。 */
@org.springframework.beans.factory.annotation.Autowired
public FlowController(FlowExcuteService flowExcuteService, FlowNameResolver flowNameResolver,
UserColumnResolver userColumnResolver, FlowReadWriteClassifier classifier,
FlowInputCoercer inputCoercer, EditGridDerivedFieldComputer editGridComputer,
- JdbcTemplate jdbcTemplate, PickerController pickerController) {
+ JdbcTemplate jdbcTemplate, PickerController pickerController,
+ RecipeDerivedFieldComputer recipeDerivedComputer) {
this.flowExcuteService = flowExcuteService;
this.flowNameResolver = flowNameResolver;
this.userColumnResolver = userColumnResolver;
@@ -99,6 +103,16 @@ public class FlowController {
this.editGridComputer = editGridComputer;
this.jdbcTemplate = jdbcTemplate;
this.pickerController = pickerController;
+ this.recipeDerivedComputer = recipeDerivedComputer;
+ }
+
+ /** 兼容老单测/旧调用的八参构造(无 recipe 派生补算器)。生产由 Spring 走九参构造。 */
+ public FlowController(FlowExcuteService flowExcuteService, FlowNameResolver flowNameResolver,
+ UserColumnResolver userColumnResolver, FlowReadWriteClassifier classifier,
+ FlowInputCoercer inputCoercer, EditGridDerivedFieldComputer editGridComputer,
+ JdbcTemplate jdbcTemplate, PickerController pickerController) {
+ this(flowExcuteService, flowNameResolver, userColumnResolver, classifier, inputCoercer,
+ editGridComputer, jdbcTemplate, pickerController, null);
}
/** 兼容老单测的六参构造(无 picker 默认值解析)。生产由 Spring 走八参构造。 */
@@ -162,6 +176,7 @@ public class FlowController {
@Operation(summary = "执行服务流(POST):JSON body 作为入参 map,返回流输出 JSON")
public ResponseEntity