feat(主子表): 派生字段(金额=数量×单价) compute-on-save + tpl 实时预览
零引擎改动:UI 派生列只读 tpl ${公式} 实时预览(quickEdit:false),服务端权威
经写流 ?__derive= 用安全算术求值器逐行 compute-on-save 落库(复用 ?__egtpl=
同款轨道,绕开 amis input-table 前端竞态)。
- RecipeArithmeticEvaluator: 纯算术递归下降/BigDecimal,无任意代码执行;含递归
深度(64)+表达式长度(512)护栏,防深嵌套 StackOverflowError(Error 逃兜底)DoS
- RecipeDerivedFieldComputer: 子表数组逐行求值写回,逐格错误隔离不阻断保存
- PageBlueprintChild.derived + 编译器派生列(tpl + quickEdit:false + 表单 api
URL 编码 __derive);RecipePageComposer/DesignFeatureController 贯通 childDerived
(Object 容错避免 Jackson 400;公式字符白名单拒 |/=/; 防静默写错值)
- FlowController.executePost 接 __derive(9 参 @Autowired + 反射回归测试)
对抗评审(36 agent)揪修 3 真 bug:amis needConfirm:false 强注 quickEdit 需显式
false 才保留 tpl 预览;求值器深嵌套 Error 逃逐行兜底;公式 | 破坏 spec 切分。
+9 单测,curl live e2e 含负控 PASS,Playwright 3/3。
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
131
scripts/master-detail-derived-acceptance.sh
Normal file
131
scripts/master-detail-derived-acceptance.sh
Normal file
@@ -0,0 +1,131 @@
|
||||
#!/usr/bin/env bash
|
||||
# 主子表派生字段 · live e2e 验收:建主+子(含 AMOUNT 列) → compile master-detail-v1 携 childDerived
|
||||
# (AMOUNT=ITEMQTY*ITEMPRICE) → publish → 主表 _ADD 报子行(不带 AMOUNT) → _LOAD 断言落库 AMOUNT=数量×单价。
|
||||
# 证明点:① 带 ?__derive= 时服务端逐行权威算 AMOUNT;② 负控不带 __derive 则 AMOUNT 空(确属服务端补算非客户端传入)。
|
||||
set -euo pipefail
|
||||
BASE=${BASE:-http://localhost:8094}
|
||||
ACCT=${ACCT:-admin}; PW=${PW:-111111}
|
||||
TS=$(date +%s)
|
||||
M="EIP4PT_DRV${TS}M"; C="EIP4PT_DRV${TS}C"
|
||||
jqpy() { python3 -c "import sys,json;d=json.load(sys.stdin,strict=False);print(eval(\"d$1\"))"; }
|
||||
|
||||
TOK=$(curl -s -X POST "$BASE/api/auth/login" -H 'Content-Type: application/json' \
|
||||
-d "{\"account\":\"$ACCT\",\"password\":\"$PW\"}" | jqpy "['token']")
|
||||
H=(-H "Authorization: Bearer $TOK" -H 'Content-Type: application/json')
|
||||
echo "[login] token len=${#TOK} master=$M child=$C"
|
||||
|
||||
echo "[建主实体] $M (TITLE)"
|
||||
MEID=$(curl -s -X POST "$BASE/api/meta/entity" "${H[@]}" -d '{
|
||||
"tablename":"'"$M"'","name":"派生采购","attributes":[
|
||||
{"column":"TITLE","display":"标题","type":"string","length":200,"mandatory":true}]}' | jqpy "['data']['entityId']")
|
||||
echo " masterEntityId=$MEID"
|
||||
|
||||
echo "[建子实体] $C (ITEMNAME/ITEMQTY/ITEMPRICE/AMOUNT, tabletype=1, masterTable=$M)"
|
||||
curl -s -X POST "$BASE/api/meta/entity" "${H[@]}" -d '{
|
||||
"tablename":"'"$C"'","name":"派生明细","tabletype":1,"masterTable":"'"$M"'","attributes":[
|
||||
{"column":"ITEMNAME","display":"物料","type":"string","length":100,"mandatory":true},
|
||||
{"column":"ITEMQTY","display":"数量","type":"integer"},
|
||||
{"column":"ITEMPRICE","display":"单价","type":"number"},
|
||||
{"column":"AMOUNT","display":"金额","type":"number"}]}' | jqpy "['data']['entityId']" >/dev/null
|
||||
echo " child created"
|
||||
|
||||
echo "[环③ compile] master-detail-v1 + childDerived AMOUNT=ITEMQTY*ITEMPRICE"
|
||||
TID=$(curl -s -X POST "$BASE/api/design/recipe/compile" "${H[@]}" -d '{
|
||||
"tableName":"'"$M"'","recipe":"master-detail-v1","title":"派生采购主子","displayField":"TITLE",
|
||||
"childTable":"'"$C"'","linkColumn":"MASTERID","listColumn":"DETAILS","listLabel":"明细",
|
||||
"childDerived":[{"column":"AMOUNT","formula":"ITEMQTY*ITEMPRICE"}]}' | jqpy "['data']['templateId']")
|
||||
echo " templateId=$TID"
|
||||
echo " [校验] 生成页表单 api 应含 __derive、子表 AMOUNT 列应为 tpl:"
|
||||
curl -s "$BASE/api/page/schema/$TID" "${H[@]}" -o /tmp/md-derived-schema.json
|
||||
python3 - <<'PY'
|
||||
import json
|
||||
d=json.load(open('/tmp/md-derived-schema.json'),strict=False)
|
||||
import re
|
||||
s=json.dumps(d,ensure_ascii=False)
|
||||
print(" __derive in api:", "__derive" in s)
|
||||
# 找 input-table 的 AMOUNT 列
|
||||
def walk(n):
|
||||
if isinstance(n,dict):
|
||||
if n.get('type')=='input-table':
|
||||
for c in n.get('columns',[]):
|
||||
if c.get('name')=='AMOUNT':
|
||||
print(" AMOUNT 列 type=",c.get('type')," tpl=",c.get('tpl'))
|
||||
for v in n.values(): walk(v)
|
||||
elif isinstance(n,list):
|
||||
for v in n: walk(v)
|
||||
walk(d)
|
||||
PY
|
||||
|
||||
echo "[环④ publish] 五流 + 菜单"
|
||||
curl -s -X POST "$BASE/api/design/publish" "${H[@]}" \
|
||||
-d "{\"entityId\":\"$MEID\",\"tableName\":\"$M\",\"templateId\":\"$TID\",\"menuName\":\"派生采购主子\",\"generateDeploymentPackage\":true}" \
|
||||
| jqpy "['data']['flowsCreated']" | sed 's/^/ flowsCreated=/'
|
||||
|
||||
echo "[_ADD 带 __derive] 子行不带 AMOUNT,服务端应逐行算 30 / 25"
|
||||
ADD=$(curl -s -X POST "$BASE/api/flow/${M}_ADD?__derive=DETAILS%7CAMOUNT%3DITEMQTY*ITEMPRICE" "${H[@]}" -d '{
|
||||
"TITLE":"采购单A","DETAILS":[
|
||||
{"ITEMNAME":"水泥","ITEMQTY":3,"ITEMPRICE":10},
|
||||
{"ITEMNAME":"钢筋","ITEMQTY":2,"ITEMPRICE":12.5}]}')
|
||||
echo " _ADD status=$(echo "$ADD" | jqpy "['status']")"
|
||||
|
||||
echo "[_ADD 负控 不带 __derive] 子行 AMOUNT 应留空(证明 AMOUNT 来自服务端而非客户端)"
|
||||
curl -s -X POST "$BASE/api/flow/${M}_ADD" "${H[@]}" -d '{
|
||||
"TITLE":"采购单B","DETAILS":[{"ITEMNAME":"砂石","ITEMQTY":5,"ITEMPRICE":4}]}' | jqpy "['status']" | sed 's/^/ 负控 _ADD status=/'
|
||||
|
||||
echo "[_SEARCH] 取主记录 id"
|
||||
curl -s -X POST "$BASE/api/flow/${M}_SEARCH" "${H[@]}" -d '{}' -o /tmp/md-derived-search.json
|
||||
echo " _SEARCH status=$(jqpy "['status']" </tmp/md-derived-search.json)"
|
||||
|
||||
echo "[_LOAD 断言] 采购单A 子行 AMOUNT=30/25;采购单B 子行 AMOUNT 空"
|
||||
python3 - "$BASE" "$TOK" "$M" <<'PY'
|
||||
import json,sys,urllib.request
|
||||
base,tok,M=sys.argv[1],sys.argv[2],sys.argv[3]
|
||||
def post(path,body):
|
||||
req=urllib.request.Request(base+path,data=json.dumps(body).encode(),
|
||||
headers={'Authorization':'Bearer '+tok,'Content-Type':'application/json'})
|
||||
return json.load(urllib.request.urlopen(req),strict=False)
|
||||
search=json.load(open('/tmp/md-derived-search.json'),strict=False)
|
||||
data=search.get('data',{})
|
||||
print(" [debug] data keys=",list(data.keys()) if isinstance(data,dict) else type(data))
|
||||
rows=data.get('items') or data.get('result') or data.get('rows') or data.get('list') or data.get('records') or []
|
||||
if isinstance(rows,dict): rows=rows.get('items') or rows.get('rows') or rows.get('records') or rows.get('list') or []
|
||||
print(" [debug] rows len=",len(rows), " row0 keys=",list(rows[0].keys()) if rows else None)
|
||||
pk=M+'_ID'
|
||||
_dbg=[True]
|
||||
def load_details(rid):
|
||||
r=post('/api/flow/%s_LOAD'%M,{pk:rid})
|
||||
res=r.get('data',{}).get('result',r.get('data',{}))
|
||||
if isinstance(res,list): res=res[0] if res else {}
|
||||
if _dbg[0]:
|
||||
_dbg[0]=False
|
||||
print(" [debug] _LOAD data keys=",list(r.get('data',{}).keys())," result keys=",list(res.keys()) if isinstance(res,dict) else type(res))
|
||||
return res.get('DETAILS') or res.get('details') or []
|
||||
ok=True; found_a=False; found_b=False
|
||||
for row in rows:
|
||||
rid=row.get(pk) or row.get(pk.lower())
|
||||
title=row.get('TITLE') or row.get('title')
|
||||
if not rid: continue
|
||||
det=load_details(str(rid).strip())
|
||||
amts=[d.get('AMOUNT') if isinstance(d,dict) else None for d in det]
|
||||
print(" %s id=%s DETAILS.AMOUNT=%s"%(title,str(rid).strip(),amts))
|
||||
if title=='采购单A':
|
||||
found_a=True
|
||||
got=sorted([float(a) for a in amts if a not in (None,'')])
|
||||
if got!=[25.0,30.0]:
|
||||
ok=False; print(" ✗ 期望 [25,30] 实得",got)
|
||||
else: print(" ✓ 服务端派生 AMOUNT=数量×单价 正确")
|
||||
if title=='采购单B':
|
||||
found_b=True
|
||||
if any(a not in (None,'') for a in amts):
|
||||
ok=False; print(" ✗ 负控应为空,实得",amts)
|
||||
else: print(" ✓ 负控 AMOUNT 空(确属服务端补算)")
|
||||
if not found_a:
|
||||
ok=False; print(" ✗ 未在 _SEARCH 结果中找到采购单A → 断言根本没跑(假 PASS 风险)")
|
||||
print("RESULT:", "PASS" if (ok and found_a and found_b) else "FAIL")
|
||||
PY
|
||||
|
||||
echo "[清理] 删测试主/子实体(EIP4 前缀门)"
|
||||
curl -s -X DELETE "$BASE/api/meta/entity/$C" "${H[@]}" >/dev/null; echo " child deleted"
|
||||
curl -s -X DELETE "$BASE/api/meta/entity/$M" "${H[@]}" >/dev/null; echo " master deleted"
|
||||
echo "[完成] 主子表派生字段 live e2e 验收(残留 RV/页/菜单/流需 psql 清,见末尾)"
|
||||
echo "TID=$TID M=$M C=$C"
|
||||
Reference in New Issue
Block a user