three-trees-ui 1.0.3 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-trees-ui",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "publicPath": "/ui",
   "author": "hotent",
   "private": false,

package/packages/CustomDialog/src/customDialog.vue

@@ -130,7 +130,7 @@
               </el-button>
             </div>
           </el-header>
-          <el-main class="custom-dialog_main">
+          <el-main class="custom-dialog_main" ref="customTableRef">
             <el-table
               ref="orgTable"
               :data="dialogData"
@@ -422,7 +422,6 @@
               })
             }
           }
-          this.initTableHeight()
         },
         immediate: true,
         deep: true,
@@ -579,9 +578,12 @@
       },
       initTableHeight() {
         this.$nextTick(() => {
-          let mainEl = document.getElementsByClassName('custom-dialog_main')
-          if (mainEl && mainEl.length) {
-            this.tableHeight = mainEl[0].clientHeight - 40
+          let mainEl = this.$refs.customTableRef
+          if (mainEl) {
+            this.tableHeight =
+              mainEl.$el.clientHeight - 2 > 350
+                ? mainEl.$el.clientHeight - 2
+                : 350
           }
         })
       },
@@ -1038,6 +1040,7 @@
               totalKey: this.customDialog.totalKey,
             }
             this.getDialoglistJson(requestParam).then(() => {
+              this.initTableHeight()
               this.checkList()
             })
           } catch (e) {
@@ -1051,11 +1054,13 @@
             })
             this.customDialog.pageBean = queryFilter
             this.getDialoglistJson(this.customDialog).then(() => {
+              this.initTableHeight()
               this.checkList()
             })
           } else {
             this.customDialog.pageBean = pageBean
             this.getDialoglistJson(this.customDialog).then(() => {
+              this.initTableHeight()
               this.checkList()
             })
           }
@@ -1880,5 +1885,6 @@
   }
   .custom-dialog_main {
     min-height: 350px;
+    padding: 0 20px !important;
   }
 </style>