vxe-table 3.7.7-beta.3 → 3.7.7-beta.5

package/README.md

@@ -26,7 +26,7 @@
 ## 功能点
 
 * [x] 基础表格
-* [x] 高级表格
+* [x] 配置式表格
 * [x] 基础表单
 * [x] 配置式表单
 * [x] 斑马线条纹

package/helper/vetur/attributes.json

@@ -3,10 +3,6 @@
     "type": "string",
     "description": "图标名称"
   },
-  "vxe-icon/status": {
-    "type": "string",
-    "description": "状态颜色"
-  },
   "vxe-icon/roll": {
     "type": "boolean",
     "description": "旋转动画"

package/helper/vetur/tags.json

@@ -2,7 +2,6 @@
   "vxe-icon": {
     "attributes": [
       "name",
-      "status",
       "roll"
     ],
     "description": "图标"
@@ -243,7 +242,7 @@
       "proxy-config",
       "zoom-config"
     ],
-    "description": "高级表格"
+    "description": "配置式表格"
   },
   "vxe-toolbar": {
     "attributes": [

package/lib/edit/src/mixin.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
 var _vXETable = _interopRequireDefault(require("../../v-x-e-table"));
+var _conf = _interopRequireDefault(require("../../v-x-e-table/src/conf"));
 var _utils = _interopRequireWildcard(require("../../tools/utils"));
 var _util = require("../../table/src/util");
 var _dom = _interopRequireWildcard(require("../../tools/dom"));
@@ -479,7 +480,8 @@ var _default = {
       return {
         insertRecords: this.getInsertRecords(),
         removeRecords: this.getRemoveRecords(),
-        updateRecords: this.getUpdateRecords()
+        updateRecords: this.getUpdateRecords(),
+        pendingRecords: this.getPendingRecords()
       };
     },
     /**
@@ -551,7 +553,7 @@ var _default = {
       var editRender = column.editRender;
       var cell = params.cell = params.cell || this.getCell(row, column);
       var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
-      if ((0, _utils.isEnableConf)(editConfig) && (0, _utils.isEnableConf)(editRender) && cell) {
+      if ((0, _utils.isEnableConf)(editConfig) && (0, _utils.isEnableConf)(editRender) && !this.hasPendingByRow(row) && cell) {
         if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
           // 判断是否禁用编辑
           var type = 'edit-disabled';
@@ -567,7 +569,7 @@ var _default = {
             if (actived.column) {
               this.clearActived(evnt);
             }
-            type = 'edit-actived';
+            type = 'edit-activated';
             column.renderHeight = cell.offsetHeight;
             actived.args = params;
             actived.row = row;
@@ -591,6 +593,18 @@ var _default = {
             columnIndex: this.getColumnIndex(column),
             $columnIndex: this.getVMColumnIndex(column)
           }, evnt);
+
+          // v4已废弃
+          if (type === 'edit-activated') {
+            this.emitEvent('edit-actived', {
+              row: row,
+              rowIndex: this.getRowIndex(row),
+              $rowIndex: this.getVMRowIndex(row),
+              column: column,
+              columnIndex: this.getColumnIndex(column),
+              $columnIndex: this.getVMColumnIndex(column)
+            }, evnt);
+          }
         } else {
           var oldColumn = actived.column;
           if (mouseConfig) {
@@ -681,7 +695,12 @@ var _default = {
           $columnIndex: this.getVMColumnIndex(column)
         }, evnt);
       }
-      return _vXETable.default._valid ? this.clearValidate() : this.$nextTick();
+      if (_conf.default.cellVaildMode === 'obsolete') {
+        if (this.clearValidate) {
+          return this.clearValidate();
+        }
+      }
+      return this.$nextTick();
     },
     _getActiveRecord: function _getActiveRecord() {
       // if (process.env.NODE_ENV === 'development') {
@@ -697,7 +716,7 @@ var _default = {
       var actived = editStore.actived;
       var args = actived.args,
         row = actived.row;
-      if (args && this.findRowIndexOf(afterFullData, row) > -1 && $el.querySelectorAll('.vxe-body--column.col--actived').length) {
+      if (args && this.findRowIndexOf(afterFullData, row) > -1 && $el.querySelectorAll('.vxe-body--column.col--active').length) {
         return Object.assign({}, args);
       }
       return null;

package/lib/edit/src/mixin.min.js

@@ -1 +1 @@
-"use strict";function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_utils=_interopRequireWildcard(require("../../tools/utils")),_util=require("../../table/src/util"),_dom=_interopRequireWildcard(require("../../tools/dom")),_log=require("../../tools/log");function _getRequireWildcardCache(e){var t,r;return"function"!=typeof WeakMap?null:(t=new WeakMap,r=new WeakMap,(_getRequireWildcardCache=function(e){return e?r:t})(e))}function _interopRequireWildcard(e,t){if(!t&&e&&e.__esModule)return e;if(null===e||"object"!==_typeof(e)&&"function"!=typeof e)return{default:e};t=_getRequireWildcardCache(t);if(t&&t.has(e))return t.get(e);var r,n,i={},l=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(r in e)"default"!==r&&Object.prototype.hasOwnProperty.call(e,r)&&((n=l?Object.getOwnPropertyDescriptor(e,r):null)&&(n.get||n.set)?Object.defineProperty(i,r,n):i[r]=e[r]);return i.default=e,t&&t.set(e,i),i}function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function ownKeys(t,e){var r,n=Object.keys(t);return Object.getOwnPropertySymbols&&(r=Object.getOwnPropertySymbols(t),e&&(r=r.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),n.push.apply(n,r)),n}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(r),!0).forEach(function(e){_defineProperty(t,e,r[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):ownKeys(Object(r)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,e))})}return t}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_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(e,t){var r;if(e)return"string"==typeof e?_arrayLikeToArray(e,t):"Map"===(r="Object"===(r=Object.prototype.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:r)||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?_arrayLikeToArray(e,t):void 0}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,n=new Array(t);r<t;r++)n[r]=e[r];return n}function _defineProperty(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function insertTreeRow(a,e,t){var s=a.tableFullTreeData,u=a.afterFullData,c=a.fullDataRowIdData,d=a.fullAllDataRowIdData,r=a.treeOpts,f=r.rowField,h=r.parentField,p=r.mapChildrenField,_=r.children||r.childrenField,m=t?"push":"unshift";e.forEach(function(e){var t,r,n,i=e[h],l=(0,_util.getRowid)(a,e),o=i?_xeUtils.default.findTree(s,function(e){return i===e[f]},{children:p}):null;o?(o=o.item,t=(t=d[(0,_util.getRowid)(a,o)])?t.level:0,r=o[_],n=o[p],_xeUtils.default.isArray(r)||(r=o[_]=[]),_xeUtils.default.isArray(n)||(n=o[_]=[]),r[m](e),n[m](e),o={row:e,rowid:l,seq:-1,index:-1,_index:-1,$index:-1,items:r,parent:parent,level:t+1},c[l]=o,d[l]=o):("development"===process.env.NODE_ENV&&i&&(0,_log.warnLog)("vxe.error.unableInsert"),u[m](e),s[m](e),n={row:e,rowid:l,seq:-1,index:-1,_index:-1,$index:-1,items:s,parent:null,level:0},c[l]=n,d[l]=n)})}function handleInsertRowAt(n,e,t,i){var r=n.tableFullTreeData,l=n.mergeList,o=n.afterFullData,a=n.editStore,s=n.tableFullData,u=n.treeConfig,c=n.fullDataRowIdData,d=n.fullAllDataRowIdData,f=n.treeOpts,h=f.transform,p=f.rowField,_=f.mapChildrenField,m=f.children||f.childrenField,w=(_xeUtils.default.isArray(e)||(e=[e]),n.defineField(e.map(function(e){var t;return Object.assign(u&&h?(_defineProperty(t={},_,[]),_defineProperty(t,m,[]),t):{},e)})));if(t)if(-1===t)u&&h?insertTreeRow(n,w,!0):(o.push.apply(o,_toConsumableArray(w)),s.push.apply(s,_toConsumableArray(w)),l.forEach(function(e){var t=e.row,r=e.rowspan;t+r>o.length&&(e.rowspan=r+w.length)}));else if(u&&h){var v,g,y,b=_xeUtils.default.findTree(r,function(e){return t[p]===e[p]},{children:_});b?(v=b.parent,g=v?v[_]:r,e=d[(0,_util.getRowid)(n,v)],y=e?e.level:0,w.forEach(function(e,t){var r=(0,_util.getRowid)(n,e),t=("development"===process.env.NODE_ENV&&e[f.parentField]&&v&&e[f.parentField]!==v[p]&&(0,_log.errLog)("vxe.error.errProp",["".concat(f.parentField,"=").concat(e[f.parentField]),"".concat(f.parentField,"=").concat(v[p])]),v&&(e[f.parentField]=v[p]),b.index+t),t=(i&&(t+=1),g.splice(t,0,e),{row:e,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,items:g,parent:v,level:y+1});c[r]=t,d[r]=t}),v&&(e=_xeUtils.default.findTree(r,function(e){return t[p]===e[p]},{children:m}))&&(r=e.items,e=e.index,i&&(e+=1),r.splice.apply(r,[e,0].concat(_toConsumableArray(w))))):("development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.unableInsert"),insertTreeRow(n,w,!0))}else{if(u)throw new Error((0,_log.getLog)("vxe.error.noTree",["insert"]));var C=-1;if(_xeUtils.default.isNumber(t)?t<o.length&&(C=t):C=n.findRowIndexOf(o,t),-1===(C=i?Math.min(o.length,C+1):C))throw new Error((0,_log.errLog)("vxe.error.unableInsert"));o.splice.apply(o,[C,0].concat(_toConsumableArray(w))),s.splice.apply(s,[n.findRowIndexOf(s,t),0].concat(_toConsumableArray(w))),l.forEach(function(e){var t=e.row,r=e.rowspan;C<t?e.row=t+w.length:C<t+r&&(e.rowspan=r+w.length)})}else u&&h?insertTreeRow(n,w,!1):(o.unshift.apply(o,_toConsumableArray(w)),s.unshift.apply(s,_toConsumableArray(w)),l.forEach(function(e){var t=e.row;0<t&&(e.row=t+w.length)}));var r=a.insertList,x=a.insertMaps;return w.forEach(function(e){var t=(0,_util.getRowid)(n,e);x[t]=e}),r.unshift.apply(r,_toConsumableArray(w)),n.cacheRowMap(),n.updateScrollYStatus(),n.handleTableData(u&&h),u&&h||n.updateAfterDataIndex(),n.updateFooter(),n.checkSelectionStatus(),n.scrollYLoad&&n.updateScrollYSpace(),n.$nextTick().then(function(){return n.updateCellAreas(),n.recalculate()}).then(function(){return{row:w.length?w[w.length-1]:null,rows:w}})}var _default={methods:{_insert:function(e){return handleInsertRowAt(this,e,null)},_insertAt:function(e,t){return handleInsertRowAt(this,e,t)},_insertNextAt:function(e,t){return handleInsertRowAt(this,e,t,!0)},_remove:function(e){var t,i=this,l=this.afterFullData,r=this.tableFullData,n=this.tableFullTreeData,o=this.treeConfig,a=this.mergeList,s=this.editStore,u=this.checkboxOpts,c=this.selectCheckboxMaps,d=this.isInsertByRow,f=this.treeOpts,h=f.transform,p=f.mapChildrenField,_=f.children||f.childrenField,f=s.actived,m=s.removeList,w=s.insertList,v=s.insertMaps,s=u.checkField,g=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=r,e.forEach(function(e){d(e)||m.push(e)}),s||(t=_objectSpread({},c),e.forEach(function(e){e=(0,_util.getRowid)(i,e);t[e]&&delete t[e]}),this.selectCheckboxMaps=t),r===e?(e=g=r.slice(0),this.tableFullData=[],this.afterFullData=[],this.clearMergeCells()):o&&h?e.forEach(function(e){var t=(0,_util.getRowid)(i,e),r=_xeUtils.default.findTree(n,function(e){return t===(0,_util.getRowid)(i,e)},{children:p}),r=(r&&(r=r.items.splice(r.index,1),g.push(r[0])),_xeUtils.default.findTree(n,function(e){return t===(0,_util.getRowid)(i,e)},{children:_})),r=(r&&r.items.splice(r.index,1),i.findRowIndexOf(l,e));-1<r&&l.splice(r,1)}):e.forEach(function(e){var t=i.findRowIndexOf(r,e),n=(-1<t&&(t=r.splice(t,1),g.push(t[0])),i.findRowIndexOf(l,e));-1<n&&(a.forEach(function(e){var t=e.row,r=e.rowspan;n<t?e.row=t-1:n<t+r&&(e.rowspan=r-1)}),l.splice(n,1))}),f.row&&-1<this.findRowIndexOf(e,f.row)&&this.clearActived(),e.forEach(function(e){var t=(0,_util.getRowid)(i,e),e=i.findRowIndexOf(w,e);-1<e&&w.splice(e,1),delete v[t]}),this.handleTableData(o&&h),o&&h||this.updateAfterDataIndex(),this.updateFooter(),this.cacheRowMap(),this.checkSelectionStatus(),this.scrollYLoad&&this.updateScrollYSpace(),this.$nextTick().then(function(){return i.updateCellAreas(),i.recalculate()}).then(function(){return{row:g.length?g[g.length-1]:null,rows:g}})},_removeCheckboxRow:function(){var t=this;return this.remove(this.getCheckboxRecords()).then(function(e){return t.clearCheckboxRow(),e})},_removeRadioRow:function(){var t=this,e=this.getRadioRecord();return this.remove(e||[]).then(function(e){return t.clearRadioRow(),e})},_removeCurrentRow:function(){var t=this,e=this.getCurrentRecord();return this.remove(e||[]).then(function(e){return t.clearCurrentRow(),e})},_getRecordset:function(){return{insertRecords:this.getInsertRecords(),removeRecords:this.getRemoveRecords(),updateRecords:this.getUpdateRecords()}},_getInsertRecords:function(){var r=this,n=this.fullAllDataRowIdData,e=this.editStore.insertList,i=[];return e.forEach(function(e){var t=(0,_util.getRowid)(r,e);n[t]&&i.push(e)}),i},_getRemoveRecords:function(){return this.editStore.removeList},_getUpdateRecords:function(){var e=this.keepSource,t=this.tableFullData,r=this.isUpdateByRow,n=this.treeConfig,i=this.treeOpts,l=this.editStore;return e?(l=(e=l.actived).row,e=e.column,(l||e)&&this._syncActivedCell(),n?_xeUtils.default.filterTree(t,function(e){return r(e)},i):t.filter(function(e){return r(e)})):[]},handleActived:function(e,t){var r=this,n=this.editStore,i=this.editOpts,l=this.tableColumn,o=this.editConfig,a=this.mouseConfig,s=i.mode,n=n.actived,u=e.row,c=e.column,d=c.editRender,f=e.cell=e.cell||this.getCell(u,c),i=i.beforeEditMethod||i.activeMethod;return(0,_utils.isEnableConf)(o)&&(0,_utils.isEnableConf)(d)&&f&&(n.row!==u||"cell"===s&&n.column!==c?(o="edit-disabled",i&&!i(_objectSpread(_objectSpread({},e),{},{$table:this}))||(a&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),this.closeTooltip(),n.column&&this.clearActived(t),o="edit-actived",c.renderHeight=f.offsetHeight,n.args=e,n.row=u,n.column=c,"row"===s?l.forEach(function(e){return r._getColumnModel(u,e)}):this._getColumnModel(u,c),this.$nextTick(function(){r.handleFocus(e,t)})),this.emitEvent(o,{row:u,rowIndex:this.getRowIndex(u),$rowIndex:this.getVMRowIndex(u),column:c,columnIndex:this.getColumnIndex(c),$columnIndex:this.getVMColumnIndex(c)},t)):(d=n.column,a&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),d!==c&&((i=d.model).update&&_utils.default.setCellValue(u,d,i.value),this.clearValidate()),c.renderHeight=f.offsetHeight,n.args=e,n.column=c,setTimeout(function(){r.handleFocus(e,t)})),this.focus()),this.$nextTick()},_getColumnModel:function(e,t){var r=t.model;t.editRender&&(r.value=_utils.default.getCellValue(e,t),r.update=!1)},_setColumnModel:function(e,t){var r=t.model;t.editRender&&r.update&&(_utils.default.setCellValue(e,t,r.value),r.update=!1,r.value=null)},_syncActivedCell:function(){var t=this,e=this.tableColumn,r=this.editStore,n=this.editOpts,r=r.actived,i=r.row,r=r.column;(i||r)&&("row"===n.mode?e.forEach(function(e){return t._setColumnModel(i,e)}):this._setColumnModel(i,r))},_clearActived:function(e){return this.clearEdit(e)},_clearEdit:function(e){var t=this.editStore.actived,r=t.row,n=t.column;return(r||n)&&(this._syncActivedCell(),t.args=null,t.row=null,t.column=null,this.updateFooter(),this.emitEvent("edit-closed",{row:r,rowIndex:this.getRowIndex(r),$rowIndex:this.getVMRowIndex(r),column:n,columnIndex:this.getColumnIndex(n),$columnIndex:this.getVMColumnIndex(n)},e)),_vXETable.default._valid?this.clearValidate():this.$nextTick()},_getActiveRecord:function(){return this.getEditRecord()},_getEditRecord:function(){var e=this.$el,t=this.editStore,r=this.afterFullData,t=t.actived,n=t.args,t=t.row;return n&&-1<this.findRowIndexOf(r,t)&&e.querySelectorAll(".vxe-body--column.col--actived").length?Object.assign({},n):null},_isActiveByRow:function(e){return this.isEditByRow(e)},_isEditByRow:function(e){return this.editStore.actived.row===e},handleFocus:function(e){var t,r,n,i=e.row,l=e.column,o=e.cell,a=l.editRender;(0,_utils.isEnableConf)(a)&&(n=_vXETable.default.renderer.get(a.name),t=a.autofocus,a=a.autoselect,!t&&n&&(t=n.autofocus),!a&&n&&(a=n.autoselect),_xeUtils.default.isFunction(t)?r=t.call(this,e):t&&(r=o.querySelector(t))&&r.focus(),r?a?r.select():_dom.browse.msie&&((n=r.createTextRange()).collapse(!1),n.select()):this.scrollToRow(i,l))},_setActiveRow:function(e){return this.setEditRow(e)},_setEditRow:function(e,t){var r=_xeUtils.default.find(this.visibleColumn,function(e){return(0,_utils.isEnableConf)(e.editRender)});return t&&(r=_xeUtils.default.isString(t)?this.getColumnByField(t):t),this.setEditCell(e,r)},_setActiveCell:function(e){return this.setEditCell(e)},_setEditCell:function(t,e){var r=this,n=this.editConfig,i=_xeUtils.default.isString(e)?this.getColumnByField(e):e;return t&&i&&(0,_utils.isEnableConf)(n)&&(0,_utils.isEnableConf)(i.editRender)?this.scrollToRow(t,!0).then(function(){var e=r.getCell(t,i);e&&(r.handleActived({row:t,rowIndex:r.getRowIndex(t),column:i,columnIndex:r.getColumnIndex(i),cell:e,$table:r}),r.lastCallTime=Date.now())}):this.$nextTick()},_setSelectCell:function(e,t){var r=this.tableData,n=this.editOpts,i=this.visibleColumn,t=_xeUtils.default.isString(t)?this.getColumnByField(t):t;return e&&t&&"manual"!==n.trigger&&-1<(n=this.findRowIndexOf(r,e))&&(r=this.getCell(e,t),e={row:e,rowIndex:n,column:t,columnIndex:i.indexOf(t),cell:r},this.handleSelected(e,{})),this.$nextTick()},handleSelected:function(e,t){var r=this,n=this.mouseConfig,i=this.mouseOpts,l=this.editOpts,o=this.editStore,a=o.actived,o=o.selected,s=e.row,u=e.column,n=n&&i.selected;return!n||o.row===s&&o.column===u||(a.row!==s||"cell"===l.mode&&a.column!==u)&&(r.clearActived(t),r.clearSelected(t),r.clearCellAreas(t),r.clearCopyCellArea(t),o.args=e,o.row=s,o.column=u,n&&r.addColSdCls(),r.focus(),t)&&r.emitEvent("cell-selected",e,t),r.$nextTick()},_getSelectedCell:function(){var e=this.editStore.selected,t=e.args,e=e.column;return t&&e?Object.assign({},t):null},_clearSelected:function(){var e=this.editStore.selected;return e.row=null,e.column=null,this.reColTitleSdCls(),this.reColSdCls(),this.$nextTick()},reColTitleSdCls:function(){var e=this.elemStore["main-header-list"];e&&_xeUtils.default.arrayEach(e.querySelectorAll(".col--title-selected"),function(e){return _dom.default.removeClass(e,"col--title-selected")})},reColSdCls:function(){var e=this.$el.querySelector(".col--selected");e&&_dom.default.removeClass(e,"col--selected")},addColSdCls:function(){var e=this.editStore.selected,t=e.row,e=e.column;this.reColSdCls(),t&&e&&(t=this.getCell(t,e))&&_dom.default.addClass(t,"col--selected")}}};exports.default=_default;
+"use strict";function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_utils=_interopRequireWildcard(require("../../tools/utils")),_util=require("../../table/src/util"),_dom=_interopRequireWildcard(require("../../tools/dom")),_log=require("../../tools/log");function _getRequireWildcardCache(e){var t,r;return"function"!=typeof WeakMap?null:(t=new WeakMap,r=new WeakMap,(_getRequireWildcardCache=function(e){return e?r:t})(e))}function _interopRequireWildcard(e,t){if(!t&&e&&e.__esModule)return e;if(null===e||"object"!==_typeof(e)&&"function"!=typeof e)return{default:e};t=_getRequireWildcardCache(t);if(t&&t.has(e))return t.get(e);var r,n,i={},o=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(r in e)"default"!==r&&Object.prototype.hasOwnProperty.call(e,r)&&((n=o?Object.getOwnPropertyDescriptor(e,r):null)&&(n.get||n.set)?Object.defineProperty(i,r,n):i[r]=e[r]);return i.default=e,t&&t.set(e,i),i}function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function ownKeys(t,e){var r,n=Object.keys(t);return Object.getOwnPropertySymbols&&(r=Object.getOwnPropertySymbols(t),e&&(r=r.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),n.push.apply(n,r)),n}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(r),!0).forEach(function(e){_defineProperty(t,e,r[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):ownKeys(Object(r)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,e))})}return t}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_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(e,t){var r;if(e)return"string"==typeof e?_arrayLikeToArray(e,t):"Map"===(r="Object"===(r=Object.prototype.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:r)||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?_arrayLikeToArray(e,t):void 0}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,n=new Array(t);r<t;r++)n[r]=e[r];return n}function _defineProperty(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function insertTreeRow(a,e,t){var s=a.tableFullTreeData,u=a.afterFullData,c=a.fullDataRowIdData,d=a.fullAllDataRowIdData,r=a.treeOpts,f=r.rowField,h=r.parentField,p=r.mapChildrenField,m=r.children||r.childrenField,_=t?"push":"unshift";e.forEach(function(e){var t,r,n,i=e[h],o=(0,_util.getRowid)(a,e),l=i?_xeUtils.default.findTree(s,function(e){return i===e[f]},{children:p}):null;l?(l=l.item,t=(t=d[(0,_util.getRowid)(a,l)])?t.level:0,r=l[m],n=l[p],_xeUtils.default.isArray(r)||(r=l[m]=[]),_xeUtils.default.isArray(n)||(n=l[m]=[]),r[_](e),n[_](e),l={row:e,rowid:o,seq:-1,index:-1,_index:-1,$index:-1,items:r,parent:parent,level:t+1},c[o]=l,d[o]=l):("development"===process.env.NODE_ENV&&i&&(0,_log.warnLog)("vxe.error.unableInsert"),u[_](e),s[_](e),n={row:e,rowid:o,seq:-1,index:-1,_index:-1,$index:-1,items:s,parent:null,level:0},c[o]=n,d[o]=n)})}function handleInsertRowAt(n,e,t,i){var r=n.tableFullTreeData,o=n.mergeList,l=n.afterFullData,a=n.editStore,s=n.tableFullData,u=n.treeConfig,c=n.fullDataRowIdData,d=n.fullAllDataRowIdData,f=n.treeOpts,h=f.transform,p=f.rowField,m=f.mapChildrenField,_=f.children||f.childrenField,w=(_xeUtils.default.isArray(e)||(e=[e]),n.defineField(e.map(function(e){var t;return Object.assign(u&&h?(_defineProperty(t={},m,[]),_defineProperty(t,_,[]),t):{},e)})));if(t)if(-1===t)u&&h?insertTreeRow(n,w,!0):(l.push.apply(l,_toConsumableArray(w)),s.push.apply(s,_toConsumableArray(w)),o.forEach(function(e){var t=e.row,r=e.rowspan;t+r>l.length&&(e.rowspan=r+w.length)}));else if(u&&h){var g,v,y,b=_xeUtils.default.findTree(r,function(e){return t[p]===e[p]},{children:m});b?(g=b.parent,v=g?g[m]:r,e=d[(0,_util.getRowid)(n,g)],y=e?e.level:0,w.forEach(function(e,t){var r=(0,_util.getRowid)(n,e),t=("development"===process.env.NODE_ENV&&e[f.parentField]&&g&&e[f.parentField]!==g[p]&&(0,_log.errLog)("vxe.error.errProp",["".concat(f.parentField,"=").concat(e[f.parentField]),"".concat(f.parentField,"=").concat(g[p])]),g&&(e[f.parentField]=g[p]),b.index+t),t=(i&&(t+=1),v.splice(t,0,e),{row:e,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,items:v,parent:g,level:y+1});c[r]=t,d[r]=t}),g&&(e=_xeUtils.default.findTree(r,function(e){return t[p]===e[p]},{children:_}))&&(r=e.items,e=e.index,i&&(e+=1),r.splice.apply(r,[e,0].concat(_toConsumableArray(w))))):("development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.unableInsert"),insertTreeRow(n,w,!0))}else{if(u)throw new Error((0,_log.getLog)("vxe.error.noTree",["insert"]));var C=-1;if(_xeUtils.default.isNumber(t)?t<l.length&&(C=t):C=n.findRowIndexOf(l,t),-1===(C=i?Math.min(l.length,C+1):C))throw new Error((0,_log.errLog)("vxe.error.unableInsert"));l.splice.apply(l,[C,0].concat(_toConsumableArray(w))),s.splice.apply(s,[n.findRowIndexOf(s,t),0].concat(_toConsumableArray(w))),o.forEach(function(e){var t=e.row,r=e.rowspan;C<t?e.row=t+w.length:C<t+r&&(e.rowspan=r+w.length)})}else u&&h?insertTreeRow(n,w,!1):(l.unshift.apply(l,_toConsumableArray(w)),s.unshift.apply(s,_toConsumableArray(w)),o.forEach(function(e){var t=e.row;0<t&&(e.row=t+w.length)}));var r=a.insertList,x=a.insertMaps;return w.forEach(function(e){var t=(0,_util.getRowid)(n,e);x[t]=e}),r.unshift.apply(r,_toConsumableArray(w)),n.cacheRowMap(),n.updateScrollYStatus(),n.handleTableData(u&&h),u&&h||n.updateAfterDataIndex(),n.updateFooter(),n.checkSelectionStatus(),n.scrollYLoad&&n.updateScrollYSpace(),n.$nextTick().then(function(){return n.updateCellAreas(),n.recalculate()}).then(function(){return{row:w.length?w[w.length-1]:null,rows:w}})}var _default={methods:{_insert:function(e){return handleInsertRowAt(this,e,null)},_insertAt:function(e,t){return handleInsertRowAt(this,e,t)},_insertNextAt:function(e,t){return handleInsertRowAt(this,e,t,!0)},_remove:function(e){var t,i=this,o=this.afterFullData,r=this.tableFullData,n=this.tableFullTreeData,l=this.treeConfig,a=this.mergeList,s=this.editStore,u=this.checkboxOpts,c=this.selectCheckboxMaps,d=this.isInsertByRow,f=this.treeOpts,h=f.transform,p=f.mapChildrenField,m=f.children||f.childrenField,f=s.actived,_=s.removeList,w=s.insertList,g=s.insertMaps,s=u.checkField,v=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=r,e.forEach(function(e){d(e)||_.push(e)}),s||(t=_objectSpread({},c),e.forEach(function(e){e=(0,_util.getRowid)(i,e);t[e]&&delete t[e]}),this.selectCheckboxMaps=t),r===e?(e=v=r.slice(0),this.tableFullData=[],this.afterFullData=[],this.clearMergeCells()):l&&h?e.forEach(function(e){var t=(0,_util.getRowid)(i,e),r=_xeUtils.default.findTree(n,function(e){return t===(0,_util.getRowid)(i,e)},{children:p}),r=(r&&(r=r.items.splice(r.index,1),v.push(r[0])),_xeUtils.default.findTree(n,function(e){return t===(0,_util.getRowid)(i,e)},{children:m})),r=(r&&r.items.splice(r.index,1),i.findRowIndexOf(o,e));-1<r&&o.splice(r,1)}):e.forEach(function(e){var t=i.findRowIndexOf(r,e),n=(-1<t&&(t=r.splice(t,1),v.push(t[0])),i.findRowIndexOf(o,e));-1<n&&(a.forEach(function(e){var t=e.row,r=e.rowspan;n<t?e.row=t-1:n<t+r&&(e.rowspan=r-1)}),o.splice(n,1))}),f.row&&-1<this.findRowIndexOf(e,f.row)&&this.clearActived(),e.forEach(function(e){var t=(0,_util.getRowid)(i,e),e=i.findRowIndexOf(w,e);-1<e&&w.splice(e,1),delete g[t]}),this.handleTableData(l&&h),l&&h||this.updateAfterDataIndex(),this.updateFooter(),this.cacheRowMap(),this.checkSelectionStatus(),this.scrollYLoad&&this.updateScrollYSpace(),this.$nextTick().then(function(){return i.updateCellAreas(),i.recalculate()}).then(function(){return{row:v.length?v[v.length-1]:null,rows:v}})},_removeCheckboxRow:function(){var t=this;return this.remove(this.getCheckboxRecords()).then(function(e){return t.clearCheckboxRow(),e})},_removeRadioRow:function(){var t=this,e=this.getRadioRecord();return this.remove(e||[]).then(function(e){return t.clearRadioRow(),e})},_removeCurrentRow:function(){var t=this,e=this.getCurrentRecord();return this.remove(e||[]).then(function(e){return t.clearCurrentRow(),e})},_getRecordset:function(){return{insertRecords:this.getInsertRecords(),removeRecords:this.getRemoveRecords(),updateRecords:this.getUpdateRecords(),pendingRecords:this.getPendingRecords()}},_getInsertRecords:function(){var r=this,n=this.fullAllDataRowIdData,e=this.editStore.insertList,i=[];return e.forEach(function(e){var t=(0,_util.getRowid)(r,e);n[t]&&i.push(e)}),i},_getRemoveRecords:function(){return this.editStore.removeList},_getUpdateRecords:function(){var e=this.keepSource,t=this.tableFullData,r=this.isUpdateByRow,n=this.treeConfig,i=this.treeOpts,o=this.editStore;return e?(o=(e=o.actived).row,e=e.column,(o||e)&&this._syncActivedCell(),n?_xeUtils.default.filterTree(t,function(e){return r(e)},i):t.filter(function(e){return r(e)})):[]},handleActived:function(e,t){var r=this,n=this.editStore,i=this.editOpts,o=this.tableColumn,l=this.editConfig,a=this.mouseConfig,s=i.mode,n=n.actived,u=e.row,c=e.column,d=c.editRender,f=e.cell=e.cell||this.getCell(u,c),i=i.beforeEditMethod||i.activeMethod;return(0,_utils.isEnableConf)(l)&&(0,_utils.isEnableConf)(d)&&!this.hasPendingByRow(u)&&f&&(n.row!==u||"cell"===s&&n.column!==c?(l="edit-disabled",i&&!i(_objectSpread(_objectSpread({},e),{},{$table:this}))||(a&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),this.closeTooltip(),n.column&&this.clearActived(t),l="edit-activated",c.renderHeight=f.offsetHeight,n.args=e,n.row=u,n.column=c,"row"===s?o.forEach(function(e){return r._getColumnModel(u,e)}):this._getColumnModel(u,c),this.$nextTick(function(){r.handleFocus(e,t)})),this.emitEvent(l,{row:u,rowIndex:this.getRowIndex(u),$rowIndex:this.getVMRowIndex(u),column:c,columnIndex:this.getColumnIndex(c),$columnIndex:this.getVMColumnIndex(c)},t),"edit-activated"===l&&this.emitEvent("edit-actived",{row:u,rowIndex:this.getRowIndex(u),$rowIndex:this.getVMRowIndex(u),column:c,columnIndex:this.getColumnIndex(c),$columnIndex:this.getVMColumnIndex(c)},t)):(d=n.column,a&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),d!==c&&((i=d.model).update&&_utils.default.setCellValue(u,d,i.value),this.clearValidate()),c.renderHeight=f.offsetHeight,n.args=e,n.column=c,setTimeout(function(){r.handleFocus(e,t)})),this.focus()),this.$nextTick()},_getColumnModel:function(e,t){var r=t.model;t.editRender&&(r.value=_utils.default.getCellValue(e,t),r.update=!1)},_setColumnModel:function(e,t){var r=t.model;t.editRender&&r.update&&(_utils.default.setCellValue(e,t,r.value),r.update=!1,r.value=null)},_syncActivedCell:function(){var t=this,e=this.tableColumn,r=this.editStore,n=this.editOpts,r=r.actived,i=r.row,r=r.column;(i||r)&&("row"===n.mode?e.forEach(function(e){return t._setColumnModel(i,e)}):this._setColumnModel(i,r))},_clearActived:function(e){return this.clearEdit(e)},_clearEdit:function(e){var t=this.editStore.actived,r=t.row,n=t.column;return(r||n)&&(this._syncActivedCell(),t.args=null,t.row=null,t.column=null,this.updateFooter(),this.emitEvent("edit-closed",{row:r,rowIndex:this.getRowIndex(r),$rowIndex:this.getVMRowIndex(r),column:n,columnIndex:this.getColumnIndex(n),$columnIndex:this.getVMColumnIndex(n)},e)),"obsolete"===_conf.default.cellVaildMode&&this.clearValidate?this.clearValidate():this.$nextTick()},_getActiveRecord:function(){return this.getEditRecord()},_getEditRecord:function(){var e=this.$el,t=this.editStore,r=this.afterFullData,t=t.actived,n=t.args,t=t.row;return n&&-1<this.findRowIndexOf(r,t)&&e.querySelectorAll(".vxe-body--column.col--active").length?Object.assign({},n):null},_isActiveByRow:function(e){return this.isEditByRow(e)},_isEditByRow:function(e){return this.editStore.actived.row===e},handleFocus:function(e){var t,r,n,i=e.row,o=e.column,l=e.cell,a=o.editRender;(0,_utils.isEnableConf)(a)&&(n=_vXETable.default.renderer.get(a.name),t=a.autofocus,a=a.autoselect,!t&&n&&(t=n.autofocus),!a&&n&&(a=n.autoselect),_xeUtils.default.isFunction(t)?r=t.call(this,e):t&&(r=l.querySelector(t))&&r.focus(),r?a?r.select():_dom.browse.msie&&((n=r.createTextRange()).collapse(!1),n.select()):this.scrollToRow(i,o))},_setActiveRow:function(e){return this.setEditRow(e)},_setEditRow:function(e,t){var r=_xeUtils.default.find(this.visibleColumn,function(e){return(0,_utils.isEnableConf)(e.editRender)});return t&&(r=_xeUtils.default.isString(t)?this.getColumnByField(t):t),this.setEditCell(e,r)},_setActiveCell:function(e){return this.setEditCell(e)},_setEditCell:function(t,e){var r=this,n=this.editConfig,i=_xeUtils.default.isString(e)?this.getColumnByField(e):e;return t&&i&&(0,_utils.isEnableConf)(n)&&(0,_utils.isEnableConf)(i.editRender)?this.scrollToRow(t,!0).then(function(){var e=r.getCell(t,i);e&&(r.handleActived({row:t,rowIndex:r.getRowIndex(t),column:i,columnIndex:r.getColumnIndex(i),cell:e,$table:r}),r.lastCallTime=Date.now())}):this.$nextTick()},_setSelectCell:function(e,t){var r=this.tableData,n=this.editOpts,i=this.visibleColumn,t=_xeUtils.default.isString(t)?this.getColumnByField(t):t;return e&&t&&"manual"!==n.trigger&&-1<(n=this.findRowIndexOf(r,e))&&(r=this.getCell(e,t),e={row:e,rowIndex:n,column:t,columnIndex:i.indexOf(t),cell:r},this.handleSelected(e,{})),this.$nextTick()},handleSelected:function(e,t){var r=this,n=this.mouseConfig,i=this.mouseOpts,o=this.editOpts,l=this.editStore,a=l.actived,l=l.selected,s=e.row,u=e.column,n=n&&i.selected;return!n||l.row===s&&l.column===u||(a.row!==s||"cell"===o.mode&&a.column!==u)&&(r.clearActived(t),r.clearSelected(t),r.clearCellAreas(t),r.clearCopyCellArea(t),l.args=e,l.row=s,l.column=u,n&&r.addColSdCls(),r.focus(),t)&&r.emitEvent("cell-selected",e,t),r.$nextTick()},_getSelectedCell:function(){var e=this.editStore.selected,t=e.args,e=e.column;return t&&e?Object.assign({},t):null},_clearSelected:function(){var e=this.editStore.selected;return e.row=null,e.column=null,this.reColTitleSdCls(),this.reColSdCls(),this.$nextTick()},reColTitleSdCls:function(){var e=this.elemStore["main-header-list"];e&&_xeUtils.default.arrayEach(e.querySelectorAll(".col--title-selected"),function(e){return _dom.default.removeClass(e,"col--title-selected")})},reColSdCls:function(){var e=this.$el.querySelector(".col--selected");e&&_dom.default.removeClass(e,"col--selected")},addColSdCls:function(){var e=this.editStore.selected,t=e.row,e=e.column;this.reColSdCls(),t&&e&&(t=this.getCell(t,e))&&_dom.default.addClass(t,"col--selected")}}};exports.default=_default;

package/lib/grid/src/grid.js

@@ -195,7 +195,6 @@ var _default2 = {
       tableLoading: false,
       isZMax: false,
       tableData: [],
-      pendingRecords: [],
       filterData: [],
       formData: {},
       sortData: [],
@@ -262,7 +261,6 @@ var _default2 = {
       if (proxyConfig) {
         tableProps.loading = loading || tableLoading;
         tableProps.data = tableData;
-        tableProps.rowClassName = this.handleRowClassName;
         if (proxyOpts.seq && (0, _utils.isEnableConf)(pagerConfig)) {
           tableProps.seqConfig = Object.assign({}, seqConfig, {
             startIndex: (tablePage.currentPage - 1) * tablePage.pageSize
@@ -270,9 +268,7 @@ var _default2 = {
         }
       }
       if (editConfig) {
-        tableProps.editConfig = Object.assign({}, editConfig, {
-          beforeEditMethod: this.handleBeforeEditMethod
-        });
+        tableProps.editConfig = Object.assign({}, editConfig);
       }
       return tableProps;
     }
@@ -441,27 +437,6 @@ var _default2 = {
       var parentPaddingSize = isZMax || height !== 'auto' ? 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);
     },
-    handleRowClassName: function handleRowClassName(params) {
-      var rowClassName = this.rowClassName;
-      var clss = [];
-      if (this.pendingRecords.some(function (item) {
-        return item === params.row;
-      })) {
-        clss.push('row--pending');
-      }
-      clss.push(rowClassName ? _xeUtils.default.isFunction(rowClassName) ? rowClassName(params) : rowClassName : '');
-      return clss;
-    },
-    handleBeforeEditMethod: function handleBeforeEditMethod(params) {
-      var editConfig = this.editConfig;
-      var beforeEditMethod = editConfig ? editConfig.beforeEditMethod || editConfig.activeMethod : null;
-      if (this.pendingRecords.indexOf(params.row) === -1) {
-        return !beforeEditMethod || beforeEditMethod(_objectSpread(_objectSpread({}, params), {}, {
-          $grid: this
-        }));
-      }
-      return false;
-    },
     initToolbar: function initToolbar() {
       var _this3 = this;
       this.$nextTick(function () {
@@ -586,11 +561,20 @@ var _default2 = {
       switch (code) {
         case 'insert':
           return this.insert();
-        case 'insert_actived':
+        case 'insert_edit':
           return this.insert().then(function (_ref2) {
             var row = _ref2.row;
-            return _this5.setActiveRow(row);
+            return _this5.setEditRow(row);
+          });
+
+        // 已废弃
+        case 'insert_actived':
+          return this.insert().then(function (_ref3) {
+            var row = _ref3.row;
+            return _this5.setEditRow(row);
           });
+        // 已废弃
+
         case 'mark_cancel':
           this.triggerPendingEvent(code);
           break;
@@ -651,7 +635,6 @@ var _default2 = {
                 filterList = $xetable.getCheckedFilters();
               } else {
                 if (isReload) {
-                  this.pendingRecords = [];
                   $xetable.clearAll();
                 } else {
                   sortList = $xetable.getSortColumns();
@@ -739,9 +722,7 @@ var _default2 = {
                   _this5.tableLoading = true;
                   return Promise.resolve((beforeDelete || _ajaxMethods).apply(void 0, _toConsumableArray(_applyArgs))).then(function (rest) {
                     _this5.tableLoading = false;
-                    _this5.pendingRecords = _this5.pendingRecords.filter(function (row) {
-                      return removeRecords.indexOf(row) === -1;
-                    });
+                    $xetable.setPendingRow(removeRecords, false);
                     if (isMsg) {
                       // 检测弹窗模块
                       if (process.env.NODE_ENV === 'development') {
@@ -808,9 +789,7 @@ var _default2 = {
           {
             var _ajaxMethods2 = ajax.save;
             if (_ajaxMethods2) {
-              var _body = Object.assign({
-                pendingRecords: this.pendingRecords
-              }, this.getRecordset());
+              var _body = this.getRecordset();
               var insertRecords = _body.insertRecords,
                 _removeRecords = _body.removeRecords,
                 updateRecords = _body.updateRecords,
@@ -849,7 +828,7 @@ var _default2 = {
                   _this5.tableLoading = true;
                   return Promise.resolve((beforeSave || _ajaxMethods2).apply(void 0, _toConsumableArray(_applyArgs2))).then(function (rest) {
                     _this5.tableLoading = false;
-                    _this5.pendingRecords = [];
+                    $xetable.clearPendingRow();
                     if (isMsg) {
                       // 检测弹窗模块
                       if (process.env.NODE_ENV === 'development') {
@@ -986,9 +965,6 @@ var _default2 = {
       });
       return _xeUtils.default.isUndefined(itemIndex) ? itemList : itemList[itemIndex];
     },
-    getPendingRecords: function getPendingRecords() {
-      return this.pendingRecords;
-    },
     triggerToolbarCommitEvent: function triggerToolbarCommitEvent(params, evnt) {
       var _this6 = this;
       var code = params.code;
@@ -1021,28 +997,10 @@ var _default2 = {
       });
     },
     triggerPendingEvent: function triggerPendingEvent(code) {
-      var pendingRecords = this.pendingRecords,
-        isMsg = this.isMsg;
+      var isMsg = this.isMsg;
       var selectRecords = this.getCheckboxRecords();
       if (selectRecords.length) {
-        var plus = [];
-        var minus = [];
-        selectRecords.forEach(function (data) {
-          if (pendingRecords.some(function (item) {
-            return data === item;
-          })) {
-            minus.push(data);
-          } else {
-            plus.push(data);
-          }
-        });
-        if (minus.length) {
-          this.pendingRecords = pendingRecords.filter(function (item) {
-            return minus.indexOf(item) === -1;
-          }).concat(plus);
-        } else if (plus.length) {
-          this.pendingRecords = pendingRecords.concat(plus);
-        }
+        this.togglePendingRow(selectRecords);
         this.clearCheckboxRow();
       } else {
         if (isMsg) {
@@ -1209,8 +1167,10 @@ var _default2 = {
       });
     },
     getProxyInfo: function getProxyInfo() {
-      var sortData = this.sortData,
+      var $refs = this.$refs,
+        sortData = this.sortData,
         proxyConfig = this.proxyConfig;
+      var $xetable = $refs.xTable;
       if (proxyConfig) {
         return {
           data: this.tableData,
@@ -1219,7 +1179,7 @@ var _default2 = {
           sort: sortData.length ? sortData[0] : {},
           sorts: sortData,
           pager: this.tablePage,
-          pendingRecords: this.pendingRecords
+          pendingRecords: $xetable ? $xetable.getPendingRecords() : []
         };
       }
       return null;

package/lib/grid/src/grid.min.js

@@ -1 +1 @@
-"use strict";function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _table=_interopRequireDefault(require("../../table")),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_size=_interopRequireDefault(require("../../mixins/size")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_utils=_interopRequireWildcard(require("../../tools/utils")),_dom=_interopRequireWildcard(require("../../tools/dom")),_event=require("../../tools/event"),_log=require("../../tools/log"),_vn=require("../../tools/vn");function _getRequireWildcardCache(e){var t,r;return"function"!=typeof WeakMap?null:(t=new WeakMap,r=new WeakMap,(_getRequireWildcardCache=function(e){return e?r:t})(e))}function _interopRequireWildcard(e,t){if(!t&&e&&e.__esModule)return e;if(null===e||"object"!==_typeof(e)&&"function"!=typeof e)return{default:e};t=_getRequireWildcardCache(t);if(t&&t.has(e))return t.get(e);var r,o,i={},n=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(r in e)"default"!==r&&Object.prototype.hasOwnProperty.call(e,r)&&((o=n?Object.getOwnPropertyDescriptor(e,r):null)&&(o.get||o.set)?Object.defineProperty(i,r,o):i[r]=e[r]);return i.default=e,t&&t.set(e,i),i}function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_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(e,t){var r;if(e)return"string"==typeof e?_arrayLikeToArray(e,t):"Map"===(r="Object"===(r=Object.prototype.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:r)||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?_arrayLikeToArray(e,t):void 0}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,o=new Array(t);r<t;r++)o[r]=e[r];return o}function ownKeys(t,e){var r,o=Object.keys(t);return Object.getOwnPropertySymbols&&(r=Object.getOwnPropertySymbols(t),e&&(r=r.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),o.push.apply(o,r)),o}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(r),!0).forEach(function(e){_defineProperty(t,e,r[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):ownKeys(Object(r)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,e))})}return t}function _defineProperty(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}var methods={},propKeys=Object.keys(_table.default.props);function renderDefaultForm(e,t){var r,o,i=t.$scopedSlots,n=t.proxyConfig,s=t.proxyOpts,a=t.formData,l=t.formConfig,c=t.formOpts;return(0,_utils.isEnableConf)(l)&&c.items&&c.items.length?(r={},c.inited||(c.inited=!0,o=s.beforeItem,s&&o&&c.items.forEach(function(e){o.call(t,{$grid:t,item:e})})),c.items.forEach(function(e){_xeUtils.default.each(e.slots,function(e){_xeUtils.default.isFunction(e)||i[e]&&(r[e]=i[e])})}),[e("vxe-form",{props:Object.assign({},c,{data:n&&s.form?a:c.data}),on:{submit:t.submitEvent,reset:t.resetEvent,collapse:t.collapseEvent,"submit-invalid":t.submitInvalidEvent},scopedSlots:r})]):[]}function getFuncSlot(e,t,r){e=e.$scopedSlots,t=t[r];if(t){if(!_xeUtils.default.isString(t))return t;if(e[t])return e[t];"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notSlot",[t])}return null}function getToolbarSlots(e){var t=e.$scopedSlots,r=e.toolbarOpts.slots,o={};return"development"===process.env.NODE_ENV&&(!t.buttons||r&&"buttons"===r.buttons||(0,_log.warnLog)("vxe.error.reqProp",["toolbar-config.slots.buttons"]),!t.tools||r&&"tools"===r.tools||(0,_log.warnLog)("vxe.error.reqProp",["toolbar-config.slots.tools"])),r&&(t=getFuncSlot(e,r,"buttons"),e=getFuncSlot(e,r,"tools"),t&&(o.buttons=t),e)&&(o.tools=e),o}function getPagerSlots(e){var t,r=e.pagerOpts.slots,o={};return r&&(t=getFuncSlot(e,r,"left"),e=getFuncSlot(e,r,"right"),t&&(o.left=t),e)&&(o.right=e),o}function getTableOns(i){var e=i.$listeners,t=i.proxyConfig,r=i.proxyOpts,n={};return _xeUtils.default.each(e,function(e,o){n[o]=function(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r];i.$emit.apply(i,[o].concat(t))}}),t&&(r.sort&&(n["sort-change"]=i.sortChangeEvent),r.filter)&&(n["filter-change"]=i.filterChangeEvent),n}Object.keys(_table.default.methods).forEach(function(t){methods[t]=function(){var e;return this.$refs.xTable&&(e=this.$refs.xTable)[t].apply(e,arguments)}});var _default2={name:"VxeGrid",mixins:[_size.default],props:_objectSpread(_objectSpread({},_table.default.props),{},{columns:Array,pagerConfig:[Boolean,Object],proxyConfig:Object,toolbar:[Boolean,Object],toolbarConfig:[Boolean,Object],formConfig:[Boolean,Object],zoomConfig:Object,size:{type:String,default:function(){return _conf.default.grid.size||_conf.default.size}}}),provide:function(){return{$xegrid:this}},data:function(){return{tableLoading:!1,isZMax:!1,tableData:[],pendingRecords:[],filterData:[],formData:{},sortData:[],tZindex:0,tablePage:{total:0,pageSize:_conf.default.pager.pageSize||10,currentPage:1}}},computed:{isMsg:function(){return!1!==this.proxyOpts.message},proxyOpts:function(){return Object.assign({},_conf.default.grid.proxyConfig,this.proxyConfig)},pagerOpts:function(){return Object.assign({},_conf.default.grid.pagerConfig,this.pagerConfig)},formOpts:function(){return Object.assign({},_conf.default.grid.formConfig,this.formConfig)},toolbarOpts:function(){return Object.assign({},_conf.default.grid.toolbarConfig,this.toolbarConfig||this.toolbar)},zoomOpts:function(){return Object.assign({},_conf.default.grid.zoomConfig,this.zoomConfig)},renderStyle:function(){return this.isZMax?{zIndex:this.tZindex}:null},tableExtendProps:function(){var t=this,r={};return propKeys.forEach(function(e){r[e]=t[e]}),r},tableProps:function(){var e=this.isZMax,t=this.seqConfig,r=this.pagerConfig,o=this.loading,i=this.editConfig,n=this.proxyConfig,s=this.proxyOpts,a=this.tableExtendProps,l=this.tableLoading,c=this.tablePage,d=this.tableData,u=Object.assign({},a);return e&&(a.maxHeight?u.maxHeight="auto":u.height="auto"),n&&(u.loading=o||l,u.data=d,u.rowClassName=this.handleRowClassName,s.seq)&&(0,_utils.isEnableConf)(r)&&(u.seqConfig=Object.assign({},t,{startIndex:(c.currentPage-1)*c.pageSize})),i&&(u.editConfig=Object.assign({},i,{beforeEditMethod:this.handleBeforeEditMethod})),u}},watch:{columns:function(e){var t=this;this.$nextTick(function(){return t.loadColumn(e)})},toolbar:function(e){e&&this.initToolbar()},toolbarConfig:function(e){e&&this.initToolbar()},proxyConfig:function(){this.initProxy()},pagerConfig:function(){this.initPages()}},created:function(){var e=this.data,t=this.formOpts,r=this.proxyOpts;this.proxyConfig&&(e||r.form&&t.data)&&(0,_log.errLog)("vxe.error.errConflicts",["grid.data","grid.proxy-config"]),"development"===process.env.NODE_ENV&&(this.toolbar&&(0,_log.warnLog)("vxe.error.delProp",["grid.toolbar","grid.toolbar-config"]),this.toolbarConfig)&&!_xeUtils.default.isObject(this.toolbarConfig)&&(0,_log.warnLog)("vxe.error.errProp",["grid.toolbar-config=".concat(this.toolbarConfig),"grid.toolbar-config={}"]),this.initPages(),_event.GlobalEvent.on(this,"keydown",this.handleGlobalKeydownEvent)},mounted:function(){this.columns&&this.columns.length&&this.loadColumn(this.columns),this.initToolbar(),this.initProxy()},destroyed:function(){_event.GlobalEvent.off(this,"keydown")},render:function(e){var t,r=this.$scopedSlots,o=this.vSize,i=this.isZMax,n=!(!r.form&&!(0,_utils.isEnableConf)(this.formConfig)),s=!!(r.toolbar||(0,_utils.isEnableConf)(this.toolbarConfig)||this.toolbar),a=!(!r.pager&&!(0,_utils.isEnableConf)(this.pagerConfig));return e("div",{class:["vxe-grid",(_defineProperty(t={},"size--".concat(o),o),_defineProperty(t,"is--animat",!!this.animat),_defineProperty(t,"is--round",this.round),_defineProperty(t,"is--maximize",i),_defineProperty(t,"is--loading",this.loading||this.tableLoading),t)],style:this.renderStyle},[n?e("div",{ref:"formWrapper",class:"vxe-grid--form-wrapper"},r.form?r.form.call(this,{$grid:this},e):renderDefaultForm(e,this)):null,s?e("div",{ref:"toolbarWrapper",class:"vxe-grid--toolbar-wrapper"},r.toolbar?r.toolbar.call(this,{$grid:this},e):[e("vxe-toolbar",{props:this.toolbarOpts,ref:"xToolbar",scopedSlots:getToolbarSlots(this)})]):null,r.top?e("div",{ref:"topWrapper",class:"vxe-grid--top-wrapper"},r.top.call(this,{$grid:this},e)):null,e("vxe-table",{props:this.tableProps,on:getTableOns(this),scopedSlots:r,ref:"xTable"}),r.bottom?e("div",{ref:"bottomWrapper",class:"vxe-grid--bottom-wrapper"},r.bottom.call(this,{$grid:this},e)):null,a?e("div",{ref:"pagerWrapper",class:"vxe-grid--pager-wrapper"},r.pager?r.pager.call(this,{$grid:this},e):[e("vxe-pager",{props:_objectSpread(_objectSpread({},this.pagerOpts),this.proxyConfig?this.tablePage:{}),on:{"page-change":this.pageChangeEvent},scopedSlots:getPagerSlots(this)})]):null])},methods:_objectSpread(_objectSpread({},methods),{},{callSlot:function(e,t,r,o){if(e){var i=this.$scopedSlots;if(_xeUtils.default.isString(e)&&(e=i[e]||null),_xeUtils.default.isFunction(e))return(0,_vn.getSlotVNs)(e.call(this,t,r,o))}return[]},getParentHeight:function(){var e=this.$el;return(this.isZMax?_dom.default.getDomNode().visibleHeight:_xeUtils.default.toNumber(getComputedStyle(e.parentNode).height))-this.getExcludeHeight()},getExcludeHeight:function(){var e=this.$refs,t=this.$el,r=this.isZMax,o=this.height,i=e.formWrapper,n=e.toolbarWrapper,s=e.topWrapper,a=e.bottomWrapper,e=e.pagerWrapper;return(r||"auto"!==o?0:(0,_dom.getPaddingTopBottomSize)(t.parentNode))+(0,_dom.getPaddingTopBottomSize)(t)+(0,_dom.getOffsetHeight)(i)+(0,_dom.getOffsetHeight)(n)+(0,_dom.getOffsetHeight)(s)+(0,_dom.getOffsetHeight)(a)+(0,_dom.getOffsetHeight)(e)},handleRowClassName:function(t){var e=this.rowClassName,r=[];return this.pendingRecords.some(function(e){return e===t.row})&&r.push("row--pending"),r.push(e?_xeUtils.default.isFunction(e)?e(t):e:""),r},handleBeforeEditMethod:function(e){var t=this.editConfig,t=t?t.beforeEditMethod||t.activeMethod:null;return-1===this.pendingRecords.indexOf(e.row)&&(!t||t(_objectSpread(_objectSpread({},e),{},{$grid:this})))},initToolbar:function(){var r=this;this.$nextTick(function(){var e=r.$refs,t=e.xTable,e=e.xToolbar;t&&e&&t.connect(e)})},initPages:function(){var e=this.tablePage,t=this.pagerConfig,r=this.pagerOpts,o=r.currentPage,r=r.pageSize;t&&(o&&(e.currentPage=o),r)&&(e.pageSize=r)},initProxy:function(){var i,t=this,e=this.proxyInited,r=this.proxyConfig,o=this.proxyOpts,n=this.formConfig,s=this.formOpts;r&&((0,_utils.isEnableConf)(n)&&o.form&&s.items&&(i={},s.items.forEach(function(e){var t,r=e.field,o=e.itemRender;r&&(t=null,o&&(o=o.defaultValue,_xeUtils.default.isFunction(o)?t=o({item:e}):_xeUtils.default.isUndefined(o)||(t=o)),i[r]=t)}),this.formData=i),e||!1===o.autoLoad||(this.proxyInited=!0,this.$nextTick().then(function(){return t.commitProxy("_init")}).then(function(e){t.$emit("proxy-query",_objectSpread(_objectSpread({},e),{},{isInited:!0,$grid:t,$event:new Event("init")}))})))},handleGlobalKeydownEvent:function(e){27===e.keyCode&&this.isZMax&&!1!==this.zoomOpts.escRestore&&this.triggerZoomEvent(e)},commitProxy:function(t){for(var r,e,o=this,N=this.$refs,L=this.toolbar,k=this.toolbarConfig,z=this.toolbarOpts,i=this.proxyOpts,n=this.tablePage,s=this.pagerConfig,U=this.editRules,a=this.formData,l=this.isMsg,A=i.beforeQuery,c=i.afterQuery,Z=i.beforeDelete,I=i.afterDelete,W=i.beforeSave,V=i.afterSave,d=i.ajax,u=void 0===d?{}:d,d=i.props,f=void 0===d?{}:d,g=N.xTable,p=(_xeUtils.default.isString(t)?(i=k||L?_xeUtils.default.findTree(z.buttons,function(e){return e.code===t},{children:"dropdowns"}):null,r=t,e=i?i.item:null):r=(e=t).code,e?e.params:null),h=arguments.length,m=new Array(1<h?h-1:0),b=1;b<h;b++)m[b-1]=arguments[b];switch(r){case"insert":return this.insert();case"insert_actived":return this.insert().then(function(e){e=e.row;return o.setActiveRow(e)});case"mark_cancel":this.triggerPendingEvent(r);break;case"remove":return this.handleDeleteRow(r,"vxe.grid.removeSelectRecord",function(){return o.removeCheckboxRow()});case"import":this.importData(p);break;case"open_import":this.openImport(p);break;case"export":this.exportData(p);break;case"open_export":this.openExport(p);break;case"reset_custom":this.resetColumn(!0);break;case"_init":case"reload":case"query":var v,_,x,y,O,E=u.query;if(E)return w="_init"===r,q="reload"===r,v=[],_=[],x={},s&&((w||q)&&(n.currentPage=1),(0,_utils.isEnableConf)(s))&&(x=_objectSpread({},n)),w?((y=g.sortOpts.defaultSort)&&(v=(y=_xeUtils.default.isArray(y)?y:[y]).map(function(e){return{field:e.field,property:e.field,order:e.order}})),_=g.getCheckedFilters()):q?(this.pendingRecords=[],g.clearAll()):(v=g.getSortColumns(),_=g.getCheckedFilters()),y={code:r,button:e,isInited:w,isReload:q,$grid:this,page:x,sort:v.length?v[0]:{},sorts:v,filters:_,form:a,options:E},this.sortData=v,this.filterData=_,this.tableLoading=!0,O=[y].concat(m),Promise.resolve((A||E).apply(void 0,_toConsumableArray(O))).then(function(e){var t;return o.tableLoading=!1,e?(0,_utils.isEnableConf)(s)?(t=_xeUtils.default.get(e,f.total||"page.total")||0,n.total=_xeUtils.default.toNumber(t),o.tableData=_xeUtils.default.get(e,f.result||"result")||[],t=Math.max(Math.ceil(t/n.pageSize),1),n.currentPage>t&&(n.currentPage=t)):o.tableData=(f.list?_xeUtils.default.get(e,f.list):e)||[]:o.tableData=[],c&&c.apply(void 0,_toConsumableArray(O)),{status:!0}}).catch(function(){return{status:o.tableLoading=!1}});"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.query"]);break;case"delete":var C=u.delete;if(C){var S=g.getCheckboxRecords(),$=S.filter(function(e){return!g.isInsertByRow(e)}),X=[{$grid:this,code:r,button:e,body:{removeRecords:$},form:a,options:C}].concat(m);if(S.length)return this.handleDeleteRow(r,"vxe.grid.deleteSelectRecord",function(){return $.length?(o.tableLoading=!0,Promise.resolve((Z||C).apply(void 0,_toConsumableArray(X))).then(function(e){return o.tableLoading=!1,o.pendingRecords=o.pendingRecords.filter(function(e){return-1===$.indexOf(e)}),l&&("development"!==process.env.NODE_ENV||_vXETable.default.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_vXETable.default.modal.message({content:o.getRespMsg(e,"vxe.grid.delSuccess"),status:"success"})),I?I.apply(void 0,_toConsumableArray(X)):o.commitProxy("query"),{status:!0}}).catch(function(e){return o.tableLoading=!1,l&&("development"!==process.env.NODE_ENV||_vXETable.default.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_vXETable.default.modal.message({id:r,content:o.getRespMsg(e,"vxe.grid.operError"),status:"error"})),{status:!1}})):g.remove(S)});l&&("development"!==process.env.NODE_ENV||_vXETable.default.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_vXETable.default.modal.message({id:r,content:_conf.default.i18n("vxe.grid.selectOneRecord"),status:"warning"}))}else"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.delete"]);break;case"save":var P,j,F,R,T,D,w,M=u.save;if(M)return P=Object.assign({pendingRecords:this.pendingRecords},this.getRecordset()),j=P.insertRecords,F=P.removeRecords,R=P.updateRecords,T=P.pendingRecords,D=[{$grid:this,code:r,button:e,body:P,form:a,options:M}].concat(m),j.length&&(P.pendingRecords=T.filter(function(e){return-1===j.indexOf(e)})),T.length&&(P.insertRecords=j.filter(function(e){return-1===T.indexOf(e)})),w=Promise.resolve(),(w=U?this.validate(P.insertRecords.concat(R)):w).then(function(e){if(!e)return P.insertRecords.length||F.length||R.length||P.pendingRecords.length?(o.tableLoading=!0,Promise.resolve((W||M).apply(void 0,_toConsumableArray(D))).then(function(e){return o.tableLoading=!1,o.pendingRecords=[],l&&("development"!==process.env.NODE_ENV||_vXETable.default.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_vXETable.default.modal.message({content:o.getRespMsg(e,"vxe.grid.saveSuccess"),status:"success"})),V?V.apply(void 0,_toConsumableArray(D)):o.commitProxy("query"),{status:!0}}).catch(function(e){return o.tableLoading=!1,l&&("development"!==process.env.NODE_ENV||_vXETable.default.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_vXETable.default.modal.message({id:r,content:o.getRespMsg(e,"vxe.grid.operError"),status:"error"})),{status:!1}})):void(l&&("development"!==process.env.NODE_ENV||_vXETable.default.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_vXETable.default.modal.message({id:r,content:_conf.default.i18n("vxe.grid.dataUnchanged"),status:"info"})))});"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.save"]);break;default:var q=_vXETable.default.commands.get(r);q&&(q.commandMethod?q.commandMethod.apply(q,[{code:r,button:e,$grid:this,$table:g}].concat(m)):"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notCommands",[r]))}return this.$nextTick()},getRespMsg:function(e,t){var r,o=this.proxyOpts.props,o=void 0===o?{}:o;return(r=e&&o.message?_xeUtils.default.get(e,o.message):r)||_conf.default.i18n(t)},handleDeleteRow:function(e,t,r){var o=this.getCheckboxRecords();if(this.isMsg){if(o.length)return _vXETable.default.modal.confirm({id:"cfm_".concat(e),content:_conf.default.i18n(t),escClosable:!0}).then(function(e){if("confirm"===e)return r()});"development"!==process.env.NODE_ENV||_vXETable.default.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_vXETable.default.modal.message({id:"msg_".concat(e),content:_conf.default.i18n("vxe.grid.selectOneRecord"),status:"warning"})}else o.length&&r();return Promise.resolve()},getFormItems:function(e){var t=this.formConfig,r=this.formOpts,o=[];return _xeUtils.default.eachTree((0,_utils.isEnableConf)(t)&&r.items?r.items:[],function(e){o.push(e)},{children:"children"}),_xeUtils.default.isUndefined(e)?o:o[e]},getPendingRecords:function(){return this.pendingRecords},triggerToolbarCommitEvent:function(e,t){var r=this,o=e.code;return this.commitProxy(e,t).then(function(e){o&&e&&e.status&&["query","reload","delete","save"].includes(o)&&r.$emit("delete"===o||"save"===o?"proxy-".concat(o):"proxy-query",_objectSpread(_objectSpread({},e),{},{isReload:"reload"===o,$grid:r,$event:t}))})},triggerToolbarBtnEvent:function(e,t){this.triggerToolbarCommitEvent(e,t),this.$emit("toolbar-button-click",{code:e.code,button:e,$grid:this,$event:t})},triggerToolbarTolEvent:function(e,t){this.triggerToolbarCommitEvent(e,t),this.$emit("toolbar-tool-click",{code:e.code,tool:e,$grid:this,$event:t})},triggerPendingEvent:function(e){var r,o,i=this.pendingRecords,t=this.isMsg,n=this.getCheckboxRecords();n.length?(r=[],o=[],n.forEach(function(t){(i.some(function(e){return t===e})?o:r).push(t)}),o.length?this.pendingRecords=i.filter(function(e){return-1===o.indexOf(e)}).concat(r):r.length&&(this.pendingRecords=i.concat(r)),this.clearCheckboxRow()):t&&("development"!==process.env.NODE_ENV||_vXETable.default.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_vXETable.default.modal.message({id:e,content:_conf.default.i18n("vxe.grid.selectOneRecord"),status:"warning"}))},pageChangeEvent:function(t){var r=this,e=this.proxyConfig,o=this.tablePage,i=t.currentPage,n=t.pageSize;o.currentPage=i,o.pageSize=n,this.$emit("page-change",Object.assign({$grid:this},t)),e&&this.commitProxy("query").then(function(e){r.$emit("proxy-query",_objectSpread(_objectSpread({},e),{},{$grid:r,$event:t.$event}))})},sortChangeEvent:function(t){var r=this,e=t.$table,o=t.column,i=t.sortList;(_xeUtils.default.isBoolean(o.remoteSort)?o.remoteSort:e.sortOpts.remote)&&(this.sortData=i,this.proxyConfig)&&(this.tablePage.currentPage=1,this.commitProxy("query").then(function(e){r.$emit("proxy-query",_objectSpread(_objectSpread({},e),{},{$grid:r,$event:t.$event}))})),this.$emit("sort-change",Object.assign({$grid:this},t))},filterChangeEvent:function(t){var r=this,e=t.$table,o=t.filterList;e.filterOpts.remote&&(this.filterData=o,this.proxyConfig)&&(this.tablePage.currentPage=1,this.commitProxy("query").then(function(e){r.$emit("proxy-query",_objectSpread(_objectSpread({},e),{},{$grid:r,$event:t.$event}))})),this.$emit("filter-change",Object.assign({$grid:this},t))},submitEvent:function(t){var r=this;this.proxyConfig&&this.commitProxy("reload").then(function(e){r.$emit("proxy-query",_objectSpread(_objectSpread({},e),{},{isReload:!0,$grid:r,$event:t.$event}))}),this.$emit("form-submit",Object.assign({$grid:this},t))},resetEvent:function(t){var r=this;this.proxyConfig&&this.commitProxy("reload").then(function(e){r.$emit("proxy-query",_objectSpread(_objectSpread({},e),{},{isReload:!0,$grid:r,$event:t.$event}))}),this.$emit("form-reset",Object.assign({$grid:this},t))},submitInvalidEvent:function(e){this.$emit("form-submit-invalid",Object.assign({$grid:this},e))},collapseEvent:function(e){var t=this;this.$nextTick(function(){return t.recalculate(!0)}),this.$emit("form-toggle-collapse",Object.assign({$grid:this},e)),this.$emit("form-collapse",Object.assign({$grid:this},e))},triggerZoomEvent:function(e){this.zoom(),this.$emit("zoom",{$grid:this,type:this.isZMax?"max":"revert",$event:e})},zoom:function(){return this[this.isZMax?"revert":"maximize"]()},isMaximized:function(){return this.isZMax},maximize:function(){return this.handleZoom(!0)},revert:function(){return this.handleZoom()},handleZoom:function(e){var t=this,r=this.isZMax;return(e?!r:r)&&(this.isZMax=!r,this.tZindex<_utils.default.getLastZIndex())&&(this.tZindex=_utils.default.nextZIndex()),this.$nextTick().then(function(){return t.recalculate(!0)}).then(function(){return t.isZMax})},getProxyInfo:function(){var e=this.sortData;return this.proxyConfig?{data:this.tableData,filter:this.filterData,form:this.formData,sort:e.length?e[0]:{},sorts:e,pager:this.tablePage,pendingRecords:this.pendingRecords}:null}},"development"===process.env.NODE_ENV?{loadColumn:function(e){var t=this.$scopedSlots;return _xeUtils.default.eachTree(e,function(e){e.slots&&_xeUtils.default.each(e.slots,function(e){_xeUtils.default.isFunction(e)||t[e]||(0,_log.errLog)("vxe.error.notSlot",[e])})}),this.$refs.xTable.loadColumn(e)},reloadColumn:function(e){return this.clearAll(),this.loadColumn(e)}}:null)};exports.default=_default2;
+"use strict";function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _table=_interopRequireDefault(require("../../table")),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_size=_interopRequireDefault(require("../../mixins/size")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_utils=_interopRequireWildcard(require("../../tools/utils")),_dom=_interopRequireWildcard(require("../../tools/dom")),_event=require("../../tools/event"),_log=require("../../tools/log"),_vn=require("../../tools/vn");function _getRequireWildcardCache(e){var t,r;return"function"!=typeof WeakMap?null:(t=new WeakMap,r=new WeakMap,(_getRequireWildcardCache=function(e){return e?r:t})(e))}function _interopRequireWildcard(e,t){if(!t&&e&&e.__esModule)return e;if(null===e||"object"!==_typeof(e)&&"function"!=typeof e)return{default:e};t=_getRequireWildcardCache(t);if(t&&t.has(e))return t.get(e);var r,o,i={},n=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(r in e)"default"!==r&&Object.prototype.hasOwnProperty.call(e,r)&&((o=n?Object.getOwnPropertyDescriptor(e,r):null)&&(o.get||o.set)?Object.defineProperty(i,r,o):i[r]=e[r]);return i.default=e,t&&t.set(e,i),i}function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_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(e,t){var r;if(e)return"string"==typeof e?_arrayLikeToArray(e,t):"Map"===(r="Object"===(r=Object.prototype.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:r)||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?_arrayLikeToArray(e,t):void 0}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,o=new Array(t);r<t;r++)o[r]=e[r];return o}function ownKeys(t,e){var r,o=Object.keys(t);return Object.getOwnPropertySymbols&&(r=Object.getOwnPropertySymbols(t),e&&(r=r.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),o.push.apply(o,r)),o}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(r),!0).forEach(function(e){_defineProperty(t,e,r[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):ownKeys(Object(r)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,e))})}return t}function _defineProperty(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}var methods={},propKeys=Object.keys(_table.default.props);function renderDefaultForm(e,t){var r,o,i=t.$scopedSlots,n=t.proxyConfig,a=t.proxyOpts,s=t.formData,l=t.formConfig,u=t.formOpts;return(0,_utils.isEnableConf)(l)&&u.items&&u.items.length?(r={},u.inited||(u.inited=!0,o=a.beforeItem,a&&o&&u.items.forEach(function(e){o.call(t,{$grid:t,item:e})})),u.items.forEach(function(e){_xeUtils.default.each(e.slots,function(e){_xeUtils.default.isFunction(e)||i[e]&&(r[e]=i[e])})}),[e("vxe-form",{props:Object.assign({},u,{data:n&&a.form?s:u.data}),on:{submit:t.submitEvent,reset:t.resetEvent,collapse:t.collapseEvent,"submit-invalid":t.submitInvalidEvent},scopedSlots:r})]):[]}function getFuncSlot(e,t,r){e=e.$scopedSlots,t=t[r];if(t){if(!_xeUtils.default.isString(t))return t;if(e[t])return e[t];"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notSlot",[t])}return null}function getToolbarSlots(e){var t=e.$scopedSlots,r=e.toolbarOpts.slots,o={};return"development"===process.env.NODE_ENV&&(!t.buttons||r&&"buttons"===r.buttons||(0,_log.warnLog)("vxe.error.reqProp",["toolbar-config.slots.buttons"]),!t.tools||r&&"tools"===r.tools||(0,_log.warnLog)("vxe.error.reqProp",["toolbar-config.slots.tools"])),r&&(t=getFuncSlot(e,r,"buttons"),e=getFuncSlot(e,r,"tools"),t&&(o.buttons=t),e)&&(o.tools=e),o}function getPagerSlots(e){var t,r=e.pagerOpts.slots,o={};return r&&(t=getFuncSlot(e,r,"left"),e=getFuncSlot(e,r,"right"),t&&(o.left=t),e)&&(o.right=e),o}function getTableOns(i){var e=i.$listeners,t=i.proxyConfig,r=i.proxyOpts,n={};return _xeUtils.default.each(e,function(e,o){n[o]=function(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++)t[r]=arguments[r];i.$emit.apply(i,[o].concat(t))}}),t&&(r.sort&&(n["sort-change"]=i.sortChangeEvent),r.filter)&&(n["filter-change"]=i.filterChangeEvent),n}Object.keys(_table.default.methods).forEach(function(t){methods[t]=function(){var e;return this.$refs.xTable&&(e=this.$refs.xTable)[t].apply(e,arguments)}});var _default2={name:"VxeGrid",mixins:[_size.default],props:_objectSpread(_objectSpread({},_table.default.props),{},{columns:Array,pagerConfig:[Boolean,Object],proxyConfig:Object,toolbar:[Boolean,Object],toolbarConfig:[Boolean,Object],formConfig:[Boolean,Object],zoomConfig:Object,size:{type:String,default:function(){return _conf.default.grid.size||_conf.default.size}}}),provide:function(){return{$xegrid:this}},data:function(){return{tableLoading:!1,isZMax:!1,tableData:[],filterData:[],formData:{},sortData:[],tZindex:0,tablePage:{total:0,pageSize:_conf.default.pager.pageSize||10,currentPage:1}}},computed:{isMsg:function(){return!1!==this.proxyOpts.message},proxyOpts:function(){return Object.assign({},_conf.default.grid.proxyConfig,this.proxyConfig)},pagerOpts:function(){return Object.assign({},_conf.default.grid.pagerConfig,this.pagerConfig)},formOpts:function(){return Object.assign({},_conf.default.grid.formConfig,this.formConfig)},toolbarOpts:function(){return Object.assign({},_conf.default.grid.toolbarConfig,this.toolbarConfig||this.toolbar)},zoomOpts:function(){return Object.assign({},_conf.default.grid.zoomConfig,this.zoomConfig)},renderStyle:function(){return this.isZMax?{zIndex:this.tZindex}:null},tableExtendProps:function(){var t=this,r={};return propKeys.forEach(function(e){r[e]=t[e]}),r},tableProps:function(){var e=this.isZMax,t=this.seqConfig,r=this.pagerConfig,o=this.loading,i=this.editConfig,n=this.proxyConfig,a=this.proxyOpts,s=this.tableExtendProps,l=this.tableLoading,u=this.tablePage,c=this.tableData,d=Object.assign({},s);return e&&(s.maxHeight?d.maxHeight="auto":d.height="auto"),n&&(d.loading=o||l,d.data=c,a.seq)&&(0,_utils.isEnableConf)(r)&&(d.seqConfig=Object.assign({},t,{startIndex:(u.currentPage-1)*u.pageSize})),i&&(d.editConfig=Object.assign({},i)),d}},watch:{columns:function(e){var t=this;this.$nextTick(function(){return t.loadColumn(e)})},toolbar:function(e){e&&this.initToolbar()},toolbarConfig:function(e){e&&this.initToolbar()},proxyConfig:function(){this.initProxy()},pagerConfig:function(){this.initPages()}},created:function(){var e=this.data,t=this.formOpts,r=this.proxyOpts;this.proxyConfig&&(e||r.form&&t.data)&&(0,_log.errLog)("vxe.error.errConflicts",["grid.data","grid.proxy-config"]),"development"===process.env.NODE_ENV&&(this.toolbar&&(0,_log.warnLog)("vxe.error.delProp",["grid.toolbar","grid.toolbar-config"]),this.toolbarConfig)&&!_xeUtils.default.isObject(this.toolbarConfig)&&(0,_log.warnLog)("vxe.error.errProp",["grid.toolbar-config=".concat(this.toolbarConfig),"grid.toolbar-config={}"]),this.initPages(),_event.GlobalEvent.on(this,"keydown",this.handleGlobalKeydownEvent)},mounted:function(){this.columns&&this.columns.length&&this.loadColumn(this.columns),this.initToolbar(),this.initProxy()},destroyed:function(){_event.GlobalEvent.off(this,"keydown")},render:function(e){var t,r=this.$scopedSlots,o=this.vSize,i=this.isZMax,n=!(!r.form&&!(0,_utils.isEnableConf)(this.formConfig)),a=!!(r.toolbar||(0,_utils.isEnableConf)(this.toolbarConfig)||this.toolbar),s=!(!r.pager&&!(0,_utils.isEnableConf)(this.pagerConfig));return e("div",{class:["vxe-grid",(_defineProperty(t={},"size--".concat(o),o),_defineProperty(t,"is--animat",!!this.animat),_defineProperty(t,"is--round",this.round),_defineProperty(t,"is--maximize",i),_defineProperty(t,"is--loading",this.loading||this.tableLoading),t)],style:this.renderStyle},[n?e("div",{ref:"formWrapper",class:"vxe-grid--form-wrapper"},r.form?r.form.call(this,{$grid:this},e):renderDefaultForm(e,this)):null,a?e("div",{ref:"toolbarWrapper",class:"vxe-grid--toolbar-wrapper"},r.toolbar?r.toolbar.call(this,{$grid:this},e):[e("vxe-toolbar",{props:this.toolbarOpts,ref:"xToolbar",scopedSlots:getToolbarSlots(this)})]):null,r.top?e("div",{ref:"topWrapper",class:"vxe-grid--top-wrapper"},r.top.call(this,{$grid:this},e)):null,e("vxe-table",{props:this.tableProps,on:getTableOns(this),scopedSlots:r,ref:"xTable"}),r.bottom?e("div",{ref:"bottomWrapper",class:"vxe-grid--bottom-wrapper"},r.bottom.call(this,{$grid:this},e)):null,s?e("div",{ref:"pagerWrapper",class:"vxe-grid--pager-wrapper"},r.pager?r.pager.call(this,{$grid:this},e):[e("vxe-pager",{props:_objectSpread(_objectSpread({},this.pagerOpts),this.proxyConfig?this.tablePage:{}),on:{"page-change":this.pageChangeEvent},scopedSlots:getPagerSlots(this)})]):null])},methods:_objectSpread(_objectSpread({},methods),{},{callSlot:function(e,t,r,o){if(e){var i=this.$scopedSlots;if(_xeUtils.default.isString(e)&&(e=i[e]||null),_xeUtils.default.isFunction(e))return(0,_vn.getSlotVNs)(e.call(this,t,r,o))}return[]},getParentHeight:function(){var e=this.$el;return(this.isZMax?_dom.default.getDomNode().visibleHeight:_xeUtils.default.toNumber(getComputedStyle(e.parentNode).height))-this.getExcludeHeight()},getExcludeHeight:function(){var e=this.$refs,t=this.$el,r=this.isZMax,o=this.height,i=e.formWrapper,n=e.toolbarWrapper,a=e.topWrapper,s=e.bottomWrapper,e=e.pagerWrapper;return(r||"auto"!==o?0:(0,_dom.getPaddingTopBottomSize)(t.parentNode))+(0,_dom.getPaddingTopBottomSize)(t)+(0,_dom.getOffsetHeight)(i)+(0,_dom.getOffsetHeight)(n)+(0,_dom.getOffsetHeight)(a)+(0,_dom.getOffsetHeight)(s)+(0,_dom.getOffsetHeight)(e)},initToolbar:function(){var r=this;this.$nextTick(function(){var e=r.$refs,t=e.xTable,e=e.xToolbar;t&&e&&t.connect(e)})},initPages:function(){var e=this.tablePage,t=this.pagerConfig,r=this.pagerOpts,o=r.currentPage,r=r.pageSize;t&&(o&&(e.currentPage=o),r)&&(e.pageSize=r)},initProxy:function(){var i,t=this,e=this.proxyInited,r=this.proxyConfig,o=this.proxyOpts,n=this.formConfig,a=this.formOpts;r&&((0,_utils.isEnableConf)(n)&&o.form&&a.items&&(i={},a.items.forEach(function(e){var t,r=e.field,o=e.itemRender;r&&(t=null,o&&(o=o.defaultValue,_xeUtils.default.isFunction(o)?t=o({item:e}):_xeUtils.default.isUndefined(o)||(t=o)),i[r]=t)}),this.formData=i),e||!1===o.autoLoad||(this.proxyInited=!0,this.$nextTick().then(function(){return t.commitProxy("_init")}).then(function(e){t.$emit("proxy-query",_objectSpread(_objectSpread({},e),{},{isInited:!0,$grid:t,$event:new Event("init")}))})))},handleGlobalKeydownEvent:function(e){27===e.keyCode&&this.isZMax&&!1!==this.zoomOpts.escRestore&&this.triggerZoomEvent(e)},commitProxy:function(t){for(var r,e,o=this,L=this.$refs,k=this.toolbar,N=this.toolbarConfig,z=this.toolbarOpts,i=this.proxyOpts,n=this.tablePage,a=this.pagerConfig,U=this.editRules,s=this.formData,l=this.isMsg,A=i.beforeQuery,u=i.afterQuery,Z=i.beforeDelete,I=i.afterDelete,W=i.beforeSave,V=i.afterSave,c=i.ajax,d=void 0===c?{}:c,c=i.props,f=void 0===c?{}:c,g=L.xTable,p=(_xeUtils.default.isString(t)?(i=N||k?_xeUtils.default.findTree(z.buttons,function(e){return e.code===t},{children:"dropdowns"}):null,r=t,e=i?i.item:null):r=(e=t).code,e?e.params:null),h=arguments.length,m=new Array(1<h?h-1:0),b=1;b<h;b++)m[b-1]=arguments[b];switch(r){case"insert":return this.insert();case"insert_edit":return this.insert().then(function(e){e=e.row;return o.setEditRow(e)});case"insert_actived":return this.insert().then(function(e){e=e.row;return o.setEditRow(e)});case"mark_cancel":this.triggerPendingEvent(r);break;case"remove":return this.handleDeleteRow(r,"vxe.grid.removeSelectRecord",function(){return o.removeCheckboxRow()});case"import":this.importData(p);break;case"open_import":this.openImport(p);break;case"export":this.exportData(p);break;case"open_export":this.openExport(p);break;case"reset_custom":this.resetColumn(!0);break;case"_init":case"reload":case"query":var v,_,x,y,O,E=d.query;if(E)return w="_init"===r,M="reload"===r,v=[],_=[],x={},a&&((w||M)&&(n.currentPage=1),(0,_utils.isEnableConf)(a))&&(x=_objectSpread({},n)),w?((y=g.sortOpts.defaultSort)&&(v=(y=_xeUtils.default.isArray(y)?y:[y]).map(function(e){return{field:e.field,property:e.field,order:e.order}})),_=g.getCheckedFilters()):M?g.clearAll():(v=g.getSortColumns(),_=g.getCheckedFilters()),y={code:r,button:e,isInited:w,isReload:M,$grid:this,page:x,sort:v.length?v[0]:{},sorts:v,filters:_,form:s,options:E},this.sortData=v,this.filterData=_,this.tableLoading=!0,O=[y].concat(m),Promise.resolve((A||E).apply(void 0,_toConsumableArray(O))).then(function(e){var t;return o.tableLoading=!1,e?(0,_utils.isEnableConf)(a)?(t=_xeUtils.default.get(e,f.total||"page.total")||0,n.total=_xeUtils.default.toNumber(t),o.tableData=_xeUtils.default.get(e,f.result||"result")||[],t=Math.max(Math.ceil(t/n.pageSize),1),n.currentPage>t&&(n.currentPage=t)):o.tableData=(f.list?_xeUtils.default.get(e,f.list):e)||[]:o.tableData=[],u&&u.apply(void 0,_toConsumableArray(O)),{status:!0}}).catch(function(){return{status:o.tableLoading=!1}});"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.query"]);break;case"delete":var C=d.delete;if(C){var $=g.getCheckboxRecords(),S=$.filter(function(e){return!g.isInsertByRow(e)}),X=[{$grid:this,code:r,button:e,body:{removeRecords:S},form:s,options:C}].concat(m);if($.length)return this.handleDeleteRow(r,"vxe.grid.deleteSelectRecord",function(){return S.length?(o.tableLoading=!0,Promise.resolve((Z||C).apply(void 0,_toConsumableArray(X))).then(function(e){return o.tableLoading=!1,g.setPendingRow(S,!1),l&&("development"!==process.env.NODE_ENV||_vXETable.default.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_vXETable.default.modal.message({content:o.getRespMsg(e,"vxe.grid.delSuccess"),status:"success"})),I?I.apply(void 0,_toConsumableArray(X)):o.commitProxy("query"),{status:!0}}).catch(function(e){return o.tableLoading=!1,l&&("development"!==process.env.NODE_ENV||_vXETable.default.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_vXETable.default.modal.message({id:r,content:o.getRespMsg(e,"vxe.grid.operError"),status:"error"})),{status:!1}})):g.remove($)});l&&("development"!==process.env.NODE_ENV||_vXETable.default.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_vXETable.default.modal.message({id:r,content:_conf.default.i18n("vxe.grid.selectOneRecord"),status:"warning"}))}else"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.delete"]);break;case"save":var P,j,F,T,D,R,w,q=d.save;if(q)return P=this.getRecordset(),j=P.insertRecords,F=P.removeRecords,T=P.updateRecords,D=P.pendingRecords,R=[{$grid:this,code:r,button:e,body:P,form:s,options:q}].concat(m),j.length&&(P.pendingRecords=D.filter(function(e){return-1===j.indexOf(e)})),D.length&&(P.insertRecords=j.filter(function(e){return-1===D.indexOf(e)})),w=Promise.resolve(),(w=U?this.validate(P.insertRecords.concat(T)):w).then(function(e){if(!e)return P.insertRecords.length||F.length||T.length||P.pendingRecords.length?(o.tableLoading=!0,Promise.resolve((W||q).apply(void 0,_toConsumableArray(R))).then(function(e){return o.tableLoading=!1,g.clearPendingRow(),l&&("development"!==process.env.NODE_ENV||_vXETable.default.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_vXETable.default.modal.message({content:o.getRespMsg(e,"vxe.grid.saveSuccess"),status:"success"})),V?V.apply(void 0,_toConsumableArray(R)):o.commitProxy("query"),{status:!0}}).catch(function(e){return o.tableLoading=!1,l&&("development"!==process.env.NODE_ENV||_vXETable.default.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_vXETable.default.modal.message({id:r,content:o.getRespMsg(e,"vxe.grid.operError"),status:"error"})),{status:!1}})):void(l&&("development"!==process.env.NODE_ENV||_vXETable.default.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_vXETable.default.modal.message({id:r,content:_conf.default.i18n("vxe.grid.dataUnchanged"),status:"info"})))});"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.save"]);break;default:var M=_vXETable.default.commands.get(r);M&&(M.commandMethod?M.commandMethod.apply(M,[{code:r,button:e,$grid:this,$table:g}].concat(m)):"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notCommands",[r]))}return this.$nextTick()},getRespMsg:function(e,t){var r,o=this.proxyOpts.props,o=void 0===o?{}:o;return(r=e&&o.message?_xeUtils.default.get(e,o.message):r)||_conf.default.i18n(t)},handleDeleteRow:function(e,t,r){var o=this.getCheckboxRecords();if(this.isMsg){if(o.length)return _vXETable.default.modal.confirm({id:"cfm_".concat(e),content:_conf.default.i18n(t),escClosable:!0}).then(function(e){if("confirm"===e)return r()});"development"!==process.env.NODE_ENV||_vXETable.default.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_vXETable.default.modal.message({id:"msg_".concat(e),content:_conf.default.i18n("vxe.grid.selectOneRecord"),status:"warning"})}else o.length&&r();return Promise.resolve()},getFormItems:function(e){var t=this.formConfig,r=this.formOpts,o=[];return _xeUtils.default.eachTree((0,_utils.isEnableConf)(t)&&r.items?r.items:[],function(e){o.push(e)},{children:"children"}),_xeUtils.default.isUndefined(e)?o:o[e]},triggerToolbarCommitEvent:function(e,t){var r=this,o=e.code;return this.commitProxy(e,t).then(function(e){o&&e&&e.status&&["query","reload","delete","save"].includes(o)&&r.$emit("delete"===o||"save"===o?"proxy-".concat(o):"proxy-query",_objectSpread(_objectSpread({},e),{},{isReload:"reload"===o,$grid:r,$event:t}))})},triggerToolbarBtnEvent:function(e,t){this.triggerToolbarCommitEvent(e,t),this.$emit("toolbar-button-click",{code:e.code,button:e,$grid:this,$event:t})},triggerToolbarTolEvent:function(e,t){this.triggerToolbarCommitEvent(e,t),this.$emit("toolbar-tool-click",{code:e.code,tool:e,$grid:this,$event:t})},triggerPendingEvent:function(e){var t=this.isMsg,r=this.getCheckboxRecords();r.length?(this.togglePendingRow(r),this.clearCheckboxRow()):t&&("development"!==process.env.NODE_ENV||_vXETable.default.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_vXETable.default.modal.message({id:e,content:_conf.default.i18n("vxe.grid.selectOneRecord"),status:"warning"}))},pageChangeEvent:function(t){var r=this,e=this.proxyConfig,o=this.tablePage,i=t.currentPage,n=t.pageSize;o.currentPage=i,o.pageSize=n,this.$emit("page-change",Object.assign({$grid:this},t)),e&&this.commitProxy("query").then(function(e){r.$emit("proxy-query",_objectSpread(_objectSpread({},e),{},{$grid:r,$event:t.$event}))})},sortChangeEvent:function(t){var r=this,e=t.$table,o=t.column,i=t.sortList;(_xeUtils.default.isBoolean(o.remoteSort)?o.remoteSort:e.sortOpts.remote)&&(this.sortData=i,this.proxyConfig)&&(this.tablePage.currentPage=1,this.commitProxy("query").then(function(e){r.$emit("proxy-query",_objectSpread(_objectSpread({},e),{},{$grid:r,$event:t.$event}))})),this.$emit("sort-change",Object.assign({$grid:this},t))},filterChangeEvent:function(t){var r=this,e=t.$table,o=t.filterList;e.filterOpts.remote&&(this.filterData=o,this.proxyConfig)&&(this.tablePage.currentPage=1,this.commitProxy("query").then(function(e){r.$emit("proxy-query",_objectSpread(_objectSpread({},e),{},{$grid:r,$event:t.$event}))})),this.$emit("filter-change",Object.assign({$grid:this},t))},submitEvent:function(t){var r=this;this.proxyConfig&&this.commitProxy("reload").then(function(e){r.$emit("proxy-query",_objectSpread(_objectSpread({},e),{},{isReload:!0,$grid:r,$event:t.$event}))}),this.$emit("form-submit",Object.assign({$grid:this},t))},resetEvent:function(t){var r=this;this.proxyConfig&&this.commitProxy("reload").then(function(e){r.$emit("proxy-query",_objectSpread(_objectSpread({},e),{},{isReload:!0,$grid:r,$event:t.$event}))}),this.$emit("form-reset",Object.assign({$grid:this},t))},submitInvalidEvent:function(e){this.$emit("form-submit-invalid",Object.assign({$grid:this},e))},collapseEvent:function(e){var t=this;this.$nextTick(function(){return t.recalculate(!0)}),this.$emit("form-toggle-collapse",Object.assign({$grid:this},e)),this.$emit("form-collapse",Object.assign({$grid:this},e))},triggerZoomEvent:function(e){this.zoom(),this.$emit("zoom",{$grid:this,type:this.isZMax?"max":"revert",$event:e})},zoom:function(){return this[this.isZMax?"revert":"maximize"]()},isMaximized:function(){return this.isZMax},maximize:function(){return this.handleZoom(!0)},revert:function(){return this.handleZoom()},handleZoom:function(e){var t=this,r=this.isZMax;return(e?!r:r)&&(this.isZMax=!r,this.tZindex<_utils.default.getLastZIndex())&&(this.tZindex=_utils.default.nextZIndex()),this.$nextTick().then(function(){return t.recalculate(!0)}).then(function(){return t.isZMax})},getProxyInfo:function(){var e=this.$refs,t=this.sortData,r=this.proxyConfig,e=e.xTable;return r?{data:this.tableData,filter:this.filterData,form:this.formData,sort:t.length?t[0]:{},sorts:t,pager:this.tablePage,pendingRecords:e?e.getPendingRecords():[]}:null}},"development"===process.env.NODE_ENV?{loadColumn:function(e){var t=this.$scopedSlots;return _xeUtils.default.eachTree(e,function(e){e.slots&&_xeUtils.default.each(e.slots,function(e){_xeUtils.default.isFunction(e)||t[e]||(0,_log.errLog)("vxe.error.notSlot",[e])})}),this.$refs.xTable.loadColumn(e)},reloadColumn:function(e){return this.clearAll(),this.loadColumn(e)}}:null)};exports.default=_default2;

package/lib/grid/style/style.css

@@ -52,24 +52,6 @@
   padding: 0.5em 1em;
   background-color: #fff;
 }
-.vxe-grid .vxe-body--row.row--pending {
-  color: #f56c6c;
-  text-decoration: line-through;
-  cursor: no-drop;
-}
-.vxe-grid .vxe-body--row.row--pending .vxe-body--column {
-  position: relative;
-}
-.vxe-grid .vxe-body--row.row--pending .vxe-body--column:after {
-  content: "";
-  position: absolute;
-  top: 50%;
-  left: 0;
-  width: 100%;
-  height: 0;
-  border-bottom: 1px solid #f56c6c;
-  z-index: 1;
-}
 .vxe-grid .vxe-grid--form-wrapper,
 .vxe-grid .vxe-grid--top-wrapper,
 .vxe-grid .vxe-grid--bottom-wrapper {

package/lib/grid/style/style.min.css

@@ -1 +1 @@
-.vxe-grid{position:relative}.vxe-grid.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:99;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:rgba(255,255,255,.5)}.vxe-grid.is--loading>.vxe-table .vxe-loading{background-color:transparent}.vxe-grid.is--maximize{position:fixed;top:0;left:0;width:100%;height:100%;padding:.5em 1em;background-color:#fff}.vxe-grid .vxe-body--row.row--pending{color:#f56c6c;text-decoration:line-through;cursor:no-drop}.vxe-grid .vxe-body--row.row--pending .vxe-body--column{position:relative}.vxe-grid .vxe-body--row.row--pending .vxe-body--column:after{content:"";position:absolute;top:50%;left:0;width:100%;height:0;border-bottom:1px solid #f56c6c;z-index:1}.vxe-grid .vxe-grid--bottom-wrapper,.vxe-grid .vxe-grid--form-wrapper,.vxe-grid .vxe-grid--top-wrapper{position:relative}.vxe-grid{font-size:14px}.vxe-grid.size--medium{font-size:14px}.vxe-grid.size--small{font-size:13px}.vxe-grid.size--mini{font-size:12px}
+.vxe-grid{position:relative}.vxe-grid.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:99;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:rgba(255,255,255,.5)}.vxe-grid.is--loading>.vxe-table .vxe-loading{background-color:transparent}.vxe-grid.is--maximize{position:fixed;top:0;left:0;width:100%;height:100%;padding:.5em 1em;background-color:#fff}.vxe-grid .vxe-grid--bottom-wrapper,.vxe-grid .vxe-grid--form-wrapper,.vxe-grid .vxe-grid--top-wrapper{position:relative}.vxe-grid{font-size:14px}.vxe-grid.size--medium{font-size:14px}.vxe-grid.size--small{font-size:13px}.vxe-grid.size--mini{font-size:12px}