Commit ac9ba07f authored by 彭俊龙's avatar 彭俊龙

fromjson解析检查非空

parent ffd8373e
{ {
"name": "panda-xform", "name": "panda-xform",
"version": "6.10.51", "version": "6.10.52",
"description": "6.10.51 地图选取加判断", "description": "6.10.52 formjson解析检查非空",
"keywords": [ "keywords": [
"panda-xform" "panda-xform"
], ],
......
...@@ -426,9 +426,9 @@ export function ImportAccountData(options, params, data) { ...@@ -426,9 +426,9 @@ export function ImportAccountData(options, params, data) {
} }
//导出数据 //导出数据
export function ExportAccountData({ accountName, ids, exportAll, isExportRelationForm }) { export function ExportAccountData({ accountName, ids, exportAll, isExportRelationForm, isExportImage, condition }) {
return request({ return request({
url: `${BASEURL}/ExportAccountData?accountName=${accountName}&ids=${ids}&exportAll=${exportAll}&isExportRelationForm=${isExportRelationForm}`, url: `${BASEURL}/ExportAccountData?accountName=${accountName}&ids=${ids}&exportAll=${exportAll}&isExportRelationForm=${isExportRelationForm}&isExportImage=${isExportImage}&condition=${condition}`,
method: 'get', method: 'get',
headers: { headers: {
// 'Civ-Site': window?.globalConfig?.userInfo?.site, // 'Civ-Site': window?.globalConfig?.userInfo?.site,
......
...@@ -46,18 +46,18 @@ const XRender = (props, ref) => { ...@@ -46,18 +46,18 @@ const XRender = (props, ref) => {
console.log(schemaForm, 'schemaForm'); console.log(schemaForm, 'schemaForm');
let parent = schemaForm?.properties let parent = schemaForm?.properties
let keys = Object.keys(parent);
let parentDatas = keys.map(k=> parent[k].properties)
let fieldDatas = {};
parentDatas.forEach(k=>{
if(k){
let ks = Object.keys(k)
ks.map(x=> fieldDatas[x] =k[x])
}
})
let parentObj = {} let parentObj = {}
let array = [] let array = []
if (isObject(parent)) { if (isObject(parent)) {
let keys = Object.keys(parent);
let parentDatas = keys.map(k=> parent[k].properties)
let fieldDatas = {};
parentDatas.forEach(k=>{
if(k){
let ks = Object.keys(k)
ks.map(x=> fieldDatas[x] =k[x])
}
})
for (let v in parent) { for (let v in parent) {
let hidden = true let hidden = true
let child = parent[v]?.properties let child = parent[v]?.properties
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment