Commit 861e9654 authored by 郭志伟's avatar 郭志伟

fix: 修改高度计算方式

parent 03094c70
...@@ -14,7 +14,7 @@ export default class OperationPanel extends Mixins(TransformStyleMixin) { ...@@ -14,7 +14,7 @@ export default class OperationPanel extends Mixins(TransformStyleMixin) {
@Prop(Boolean) isDraging; @Prop(Boolean) isDraging;
@Prop(Boolean) isDragIn; @Prop(Boolean) isDragIn;
layout: object = [];
bottomInfo: object = { bottomInfo: object = {
x: 0, x: 0,
y: 0, y: 0,
...@@ -23,13 +23,10 @@ export default class OperationPanel extends Mixins(TransformStyleMixin) { ...@@ -23,13 +23,10 @@ export default class OperationPanel extends Mixins(TransformStyleMixin) {
i: 'page-bottom-top' i: 'page-bottom-top'
}; };
get layout() { @Watch('pageData')
return this.pageData.elements.map(v => v.point);
}
@Watch('layout')
onLayoutChange(val) { onLayoutChange(val) {
const lastGridItemPoint = val[val.length - 1]; const layout = this.pageData.elements.map(v => v.point);
const lastGridItemPoint = layout[layout.length - 1];
if (lastGridItemPoint.w) { if (lastGridItemPoint.w) {
this.bottomInfo = { this.bottomInfo = {
x: 0, x: 0,
...@@ -41,6 +38,8 @@ export default class OperationPanel extends Mixins(TransformStyleMixin) { ...@@ -41,6 +38,8 @@ export default class OperationPanel extends Mixins(TransformStyleMixin) {
if (lastGridItemPoint.w > this.bottomInfo.w) { this.bottomInfo.w = lastGridItemPoint.w; } if (lastGridItemPoint.w > this.bottomInfo.w) { this.bottomInfo.w = lastGridItemPoint.w; }
this.bottomInfo.y = this.bottomInfo.y + lastGridItemPoint.y + lastGridItemPoint.h; this.bottomInfo.y = this.bottomInfo.y + lastGridItemPoint.y + lastGridItemPoint.h;
} }
layout.push(this.bottomInfo);
this.layout = layout;
} }
@Emit('update:isDragIn') @Emit('update:isDragIn')
......
...@@ -1491,9 +1491,9 @@ ...@@ -1491,9 +1491,9 @@
"integrity": "sha512-uOCUKu5mvX3PWee+7ZFXQSNIR1V5SN2JVE2yANmW9/wQOgpEct291gXGok8VMw0009HlTWB4JATURPwyOP2DFg==" "integrity": "sha512-uOCUKu5mvX3PWee+7ZFXQSNIR1V5SN2JVE2yANmW9/wQOgpEct291gXGok8VMw0009HlTWB4JATURPwyOP2DFg=="
}, },
"@qg/cherry-ui": { "@qg/cherry-ui": {
"version": "2.21.1-beta5", "version": "2.21.1-beta6",
"resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.1-beta5.tgz", "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.1-beta6.tgz",
"integrity": "sha512-C43ydazyjqmsrq2uYJ2prcksnSTmeMyoracVw5dcyV1S9GGQku7C6CmpV1KXXpXiR6HLrXb7HcLyzgrCf/DzUA==", "integrity": "sha512-N99UjjwYrQj1AccZ+08lNRdHWKnlb7ZnKvAn4w48KWRERQNxJ1U2LwclVmQ3FRFlc9x5FRSUDccuoJ3CAf2ZMg==",
"requires": { "requires": {
"@popperjs/core": "^2.5.4", "@popperjs/core": "^2.5.4",
"vue-lazyload": "^1.3.3", "vue-lazyload": "^1.3.3",
......
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