主表列 = SUM/COUNT/AVG/MIN/MAX(子表某列)。服务端权威:行级派生(__derive)之后再聚合
(?__rollup=主列=AGG:LIST:子列),把子表列聚合写回主 map → 引擎落库;主表单该列只读
static + ${SUM(ARRAYMAP(DETAILS, item => <派生公式或子列>))} 实时预览。
- RecipeDerivedFieldComputer.enrichRollup: 子表列聚合(空集 SUM/COUNT=0,MIN/MAX/AVG 跳过)
- PageBlueprintChild.RollupColumn + 编译器 masterDetailFormControls(汇总列→static SUM 预览,
被聚合子列若派生则用其公式 item 前缀)+ masterDetailFormApi 拼 __derive&__rollup
- RecipePageComposer/DesignFeatureController 贯通 childRollup(Object 容错;主列须主表真实列、
子列须子表真实列、agg 白名单 SUM/COUNT/AVG/MIN/MAX)
- FlowController.executePost 接 __rollup(在 __derive 之后,使派生列已算好)
+5 单测,curl live e2e(TOTAL=SUM(明细金额)=55,服务端先逐行派生再聚合)PASS,Playwright 3/3。
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
96 lines
5.3 KiB
Bash
96 lines
5.3 KiB
Bash
#!/usr/bin/env bash
|
|
# 主子表父级聚合 · live e2e:建主(TITLE/TOTAL)+子(ITEMQTY/ITEMPRICE/AMOUNT) → compile 带 childDerived
|
|
# (AMOUNT=ITEMQTY*ITEMPRICE) + childRollup(TOTAL=SUM(AMOUNT)) → publish → 主表 _ADD(报子行不带 AMOUNT,
|
|
# 主体不带 TOTAL) → _LOAD 断言 子行 AMOUNT=30/25 且 主表 TOTAL=55(服务端先逐行派生再聚合,权威)。
|
|
set -euo pipefail
|
|
BASE=${BASE:-http://localhost:8094}
|
|
ACCT=${ACCT:-admin}; PW=${PW:-111111}
|
|
TS=$(date +%s); M="EIP4PT_RUP${TS}M"; C="EIP4PT_RUP${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] master=$M child=$C"
|
|
|
|
echo "[建主实体] $M (TITLE + TOTAL)"
|
|
MEID=$(curl -s -X POST "$BASE/api/meta/entity" "${H[@]}" -d '{
|
|
"tablename":"'"$M"'","name":"聚合采购","attributes":[
|
|
{"column":"TITLE","display":"标题","type":"string","length":200,"mandatory":true},
|
|
{"column":"TOTAL","display":"总额","type":"number"}]}' | jqpy "['data']['entityId']")
|
|
echo " masterEntityId=$MEID"
|
|
|
|
echo "[建子实体] $C (ITEMQTY/ITEMPRICE/AMOUNT, tabletype=1)"
|
|
curl -s -X POST "$BASE/api/meta/entity" "${H[@]}" -d '{
|
|
"tablename":"'"$C"'","name":"聚合明细","tabletype":1,"masterTable":"'"$M"'","attributes":[
|
|
{"column":"ITEMQTY","display":"数量","type":"integer"},
|
|
{"column":"ITEMPRICE","display":"单价","type":"number"},
|
|
{"column":"AMOUNT","display":"金额","type":"number"}]}' | jqpy "['data']['entityId']" >/dev/null
|
|
|
|
echo "[compile] childDerived AMOUNT=ITEMQTY*ITEMPRICE + childRollup TOTAL=SUM(AMOUNT)"
|
|
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"}],
|
|
"childRollup":[{"masterColumn":"TOTAL","childColumn":"AMOUNT","agg":"SUM"}]}' | jqpy "['data']['templateId']")
|
|
echo " templateId=$TID"
|
|
echo " [校验] 表单 api 含 __derive+__rollup;主表 TOTAL 列=static SUM 预览:"
|
|
curl -s "$BASE/api/page/schema/$TID" "${H[@]}" -o /tmp/rup-schema.json
|
|
python3 - <<'PY'
|
|
import json
|
|
d=json.load(open('/tmp/rup-schema.json'),strict=False)
|
|
s=json.dumps(d,ensure_ascii=False)
|
|
print(" __derive:", "__derive" in s, " __rollup:", "__rollup" in s)
|
|
def walk(n):
|
|
if isinstance(n,dict):
|
|
if n.get('name')=='TOTAL' and n.get('type')=='static':
|
|
print(" TOTAL static tpl=",n.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\":\"聚合采购主子\"}" | jqpy "['data']['flowsCreated']" | sed 's/^/ flowsCreated=/'
|
|
|
|
echo "[_ADD 带 __derive+__rollup] 子行不带 AMOUNT、主体不带 TOTAL → 服务端逐行派生再聚合"
|
|
ADD=$(curl -s -X POST "$BASE/api/flow/${M}_ADD?__derive=DETAILS%7CAMOUNT%3DITEMQTY*ITEMPRICE&__rollup=TOTAL%3DSUM%3ADETAILS%3AAMOUNT" "${H[@]}" -d '{
|
|
"TITLE":"聚合单A","DETAILS":[
|
|
{"ITEMQTY":3,"ITEMPRICE":10},
|
|
{"ITEMQTY":2,"ITEMPRICE":12.5}]}')
|
|
echo " _ADD status=$(echo "$ADD" | jqpy "['status']")"
|
|
|
|
echo "[_SEARCH→_LOAD 断言] 子行 AMOUNT=30/25;主表 TOTAL=55"
|
|
curl -s -X POST "$BASE/api/flow/${M}_SEARCH" "${H[@]}" -d '{}' -o /tmp/rup-search.json
|
|
python3 - "$BASE" "$TOK" "$M" <<'PY'
|
|
import json,sys,urllib.request
|
|
base,tok,M=sys.argv[1],sys.argv[2],sys.argv[3]
|
|
def post(p,b):
|
|
r=urllib.request.Request(base+p,data=json.dumps(b).encode(),headers={'Authorization':'Bearer '+tok,'Content-Type':'application/json'})
|
|
return json.load(urllib.request.urlopen(r),strict=False)
|
|
items=json.load(open('/tmp/rup-search.json'),strict=False).get('data',{}).get('items',[])
|
|
pk=M+'_ID'; ok=True; found=False
|
|
for it in items:
|
|
if it.get('TITLE')!='聚合单A': continue
|
|
found=True
|
|
ld=post('/api/flow/%s_LOAD'%M,{pk:str(it[pk]).strip()})
|
|
res=ld['data']['result']
|
|
det=res.get('DETAILS') or []
|
|
amts=sorted([float(d.get('AMOUNT')) for d in det if d.get('AMOUNT') not in (None,'')])
|
|
total=res.get('TOTAL')
|
|
print(" 子行 AMOUNT=",amts," 主表 TOTAL=",total)
|
|
if amts!=[25.0,30.0]: ok=False; print(" ✗ 子行派生期望[25,30]")
|
|
else: print(" ✓ 子行派生 AMOUNT 正确")
|
|
if total in (None,'') or abs(float(total)-55.0)>1e-9: ok=False; print(" ✗ 主表 TOTAL 期望 55,实得",total)
|
|
else: print(" ✓ 服务端聚合 TOTAL=SUM(明细金额)=55 正确")
|
|
if not found: ok=False; print(" ✗ 未找到聚合单A")
|
|
print("RESULT:", "PASS" if (ok and found) else "FAIL")
|
|
PY
|
|
|
|
echo "[清理]"
|
|
curl -s -X DELETE "$BASE/api/meta/entity/$C" "${H[@]}" >/dev/null
|
|
curl -s -X DELETE "$BASE/api/meta/entity/$M" "${H[@]}" >/dev/null
|
|
export PGOPTIONS="-c search_path=eip3"; /opt/homebrew/bin/psql -h localhost -p 5433 -U zhengwr -d eip4dev -At -c "DELETE FROM sys_page_schema WHERE template_id='$TID'; DELETE FROM sys_menu WHERE name='聚合采购主子'; DELETE FROM sys_serviceflow WHERE displayname LIKE '$M%';" >/dev/null 2>&1
|
|
echo " cleaned $M/$C"
|