vxe-table 3.4.12-beta.2 → 3.4.12

package/lib/edit/src/mixin.js

@@ -35,22 +35,28 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       fullDataRowIdData = _vm.fullDataRowIdData,
       fullAllDataRowIdData = _vm.fullAllDataRowIdData,
       treeOpts = _vm.treeOpts;
+  var rowField = treeOpts.rowField,
+      parentField = treeOpts.parentField,
+      children = treeOpts.children,
+      mapChildren = treeOpts.mapChildren;
   var funcName = isAppend ? 'push' : 'unshift';
   newRecords.forEach(function (item) {
-    var parentRowId = item[treeOpts.parentField];
+    var parentRowId = item[parentField];
     var rowid = getRowid(_vm, item);
     var matchObj = parentRowId ? _xeUtils.default.findTree(tableFullTreeData, function (item) {
-      return parentRowId === item[treeOpts.rowField];
-    }, treeOpts) : null;
+      return parentRowId === item[rowField];
+    }, {
+      children: mapChildren
+    }) : null;
 
     if (matchObj) {
       var parentRow = matchObj.item;
       var parentRest = fullAllDataRowIdData[getRowid(_vm, parentRow)];
       var parentLevel = parentRest ? parentRest.level : 0;
-      var parentChilds = parentRow[treeOpts.children];
+      var parentChilds = parentRow[children];
 
       if (!_xeUtils.default.isArray(parentChilds)) {
-        parentChilds = parentRow[treeOpts.children] = [];
+        parentChilds = parentRow[children] = [];
       }
 
       parentChilds[funcName](item);
@@ -125,7 +131,9 @@ var _default = {
           fullDataRowIdData = this.fullDataRowIdData,
           fullAllDataRowIdData = this.fullAllDataRowIdData,
           treeOpts = this.treeOpts;
-      var transform = treeOpts.transform;
+      var transform = treeOpts.transform,
+          rowField = treeOpts.rowField,
+          mapChildren = treeOpts.mapChildren;
 
       if (!_xeUtils.default.isArray(records)) {
         records = [records];
@@ -173,8 +181,10 @@ var _default = {
           // 如果为虚拟树
           if (treeConfig && transform) {
             var matchObj = _xeUtils.default.findTree(tableFullTreeData, function (item) {
-              return row[treeOpts.rowField] === item[treeOpts.rowField];
-            }, treeOpts);
+              return row[rowField] === item[rowField];
+            }, {
+              children: mapChildren
+            });
 
             if (matchObj) {
               var parentRow = matchObj.parent;
@@ -186,14 +196,14 @@ var _default = {
 
                 if (process.env.NODE_ENV === 'development') {
                   if (item[treeOpts.parentField]) {
-                    if (parentRow && item[treeOpts.parentField] !== parentRow[treeOpts.rowField]) {
-                      _tools.UtilTools.error('vxe.error.errProp', ["".concat(treeOpts.parentField, "=").concat(item[treeOpts.parentField]), "".concat(treeOpts.parentField, "=").concat(parentRow[treeOpts.rowField])]);
+                    if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
+                      _tools.UtilTools.error('vxe.error.errProp', ["".concat(treeOpts.parentField, "=").concat(item[treeOpts.parentField]), "".concat(treeOpts.parentField, "=").concat(parentRow[rowField])]);
                     }
                   }
                 }
 
                 if (parentRow) {
-                  item[treeOpts.parentField] = parentRow[treeOpts.rowField];
+                  item[treeOpts.parentField] = parentRow[rowField];
                 }
 
                 parentChilds.splice(matchObj.index + i, 0, item);
@@ -223,7 +233,15 @@ var _default = {
               throw new Error(_tools.UtilTools.getLog('vxe.error.noTree', ['insert']));
             }
 
-            var afIndex = afterFullData.indexOf(row);
+            var afIndex = -1; // 如果是可视索引
+
+            if (_xeUtils.default.isNumber(row)) {
+              if (row < afterFullData.length) {
+                afIndex = row;
+              }
+            } else {
+              afIndex = afterFullData.indexOf(row);
+            }
 
             if (afIndex === -1) {
               throw new Error(_tools.UtilTools.error('vxe.error.unableInsert'));

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_tools=require("../../tools"),_dom=require("../../tools/src/dom");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){if(e){if("string"==typeof e)return _arrayLikeToArray(e,t);var r=Object.prototype.toString.call(e).slice(8,-1);return"Map"===(r="Object"===r&&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}var getRowid=_tools.UtilTools.getRowid;function insertTreeRow(n,e,t){var s=n.tableFullTreeData,a=n.afterFullData,c=n.fullDataRowIdData,u=n.fullAllDataRowIdData,d=n.treeOpts,h=t?"push":"unshift";e.forEach(function(e){var t,r,o=e[d.parentField],l=getRowid(n,e),i=o?_xeUtils.default.findTree(s,function(e){return o===e[d.rowField]},d):null;i?(t=i.item,i=(r=u[getRowid(n,t)])?r.level:0,r=t[d.children],(r=!_xeUtils.default.isArray(r)?t[d.children]=[]:r)[h](e),i={row:e,rowid:l,seq:-1,index:-1,_index:-1,$index:-1,items:r,parent:parent,level:i+1},c[l]=i,u[l]=i):("development"===process.env.NODE_ENV&&o&&_tools.UtilTools.warn("vxe.error.unableInsert"),a[h](e),s[h](e),e={row:e,rowid:l,seq:-1,index:-1,_index:-1,$index:-1,items:s,parent:null,level:0},c[l]=e,u[l]=e)})}var _default={methods:{_insert:function(e){return this.insertAt(e)},_insertAt:function(e,t){var o=this,r=this.tableFullTreeData,l=this.mergeList,i=this.afterFullData,n=this.editStore,s=this.tableFullData,a=this.treeConfig,c=this.fullDataRowIdData,u=this.fullAllDataRowIdData,d=this.treeOpts,h=d.transform,f=(e=!_xeUtils.default.isArray(e)?[e]:e).map(function(e){return o.defineField(Object.assign({},e))});if(t)if(-1===t)a&&h?insertTreeRow(this,f,!0):(i.push.apply(i,_toConsumableArray(f)),s.push.apply(s,_toConsumableArray(f)),l.forEach(function(e){var t=e.row,r=e.rowspan;t+r>i.length&&(e.rowspan=r+f.length)}));else if(a&&h){var m,p,v,w=_xeUtils.default.findTree(r,function(e){return t[d.rowField]===e[d.rowField]},d);w?(m=w.parent,p=w.items,r=u[getRowid(this,m)],v=r?r.level:0,f.forEach(function(e,t){var r=getRowid(o,e);"development"===process.env.NODE_ENV&&e[d.parentField]&&m&&e[d.parentField]!==m[d.rowField]&&_tools.UtilTools.error("vxe.error.errProp",["".concat(d.parentField,"=").concat(e[d.parentField]),"".concat(d.parentField,"=").concat(m[d.rowField])]),m&&(e[d.parentField]=m[d.rowField]),p.splice(w.index+t,0,e);e={row:e,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,items:p,parent:m,level:v+1};c[r]=e,u[r]=e})):("development"===process.env.NODE_ENV&&_tools.UtilTools.warn("vxe.error.unableInsert"),insertTreeRow(this,f,!0))}else{if(a)throw new Error(_tools.UtilTools.getLog("vxe.error.noTree",["insert"]));var _=i.indexOf(t);if(-1===_)throw new Error(_tools.UtilTools.error("vxe.error.unableInsert"));i.splice.apply(i,[_,0].concat(_toConsumableArray(f))),s.splice.apply(s,[s.indexOf(t),0].concat(_toConsumableArray(f))),l.forEach(function(e){var t=e.row,r=e.rowspan;_<t?e.row=t+f.length:_<t+r&&(e.rowspan=r+f.length)})}else a&&h?insertTreeRow(this,f,!1):(i.unshift.apply(i,_toConsumableArray(f)),s.unshift.apply(s,_toConsumableArray(f)),l.forEach(function(e){var t=e.row;0<t&&(e.row=t+f.length)}));return(n=n.insertList).unshift.apply(n,_toConsumableArray(f)),this.handleTableData(a&&h),a&&h||this.updateAfterDataIndex(),this.updateFooter(),this.cacheRowMap(),this.checkSelectionStatus(),this.scrollYLoad&&this.updateScrollYSpace(),this.$nextTick().then(function(){return o.updateCellAreas(),o.recalculate()}).then(function(){return{row:f.length?f[f.length-1]:null,rows:f}})},_remove:function(e){var o=this,l=this.afterFullData,r=this.tableFullData,i=this.tableFullTreeData,t=this.treeConfig,n=this.mergeList,s=this.editStore,a=this.checkboxOpts,c=this.selection,u=this.isInsertByRow,d=this.treeOpts,h=d.transform,f=s.actived,m=s.removeList,p=s.insertList,a=a.checkField,v=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=r,e.forEach(function(e){u(e)||m.push(e)}),a||e.forEach(function(e){e=c.indexOf(e);-1<e&&c.splice(e,1)}),r===e?(e=v=r.slice(0),this.tableFullData=[],this.afterFullData=[],this.clearMergeCells()):t&&h?e.forEach(function(e){var t=getRowid(o,e),r=_xeUtils.default.findTree(i,function(e){return t===getRowid(o,e)},d);r&&(r=r.items.splice(r.index,1),v.push(r[0]));e=l.indexOf(e);-1<e&&l.splice(e,1)}):e.forEach(function(e){var t=r.indexOf(e);-1<t&&(t=r.splice(t,1),v.push(t[0]));var o=l.indexOf(e);-1<o&&(n.forEach(function(e){var t=e.row,r=e.rowspan;o<t?e.row=t-1:o<t+r&&(e.rowspan=r-1)}),l.splice(o,1))}),f.row&&-1<e.indexOf(f.row)&&this.clearActived(),e.forEach(function(e){e=p.indexOf(e);-1<e&&p.splice(e,1)}),this.handleTableData(t&&h),t&&h||this.updateAfterDataIndex(),this.updateFooter(),this.cacheRowMap(),this.checkSelectionStatus(),this.scrollYLoad&&this.updateScrollYSpace(),this.$nextTick().then(function(){return o.updateCellAreas(),o.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()}},_getInsertRecords:function(){var r=this,e=this.treeConfig,o=this.tableFullTreeData,t=this.tableFullData,l=this.treeOpts,i=this.editStore.insertList,n=[];return i.length&&(e&&l.transform?i.forEach(function(e){var t=getRowid(r,e);_xeUtils.default.findTree(o,function(e){return t===getRowid(r,e)},l)&&n.push(e)}):i.forEach(function(e){-1<t.indexOf(e)&&n.push(e)})),n},_getRemoveRecords:function(){return this.editStore.removeList},_getUpdateRecords:function(){var e=this.keepSource,t=this.tableFullData,r=this.isUpdateByRow,o=this.treeConfig,l=this.treeOpts,i=this.editStore;if(e){e=i.actived,i=e.row,e=e.column;return(i||e)&&this._syncActivedCell(),o?_xeUtils.default.filterTree(t,function(e){return r(e)},l):t.filter(function(e){return r(e)})}return[]},handleActived:function(e,t){var r,o=this,l=this.editStore,i=this.editOpts,n=this.tableColumn,s=this.editConfig,a=this.mouseConfig,c=i.mode,u=i.activeMethod,d=l.actived,h=e.row,f=e.column,i=f.editRender,l=e.cell=e.cell||this.getCell(h,f);return(0,_tools.isEnableConf)(s)&&(0,_tools.isEnableConf)(i)&&l&&(d.row!==h||"cell"===c&&d.column!==f?(r="edit-disabled",u&&!u(e)||(a&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),this.closeTooltip(),this.clearActived(t),r="edit-actived",f.renderHeight=l.offsetHeight,d.args=e,d.row=h,d.column=f,"row"===c?n.forEach(function(e){return o._getColumnModel(h,e)}):this._getColumnModel(h,f),this.$nextTick(function(){o.handleFocus(e,t)})),this.emitEvent(r,{row:h,rowIndex:this.getRowIndex(h),$rowIndex:this.getVMRowIndex(h),column:f,columnIndex:this.getColumnIndex(f),$columnIndex:this.getVMColumnIndex(f)},t)):(r=d.column,a&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),r!==f&&((a=r.model).update&&_tools.UtilTools.setCellValue(h,r,a.value),this.clearValidate()),f.renderHeight=l.offsetHeight,d.args=e,d.column=f,setTimeout(function(){o.handleFocus(e,t)})),this.focus()),this.$nextTick()},_getColumnModel:function(e,t){var r=t.model;t.editRender&&(r.value=_tools.UtilTools.getCellValue(e,t),r.update=!1)},_setColumnModel:function(e,t){var r=t.model;t.editRender&&r.update&&(_tools.UtilTools.setCellValue(e,t,r.value),r.update=!1,r.value=null)},_syncActivedCell:function(){var t=this,e=this.tableColumn,r=this.editStore,o=this.editOpts,r=r.actived,l=r.row,r=r.column;(l||r)&&("row"===o.mode?e.forEach(function(e){return t._setColumnModel(l,e)}):this._setColumnModel(l,r))},_clearActived:function(e){var t=this.editStore.actived,r=t.row,o=t.column;return(r||o)&&(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:o,columnIndex:this.getColumnIndex(o),$columnIndex:this.getVMColumnIndex(o)},e)),(_vXETable.default._valid?this.clearValidate():this.$nextTick()).then(this.recalculate)},_getActiveRecord:function(){var e=this.$el,t=this.editStore,r=this.afterFullData,o=t.actived,t=o.args,o=o.row;return t&&-1<r.indexOf(o)&&e.querySelectorAll(".vxe-body--column.col--actived").length?Object.assign({},t):null},_isActiveByRow:function(e){return this.editStore.actived.row===e},handleFocus:function(e){var t,r,o=e.row,l=e.column,i=e.cell,n=l.editRender;(0,_tools.isEnableConf)(n)&&(t=_vXETable.default.renderer.get(n.name),e=n.autofocus,n=n.autoselect,(r=!(r=e?i.querySelector(e):r)&&t&&t.autofocus?i.querySelector(t.autofocus):r)?(r.focus(),n?r.select():_dom.browse.msie&&((r=r.createTextRange()).collapse(!1),r.select())):this.scrollToRow(o,l))},_setActiveRow:function(e){return this.setActiveCell(e,_xeUtils.default.find(this.visibleColumn,function(e){return(0,_tools.isEnableConf)(e.editRender)}))},_setActiveCell:function(t,e){var r=this,o=this.editConfig,l=_xeUtils.default.isString(e)?this.getColumnByField(e):e;return t&&l&&(0,_tools.isEnableConf)(o)&&(0,_tools.isEnableConf)(l.editRender)?this.scrollToRow(t,!0).then(function(){var e=r.getCell(t,l);e&&(r.handleActived({row:t,rowIndex:r.getRowIndex(t),column:l,columnIndex:r.getColumnIndex(l),cell:e,$table:r}),r.lastCallTime=Date.now())}):this.$nextTick()},_setSelectCell:function(e,t){var r=this.tableData,o=this.editOpts,l=this.visibleColumn,t=_xeUtils.default.isString(t)?this.getColumnByField(t):t;return e&&t&&"manual"!==o.trigger&&(-1<(o=r.indexOf(e))&&(r=this.getCell(e,t),r={row:e,rowIndex:o,column:t,columnIndex:l.indexOf(t),cell:r},this.handleSelected(r,{}))),this.$nextTick()},handleSelected:function(e,t){var r=this,o=this.mouseConfig,l=this.mouseOpts,i=this.editOpts,n=this.editStore,s=n.actived,a=n.selected,c=e.row,u=e.column,d=o&&l.selected;return!d||a.row===c&&a.column===u||(s.row!==c||"cell"===i.mode&&s.column!==u)&&(r.clearActived(t),r.clearSelected(t),r.clearCellAreas(t),r.clearCopyCellArea(t),a.args=e,a.row=c,a.column=u,d&&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 _tools.DomTools.removeClass(e,"col--title-selected")})},reColSdCls:function(){var e=this.$el.querySelector(".col--selected");e&&_tools.DomTools.removeClass(e,"col--selected")},addColSdCls:function(){var e=this.editStore.selected,t=e.row,e=e.column;this.reColSdCls(),t&&e&&((e=this.getCell(t,e))&&_tools.DomTools.addClass(e,"col--selected"))}}};exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_tools=require("../../tools"),_dom=require("../../tools/src/dom");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){if(e){if("string"==typeof e)return _arrayLikeToArray(e,t);var r=Object.prototype.toString.call(e).slice(8,-1);return"Map"===(r="Object"===r&&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}var getRowid=_tools.UtilTools.getRowid;function insertTreeRow(n,e,t){var s=n.tableFullTreeData,a=n.afterFullData,u=n.fullDataRowIdData,c=n.fullAllDataRowIdData,r=n.treeOpts,d=r.rowField,h=r.parentField,f=r.children,m=r.mapChildren,p=t?"push":"unshift";e.forEach(function(e){var t,r,o=e[h],l=getRowid(n,e),i=o?_xeUtils.default.findTree(s,function(e){return o===e[d]},{children:m}):null;i?(t=i.item,i=(r=c[getRowid(n,t)])?r.level:0,r=t[f],(r=!_xeUtils.default.isArray(r)?t[f]=[]:r)[p](e),i={row:e,rowid:l,seq:-1,index:-1,_index:-1,$index:-1,items:r,parent:parent,level:i+1},u[l]=i,c[l]=i):("development"===process.env.NODE_ENV&&o&&_tools.UtilTools.warn("vxe.error.unableInsert"),a[p](e),s[p](e),e={row:e,rowid:l,seq:-1,index:-1,_index:-1,$index:-1,items:s,parent:null,level:0},u[l]=e,c[l]=e)})}var _default={methods:{_insert:function(e){return this.insertAt(e)},_insertAt:function(e,t){var o=this,r=this.tableFullTreeData,l=this.mergeList,i=this.afterFullData,n=this.editStore,s=this.tableFullData,a=this.treeConfig,u=this.fullDataRowIdData,c=this.fullAllDataRowIdData,d=this.treeOpts,h=d.transform,f=d.rowField,m=d.mapChildren,p=(e=!_xeUtils.default.isArray(e)?[e]:e).map(function(e){return o.defineField(Object.assign({},e))});if(t)if(-1===t)a&&h?insertTreeRow(this,p,!0):(i.push.apply(i,_toConsumableArray(p)),s.push.apply(s,_toConsumableArray(p)),l.forEach(function(e){var t=e.row,r=e.rowspan;t+r>i.length&&(e.rowspan=r+p.length)}));else if(a&&h){var v,w,_,C=_xeUtils.default.findTree(r,function(e){return t[f]===e[f]},{children:m});C?(v=C.parent,w=C.items,m=c[getRowid(this,v)],_=m?m.level:0,p.forEach(function(e,t){var r=getRowid(o,e);"development"===process.env.NODE_ENV&&e[d.parentField]&&v&&e[d.parentField]!==v[f]&&_tools.UtilTools.error("vxe.error.errProp",["".concat(d.parentField,"=").concat(e[d.parentField]),"".concat(d.parentField,"=").concat(v[f])]),v&&(e[d.parentField]=v[f]),w.splice(C.index+t,0,e);e={row:e,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,items:w,parent:v,level:_+1};u[r]=e,c[r]=e})):("development"===process.env.NODE_ENV&&_tools.UtilTools.warn("vxe.error.unableInsert"),insertTreeRow(this,p,!0))}else{if(a)throw new Error(_tools.UtilTools.getLog("vxe.error.noTree",["insert"]));var g=-1;if(_xeUtils.default.isNumber(t)?t<i.length&&(g=t):g=i.indexOf(t),-1===g)throw new Error(_tools.UtilTools.error("vxe.error.unableInsert"));i.splice.apply(i,[g,0].concat(_toConsumableArray(p))),s.splice.apply(s,[s.indexOf(t),0].concat(_toConsumableArray(p))),l.forEach(function(e){var t=e.row,r=e.rowspan;g<t?e.row=t+p.length:g<t+r&&(e.rowspan=r+p.length)})}else a&&h?insertTreeRow(this,p,!1):(i.unshift.apply(i,_toConsumableArray(p)),s.unshift.apply(s,_toConsumableArray(p)),l.forEach(function(e){var t=e.row;0<t&&(e.row=t+p.length)}));return(n=n.insertList).unshift.apply(n,_toConsumableArray(p)),this.handleTableData(a&&h),a&&h||this.updateAfterDataIndex(),this.updateFooter(),this.cacheRowMap(),this.checkSelectionStatus(),this.scrollYLoad&&this.updateScrollYSpace(),this.$nextTick().then(function(){return o.updateCellAreas(),o.recalculate()}).then(function(){return{row:p.length?p[p.length-1]:null,rows:p}})},_remove:function(e){var o=this,l=this.afterFullData,r=this.tableFullData,i=this.tableFullTreeData,t=this.treeConfig,n=this.mergeList,s=this.editStore,a=this.checkboxOpts,u=this.selection,c=this.isInsertByRow,d=this.treeOpts,h=d.transform,f=s.actived,m=s.removeList,p=s.insertList,a=a.checkField,v=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=r,e.forEach(function(e){c(e)||m.push(e)}),a||e.forEach(function(e){e=u.indexOf(e);-1<e&&u.splice(e,1)}),r===e?(e=v=r.slice(0),this.tableFullData=[],this.afterFullData=[],this.clearMergeCells()):t&&h?e.forEach(function(e){var t=getRowid(o,e),r=_xeUtils.default.findTree(i,function(e){return t===getRowid(o,e)},d);r&&(r=r.items.splice(r.index,1),v.push(r[0]));e=l.indexOf(e);-1<e&&l.splice(e,1)}):e.forEach(function(e){var t=r.indexOf(e);-1<t&&(t=r.splice(t,1),v.push(t[0]));var o=l.indexOf(e);-1<o&&(n.forEach(function(e){var t=e.row,r=e.rowspan;o<t?e.row=t-1:o<t+r&&(e.rowspan=r-1)}),l.splice(o,1))}),f.row&&-1<e.indexOf(f.row)&&this.clearActived(),e.forEach(function(e){e=p.indexOf(e);-1<e&&p.splice(e,1)}),this.handleTableData(t&&h),t&&h||this.updateAfterDataIndex(),this.updateFooter(),this.cacheRowMap(),this.checkSelectionStatus(),this.scrollYLoad&&this.updateScrollYSpace(),this.$nextTick().then(function(){return o.updateCellAreas(),o.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()}},_getInsertRecords:function(){var r=this,e=this.treeConfig,o=this.tableFullTreeData,t=this.tableFullData,l=this.treeOpts,i=this.editStore.insertList,n=[];return i.length&&(e&&l.transform?i.forEach(function(e){var t=getRowid(r,e);_xeUtils.default.findTree(o,function(e){return t===getRowid(r,e)},l)&&n.push(e)}):i.forEach(function(e){-1<t.indexOf(e)&&n.push(e)})),n},_getRemoveRecords:function(){return this.editStore.removeList},_getUpdateRecords:function(){var e=this.keepSource,t=this.tableFullData,r=this.isUpdateByRow,o=this.treeConfig,l=this.treeOpts,i=this.editStore;if(e){e=i.actived,i=e.row,e=e.column;return(i||e)&&this._syncActivedCell(),o?_xeUtils.default.filterTree(t,function(e){return r(e)},l):t.filter(function(e){return r(e)})}return[]},handleActived:function(e,t){var r,o=this,l=this.editStore,i=this.editOpts,n=this.tableColumn,s=this.editConfig,a=this.mouseConfig,u=i.mode,c=i.activeMethod,d=l.actived,h=e.row,f=e.column,i=f.editRender,l=e.cell=e.cell||this.getCell(h,f);return(0,_tools.isEnableConf)(s)&&(0,_tools.isEnableConf)(i)&&l&&(d.row!==h||"cell"===u&&d.column!==f?(r="edit-disabled",c&&!c(e)||(a&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),this.closeTooltip(),this.clearActived(t),r="edit-actived",f.renderHeight=l.offsetHeight,d.args=e,d.row=h,d.column=f,"row"===u?n.forEach(function(e){return o._getColumnModel(h,e)}):this._getColumnModel(h,f),this.$nextTick(function(){o.handleFocus(e,t)})),this.emitEvent(r,{row:h,rowIndex:this.getRowIndex(h),$rowIndex:this.getVMRowIndex(h),column:f,columnIndex:this.getColumnIndex(f),$columnIndex:this.getVMColumnIndex(f)},t)):(r=d.column,a&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),r!==f&&((a=r.model).update&&_tools.UtilTools.setCellValue(h,r,a.value),this.clearValidate()),f.renderHeight=l.offsetHeight,d.args=e,d.column=f,setTimeout(function(){o.handleFocus(e,t)})),this.focus()),this.$nextTick()},_getColumnModel:function(e,t){var r=t.model;t.editRender&&(r.value=_tools.UtilTools.getCellValue(e,t),r.update=!1)},_setColumnModel:function(e,t){var r=t.model;t.editRender&&r.update&&(_tools.UtilTools.setCellValue(e,t,r.value),r.update=!1,r.value=null)},_syncActivedCell:function(){var t=this,e=this.tableColumn,r=this.editStore,o=this.editOpts,r=r.actived,l=r.row,r=r.column;(l||r)&&("row"===o.mode?e.forEach(function(e){return t._setColumnModel(l,e)}):this._setColumnModel(l,r))},_clearActived:function(e){var t=this.editStore.actived,r=t.row,o=t.column;return(r||o)&&(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:o,columnIndex:this.getColumnIndex(o),$columnIndex:this.getVMColumnIndex(o)},e)),(_vXETable.default._valid?this.clearValidate():this.$nextTick()).then(this.recalculate)},_getActiveRecord:function(){var e=this.$el,t=this.editStore,r=this.afterFullData,o=t.actived,t=o.args,o=o.row;return t&&-1<r.indexOf(o)&&e.querySelectorAll(".vxe-body--column.col--actived").length?Object.assign({},t):null},_isActiveByRow:function(e){return this.editStore.actived.row===e},handleFocus:function(e){var t,r,o=e.row,l=e.column,i=e.cell,n=l.editRender;(0,_tools.isEnableConf)(n)&&(t=_vXETable.default.renderer.get(n.name),e=n.autofocus,n=n.autoselect,(r=!(r=e?i.querySelector(e):r)&&t&&t.autofocus?i.querySelector(t.autofocus):r)?(r.focus(),n?r.select():_dom.browse.msie&&((r=r.createTextRange()).collapse(!1),r.select())):this.scrollToRow(o,l))},_setActiveRow:function(e){return this.setActiveCell(e,_xeUtils.default.find(this.visibleColumn,function(e){return(0,_tools.isEnableConf)(e.editRender)}))},_setActiveCell:function(t,e){var r=this,o=this.editConfig,l=_xeUtils.default.isString(e)?this.getColumnByField(e):e;return t&&l&&(0,_tools.isEnableConf)(o)&&(0,_tools.isEnableConf)(l.editRender)?this.scrollToRow(t,!0).then(function(){var e=r.getCell(t,l);e&&(r.handleActived({row:t,rowIndex:r.getRowIndex(t),column:l,columnIndex:r.getColumnIndex(l),cell:e,$table:r}),r.lastCallTime=Date.now())}):this.$nextTick()},_setSelectCell:function(e,t){var r=this.tableData,o=this.editOpts,l=this.visibleColumn,t=_xeUtils.default.isString(t)?this.getColumnByField(t):t;return e&&t&&"manual"!==o.trigger&&(-1<(o=r.indexOf(e))&&(r=this.getCell(e,t),r={row:e,rowIndex:o,column:t,columnIndex:l.indexOf(t),cell:r},this.handleSelected(r,{}))),this.$nextTick()},handleSelected:function(e,t){var r=this,o=this.mouseConfig,l=this.mouseOpts,i=this.editOpts,n=this.editStore,s=n.actived,a=n.selected,u=e.row,c=e.column,d=o&&l.selected;return!d||a.row===u&&a.column===c||(s.row!==u||"cell"===i.mode&&s.column!==c)&&(r.clearActived(t),r.clearSelected(t),r.clearCellAreas(t),r.clearCopyCellArea(t),a.args=e,a.row=u,a.column=c,d&&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 _tools.DomTools.removeClass(e,"col--title-selected")})},reColSdCls:function(){var e=this.$el.querySelector(".col--selected");e&&_tools.DomTools.removeClass(e,"col--selected")},addColSdCls:function(){var e=this.editStore.selected,t=e.row,e=e.column;this.reColSdCls(),t&&e&&((e=this.getCell(t,e))&&_tools.DomTools.addClass(e,"col--selected"))}}};exports.default=_default;

