提交 fe105d33 编写于 作者: tony001's avatar tony001

update:更新

上级 fcccfc63
...@@ -174,7 +174,14 @@ export default class AppScrollContainer extends Vue { ...@@ -174,7 +174,14 @@ export default class AppScrollContainer extends Vue {
const itemName = this.index ? `${name}_${this.index}` : name; const itemName = this.index ? `${name}_${this.index}` : name;
let layoutModel = this.layoutModelDetails[itemName]; let layoutModel = this.layoutModelDetails[itemName];
if (layoutModel) { if (layoutModel) {
return layoutModel.getBoxLayOutStyle(); const boxSizeStyle: any = layoutModel.getBoxSizeStyle();
if (!boxSizeStyle.width) {
Object.assign(boxSizeStyle, { 'width': '100%' });
}
if (!boxSizeStyle.height) {
Object.assign(boxSizeStyle, { 'height': '100%' });
}
return boxSizeStyle;
} }
} }
} }
......
...@@ -450,11 +450,9 @@ export class PanelDetailModel { ...@@ -450,11 +450,9 @@ export class PanelDetailModel {
Object.assign(boxStyle, { 'flex-grow': 1, 'min-width': `${(100 / 12)}%`, 'height': '100%' }); Object.assign(boxStyle, { 'flex-grow': 1, 'min-width': `${(100 / 12)}%`, 'height': '100%' });
} }
} }
// 项如果设置宽高,布局应该对应设置宽高且不应该设置flex布局 const boxSizeStyle: any = this.getBoxSizeStyle();
const boxSize = this.getBoxSizeStyle(); if (boxSizeStyle && Object.keys(boxSizeStyle).length > 0) {
if (boxSize && Object.keys(boxSize).length > 0) { Object.assign(boxStyle, { 'flex-grow': 0 });
Object.assign(boxStyle, boxSize);
Object.assign(boxStyle, { 'flex': 'none' });
} }
return boxStyle; return boxStyle;
} }
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册