eoss-ui 0.4.68 → 0.4.70

package/lib/data-table.js

@@ -2925,8 +2925,8 @@ module.exports = require("vue");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=0cfc4a8c&
-var mainvue_type_template_id_0cfc4a8c_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=40481d3e&
+var mainvue_type_template_id_40481d3e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3262,10 +3262,10 @@ var mainvue_type_template_id_0cfc4a8c_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_0cfc4a8c_render._withStripped = true
+mainvue_type_template_id_40481d3e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=0cfc4a8c&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=40481d3e&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(2);
@@ -6695,10 +6695,12 @@ var mainvue_type_script_lang_js_components;
         this.getTableData({ where: obj && obj.where ? obj.where : {}, first: first });
       }
     },
-    resetHeight: function resetHeight() {
-      //this.$nextTick(() => {
+    resetHeight: function resetHeight(warn) {
+      var _this9 = this;
+
       if (this.full && !this.height && !this.maxHeight) {
-        var height = this.$el.parentNode.offsetHeight - parseInt(util["a" /* default */].getStyle(this.$el.parentNode, 'padding-top'), 10) - parseInt(util["a" /* default */].getStyle(this.$el.parentNode, 'padding-bottom'), 10);
+        var height = parseInt(util["a" /* default */].getStyle(this.$el.parentNode, 'height'), 10);
+        height = (height == NaN ? 0 : height) - parseInt(util["a" /* default */].getStyle(this.$el.parentNode, 'padding-top'), 10) - parseInt(util["a" /* default */].getStyle(this.$el.parentNode, 'padding-bottom'), 10);
         for (var i = 0; i < this.$el.parentNode.childNodes.length; i++) {
           var ele = this.$el.parentNode.childNodes[i];
           if (ele !== this.$el && ele.offsetHeight !== undefined) {
@@ -6719,8 +6721,12 @@ var mainvue_type_script_lang_js_components;
         }
         if (height > 1 && height - eht > 1) {
           this.tableHeight = height;
-        } else {
+        } else if (warn) {
           console.warn(this.$el.parentNode, '\u83B7\u53D6\u4E0D\u5230\u9AD8\u5EA6\uFF01');
+        } else {
+          this.$nextTick(function () {
+            _this9.resetHeight(true);
+          });
         }
       }
     },
@@ -6746,12 +6752,12 @@ var mainvue_type_script_lang_js_components;
       this.$emit('sort-change', res);
     },
     mergeThead: function mergeThead(res) {
-      var _this9 = this;
+      var _this10 = this;
 
       this.theadData = res;
       this.icon = true;
       setTimeout(function () {
-        _this9.show = true;
+        _this10.show = true;
       }, 100);
     }
   }
@@ -6768,7 +6774,7 @@ var mainvue_type_script_lang_js_components;
 
 var main_component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_0cfc4a8c_render,
+  mainvue_type_template_id_40481d3e_render,
   staticRenderFns,
   false,
   null,