Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua
commit
ed932adc46
|
|
@ -219,13 +219,13 @@
|
||||||
const arr: any = [];
|
const arr: any = [];
|
||||||
formScheme.value.formInfo.tabList.forEach((item, index) => {
|
formScheme.value.formInfo.tabList.forEach((item, index) => {
|
||||||
item.schemas.forEach((val) => {
|
item.schemas.forEach((val) => {
|
||||||
if (val.columns) {
|
if (val.columns && (val.component === "Grid" && val.type === "subTable")) {
|
||||||
val.columns.forEach((col) => {
|
val.columns.forEach((col) => {
|
||||||
col.children.forEach((chil) => {
|
col.children.forEach((chil) => {
|
||||||
arr.push(chil);
|
arr.push(chil);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}else if(val.component){
|
}else if(val.component && val.component !== "Grid"){
|
||||||
arr.push(val);
|
arr.push(val);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -235,13 +235,13 @@
|
||||||
if (formScheme.value.formInfo.tabList && formScheme.value.formInfo.tabList.length == 1) {
|
if (formScheme.value.formInfo.tabList && formScheme.value.formInfo.tabList.length == 1) {
|
||||||
const arr: any = [];
|
const arr: any = [];
|
||||||
formScheme.value.formInfo.tabList[0].schemas.forEach((item) => {
|
formScheme.value.formInfo.tabList[0].schemas.forEach((item) => {
|
||||||
if (item.columns) {
|
if (item.columns && (item.component === "Grid" && item.type === "subTable")) {
|
||||||
item.columns.forEach((col) => {
|
item.columns.forEach((col) => {
|
||||||
col.children.forEach((chil) => {
|
col.children.forEach((chil) => {
|
||||||
arr.push(chil);
|
arr.push(chil);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}else if(item.component){
|
}else if(item.component && item.component !== "Grid"){
|
||||||
arr.push(item)
|
arr.push(item)
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue