vxe-table 3.5.9-beta.6 → 3.5.9-beta.7

package/lib/grid/src/grid.js

@@ -379,6 +379,8 @@ var _default2 = {
       }
     }
 
+    this.initPages();
+
     _event.GlobalEvent.on(this, 'keydown', this.handleGlobalKeydownEvent);
   },
   mounted: function mounted() {
@@ -387,7 +389,6 @@ var _default2 = {
     }
 
     this.initToolbar();
-    this.initPages();
     this.initProxy();
   },
   destroyed: function destroyed() {

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

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

package/lib/index.umd.js

@@ -8707,8 +8707,8 @@ var iconPrefix = 'vxe-icon--';
     // parseFormat: 'yyyy-MM-dd HH:mm:ss.SSS',
     // labelFormat: '',
     // valueFormat: '',
-    minDate: new Date(1900, 0, 1),
-    maxDate: new Date(2100, 0, 1),
+    startDate: new Date(1900, 0, 1),
+    endDate: new Date(2100, 0, 1),
     startDay: 1,
     selectDay: 1,
     digits: 2,
@@ -8808,7 +8808,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.5.9-beta.6", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.5.9-beta.7", "] ").concat(conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10077,7 +10077,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.5.9-beta.6",
+  version: "3.5.9-beta.7",
   reg: reg,
   use: use,
   setup: setup,
@@ -25214,18 +25214,20 @@ function renderExtraSuffixIcon(h, _vm) {
     },
     // date、week、month、year
     dateConfig: Object,
-    minDate: {
+    startDate: {
       type: [String, Number, Date],
       default: function _default() {
-        return conf.input.minDate;
+        return conf.input.startDate;
       }
     },
-    maxDate: {
+    endDate: {
       type: [String, Number, Date],
       default: function _default() {
-        return conf.input.maxDate;
+        return conf.input.endDate;
       }
     },
+    minDate: [String, Number, Date],
+    maxDate: [String, Number, Date],
     // 已废弃 startWeek，被 startDay 替换
     startWeek: Number,
     startDay: {
@@ -25342,29 +25344,29 @@ function renderExtraSuffixIcon(h, _vm) {
     },
     isDisabledPrevDateBtn: function isDisabledPrevDateBtn() {
       var selectMonth = this.selectMonth,
-          dateMinTime = this.dateMinTime;
+          dateStartTime = this.dateStartTime;
 
       if (selectMonth) {
-        return selectMonth <= dateMinTime;
+        return selectMonth <= dateStartTime;
       }
 
       return false;
     },
     isDisabledNextDateBtn: function isDisabledNextDateBtn() {
       var selectMonth = this.selectMonth,
-          dateMaxTime = this.dateMaxTime;
+          dateEndTime = this.dateEndTime;
 
       if (selectMonth) {
-        return selectMonth >= dateMaxTime;
+        return selectMonth >= dateEndTime;
       }
 
       return false;
     },
-    dateMinTime: function dateMinTime() {
-      return this.minDate ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(this.minDate) : null;
+    dateStartTime: function dateStartTime() {
+      return this.startDate ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(this.startDate) : null;
     },
-    dateMaxTime: function dateMaxTime() {
-      return this.maxDate ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(this.maxDate) : null;
+    dateEndTime: function dateEndTime() {
+      return this.endDate ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toStringDate(this.endDate) : null;
     },
     supportMultiples: function supportMultiples() {
       return ['date', 'week', 'month', 'quarter', 'year'].includes(this.type);
@@ -25624,10 +25626,10 @@ function renderExtraSuffixIcon(h, _vm) {
         var selMonth = selectMonth.getMonth();
         var selDay = selectMonth.getDay();
         var prevOffsetDate = -weekDatas.indexOf(selDay);
-        var startDate = new Date(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatDay(selectMonth, prevOffsetDate).getTime() + hmsTime);
+        var startDayDate = new Date(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatDay(selectMonth, prevOffsetDate).getTime() + hmsTime);
 
         for (var index = 0; index < 42; index++) {
-          var date = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatDay(startDate, index);
+          var date = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.getWhatDay(startDayDate, index);
           var itemFullYear = date.getFullYear();
           var itemMonth = date.getMonth();
           var itemDate = date.getDate();
@@ -26538,7 +26540,10 @@ function renderExtraSuffixIcon(h, _vm) {
       this.dateTimeChangeEvent(evnt);
     },
     dateConfirmEvent: function dateConfirmEvent() {
-      this.dateChange(this.dateValue || this.currentDate);
+      if (this.isDateTimeType || this.multiple) {
+        this.dateChange(this.dateValue || this.currentDate);
+      }
+
       this.hidePanel();
     },
     dateMinuteEvent: function dateMinuteEvent(evnt, item) {
@@ -33008,6 +33013,7 @@ Object.keys(packages_table.methods).forEach(function (name) {
 
     if (false) {}
 
+    this.initPages();
     GlobalEvent.on(this, 'keydown', this.handleGlobalKeydownEvent);
   },
   mounted: function mounted() {
@@ -33016,7 +33022,6 @@ Object.keys(packages_table.methods).forEach(function (name) {
     }
 
     this.initToolbar();
-    this.initPages();
     this.initProxy();
   },
   destroyed: function destroyed() {