vxe-table 3.9.0-rc.9 → 3.9.0

package/lib/grid/src/grid.js

@@ -1,6 +1,5 @@
 "use strict";
 
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -15,78 +14,77 @@ var _props = _interopRequireDefault(require("../../table/src/props"));
 var _vn = require("../../ui/src/vn");
 var _log = require("../../ui/src/log");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
-function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _readOnlyError(r) { throw new TypeError('"' + r + '" is read-only'); }
-var getConfig = _ui.VxeUI.getConfig,
-  getI18n = _ui.VxeUI.getI18n,
-  commands = _ui.VxeUI.commands,
-  globalEvents = _ui.VxeUI.globalEvents,
-  globalMixins = _ui.VxeUI.globalMixins;
-var methods = {};
-var propKeys = Object.keys(_props.default);
-function renderDefaultForm(h, _vm) {
-  var $scopedSlots = _vm.$scopedSlots,
-    proxyConfig = _vm.proxyConfig,
-    proxyOpts = _vm.proxyOpts,
-    formData = _vm.formData,
-    formConfig = _vm.formConfig,
-    formOpts = _vm.formOpts;
+const {
+  getConfig,
+  getI18n,
+  commands,
+  globalEvents,
+  globalMixins,
+  renderEmptyElement
+} = _ui.VxeUI;
+const methods = {};
+const propKeys = Object.keys(_props.default);
+function renderDefaultForm(h, $xeGrid) {
+  const VxeUIFormComponent = _ui.VxeUI.getComponent('VxeForm');
+  const props = $xeGrid;
+  const slots = $xeGrid.$scopedSlots;
+  const {
+    proxyConfig,
+    formConfig
+  } = props;
+  const {
+    proxyOpts,
+    formData,
+    formOpts
+  } = $xeGrid;
   if ((0, _utils.isEnableConf)(formConfig) && formOpts.items && formOpts.items.length) {
-    var formSlots = {};
+    const formSlots = {};
     if (!formOpts.inited) {
       formOpts.inited = true;
-      var beforeItem = proxyOpts.beforeItem;
+      const beforeItem = proxyOpts.beforeItem;
       if (proxyOpts && beforeItem) {
-        formOpts.items.forEach(function (item) {
-          beforeItem.call(_vm, {
-            $grid: _vm,
-            item: item
+        formOpts.items.forEach(item => {
+          beforeItem.call($xeGrid, {
+            $grid: $xeGrid,
+            item
           });
         });
       }
     }
     // 处理插槽
-    formOpts.items.forEach(function (item) {
-      _xeUtils.default.each(item.slots, function (func) {
+    formOpts.items.forEach(item => {
+      _xeUtils.default.each(item.slots, func => {
         if (!_xeUtils.default.isFunction(func)) {
-          if ($scopedSlots[func]) {
-            formSlots[func] = $scopedSlots[func];
+          if (slots[func]) {
+            formSlots[func] = slots[func];
           }
         }
       });
     });
-    return [h('vxe-form', {
+    return [VxeUIFormComponent ? h(VxeUIFormComponent, {
       props: Object.assign({}, formOpts, {
         data: proxyConfig && proxyOpts.form ? formData : formOpts.data
       }),
       on: {
-        submit: _vm.submitEvent,
-        reset: _vm.resetEvent,
-        collapse: _vm.collapseEvent,
-        'submit-invalid': _vm.submitInvalidEvent
+        submit: $xeGrid.submitEvent,
+        reset: $xeGrid.resetEvent,
+        collapse: $xeGrid.collapseEvent,
+        'submit-invalid': $xeGrid.submitInvalidEvent
       },
       scopedSlots: formSlots
-    })];
+    }) : renderEmptyElement($xeGrid)];
   }
   return [];
 }
-function getFuncSlot(_vm, optSlots, slotKey) {
-  var $scopedSlots = _vm.$scopedSlots;
-  var funcSlot = optSlots[slotKey];
+function getFuncSlot($xeGrid, optSlots, slotKey) {
+  const slots = $xeGrid.$scopedSlots;
+  const funcSlot = optSlots[slotKey];
   if (funcSlot) {
     if (_xeUtils.default.isString(funcSlot)) {
-      if ($scopedSlots[funcSlot]) {
-        return $scopedSlots[funcSlot];
+      if (slots[funcSlot]) {
+        return slots[funcSlot];
       } else {
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.NODE_ENV === 'development') {
           (0, _log.errLog)('vxe.error.notSlot', [funcSlot]);
         }
       }
@@ -97,13 +95,15 @@ function getFuncSlot(_vm, optSlots, slotKey) {
   return null;
 }
 function getToolbarSlots(_vm) {
-  var $scopedSlots = _vm.$scopedSlots,
-    toolbarOpts = _vm.toolbarOpts;
-  var toolbarOptSlots = toolbarOpts.slots;
-  var buttonsSlot;
-  var toolsSlot;
-  var slots = {};
-  if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+  const {
+    $scopedSlots,
+    toolbarOpts
+  } = _vm;
+  const toolbarOptSlots = toolbarOpts.slots;
+  let buttonsSlot;
+  let toolsSlot;
+  const slots = {};
+  if (process.env.NODE_ENV === 'development') {
     if ($scopedSlots.buttons && (!toolbarOptSlots || toolbarOptSlots.buttons !== 'buttons')) {
       (0, _log.warnLog)('vxe.error.reqProp', ['toolbar-config.slots.buttons']);
     }
@@ -124,11 +124,13 @@ function getToolbarSlots(_vm) {
   return slots;
 }
 function getPagerSlots(_vm) {
-  var pagerOpts = _vm.pagerOpts;
-  var pagerOptSlots = pagerOpts.slots;
-  var slots = {};
-  var leftSlot;
-  var rightSlot;
+  const {
+    pagerOpts
+  } = _vm;
+  const pagerOptSlots = pagerOpts.slots;
+  const slots = {};
+  let leftSlot;
+  let rightSlot;
   if (pagerOptSlots) {
     leftSlot = getFuncSlot(_vm, pagerOptSlots, 'left');
     rightSlot = getFuncSlot(_vm, pagerOptSlots, 'right');
@@ -142,16 +144,15 @@ function getPagerSlots(_vm) {
   return slots;
 }
 function getTableOns(_vm) {
-  var $listeners = _vm.$listeners,
-    proxyConfig = _vm.proxyConfig,
-    proxyOpts = _vm.proxyOpts;
-  var ons = {};
-  _xeUtils.default.each($listeners, function (cb, type) {
-    ons[type] = function () {
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
-      _vm.$emit.apply(_vm, [type].concat(args));
+  const {
+    $listeners,
+    proxyConfig,
+    proxyOpts
+  } = _vm;
+  const ons = {};
+  _xeUtils.default.each($listeners, (cb, type) => {
+    ons[type] = (...args) => {
+      _vm.$emit(type, ...args);
     };
   });
   if (proxyConfig) {
@@ -168,11 +169,13 @@ function getTableOns(_vm) {
  * 渲染表单
  */
 function renderForm(h, _vm) {
-  var _e = _vm._e,
-    $scopedSlots = _vm.$scopedSlots,
-    formConfig = _vm.formConfig;
-  var formSlot = $scopedSlots.form;
-  var hasForm = !!(formSlot || (0, _utils.isEnableConf)(formConfig));
+  const {
+    _e,
+    $scopedSlots,
+    formConfig
+  } = _vm;
+  const formSlot = $scopedSlots.form;
+  const hasForm = !!(formSlot || (0, _utils.isEnableConf)(formConfig));
   if (hasForm) {
     return h('div', {
       key: 'form',
@@ -188,12 +191,14 @@ function renderForm(h, _vm) {
  * 渲染工具栏
  */
 function renderToolbar(h, _vm) {
-  var _e = _vm._e,
-    $scopedSlots = _vm.$scopedSlots,
-    toolbarConfig = _vm.toolbarConfig,
-    toolbar = _vm.toolbar;
-  var toolbarSlot = $scopedSlots.toolbar;
-  var hasToolbar = !!(toolbarSlot || (0, _utils.isEnableConf)(toolbarConfig) || toolbar);
+  const {
+    _e,
+    $scopedSlots,
+    toolbarConfig,
+    toolbar
+  } = _vm;
+  const toolbarSlot = $scopedSlots.toolbar;
+  const hasToolbar = !!(toolbarSlot || (0, _utils.isEnableConf)(toolbarConfig) || toolbar);
   if (hasToolbar) {
     return h('div', {
       key: 'toolbar',
@@ -213,9 +218,11 @@ function renderToolbar(h, _vm) {
  * 渲染表格顶部区域
  */
 function renderTop(h, _vm) {
-  var _e = _vm._e,
-    $scopedSlots = _vm.$scopedSlots;
-  var topSlot = $scopedSlots.top;
+  const {
+    _e,
+    $scopedSlots
+  } = _vm;
+  const topSlot = $scopedSlots.top;
   return topSlot ? h('div', {
     key: 'top',
     ref: 'topWrapper',
@@ -225,9 +232,11 @@ function renderTop(h, _vm) {
   }, h)) : _e();
 }
 function renderTableLeft(h, _vm) {
-  var _e = _vm._e,
-    $scopedSlots = _vm.$scopedSlots;
-  var leftSlot = $scopedSlots.left;
+  const {
+    _e,
+    $scopedSlots
+  } = _vm;
+  const leftSlot = $scopedSlots.left;
   if (leftSlot) {
     return h('div', {
       class: 'vxe-grid--left-wrapper'
@@ -238,9 +247,11 @@ function renderTableLeft(h, _vm) {
   return _e();
 }
 function renderTableRight(h, _vm) {
-  var _e = _vm._e,
-    $scopedSlots = _vm.$scopedSlots;
-  var rightSlot = $scopedSlots.right;
+  const {
+    _e,
+    $scopedSlots
+  } = _vm;
+  const rightSlot = $scopedSlots.right;
   if (rightSlot) {
     return h('div', {
       class: 'vxe-grid--right-wrapper'
@@ -254,8 +265,10 @@ function renderTableRight(h, _vm) {
  * 渲染表格
  */
 function renderTable(h, _vm) {
-  var $scopedSlots = _vm.$scopedSlots,
-    tableProps = _vm.tableProps;
+  const {
+    $scopedSlots,
+    tableProps
+  } = _vm;
   return h('div', {
     class: 'vxe-grid--table-wrapper'
   }, [h('vxe-table', {
@@ -270,9 +283,11 @@ function renderTable(h, _vm) {
  * 渲染表格底部区域
  */
 function renderBottom(h, _vm) {
-  var _e = _vm._e,
-    $scopedSlots = _vm.$scopedSlots;
-  var bottomSlot = $scopedSlots.bottom;
+  const {
+    _e,
+    $scopedSlots
+  } = _vm;
+  const bottomSlot = $scopedSlots.bottom;
   return bottomSlot ? h('div', {
     key: 'bottom',
     ref: 'bottomWrapper',
@@ -284,37 +299,44 @@ function renderBottom(h, _vm) {
 /**
  * 渲染分页
  */
-function renderPager(h, _vm) {
-  var _e = _vm._e,
-    $scopedSlots = _vm.$scopedSlots,
-    pagerConfig = _vm.pagerConfig,
-    proxyConfig = _vm.proxyConfig,
-    tablePage = _vm.tablePage;
-  var pagerSlot = $scopedSlots.pager;
-  var hasPager = !!(pagerSlot || (0, _utils.isEnableConf)(pagerConfig));
+function renderPager(h, $xeGrid) {
+  const VxeUIPagerComponent = _ui.VxeUI.getComponent('VxePager');
+  const props = $xeGrid;
+  const {
+    pagerConfig,
+    proxyConfig
+  } = props;
+  const {
+    $scopedSlots,
+    tablePage
+  } = $xeGrid;
+  const pagerSlot = $scopedSlots.pager;
+  const hasPager = !!(pagerSlot || (0, _utils.isEnableConf)(pagerConfig));
   if (hasPager) {
     return h('div', {
       key: 'pager',
       ref: 'pagerWrapper',
       class: 'vxe-grid--pager-wrapper'
-    }, pagerSlot ? pagerSlot.call(_vm, {
-      $grid: _vm
-    }, h) : [h('vxe-pager', {
-      props: Object.assign(Object.assign({}, _vm.pagerOpts), proxyConfig ? tablePage : {}),
+    }, pagerSlot ? pagerSlot.call($xeGrid, {
+      $grid: $xeGrid
+    }, h) : [VxeUIPagerComponent ? h(VxeUIPagerComponent, {
+      props: Object.assign(Object.assign({}, $xeGrid.pagerOpts), proxyConfig ? tablePage : {}),
       on: {
-        'page-change': _vm.pageChangeEvent
+        'page-change': $xeGrid.pageChangeEvent
       },
-      scopedSlots: getPagerSlots(_vm)
-    })]);
+      scopedSlots: getPagerSlots($xeGrid)
+    }) : renderEmptyElement($xeGrid)]);
   }
-  return _e();
+  return renderEmptyElement($xeGrid);
 }
-var defaultLayouts = ['Form', 'Toolbar', 'Top', 'Table', 'Bottom', 'Pager'];
+const defaultLayouts = ['Form', 'Toolbar', 'Top', 'Table', 'Bottom', 'Pager'];
 function renderLayout(h, _vm) {
-  var layouts = _vm.layouts;
-  var vns = [];
-  var currLayouts = layouts && layouts.length ? layouts : getConfig().grid.layouts || defaultLayouts;
-  currLayouts.forEach(function (name) {
+  const {
+    layouts
+  } = _vm;
+  const vns = [];
+  const currLayouts = layouts && layouts.length ? layouts : getConfig().grid.layouts || defaultLayouts;
+  currLayouts.forEach(name => {
     switch (name) {
       case 'Form':
         vns.push(renderForm(h, _vm));
@@ -338,21 +360,20 @@ function renderLayout(h, _vm) {
         vns.push(renderPager(h, _vm));
         break;
       default:
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-          (0, _log.errLog)('vxe.error.notProp', ["layouts -> ".concat(name)]);
+        if (process.env.NODE_ENV === 'development') {
+          (0, _log.errLog)('vxe.error.notProp', [`layouts -> ${name}`]);
         }
         break;
     }
   });
   return vns;
 }
-Object.keys(_table.default.methods).forEach(function (name) {
-  methods[name] = function () {
-    var _this$$refs$xTable;
-    return this.$refs.xTable && (_this$$refs$xTable = this.$refs.xTable)[name].apply(_this$$refs$xTable, arguments);
+Object.keys(_table.default.methods).forEach(name => {
+  methods[name] = function (...args) {
+    return this.$refs.xTable && this.$refs.xTable[name](...args);
   };
 });
-var _default2 = exports.default = {
+var _default = exports.default = {
   name: 'VxeGrid',
   mixins: [globalMixins.sizeMixin],
   props: Object.assign(Object.assign({}, _props.default), {
@@ -366,18 +387,17 @@ var _default2 = exports.default = {
     zoomConfig: Object,
     size: {
       type: String,
-      default: function _default() {
-        return getConfig().grid.size || getConfig().size;
-      }
+      default: () => getConfig().grid.size || getConfig().size
     }
   }),
-  provide: function provide() {
+  provide() {
     return {
       $xeGrid: this,
       $xegrid: this
     };
   },
-  data: function data() {
+  data() {
+    var _a;
     return {
       tableLoading: false,
       isZMax: false,
@@ -388,60 +408,78 @@ var _default2 = exports.default = {
       tZindex: 0,
       tablePage: {
         total: 0,
-        pageSize: getConfig().pager.pageSize || 10,
+        pageSize: ((_a = getConfig().pager) === null || _a === void 0 ? void 0 : _a.pageSize) || 10,
         currentPage: 1
       }
     };
   },
   computed: {
-    isRespMsg: function isRespMsg() {
-      var proxyOpts = this.proxyOpts;
+    isRespMsg() {
+      const {
+        proxyOpts
+      } = this;
       return _xeUtils.default.isBoolean(proxyOpts.message) ? proxyOpts.message : proxyOpts.showResponseMsg;
     },
-    isActiveMsg: function isActiveMsg() {
+    isActiveMsg() {
       return this.proxyOpts.showActiveMsg;
     },
-    proxyOpts: function proxyOpts() {
-      return _xeUtils.default.merge({}, getConfig().grid.proxyConfig, this.proxyConfig);
+    proxyOpts() {
+      return this.computeProxyOpts;
+    },
+    computeProxyOpts() {
+      return _xeUtils.default.merge({}, _xeUtils.default.clone(getConfig().grid.proxyConfig, true), this.proxyConfig);
+    },
+    pagerOpts() {
+      return this.computePagerOpts;
+    },
+    computePagerOpts() {
+      return Object.assign({}, _xeUtils.default.clone(getConfig().grid.pagerConfig, true), this.pagerConfig);
+    },
+    formOpts() {
+      return this.computeFormOpts;
+    },
+    computeFormOpts() {
+      return Object.assign({}, _xeUtils.default.clone(getConfig().grid.formConfig, true), this.formConfig);
     },
-    pagerOpts: function pagerOpts() {
-      return Object.assign({}, getConfig().grid.pagerConfig, this.pagerConfig);
+    toolbarOpts() {
+      return this.computeToolbarOpts;
     },
-    formOpts: function formOpts() {
-      return Object.assign({}, getConfig().grid.formConfig, this.formConfig);
+    computeToolbarOpts() {
+      return Object.assign({}, _xeUtils.default.clone(getConfig().grid.toolbarConfig, true), this.toolbarConfig || this.toolbar);
     },
-    toolbarOpts: function toolbarOpts() {
-      return Object.assign({}, getConfig().grid.toolbarConfig, this.toolbarConfig || this.toolbar);
+    zoomOpts() {
+      return this.computeZoomOpts;
     },
-    zoomOpts: function zoomOpts() {
-      return Object.assign({}, getConfig().grid.zoomConfig, this.zoomConfig);
+    computeZoomOpts() {
+      return Object.assign({}, _xeUtils.default.clone(getConfig().grid.zoomConfig, true), this.zoomConfig);
     },
-    renderStyle: function renderStyle() {
+    renderStyle() {
       return this.isZMax ? {
         zIndex: this.tZindex
       } : null;
     },
-    tableExtendProps: function tableExtendProps() {
-      var _this = this;
-      var rest = {};
-      propKeys.forEach(function (key) {
-        rest[key] = _this[key];
+    tableExtendProps() {
+      const rest = {};
+      propKeys.forEach(key => {
+        rest[key] = this[key];
       });
       return rest;
     },
-    tableProps: function tableProps() {
-      var isZMax = this.isZMax,
-        seqConfig = this.seqConfig,
-        pagerConfig = this.pagerConfig,
-        loading = this.loading,
-        editConfig = this.editConfig,
-        proxyConfig = this.proxyConfig,
-        proxyOpts = this.proxyOpts,
-        tableExtendProps = this.tableExtendProps,
-        tableLoading = this.tableLoading,
-        tablePage = this.tablePage,
-        tableData = this.tableData;
-      var tableProps = Object.assign({}, tableExtendProps);
+    tableProps() {
+      const {
+        isZMax,
+        seqConfig,
+        pagerConfig,
+        loading,
+        editConfig,
+        proxyConfig,
+        proxyOpts,
+        tableExtendProps,
+        tableLoading,
+        tablePage,
+        tableData
+      } = this;
+      const tableProps = Object.assign({}, tableExtendProps);
       if (isZMax) {
         if (tableExtendProps.maxHeight) {
           tableProps.maxHeight = '100%';
@@ -465,70 +503,97 @@ var _default2 = exports.default = {
     }
   },
   watch: {
-    columns: function columns(value) {
-      var _this2 = this;
-      this.$nextTick(function () {
-        return _this2.loadColumn(value);
-      });
+    columns(value) {
+      this.$nextTick(() => this.loadColumn(value));
     },
-    toolbar: function toolbar(value) {
+    toolbar(value) {
       if (value) {
         this.initToolbar();
       }
     },
-    toolbarConfig: function toolbarConfig(value) {
+    toolbarConfig(value) {
       if (value) {
         this.initToolbar();
       }
     },
-    proxyConfig: function proxyConfig() {
+    proxyConfig() {
       this.initProxy();
     },
-    pagerConfig: function pagerConfig() {
+    pagerConfig() {
       this.initPages();
     }
   },
-  created: function created() {
+  created() {
+    const $xeGrid = this;
+    const props = $xeGrid;
     // const { data, formOpts, proxyOpts, proxyConfig } = this
     // if (proxyConfig && (data || (proxyOpts.form && formOpts.data))) {
     //   errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
     // }
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.NODE_ENV === 'development') {
       if (this.toolbar) {
         (0, _log.warnLog)('vxe.error.delProp', ['grid.toolbar', 'grid.toolbar-config']);
       }
       if (this.toolbarConfig && !_xeUtils.default.isObject(this.toolbarConfig)) {
-        (0, _log.warnLog)('vxe.error.errProp', ["grid.toolbar-config=".concat(this.toolbarConfig), 'grid.toolbar-config={}']);
+        (0, _log.warnLog)('vxe.error.errProp', [`grid.toolbar-config=${this.toolbarConfig}`, 'grid.toolbar-config={}']);
       }
       // if (proxyOpts.props) {
       //   warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
       // }
     }
+    if (process.env.NODE_ENV === 'development') {
+      // 使用已安装的组件，如果未安装则不渲染
+      const VxeUIFormComponent = _ui.VxeUI.getComponent('VxeForm');
+      const VxeUIPagerComponent = _ui.VxeUI.getComponent('VxePager');
+      $xeGrid.$nextTick(() => {
+        if (props.formConfig) {
+          if (!VxeUIFormComponent) {
+            (0, _log.errLog)('vxe.error.reqComp', ['vxe-form']);
+          }
+        }
+        if (props.pagerConfig) {
+          if (!VxeUIPagerComponent) {
+            (0, _log.errLog)('vxe.error.reqComp', ['vxe-pager']);
+          }
+        }
+      });
+    }
     this.initPages();
     globalEvents.on(this, 'keydown', this.handleGlobalKeydownEvent);
   },
-  mounted: function mounted() {
+  mounted() {
     if (this.columns && this.columns.length) {
       this.loadColumn(this.columns);
     }
     this.initToolbar();
     this.initProxy();
   },
-  destroyed: function destroyed() {
+  destroyed() {
     globalEvents.off(this, 'keydown');
   },
-  render: function render(h) {
-    var vSize = this.vSize,
-      isZMax = this.isZMax;
+  render(h) {
+    const {
+      computeSize,
+      isZMax
+    } = this;
+    const vSize = computeSize;
     return h('div', {
-      class: ['vxe-grid', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--animat', !!this.animat), 'is--round', this.round), 'is--maximize', isZMax), 'is--loading', this.loading || this.tableLoading)],
+      class: ['vxe-grid', {
+        [`size--${vSize}`]: vSize,
+        'is--animat': !!this.animat,
+        'is--round': this.round,
+        'is--maximize': isZMax,
+        'is--loading': this.loading || this.tableLoading
+      }],
       style: this.renderStyle
     }, renderLayout(h, this));
   },
   methods: Object.assign(Object.assign(Object.assign({}, methods), {
-    callSlot: function callSlot(slotFunc, params, h, vNodes) {
+    callSlot(slotFunc, params, h, vNodes) {
       if (slotFunc) {
-        var $scopedSlots = this.$scopedSlots;
+        const {
+          $scopedSlots
+        } = this;
         if (_xeUtils.default.isString(slotFunc)) {
           slotFunc = $scopedSlots[slotFunc] || null;
         }
@@ -538,44 +603,54 @@ var _default2 = exports.default = {
       }
       return [];
     },
-    getParentHeight: function getParentHeight() {
-      var $el = this.$el,
-        isZMax = this.isZMax;
+    getParentHeight() {
+      const {
+        $el,
+        isZMax
+      } = this;
       return (isZMax ? (0, _dom.getDomNode)().visibleHeight : _xeUtils.default.toNumber(getComputedStyle($el.parentNode).height)) - this.getExcludeHeight();
     },
     /**
      * 获取需要排除的高度
      */
-    getExcludeHeight: function getExcludeHeight() {
-      var $refs = this.$refs,
-        $el = this.$el,
-        isZMax = this.isZMax,
-        height = this.height;
-      var formWrapper = $refs.formWrapper,
-        toolbarWrapper = $refs.toolbarWrapper,
-        topWrapper = $refs.topWrapper,
-        bottomWrapper = $refs.bottomWrapper,
-        pagerWrapper = $refs.pagerWrapper;
-      var parentPaddingSize = isZMax || !(height === 'auto' || height === '100%') ? 0 : (0, _dom.getPaddingTopBottomSize)($el.parentNode);
+    getExcludeHeight() {
+      const {
+        $refs,
+        $el,
+        isZMax,
+        height
+      } = this;
+      const {
+        formWrapper,
+        toolbarWrapper,
+        topWrapper,
+        bottomWrapper,
+        pagerWrapper
+      } = $refs;
+      const parentPaddingSize = isZMax || !(height === 'auto' || height === '100%') ? 0 : (0, _dom.getPaddingTopBottomSize)($el.parentNode);
       return parentPaddingSize + (0, _dom.getPaddingTopBottomSize)($el) + (0, _dom.getOffsetHeight)(formWrapper) + (0, _dom.getOffsetHeight)(toolbarWrapper) + (0, _dom.getOffsetHeight)(topWrapper) + (0, _dom.getOffsetHeight)(bottomWrapper) + (0, _dom.getOffsetHeight)(pagerWrapper);
     },
-    initToolbar: function initToolbar() {
-      var _this3 = this;
-      this.$nextTick(function () {
-        var _this3$$refs = _this3.$refs,
-          xTable = _this3$$refs.xTable,
-          xToolbar = _this3$$refs.xToolbar;
+    initToolbar() {
+      this.$nextTick(() => {
+        const {
+          xTable,
+          xToolbar
+        } = this.$refs;
         if (xTable && xToolbar) {
           xTable.connect(xToolbar);
         }
       });
     },
-    initPages: function initPages() {
-      var tablePage = this.tablePage,
-        pagerConfig = this.pagerConfig,
-        pagerOpts = this.pagerOpts;
-      var currentPage = pagerOpts.currentPage,
-        pageSize = pagerOpts.pageSize;
+    initPages() {
+      const {
+        tablePage,
+        pagerConfig,
+        pagerOpts
+      } = this;
+      const {
+        currentPage,
+        pageSize
+      } = pagerOpts;
       if (pagerConfig) {
         if (currentPage) {
           tablePage.currentPage = currentPage;
@@ -585,26 +660,31 @@ var _default2 = exports.default = {
         }
       }
     },
-    initProxy: function initProxy() {
-      var _this4 = this;
-      var proxyInited = this.proxyInited,
-        proxyConfig = this.proxyConfig,
-        proxyOpts = this.proxyOpts,
-        formConfig = this.formConfig,
-        formOpts = this.formOpts;
+    initProxy() {
+      const {
+        proxyInited,
+        proxyConfig,
+        proxyOpts,
+        formConfig,
+        formOpts
+      } = this;
       if (proxyConfig) {
         if ((0, _utils.isEnableConf)(formConfig) && proxyOpts.form && formOpts.items) {
-          var fData = {};
-          formOpts.items.forEach(function (item) {
-            var field = item.field,
-              itemRender = item.itemRender;
+          const fData = {};
+          formOpts.items.forEach(item => {
+            const {
+              field,
+              itemRender
+            } = item;
             if (field) {
-              var itemValue = null;
+              let itemValue = null;
               if (itemRender) {
-                var defaultValue = itemRender.defaultValue;
+                const {
+                  defaultValue
+                } = itemRender;
                 if (_xeUtils.default.isFunction(defaultValue)) {
                   itemValue = defaultValue({
-                    item: item
+                    item
                   });
                 } else if (!_xeUtils.default.isUndefined(defaultValue)) {
                   itemValue = defaultValue;
@@ -617,20 +697,18 @@ var _default2 = exports.default = {
         }
         if (!proxyInited && proxyOpts.autoLoad !== false) {
           this.proxyInited = true;
-          this.$nextTick().then(function () {
-            return _this4.commitProxy('_init');
-          }).then(function (rest) {
-            _this4.$emit('proxy-query', Object.assign(Object.assign({}, rest), {
+          this.$nextTick().then(() => this.commitProxy('_init')).then(rest => {
+            this.$emit('proxy-query', Object.assign(Object.assign({}, rest), {
               isInited: true,
-              $grid: _this4,
+              $grid: this,
               $event: new Event('init')
             }));
           });
         }
       }
     },
-    handleGlobalKeydownEvent: function handleGlobalKeydownEvent(evnt) {
-      var isEsc = evnt.keyCode === 27;
+    handleGlobalKeydownEvent(evnt) {
+      const isEsc = evnt.keyCode === 27;
       if (isEsc && this.isZMax && this.zoomOpts.escRestore !== false) {
         this.triggerZoomEvent(evnt);
       }
@@ -639,37 +717,37 @@ var _default2 = exports.default = {
      * 提交指令，支持 code 或 button
      * @param {String/Object} code 字符串或对象
      */
-    commitProxy: function commitProxy(proxyTarget) {
-      var _this5 = this;
-      var $refs = this.$refs,
-        toolbar = this.toolbar,
-        toolbarConfig = this.toolbarConfig,
-        toolbarOpts = this.toolbarOpts,
-        proxyOpts = this.proxyOpts,
-        tablePage = this.tablePage,
-        pagerConfig = this.pagerConfig,
-        editRules = this.editRules,
-        isRespMsg = this.isRespMsg,
-        isActiveMsg = this.isActiveMsg,
-        validConfig = this.validConfig,
-        pagerOpts = this.pagerOpts;
-      var beforeQuery = proxyOpts.beforeQuery,
-        afterQuery = proxyOpts.afterQuery,
-        beforeDelete = proxyOpts.beforeDelete,
-        afterDelete = proxyOpts.afterDelete,
-        beforeSave = proxyOpts.beforeSave,
-        afterSave = proxyOpts.afterSave,
-        _proxyOpts$ajax = proxyOpts.ajax,
-        ajax = _proxyOpts$ajax === void 0 ? {} : _proxyOpts$ajax;
-      var resConfigs = proxyOpts.response || proxyOpts.props || {};
-      var $xetable = $refs.xTable;
-      var formData = this.getFormData();
-      var button;
-      var code;
+    commitProxy(proxyTarget, ...args) {
+      const {
+        $refs,
+        toolbar,
+        toolbarConfig,
+        toolbarOpts,
+        proxyOpts,
+        tablePage,
+        pagerConfig,
+        editRules,
+        isRespMsg,
+        isActiveMsg,
+        validConfig,
+        pagerOpts
+      } = this;
+      const {
+        beforeQuery,
+        afterQuery,
+        beforeDelete,
+        afterDelete,
+        beforeSave,
+        afterSave,
+        ajax = {}
+      } = proxyOpts;
+      const resConfigs = proxyOpts.response || proxyOpts.props || {};
+      const $xetable = $refs.xTable;
+      const formData = this.getFormData();
+      let button;
+      let code;
       if (_xeUtils.default.isString(proxyTarget)) {
-        var matchObj = toolbarConfig || toolbar ? _xeUtils.default.findTree(toolbarOpts.buttons, function (item) {
-          return item.code === proxyTarget;
-        }, {
+        const matchObj = toolbarConfig || toolbar ? _xeUtils.default.findTree(toolbarOpts.buttons, item => item.code === proxyTarget, {
           children: 'dropdowns'
         }) : null;
         code = proxyTarget;
@@ -678,32 +756,25 @@ var _default2 = exports.default = {
         button = proxyTarget;
         code = button.code;
       }
-      var btnParams = button ? button.params : null;
-      for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
-        args[_key2 - 1] = arguments[_key2];
-      }
+      const btnParams = button ? button.params : null;
       switch (code) {
         case 'insert':
           return this.insert();
         case 'insert_edit':
-          return this.insert().then(function (_ref2) {
-            var row = _ref2.row;
-            return _this5.setEditRow(row);
-          });
+          return this.insert().then(({
+            row
+          }) => this.setEditRow(row));
         // 已废弃
         case 'insert_actived':
-          return this.insert().then(function (_ref3) {
-            var row = _ref3.row;
-            return _this5.setEditRow(row);
-          });
+          return this.insert().then(({
+            row
+          }) => this.setEditRow(row));
         // 已废弃
         case 'mark_cancel':
           this.triggerPendingEvent(code);
           break;
         case 'remove':
-          return this.handleDeleteRow(code, 'vxe.grid.removeSelectRecord', function () {
-            return _this5.removeCheckboxRow();
-          });
+          return this.handleDeleteRow(code, 'vxe.grid.removeSelectRecord', () => this.removeCheckboxRow());
         case 'import':
           this.importData(btnParams);
           break;
@@ -723,15 +794,15 @@ var _default2 = exports.default = {
         case 'reload':
         case 'query':
           {
-            var ajaxMethods = ajax.query;
-            var querySuccessMethods = ajax.querySuccess;
-            var queryErrorMethods = ajax.queryError;
+            const ajaxMethods = ajax.query;
+            const querySuccessMethods = ajax.querySuccess;
+            const queryErrorMethods = ajax.queryError;
             if (ajaxMethods) {
-              var isInited = code === '_init';
-              var isReload = code === 'reload';
-              var sortList = [];
-              var filterList = [];
-              var pageParams = {};
+              const isInited = code === '_init';
+              const isReload = code === 'reload';
+              let sortList = [];
+              let filterList = [];
+              let pageParams = {};
               if (pagerConfig) {
                 if (isInited || isReload) {
                   tablePage.currentPage = 1;
@@ -741,14 +812,19 @@ var _default2 = exports.default = {
                 }
               }
               if (isInited) {
-                var sortOpts = $xetable.sortOpts;
-                var defaultSort = sortOpts.defaultSort;
+                let defaultSort = null;
+                if ($xetable) {
+                  const {
+                    sortOpts
+                  } = $xetable;
+                  defaultSort = sortOpts.defaultSort;
+                }
                 // 如果使用默认排序
                 if (defaultSort) {
                   if (!_xeUtils.default.isArray(defaultSort)) {
                     defaultSort = [defaultSort];
                   }
-                  sortList = defaultSort.map(function (item) {
+                  sortList = defaultSort.map(item => {
                     return {
                       field: item.field,
                       property: item.field,
@@ -756,20 +832,24 @@ var _default2 = exports.default = {
                     };
                   });
                 }
-                filterList = $xetable.getCheckedFilters();
-              } else {
-                if (isReload) {
-                  $xetable.clearAll();
-                } else {
-                  sortList = $xetable.getSortColumns();
+                if ($xetable) {
                   filterList = $xetable.getCheckedFilters();
                 }
+              } else {
+                if ($xetable) {
+                  if (isReload) {
+                    $xetable.clearAll();
+                  } else {
+                    sortList = $xetable.getSortColumns();
+                    filterList = $xetable.getCheckedFilters();
+                  }
+                }
               }
-              var commitParams = {
-                code: code,
-                button: button,
-                isInited: isInited,
-                isReload: isReload,
+              const commitParams = {
+                code,
+                button,
+                isInited,
+                isReload,
                 $grid: this,
                 page: pageParams,
                 sort: sortList.length ? sortList[0] : {},
@@ -781,39 +861,39 @@ var _default2 = exports.default = {
               this.sortData = sortList;
               this.filterData = filterList;
               this.tableLoading = true;
-              var applyArgs = [commitParams].concat(args);
-              return Promise.resolve((beforeQuery || ajaxMethods).apply(void 0, _toConsumableArray(applyArgs))).then(function (rest) {
-                _this5.tableLoading = false;
+              const applyArgs = [commitParams].concat(args);
+              return Promise.resolve((beforeQuery || ajaxMethods)(...applyArgs)).then(rest => {
+                this.tableLoading = false;
                 if (rest) {
                   if (pagerConfig && (0, _utils.isEnableConf)(pagerOpts)) {
-                    var totalProp = resConfigs.total;
-                    var total = (_xeUtils.default.isFunction(totalProp) ? totalProp({
+                    const totalProp = resConfigs.total;
+                    const total = (_xeUtils.default.isFunction(totalProp) ? totalProp({
                       data: rest,
-                      $grid: _this5
+                      $grid: this
                     }) : _xeUtils.default.get(rest, totalProp || 'page.total')) || 0;
                     tablePage.total = _xeUtils.default.toNumber(total);
-                    var resultProp = resConfigs.result;
-                    _this5.tableData = (_xeUtils.default.isFunction(resultProp) ? resultProp({
+                    const resultProp = resConfigs.result;
+                    this.tableData = (_xeUtils.default.isFunction(resultProp) ? resultProp({
                       data: rest,
-                      $grid: _this5
+                      $grid: this
                     }) : _xeUtils.default.get(rest, resultProp || 'result')) || [];
                     // 检验当前页码，不能超出当前最大页数
-                    var pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);
+                    const pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);
                     if (tablePage.currentPage > pageCount) {
                       tablePage.currentPage = pageCount;
                     }
                   } else {
-                    var listProp = resConfigs.list;
-                    _this5.tableData = (listProp ? _xeUtils.default.isFunction(listProp) ? listProp({
+                    const listProp = resConfigs.list;
+                    this.tableData = (listProp ? _xeUtils.default.isFunction(listProp) ? listProp({
                       data: rest,
-                      $grid: _this5
+                      $grid: this
                     }) : _xeUtils.default.get(rest, listProp) : rest) || [];
                   }
                 } else {
-                  _this5.tableData = [];
+                  this.tableData = [];
                 }
                 if (afterQuery) {
-                  afterQuery.apply(void 0, _toConsumableArray(applyArgs));
+                  afterQuery(...applyArgs);
                 }
                 if (querySuccessMethods) {
                   querySuccessMethods(Object.assign(Object.assign({}, commitParams), {
@@ -823,8 +903,8 @@ var _default2 = exports.default = {
                 return {
                   status: true
                 };
-              }).catch(function (rest) {
-                _this5.tableLoading = false;
+              }).catch(rest => {
+                this.tableLoading = false;
                 if (queryErrorMethods) {
                   queryErrorMethods(Object.assign(Object.assign({}, commitParams), {
                     response: rest
@@ -835,7 +915,7 @@ var _default2 = exports.default = {
                 };
               });
             } else {
-              if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+              if (process.env.NODE_ENV === 'development') {
                 (0, _log.errLog)('vxe.error.notFunc', ['proxy-config.ajax.query']);
               }
             }
@@ -843,77 +923,75 @@ var _default2 = exports.default = {
           }
         case 'delete':
           {
-            var _ajaxMethods = ajax.delete;
-            var deleteSuccessMethods = ajax.deleteSuccess;
-            var deleteErrorMethods = ajax.deleteError;
-            if (_ajaxMethods) {
-              var selectRecords = $xetable.getCheckboxRecords();
-              var removeRecords = selectRecords.filter(function (row) {
-                return !$xetable.isInsertByRow(row);
-              });
-              var body = {
-                removeRecords: removeRecords
+            const ajaxMethods = ajax.delete;
+            const deleteSuccessMethods = ajax.deleteSuccess;
+            const deleteErrorMethods = ajax.deleteError;
+            if (ajaxMethods) {
+              const selectRecords = $xetable.getCheckboxRecords();
+              const removeRecords = selectRecords.filter(row => !$xetable.isInsertByRow(row));
+              const body = {
+                removeRecords
               };
-              var _commitParams = {
+              const commitParams = {
                 $grid: this,
-                code: code,
-                button: button,
-                body: body,
+                code,
+                button,
+                body,
                 form: formData,
-                options: _ajaxMethods
+                options: ajaxMethods
               };
-              var _applyArgs = [_commitParams].concat(args);
+              const applyArgs = [commitParams].concat(args);
               if (selectRecords.length) {
-                return this.handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', function () {
+                return this.handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', () => {
                   if (!removeRecords.length) {
                     return $xetable.remove(selectRecords);
                   }
-                  _this5.tableLoading = true;
-                  return Promise.resolve((beforeDelete || _ajaxMethods).apply(void 0, _toConsumableArray(_applyArgs))).then(function (rest) {
-                    _this5.tableLoading = false;
+                  this.tableLoading = true;
+                  return Promise.resolve((beforeDelete || ajaxMethods)(...applyArgs)).then(rest => {
+                    this.tableLoading = false;
                     $xetable.setPendingRow(removeRecords, false);
                     if (isRespMsg) {
                       // 检测弹窗模块
-                      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                      if (process.env.NODE_ENV === 'development') {
                         if (!_ui.VxeUI.modal) {
                           (0, _log.errLog)('vxe.error.reqModule', ['Modal']);
                         }
                       }
                       _ui.VxeUI.modal.message({
-                        content: _this5.getRespMsg(rest, 'vxe.grid.delSuccess'),
+                        content: this.getRespMsg(rest, 'vxe.grid.delSuccess'),
                         status: 'success'
                       });
                     }
                     if (afterDelete) {
-                      afterDelete.apply(void 0, _toConsumableArray(_applyArgs));
+                      afterDelete(...applyArgs);
                     } else {
-                      _this5.commitProxy('query');
+                      this.commitProxy('query');
                     }
                     if (deleteSuccessMethods) {
-                      deleteSuccessMethods(Object.assign(Object.assign({}, _commitParams), {
+                      deleteSuccessMethods(Object.assign(Object.assign({}, commitParams), {
                         response: rest
                       }));
                     }
                     return {
                       status: true
                     };
-                  }).catch(function (rest) {
-                    _this5.tableLoading = false;
+                  }).catch(rest => {
+                    this.tableLoading = false;
                     if (isRespMsg) {
                       // 检测弹窗模块
-                      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                      if (process.env.NODE_ENV === 'development') {
                         if (!_ui.VxeUI.modal) {
                           (0, _log.errLog)('vxe.error.reqModule', ['Modal']);
                         }
                       }
                       _ui.VxeUI.modal.message({
                         id: code,
-                        content: _this5.getRespMsg(rest, 'vxe.grid.operError'),
+                        content: this.getRespMsg(rest, 'vxe.grid.operError'),
                         status: 'error'
                       });
                     }
                     if (deleteErrorMethods) {
-                      deleteErrorMethods(Object.assign(Object.assign({}, _commitParams), {
+                      deleteErrorMethods(Object.assign(Object.assign({}, commitParams), {
                         response: rest
                       }));
                     }
@@ -925,7 +1003,7 @@ var _default2 = exports.default = {
               } else {
                 if (isActiveMsg) {
                   // 检测弹窗模块
-                  if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                  if (process.env.NODE_ENV === 'development') {
                     if (!_ui.VxeUI.modal) {
                       (0, _log.errLog)('vxe.error.reqModule', ['Modal']);
                     }
@@ -938,7 +1016,7 @@ var _default2 = exports.default = {
                 }
               }
             } else {
-              if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+              if (process.env.NODE_ENV === 'development') {
                 (0, _log.errLog)('vxe.error.notFunc', ['proxy-config.ajax.delete']);
               }
             }
@@ -946,93 +1024,91 @@ var _default2 = exports.default = {
           }
         case 'save':
           {
-            var _ajaxMethods2 = ajax.save;
-            var saveSuccessMethods = ajax.saveSuccess;
-            var saveErrorMethods = ajax.saveError;
-            if (_ajaxMethods2) {
-              var _body = this.getRecordset();
-              var insertRecords = _body.insertRecords,
-                _removeRecords = _body.removeRecords,
-                updateRecords = _body.updateRecords,
-                pendingRecords = _body.pendingRecords;
-              var _commitParams2 = {
+            const ajaxMethods = ajax.save;
+            const saveSuccessMethods = ajax.saveSuccess;
+            const saveErrorMethods = ajax.saveError;
+            if (ajaxMethods) {
+              const body = this.getRecordset();
+              const {
+                insertRecords,
+                removeRecords,
+                updateRecords,
+                pendingRecords
+              } = body;
+              const commitParams = {
                 $grid: this,
-                code: code,
-                button: button,
-                body: _body,
+                code,
+                button,
+                body,
                 form: formData,
-                options: _ajaxMethods2
+                options: ajaxMethods
               };
-              var _applyArgs2 = [_commitParams2].concat(args);
+              const applyArgs = [commitParams].concat(args);
               // 排除掉新增且标记为删除的数据
               if (insertRecords.length) {
-                _body.pendingRecords = pendingRecords.filter(function (row) {
-                  return insertRecords.indexOf(row) === -1;
-                });
+                body.pendingRecords = pendingRecords.filter(row => insertRecords.indexOf(row) === -1);
               }
               // 排除已标记为删除的数据
               if (pendingRecords.length) {
-                _body.insertRecords = insertRecords.filter(function (row) {
-                  return pendingRecords.indexOf(row) === -1;
-                });
+                body.insertRecords = insertRecords.filter(row => pendingRecords.indexOf(row) === -1);
               }
-              var restPromise = Promise.resolve();
+              let restPromise = Promise.resolve();
               if (editRules) {
                 // 只校验新增和修改的数据
-                restPromise = this[validConfig && validConfig.msgMode === 'full' ? 'fullValidate' : 'validate'](_body.insertRecords.concat(updateRecords));
+                restPromise = this[validConfig && validConfig.msgMode === 'full' ? 'fullValidate' : 'validate'](body.insertRecords.concat(updateRecords));
               }
-              return restPromise.then(function (errMap) {
+              return restPromise.then(errMap => {
                 if (errMap) {
                   // 如果校验不通过
                   return;
                 }
-                if (_body.insertRecords.length || _removeRecords.length || updateRecords.length || _body.pendingRecords.length) {
-                  _this5.tableLoading = true;
-                  return Promise.resolve((beforeSave || _ajaxMethods2).apply(void 0, _toConsumableArray(_applyArgs2))).then(function (rest) {
-                    _this5.tableLoading = false;
+                if (body.insertRecords.length || removeRecords.length || updateRecords.length || body.pendingRecords.length) {
+                  this.tableLoading = true;
+                  return Promise.resolve((beforeSave || ajaxMethods)(...applyArgs)).then(rest => {
+                    this.tableLoading = false;
                     $xetable.clearPendingRow();
                     if (isRespMsg) {
                       // 检测弹窗模块
-                      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                      if (process.env.NODE_ENV === 'development') {
                         if (!_ui.VxeUI.modal) {
                           (0, _log.errLog)('vxe.error.reqModule', ['Modal']);
                         }
                       }
                       _ui.VxeUI.modal.message({
-                        content: _this5.getRespMsg(rest, 'vxe.grid.saveSuccess'),
+                        content: this.getRespMsg(rest, 'vxe.grid.saveSuccess'),
                         status: 'success'
                       });
                     }
                     if (afterSave) {
-                      afterSave.apply(void 0, _toConsumableArray(_applyArgs2));
+                      afterSave(...applyArgs);
                     } else {
-                      _this5.commitProxy('query');
+                      this.commitProxy('query');
                     }
                     if (saveSuccessMethods) {
-                      saveSuccessMethods(Object.assign(Object.assign({}, _commitParams2), {
+                      saveSuccessMethods(Object.assign(Object.assign({}, commitParams), {
                         response: rest
                       }));
                     }
                     return {
                       status: true
                     };
-                  }).catch(function (rest) {
-                    _this5.tableLoading = false;
+                  }).catch(rest => {
+                    this.tableLoading = false;
                     if (isRespMsg) {
                       // 检测弹窗模块
-                      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                      if (process.env.NODE_ENV === 'development') {
                         if (!_ui.VxeUI.modal) {
                           (0, _log.errLog)('vxe.error.reqModule', ['Modal']);
                         }
                       }
                       _ui.VxeUI.modal.message({
                         id: code,
-                        content: _this5.getRespMsg(rest, 'vxe.grid.operError'),
+                        content: this.getRespMsg(rest, 'vxe.grid.operError'),
                         status: 'error'
                       });
                     }
                     if (saveErrorMethods) {
-                      saveErrorMethods(Object.assign(Object.assign({}, _commitParams2), {
+                      saveErrorMethods(Object.assign(Object.assign({}, commitParams), {
                         response: rest
                       }));
                     }
@@ -1043,7 +1119,7 @@ var _default2 = exports.default = {
                 } else {
                   if (isActiveMsg) {
                     // 检测弹窗模块
-                    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                    if (process.env.NODE_ENV === 'development') {
                       if (!_ui.VxeUI.modal) {
                         (0, _log.errLog)('vxe.error.reqModule', ['Modal']);
                       }
@@ -1057,7 +1133,7 @@ var _default2 = exports.default = {
                 }
               });
             } else {
-              if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+              if (process.env.NODE_ENV === 'development') {
                 (0, _log.errLog)('vxe.error.notFunc', ['proxy-config.ajax.save']);
               }
             }
@@ -1065,17 +1141,17 @@ var _default2 = exports.default = {
           }
         default:
           {
-            var gCommandOpts = commands.get(code);
+            const gCommandOpts = commands.get(code);
             if (gCommandOpts) {
               if (gCommandOpts.commandMethod) {
-                gCommandOpts.commandMethod.apply(gCommandOpts, [{
-                  code: code,
-                  button: button,
+                gCommandOpts.commandMethod({
+                  code,
+                  button,
                   $grid: this,
                   $table: $xetable
-                }].concat(args));
+                }, ...args);
               } else {
-                if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                if (process.env.NODE_ENV === 'development') {
                   (0, _log.errLog)('vxe.error.notCommands', [code]);
                 }
               }
@@ -1084,37 +1160,39 @@ var _default2 = exports.default = {
       }
       return this.$nextTick();
     },
-    getRespMsg: function getRespMsg(rest, defaultMsg) {
-      var proxyOpts = this.proxyOpts;
-      var resConfigs = proxyOpts.response || proxyOpts.props || {};
-      var msg;
+    getRespMsg(rest, defaultMsg) {
+      const {
+        proxyOpts
+      } = this;
+      const resConfigs = proxyOpts.response || proxyOpts.props || {};
+      let msg;
       if (rest && resConfigs.message) {
         msg = _xeUtils.default.get(rest, resConfigs.message);
       }
       return msg || getI18n(defaultMsg);
     },
-    handleDeleteRow: function handleDeleteRow(code, alertKey, callback) {
-      var selectRecords = this.getCheckboxRecords();
+    handleDeleteRow(code, alertKey, callback) {
+      const selectRecords = this.getCheckboxRecords();
       if (this.isActiveMsg) {
         if (selectRecords.length) {
           return _ui.VxeUI.modal.confirm({
-            id: "cfm_".concat(code),
+            id: `cfm_${code}`,
             content: getI18n(alertKey),
             escClosable: true
-          }).then(function (type) {
+          }).then(type => {
             if (type === 'confirm') {
               return callback();
             }
           });
         } else {
           // 检测弹窗模块
-          if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+          if (process.env.NODE_ENV === 'development') {
             if (!_ui.VxeUI.modal) {
               (0, _log.errLog)('vxe.error.reqModule', ['Modal']);
             }
           }
           _ui.VxeUI.modal.message({
-            id: "msg_".concat(code),
+            id: `msg_${code}`,
             content: getI18n('vxe.grid.selectOneRecord'),
             status: 'warning'
           });
@@ -1126,65 +1204,72 @@ var _default2 = exports.default = {
       }
       return Promise.resolve();
     },
-    getFormData: function getFormData() {
-      var proxyConfig = this.proxyConfig,
-        proxyOpts = this.proxyOpts,
-        formOpts = this.formOpts,
-        formData = this.formData;
+    getFormData() {
+      const {
+        proxyConfig,
+        proxyOpts,
+        formOpts,
+        formData
+      } = this;
       return proxyConfig && (0, _utils.isEnableConf)(proxyOpts) && proxyOpts.form ? formData : formOpts.data;
     },
-    getFormItems: function getFormItems(itemIndex) {
-      var formConfig = this.formConfig,
-        formOpts = this.formOpts;
-      var itemList = [];
-      _xeUtils.default.eachTree((0, _utils.isEnableConf)(formConfig) && formOpts.items ? formOpts.items : [], function (item) {
+    getFormItems(itemIndex) {
+      const {
+        formConfig,
+        formOpts
+      } = this;
+      const itemList = [];
+      _xeUtils.default.eachTree((0, _utils.isEnableConf)(formConfig) && formOpts.items ? formOpts.items : [], item => {
         itemList.push(item);
       }, {
         children: 'children'
       });
       return _xeUtils.default.isUndefined(itemIndex) ? itemList : itemList[itemIndex];
     },
-    triggerToolbarCommitEvent: function triggerToolbarCommitEvent(params, evnt) {
-      var _this6 = this;
-      var code = params.code;
-      return this.commitProxy(params, evnt).then(function (rest) {
+    triggerToolbarCommitEvent(params, evnt) {
+      const {
+        code
+      } = params;
+      return this.commitProxy(params, evnt).then(rest => {
         if (code && rest && rest.status && ['query', 'reload', 'delete', 'save'].includes(code)) {
-          _this6.$emit(code === 'delete' || code === 'save' ? "proxy-".concat(code) : 'proxy-query', Object.assign(Object.assign({}, rest), {
+          this.$emit(code === 'delete' || code === 'save' ? `proxy-${code}` : 'proxy-query', Object.assign(Object.assign({}, rest), {
             isReload: code === 'reload',
-            $grid: _this6,
+            $grid: this,
             $event: evnt
           }));
         }
       });
     },
-    triggerToolbarBtnEvent: function triggerToolbarBtnEvent(button, evnt) {
+    triggerToolbarBtnEvent(button, evnt) {
       this.triggerToolbarCommitEvent(button, evnt);
       this.$emit('toolbar-button-click', {
         code: button.code,
-        button: button,
+        button,
         $grid: this,
         $event: evnt
       });
     },
-    triggerToolbarTolEvent: function triggerToolbarTolEvent(tool, evnt) {
+    triggerToolbarTolEvent(tool, evnt) {
       this.triggerToolbarCommitEvent(tool, evnt);
       this.$emit('toolbar-tool-click', {
         code: tool.code,
-        tool: tool,
+        tool,
         $grid: this,
         $event: evnt
       });
     },
-    triggerPendingEvent: function triggerPendingEvent(code) {
-      var isActiveMsg = this.isActiveMsg;
-      var selectRecords = this.getCheckboxRecords();
+    triggerPendingEvent(code) {
+      const {
+        isActiveMsg
+      } = this;
+      const selectRecords = this.getCheckboxRecords();
       if (selectRecords.length) {
         this.togglePendingRow(selectRecords);
         this.clearCheckboxRow();
       } else {
         if (isActiveMsg) {
           // 检测弹窗模块
-          if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+          if (process.env.NODE_ENV === 'development') {
             if (!_ui.VxeUI.modal) {
               (0, _log.errLog)('vxe.error.reqModule', ['Modal']);
             }
@@ -1197,40 +1282,44 @@ var _default2 = exports.default = {
         }
       }
     },
-    pageChangeEvent: function pageChangeEvent(params) {
-      var _this7 = this;
-      var proxyConfig = this.proxyConfig,
-        tablePage = this.tablePage;
-      var currentPage = params.currentPage,
-        pageSize = params.pageSize;
+    pageChangeEvent(params) {
+      const {
+        proxyConfig,
+        tablePage
+      } = this;
+      const {
+        currentPage,
+        pageSize
+      } = params;
       tablePage.currentPage = currentPage;
       tablePage.pageSize = pageSize;
       this.$emit('page-change', Object.assign({
         $grid: this
       }, params));
       if (proxyConfig) {
-        this.commitProxy('query').then(function (rest) {
-          _this7.$emit('proxy-query', Object.assign(Object.assign({}, rest), {
-            $grid: _this7,
+        this.commitProxy('query').then(rest => {
+          this.$emit('proxy-query', Object.assign(Object.assign({}, rest), {
+            $grid: this,
             $event: params.$event
           }));
         });
       }
     },
-    sortChangeEvent: function sortChangeEvent(params) {
-      var _this8 = this;
-      var $table = params.$table,
-        column = params.column,
-        sortList = params.sortList;
-      var isRemote = _xeUtils.default.isBoolean(column.remoteSort) ? column.remoteSort : $table.sortOpts.remote;
+    sortChangeEvent(params) {
+      const {
+        $table,
+        column,
+        sortList
+      } = params;
+      const isRemote = _xeUtils.default.isBoolean(column.remoteSort) ? column.remoteSort : $table.sortOpts.remote;
       // 如果是服务端排序
       if (isRemote) {
         this.sortData = sortList;
         if (this.proxyConfig) {
           this.tablePage.currentPage = 1;
-          this.commitProxy('query').then(function (rest) {
-            _this8.$emit('proxy-query', Object.assign(Object.assign({}, rest), {
-              $grid: _this8,
+          this.commitProxy('query').then(rest => {
+            this.$emit('proxy-query', Object.assign(Object.assign({}, rest), {
+              $grid: this,
               $event: params.$event
             }));
           });
@@ -1240,18 +1329,19 @@ var _default2 = exports.default = {
         $grid: this
       }, params));
     },
-    filterChangeEvent: function filterChangeEvent(params) {
-      var _this9 = this;
-      var $table = params.$table,
-        filterList = params.filterList;
+    filterChangeEvent(params) {
+      const {
+        $table,
+        filterList
+      } = params;
       // 如果是服务端过滤
       if ($table.filterOpts.remote) {
         this.filterData = filterList;
         if (this.proxyConfig) {
           this.tablePage.currentPage = 1;
-          this.commitProxy('query').then(function (rest) {
-            _this9.$emit('proxy-query', Object.assign(Object.assign({}, rest), {
-              $grid: _this9,
+          this.commitProxy('query').then(rest => {
+            this.$emit('proxy-query', Object.assign(Object.assign({}, rest), {
+              $grid: this,
               $event: params.$event
             }));
           });
@@ -1261,14 +1351,15 @@ var _default2 = exports.default = {
         $grid: this
       }, params));
     },
-    submitEvent: function submitEvent(params) {
-      var _this10 = this;
-      var proxyConfig = this.proxyConfig;
+    submitEvent(params) {
+      const {
+        proxyConfig
+      } = this;
       if (proxyConfig) {
-        this.commitProxy('reload').then(function (rest) {
-          _this10.$emit('proxy-query', Object.assign(Object.assign({}, rest), {
+        this.commitProxy('reload').then(rest => {
+          this.$emit('proxy-query', Object.assign(Object.assign({}, rest), {
             isReload: true,
-            $grid: _this10,
+            $grid: this,
             $event: params.$event
           }));
         });
@@ -1277,14 +1368,15 @@ var _default2 = exports.default = {
         $grid: this
       }, params));
     },
-    resetEvent: function resetEvent(params) {
-      var _this11 = this;
-      var proxyConfig = this.proxyConfig;
+    resetEvent(params) {
+      const {
+        proxyConfig
+      } = this;
       if (proxyConfig) {
-        this.commitProxy('reload').then(function (rest) {
-          _this11.$emit('proxy-query', Object.assign(Object.assign({}, rest), {
+        this.commitProxy('reload').then(rest => {
+          this.$emit('proxy-query', Object.assign(Object.assign({}, rest), {
             isReload: true,
-            $grid: _this11,
+            $grid: this,
             $event: params.$event
           }));
         });
@@ -1293,16 +1385,13 @@ var _default2 = exports.default = {
         $grid: this
       }, params));
     },
-    submitInvalidEvent: function submitInvalidEvent(params) {
+    submitInvalidEvent(params) {
       this.$emit('form-submit-invalid', Object.assign({
         $grid: this
       }, params));
     },
-    collapseEvent: function collapseEvent(params) {
-      var _this12 = this;
-      this.$nextTick(function () {
-        return _this12.recalculate(true);
-      });
+    collapseEvent(params) {
+      this.$nextTick(() => this.recalculate(true));
       this.$emit('form-toggle-collapse', Object.assign({
         $grid: this
       }, params));
@@ -1310,7 +1399,7 @@ var _default2 = exports.default = {
         $grid: this
       }, params));
     },
-    triggerZoomEvent: function triggerZoomEvent(evnt) {
+    triggerZoomEvent(evnt) {
       this.zoom();
       this.$emit('zoom', {
         $grid: this,
@@ -1318,38 +1407,37 @@ var _default2 = exports.default = {
         $event: evnt
       });
     },
-    zoom: function zoom() {
+    zoom() {
       return this[this.isZMax ? 'revert' : 'maximize']();
     },
-    isMaximized: function isMaximized() {
+    isMaximized() {
       return this.isZMax;
     },
-    maximize: function maximize() {
+    maximize() {
       return this.handleZoom(true);
     },
-    revert: function revert() {
+    revert() {
       return this.handleZoom();
     },
-    handleZoom: function handleZoom(isMax) {
-      var _this13 = this;
-      var isZMax = this.isZMax;
+    handleZoom(isMax) {
+      const {
+        isZMax
+      } = this;
       if (isMax ? !isZMax : isZMax) {
         this.isZMax = !isZMax;
         if (this.tZindex < (0, _utils.getLastZIndex)()) {
           this.tZindex = (0, _utils.nextZIndex)();
         }
       }
-      return this.$nextTick().then(function () {
-        return _this13.recalculate(true);
-      }).then(function () {
-        return _this13.isZMax;
-      });
+      return this.$nextTick().then(() => this.recalculate(true)).then(() => this.isZMax);
     },
-    getProxyInfo: function getProxyInfo() {
-      var $refs = this.$refs,
-        sortData = this.sortData,
-        proxyConfig = this.proxyConfig;
-      var $xetable = $refs.xTable;
+    getProxyInfo() {
+      const {
+        $refs,
+        sortData,
+        proxyConfig
+      } = this;
+      const $xetable = $refs.xTable;
       if (proxyConfig) {
         return {
           data: this.tableData,
@@ -1363,12 +1451,14 @@ var _default2 = exports.default = {
       }
       return null;
     }
-  }), process.env.VUE_APP_VXE_TABLE_ENV === 'development' ? {
-    loadColumn: function loadColumn(columns) {
-      var $scopedSlots = this.$scopedSlots;
-      _xeUtils.default.eachTree(columns, function (column) {
+  }), process.env.NODE_ENV === 'development' ? {
+    loadColumn(columns) {
+      const {
+        $scopedSlots
+      } = this;
+      _xeUtils.default.eachTree(columns, column => {
         if (column.slots) {
-          _xeUtils.default.each(column.slots, function (func) {
+          _xeUtils.default.each(column.slots, func => {
             if (!_xeUtils.default.isFunction(func)) {
               if (!$scopedSlots[func]) {
                 (0, _log.errLog)('vxe.error.notSlot', [func]);
@@ -1379,7 +1469,7 @@ var _default2 = exports.default = {
       });
       return this.$refs.xTable.loadColumn(columns);
     },
-    reloadColumn: function reloadColumn(columns) {
+    reloadColumn(columns) {
       this.clearAll();
       return this.loadColumn(columns);
     }