eoss-ui 0.5.28 → 0.5.30

package/lib/data-table.js

@@ -239,16 +239,21 @@ var ajax = function ajax(_ref) {
     delPendingRequest(response.config);
     loading && loading.close();
     if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
-      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId') || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
-        localStorage.setItem('ssId', response.headers.ssid);
+      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
         localStorage.setItem('token', response.headers.authorization);
         localStorage.setItem('Authorization', response.headers.authorization);
       } else {
-        sessionStorage.setItem('ssId', response.headers.ssid);
         sessionStorage.setItem('token', response.headers.authorization);
         sessionStorage.setItem('Authorization', response.headers.authorization);
       }
     }
+    if ((response.headers.ssId || response.headers.Ssid || response.headers.ssid) && (response.headers.ssId || response.headers.SsId || response.headers.ssid) !== getStorage('ssId')) {
+      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId')) {
+        localStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
+      } else {
+        sessionStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
+      }
+    }
     if (response.status === 200) {
       if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
         removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
@@ -3602,7 +3607,7 @@ module.exports = require("babel-runtime/regenerator");
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(16);
+/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(15);
 /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(vue__WEBPACK_IMPORTED_MODULE_0__);
 
 
@@ -3612,231 +3617,12 @@ module.exports = require("babel-runtime/regenerator");
 /* 15 */
 /***/ (function(module, exports) {
 
-module.exports = require("interactjs");
-
-/***/ }),
-/* 16 */
-/***/ (function(module, exports) {
-
 module.exports = require("vue");
 
 /***/ }),
+/* 16 */,
 /* 17 */,
-/* 18 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/layout/src/item.vue?vue&type=template&id=124bb300&
-var render = function () {
-  var _vm = this
-  var _h = _vm.$createElement
-  var _c = _vm._self._c || _h
-  return _c(
-    "div",
-    {
-      ref: "move",
-      staticClass: "es-layout-item",
-      class: _vm.defaultClasss,
-      style: _vm.defaultaStyle,
-    },
-    [
-      _c("es-card"),
-      _c("div", { staticClass: "es-layout-resizable-width" }),
-      _c("div", { staticClass: "es-layout-resizable-height" }),
-      _c("div", { staticClass: "es-layout-resizable" }),
-    ],
-    1
-  )
-}
-var staticRenderFns = []
-render._withStripped = true
-
-
-// CONCATENATED MODULE: ./packages/layout/src/item.vue?vue&type=template&id=124bb300&
-
-// EXTERNAL MODULE: external "interactjs"
-var external_interactjs_ = __webpack_require__(15);
-var external_interactjs_default = /*#__PURE__*/__webpack_require__.n(external_interactjs_);
-
-// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/layout/src/item.vue?vue&type=script&lang=js&
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-
-// import '@interactjs/auto-start';
-// import '@interactjs/auto-scroll';
-// import '@interactjs/actions/drag';
-// import '@interactjs/actions/resize';
-// import '@interactjs/modifiers';
-// import '@interactjs/dev-tools';
-
-/* harmony default export */ var itemvue_type_script_lang_js_ = ({
-  name: 'LayoutItem',
-  components: {},
-  props: {
-    redact: {
-      type: Boolean,
-      default: true
-    },
-    width: {
-      type: String,
-      default: '100%'
-    },
-    height: {
-      type: String,
-      default: '100px'
-    },
-    left: String,
-    top: String,
-    index: Number
-  },
-  computed: {
-    defaultClasss: function defaultClasss() {
-      return {
-        'es-dragging': this.dragging
-      };
-    },
-    defaultaStyle: function defaultaStyle() {
-      return {
-        width: this.width,
-        height: this.height,
-        left: this.left,
-        top: this.top
-      };
-    },
-    cardStyle: function cardStyle() {
-      return {
-        width: this.width,
-        height: this.height
-      };
-    }
-  },
-  watch: {},
-  data: function data() {
-    return {
-      position: { x: 0, y: 0 },
-      interaction: null,
-      dragging: false
-    };
-  },
-  created: function created() {
-    this.position = {
-      x: parseInt(this.left) || 0,
-      y: parseInt(this.top) || 0
-    };
-    console.log(this.position);
-  },
-  mounted: function mounted() {
-    console.log(external_interactjs_default.a.feedback);
-    this.interaction = external_interactjs_default()(this.$refs.move);
-    this.interaction.draggable({
-      // modifiers: [
-      //   interact.modifiers.restrictRect({
-      //     restriction: 'parent',
-      //     endOnly: false
-      //   })
-      // ],
-      // listeners: {
-      //   start: (event) => {
-      //     this.dragging = true;
-      //     console.log(event.type, event.target, 111);
-      //   },
-      //   move: (event) => {
-      //     this.position.x += event.dx;
-      //     this.position.y += event.dy;
-      //     event.target.style.transform = `translate(${this.position.x}px, ${this.position.y}px)`;
-      //   },
-      //   end: (event) => {
-      //     this.dragging = false;
-      //     console.log(event.type, event.target, 222);
-      //   }
-      // }
-      inertia: true,
-      //autoScroll: { container: '.container' },
-      listeners: [external_interactjs_default.a.feedback.pointers()],
-      modifiers: [external_interactjs_default.a.modifiers.restrict({
-        restriction: 'html',
-        elementRect: { left: 0, top: 0, right: 1, bottom: 1 }
-      }), external_interactjs_default.a.modifiers.transform(), external_interactjs_default.a.modifiers.spring()]
-    });
-    this.interaction.resizable({
-      modifiers: [
-      // keep the edges inside the parent
-      external_interactjs_default.a.modifiers.restrictEdges({
-        outer: 'parent'
-      }),
-
-      // minimum size
-      external_interactjs_default.a.modifiers.restrictSize({
-        min: { width: 100, height: 100 }
-      })],
-
-      //inertia: true,
-      edges: { top: true, left: true, bottom: true, right: true },
-      listeners: {
-        move: function move(event) {
-          console.log(1212);
-          var _event$target$dataset = event.target.dataset,
-              x = _event$target$dataset.x,
-              y = _event$target$dataset.y;
-
-
-          x = (parseFloat(x) || 0) + event.deltaRect.left;
-          y = (parseFloat(y) || 0) + event.deltaRect.top;
-
-          Object.assign(event.target.style, {
-            width: event.rect.width + 'px',
-            height: event.rect.height + 'px',
-            transform: 'translate(' + x + 'px, ' + y + 'px)'
-          });
-
-          Object.assign(event.target.dataset, { x: x, y: y });
-        }
-      }
-    });
-  },
-
-  methods: {},
-  beforeDestroy: function beforeDestroy() {}
-});
-// CONCATENATED MODULE: ./packages/layout/src/item.vue?vue&type=script&lang=js&
- /* harmony default export */ var src_itemvue_type_script_lang_js_ = (itemvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
-var componentNormalizer = __webpack_require__(3);
-
-// CONCATENATED MODULE: ./packages/layout/src/item.vue
-
-
-
-
-
-/* normalize component */
-
-var component = Object(componentNormalizer["a" /* default */])(
-  src_itemvue_type_script_lang_js_,
-  render,
-  staticRenderFns,
-  false,
-  null,
-  null,
-  null
-  
-)
-
-/* harmony default export */ var item = __webpack_exports__["a"] = (component.exports);
-
-/***/ }),
+/* 18 */,
 /* 19 */,
 /* 20 */,
 /* 21 */,
@@ -3857,8 +3643,8 @@ var component = Object(componentNormalizer["a" /* default */])(
 // 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=4564aac4&
-var mainvue_type_template_id_4564aac4_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=a455250e&
+var mainvue_type_template_id_a455250e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4018,6 +3804,7 @@ var mainvue_type_template_id_4564aac4_render = function () {
                           align: "center",
                           label: "操作",
                           fixed: "right",
+                          button: _vm.headButton,
                           total: false,
                         },
                         scopedSlots: _vm._u([
@@ -4044,7 +3831,7 @@ var mainvue_type_template_id_4564aac4_render = function () {
                                       ]
                                     )
                                   : _vm._e(),
-                                !scope.row.cantDelete
+                                !scope.row.cantDelete && !_vm.isLeast
                                   ? _c(
                                       "el-button",
                                       {
@@ -4107,10 +3894,10 @@ var mainvue_type_template_id_4564aac4_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_4564aac4_render._withStripped = true
+mainvue_type_template_id_a455250e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=4564aac4&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=a455250e&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -6060,9 +5847,6 @@ var bus = __webpack_require__(14);
 var external_qs_ = __webpack_require__(4);
 var external_qs_default = /*#__PURE__*/__webpack_require__.n(external_qs_);
 
-// EXTERNAL MODULE: ./packages/layout/src/item.vue + 4 modules
-var src_item = __webpack_require__(18);
-
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=script&lang=js&
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
@@ -6207,7 +5991,7 @@ var mainvue_type_script_lang_js_components, _watch;
 //
 //
 //
-
+//
 
 
 
@@ -6373,6 +6157,10 @@ var mainvue_type_script_lang_js_components, _watch;
       type: Boolean,
       default: false
     },
+    theadAdd: {
+      type: Boolean,
+      default: true
+    },
     // 单元格点击事件
     click: {
       type: Boolean,
@@ -6426,6 +6214,11 @@ var mainvue_type_script_lang_js_components, _watch;
       default: function _default() {
         return [];
       }
+    },
+    rowData: [Object, Boolean],
+    least: {
+      type: Boolean,
+      default: false
     }
   },
   data: function data() {
@@ -6546,6 +6339,16 @@ var mainvue_type_script_lang_js_components, _watch;
       set: function set(val) {
         return val;
       }
+    },
+    headButton: function headButton() {
+      return this.theadAdd ? {
+        icon: 'el-icon-circle-plus-outline',
+        type: 'text',
+        event: this.handleClickAddData
+      } : false;
+    },
+    isLeast: function isLeast() {
+      return this.data.length < 2 && this.least;
     }
   },
   watch: (_watch = {
@@ -6739,18 +6542,45 @@ var mainvue_type_script_lang_js_components, _watch;
       this.$emit('row-click', row, column, event);
     },
     handleClickAddData: function handleClickAddData(scope) {
-      var data = JSON.parse(JSON.stringify(scope.row));
-      var index = scope.$index + 1;
-      if (this.page) {
-        index += (this.config.pageNum - 1) * this.config.pageSize;
+      if (scope && scope.row) {
+        var data = JSON.parse(JSON.stringify(scope.row));
+        var index = scope.$index + 1;
+        if (this.page) {
+          index += (this.config.pageNum - 1) * this.config.pageSize;
+        }
+        this.data.splice(index, 0, data);
+        this.$emit('dataChange', 'add', data);
+        this.$emit('btnClick', {
+          event: 'addRow',
+          row: data,
+          index: index,
+          data: this.data
+        });
+      } else {
+        var _index = this.data.length;
+        if (this.page) {
+          _index += (this.config.pageNum - 1) * this.config.pageSize;
+        }
+        var rows = {};
+        if (this.rowData && _typeof(this.rowData) == 'object') {
+          rows = this.rowData;
+        } else if (_index && this.rowData === true) {
+          rows = JSON.parse(JSON.stringify(this.data[_index - 1]));
+        } else {
+          this.getRow(this.thead, rows);
+        }
+        this.data.splice(_index, 0, rows);
       }
-      this.data.splice(index, 0, data);
-      this.$emit('dataChange', 'add', data);
-      this.$emit('btnClick', {
-        event: 'addRow',
-        row: data,
-        index: index,
-        data: this.data
+    },
+    getRow: function getRow(thead, obj) {
+      var _this4 = this;
+
+      thead.forEach(function (item) {
+        if (item.field) {
+          obj[item['field']] = item.defaultValue || '';
+        } else if (item.children && item.children.length) {
+          _this4.getRow(item.children, obj);
+        }
       });
     },
     handleClickDeleteData: function handleClickDeleteData(scope) {
@@ -6769,27 +6599,27 @@ var mainvue_type_script_lang_js_components, _watch;
       });
     },
     checkSelect: function checkSelect(newVal) {
-      var _this4 = this;
+      var _this5 = this;
 
       this.$nextTick(function () {
         if (util["a" /* default */].getObjectType(newVal) === 'array') {
           newVal.forEach(function (row) {
             if (util["a" /* default */].isObject(row)) {
-              _this4.$refs.oaTable.toggleRowSelection(row, true);
-            } else _this4.datas.forEach(function (item) {
-              if (item[_this4.checkedKey] === row) {
-                _this4.$refs.oaTable.toggleRowSelection(item, true);
+              _this5.$refs.oaTable.toggleRowSelection(row, true);
+            } else _this5.datas.forEach(function (item) {
+              if (item[_this5.checkedKey] === row) {
+                _this5.$refs.oaTable.toggleRowSelection(item, true);
                 return;
               }
             });
           });
         } else if (newVal === true) {
-          _this4.toggleAllSelection();
+          _this5.toggleAllSelection();
         }
       });
     },
     getTheads: function getTheads() {
-      var _this5 = this;
+      var _this6 = this;
 
       util["a" /* default */].ajax({
         url: this.thead,
@@ -6801,27 +6631,27 @@ var mainvue_type_script_lang_js_components, _watch;
         if (res.rCode === 0) {
           var results = res.results;
           if (Array.isArray(results)) {
-            _this5.theadData = results;
+            _this6.theadData = results;
           } else {
-            _this5.theadData = results.theadData || [];
-            _this5.list = results.data || results.records || [];
-            _this5.config.totalCount = results.count || results.total || results.totalCount;
-            _this5.getOptions(_this5.theadData);
+            _this6.theadData = results.theadData || [];
+            _this6.list = results.data || results.records || [];
+            _this6.config.totalCount = results.count || results.total || results.totalCount;
+            _this6.getOptions(_this6.theadData);
           }
         } else {
-          _this5.theadData = [];
+          _this6.theadData = [];
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this5.$message.error(msg);
+          _this6.$message.error(msg);
         }
-        _this5.$emit('success', res);
+        _this6.$emit('success', res);
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this5.$message.error(err.message);
+          _this6.$message.error(err.message);
         }
       });
     },
     getTableData: function getTableData(res) {
-      var _this6 = this;
+      var _this7 = this;
 
       var where = void 0;
       var first = void 0;
@@ -6851,28 +6681,28 @@ var mainvue_type_script_lang_js_components, _watch;
         params: reqData,
         data: reqData
       }).then(function (res) {
-        _this6.tableLoading = false;
+        _this7.tableLoading = false;
         if (res.rCode === 0 || res.status === 'success') {
-          _this6.$refs.oaTable && _this6.$refs.oaTable.resetScroll && _this6.$refs.oaTable.resetScroll(0, 0);
-          var results = _this6.parseData !== undefined ? _this6.parseData(res.results || res.data || res) : res.results || res.data;
-          _this6.list = results.data || results.records || results.list || [];
-          _this6.config.totalCount = results.count || results.total || results.totalCount;
-          _this6.checked && _this6.$nextTick(function () {
-            _this6.checkSelect(_this6.checked);
+          _this7.$refs.oaTable && _this7.$refs.oaTable.resetScroll && _this7.$refs.oaTable.resetScroll(0, 0);
+          var results = _this7.parseData !== undefined ? _this7.parseData(res.results || res.data || res) : res.results || res.data;
+          _this7.list = results.data || results.records || results.list || [];
+          _this7.config.totalCount = results.count || results.total || results.totalCount;
+          _this7.checked && _this7.$nextTick(function () {
+            _this7.checkSelect(_this7.checked);
           });
         } else {
-          _this6.list = [];
+          _this7.list = [];
           //this.tableHeight = false;
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this6.$message.error(msg);
+          _this7.$message.error(msg);
         }
-        _this6.$emit('success', res);
+        _this7.$emit('success', res);
       }).catch(function (err) {
         //this.tableHeight = false;
         if (err.message && err.message !== 'canceled') {
-          _this6.$message.error(err.message);
+          _this7.$message.error(err.message);
         }
-        _this6.tableLoading = false;
+        _this7.tableLoading = false;
       });
     },
     selectionChange: function selectionChange(data) {
@@ -6917,7 +6747,7 @@ var mainvue_type_script_lang_js_components, _watch;
       this.$emit('change', data, this.datas);
     },
     handleAjax: function handleAjax(handle, row) {
-      var _this7 = this;
+      var _this8 = this;
 
       this.changeLoading(true, handle.text + '\u4E2D...');
       var params = handle.param || {};
@@ -6973,9 +6803,9 @@ var mainvue_type_script_lang_js_components, _watch;
         method: handle.method,
         format: handle.format
       }).then(function (res) {
-        _this7.changeLoading(false);
+        _this8.changeLoading(false);
         if (res.rCode === 0) {
-          _this7.$message({
+          _this8.$message({
             message: handle.text + '\u6210\u529F',
             duration: 2000,
             type: 'success',
@@ -6983,17 +6813,17 @@ var mainvue_type_script_lang_js_components, _watch;
               var first = Object.prototype.hasOwnProperty.call(handle, 'first') ? handle.first : false;
               var reload = handle.reload || true;
               if (reload) {
-                _this7.reload({}, first);
+                _this8.reload({}, first);
               }
             }
           });
         } else {
-          _this7.$message.error(res.msg || handle.text + '\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\uFF01');
+          _this8.$message.error(res.msg || handle.text + '\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\uFF01');
         }
       }).catch(function (err) {
-        _this7.changeLoading(false);
+        _this8.changeLoading(false);
         if (err.message && err.message !== 'canceled') {
-          _this7.$message.error(err.message);
+          _this8.$message.error(err.message);
         }
       });
     },
@@ -7018,7 +6848,7 @@ var mainvue_type_script_lang_js_components, _watch;
       return mainvue_type_script_lang_js_extends({}, obj, item);
     },
     handleClick: function handleClick(res) {
-      var _this8 = this;
+      var _this9 = this;
 
       var row = res.row,
           handle = res.handle;
@@ -7054,7 +6884,7 @@ var mainvue_type_script_lang_js_components, _watch;
             cancelButtonText: '取消',
             type: 'warning'
           }).then(function () {
-            _this8.handleAjax(handle, rows);
+            _this9.handleAjax(handle, rows);
           }).catch(function () {});
         } else {
           this.handleAjax(handle, rows);
@@ -7142,7 +6972,7 @@ var mainvue_type_script_lang_js_components, _watch;
           var type = ['selection', 'index', 'expand'];
           thead = thead.map(function (item) {
             return item.filter(function (ele) {
-              return !type.includes(ele.type) && ele.label !== text && !_this8.exportExcludeLabel.includes(ele.label);
+              return !type.includes(ele.type) && ele.label !== text && !_this9.exportExcludeLabel.includes(ele.label);
             });
           });
           util["a" /* default */].exportXls({
@@ -7248,40 +7078,40 @@ var mainvue_type_script_lang_js_components, _watch;
       }
     },
     resetHeight: function resetHeight(warn) {
-      var _this9 = this;
+      var _this10 = this;
 
       this.$nextTick(function () {
-        if (_this9.full && !_this9.height && !_this9.maxHeight) {
-          var height = _this9.$el.parentNode.offsetHeight;
+        if (_this10.full && !_this10.height && !_this10.maxHeight) {
+          var height = _this10.$el.parentNode.offsetHeight;
           if (height) {
-            height = parseInt(util["a" /* default */].getStyle(_this9.$el.parentNode, 'height', '%'), 10);
-            height = (height == NaN ? 0 : height) - parseInt(util["a" /* default */].getStyle(_this9.$el.parentNode, 'padding-top'), 10) - parseInt(util["a" /* default */].getStyle(_this9.$el.parentNode, 'padding-bottom'), 10);
-            for (var i = 0; i < _this9.$el.parentNode.childNodes.length; i++) {
-              var ele = _this9.$el.parentNode.childNodes[i];
-              if (ele !== _this9.$el && ele.offsetHeight !== undefined) {
+            height = parseInt(util["a" /* default */].getStyle(_this10.$el.parentNode, 'height', '%'), 10);
+            height = (height == NaN ? 0 : height) - parseInt(util["a" /* default */].getStyle(_this10.$el.parentNode, 'padding-top'), 10) - parseInt(util["a" /* default */].getStyle(_this10.$el.parentNode, 'padding-bottom'), 10);
+            for (var i = 0; i < _this10.$el.parentNode.childNodes.length; i++) {
+              var ele = _this10.$el.parentNode.childNodes[i];
+              if (ele !== _this10.$el && ele.offsetHeight !== undefined) {
                 height = height - ele.offsetHeight - parseInt(util["a" /* default */].getStyle(ele, 'margin-top'), 10) - parseInt(util["a" /* default */].getStyle(ele, 'margin-bottom'), 10);
               }
             }
-            height -= _this9.showToolbar ? 45 : 0;
-            height -= _this9.page === false ? 0 : 46;
-            height -= _this9.title ? _this9.$refs.title.offsetHeight : 0;
-            height -= parseInt(util["a" /* default */].getStyle(_this9.$refs.esTableContent, 'padding-top'), 10);
-            height -= parseInt(util["a" /* default */].getStyle(_this9.$refs.esTableContent, 'padding-bottom'), 10);
-            var emptyText = _this9.$refs.esTableContent.querySelector('.el-table__empty-text');
+            height -= _this10.showToolbar ? 45 : 0;
+            height -= _this10.page === false ? 0 : 46;
+            height -= _this10.title ? _this10.$refs.title.offsetHeight : 0;
+            height -= parseInt(util["a" /* default */].getStyle(_this10.$refs.esTableContent, 'padding-top'), 10);
+            height -= parseInt(util["a" /* default */].getStyle(_this10.$refs.esTableContent, 'padding-bottom'), 10);
+            var emptyText = _this10.$refs.esTableContent.querySelector('.el-table__empty-text');
             var eht = 0;
             if (emptyText) {
               eht = emptyText.offsetHeight;
-              var thead = _this9.$refs.esTableContent.querySelector('.el-table__header');
+              var thead = _this10.$refs.esTableContent.querySelector('.el-table__header');
               thead && (eht += thead.offsetHeight);
             }
             if (height > 1 && height - eht > 1) {
-              _this9.tableHeight = height;
+              _this10.tableHeight = height;
             } else {
-              console.warn(_this9.$el.parentNode, '\u83B7\u53D6\u4E0D\u5230\u9AD8\u5EA6\uFF01');
+              console.warn(_this10.$el.parentNode, '\u83B7\u53D6\u4E0D\u5230\u9AD8\u5EA6\uFF01');
             }
           } else if (!warn) {
             setTimeout(function () {
-              _this9.resetHeight(true);
+              _this10.resetHeight(true);
             }, 1000);
           }
         }
@@ -7311,31 +7141,31 @@ var mainvue_type_script_lang_js_components, _watch;
       this.$emit('sort-change', res);
     },
     mergeThead: function mergeThead(res) {
-      var _this10 = this;
+      var _this11 = this;
 
       this.theadData = res;
       this.icon = true;
       setTimeout(function () {
-        _this10.show = true;
+        _this11.show = true;
       }, 100);
     },
     setOptions: function setOptions(val, sysCode) {
       this.$set(this.options, sysCode, val);
     },
     bindEventBus: function bindEventBus() {
-      var _this11 = this;
+      var _this12 = this;
 
       this.sysCodes.forEach(function (item) {
         bus["a" /* default */].$on(item, function (val) {
-          _this11.setOptions(val, item);
+          _this12.setOptions(val, item);
         });
       });
     },
     unbindEventBus: function unbindEventBus() {
-      var _this12 = this;
+      var _this13 = this;
 
       this.sysCodes.forEach(function (item) {
-        bus["a" /* default */].$off(item, _this12.setOptions);
+        bus["a" /* default */].$off(item, _this13.setOptions);
       });
     }
   }
@@ -7352,7 +7182,7 @@ var mainvue_type_script_lang_js_components, _watch;
 
 var main_component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_4564aac4_render,
+  mainvue_type_template_id_a455250e_render,
   staticRenderFns,
   false,
   null,