vxe-table 3.3.14 → 3.4.0

package/lib/grid/src/grid.js

@@ -27,13 +27,13 @@ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread n
 
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
@@ -827,6 +827,13 @@ var _default2 = {
                     });
 
                     if (isMsg) {
+                      // 检测弹窗模块
+                      if (process.env.NODE_ENV === 'development') {
+                        if (!_vXETable.default.modal) {
+                          _tools.UtilTools.error('vxe.error.reqModule', ['Modal']);
+                        }
+                      }
+
                       _vXETable.default.modal.message({
                         content: _this5.getRespMsg(rest, 'vxe.grid.delSuccess'),
                         status: 'success'
@@ -842,6 +849,13 @@ var _default2 = {
                     _this5.tableLoading = false;
 
                     if (isMsg) {
+                      // 检测弹窗模块
+                      if (process.env.NODE_ENV === 'development') {
+                        if (!_vXETable.default.modal) {
+                          _tools.UtilTools.error('vxe.error.reqModule', ['Modal']);
+                        }
+                      }
+
                       _vXETable.default.modal.message({
                         id: code,
                         content: _this5.getRespMsg(rest, 'vxe.grid.operError'),
@@ -852,6 +866,13 @@ var _default2 = {
                 });
               } else {
                 if (isMsg) {
+                  // 检测弹窗模块
+                  if (process.env.NODE_ENV === 'development') {
+                    if (!_vXETable.default.modal) {
+                      _tools.UtilTools.error('vxe.error.reqModule', ['Modal']);
+                    }
+                  }
+
                   _vXETable.default.modal.message({
                     id: code,
                     content: _conf.default.i18n('vxe.grid.selectOneRecord'),
@@ -913,6 +934,13 @@ var _default2 = {
                     _this5.pendingRecords = [];
 
                     if (isMsg) {
+                      // 检测弹窗模块
+                      if (process.env.NODE_ENV === 'development') {
+                        if (!_vXETable.default.modal) {
+                          _tools.UtilTools.error('vxe.error.reqModule', ['Modal']);
+                        }
+                      }
+
                       _vXETable.default.modal.message({
                         content: _this5.getRespMsg(rest, 'vxe.grid.saveSuccess'),
                         status: 'success'
@@ -928,6 +956,13 @@ var _default2 = {
                     _this5.tableLoading = false;
 
                     if (isMsg) {
+                      // 检测弹窗模块
+                      if (process.env.NODE_ENV === 'development') {
+                        if (!_vXETable.default.modal) {
+                          _tools.UtilTools.error('vxe.error.reqModule', ['Modal']);
+                        }
+                      }
+
                       _vXETable.default.modal.message({
                         id: code,
                         content: _this5.getRespMsg(rest, 'vxe.grid.operError'),
@@ -937,6 +972,13 @@ var _default2 = {
                   });
                 } else {
                   if (isMsg) {
+                    // 检测弹窗模块
+                    if (process.env.NODE_ENV === 'development') {
+                      if (!_vXETable.default.modal) {
+                        _tools.UtilTools.error('vxe.error.reqModule', ['Modal']);
+                      }
+                    }
+
                     _vXETable.default.modal.message({
                       id: code,
                       content: _conf.default.i18n('vxe.grid.dataUnchanged'),
@@ -999,6 +1041,13 @@ var _default2 = {
             }
           });
         } else {
+          // 检测弹窗模块
+          if (process.env.NODE_ENV === 'development') {
+            if (!_vXETable.default.modal) {
+              _tools.UtilTools.error('vxe.error.reqModule', ['Modal']);
+            }
+          }
+
           _vXETable.default.modal.message({
             id: "msg_".concat(code),
             content: _conf.default.i18n('vxe.grid.selectOneRecord'),
@@ -1076,6 +1125,13 @@ var _default2 = {
         this.clearCheckboxRow();
       } else {
         if (isMsg) {
+          // 检测弹窗模块
+          if (process.env.NODE_ENV === 'development') {
+            if (!_vXETable.default.modal) {
+              _tools.UtilTools.error('vxe.error.reqModule', ['Modal']);
+            }
+          }
+
           _vXETable.default.modal.message({
             id: code,
             content: _conf.default.i18n('vxe.grid.selectOneRecord'),

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Header=void 0;var _header=_interopRequireDefault(require("./src/header"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var Header=Object.assign(_header.default,{install:function(e){e.component(_header.default.name,_header.default)}}),_default=exports.Header=Header;exports.default=Header;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Header=void 0;var _header=_interopRequireDefault(require("./src/header"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var Header=Object.assign(_header.default,{install:function(e){e.component(_header.default.name,_header.default)}}),_default=exports.Header=Header;exports.default=_default;

package/lib/header/src/header.js

@@ -82,7 +82,8 @@ var _default = {
         overflowX = $xetable.overflowX,
         scrollbarWidth = $xetable.scrollbarWidth,
         sortOpts = $xetable.sortOpts,
-        mouseConfig = $xetable.mouseConfig;
+        mouseConfig = $xetable.mouseConfig,
+        columnOpts = $xetable.columnOpts;
     var tableColumn = this.tableColumn;
     var headerGroups = headerColumn; // 如果是使用优化模式
 
@@ -231,7 +232,7 @@ var _default = {
         /**
          * 列宽拖动
          */
-        !fixedHiddenColumn && !isColGroup && (_xeUtils.default.isBoolean(column.resizable) ? column.resizable : resizable) ? h('div', {
+        !fixedHiddenColumn && !isColGroup && (_xeUtils.default.isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || resizable) ? h('div', {
           class: ['vxe-resizable', {
             'is--line': !border || border === 'none'
           }],

package/lib/header/src/header.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_tools=require("../../tools"),_util=require("./util"),_util2=require("../../table/src/util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,t,l){return t in e?Object.defineProperty(e,t,{value:l,enumerable:!0,configurable:!0,writable:!0}):e[t]=l,e}var cellType="header",_default={name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,size:String,fixedType:String},data:function(){return{headerColumn:[]}},watch:{tableColumn:function(){this.uploadColumn()}},created:function(){this.uploadColumn()},mounted:function(){var e=this.$parent,t=this.$el,l=this.$refs,o=this.fixedType,e=e.elemStore,o="".concat(o||"main","-header-");e["".concat(o,"wrapper")]=t,e["".concat(o,"table")]=l.table,e["".concat(o,"colgroup")]=l.colgroup,e["".concat(o,"list")]=l.thead,e["".concat(o,"xSpace")]=l.xSpace,e["".concat(o,"repair")]=l.repair},render:function(y){var _=this,e=this._e,b=this.$parent,v=this.fixedType,t=this.headerColumn,l=this.fixedColumn,C=b.$listeners,o=b.tId,r=b.isGroup,w=b.resizable,T=b.border,$=b.columnKey,i=b.headerRowClassName,z=b.headerCellClassName,n=b.headerRowStyle,P=b.headerCellStyle,S=b.showHeaderOverflow,M=b.headerAlign,D=b.align,W=b.highlightCurrentColumn,k=b.currentColumn,U=b.scrollXLoad,I=b.overflowX,a=b.scrollbarWidth,R=b.sortOpts,H=b.mouseConfig,s=this.tableColumn,t=t;return r||(t=[s=v&&(U||S)?l:s]),y("div",{class:["vxe-table--header-wrapper",v?"fixed-".concat(v,"--wrapper"):"body--wrapper"],attrs:{xid:o}},[v?e():y("div",{class:"vxe-body--x-space",ref:"xSpace"}),y("table",{class:"vxe-table--header",attrs:{xid:o,cellspacing:0,cellpadding:0,border:0},ref:"table"},[y("colgroup",{ref:"colgroup"},s.map(function(e,t){return y("col",{attrs:{name:e.id},key:t})}).concat(a?[y("col",{attrs:{name:"col_gutter"}})]:[])),y("thead",{ref:"thead"},t.map(function(x,g){return y("tr",{class:["vxe-header--row",i?_xeUtils.default.isFunction(i)?i({$table:b,$rowIndex:g,fixed:v,type:cellType}):i:""],style:n?_xeUtils.default.isFunction(n)?n({$table:b,$rowIndex:g,fixed:v,type:cellType}):n:null},x.map(function(e,t){var l=e.type,o=e.showHeaderOverflow,r=e.headerAlign,i=e.align,n=e.headerClassName,a=e.children&&e.children.length,s=v?e.fixed!==v&&!a:e.fixed&&I,d=_xeUtils.default.isUndefined(o)||_xeUtils.default.isNull(o)?S:o,c=r||i||M||D,u="ellipsis"===d,f="title"===d,p=!0===d||"tooltip"===d,h=f||p||u,o={},r=e.filters&&e.filters.some(function(e){return e.checked}),i=b.getColumnIndex(e),d=b.getVTColumnIndex(e),m={$table:b,$rowIndex:g,column:e,columnIndex:i,$columnIndex:t,_columnIndex:d,fixed:v,type:cellType,isHidden:s,hasFilter:r};return U&&!h&&(u=h=!0),(W||C["header-cell-click"]||"cell"===R.trigger)&&(o.click=function(e){return b.triggerHeaderCellClickEvent(e,m)}),C["header-cell-dblclick"]&&(o.dblclick=function(e){return b.triggerHeaderCellDblclickEvent(e,m)}),H&&(o.mousedown=function(e){return b.triggerHeaderCellMousedownEvent(e,m)}),y("th",{class:["vxe-header--column",e.id,(_defineProperty(d={},"col--".concat(c),c),_defineProperty(d,"col--".concat(l),l),_defineProperty(d,"col--last",t===x.length-1),_defineProperty(d,"col--fixed",e.fixed),_defineProperty(d,"col--group",a),_defineProperty(d,"col--ellipsis",h),_defineProperty(d,"fixed--hidden",s),_defineProperty(d,"is--sortable",e.sortable),_defineProperty(d,"col--filter",!!e.filters),_defineProperty(d,"is--filter-active",r),_defineProperty(d,"col--current",k===e),d),_tools.UtilTools.getClass(n,m),_tools.UtilTools.getClass(z,m)],attrs:{colid:e.id,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null},style:P?_xeUtils.default.isFunction(P)?P(m):P:null,on:o,key:$||a?e.id:t},[y("div",{class:["vxe-cell",{"c--title":f,"c--tooltip":p,"c--ellipsis":u}]},e.renderHeader(y,m)),!s&&!a&&(_xeUtils.default.isBoolean(e.resizable)?e.resizable:w)?y("div",{class:["vxe-resizable",{"is--line":!T||"none"===T}],on:{mousedown:function(e){return _.resizeMousedown(e,m)}}}):null])}).concat(a?[y("th",{class:"vxe-header--gutter col--gutter"})]:[]))}))]),y("div",{class:"vxe-table--header-border-line",ref:"repair"})])},methods:{uploadColumn:function(){var e=this.$parent;this.headerColumn=e.isGroup?(0,_util.convertToRows)(this.tableGroupColumn):[]},resizeMousedown:function(e,t){var l=t.column,o=this.$parent,r=this.$el,i=this.fixedType,n=o.$refs,a=n.tableBody,s=n.leftContainer,d=n.rightContainer,c=n.resizeBar,n=e.target,u=e.clientX,f=t.cell=n.parentNode,p=0,h=a.$el,a=_tools.DomTools.getOffsetPos(n,r),r=n.clientWidth,n=Math.floor(r/2),m=(0,_util2.getColMinWidth)(t)-n,x=a.left-f.clientWidth+r+m,g=a.left+n,y=document.onmousemove,_=document.onmouseup,b="left"===i,v="right"===i,C=0;if(b||v){for(var w=b?"nextElementSibling":"previousElementSibling",T=f[w];T&&!_tools.DomTools.hasClass(T,"fixed--hidden");)_tools.DomTools.hasClass(T,"col--group")||(C+=T.offsetWidth),T=T[w];v&&d&&(g=d.offsetLeft+C)}n=function(e){e.stopPropagation(),e.preventDefault();var t=e.clientX-u,e=g+t,t=i?0:h.scrollLeft;b?e=Math.min(e,(d?d.offsetLeft:h.clientWidth)-C-m):v?(x=(s?s.clientWidth:0)+C+m,e=Math.min(e,g+f.clientWidth-m)):x=Math.max(h.scrollLeft,x),p=Math.max(e,x),c.style.left="".concat(p-t,"px")};o._isResize=!0,_tools.DomTools.addClass(o.$el,"drag--resize"),c.style.display="block",document.onmousemove=n,document.onmouseup=function(e){document.onmousemove=y,document.onmouseup=_,l.resizeWidth=l.renderWidth+(v?g-p:p-g),c.style.display="none",o._isResize=!1,o._lastResizeTime=Date.now(),o.analyColumnWidth(),o.recalculate(!0).then(function(){o.saveCustomResizable(),o.updateCellAreas(),o.emitEvent("resizable-change",t,e)}),_tools.DomTools.removeClass(o.$el,"drag--resize")},n(e),o.closeMenu()}}};exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_tools=require("../../tools"),_util=require("./util"),_util2=require("../../table/src/util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,t,l){return t in e?Object.defineProperty(e,t,{value:l,enumerable:!0,configurable:!0,writable:!0}):e[t]=l,e}var cellType="header",_default={name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,size:String,fixedType:String},data:function(){return{headerColumn:[]}},watch:{tableColumn:function(){this.uploadColumn()}},created:function(){this.uploadColumn()},mounted:function(){var e=this.$parent,t=this.$el,l=this.$refs,o=this.fixedType,e=e.elemStore,o="".concat(o||"main","-header-");e["".concat(o,"wrapper")]=t,e["".concat(o,"table")]=l.table,e["".concat(o,"colgroup")]=l.colgroup,e["".concat(o,"list")]=l.thead,e["".concat(o,"xSpace")]=l.xSpace,e["".concat(o,"repair")]=l.repair},render:function(y){var b=this,e=this._e,_=this.$parent,v=this.fixedType,t=this.headerColumn,l=this.fixedColumn,C=_.$listeners,o=_.tId,r=_.isGroup,w=_.resizable,T=_.border,$=_.columnKey,i=_.headerRowClassName,z=_.headerCellClassName,n=_.headerRowStyle,P=_.headerCellStyle,S=_.showHeaderOverflow,M=_.headerAlign,D=_.align,W=_.highlightCurrentColumn,k=_.currentColumn,U=_.scrollXLoad,I=_.overflowX,a=_.scrollbarWidth,R=_.sortOpts,H=_.mouseConfig,A=_.columnOpts,s=this.tableColumn,t=t;return r||(t=[s=v&&(U||S)?l:s]),y("div",{class:["vxe-table--header-wrapper",v?"fixed-".concat(v,"--wrapper"):"body--wrapper"],attrs:{xid:o}},[v?e():y("div",{class:"vxe-body--x-space",ref:"xSpace"}),y("table",{class:"vxe-table--header",attrs:{xid:o,cellspacing:0,cellpadding:0,border:0},ref:"table"},[y("colgroup",{ref:"colgroup"},s.map(function(e,t){return y("col",{attrs:{name:e.id},key:t})}).concat(a?[y("col",{attrs:{name:"col_gutter"}})]:[])),y("thead",{ref:"thead"},t.map(function(x,g){return y("tr",{class:["vxe-header--row",i?_xeUtils.default.isFunction(i)?i({$table:_,$rowIndex:g,fixed:v,type:cellType}):i:""],style:n?_xeUtils.default.isFunction(n)?n({$table:_,$rowIndex:g,fixed:v,type:cellType}):n:null},x.map(function(e,t){var l=e.type,o=e.showHeaderOverflow,r=e.headerAlign,i=e.align,n=e.headerClassName,a=e.children&&e.children.length,s=v?e.fixed!==v&&!a:e.fixed&&I,d=_xeUtils.default.isUndefined(o)||_xeUtils.default.isNull(o)?S:o,c=r||i||M||D,u="ellipsis"===d,f="title"===d,p=!0===d||"tooltip"===d,h=f||p||u,o={},r=e.filters&&e.filters.some(function(e){return e.checked}),i=_.getColumnIndex(e),d=_.getVTColumnIndex(e),m={$table:_,$rowIndex:g,column:e,columnIndex:i,$columnIndex:t,_columnIndex:d,fixed:v,type:cellType,isHidden:s,hasFilter:r};return U&&!h&&(u=h=!0),(W||C["header-cell-click"]||"cell"===R.trigger)&&(o.click=function(e){return _.triggerHeaderCellClickEvent(e,m)}),C["header-cell-dblclick"]&&(o.dblclick=function(e){return _.triggerHeaderCellDblclickEvent(e,m)}),H&&(o.mousedown=function(e){return _.triggerHeaderCellMousedownEvent(e,m)}),y("th",{class:["vxe-header--column",e.id,(_defineProperty(d={},"col--".concat(c),c),_defineProperty(d,"col--".concat(l),l),_defineProperty(d,"col--last",t===x.length-1),_defineProperty(d,"col--fixed",e.fixed),_defineProperty(d,"col--group",a),_defineProperty(d,"col--ellipsis",h),_defineProperty(d,"fixed--hidden",s),_defineProperty(d,"is--sortable",e.sortable),_defineProperty(d,"col--filter",!!e.filters),_defineProperty(d,"is--filter-active",r),_defineProperty(d,"col--current",k===e),d),_tools.UtilTools.getClass(n,m),_tools.UtilTools.getClass(z,m)],attrs:{colid:e.id,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null},style:P?_xeUtils.default.isFunction(P)?P(m):P:null,on:o,key:$||a?e.id:t},[y("div",{class:["vxe-cell",{"c--title":f,"c--tooltip":p,"c--ellipsis":u}]},e.renderHeader(y,m)),s||a||!(_xeUtils.default.isBoolean(e.resizable)?e.resizable:A.resizable||w)?null:y("div",{class:["vxe-resizable",{"is--line":!T||"none"===T}],on:{mousedown:function(e){return b.resizeMousedown(e,m)}}})])}).concat(a?[y("th",{class:"vxe-header--gutter col--gutter"})]:[]))}))]),y("div",{class:"vxe-table--header-border-line",ref:"repair"})])},methods:{uploadColumn:function(){var e=this.$parent;this.headerColumn=e.isGroup?(0,_util.convertToRows)(this.tableGroupColumn):[]},resizeMousedown:function(e,t){var l=t.column,o=this.$parent,r=this.$el,i=this.fixedType,n=o.$refs,a=n.tableBody,s=n.leftContainer,d=n.rightContainer,c=n.resizeBar,n=e.target,u=e.clientX,f=t.cell=n.parentNode,p=0,h=a.$el,a=_tools.DomTools.getOffsetPos(n,r),r=n.clientWidth,n=Math.floor(r/2),m=(0,_util2.getColMinWidth)(t)-n,x=a.left-f.clientWidth+r+m,g=a.left+n,y=document.onmousemove,b=document.onmouseup,_="left"===i,v="right"===i,C=0;if(_||v){for(var w=_?"nextElementSibling":"previousElementSibling",T=f[w];T&&!_tools.DomTools.hasClass(T,"fixed--hidden");)_tools.DomTools.hasClass(T,"col--group")||(C+=T.offsetWidth),T=T[w];v&&d&&(g=d.offsetLeft+C)}n=function(e){e.stopPropagation(),e.preventDefault();var t=e.clientX-u,e=g+t,t=i?0:h.scrollLeft;_?e=Math.min(e,(d?d.offsetLeft:h.clientWidth)-C-m):v?(x=(s?s.clientWidth:0)+C+m,e=Math.min(e,g+f.clientWidth-m)):x=Math.max(h.scrollLeft,x),p=Math.max(e,x),c.style.left="".concat(p-t,"px")};o._isResize=!0,_tools.DomTools.addClass(o.$el,"drag--resize"),c.style.display="block",document.onmousemove=n,document.onmouseup=function(e){document.onmousemove=y,document.onmouseup=b,l.resizeWidth=l.renderWidth+(v?g-p:p-g),c.style.display="none",o._isResize=!1,o._lastResizeTime=Date.now(),o.analyColumnWidth(),o.recalculate(!0).then(function(){o.saveCustomResizable(),o.updateCellAreas(),o.emitEvent("resizable-change",t,e)}),_tools.DomTools.removeClass(o.$el,"drag--resize")},n(e),o.closeMenu()}}};exports.default=_default;

package/lib/header/src/util.js

@@ -11,7 +11,7 @@ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread n
 
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 

package/lib/header/src/util.min.js

@@ -1 +1 @@
-"use strict";function _toConsumableArray(r){return _arrayWithoutHoles(r)||_iterableToArray(r)||_unsupportedIterableToArray(r)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(r,e){if(r){if("string"==typeof r)return _arrayLikeToArray(r,e);var n=Object.prototype.toString.call(r).slice(8,-1);return"Map"===(n="Object"===n&&r.constructor?r.constructor.name:n)||"Set"===n?Array.from(r):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?_arrayLikeToArray(r,e):void 0}}function _iterableToArray(r){if("undefined"!=typeof Symbol&&Symbol.iterator in Object(r))return Array.from(r)}function _arrayWithoutHoles(r){if(Array.isArray(r))return _arrayLikeToArray(r)}function _arrayLikeToArray(r,e){(null==e||e>r.length)&&(e=r.length);for(var n=0,o=new Array(e);n<e;n++)o[n]=r[n];return o}Object.defineProperty(exports,"__esModule",{value:!0}),exports.convertToRows=void 0;var getAllColumns=function e(r,n){var o=[];return r.forEach(function(r){r.parentId=n?n.id:null,r.visible&&(r.children&&r.children.length&&r.children.some(function(r){return r.visible})?(o.push(r),o.push.apply(o,_toConsumableArray(e(r.children,r)))):o.push(r))}),o},convertToRows=function(r){function o(e,r){var n;r&&(e.level=r.level+1,t<e.level&&(t=e.level)),e.children&&e.children.length&&e.children.some(function(r){return r.visible})?(n=0,e.children.forEach(function(r){r.visible&&(o(r,e),n+=r.colSpan)}),e.colSpan=n):e.colSpan=1}var t=1;r.forEach(function(r){r.level=1,o(r)});for(var e=[],n=0;n<t;n++)e.push([]);return getAllColumns(r).forEach(function(r){r.children&&r.children.length&&r.children.some(function(r){return r.visible})?r.rowSpan=1:r.rowSpan=t-r.level+1,e[r.level-1].push(r)}),e};exports.convertToRows=convertToRows;
+"use strict";function _toConsumableArray(r){return _arrayWithoutHoles(r)||_iterableToArray(r)||_unsupportedIterableToArray(r)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(r,e){if(r){if("string"==typeof r)return _arrayLikeToArray(r,e);var n=Object.prototype.toString.call(r).slice(8,-1);return"Map"===(n="Object"===n&&r.constructor?r.constructor.name:n)||"Set"===n?Array.from(r):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?_arrayLikeToArray(r,e):void 0}}function _iterableToArray(r){if("undefined"!=typeof Symbol&&null!=r[Symbol.iterator]||null!=r["@@iterator"])return Array.from(r)}function _arrayWithoutHoles(r){if(Array.isArray(r))return _arrayLikeToArray(r)}function _arrayLikeToArray(r,e){(null==e||e>r.length)&&(e=r.length);for(var n=0,o=new Array(e);n<e;n++)o[n]=r[n];return o}Object.defineProperty(exports,"__esModule",{value:!0}),exports.convertToRows=void 0;var getAllColumns=function e(r,n){var o=[];return r.forEach(function(r){r.parentId=n?n.id:null,r.visible&&(r.children&&r.children.length&&r.children.some(function(r){return r.visible})?(o.push(r),o.push.apply(o,_toConsumableArray(e(r.children,r)))):o.push(r))}),o},convertToRows=function(r){function o(e,r){var n;r&&(e.level=r.level+1,t<e.level&&(t=e.level)),e.children&&e.children.length&&e.children.some(function(r){return r.visible})?(n=0,e.children.forEach(function(r){r.visible&&(o(r,e),n+=r.colSpan)}),e.colSpan=n):e.colSpan=1}var t=1;r.forEach(function(r){r.level=1,o(r)});for(var e=[],n=0;n<t;n++)e.push([]);return getAllColumns(r).forEach(function(r){r.children&&r.children.length&&r.children.some(function(r){return r.visible})?r.rowSpan=1:r.rowSpan=t-r.level+1,e[r.level-1].push(r)}),e};exports.convertToRows=convertToRows;

package/lib/header/style/style.css

@@ -36,7 +36,7 @@
       border-bottom: 1px solid #e8eaec; }
   .vxe-table .vxe-cell--sort {
     width: 1.5em;
-    height: 1.5em;
+    height: 1.35em;
     vertical-align: middle;
     text-align: center;
     display: inline-block;
@@ -56,9 +56,9 @@
     .vxe-table .vxe-sort--desc-btn.sort--active {
       color: #409eff; }
   .vxe-table .vxe-sort--asc-btn {
-    top: -0.04em; }
+    top: -0.15em; }
   .vxe-table .vxe-sort--desc-btn {
-    bottom: -0.04em; }
+    bottom: -0.15em; }
 
 .vxe-header--column {
   position: relative;
@@ -96,11 +96,6 @@
       position: absolute;
       left: 0;
       top: 0.2em; }
-  .vxe-header--column .vxe-cell--required-icon,
-  .vxe-header--column .vxe-cell--edit-icon,
-  .vxe-header--column .vxe-cell-help-icon,
-  .vxe-header--column .vxe-cell--title {
-    vertical-align: middle; }
   .vxe-header--column .vxe-cell--required-icon {
     margin-right: 0.1em; }
   .vxe-header--column .vxe-cell--edit-icon,
@@ -108,8 +103,6 @@
     margin-right: 0.2em; }
   .vxe-header--column .vxe-cell-help-icon {
     cursor: help; }
-  .vxe-header--column .vxe-cell--title {
-    line-height: 1.5; }
   .vxe-header--column .vxe-resizable {
     position: absolute;
     right: -7px;

package/lib/header/style/style.min.css

@@ -1 +1 @@
-@charset "UTF-8";.vxe-table .vxe-table--header-wrapper{color:#606266}.vxe-table .vxe-table--header-wrapper .vxe-table--header-border-line{position:absolute;left:0;bottom:0;height:0;border-bottom:1px solid #e8eaec}.vxe-table .vxe-cell--sort{width:1.5em;height:1.5em;vertical-align:middle;text-align:center;display:inline-block;position:relative}.vxe-table .vxe-sort--asc-btn,.vxe-table .vxe-sort--desc-btn{position:absolute;left:.35em;color:#c0c4cc;width:1em;text-align:center;cursor:pointer}.vxe-table .vxe-sort--asc-btn:hover,.vxe-table .vxe-sort--desc-btn:hover{color:#606266}.vxe-table .vxe-sort--asc-btn.sort--active,.vxe-table .vxe-sort--desc-btn.sort--active{color:#409eff}.vxe-table .vxe-sort--asc-btn{top:-.04em}.vxe-table .vxe-sort--desc-btn{bottom:-.04em}.vxe-header--column{position:relative;font-weight:700;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-header--column.col--ellipsis>.vxe-cell{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.vxe-header--column.col--ellipsis>.vxe-cell .vxe-cell--title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-header--column.col--ellipsis>.vxe-cell>i:not(.vxe-cell--title),.vxe-header--column.col--ellipsis>.vxe-cell>span:not(.vxe-cell--title){-ms-flex-negative:0;flex-shrink:0}.vxe-header--column .vxe-cell--required-icon{display:inline-block;color:#f56c6c;width:.8em;height:1em;line-height:1em;font-family:Verdana,Arial,Tahoma;font-weight:400;position:relative}.vxe-header--column .vxe-cell--required-icon:before{content:"*";position:absolute;left:0;top:.2em}.vxe-header--column .vxe-cell--edit-icon,.vxe-header--column .vxe-cell--required-icon,.vxe-header--column .vxe-cell--title,.vxe-header--column .vxe-cell-help-icon{vertical-align:middle}.vxe-header--column .vxe-cell--required-icon{margin-right:.1em}.vxe-header--column .vxe-cell--edit-icon,.vxe-header--column .vxe-cell-help-icon{margin-right:.2em}.vxe-header--column .vxe-cell-help-icon{cursor:help}.vxe-header--column .vxe-cell--title{line-height:1.5}.vxe-header--column .vxe-resizable{position:absolute;right:-7px;bottom:0;width:14px;height:100%;text-align:center;z-index:1;cursor:col-resize}.vxe-header--column .vxe-resizable.is--line:after,.vxe-header--column .vxe-resizable.is--line:before{content:"";display:inline-block;vertical-align:middle}.vxe-header--column .vxe-resizable.is--line:before{width:1px;height:50%;background-color:#d9dddf}.vxe-header--column .vxe-resizable.is--line:after{width:0;height:100%}.vxe-table--fixed-right-wrapper .vxe-header--column .vxe-resizable{right:auto;left:-7px}
+@charset "UTF-8";.vxe-table .vxe-table--header-wrapper{color:#606266}.vxe-table .vxe-table--header-wrapper .vxe-table--header-border-line{position:absolute;left:0;bottom:0;height:0;border-bottom:1px solid #e8eaec}.vxe-table .vxe-cell--sort{width:1.5em;height:1.35em;vertical-align:middle;text-align:center;display:inline-block;position:relative}.vxe-table .vxe-sort--asc-btn,.vxe-table .vxe-sort--desc-btn{position:absolute;left:.35em;color:#c0c4cc;width:1em;text-align:center;cursor:pointer}.vxe-table .vxe-sort--asc-btn:hover,.vxe-table .vxe-sort--desc-btn:hover{color:#606266}.vxe-table .vxe-sort--asc-btn.sort--active,.vxe-table .vxe-sort--desc-btn.sort--active{color:#409eff}.vxe-table .vxe-sort--asc-btn{top:-.15em}.vxe-table .vxe-sort--desc-btn{bottom:-.15em}.vxe-header--column{position:relative;font-weight:700;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-header--column.col--ellipsis>.vxe-cell{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.vxe-header--column.col--ellipsis>.vxe-cell .vxe-cell--title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-header--column.col--ellipsis>.vxe-cell>i:not(.vxe-cell--title),.vxe-header--column.col--ellipsis>.vxe-cell>span:not(.vxe-cell--title){-ms-flex-negative:0;flex-shrink:0}.vxe-header--column .vxe-cell--required-icon{display:inline-block;color:#f56c6c;width:.8em;height:1em;line-height:1em;font-family:Verdana,Arial,Tahoma;font-weight:400;position:relative}.vxe-header--column .vxe-cell--required-icon:before{content:"*";position:absolute;left:0;top:.2em}.vxe-header--column .vxe-cell--required-icon{margin-right:.1em}.vxe-header--column .vxe-cell--edit-icon,.vxe-header--column .vxe-cell-help-icon{margin-right:.2em}.vxe-header--column .vxe-cell-help-icon{cursor:help}.vxe-header--column .vxe-resizable{position:absolute;right:-7px;bottom:0;width:14px;height:100%;text-align:center;z-index:1;cursor:col-resize}.vxe-header--column .vxe-resizable.is--line:after,.vxe-header--column .vxe-resizable.is--line:before{content:"";display:inline-block;vertical-align:middle}.vxe-header--column .vxe-resizable.is--line:before{width:1px;height:50%;background-color:#d9dddf}.vxe-header--column .vxe-resizable.is--line:after{width:0;height:100%}.vxe-table--fixed-right-wrapper .vxe-header--column .vxe-resizable{right:auto;left:-7px}

package/lib/icon/index.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Icon=void 0;var Icon={install:function(){}},_default=exports.Icon=Icon;exports.default=Icon;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Icon=void 0;var Icon={install:function(){}},_default=exports.Icon=Icon;exports.default=_default;

package/lib/index.common.js

@@ -22,9 +22,9 @@ Object.keys(VXETableExport).forEach(function (key) {
   });
 });
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 var _default = VXETableExport;
 exports.default = _default;

package/lib/index.common.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});var _exportNames={};exports.default=void 0;var VXETableExport=_interopRequireWildcard(require("./all"));function _getRequireWildcardCache(){if("function"!=typeof WeakMap)return null;var e=new WeakMap;return _getRequireWildcardCache=function(){return e},e}function _interopRequireWildcard(e){if(e&&e.__esModule)return e;if(null===e||"object"!==_typeof(e)&&"function"!=typeof e)return{default:e};var t=_getRequireWildcardCache();if(t&&t.has(e))return t.get(e);var r,o,n={},u=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(r in e)Object.prototype.hasOwnProperty.call(e,r)&&((o=u?Object.getOwnPropertyDescriptor(e,r):null)&&(o.get||o.set)?Object.defineProperty(n,r,o):n[r]=e[r]);return n.default=e,t&&t.set(e,n),n}Object.keys(VXETableExport).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===VXETableExport[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return VXETableExport[e]}}))});var _default=VXETableExport;exports.default=VXETableExport;
+"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});var _exportNames={};exports.default=void 0;var VXETableExport=_interopRequireWildcard(require("./all"));function _getRequireWildcardCache(e){if("function"!=typeof WeakMap)return null;var t=new WeakMap,r=new WeakMap;return(_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,n={},u=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(r in e)"default"!==r&&Object.prototype.hasOwnProperty.call(e,r)&&((o=u?Object.getOwnPropertyDescriptor(e,r):null)&&(o.get||o.set)?Object.defineProperty(n,r,o):n[r]=e[r]);return n.default=e,t&&t.set(e,n),n}Object.keys(VXETableExport).forEach(function(e){"default"!==e&&"__esModule"!==e&&(Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===VXETableExport[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return VXETableExport[e]}}))});var _default=VXETableExport;exports.default=_default;