package/lib/grid/src/grid.js

@@ -356,7 +356,7 @@ var _default2 = {
         proxyConfig = this.proxyConfig;
 
     if (proxyConfig && (data || proxyOpts.form && formOpts.data)) {
-      console.error('[vxe-grid] There is a conflict between the props proxy-config and data.');
+      _tools.UtilTools.error('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config']);
     }
 
     if (process.env.NODE_ENV === 'development') {

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

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

package/lib/index.umd.js

@@ -9801,14 +9801,14 @@ function getChangeEvent(renderOpts) {
   return 'change';
 }
 
-function parseDate(value, props) {
+function renderer_parseDate(value, props) {
   return value && props.valueFormat ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(value, props.valueFormat) : value;
 }
 
 function getFormatDate(value, props, defaultFormat) {
   var _props$dateConfig = props.dateConfig,
       dateConfig = _props$dateConfig === void 0 ? {} : _props$dateConfig;
-  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toDateString(parseDate(value, props), dateConfig.labelFormat || defaultFormat);
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toDateString(renderer_parseDate(value, props), dateConfig.labelFormat || defaultFormat);
 }
 
 function getLabelFormatDate(value, props) {
@@ -14227,16 +14227,23 @@ var Methods = {
         afterFullData = this.afterFullData,
         treeConfig = this.treeConfig,
         treeOpts = this.treeOpts,
-        checkboxOpts = this.checkboxOpts;
+        checkboxOpts = this.checkboxOpts,
+        tableFullTreeData = this.tableFullTreeData,
+        afterTreeFullData = this.afterTreeFullData;
+    var transform = treeOpts.transform,
+        children = treeOpts.children,
+        mapChildren = treeOpts.mapChildren;
     var property = checkboxOpts.checkField;
-    var currTableData = isFull ? tableFullData : afterFullData;
+    var currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
     var rowList = [];
 
     if (property) {
       if (treeConfig) {
         rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.filterTree(currTableData, function (row) {
           return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, property);
-        }, treeOpts);
+        }, {
+          children: transform ? mapChildren : children
+        });
       } else {
         rowList = currTableData.filter(function (row) {
           return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, property);
@@ -14248,7 +14255,9 @@ var Methods = {
       if (treeConfig) {
         rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.filterTree(currTableData, function (row) {
           return selection.indexOf(row) > -1;
-        }, treeOpts);
+        }, {
+          children: transform ? mapChildren : children
+        });
       } else {
         rowList = currTableData.filter(function (row) {
           return selection.indexOf(row) > -1;
@@ -21468,22 +21477,28 @@ function insertTreeRow(_vm, newRecords, isAppend) {
       fullDataRowIdData = _vm.fullDataRowIdData,
       fullAllDataRowIdData = _vm.fullAllDataRowIdData,
       treeOpts = _vm.treeOpts;
+  var rowField = treeOpts.rowField,
+      parentField = treeOpts.parentField,
+      children = treeOpts.children,
+      mapChildren = treeOpts.mapChildren;
   var funcName = isAppend ? 'push' : 'unshift';
   newRecords.forEach(function (item) {
-    var parentRowId = item[treeOpts.parentField];
+    var parentRowId = item[parentField];
     var rowid = mixin_getRowid(_vm, item);
     var matchObj = parentRowId ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableFullTreeData, function (item) {
-      return parentRowId === item[treeOpts.rowField];
-    }, treeOpts) : null;
+      return parentRowId === item[rowField];
+    }, {
+      children: mapChildren
+    }) : null;
 
     if (matchObj) {
       var parentRow = matchObj.item;
       var parentRest = fullAllDataRowIdData[mixin_getRowid(_vm, parentRow)];
       var parentLevel = parentRest ? parentRest.level : 0;
-      var parentChilds = parentRow[treeOpts.children];
+      var parentChilds = parentRow[children];
 
       if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(parentChilds)) {
-        parentChilds = parentRow[treeOpts.children] = [];
+        parentChilds = parentRow[children] = [];
       }
 
       parentChilds[funcName](item);
@@ -21554,7 +21569,9 @@ function insertTreeRow(_vm, newRecords, isAppend) {
           fullDataRowIdData = this.fullDataRowIdData,
           fullAllDataRowIdData = this.fullAllDataRowIdData,
           treeOpts = this.treeOpts;
-      var transform = treeOpts.transform;
+      var transform = treeOpts.transform,
+          rowField = treeOpts.rowField,
+          mapChildren = treeOpts.mapChildren;
 
       if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(records)) {
         records = [records];
@@ -21602,8 +21619,10 @@ function insertTreeRow(_vm, newRecords, isAppend) {
           // 如果为虚拟树
           if (treeConfig && transform) {
             var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableFullTreeData, function (item) {
-              return row[treeOpts.rowField] === item[treeOpts.rowField];
-            }, treeOpts);
+              return row[rowField] === item[rowField];
+            }, {
+              children: mapChildren
+            });
 
             if (matchObj) {
               var parentRow = matchObj.parent;
@@ -21616,7 +21635,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
                 if (false) {}
 
                 if (parentRow) {
-                  item[treeOpts.parentField] = parentRow[treeOpts.rowField];
+                  item[treeOpts.parentField] = parentRow[rowField];
                 }
 
                 parentChilds.splice(matchObj.index + i, 0, item);
@@ -21644,7 +21663,15 @@ function insertTreeRow(_vm, newRecords, isAppend) {
               throw new Error(UtilTools.getLog('vxe.error.noTree', ['insert']));
             }
 
-            var afIndex = afterFullData.indexOf(row);
+            var afIndex = -1; // 如果是可视索引
+
+            if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isNumber(row)) {
+              if (row < afterFullData.length) {
+                afIndex = row;
+              }
+            } else {
+              afIndex = afterFullData.indexOf(row);
+            }
 
             if (afIndex === -1) {
               throw new Error(UtilTools.error('vxe.error.unableInsert'));
@@ -24519,18 +24546,11 @@ function renderExtraSuffixIcon(h, _vm) {
     dateValue: function dateValue() {
       var value = this.value,
           isDatePickerType = this.isDatePickerType,
-          type = this.type,
           dateValueFormat = this.dateValueFormat;
       var val = null;
 
       if (value && isDatePickerType) {
-        var date;
-
-        if (type === 'time') {
-          date = toStringTimeDate(value);
-        } else {
-          date = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(value, dateValueFormat);
-        }
+        var date = this.parseDate(value, dateValueFormat);
 
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isValidDate(date)) {
           val = date;
@@ -25165,6 +25185,15 @@ function renderExtraSuffixIcon(h, _vm) {
         $event: evnt
       });
     },
+    parseDate: function parseDate(value, format) {
+      var type = this.type;
+
+      if (type === 'time') {
+        return toStringTimeDate(value);
+      }
+
+      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(value, format);
+    },
 
     /**
      * 检查初始值
@@ -25239,13 +25268,7 @@ function renderExtraSuffixIcon(h, _vm) {
           if (inputValue) {
             if (type === 'week' || type === 'quarter') {// 周和季度选择器不支持解析，无需处理
             } else {
-              var inpDateVal;
-
-              if (type === 'time') {
-                inpDateVal = toStringTimeDate(inputValue);
-              } else {
-                inpDateVal = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(inputValue, dateLabelFormat);
-              }
+              var inpDateVal = this.parseDate(inputValue, dateLabelFormat);
 
               if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isValidDate(inpDateVal)) {
                 if (type === 'time') {
@@ -25673,11 +25696,7 @@ function renderExtraSuffixIcon(h, _vm) {
       var dLabel = '';
 
       if (date) {
-        if (type === 'time') {
-          dValue = toStringTimeDate(date);
-        } else {
-          dValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(date, valueFormat);
-        }
+        dValue = this.parseDate(date, valueFormat);
       }
 
       if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isValidDate(dValue)) {
@@ -32192,7 +32211,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
         proxyConfig = this.proxyConfig;
 
     if (proxyConfig && (data || proxyOpts.form && formOpts.data)) {
-      console.error('[vxe-grid] There is a conflict between the props proxy-config and data.');
+      UtilTools.error('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config']);
     }
 
     if (false) {}