Elements-SY

modify

...@@ -424,21 +424,21 @@ export function restTableHeight($refs) { ...@@ -424,21 +424,21 @@ export function restTableHeight($refs) {
424 if (key == "ylTable") { 424 if (key == "ylTable") {
425 $refs[key].$children.map((item) => { 425 $refs[key].$children.map((item) => {
426 if (item.$el.id == "group-btn") { 426 if (item.$el.id == "group-btn") {
427 - console.log("group-btn:", getPropertyValue(item.$el)); 427 + // console.log("group-btn:", getPropertyValue(item.$el));
428 // table表格组合按钮 428 // table表格组合按钮
429 heigth += getPropertyValue(item.$el); 429 heigth += getPropertyValue(item.$el);
430 heigth += item.$el.clientHeight; 430 heigth += item.$el.clientHeight;
431 } else if (item.$el.className == "el-pagination is-background") { 431 } else if (item.$el.className == "el-pagination is-background") {
432 // table表格组合分页 432 // table表格组合分页
433 if (item.$el.offsetParent.className == "pagination-container") { 433 if (item.$el.offsetParent.className == "pagination-container") {
434 - console.log( 434 + // console.log(
435 - "pagination:", 435 + // "pagination:",
436 - getPropertyValue(item.$el.offsetParent) 436 + // getPropertyValue(item.$el.offsetParent)
437 - ); 437 + // );
438 - console.log( 438 + // console.log(
439 - "paginationClientHeight:", 439 + // "paginationClientHeight:",
440 - getPropertyValue(item.$el.offsetParent.clientHeight) 440 + // getPropertyValue(item.$el.offsetParent.clientHeight)
441 - ); 441 + // );
442 heigth += getPropertyValue(item.$el.offsetParent); 442 heigth += getPropertyValue(item.$el.offsetParent);
443 heigth += item.$el.offsetParent.clientHeight; 443 heigth += item.$el.offsetParent.clientHeight;
444 } 444 }
...@@ -448,22 +448,22 @@ export function restTableHeight($refs) { ...@@ -448,22 +448,22 @@ export function restTableHeight($refs) {
448 if ($refs[key].hasOwnProperty("$el")) { 448 if ($refs[key].hasOwnProperty("$el")) {
449 heigth += $refs[key].$el.clientHeight; 449 heigth += $refs[key].$el.clientHeight;
450 heigth += getPropertyValue($refs[key].$el); 450 heigth += getPropertyValue($refs[key].$el);
451 - console.log( 451 + // console.log(
452 - "ruleForm:", 452 + // "ruleForm:",
453 - $refs[key].$el.clientHeight, 453 + // $refs[key].$el.clientHeight,
454 - getPropertyValue($refs[key].$el) 454 + // getPropertyValue($refs[key].$el)
455 - ); 455 + // );
456 } else { 456 } else {
457 - console.log("ruleForm:", $refs[key]); 457 + // console.log("ruleForm:", $refs[key]);
458 heigth += $refs[key].$el.clientHeight; 458 heigth += $refs[key].$el.clientHeight;
459 heigth += getPropertyValue($refs[key]); 459 heigth += getPropertyValue($refs[key]);
460 } 460 }
461 } 461 }
462 } else if (key == "formHeaderRef") { 462 } else if (key == "formHeaderRef") {
463 - console.log("formHeaderRef:", getPropertyValue($refs[key])); 463 + // console.log("formHeaderRef:", getPropertyValue($refs[key]));
464 heigth += getPropertyValue($refs[key]); 464 heigth += getPropertyValue($refs[key]);
465 } 465 }
466 }); 466 });
467 - console.log("heigth:", heigth); 467 + // console.log("heigth:", heigth);
468 return heigth; 468 return heigth;
469 } 469 }
......
...@@ -141,8 +141,8 @@ export default { ...@@ -141,8 +141,8 @@ export default {
141 }, 141 },
142 mounted() { 142 mounted() {
143 this.$nextTick(() => { 143 this.$nextTick(() => {
144 - console.log(this.$refs) 144 + this.tableAttr.maxHeight =
145 - this.tableAttr.maxHeight = window.innerHeight - restTableHeight(this.$refs); 145 + window.innerHeight - restTableHeight(this.$refs);
146 }); 146 });
147 }, 147 },
148 methods: { 148 methods: {
......
...@@ -71,9 +71,7 @@ export default { ...@@ -71,9 +71,7 @@ export default {
71 }, 71 },
72 mounted() { 72 mounted() {
73 this.$nextTick(() => { 73 this.$nextTick(() => {
74 - console.log(window.innerHeight); 74 + this.tableAttr.maxHeight = window.innerHeight - restTableHeight(this.$refs);
75 - console.log(restTableHeight(this.$refs));
76 - // this.tableAttr.maxHeight = window.innerHeight - restTableHeight(this.$refs);
77 }); 75 });
78 }, 76 },
79 methods: { 77 methods: {
......
...@@ -141,16 +141,7 @@ export default { ...@@ -141,16 +141,7 @@ export default {
141 }, 141 },
142 mounted() { 142 mounted() {
143 this.$nextTick(() => { 143 this.$nextTick(() => {
144 - let app = document.querySelector(".app-main"); 144 + this.tableAttr.maxHeight = window.innerHeight - restTableHeight(this.$refs);
145 - if (this.$store.getters.appMainBlockClientHeight) {
146 - this.tableAttr.maxHeight =
147 - this.$store.getters.appMainBlockClientHeight -
148 - restTableHeight(this.$refs);
149 - } else {
150 - this.tableAttr.maxHeight =
151 - app.clientHeight - restTableHeight(this.$refs);
152 - }
153 - console.log(this.tableAttr.maxHeight);
154 }); 145 });
155 }, 146 },
156 methods: { 147 methods: {
......