vxe-table 4.7.59 → 4.7.61

package/lib/grid/src/grid.js

@@ -105,7 +105,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       };
     });
     const computeProxyOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, getConfig().grid.proxyConfig, props.proxyConfig);
+      return _xeUtils.default.merge({}, getConfig().grid.proxyConfig, props.proxyConfig);
     });
     const computeIsRespMsg = (0, _vue.computed)(() => {
       const proxyOpts = computeProxyOpts.value;
@@ -861,6 +861,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
           case 'query':
             {
               const ajaxMethods = ajax.query;
+              const querySuccessMethods = ajax.querySuccess;
+              const queryErrorMethods = ajax.queryError;
               if (ajaxMethods) {
                 const isInited = code === '_init';
                 const isReload = code === 'reload';
@@ -919,8 +921,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                 reactData.sortData = sortList;
                 reactData.filterData = filterList;
                 reactData.tableLoading = true;
-                const applyArgs = [commitParams].concat(args);
-                return Promise.resolve((beforeQuery || ajaxMethods)(...applyArgs)).then(rest => {
+                return Promise.resolve((beforeQuery || ajaxMethods)(commitParams, ...args)).then(rest => {
                   reactData.tableLoading = false;
                   if (rest) {
                     if (pagerConfig && (0, _utils.isEnableConf)(pagerOpts)) {
@@ -951,13 +952,23 @@ var _default = exports.default = (0, _vue.defineComponent)({
                     reactData.tableData = [];
                   }
                   if (afterQuery) {
-                    afterQuery(...applyArgs);
+                    afterQuery(commitParams, ...args);
+                  }
+                  if (querySuccessMethods) {
+                    querySuccessMethods(Object.assign(Object.assign({}, commitParams), {
+                      response: rest
+                    }));
                   }
                   return {
                     status: true
                   };
-                }).catch(() => {
+                }).catch(rest => {
                   reactData.tableLoading = false;
+                  if (queryErrorMethods) {
+                    queryErrorMethods(Object.assign(Object.assign({}, commitParams), {
+                      response: rest
+                    }));
+                  }
                   return {
                     status: false
                   };
@@ -972,6 +983,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
           case 'delete':
             {
               const ajaxMethods = ajax.delete;
+              const deleteSuccessMethods = ajax.deleteSuccess;
+              const deleteErrorMethods = ajax.deleteError;
               if (ajaxMethods) {
                 const selectRecords = gridExtendTableMethods.getCheckboxRecords();
                 const removeRecords = selectRecords.filter(row => !$xeTable.isInsertByRow(row));
@@ -986,14 +999,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
                   form: formData,
                   options: ajaxMethods
                 };
-                const applyArgs = [commitParams].concat(args);
                 if (selectRecords.length) {
                   return handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', () => {
                     if (!removeRecords.length) {
                       return $xeTable.remove(selectRecords);
                     }
                     reactData.tableLoading = true;
-                    return Promise.resolve((beforeDelete || ajaxMethods)(...applyArgs)).then(rest => {
+                    return Promise.resolve((beforeDelete || ajaxMethods)(commitParams, ...args)).then(rest => {
                       reactData.tableLoading = false;
                       $xeTable.setPendingRow(removeRecords, false);
                       if (isRespMsg) {
@@ -1005,10 +1017,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
                         }
                       }
                       if (afterDelete) {
-                        afterDelete(...applyArgs);
+                        afterDelete(commitParams, ...args);
                       } else {
                         gridMethods.commitProxy('query');
                       }
+                      if (deleteSuccessMethods) {
+                        deleteSuccessMethods(Object.assign(Object.assign({}, commitParams), {
+                          response: rest
+                        }));
+                      }
                       return {
                         status: true
                       };
@@ -1023,6 +1040,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
                           });
                         }
                       }
+                      if (deleteErrorMethods) {
+                        deleteErrorMethods(Object.assign(Object.assign({}, commitParams), {
+                          response: rest
+                        }));
+                      }
                       return {
                         status: false
                       };
@@ -1049,6 +1071,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
           case 'save':
             {
               const ajaxMethods = ajax.save;
+              const saveSuccessMethods = ajax.saveSuccess;
+              const saveErrorMethods = ajax.saveError;
               if (ajaxMethods) {
                 const body = $xeTable.getRecordset();
                 const {
@@ -1065,7 +1089,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
                   form: formData,
                   options: ajaxMethods
                 };
-                const applyArgs = [commitParams].concat(args);
                 // 排除掉新增且标记为删除的数据
                 if (insertRecords.length) {
                   body.pendingRecords = pendingRecords.filter(row => $xeTable.findRowIndexOf(insertRecords, row) === -1);
@@ -1086,7 +1109,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                   }
                   if (body.insertRecords.length || removeRecords.length || updateRecords.length || body.pendingRecords.length) {
                     reactData.tableLoading = true;
-                    return Promise.resolve((beforeSave || ajaxMethods)(...applyArgs)).then(rest => {
+                    return Promise.resolve((beforeSave || ajaxMethods)(commitParams, ...args)).then(rest => {
                       reactData.tableLoading = false;
                       $xeTable.clearPendingRow();
                       if (isRespMsg) {
@@ -1098,10 +1121,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
                         }
                       }
                       if (afterSave) {
-                        afterSave(...applyArgs);
+                        afterSave(commitParams, ...args);
                       } else {
                         gridMethods.commitProxy('query');
                       }
+                      if (saveSuccessMethods) {
+                        saveSuccessMethods(Object.assign(Object.assign({}, commitParams), {
+                          response: rest
+                        }));
+                      }
                       return {
                         status: true
                       };
@@ -1116,6 +1144,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
                           });
                         }
                       }
+                      if (saveErrorMethods) {
+                        saveErrorMethods(Object.assign(Object.assign({}, commitParams), {
+                          response: rest
+                        }));
+                      }
                       return {
                         status: false
                       };

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_ui=require("../../ui"),_table=_interopRequireDefault(require("../../table")),_toolbar=_interopRequireDefault(require("../../toolbar")),_props=_interopRequireDefault(require("../../table/src/props")),_emits=_interopRequireDefault(require("../../table/src/emits")),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const{getConfig,getI18n,commands,hooks,useFns,createEvent,globalEvents,GLOBAL_EVENT_KEYS}=_ui.VxeUI,tableComponentPropKeys=Object.keys(_props.default),tableComponentMethodKeys=["clearAll","syncData","updateData","loadData","reloadData","reloadRow","loadColumn","reloadColumn","getRowNode","getColumnNode","getRowIndex","getVTRowIndex","getVMRowIndex","getColumnIndex","getVTColumnIndex","getVMColumnIndex","setRow","createData","createRow","revertData","clearData","isInsertByRow","isUpdateByRow","getColumns","getColumnById","getColumnByField","getTableColumn","getData","getCheckboxRecords","getParentRow","getRowSeq","getRowById","getRowid","getTableData","setColumnFixed","clearColumnFixed","setColumnWidth","getColumnWidth","hideColumn","showColumn","resetColumn","refreshColumn","refreshScroll","recalculate","closeTooltip","isAllCheckboxChecked","isAllCheckboxIndeterminate","getCheckboxIndeterminateRecords","setCheckboxRow","isCheckedByCheckboxRow","isIndeterminateByCheckboxRow","toggleCheckboxRow","setAllCheckboxRow","getRadioReserveRecord","clearRadioReserve","getCheckboxReserveRecords","clearCheckboxReserve","toggleAllCheckboxRow","clearCheckboxRow","setCurrentRow","isCheckedByRadioRow","setRadioRow","clearCurrentRow","clearRadioRow","getCurrentRecord","getRadioRecord","getCurrentColumn","setCurrentColumn","clearCurrentColumn","setPendingRow","togglePendingRow","getPendingRecords","clearPendingRow","sort","clearSort","isSort","getSortColumns","closeFilter","isFilter","isActiveFilterByColumn","isRowExpandLoaded","clearRowExpandLoaded","reloadRowExpand","reloadRowExpand","toggleRowExpand","setAllRowExpand","setRowExpand","isExpandByRow","isRowExpandByRow","clearRowExpand","clearRowExpandReserve","getRowExpandRecords","getTreeExpandRecords","isTreeExpandLoaded","clearTreeExpandLoaded","reloadTreeExpand","reloadTreeChilds","toggleTreeExpand","setAllTreeExpand","setTreeExpand","isTreeExpandByRow","clearTreeExpand","clearTreeExpandReserve","getScroll","scrollTo","scrollToRow","scrollToColumn","clearScroll","updateFooter","updateStatus","setMergeCells","removeInsertRow","removeMergeCells","getMergeCells","clearMergeCells","setMergeFooterItems","removeMergeFooterItems","getMergeFooterItems","clearMergeFooterItems","openTooltip","getCellLabel","getCellElement","focus","blur","connect"],gridComponentEmits=[..._emits.default,"page-change","form-submit","form-submit-invalid","form-reset","form-collapse","form-toggle-collapse","proxy-query","proxy-delete","proxy-save","toolbar-button-click","toolbar-tool-click","zoom"];var _default=exports.default=(0,_vue.defineComponent)({name:"VxeGrid",props:Object.assign(Object.assign({},_props.default),{layouts:Array,columns:Array,pagerConfig:Object,proxyConfig:Object,toolbarConfig:Object,formConfig:Object,zoomConfig:Object,size:{type:String,default:()=>getConfig().grid.size||getConfig().size}}),emits:gridComponentEmits,setup(z,e){const{slots:s,emit:r}=e;var y=_xeUtils.default.uniqueId();const l=_ui.VxeUI.getComponent("VxeForm"),u=_ui.VxeUI.getComponent("VxePager"),w=useFns.useSize(z)["computeSize"],Z=(0,_vue.reactive)({tableLoading:!1,proxyInited:!1,isZMax:!1,tableData:[],filterData:[],formData:{},sortData:[],tZindex:0,tablePage:{total:0,pageSize:(null==(t=getConfig().pager)?void 0:t.pageSize)||10,currentPage:1}}),d=(0,_vue.ref)(),B=(0,_vue.ref)(),g=(0,_vue.ref)(),n=(0,_vue.ref)(),c=(0,_vue.ref)(),v=(0,_vue.ref)(),m=(0,_vue.ref)(),f=(0,_vue.ref)(),p=(0,_vue.ref)(),x=(0,_vue.ref)();var t=e=>{const t={};return e.forEach(o=>{t[o]=(...e)=>{var t=B.value;if(t&&t[o])return t[o](...e)}}),t};const A=t(tableComponentMethodKeys),H=(tableComponentMethodKeys.forEach(o=>{A[o]=(...e)=>{var t=B.value;if(t&&t[o])return t&&t[o](...e)}}),(0,_vue.computed)(()=>Object.assign({},getConfig().grid.proxyConfig,z.proxyConfig))),ee=(0,_vue.computed)(()=>{var e=H.value;return _xeUtils.default.isBoolean(e.message)?e.message:e.showResponseMsg}),K=(0,_vue.computed)(()=>{return H.value.showActiveMsg}),G=(0,_vue.computed)(()=>Object.assign({},getConfig().grid.pagerConfig,z.pagerConfig)),_=(0,_vue.computed)(()=>Object.assign({},getConfig().grid.formConfig,z.formConfig)),Q=(0,_vue.computed)(()=>Object.assign({},getConfig().grid.toolbarConfig,z.toolbarConfig)),o=(0,_vue.computed)(()=>Object.assign({},getConfig().grid.zoomConfig,z.zoomConfig)),O=(0,_vue.computed)(()=>Z.isZMax?{zIndex:Z.tZindex}:null),I=(0,_vue.computed)(()=>{const t={},o=z;return tableComponentPropKeys.forEach(e=>{t[e]=o[e]}),t}),k={refElem:d,refTable:B,refForm:g,refToolbar:n,refPager:c},P={computeProxyOpts:H,computePagerOpts:G,computeFormOpts:_,computeToolbarOpts:Q,computeZoomOpts:o},W={xID:y,props:z,context:e,reactData:Z,getRefMaps:()=>k,getComputeMaps:()=>P},U=(0,_vue.computed)(()=>{var{seqConfig:e,pagerConfig:t,loading:o,editConfig:r,proxyConfig:a}=z,{isZMax:n,tableLoading:i,tablePage:s,tableData:l}=Z,u=I.value,d=H.value,g=G.value,c=Object.assign({},u);return n&&(u.maxHeight?c.maxHeight="100%":c.height="100%"),a&&(0,_utils.isEnableConf)(d)&&(c.loading=o||i,c.data=l,t)&&d.seq&&(0,_utils.isEnableConf)(g)&&(c.seqConfig=Object.assign({},e,{startIndex:(s.currentPage-1)*s.pageSize})),r&&(c.editConfig=Object.assign({},r)),c}),i=()=>{var e=Q.value;z.toolbarConfig&&(0,_utils.isEnableConf)(e)&&(0,_vue.nextTick)(()=>{var e=B.value,t=n.value;e&&t&&e.connect(t)})},a=()=>{var e=Z["tablePage"],t=z["pagerConfig"],o=G.value,{currentPage:r,pageSize:a}=o;t&&(0,_utils.isEnableConf)(o)&&(r&&(e.currentPage=r),a)&&(e.pageSize=a)},Y=(e,t)=>{var o=H.value,o=(o.response||o.props||{}).message;let r;return(r=e&&o?_xeUtils.default.isFunction(o)?o({data:e,$grid:W}):_xeUtils.default.get(e,o):r)||getI18n(t)},J=(e,t,o)=>{var r=K.value,a=A.getCheckboxRecords();if(r)if(a.length){if(_ui.VxeUI.modal)return _ui.VxeUI.modal.confirm({id:"cfm_"+e,content:getI18n(t),escClosable:!0}).then(e=>{if("confirm"===e)return o()})}else _ui.VxeUI.modal&&_ui.VxeUI.modal.message({id:"msg_"+e,content:getI18n("vxe.grid.selectOneRecord"),status:"warning"});else a.length&&o();return Promise.resolve()},T=e=>{var t=z["proxyConfig"],o=Z["tablePage"];const{$event:r,currentPage:a,pageSize:n}=e;var i=H.value;o.currentPage=a,o.pageSize=n,X.dispatchEvent("page-change",e,r),t&&(0,_utils.isEnableConf)(i)&&X.commitProxy("query").then(e=>{X.dispatchEvent("proxy-query",e,r)})},V=t=>{var e=B.value,o=z["proxyConfig"],e=e.getComputeMaps()["computeSortOpts"],r=H.value;e.value.remote&&(Z.sortData=t.sortList,o)&&(0,_utils.isEnableConf)(r)&&(Z.tablePage.currentPage=1,X.commitProxy("query").then(e=>{X.dispatchEvent("proxy-query",e,t.$event)})),X.dispatchEvent("sort-change",t,t.$event)},D=t=>{var e=B.value,o=z["proxyConfig"],e=e.getComputeMaps()["computeFilterOpts"],r=H.value;e.value.remote&&(Z.filterData=t.filterList,o)&&(0,_utils.isEnableConf)(r)&&(Z.tablePage.currentPage=1,X.commitProxy("query").then(e=>{X.dispatchEvent("proxy-query",e,t.$event)})),X.dispatchEvent("filter-change",t,t.$event)},S=t=>{var e=z["proxyConfig"],o=H.value;e&&(0,_utils.isEnableConf)(o)&&X.commitProxy("reload").then(e=>{X.dispatchEvent("proxy-query",Object.assign(Object.assign({},e),{isReload:!0}),t.$event)}),X.dispatchEvent("form-submit",t,t.$event)},j=e=>{var t=z["proxyConfig"];const o=e["$event"];var r=H.value;t&&(0,_utils.isEnableConf)(r)&&X.commitProxy("reload").then(e=>{X.dispatchEvent("proxy-query",Object.assign(Object.assign({},e),{isReload:!0}),o)}),X.dispatchEvent("form-reset",e,o)},M=e=>{X.dispatchEvent("form-submit-invalid",e,e.$event)},q=e=>{var t=e["$event"];(0,_vue.nextTick)(()=>A.recalculate(!0)),X.dispatchEvent("form-toggle-collapse",e,t),X.dispatchEvent("form-collapse",e,t)},b=e=>{var t=Z["isZMax"];return(e?!t:t)&&(Z.isZMax=!t,Z.tZindex<(0,_utils.getLastZIndex)())&&(Z.tZindex=(0,_utils.nextZIndex)()),(0,_vue.nextTick)().then(()=>A.recalculate(!0)).then(()=>Z.isZMax)},C=(e,t)=>{e=e[t];if(e){if(!_xeUtils.default.isString(e))return e;if(s[e])return s[e];"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notSlot",[e])}return null},L=()=>{var{formConfig:e,proxyConfig:t}=z,o=Z["formData"],r=H.value,a=_.value;if(e&&(0,_utils.isEnableConf)(a)||s.form){let e=[];if(s.form)e=s.form({$grid:W});else if(a.items){const n={};if(!a.inited){a.inited=!0;const i=r.beforeItem;r&&i&&a.items.forEach(e=>{i({$grid:W,item:e})})}a.items.forEach(e=>{_xeUtils.default.each(e.slots,e=>{_xeUtils.default.isFunction(e)||s[e]&&(n[e]=s[e])})}),l&&e.push((0,_vue.h)(l,Object.assign(Object.assign({ref:g},Object.assign({},a,{data:t&&(0,_utils.isEnableConf)(r)&&r.form?o:a.data})),{onSubmit:S,onReset:j,onSubmitInvalid:M,onCollapse:q}),n))}return(0,_vue.h)("div",{ref:v,key:"form",class:"vxe-grid--form-wrapper"},e)}return(0,_vue.createCommentVNode)()},N=()=>{var t,o,r=z["toolbarConfig"],a=Q.value;if(r&&(0,_utils.isEnableConf)(a)||s.toolbar){let e=[];return s.toolbar?e=s.toolbar({$grid:W}):(r={},(o=a.slots)&&(t=C(o,"buttons"),o=C(o,"tools"),t&&(r.buttons=t),o)&&(r.tools=o),e.push((0,_vue.h)(_toolbar.default,Object.assign({ref:n},a),r))),(0,_vue.h)("div",{ref:m,key:"toolbar",class:"vxe-grid--toolbar-wrapper"},e)}return(0,_vue.createCommentVNode)()},F=()=>s.top?(0,_vue.h)("div",{ref:f,key:"top",class:"vxe-grid--top-wrapper"},s.top({$grid:W})):(0,_vue.createCommentVNode)(),$=()=>{var e=s.left;return e?(0,_vue.h)("div",{class:"vxe-grid--left-wrapper"},e({$grid:W})):(0,_vue.createCommentVNode)()},te=()=>{var e=s.right;return e?(0,_vue.h)("div",{class:"vxe-grid--right-wrapper"},e({$grid:W})):(0,_vue.createCommentVNode)()},oe=()=>{var e=z["proxyConfig"],t=U.value,o=H.value,r=Object.assign({},h);const a=s.empty,n=s.loading;e&&(0,_utils.isEnableConf)(o)&&(o.sort&&(r.onSortChange=V),o.filter)&&(r.onFilterChange=D);e={};return a&&(e.empty=()=>a({$grid:W})),n&&(e.loading=()=>n({$grid:W})),(0,_vue.h)("div",{class:"vxe-grid--table-wrapper"},[(0,_vue.h)(_table.default,Object.assign(Object.assign({ref:B},t),r),e)])},re=()=>s.bottom?(0,_vue.h)("div",{ref:p,key:"bottom",class:"vxe-grid--bottom-wrapper"},s.bottom({$grid:W})):(0,_vue.createCommentVNode)(),ae=()=>{var t,o,{proxyConfig:r,pagerConfig:a}=z,n=H.value,i=G.value;if(a&&(0,_utils.isEnableConf)(i)||s.pager){let e=[];return s.pager?e=s.pager({$grid:W}):(a={},(o=i.slots)&&(t=C(o,"left"),o=C(o,"right"),t&&(a.left=t),o)&&(a.right=o),u&&e.push((0,_vue.h)(u,Object.assign(Object.assign(Object.assign({ref:c},i),r&&(0,_utils.isEnableConf)(n)?Z.tablePage:{}),{onPageChange:T}),a))),(0,_vue.h)("div",{ref:x,key:"pager",class:"vxe-grid--pager-wrapper"},e)}return(0,_vue.createCommentVNode)()},ne=["Form","Toolbar","Top","Table","Bottom","Pager"],h={},ie=(_emits.default.forEach(t=>{var e=_xeUtils.default.camelCase("on-"+t);h[e]=(...e)=>r(t,...e)}),()=>{var{proxyConfig:e,formConfig:t}=z,o=Z["proxyInited"],r=H.value,a=_.value;if(e&&(0,_utils.isEnableConf)(r)){if(t&&(0,_utils.isEnableConf)(a)&&r.form&&a.items){const n={};a.items.forEach(t=>{var{field:o,itemRender:r}=t;if(o){let e=null;r&&(r=r["defaultValue"],_xeUtils.default.isFunction(r)?e=r({item:t}):_xeUtils.default.isUndefined(r)||(e=r)),n[o]=e}}),Z.formData=n}o||!(Z.proxyInited=!0)!==r.autoLoad&&(0,_vue.nextTick)().then(()=>X.commitProxy("_init")).then(e=>{X.dispatchEvent("proxy-query",Object.assign(Object.assign({},e),{isInited:!0}),new Event("init"))})}}),X={dispatchEvent(e,t,o){r(e,createEvent(o,{$grid:W},t))},commitProxy(t,...r){const{toolbarConfig:M,pagerConfig:a,editRules:q,validConfig:o}=z,{tablePage:n,formData:i}=Z,s=K.value,l=ee.value;var e=H.value;const u=G.value;var d=Q.value;const{beforeQuery:L,afterQuery:g,beforeDelete:N,afterDelete:c,beforeSave:F,afterSave:v,ajax:m={}}=e,f=e.response||e.props||{},p=B.value;let x=null,_=null;_=_xeUtils.default.isString(t)?(e=d["buttons"],d=M&&(0,_utils.isEnableConf)(d)&&e?_xeUtils.default.findTree(e,e=>e.code===t,{children:"dropdowns"}):null,x=d?d.item:null,t):(x=t).code;var b=x?x.params:null;switch(_){case"insert":return p.insert({});case"insert_edit":return p.insert({}).then(({row:e})=>p.setEditRow(e));case"insert_actived":return p.insert({}).then(({row:e})=>p.setEditRow(e));case"mark_cancel":R=_,E=K.value,C=B.value,(h=C.getCheckboxRecords()).length?(C.togglePendingRow(h),A.clearCheckboxRow()):E&&_ui.VxeUI.modal&&_ui.VxeUI.modal.message({id:R,content:getI18n("vxe.grid.selectOneRecord"),status:"warning"});break;case"remove":return J(_,"vxe.grid.removeSelectRecord",()=>p.removeCheckboxRow());case"import":p.importData(b);break;case"open_import":p.openImport(b);break;case"export":p.exportData(b);break;case"open_export":p.openExport(b);break;case"reset_custom":return p.resetColumn(!0);case"_init":case"reload":case"query":var C=m.query;if(C){var h="_init"===_,E="reload"===_;let t=[],o=[],e={};if(a&&((h||E)&&(n.currentPage=1),(0,_utils.isEnableConf)(u))&&(e=Object.assign({},n)),h){var R=p.getComputeMaps()["computeSortOpts"];let e=R.value.defaultSort;e&&(_xeUtils.default.isArray(e)||(e=[e]),t=e.map(e=>({field:e.field,property:e.field,order:e.order}))),o=p.getCheckedFilters()}else E?p.clearAll():(t=p.getSortColumns(),o=p.getCheckedFilters());var y={code:_,button:x,isInited:h,isReload:E,$grid:W,page:e,sort:t.length?t[0]:{},sorts:t,filters:o,form:i,options:C};Z.sortData=t,Z.filterData=o,Z.tableLoading=!0;const w=[y].concat(r);return Promise.resolve((L||C)(...w)).then(e=>{var t,o;return Z.tableLoading=!1,e?a&&(0,_utils.isEnableConf)(u)?(o=f.total,o=(_xeUtils.default.isFunction(o)?o({data:e,$grid:W}):_xeUtils.default.get(e,o||"page.total"))||0,n.total=_xeUtils.default.toNumber(o),t=f.result,Z.tableData=(_xeUtils.default.isFunction(t)?t({data:e,$grid:W}):_xeUtils.default.get(e,t||"result"))||[],t=Math.max(Math.ceil(o/n.pageSize),1),n.currentPage>t&&(n.currentPage=t)):(o=f.list,Z.tableData=(o?_xeUtils.default.isFunction(o)?o({data:e,$grid:W}):_xeUtils.default.get(e,o):e)||[]):Z.tableData=[],g&&g(...w),{status:!0}}).catch(()=>({status:Z.tableLoading=!1}))}"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.query"]);break;case"delete":{const O=m.delete;if(O){const I=A.getCheckboxRecords(),k=I.filter(e=>!p.isInsertByRow(e));y={removeRecords:k};const P=[{$grid:W,code:_,button:x,body:y,form:i,options:O}].concat(r);if(I.length)return J(_,"vxe.grid.deleteSelectRecord",()=>k.length?(Z.tableLoading=!0,Promise.resolve((N||O)(...P)).then(e=>(Z.tableLoading=!1,p.setPendingRow(k,!1),l&&_ui.VxeUI.modal&&_ui.VxeUI.modal.message({content:Y(e,"vxe.grid.delSuccess"),status:"success"}),c?c(...P):X.commitProxy("query"),{status:!0})).catch(e=>(Z.tableLoading=!1,l&&_ui.VxeUI.modal&&_ui.VxeUI.modal.message({id:_,content:Y(e,"vxe.grid.operError"),status:"error"}),{status:!1}))):p.remove(I));s&&_ui.VxeUI.modal&&_ui.VxeUI.modal.message({id:_,content:getI18n("vxe.grid.selectOneRecord"),status:"warning"})}else"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.delete"]);break}case"save":{const U=m.save;if(U){const T=p.getRecordset(),{insertRecords:V,removeRecords:$,updateRecords:D,pendingRecords:S}=T;const j=[{$grid:W,code:_,button:x,body:T,form:i,options:U}].concat(r);V.length&&(T.pendingRecords=S.filter(e=>-1===p.findRowIndexOf(V,e))),S.length&&(T.insertRecords=V.filter(e=>-1===p.findRowIndexOf(S,e)));let e=Promise.resolve();return(e=q?p[o&&"full"===o.msgMode?"fullValidate":"validate"](T.insertRecords.concat(D)):e).then(e=>{if(!e)return T.insertRecords.length||$.length||D.length||T.pendingRecords.length?(Z.tableLoading=!0,Promise.resolve((F||U)(...j)).then(e=>(Z.tableLoading=!1,p.clearPendingRow(),l&&_ui.VxeUI.modal&&_ui.VxeUI.modal.message({content:Y(e,"vxe.grid.saveSuccess"),status:"success"}),v?v(...j):X.commitProxy("query"),{status:!0})).catch(e=>(Z.tableLoading=!1,l&&_ui.VxeUI.modal&&_ui.VxeUI.modal.message({id:_,content:Y(e,"vxe.grid.operError"),status:"error"}),{status:!1}))):void(s&&_ui.VxeUI.modal&&_ui.VxeUI.modal.message({id:_,content:getI18n("vxe.grid.dataUnchanged"),status:"info"}))})}"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.save"]);break}default:var y=commands.get(_);y&&((y=y.tableCommandMethod||y.commandMethod)?y({code:_,button:x,$grid:W,$table:p},...r):"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notCommands",[_]))}return(0,_vue.nextTick)()},zoom(){return Z.isZMax?X.revert():X.maximize()},isMaximized(){return Z.isZMax},maximize(){return b(!0)},revert(){return b()},getFormItems(e){var t=_.value,o=z["formConfig"],r=t["items"];const a=[];return _xeUtils.default.eachTree(o&&(0,_utils.isEnableConf)(t)&&r?r:[],e=>{a.push(e)},{children:"children"}),_xeUtils.default.isUndefined(e)?a:a[e]},getProxyInfo(){var e,t=B.value;return z.proxyConfig?(e=Z["sortData"],{data:Z.tableData,filter:Z.filterData,form:Z.formData,sort:e.length?e[0]:{},sorts:e,pager:Z.tablePage,pendingRecords:t?t.getPendingRecords():[]}):null}},E=("development"===process.env.NODE_ENV&&(X.loadColumn=e=>{var t=B.value;return _xeUtils.default.eachTree(e,e=>{e.slots&&_xeUtils.default.each(e.slots,e=>{_xeUtils.default.isFunction(e)||s[e]||(0,_log.errLog)("vxe.error.notSlot",[e])})}),t?t.loadColumn(e):(0,_vue.nextTick)()},X.reloadColumn=e=>(A.clearAll(),X.loadColumn(e))),{extendTableMethods:t,callSlot(e,t){return e&&(_xeUtils.default.isString(e)&&(e=s[e]||null),_xeUtils.default.isFunction(e))?(0,_vn.getSlotVNs)(e(t)):[]},getExcludeHeight(){var e=z["height"],t=Z["isZMax"],o=d.value,r=v.value,a=m.value,n=f.value,i=p.value,s=x.value;return(t||"auto"!==e&&"100%"!==e?0:(0,_dom.getPaddingTopBottomSize)(o.parentNode))+(0,_dom.getPaddingTopBottomSize)(o)+(0,_dom.getOffsetHeight)(r)+(0,_dom.getOffsetHeight)(a)+(0,_dom.getOffsetHeight)(n)+(0,_dom.getOffsetHeight)(i)+(0,_dom.getOffsetHeight)(s)},getParentHeight(){var e=d.value;return e?(Z.isZMax?(0,_dom.getDomNode)().visibleHeight:_xeUtils.default.toNumber(getComputedStyle(e.parentNode).height))-E.getExcludeHeight():0},triggerToolbarCommitEvent(e,t){const o=e["code"];return X.commitProxy(e,t).then(e=>{o&&e&&e.status&&["query","reload","delete","save"].includes(o)&&X.dispatchEvent("delete"===o||"save"===o?"proxy-"+o:"proxy-query",Object.assign(Object.assign({},e),{isReload:"reload"===o}),t)})},triggerToolbarBtnEvent(e,t){E.triggerToolbarCommitEvent(e,t),X.dispatchEvent("toolbar-button-click",{code:e.code,button:e},t)},triggerToolbarTolEvent(e,t){E.triggerToolbarCommitEvent(e,t),X.dispatchEvent("toolbar-tool-click",{code:e.code,tool:e},t)},triggerZoomEvent(e){X.zoom(),X.dispatchEvent("zoom",{type:Z.isZMax?"max":"revert"},e)}}),R=(Object.assign(W,A,X,E),(0,_vue.ref)(0)),se=((0,_vue.watch)(()=>z.columns?z.columns.length:-1,()=>{R.value++}),(0,_vue.watch)(()=>z.columns,()=>{R.value++}),(0,_vue.watch)(R,()=>{(0,_vue.nextTick)(()=>W.loadColumn(z.columns||[]))}),(0,_vue.watch)(()=>z.toolbarConfig,()=>{i()}),(0,_vue.watch)(()=>z.pagerConfig,()=>{a()}),(0,_vue.watch)(()=>z.proxyConfig,()=>{ie()}),e=>{var t=o.value;globalEvents.hasKey(e,GLOBAL_EVENT_KEYS.ESCAPE)&&Z.isZMax&&!1!==t.escRestore&&E.triggerZoomEvent(e)});hooks.forEach(e=>{var e=e["setupGrid"];e&&(e=e(W))&&_xeUtils.default.isObject(e)&&Object.assign(W,e)}),a(),(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{var{data:e,columns:t,proxyConfig:o}=z,r=H.value,a=_.value;(0,_utils.isEnableConf)(o)&&(e||r.form&&a.data)&&(0,_log.errLog)("vxe.error.errConflicts",["grid.data","grid.proxy-config"]),t&&t.length&&W.loadColumn(t),i()}),globalEvents.on(W,"keydown",se)}),(0,_vue.onUnmounted)(()=>{globalEvents.off(W,"keydown")}),(0,_vue.nextTick)(()=>{"development"===process.env.NODE_ENV&&(z.formConfig&&!l&&(0,_log.errLog)("vxe.error.reqComp",["vxe-form"]),z.pagerConfig)&&!u&&(0,_log.errLog)("vxe.error.reqComp",["vxe-pager"]),ie()});return W.renderVN=()=>{var e=w.value,t=O.value;return(0,_vue.h)("div",{ref:d,class:["vxe-grid",{["size--"+e]:e,"is--animat":!!z.animat,"is--round":z.round,"is--maximize":Z.isZMax,"is--loading":z.loading||Z.tableLoading}],style:t},(()=>{var e=z["layouts"];const t=[];return(e&&e.length?e:getConfig().grid.layouts||ne).forEach(e=>{switch(e){case"Form":t.push(L());break;case"Toolbar":t.push(N());break;case"Top":t.push(F());break;case"Table":t.push((0,_vue.h)("div",{key:"table",class:"vxe-grid--table-container"},[$(),oe(),te()]));break;case"Bottom":t.push(re());break;case"Pager":t.push(ae());break;default:"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notProp",["layouts -> "+e])}}),t})())},(0,_vue.provide)("$xeGrid",W),W},render(){return this.renderVN()}});
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_ui=require("../../ui"),_table=_interopRequireDefault(require("../../table")),_toolbar=_interopRequireDefault(require("../../toolbar")),_props=_interopRequireDefault(require("../../table/src/props")),_emits=_interopRequireDefault(require("../../table/src/emits")),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const{getConfig,getI18n,commands,hooks,useFns,createEvent,globalEvents,GLOBAL_EVENT_KEYS}=_ui.VxeUI,tableComponentPropKeys=Object.keys(_props.default),tableComponentMethodKeys=["clearAll","syncData","updateData","loadData","reloadData","reloadRow","loadColumn","reloadColumn","getRowNode","getColumnNode","getRowIndex","getVTRowIndex","getVMRowIndex","getColumnIndex","getVTColumnIndex","getVMColumnIndex","setRow","createData","createRow","revertData","clearData","isInsertByRow","isUpdateByRow","getColumns","getColumnById","getColumnByField","getTableColumn","getData","getCheckboxRecords","getParentRow","getRowSeq","getRowById","getRowid","getTableData","setColumnFixed","clearColumnFixed","setColumnWidth","getColumnWidth","hideColumn","showColumn","resetColumn","refreshColumn","refreshScroll","recalculate","closeTooltip","isAllCheckboxChecked","isAllCheckboxIndeterminate","getCheckboxIndeterminateRecords","setCheckboxRow","isCheckedByCheckboxRow","isIndeterminateByCheckboxRow","toggleCheckboxRow","setAllCheckboxRow","getRadioReserveRecord","clearRadioReserve","getCheckboxReserveRecords","clearCheckboxReserve","toggleAllCheckboxRow","clearCheckboxRow","setCurrentRow","isCheckedByRadioRow","setRadioRow","clearCurrentRow","clearRadioRow","getCurrentRecord","getRadioRecord","getCurrentColumn","setCurrentColumn","clearCurrentColumn","setPendingRow","togglePendingRow","getPendingRecords","clearPendingRow","sort","clearSort","isSort","getSortColumns","closeFilter","isFilter","isActiveFilterByColumn","isRowExpandLoaded","clearRowExpandLoaded","reloadRowExpand","reloadRowExpand","toggleRowExpand","setAllRowExpand","setRowExpand","isExpandByRow","isRowExpandByRow","clearRowExpand","clearRowExpandReserve","getRowExpandRecords","getTreeExpandRecords","isTreeExpandLoaded","clearTreeExpandLoaded","reloadTreeExpand","reloadTreeChilds","toggleTreeExpand","setAllTreeExpand","setTreeExpand","isTreeExpandByRow","clearTreeExpand","clearTreeExpandReserve","getScroll","scrollTo","scrollToRow","scrollToColumn","clearScroll","updateFooter","updateStatus","setMergeCells","removeInsertRow","removeMergeCells","getMergeCells","clearMergeCells","setMergeFooterItems","removeMergeFooterItems","getMergeFooterItems","clearMergeFooterItems","openTooltip","getCellLabel","getCellElement","focus","blur","connect"],gridComponentEmits=[..._emits.default,"page-change","form-submit","form-submit-invalid","form-reset","form-collapse","form-toggle-collapse","proxy-query","proxy-delete","proxy-save","toolbar-button-click","toolbar-tool-click","zoom"];var _default=exports.default=(0,_vue.defineComponent)({name:"VxeGrid",props:Object.assign(Object.assign({},_props.default),{layouts:Array,columns:Array,pagerConfig:Object,proxyConfig:Object,toolbarConfig:Object,formConfig:Object,zoomConfig:Object,size:{type:String,default:()=>getConfig().grid.size||getConfig().size}}),emits:gridComponentEmits,setup(G,e){const{slots:i,emit:r}=e;var R=_xeUtils.default.uniqueId();const l=_ui.VxeUI.getComponent("VxeForm"),u=_ui.VxeUI.getComponent("VxePager"),w=useFns.useSize(G)["computeSize"],Q=(0,_vue.reactive)({tableLoading:!1,proxyInited:!1,isZMax:!1,tableData:[],filterData:[],formData:{},sortData:[],tZindex:0,tablePage:{total:0,pageSize:(null==(t=getConfig().pager)?void 0:t.pageSize)||10,currentPage:1}}),d=(0,_vue.ref)(),W=(0,_vue.ref)(),g=(0,_vue.ref)(),n=(0,_vue.ref)(),c=(0,_vue.ref)(),v=(0,_vue.ref)(),m=(0,_vue.ref)(),f=(0,_vue.ref)(),p=(0,_vue.ref)(),x=(0,_vue.ref)();var t=e=>{const t={};return e.forEach(o=>{t[o]=(...e)=>{var t=W.value;if(t&&t[o])return t[o](...e)}}),t};const Y=t(tableComponentMethodKeys),J=(tableComponentMethodKeys.forEach(o=>{Y[o]=(...e)=>{var t=W.value;if(t&&t[o])return t&&t[o](...e)}}),(0,_vue.computed)(()=>_xeUtils.default.merge({},getConfig().grid.proxyConfig,G.proxyConfig))),se=(0,_vue.computed)(()=>{var e=J.value;return _xeUtils.default.isBoolean(e.message)?e.message:e.showResponseMsg}),X=(0,_vue.computed)(()=>{return J.value.showActiveMsg}),ee=(0,_vue.computed)(()=>Object.assign({},getConfig().grid.pagerConfig,G.pagerConfig)),b=(0,_vue.computed)(()=>Object.assign({},getConfig().grid.formConfig,G.formConfig)),te=(0,_vue.computed)(()=>Object.assign({},getConfig().grid.toolbarConfig,G.toolbarConfig)),o=(0,_vue.computed)(()=>Object.assign({},getConfig().grid.zoomConfig,G.zoomConfig)),O=(0,_vue.computed)(()=>Q.isZMax?{zIndex:Q.tZindex}:null),I=(0,_vue.computed)(()=>{const t={},o=G;return tableComponentPropKeys.forEach(e=>{t[e]=o[e]}),t}),k={refElem:d,refTable:W,refForm:g,refToolbar:n,refPager:c},P={computeProxyOpts:J,computePagerOpts:ee,computeFormOpts:b,computeToolbarOpts:te,computeZoomOpts:o},oe={xID:R,props:G,context:e,reactData:Q,getRefMaps:()=>k,getComputeMaps:()=>P},U=(0,_vue.computed)(()=>{var{seqConfig:e,pagerConfig:t,loading:o,editConfig:r,proxyConfig:a}=G,{isZMax:n,tableLoading:s,tablePage:i,tableData:l}=Q,u=I.value,d=J.value,g=ee.value,c=Object.assign({},u);return n&&(u.maxHeight?c.maxHeight="100%":c.height="100%"),a&&(0,_utils.isEnableConf)(d)&&(c.loading=o||s,c.data=l,t)&&d.seq&&(0,_utils.isEnableConf)(g)&&(c.seqConfig=Object.assign({},e,{startIndex:(i.currentPage-1)*i.pageSize})),r&&(c.editConfig=Object.assign({},r)),c}),s=()=>{var e=te.value;G.toolbarConfig&&(0,_utils.isEnableConf)(e)&&(0,_vue.nextTick)(()=>{var e=W.value,t=n.value;e&&t&&e.connect(t)})},a=()=>{var e=Q["tablePage"],t=G["pagerConfig"],o=ee.value,{currentPage:r,pageSize:a}=o;t&&(0,_utils.isEnableConf)(o)&&(r&&(e.currentPage=r),a)&&(e.pageSize=a)},re=(e,t)=>{var o=J.value,o=(o.response||o.props||{}).message;let r;return(r=e&&o?_xeUtils.default.isFunction(o)?o({data:e,$grid:oe}):_xeUtils.default.get(e,o):r)||getI18n(t)},ae=(e,t,o)=>{var r=X.value,a=Y.getCheckboxRecords();if(r)if(a.length){if(_ui.VxeUI.modal)return _ui.VxeUI.modal.confirm({id:"cfm_"+e,content:getI18n(t),escClosable:!0}).then(e=>{if("confirm"===e)return o()})}else _ui.VxeUI.modal&&_ui.VxeUI.modal.message({id:"msg_"+e,content:getI18n("vxe.grid.selectOneRecord"),status:"warning"});else a.length&&o();return Promise.resolve()},j=e=>{var t=G["proxyConfig"],o=Q["tablePage"];const{$event:r,currentPage:a,pageSize:n}=e;var s=J.value;o.currentPage=a,o.pageSize=n,ne.dispatchEvent("page-change",e,r),t&&(0,_utils.isEnableConf)(s)&&ne.commitProxy("query").then(e=>{ne.dispatchEvent("proxy-query",e,r)})},T=t=>{var e=W.value,o=G["proxyConfig"],e=e.getComputeMaps()["computeSortOpts"],r=J.value;e.value.remote&&(Q.sortData=t.sortList,o)&&(0,_utils.isEnableConf)(r)&&(Q.tablePage.currentPage=1,ne.commitProxy("query").then(e=>{ne.dispatchEvent("proxy-query",e,t.$event)})),ne.dispatchEvent("sort-change",t,t.$event)},V=t=>{var e=W.value,o=G["proxyConfig"],e=e.getComputeMaps()["computeFilterOpts"],r=J.value;e.value.remote&&(Q.filterData=t.filterList,o)&&(0,_utils.isEnableConf)(r)&&(Q.tablePage.currentPage=1,ne.commitProxy("query").then(e=>{ne.dispatchEvent("proxy-query",e,t.$event)})),ne.dispatchEvent("filter-change",t,t.$event)},D=t=>{var e=G["proxyConfig"],o=J.value;e&&(0,_utils.isEnableConf)(o)&&ne.commitProxy("reload").then(e=>{ne.dispatchEvent("proxy-query",Object.assign(Object.assign({},e),{isReload:!0}),t.$event)}),ne.dispatchEvent("form-submit",t,t.$event)},S=e=>{var t=G["proxyConfig"];const o=e["$event"];var r=J.value;t&&(0,_utils.isEnableConf)(r)&&ne.commitProxy("reload").then(e=>{ne.dispatchEvent("proxy-query",Object.assign(Object.assign({},e),{isReload:!0}),o)}),ne.dispatchEvent("form-reset",e,o)},q=e=>{ne.dispatchEvent("form-submit-invalid",e,e.$event)},M=e=>{var t=e["$event"];(0,_vue.nextTick)(()=>Y.recalculate(!0)),ne.dispatchEvent("form-toggle-collapse",e,t),ne.dispatchEvent("form-collapse",e,t)},_=e=>{var t=Q["isZMax"];return(e?!t:t)&&(Q.isZMax=!t,Q.tZindex<(0,_utils.getLastZIndex)())&&(Q.tZindex=(0,_utils.nextZIndex)()),(0,_vue.nextTick)().then(()=>Y.recalculate(!0)).then(()=>Q.isZMax)},C=(e,t)=>{e=e[t];if(e){if(!_xeUtils.default.isString(e))return e;if(i[e])return i[e];"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notSlot",[e])}return null},L=()=>{var{formConfig:e,proxyConfig:t}=G,o=Q["formData"],r=J.value,a=b.value;if(e&&(0,_utils.isEnableConf)(a)||i.form){let e=[];if(i.form)e=i.form({$grid:oe});else if(a.items){const n={};if(!a.inited){a.inited=!0;const s=r.beforeItem;r&&s&&a.items.forEach(e=>{s({$grid:oe,item:e})})}a.items.forEach(e=>{_xeUtils.default.each(e.slots,e=>{_xeUtils.default.isFunction(e)||i[e]&&(n[e]=i[e])})}),l&&e.push((0,_vue.h)(l,Object.assign(Object.assign({ref:g},Object.assign({},a,{data:t&&(0,_utils.isEnableConf)(r)&&r.form?o:a.data})),{onSubmit:D,onReset:S,onSubmitInvalid:q,onCollapse:M}),n))}return(0,_vue.h)("div",{ref:v,key:"form",class:"vxe-grid--form-wrapper"},e)}return(0,_vue.createCommentVNode)()},N=()=>{var t,o,r=G["toolbarConfig"],a=te.value;if(r&&(0,_utils.isEnableConf)(a)||i.toolbar){let e=[];return i.toolbar?e=i.toolbar({$grid:oe}):(r={},(o=a.slots)&&(t=C(o,"buttons"),o=C(o,"tools"),t&&(r.buttons=t),o)&&(r.tools=o),e.push((0,_vue.h)(_toolbar.default,Object.assign({ref:n},a),r))),(0,_vue.h)("div",{ref:m,key:"toolbar",class:"vxe-grid--toolbar-wrapper"},e)}return(0,_vue.createCommentVNode)()},F=()=>i.top?(0,_vue.h)("div",{ref:f,key:"top",class:"vxe-grid--top-wrapper"},i.top({$grid:oe})):(0,_vue.createCommentVNode)(),$=()=>{var e=i.left;return e?(0,_vue.h)("div",{class:"vxe-grid--left-wrapper"},e({$grid:oe})):(0,_vue.createCommentVNode)()},z=()=>{var e=i.right;return e?(0,_vue.h)("div",{class:"vxe-grid--right-wrapper"},e({$grid:oe})):(0,_vue.createCommentVNode)()},Z=()=>{var e=G["proxyConfig"],t=U.value,o=J.value,r=Object.assign({},h);const a=i.empty,n=i.loading;e&&(0,_utils.isEnableConf)(o)&&(o.sort&&(r.onSortChange=T),o.filter)&&(r.onFilterChange=V);e={};return a&&(e.empty=()=>a({$grid:oe})),n&&(e.loading=()=>n({$grid:oe})),(0,_vue.h)("div",{class:"vxe-grid--table-wrapper"},[(0,_vue.h)(_table.default,Object.assign(Object.assign({ref:W},t),r),e)])},B=()=>i.bottom?(0,_vue.h)("div",{ref:p,key:"bottom",class:"vxe-grid--bottom-wrapper"},i.bottom({$grid:oe})):(0,_vue.createCommentVNode)(),A=()=>{var t,o,{proxyConfig:r,pagerConfig:a}=G,n=J.value,s=ee.value;if(a&&(0,_utils.isEnableConf)(s)||i.pager){let e=[];return i.pager?e=i.pager({$grid:oe}):(a={},(o=s.slots)&&(t=C(o,"left"),o=C(o,"right"),t&&(a.left=t),o)&&(a.right=o),u&&e.push((0,_vue.h)(u,Object.assign(Object.assign(Object.assign({ref:c},s),r&&(0,_utils.isEnableConf)(n)?Q.tablePage:{}),{onPageChange:j}),a))),(0,_vue.h)("div",{ref:x,key:"pager",class:"vxe-grid--pager-wrapper"},e)}return(0,_vue.createCommentVNode)()},H=["Form","Toolbar","Top","Table","Bottom","Pager"],h={},K=(_emits.default.forEach(t=>{var e=_xeUtils.default.camelCase("on-"+t);h[e]=(...e)=>r(t,...e)}),()=>{var{proxyConfig:e,formConfig:t}=G,o=Q["proxyInited"],r=J.value,a=b.value;if(e&&(0,_utils.isEnableConf)(r)){if(t&&(0,_utils.isEnableConf)(a)&&r.form&&a.items){const n={};a.items.forEach(t=>{var{field:o,itemRender:r}=t;if(o){let e=null;r&&(r=r["defaultValue"],_xeUtils.default.isFunction(r)?e=r({item:t}):_xeUtils.default.isUndefined(r)||(e=r)),n[o]=e}}),Q.formData=n}o||!(Q.proxyInited=!0)!==r.autoLoad&&(0,_vue.nextTick)().then(()=>ne.commitProxy("_init")).then(e=>{ne.dispatchEvent("proxy-query",Object.assign(Object.assign({},e),{isInited:!0}),new Event("init"))})}}),ne={dispatchEvent(e,t,o){r(e,createEvent(o,{$grid:oe},t))},commitProxy(t,...r){const{toolbarConfig:q,pagerConfig:a,editRules:M,validConfig:L}=G,{tablePage:n,formData:s}=Q,N=X.value,o=se.value;var e=J.value;const F=ee.value;var i=te.value;const{beforeQuery:$,afterQuery:z,beforeDelete:Z,afterDelete:B,beforeSave:A,afterSave:H,ajax:l={}}=e,u=e.response||e.props||{},d=W.value;let g=null,c=null;c=_xeUtils.default.isString(t)?(e=i["buttons"],i=q&&(0,_utils.isEnableConf)(i)&&e?_xeUtils.default.findTree(e,e=>e.code===t,{children:"dropdowns"}):null,g=i?i.item:null,t):(g=t).code;var v=g?g.params:null;switch(c){case"insert":return d.insert({});case"insert_edit":return d.insert({}).then(({row:e})=>d.setEditRow(e));case"insert_actived":return d.insert({}).then(({row:e})=>d.setEditRow(e));case"mark_cancel":x=c,p=X.value,m=W.value,(f=m.getCheckboxRecords()).length?(m.togglePendingRow(f),Y.clearCheckboxRow()):p&&_ui.VxeUI.modal&&_ui.VxeUI.modal.message({id:x,content:getI18n("vxe.grid.selectOneRecord"),status:"warning"});break;case"remove":return ae(c,"vxe.grid.removeSelectRecord",()=>d.removeCheckboxRow());case"import":d.importData(v);break;case"open_import":d.openImport(v);break;case"export":d.exportData(v);break;case"open_export":d.openExport(v);break;case"reset_custom":return d.resetColumn(!0);case"_init":case"reload":case"query":{var m=l.query;const _=l.querySuccess,C=l.queryError;if(m){var f="_init"===c,p="reload"===c;let t=[],o=[],e={};if(a&&((f||p)&&(n.currentPage=1),(0,_utils.isEnableConf)(F))&&(e=Object.assign({},n)),f){var x=d.getComputeMaps()["computeSortOpts"];let e=x.value.defaultSort;e&&(_xeUtils.default.isArray(e)||(e=[e]),t=e.map(e=>({field:e.field,property:e.field,order:e.order}))),o=d.getCheckedFilters()}else p?d.clearAll():(t=d.getSortColumns(),o=d.getCheckedFilters());const h={code:c,button:g,isInited:f,isReload:p,$grid:oe,page:e,sort:t.length?t[0]:{},sorts:t,filters:o,form:s,options:m};return Q.sortData=t,Q.filterData=o,Q.tableLoading=!0,Promise.resolve(($||m)(h,...r)).then(e=>{var t,o;return Q.tableLoading=!1,e?a&&(0,_utils.isEnableConf)(F)?(o=u.total,o=(_xeUtils.default.isFunction(o)?o({data:e,$grid:oe}):_xeUtils.default.get(e,o||"page.total"))||0,n.total=_xeUtils.default.toNumber(o),t=u.result,Q.tableData=(_xeUtils.default.isFunction(t)?t({data:e,$grid:oe}):_xeUtils.default.get(e,t||"result"))||[],t=Math.max(Math.ceil(o/n.pageSize),1),n.currentPage>t&&(n.currentPage=t)):(o=u.list,Q.tableData=(o?_xeUtils.default.isFunction(o)?o({data:e,$grid:oe}):_xeUtils.default.get(e,o):e)||[]):Q.tableData=[],z&&z(h,...r),_&&_(Object.assign(Object.assign({},h),{response:e})),{status:!0}}).catch(e=>(Q.tableLoading=!1,C&&C(Object.assign(Object.assign({},h),{response:e})),{status:!1}))}"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.query"]);break}case"delete":{const E=l.delete,y=l.deleteSuccess,R=l.deleteError;if(E){const w=Y.getCheckboxRecords(),O=w.filter(e=>!d.isInsertByRow(e));var b={removeRecords:O};const I={$grid:oe,code:c,button:g,body:b,form:s,options:E};if(w.length)return ae(c,"vxe.grid.deleteSelectRecord",()=>O.length?(Q.tableLoading=!0,Promise.resolve((Z||E)(I,...r)).then(e=>(Q.tableLoading=!1,d.setPendingRow(O,!1),o&&_ui.VxeUI.modal&&_ui.VxeUI.modal.message({content:re(e,"vxe.grid.delSuccess"),status:"success"}),B?B(I,...r):ne.commitProxy("query"),y&&y(Object.assign(Object.assign({},I),{response:e})),{status:!0})).catch(e=>(Q.tableLoading=!1,o&&_ui.VxeUI.modal&&_ui.VxeUI.modal.message({id:c,content:re(e,"vxe.grid.operError"),status:"error"}),R&&R(Object.assign(Object.assign({},I),{response:e})),{status:!1}))):d.remove(w));N&&_ui.VxeUI.modal&&_ui.VxeUI.modal.message({id:c,content:getI18n("vxe.grid.selectOneRecord"),status:"warning"})}else"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.delete"]);break}case"save":{const k=l.save,P=l.saveSuccess,U=l.saveError;if(k){const j=d.getRecordset(),{insertRecords:T,removeRecords:K,updateRecords:V,pendingRecords:D}=j,S={$grid:oe,code:c,button:g,body:j,form:s,options:k};T.length&&(j.pendingRecords=D.filter(e=>-1===d.findRowIndexOf(T,e))),D.length&&(j.insertRecords=T.filter(e=>-1===d.findRowIndexOf(D,e)));let e=Promise.resolve();return(e=M?d[L&&"full"===L.msgMode?"fullValidate":"validate"](j.insertRecords.concat(V)):e).then(e=>{if(!e)return j.insertRecords.length||K.length||V.length||j.pendingRecords.length?(Q.tableLoading=!0,Promise.resolve((A||k)(S,...r)).then(e=>(Q.tableLoading=!1,d.clearPendingRow(),o&&_ui.VxeUI.modal&&_ui.VxeUI.modal.message({content:re(e,"vxe.grid.saveSuccess"),status:"success"}),H?H(S,...r):ne.commitProxy("query"),P&&P(Object.assign(Object.assign({},S),{response:e})),{status:!0})).catch(e=>(Q.tableLoading=!1,o&&_ui.VxeUI.modal&&_ui.VxeUI.modal.message({id:c,content:re(e,"vxe.grid.operError"),status:"error"}),U&&U(Object.assign(Object.assign({},S),{response:e})),{status:!1}))):void(N&&_ui.VxeUI.modal&&_ui.VxeUI.modal.message({id:c,content:getI18n("vxe.grid.dataUnchanged"),status:"info"}))})}"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.save"]);break}default:var b=commands.get(c);b&&((b=b.tableCommandMethod||b.commandMethod)?b({code:c,button:g,$grid:oe,$table:d},...r):"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notCommands",[c]))}return(0,_vue.nextTick)()},zoom(){return Q.isZMax?ne.revert():ne.maximize()},isMaximized(){return Q.isZMax},maximize(){return _(!0)},revert(){return _()},getFormItems(e){var t=b.value,o=G["formConfig"],r=t["items"];const a=[];return _xeUtils.default.eachTree(o&&(0,_utils.isEnableConf)(t)&&r?r:[],e=>{a.push(e)},{children:"children"}),_xeUtils.default.isUndefined(e)?a:a[e]},getProxyInfo(){var e,t=W.value;return G.proxyConfig?(e=Q["sortData"],{data:Q.tableData,filter:Q.filterData,form:Q.formData,sort:e.length?e[0]:{},sorts:e,pager:Q.tablePage,pendingRecords:t?t.getPendingRecords():[]}):null}},E=("development"===process.env.NODE_ENV&&(ne.loadColumn=e=>{var t=W.value;return _xeUtils.default.eachTree(e,e=>{e.slots&&_xeUtils.default.each(e.slots,e=>{_xeUtils.default.isFunction(e)||i[e]||(0,_log.errLog)("vxe.error.notSlot",[e])})}),t?t.loadColumn(e):(0,_vue.nextTick)()},ne.reloadColumn=e=>(Y.clearAll(),ne.loadColumn(e))),{extendTableMethods:t,callSlot(e,t){return e&&(_xeUtils.default.isString(e)&&(e=i[e]||null),_xeUtils.default.isFunction(e))?(0,_vn.getSlotVNs)(e(t)):[]},getExcludeHeight(){var e=G["height"],t=Q["isZMax"],o=d.value,r=v.value,a=m.value,n=f.value,s=p.value,i=x.value;return(t||"auto"!==e&&"100%"!==e?0:(0,_dom.getPaddingTopBottomSize)(o.parentNode))+(0,_dom.getPaddingTopBottomSize)(o)+(0,_dom.getOffsetHeight)(r)+(0,_dom.getOffsetHeight)(a)+(0,_dom.getOffsetHeight)(n)+(0,_dom.getOffsetHeight)(s)+(0,_dom.getOffsetHeight)(i)},getParentHeight(){var e=d.value;return e?(Q.isZMax?(0,_dom.getDomNode)().visibleHeight:_xeUtils.default.toNumber(getComputedStyle(e.parentNode).height))-E.getExcludeHeight():0},triggerToolbarCommitEvent(e,t){const o=e["code"];return ne.commitProxy(e,t).then(e=>{o&&e&&e.status&&["query","reload","delete","save"].includes(o)&&ne.dispatchEvent("delete"===o||"save"===o?"proxy-"+o:"proxy-query",Object.assign(Object.assign({},e),{isReload:"reload"===o}),t)})},triggerToolbarBtnEvent(e,t){E.triggerToolbarCommitEvent(e,t),ne.dispatchEvent("toolbar-button-click",{code:e.code,button:e},t)},triggerToolbarTolEvent(e,t){E.triggerToolbarCommitEvent(e,t),ne.dispatchEvent("toolbar-tool-click",{code:e.code,tool:e},t)},triggerZoomEvent(e){ne.zoom(),ne.dispatchEvent("zoom",{type:Q.isZMax?"max":"revert"},e)}}),y=(Object.assign(oe,Y,ne,E),(0,_vue.ref)(0)),ie=((0,_vue.watch)(()=>G.columns?G.columns.length:-1,()=>{y.value++}),(0,_vue.watch)(()=>G.columns,()=>{y.value++}),(0,_vue.watch)(y,()=>{(0,_vue.nextTick)(()=>oe.loadColumn(G.columns||[]))}),(0,_vue.watch)(()=>G.toolbarConfig,()=>{s()}),(0,_vue.watch)(()=>G.pagerConfig,()=>{a()}),(0,_vue.watch)(()=>G.proxyConfig,()=>{K()}),e=>{var t=o.value;globalEvents.hasKey(e,GLOBAL_EVENT_KEYS.ESCAPE)&&Q.isZMax&&!1!==t.escRestore&&E.triggerZoomEvent(e)});hooks.forEach(e=>{var e=e["setupGrid"];e&&(e=e(oe))&&_xeUtils.default.isObject(e)&&Object.assign(oe,e)}),a(),(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{var{data:e,columns:t,proxyConfig:o}=G,r=J.value,a=b.value;(0,_utils.isEnableConf)(o)&&(e||r.form&&a.data)&&(0,_log.errLog)("vxe.error.errConflicts",["grid.data","grid.proxy-config"]),t&&t.length&&oe.loadColumn(t),s()}),globalEvents.on(oe,"keydown",ie)}),(0,_vue.onUnmounted)(()=>{globalEvents.off(oe,"keydown")}),(0,_vue.nextTick)(()=>{"development"===process.env.NODE_ENV&&(G.formConfig&&!l&&(0,_log.errLog)("vxe.error.reqComp",["vxe-form"]),G.pagerConfig)&&!u&&(0,_log.errLog)("vxe.error.reqComp",["vxe-pager"]),K()});return oe.renderVN=()=>{var e=w.value,t=O.value;return(0,_vue.h)("div",{ref:d,class:["vxe-grid",{["size--"+e]:e,"is--animat":!!G.animat,"is--round":G.round,"is--maximize":Q.isZMax,"is--loading":G.loading||Q.tableLoading}],style:t},(()=>{var e=G["layouts"];const t=[];return(e&&e.length?e:getConfig().grid.layouts||H).forEach(e=>{switch(e){case"Form":t.push(L());break;case"Toolbar":t.push(N());break;case"Top":t.push(F());break;case"Table":t.push((0,_vue.h)("div",{key:"table",class:"vxe-grid--table-container"},[$(),Z(),z()]));break;case"Bottom":t.push(B());break;case"Pager":t.push(A());break;default:"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notProp",["layouts -> "+e])}}),t})())},(0,_vue.provide)("$xeGrid",oe),oe},render(){return this.renderVN()}});

