Elements-SY

modify

......@@ -424,21 +424,21 @@ export function restTableHeight($refs) {
if (key == "ylTable") {
$refs[key].$children.map((item) => {
if (item.$el.id == "group-btn") {
console.log("group-btn:", getPropertyValue(item.$el));
// console.log("group-btn:", getPropertyValue(item.$el));
// table表格组合按钮
heigth += getPropertyValue(item.$el);
heigth += item.$el.clientHeight;
} else if (item.$el.className == "el-pagination is-background") {
// table表格组合分页
if (item.$el.offsetParent.className == "pagination-container") {
console.log(
"pagination:",
getPropertyValue(item.$el.offsetParent)
);
console.log(
"paginationClientHeight:",
getPropertyValue(item.$el.offsetParent.clientHeight)
);
// console.log(
// "pagination:",
// getPropertyValue(item.$el.offsetParent)
// );
// console.log(
// "paginationClientHeight:",
// getPropertyValue(item.$el.offsetParent.clientHeight)
// );
heigth += getPropertyValue(item.$el.offsetParent);
heigth += item.$el.offsetParent.clientHeight;
}
......@@ -448,22 +448,22 @@ export function restTableHeight($refs) {
if ($refs[key].hasOwnProperty("$el")) {
heigth += $refs[key].$el.clientHeight;
heigth += getPropertyValue($refs[key].$el);
console.log(
"ruleForm:",
$refs[key].$el.clientHeight,
getPropertyValue($refs[key].$el)
);
// console.log(
// "ruleForm:",
// $refs[key].$el.clientHeight,
// getPropertyValue($refs[key].$el)
// );
} else {
console.log("ruleForm:", $refs[key]);
// console.log("ruleForm:", $refs[key]);
heigth += $refs[key].$el.clientHeight;
heigth += getPropertyValue($refs[key]);
}
}
} else if (key == "formHeaderRef") {
console.log("formHeaderRef:", getPropertyValue($refs[key]));
// console.log("formHeaderRef:", getPropertyValue($refs[key]));
heigth += getPropertyValue($refs[key]);
}
});
console.log("heigth:", heigth);
// console.log("heigth:", heigth);
return heigth;
}
......
......@@ -141,8 +141,8 @@ export default {
},
mounted() {
this.$nextTick(() => {
console.log(this.$refs)
this.tableAttr.maxHeight = window.innerHeight - restTableHeight(this.$refs);
this.tableAttr.maxHeight =
window.innerHeight - restTableHeight(this.$refs);
});
},
methods: {
......
......@@ -71,9 +71,7 @@ export default {
},
mounted() {
this.$nextTick(() => {
console.log(window.innerHeight);
console.log(restTableHeight(this.$refs));
// this.tableAttr.maxHeight = window.innerHeight - restTableHeight(this.$refs);
this.tableAttr.maxHeight = window.innerHeight - restTableHeight(this.$refs);
});
},
methods: {
......
......@@ -141,16 +141,7 @@ export default {
},
mounted() {
this.$nextTick(() => {
let app = document.querySelector(".app-main");
if (this.$store.getters.appMainBlockClientHeight) {
this.tableAttr.maxHeight =
this.$store.getters.appMainBlockClientHeight -
restTableHeight(this.$refs);
} else {
this.tableAttr.maxHeight =
app.clientHeight - restTableHeight(this.$refs);
}
console.log(this.tableAttr.maxHeight);
this.tableAttr.maxHeight = window.innerHeight - restTableHeight(this.$refs);
});
},
methods: {
......