提交 4a328e1b 编写于 作者: Shine-zwj's avatar Shine-zwj

更新:多数据容器

上级 80c4f608
...@@ -141,7 +141,10 @@ export class PanelContainerModel extends PanelDetailModel { ...@@ -141,7 +141,10 @@ export class PanelContainerModel extends PanelDetailModel {
this.data = this.panel.data; this.data = this.panel.data;
} }
} else { } else {
const parentItem = this.panel.layoutModelDetails[this.parentName]; let parentItem = this.panel.layoutModelDetails[`${this.parentName}_${this.index}`];
if (!parentItem) {
parentItem = this.panel.layoutModelDetails[this.parentName];
}
if (parentItem) { if (parentItem) {
if (parentItem.dataRegionType === 'MULTIDATA' && parentItem['data'] && parentItem['data'].length > 0) { if (parentItem.dataRegionType === 'MULTIDATA' && parentItem['data'] && parentItem['data'].length > 0) {
this.data = parentItem.getData()[this.getIndex()]; this.data = parentItem.getData()[this.getIndex()];
......
...@@ -440,6 +440,7 @@ export class PanelDetailModel { ...@@ -440,6 +440,7 @@ export class PanelDetailModel {
if (this.parentName && this.panel) { if (this.parentName && this.panel) {
const parentItem = this.panel.layoutModelDetails[this.parentName]; const parentItem = this.panel.layoutModelDetails[this.parentName];
// 识别父FLEX // 识别父FLEX
if (parentItem) {
if (parentItem.layout == 'FLEX') { if (parentItem.layout == 'FLEX') {
Object.assign(boxStyle, { 'display': 'contents' }); Object.assign(boxStyle, { 'display': 'contents' });
Object.assign(boxStyle, { 'flex-grow': this.flexGrow ? this.flexGrow : 0 }); Object.assign(boxStyle, { 'flex-grow': this.flexGrow ? this.flexGrow : 0 });
...@@ -464,6 +465,7 @@ export class PanelDetailModel { ...@@ -464,6 +465,7 @@ export class PanelDetailModel {
} }
} }
} }
}
if (!this.visible) { if (!this.visible) {
Object.assign(boxStyle, { display: 'none' }); Object.assign(boxStyle, { display: 'none' });
} }
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册