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

update:更新

上级 32a9de83
...@@ -215,6 +215,8 @@ export default class AppLoginButton extends Vue { ...@@ -215,6 +215,8 @@ export default class AppLoginButton extends Vue {
const layoutModel = this.layoutModelDetails[this.itemName]; const layoutModel = this.layoutModelDetails[this.itemName];
if (layoutModel) { if (layoutModel) {
return layoutModel.iconAlign || 'LEFT'; return layoutModel.iconAlign || 'LEFT';
}else{
return 'LEFT';
} }
} }
...@@ -227,6 +229,8 @@ export default class AppLoginButton extends Vue { ...@@ -227,6 +229,8 @@ export default class AppLoginButton extends Vue {
const layoutModel = this.layoutModelDetails[this.itemName]; const layoutModel = this.layoutModelDetails[this.itemName];
if (layoutModel) { if (layoutModel) {
return Object.is(layoutModel.buttonStyle, 'INVERSE'); return Object.is(layoutModel.buttonStyle, 'INVERSE');
}else{
return false;
} }
} }
......
...@@ -114,7 +114,7 @@ export default class AppScrollContainer extends Vue { ...@@ -114,7 +114,7 @@ export default class AppScrollContainer extends Vue {
*/ */
get curStyle() { get curStyle() {
const layoutModel = this.layoutModelDetails[this.itemName]; const layoutModel = this.layoutModelDetails[this.itemName];
if(layoutModel){ if (layoutModel) {
return layoutModel.getElementStyle(); return layoutModel.getElementStyle();
} }
} }
...@@ -124,7 +124,7 @@ export default class AppScrollContainer extends Vue { ...@@ -124,7 +124,7 @@ export default class AppScrollContainer extends Vue {
*/ */
public getItemPosStyle(name: string) { public getItemPosStyle(name: string) {
const layoutModel = this.layoutModelDetails[this.itemName]; const layoutModel = this.layoutModelDetails[this.itemName];
if(layoutModel){ if (layoutModel) {
return layoutModel.getBorderLayoutStyle(); return layoutModel.getBorderLayoutStyle();
} }
} }
...@@ -137,28 +137,37 @@ export default class AppScrollContainer extends Vue { ...@@ -137,28 +137,37 @@ export default class AppScrollContainer extends Vue {
public initScrollContainer() { public initScrollContainer() {
let minusHeight = ''; let minusHeight = '';
let minusWidth: string = ''; let minusWidth: string = '';
this.containerModel = {};
const curLayoutModel = this.layoutModelDetails[this.itemName]; const curLayoutModel = this.layoutModelDetails[this.itemName];
if (curLayoutModel && curLayoutModel.details && curLayoutModel.details.length > 0) { if (curLayoutModel && curLayoutModel.details && curLayoutModel.details.length > 0) {
curLayoutModel.details.forEach((key: string) => { curLayoutModel.details.forEach((key: string) => {
const { name, layoutWidth, widthMode, layoutHeight, heightMode, layoutPos } = this.layoutModelDetails[key]; let childModelDetail: any;
const style = {}; if (this.index) {
if (layoutWidth) { childModelDetail = this.layoutModelDetails[`${key}_${this.index}`];
Object.assign(style, { width: Util.getBoxSize('WIDTH', widthMode, layoutWidth).width }); } else {
if (layoutPos && (Object.is(layoutPos, 'WEST') || Object.is(layoutPos, 'EAST'))) { childModelDetail = this.layoutModelDetails[key];
minusWidth += ` - ${Util.getBoxSize('WIDTH', widthMode, layoutWidth).width}`;
}
} }
if (layoutHeight) { if (childModelDetail) {
Object.assign(style, { height: Util.getBoxSize('HEIGHT', heightMode, layoutHeight).height }); const { name, layoutWidth, widthMode, layoutHeight, heightMode, layoutPos } = childModelDetail;
if (layoutPos && (Object.is(layoutPos, 'NORTH') || Object.is(layoutPos, 'SOUTH'))) { const style = {};
minusHeight += ` - ${Util.getBoxSize('HEIGHT', heightMode, layoutHeight).height}`; if (layoutWidth) {
Object.assign(style, { width: Util.getBoxSize('WIDTH', widthMode, layoutWidth).width });
if (layoutPos && (Object.is(layoutPos, 'WEST') || Object.is(layoutPos, 'EAST'))) {
minusWidth += ` - ${Util.getBoxSize('WIDTH', widthMode, layoutWidth).width}`;
}
}
if (layoutHeight) {
Object.assign(style, { height: Util.getBoxSize('HEIGHT', heightMode, layoutHeight).height });
if (layoutPos && (Object.is(layoutPos, 'NORTH') || Object.is(layoutPos, 'SOUTH'))) {
minusHeight += ` - ${Util.getBoxSize('HEIGHT', heightMode, layoutHeight).height}`;
}
}
if (this.containerModel.hasOwnProperty(layoutPos)) {
Object.assign(this.containerModel[layoutPos], { style });
this.containerModel[layoutPos].name.push(name);
} else {
this.containerModel[layoutPos] = { style, name: [name] };
} }
}
if (this.containerModel.hasOwnProperty(layoutPos)) {
Object.assign(this.containerModel[layoutPos], { style });
this.containerModel[layoutPos].name.push(name);
} else {
this.containerModel[layoutPos] = { style, name: [name] };
} }
}); });
} }
......
...@@ -70,6 +70,7 @@ export default class AppSimpleFlexContainer extends Vue { ...@@ -70,6 +70,7 @@ export default class AppSimpleFlexContainer extends Vue {
* @memberof SimpleFlexContainer * @memberof SimpleFlexContainer
*/ */
public initSimpleFlexContainer() { public initSimpleFlexContainer() {
this.containerModel = [];
const curLayoutModel = this.layoutModelDetails[this.itemName]; const curLayoutModel = this.layoutModelDetails[this.itemName];
if (curLayoutModel && curLayoutModel.details && curLayoutModel.details.length > 0) { if (curLayoutModel && curLayoutModel.details && curLayoutModel.details.length > 0) {
curLayoutModel.details.forEach((key: string) => { curLayoutModel.details.forEach((key: string) => {
......
...@@ -70,6 +70,7 @@ export default class AppStandardContainer extends Vue { ...@@ -70,6 +70,7 @@ export default class AppStandardContainer extends Vue {
* @memberof AppStandardContainer * @memberof AppStandardContainer
*/ */
public initStandardContainer() { public initStandardContainer() {
this.containerModel = [];
const curLayoutModel = this.layoutModelDetails[this.itemName]; const curLayoutModel = this.layoutModelDetails[this.itemName];
if (curLayoutModel && curLayoutModel.details && curLayoutModel.details.length > 0) { if (curLayoutModel && curLayoutModel.details && curLayoutModel.details.length > 0) {
curLayoutModel.details.forEach((key: string) => { curLayoutModel.details.forEach((key: string) => {
......
...@@ -78,6 +78,7 @@ export default class AppTabPage extends Vue { ...@@ -78,6 +78,7 @@ export default class AppTabPage extends Vue {
* @memberof AppTabPage * @memberof AppTabPage
*/ */
public initTabPage() { public initTabPage() {
this.containerModel = [];
const layoutModel = this.layoutModelDetails[this.itemName]; const layoutModel = this.layoutModelDetails[this.itemName];
if (layoutModel && layoutModel.details && layoutModel.details.length > 0) { if (layoutModel && layoutModel.details && layoutModel.details.length > 0) {
this.currentLayoutModel = layoutModel; this.currentLayoutModel = layoutModel;
......
...@@ -77,6 +77,7 @@ export default class AppTabPanel extends Vue { ...@@ -77,6 +77,7 @@ export default class AppTabPanel extends Vue {
* @memberof AppTabPanel * @memberof AppTabPanel
*/ */
public initTabPanel() { public initTabPanel() {
this.containerModel = [];
const layoutModel = this.layoutModelDetails[this.itemName]; const layoutModel = this.layoutModelDetails[this.itemName];
if (layoutModel && layoutModel.details && layoutModel.details.length > 0) { if (layoutModel && layoutModel.details && layoutModel.details.length > 0) {
layoutModel.details.forEach((key: string) => { layoutModel.details.forEach((key: string) => {
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册