package/lib/index.umd.js

@@ -1951,9 +1951,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.59";
+const version = "4.7.60";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.59";
+core_.VxeUI.tableVersion = "4.7.60";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2332,7 +2332,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.7.59"}`;
+const log_version = `table v${"4.7.60"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5841,7 +5841,7 @@ const header_renderType = 'header';
           } = column;
           const isColGroup = column.children && column.children.length;
           const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : !!column.fixed && overflowX;
-          const headOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showHeaderOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
+          const headOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
           const headAlign = headerAlign || align || allHeaderAlign || allAlign;
           let showEllipsis = headOverflow === 'ellipsis';
           const showTitle = headOverflow === 'title';
@@ -6174,7 +6174,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
           const showAllTip = tooltipOpts.showAll;
           const isColGroup = column.children && column.children.length;
           const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : column.fixed && overflowX;
-          const footOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showFooterOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
+          const footOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
           const footAlign = footerAlign || align || allFooterAlign || allAlign;
           let showEllipsis = footOverflow === 'ellipsis';
           const showTitle = footOverflow === 'title';
@@ -19665,6 +19665,9 @@ export_hook_hooks.add('tableExportModule', {
               const {
                 computeProxyOpts
               } = $xeGrid.getComputeMaps();
+              const {
+                sortData
+              } = gridReactData;
               const proxyOpts = computeProxyOpts.value;
               const {
                 beforeQueryAll,
@@ -19673,6 +19676,8 @@ export_hook_hooks.add('tableExportModule', {
                 props = {}
               } = proxyOpts;
               const ajaxMethods = ajax.queryAll;
+              const queryAllSuccessMethods = ajax.queryAllSuccess;
+              const queryAllErrorMethods = ajax.queryAllError;
               if (true) {
                 if (!ajaxMethods) {
                   warnLog('vxe.error.notFunc', ['proxy-config.ajax.queryAll']);
@@ -19682,18 +19687,31 @@ export_hook_hooks.add('tableExportModule', {
                 const params = {
                   $table: $xeTable,
                   $grid: $xeGrid,
-                  sort: gridReactData.sortData,
+                  sort: sortData.length ? sortData[0] : {},
+                  sorts: sortData,
                   filters: gridReactData.filterData,
                   form: gridReactData.formData,
-                  target: ajaxMethods,
                   options: opts
                 };
-                return Promise.resolve((beforeQueryAll || ajaxMethods)(params)).catch(e => e).then(rest => {
+                return Promise.resolve((beforeQueryAll || ajaxMethods)(params)).then(rest => {
                   opts.data = (props.list ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(rest, props.list) : rest) || [];
                   if (afterQueryAll) {
                     afterQueryAll(params);
                   }
+                  if (queryAllSuccessMethods) {
+                    queryAllSuccessMethods({
+                      ...params,
+                      response: rest
+                    });
+                  }
                   return handleExport(opts);
+                }).catch(rest => {
+                  if (queryAllErrorMethods) {
+                    queryAllErrorMethods({
+                      ...params,
+                      response: rest
+                    });
+                  }
                 });
               }
             }
@@ -21703,7 +21721,7 @@ function getSelectCellValue(renderOpts, {
   let selectItem;
   const labelProp = optionProps.label || 'label';
   const valueProp = optionProps.value || 'value';
-  if (!isEmptyValue(cellValue)) {
+  if (!(cellValue === null || cellValue === undefined)) {
     return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().map(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(cellValue) ? cellValue : [cellValue], optionGroups ? value => {
       const groupOptions = optionGroupProps.options || 'options';
       for (let index = 0; index < optionGroups.length; index++) {
@@ -21742,7 +21760,7 @@ function getTreeSelectCellValue(renderOpts, {
   const labelProp = optionProps.label || 'label';
   const valueProp = optionProps.value || 'value';
   const childrenProp = optionProps.children || 'children';
-  if (!isEmptyValue(cellValue)) {
+  if (!(cellValue === null || cellValue === undefined)) {
     const keyMaps = {};
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(options, item => {
       keyMaps[external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(item, valueProp)] = item;
@@ -21802,7 +21820,7 @@ render_renderer.mixin({
     exportMethod: handleExportSelectMethod
   },
   VxeInput: {
-    autofocus: '.vxe-input--inner',
+    autofocus: 'input',
     renderEdit: defaultEditRender,
     renderCell(renderOpts, params) {
       const {
@@ -21835,7 +21853,7 @@ render_renderer.mixin({
     defaultFilterMethod: handleInputFilterMethod
   },
   VxeNumberInput: {
-    autofocus: '.vxe-number-input--inner',
+    autofocus: 'input',
     renderEdit: defaultEditRender,
     renderCell(renderOpts, params) {
       const {
@@ -21861,7 +21879,7 @@ render_renderer.mixin({
     defaultFilterMethod: handleInputFilterMethod
   },
   VxeDatePicker: {
-    autofocus: '.vxe-date-picker--inner',
+    autofocus: 'input',
     renderEdit: defaultEditRender,
     renderCell(renderOpts, params) {
       const {
@@ -21890,7 +21908,7 @@ render_renderer.mixin({
     defaultFilterMethod: handleFilterMethod
   },
   VxeTextarea: {
-    autofocus: '.vxe-textarea--inner'
+    autofocus: 'VxeTextarea'
   },
   VxeButton: {
     renderDefault: buttonCellRender
@@ -21908,7 +21926,7 @@ render_renderer.mixin({
     }
   },
   VxeSelect: {
-    autofocus: '.vxe-input--inner',
+    autofocus: 'input',
     renderEdit: defaultSelectEditRender,
     renderDefault: defaultSelectEditRender,
     renderCell(renderOpts, params) {
@@ -21942,7 +21960,7 @@ render_renderer.mixin({
     exportMethod: handleExportSelectMethod
   },
   VxeTreeSelect: {
-    autofocus: '.vxe-input--inner',
+    autofocus: 'input',
     renderEdit: defaultTreeSelectEditRender,
     renderCell(renderOpts, params) {
       return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
@@ -21956,7 +21974,7 @@ render_renderer.mixin({
     renderDefault: radioAndCheckboxEditRender
   },
   VxeSwitch: {
-    autofocus: '.vxe-switch--button',
+    autofocus: 'button',
     renderEdit: defaultEditRender,
     renderDefault: defaultEditRender
   },
@@ -22456,6 +22474,7 @@ const {
                   round: item.round,
                   status: item.status,
                   content: item.name,
+                  permissionCode: item.permissionCode,
                   destroyOnClose: item.destroyOnClose,
                   placement: item.placement,
                   transfer: item.transfer,
@@ -22806,7 +22825,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
       };
     });
     const computeProxyOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
-      return Object.assign({}, grid_getConfig().grid.proxyConfig, props.proxyConfig);
+      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().merge({}, grid_getConfig().grid.proxyConfig, props.proxyConfig);
     });
     const computeIsRespMsg = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const proxyOpts = computeProxyOpts.value;
@@ -23569,6 +23588,8 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
           case 'query':
             {
               const ajaxMethods = ajax.query;
+              const querySuccessMethods = ajax.querySuccess;
+              const queryErrorMethods = ajax.queryError;
               if (ajaxMethods) {
                 const isInited = code === '_init';
                 const isReload = code === 'reload';
@@ -23629,8 +23650,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                 reactData.sortData = sortList;
                 reactData.filterData = filterList;
                 reactData.tableLoading = true;
-                const applyArgs = [commitParams].concat(args);
-                return Promise.resolve((beforeQuery || ajaxMethods)(...applyArgs)).then(rest => {
+                return Promise.resolve((beforeQuery || ajaxMethods)(commitParams, ...args)).then(rest => {
                   reactData.tableLoading = false;
                   if (rest) {
                     if (pagerConfig && isEnableConf(pagerOpts)) {
@@ -23661,13 +23681,25 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                     reactData.tableData = [];
                   }
                   if (afterQuery) {
-                    afterQuery(...applyArgs);
+                    afterQuery(commitParams, ...args);
+                  }
+                  if (querySuccessMethods) {
+                    querySuccessMethods({
+                      ...commitParams,
+                      response: rest
+                    });
                   }
                   return {
                     status: true
                   };
-                }).catch(() => {
+                }).catch(rest => {
                   reactData.tableLoading = false;
+                  if (queryErrorMethods) {
+                    queryErrorMethods({
+                      ...commitParams,
+                      response: rest
+                    });
+                  }
                   return {
                     status: false
                   };
@@ -23682,6 +23714,8 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
           case 'delete':
             {
               const ajaxMethods = ajax.delete;
+              const deleteSuccessMethods = ajax.deleteSuccess;
+              const deleteErrorMethods = ajax.deleteError;
               if (ajaxMethods) {
                 const selectRecords = gridExtendTableMethods.getCheckboxRecords();
                 const removeRecords = selectRecords.filter(row => !$xeTable.isInsertByRow(row));
@@ -23696,14 +23730,13 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                   form: formData,
                   options: ajaxMethods
                 };
-                const applyArgs = [commitParams].concat(args);
                 if (selectRecords.length) {
                   return handleDeleteRow(code, 'vxe.grid.deleteSelectRecord', () => {
                     if (!removeRecords.length) {
                       return $xeTable.remove(selectRecords);
                     }
                     reactData.tableLoading = true;
-                    return Promise.resolve((beforeDelete || ajaxMethods)(...applyArgs)).then(rest => {
+                    return Promise.resolve((beforeDelete || ajaxMethods)(commitParams, ...args)).then(rest => {
                       reactData.tableLoading = false;
                       $xeTable.setPendingRow(removeRecords, false);
                       if (isRespMsg) {
@@ -23715,10 +23748,16 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                         }
                       }
                       if (afterDelete) {
-                        afterDelete(...applyArgs);
+                        afterDelete(commitParams, ...args);
                       } else {
                         gridMethods.commitProxy('query');
                       }
+                      if (deleteSuccessMethods) {
+                        deleteSuccessMethods({
+                          ...commitParams,
+                          response: rest
+                        });
+                      }
                       return {
                         status: true
                       };
@@ -23733,6 +23772,12 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                           });
                         }
                       }
+                      if (deleteErrorMethods) {
+                        deleteErrorMethods({
+                          ...commitParams,
+                          response: rest
+                        });
+                      }
                       return {
                         status: false
                       };
@@ -23759,6 +23804,8 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
           case 'save':
             {
               const ajaxMethods = ajax.save;
+              const saveSuccessMethods = ajax.saveSuccess;
+              const saveErrorMethods = ajax.saveError;
               if (ajaxMethods) {
                 const body = $xeTable.getRecordset();
                 const {
@@ -23775,7 +23822,6 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                   form: formData,
                   options: ajaxMethods
                 };
-                const applyArgs = [commitParams].concat(args);
                 // 排除掉新增且标记为删除的数据
                 if (insertRecords.length) {
                   body.pendingRecords = pendingRecords.filter(row => $xeTable.findRowIndexOf(insertRecords, row) === -1);
@@ -23796,7 +23842,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                   }
                   if (body.insertRecords.length || removeRecords.length || updateRecords.length || body.pendingRecords.length) {
                     reactData.tableLoading = true;
-                    return Promise.resolve((beforeSave || ajaxMethods)(...applyArgs)).then(rest => {
+                    return Promise.resolve((beforeSave || ajaxMethods)(commitParams, ...args)).then(rest => {
                       reactData.tableLoading = false;
                       $xeTable.clearPendingRow();
                       if (isRespMsg) {
@@ -23808,10 +23854,16 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                         }
                       }
                       if (afterSave) {
-                        afterSave(...applyArgs);
+                        afterSave(commitParams, ...args);
                       } else {
                         gridMethods.commitProxy('query');
                       }
+                      if (saveSuccessMethods) {
+                        saveSuccessMethods({
+                          ...commitParams,
+                          response: rest
+                        });
+                      }
                       return {
                         status: true
                       };
@@ -23826,6 +23878,12 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                           });
                         }
                       }
+                      if (saveErrorMethods) {
+                        saveErrorMethods({
+                          ...commitParams,
+                          response: rest
+                        });
+                      }
                       return {
                         status: false
                       };