修复前端无法加载getRecordWithOnload返回值的问题
This commit is contained in:
parent
48a825e3f3
commit
1e13b10c49
@ -105,8 +105,11 @@ export const getRecordWithOnload = async (pagetype: string, name: string): Promi
|
|||||||
// 使用getdoc RPC方法,它会调用onload方法并返回__onload数据
|
// 使用getdoc RPC方法,它会调用onload方法并返回__onload数据
|
||||||
const result = await api.call('jingrow.desk.form.load.getdoc', { pagetype, name })
|
const result = await api.call('jingrow.desk.form.load.getdoc', { pagetype, name })
|
||||||
|
|
||||||
// getdoc返回的是{ docs: [pg], docinfo: {...} }
|
// 兼容两种响应格式:
|
||||||
const pg = result.docs?.[0]
|
// SaaS 直接返回 { docs: [pg], docinfo: {...} }
|
||||||
|
// jlocal 返回 { message: { docs: [pg], docinfo: {...} } }
|
||||||
|
const docData = result.docs ? result : (result.message || {})
|
||||||
|
const pg = docData.docs?.[0]
|
||||||
if (pg) {
|
if (pg) {
|
||||||
return { success: true, data: pg }
|
return { success: true, data: pg }
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -26,6 +26,8 @@ def getdoc(**kwargs):
|
|||||||
|
|
||||||
resp = requests.post(url, headers=headers, json=kwargs, timeout=30)
|
resp = requests.post(url, headers=headers, json=kwargs, timeout=30)
|
||||||
if resp.status_code == 200:
|
if resp.status_code == 200:
|
||||||
return resp.json().get("message", {})
|
# SaaS getdoc 直接返回 {docs: [...], docinfo: {...}} 格式
|
||||||
logger.error(f"[form.load.getdoc] SaaS error: {resp.status_code}")
|
# 不包装在 message 里
|
||||||
|
return resp.json()
|
||||||
|
logger.error(f"[getdoc] SaaS error: {resp.status_code} - {resp.text[:200]}")
|
||||||
return {}
|
return {}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user