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

package/es/table/src/footer.js

@@ -32,8 +32,7 @@ function renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $
         const renderOpts = editRender || cellRender;
         const compConf = renderOpts ? renderer.get(renderOpts.name) : null;
         const showAllTip = tooltipOpts.showAll;
-        const isColGroup = column.children && column.children.length;
-        const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : column.fixed && overflowX;
+        const fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
         const isPadding = XEUtils.isBoolean(footerCellOpts.padding) ? footerCellOpts.padding : cellOpts.padding;
         const footOverflow = XEUtils.eqNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
         const footAlign = footerAlign || (compConf ? compConf.tableFooterCellAlign : '') || allFooterAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
@@ -122,7 +121,7 @@ function renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $
         const isLastColumn = $columnIndex === tableColumn.length - 1;
         const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
         let isVNPreEmptyStatus = false;
-        if (isOptimizeMode && !isMergeCell) {
+        if (isOptimizeMode && overflowX && !isMergeCell) {
             if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
                 isVNPreEmptyStatus = true;
             }

package/es/table/src/header.js

@@ -31,7 +31,7 @@ const renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
         const renderOpts = editRender || cellRender;
         const compConf = renderOpts ? renderer.get(renderOpts.name) : null;
         const isColGroup = column.children && column.children.length;
-        const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : column.fixed && overflowX;
+        const fixedHiddenColumn = overflowX && !isColGroup && (fixedType ? column.fixed !== fixedType : !!column.fixed);
         const isPadding = XEUtils.isBoolean(headerCellOpts.padding) ? headerCellOpts.padding : cellOpts.padding;
         const headOverflow = XEUtils.isUndefined(showHeaderOverflow) || XEUtils.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
         const headAlign = headerAlign || (compConf ? compConf.tableHeaderCellAlign : '') || allHeaderAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
@@ -92,7 +92,7 @@ const renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
         const showResizable = (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || allResizable));
         const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
         let isVNPreEmptyStatus = false;
-        if (isOptimizeMode && !isGroup) {
+        if (isOptimizeMode && overflowX && !isGroup) {
             if (!dragCol || dragCol.id !== colid) {
                 if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
                     isVNPreEmptyStatus = true;

package/es/table/src/methods.js

@@ -110,7 +110,7 @@ function handleVirtualXVisible($xeTable) {
                 break;
             }
         }
-        return { toVisibleIndex: Math.max(0, toVisibleIndex), visibleSize: Math.max(1, visibleSize) };
+        return { toVisibleIndex: Math.max(0, toVisibleIndex), visibleSize: Math.max(6, visibleSize) };
     }
     return { toVisibleIndex: 0, visibleSize: 6 };
 }

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.17.0-beta.6";
+export const version = "3.17.0-beta.7";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.17.0-beta.6"}`;
+const version = `table v${"3.17.0-beta.7"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/grid/src/grid.js

@@ -1100,6 +1100,62 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
       });
       return _xeUtils.default.isUndefined(itemIndex) ? itemList : itemList[itemIndex];
     },
+    resetForm() {
+      const $xeGrid = this;
+      const $form = $xeGrid.$refs.refForm;
+      if ($form) {
+        return $form.reset();
+      }
+      return $xeGrid.$nextTick();
+    },
+    validateForm() {
+      const $xeGrid = this;
+      const $form = $xeGrid.$refs.refForm;
+      if ($form) {
+        return $form.validate();
+      }
+      return $xeGrid.$nextTick();
+    },
+    validateFormField(field) {
+      const $xeGrid = this;
+      const $form = $xeGrid.$refs.refForm;
+      if ($form) {
+        return $form.validateField(field);
+      }
+      return $xeGrid.$nextTick();
+    },
+    clearFormValidate(field) {
+      const $xeGrid = this;
+      const $form = $xeGrid.$refs.refForm;
+      if ($form) {
+        return $form.clearValidate(field);
+      }
+      return $xeGrid.$nextTick();
+    },
+    homePage() {
+      const $xeGrid = this;
+      const $pager = $xeGrid.$refs.refPager;
+      if ($pager) {
+        return $pager.homePage();
+      }
+      return $xeGrid.$nextTick();
+    },
+    endPage() {
+      const $xeGrid = this;
+      const $pager = $xeGrid.$refs.refPager;
+      if ($pager) {
+        return $pager.endPage();
+      }
+      return $xeGrid.$nextTick();
+    },
+    jumpPage(currentPage) {
+      const $xeGrid = this;
+      const $pager = $xeGrid.$refs.refPager;
+      if ($pager) {
+        return $pager.jumpPage(currentPage);
+      }
+      return $xeGrid.$nextTick();
+    },
     triggerToolbarCommitEvent(params, evnt) {
       const $xeGrid = this;
       const {

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_ui=require("../../ui"),_table=_interopRequireDefault(require("../../table/src/table")),_toolbar=_interopRequireDefault(require("../../toolbar/src/toolbar")),_props=_interopRequireDefault(require("../../table/src/props")),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getConfig,getI18n,commands,globalEvents,globalMixins,createEvent,GLOBAL_EVENT_KEYS,renderEmptyElement}=_ui.VxeUI,tableMethods={},propKeys=Object.keys(_props.default),defaultLayouts=[["Form"],["Toolbar","Top","Table","Bottom","Pager"]];function getTableOns(r){var{$listeners:e,proxyConfig:t,proxyOpts:o}=r;let a={};return _xeUtils.default.each(e,(e,t)=>{a[t]=(...e)=>{r.$emit(t,...e)}}),t&&(o.sort&&(a["sort-change"]=r.sortChangeEvent),o.filter)&&(a["filter-change"]=r.filterChangeEvent),a}_xeUtils.default.each(_table.default.methods,(e,r)=>{tableMethods[r]=function(...e){var t=this.$refs.refTable;return t&&t[r](...e)}});var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeGrid",mixins:[globalMixins.sizeMixin],props:Object.assign(Object.assign({round:{type:Boolean,default:()=>getConfig().table.round},height:[Number,String],minHeight:{type:[Number,String],default:()=>getConfig().table.minHeight},maxHeight:[Number,String],seqConfig:Object,sortConfig:Object,filterConfig:Object,editConfig:[Boolean,Object],loading:Boolean,validConfig:Object,editRules:Object,animat:{type:Boolean,default:()=>getConfig().table.animat}},_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}}),provide(){return{$xeGrid:this}},data(){var e;return{xID:_xeUtils.default.uniqueId(),reactData:{tableLoading:!1,proxyInited:!1,isZMax:!1,tableData:[],filterData:[],formData:{},sortData:[],tZindex:0,tablePage:{total:0,pageSize:(null==(e=getConfig().pager)?void 0:e.pageSize)||10,currentPage:1}}}},computed:Object.assign(Object.assign({},{}),{isRespMsg(){return this.computeIsRespMsg},computeIsRespMsg(){var e=this.computeProxyOpts;return!!(_xeUtils.default.isBoolean(e.message)?e.message:e.showResponseMsg)},isActiveMsg(){return this.computeIsActiveMsg},computeIsActiveMsg(){var e=this.computeProxyOpts;return _xeUtils.default.isBoolean(e.showActionMsg)?e.showActionMsg:!!e.showActiveMsg},proxyOpts(){return this.computeProxyOpts},computeProxyOpts(){return _xeUtils.default.merge({},_xeUtils.default.clone(getConfig().grid.proxyConfig,!0),this.proxyConfig)},pagerOpts(){return this.computePagerOpts},computePagerOpts(){return Object.assign({},getConfig().grid.pagerConfig,this.pagerConfig)},formOpts(){return this.computeFormOpts},computeFormOpts(){return Object.assign({},getConfig().grid.formConfig,this.formConfig)},toolbarOpts(){return this.computeToolbarOpts},computeToolbarOpts(){return Object.assign({},getConfig().grid.toolbarConfig,this.toolbarConfig)},zoomOpts(){return this.computeZoomOpts},computeZoomOpts(){return Object.assign({},getConfig().grid.zoomConfig,this.zoomConfig)},computeStyles(){var{height:e,maxHeight:t}=this,{isZMax:r,tZindex:o}=this.reactData,a={};return r?a.zIndex=o:(e&&(a.height="auto"===e||"100%"===e?"100%":(0,_dom.toCssUnit)(e)),t&&(a.maxHeight="auto"===t||"100%"===t?"100%":(0,_dom.toCssUnit)(t))),a},computeTableExtendProps(){let t={},r=this;return propKeys.forEach(e=>{t[e]=r[e]}),t},computeTableProps(){var e=this,{seqConfig:t,pagerConfig:r,editConfig:o,proxyConfig:a}=e,{isZMax:s,tablePage:i}=e.reactData,n=e.computeTableExtendProps,l=e.computeProxyOpts,g=e.computePagerOpts,e=e.computeIsLoading,u=Object.assign({},n);return s&&(n.maxHeight?u.maxHeight="100%":u.height="100%"),a&&(0,_utils.isEnableConf)(l)&&(u.loading=e,r)&&l.seq&&(0,_utils.isEnableConf)(g)&&(u.seqConfig=Object.assign({},t,{startIndex:(i.currentPage-1)*i.pageSize})),o&&(u.editConfig=Object.assign({},o)),u},tableProps(){return this.computeTableProps},computeCurrLayoutConf(){var e=this.layouts;let t=[],r=[],o=[],a=[];return(t=e&&e.length?e:getConfig().grid.layouts||defaultLayouts).length&&(_xeUtils.default.isArray(t[0])?(r=t[0],o=t[1]||[],a=t[2]||[]):o=t),{headKeys:r,bodyKeys:o,footKeys:a}},computeCustomCurrentPageFlag(){return this.computePagerOpts.currentPage},computeCustomPageSizeFlag(){return this.computePagerOpts.pageSize},computeCustomTotalFlag(){return this.computePagerOpts.total},computeIsLoading(){var{loading:e,proxyConfig:t}=this,r=this.reactData.tableLoading,o=this.computeProxyOpts,a=o.showLoading;return e||r&&a&&t&&(0,_utils.isEnableConf)(o)}}),watch:{columns(e){let t=this;t.$nextTick(()=>t.loadColumn(e))},toolbar(e){e&&this.initToolbar()},toolbarConfig(e){e&&this.initToolbar()},proxyConfig(){this.initProxy()},computeCustomCurrentPageFlag(){this.initPages("currentPage")},computeCustomPageSizeFlag(){this.initPages("pageSize")},computeCustomTotalFlag(){this.initPages("total")}},methods:Object.assign(Object.assign({},tableMethods),{dispatchEvent(e,t,r){this.$emit(e,createEvent(r,{$grid:this},t))},initPages(e){var t=this.reactData.tablePage,r=this.pagerConfig,o=this.computePagerOpts;r&&(0,_utils.isEnableConf)(o)&&(e?o[e]&&(t[e]=_xeUtils.default.toNumber(o[e])):({currentPage:r,pageSize:e,total:o}=o,r&&(t.currentPage=r),e&&(t.pageSize=e),o&&(t.pageSize=o)))},callSlot(e,t,r,o){var a=this.$scopedSlots;return e&&(_xeUtils.default.isString(e)&&(e=a[e]||null),_xeUtils.default.isFunction(e))?(0,_vn.getSlotVNs)(e.call(this,t,r,o)):[]},getEl(){return this.$refs.refElem},getExcludeHeight(){var e,t,r,o,a,s=this,i=s.reactData.isZMax,n=s.$refs.refElem;return n?(e=s.$refs.refFormWrapper,t=s.$refs.refToolbarWrapper,r=s.$refs.refTopWrapper,o=s.$refs.refBottomWrapper,s=s.$refs.refPagerWrapper,a=n.parentElement,(!i&&a?(0,_dom.getPaddingTopBottomSize)(a):0)+(0,_dom.getPaddingTopBottomSize)(n)+(0,_dom.getOffsetHeight)(e)+(0,_dom.getOffsetHeight)(t)+(0,_dom.getOffsetHeight)(r)+(0,_dom.getOffsetHeight)(o)+(0,_dom.getOffsetHeight)(s)):0},getParentHeight(){var e=this.reactData,t=this.$refs.refElem;return t?(t=t.parentElement,(e.isZMax?(0,_dom.getDomNode)().visibleHeight:t?_xeUtils.default.toNumber(getComputedStyle(t).height):0)-this.getExcludeHeight()):0},initToolbar(){let r=this;r.$nextTick(()=>{var e=r.$refs.refTable,t=r.$refs.refToolbar;e&&t&&e.connect(t)})},getDefaultFormData(){var e=this.computeFormOpts;if(e.items){let a={};return e.items.forEach(t=>{var{field:r,itemRender:o}=t;if(r){let e=null;o&&(o=o.defaultValue,_xeUtils.default.isFunction(o)?e=o({item:t}):_xeUtils.default.isUndefined(o)||(e=o)),a[r]=e}}),a}return{}},initProxy(){let t=this;var e=t,r=t.reactData,{proxyConfig:e,formConfig:o}=e,a=r.proxyInited,s=t.computeProxyOpts,i=t.computeFormOpts;e&&((0,_utils.isEnableConf)(o)&&s.form&&i.items&&(r.formData=t.getDefaultFormData()),a||!1===s.autoLoad||(r.proxyInited=!0,t.$nextTick().then(()=>t.commitProxy("initial")).then(e=>{t.dispatchEvent("proxy-query",Object.assign(Object.assign({},e),{isInited:!0}),new Event("initial"))})))},handleGlobalKeydownEvent(e){var t=this.reactData,r=this.computeZoomOpts;globalEvents.hasKey(e,GLOBAL_EVENT_KEYS.ESCAPE)&&t.isZMax&&!1!==r.escRestore&&this.triggerZoomEvent(e)},getRespMsg(e,t){var r=this.computeProxyOpts,r=(r.response||r.props||{}).message;let o;return(o=e&&r?_xeUtils.default.isFunction(r)?r({data:e,$grid:this}):_xeUtils.default.get(e,r):o)||getI18n(t)},handleDeleteRow(e,t,r){var o=this.computeIsActiveMsg,a=this.getCheckboxRecords();if(o)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 r()})}else _ui.VxeUI.modal&&_ui.VxeUI.modal.message({id:"msg_"+e,content:getI18n("vxe.grid.selectOneRecord"),status:"warning"});else a.length&&r();return Promise.resolve()},triggerPendingEvent(e){var t=this.computeIsActiveMsg,r=this.$refs.refTable,o=r.getCheckboxRecords();o.length?(r.togglePendingRow(o),this.clearCheckboxRow()):t&&_ui.VxeUI.modal&&_ui.VxeUI.modal.message({id:e,content:getI18n("vxe.grid.selectOneRecord"),status:"warning"})},commitProxy(t,...d){let c=this;var e=c;let p=c.reactData;var r=e.toolbar;let{proxyConfig:o,toolbarConfig:a,pagerConfig:l,editRules:m,validConfig:f}=e,g=p.tablePage,h=c.computeIsActiveMsg,b=c.computeIsRespMsg;var u=c.computeProxyOpts;let x=c.computePagerOpts;var s,e=c.computeToolbarOpts;let{beforeQuery:v,afterQuery:y,beforeDelete:n,afterDelete:_,beforeSave:C,afterSave:E,ajax:O={}}=u,P=u.response||u.props||{},S=c.$refs.refTable,T=c.getFormData(),$=null,D=null;D=_xeUtils.default.isString(t)?(s=e.buttons,r=(a||r)&&(0,_utils.isEnableConf)(e)&&s?_xeUtils.default.findTree(s,e=>e.code===t,{children:"dropdowns"}):null,$=r?r.item:null,t):($=t).code;var i=$?$.params:null;switch(D){case"insert":return S.insert({});case"insert_edit":return S.insert({}).then(({row:e})=>S.setEditRow(e,!0));case"insert_actived":return S.insert({}).then(({row:e})=>S.setEditRow(e,!0));case"mark_cancel":c.triggerPendingEvent(D);break;case"remove":return c.handleDeleteRow(D,"vxe.grid.removeSelectRecord",()=>S.removeCheckboxRow());case"import":S.importData(i);break;case"open_import":S.openImport(i);break;case"export":S.exportData(i);break;case"open_export":S.openExport(i);break;case"reset_custom":S.resetCustom(!0);break;case"initial":case"reload":case"query":{var U=O.query;let n=O.querySuccess,t=O.queryError;if(U){var I="initial"===D,L="reload"===D;if(!I&&p.tableLoading)return c.$nextTick();let r=[],a=[],e={};if(l&&((I||L)&&(g.currentPage=1),(0,_utils.isEnableConf)(l))&&(e=Object.assign({},g)),I){if(o&&(0,_utils.isEnableConf)(u)&&u.form&&(T=c.getDefaultFormData(),p.formData=T),S){let{tableFullColumn:e,fullColumnFieldData:o}=S,t=S.computeSortOpts.defaultSort;e.forEach(e=>{e.order=null}),t&&(_xeUtils.default.isArray(t)||(t=[t]),r=t.map(e=>{var{field:e,order:t}=e,r=o[e];return r&&(r=r.column)&&(r.order=t),{field:e,property:e,order:t}})),a=S.getCheckedFilters()}}else S&&(L?S.clearAll():(r=S.getSortColumns(),a=S.getCheckedFilters()));let s={code:D,button:$,isInited:I,isReload:L,$grid:c,page:e,sort:r.length?r[0]:{},sorts:r,filters:a,form:T,options:U},i=(p.sortData=r,p.filterData=a,p.tableLoading=!0,[s].concat(d));return Promise.resolve((v||U)(...i)).then(e=>{let t=[];var r,o;return p.tableLoading=!1,e&&(l&&(0,_utils.isEnableConf)(x)?(o=P.total,o=(_xeUtils.default.isFunction(o)?o({data:e,$grid:c}):_xeUtils.default.get(e,o||"page.total"))||0,g.total=_xeUtils.default.toNumber(o),r=P.result,t=(_xeUtils.default.isFunction(r)?r({data:e,$grid:c}):_xeUtils.default.get(e,r||"result"))||[],r=Math.max(Math.ceil(o/g.pageSize),1),g.currentPage>r&&(g.currentPage=r)):(o=P.list,t=(o?_xeUtils.default.isFunction(o)?o({data:e,$grid:c}):_xeUtils.default.get(e,o):e)||[])),S?S.loadData(t):S.$nextTick(()=>{S&&S.loadData(t)}),y&&y(...i),n&&n(Object.assign(Object.assign({},s),{response:e})),{status:!0}}).catch(e=>(p.tableLoading=!1,t&&t(Object.assign(Object.assign({},s),{response:e})),{status:!1}))}(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.query"]);break}case"delete":{let a=O.delete,s=O.deleteSuccess,i=O.deleteError;if(a){let e=S.getCheckboxRecords(),t=e.filter(e=>!S.isInsertByRow(e));I={removeRecords:t};let r={$grid:c,code:D,button:$,body:I,form:T,options:a},o=[r].concat(d);if(e.length)return c.handleDeleteRow(D,"vxe.grid.deleteSelectRecord",()=>t.length?(p.tableLoading=!0,Promise.resolve((n||a)(...o)).then(e=>(p.tableLoading=!1,S.setPendingRow(t,!1),b&&(_ui.VxeUI.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_ui.VxeUI.modal.message({content:c.getRespMsg(e,"vxe.grid.delSuccess"),status:"success"})),_?_(...o):c.commitProxy("query"),s&&s(Object.assign(Object.assign({},r),{response:e})),{status:!0})).catch(e=>(p.tableLoading=!1,b&&(_ui.VxeUI.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_ui.VxeUI.modal.message({id:D,content:c.getRespMsg(e,"vxe.grid.operError"),status:"error"})),i&&i(Object.assign(Object.assign({},r),{response:e})),{status:!1}))):S.remove(e));h&&(_ui.VxeUI.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_ui.VxeUI.modal.message({id:D,content:getI18n("vxe.grid.selectOneRecord"),status:"warning"}))}else(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.delete"]);break}case"save":{let l=O.save,g=O.saveSuccess,u=O.saveError;if(l){let t=c.getRecordset(),{insertRecords:r,removeRecords:o,updateRecords:a,pendingRecords:s}=t,i={$grid:c,code:D,button:$,body:t,form:T,options:l},n=[i].concat(d),e=(r.length&&(t.pendingRecords=s.filter(e=>-1===r.indexOf(e))),s.length&&(t.insertRecords=r.filter(e=>-1===s.indexOf(e))),Promise.resolve());return(e=m?c[f&&"full"===f.msgMode?"fullValidate":"validate"](t.insertRecords.concat(a)):e).then(e=>{if(!e)return t.insertRecords.length||o.length||a.length||t.pendingRecords.length?(p.tableLoading=!0,Promise.resolve((C||l)(...n)).then(e=>(p.tableLoading=!1,S.clearPendingRow(),b&&(_ui.VxeUI.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_ui.VxeUI.modal.message({content:c.getRespMsg(e,"vxe.grid.saveSuccess"),status:"success"})),E?E(...n):c.commitProxy("query"),g&&g(Object.assign(Object.assign({},i),{response:e})),{status:!0})).catch(e=>(p.tableLoading=!1,b&&(_ui.VxeUI.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_ui.VxeUI.modal.message({id:D,content:c.getRespMsg(e,"vxe.grid.operError"),status:"error"})),u&&u(Object.assign(Object.assign({},i),{response:e})),{status:!1}))):void(h&&(_ui.VxeUI.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_ui.VxeUI.modal.message({id:D,content:getI18n("vxe.grid.dataUnchanged"),status:"info"})))})}(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.save"]);break}default:L=commands.get(D);L&&(L.commandMethod?L.commandMethod({code:D,button:$,$grid:c,$table:S},...d):(0,_log.errLog)("vxe.error.notCommands",[D]))}return c.$nextTick()},getFormData(){var e=this.proxyConfig,t=this.reactData.formData,r=this.computeProxyOpts,o=this.computeFormOpts;return e&&(0,_utils.isEnableConf)(r)&&r.form?t:o.data},getFormItems(e){var t=this.computeFormOpts,r=this.formConfig,o=t.items;let a=[];return _xeUtils.default.eachTree(r&&(0,_utils.isEnableConf)(t)&&o?o:[],e=>{a.push(e)},{children:"children"}),_xeUtils.default.isUndefined(e)?a:a[e]},triggerToolbarCommitEvent(e,t){let r=this,o=e.code;return r.commitProxy(e,t).then(e=>{o&&e&&e.status&&["query","reload","delete","save"].includes(o)&&r.dispatchEvent("delete"===o||"save"===o?"proxy-"+o:"proxy-query",Object.assign(Object.assign({},e),{isReload:"reload"===o}),t)})},triggerToolbarBtnEvent(e,t){this.triggerToolbarCommitEvent(e,t),this.dispatchEvent("toolbar-button-click",{code:e.code,button:e},t)},triggerToolbarTolEvent(e,t){this.triggerToolbarCommitEvent(e,t),this.dispatchEvent("toolbar-tool-click",{code:e.code,tool:e},t)},sortChangeEvent(t){let r=this;var e=r,o=r.reactData,a=r.$refs.refTable,e=e.proxyConfig,s=r.computeProxyOpts;a.computeSortOpts.remote&&(o.sortData=t.sortList,e)&&(0,_utils.isEnableConf)(s)&&(o.tablePage.currentPage=1,r.commitProxy("query").then(e=>{r.dispatchEvent("proxy-query",e,t.$event)})),r.dispatchEvent("sort-change",t,t.$event)},pageChangeEvent(e){let t=this;var r=t.proxyConfig,o=t.reactData.tablePage;let{$event:a,currentPage:s,pageSize:i}=e;var n=t.computeProxyOpts;o.currentPage=s,o.pageSize=i,t.dispatchEvent("page-change",e,a),r&&(0,_utils.isEnableConf)(n)&&t.commitProxy("query").then(e=>{t.dispatchEvent("proxy-query",e,a)})},filterChangeEvent(t){let r=this;var e=r,o=r.reactData,a=r.$refs.refTable,e=e.proxyConfig,s=r.computeProxyOpts;a.computeFilterOpts.remote&&(o.filterData=t.filterList,e)&&(0,_utils.isEnableConf)(s)&&(o.tablePage.currentPage=1,r.commitProxy("query").then(e=>{r.dispatchEvent("proxy-query",e,t.$event)})),r.dispatchEvent("filter-change",t,t.$event)},submitFormEvent(t){let r=this;var e=r,o=r.reactData,e=e.proxyConfig,a=r.computeProxyOpts;o.tableLoading||(e&&(0,_utils.isEnableConf)(a)&&r.commitProxy("reload").then(e=>{r.dispatchEvent("proxy-query",Object.assign(Object.assign({},e),{isReload:!0}),t.$event)}),r.dispatchEvent("form-submit",t,t.$event))},resetFormEvent(e){let t=this;var r=t,o=t.$refs.refTable,r=r.proxyConfig;let a=e.$event;var s=t.computeProxyOpts;r&&(0,_utils.isEnableConf)(s)&&(o.clearScroll(),t.commitProxy("reload").then(e=>{t.dispatchEvent("proxy-query",Object.assign(Object.assign({},e),{isReload:!0}),a)})),t.dispatchEvent("form-reset",e,a)},submitInvalidEvent(e){this.dispatchEvent("form-submit-invalid",e,e.$event)},collapseEvent(e){var t=e.$event;this.dispatchEvent("form-toggle-collapse",e,t),this.dispatchEvent("form-collapse",e,t)},triggerZoomEvent(e){var t=this.reactData;this.zoom(),this.dispatchEvent("zoom",{type:t.isZMax?"max":"revert"},e)},zoom(){return this[this.reactData.isZMax?"revert":"maximize"]()},isMaximized(){return this.reactData.isZMax},maximize(){return this.handleZoom(!0)},revert(){return this.handleZoom()},handleZoom(e){let t=this,r=t.reactData;var o=r.isZMax;return(e?!o:o)&&(r.isZMax=!o,r.tZindex<(0,_utils.getLastZIndex)())&&(r.tZindex=(0,_utils.nextZIndex)()),t.$nextTick().then(()=>t.recalculate(!0)).then(()=>(setTimeout(()=>t.recalculate(!0),15),r.isZMax))},getProxyInfo(){var e,t=this.$refs.refTable,r=this.reactData;return this.proxyConfig?(e=r.sortData,{data:t?t.getFullData():[],filter:r.filterData,form:this.getFormData(),sort:e.length?e[0]:{},sorts:e,pager:r.tablePage,pendingRecords:t?t.getPendingRecords():[]}):null},loadColumn(e){let t=this.$scopedSlots;var r=this.$refs.refTable;return _xeUtils.default.eachTree(e,e=>{e.slots&&_xeUtils.default.each(e.slots,e=>{_xeUtils.default.isFunction(e)||t[e]||(0,_log.errLog)("vxe.error.notSlot",[e])})}),r.loadColumn(e)},reloadColumn(e){return this.clearAll(),this.loadColumn(e)},getConfigSlot(e){let r=this.$scopedSlots,o={};return _xeUtils.default.objectMap(e,(e,t)=>{e&&(_xeUtils.default.isString(e)?r[e]?o[t]=r[e]:(0,_log.errLog)("vxe.error.notSlot",[e]):o[t]=e)}),o},getToolbarSlots(){var e,t,r,o,a=this,s=a.$scopedSlots,i=a.computeToolbarOpts.slots,n={};return!s.buttons||i&&"buttons"===i.buttons||(0,_log.warnLog)("vxe.error.reqProp",["toolbar-config.slots.buttons"]),!s.tools||i&&"tools"===i.tools||(0,_log.warnLog)("vxe.error.reqProp",["toolbar-config.slots.tools"]),i&&(s=a.getFuncSlot(i,"buttons"),e=a.getFuncSlot(i,"buttonPrefix"),t=a.getFuncSlot(i,"buttonSuffix"),r=a.getFuncSlot(i,"tools"),o=a.getFuncSlot(i,"toolPrefix"),a=a.getFuncSlot(i,"toolSuffix"),s&&(n.buttons=s),e&&(n.buttonPrefix=e),t&&(n.buttonSuffix=t),r&&(n.tools=r),o&&(n.toolPrefix=o),a)&&(n.toolSuffix=a),n},getFuncSlot(e,t){var r=this.$scopedSlots,e=e[t];if(e){if(!_xeUtils.default.isString(e))return e;if(r[e])return r[e];(0,_log.errLog)("vxe.error.notSlot",[e])}return null},renderDefaultForm(e){var r=_ui.VxeUI.getComponent("VxeForm");let o=this;var a=o;let s=o.$scopedSlots;var{proxyConfig:a,formConfig:t}=a,i=o.reactData.formData,n=o.computeProxyOpts,l=o.computeFormOpts;if((0,_utils.isEnableConf)(t)&&l.items&&l.items.length){let t={};if(!l.inited){l.inited=!0;let t=n.beforeItem;n&&t&&l.items.forEach(e=>{t.call(o,{$grid:o,item:e})})}return l.items.forEach(e=>{_xeUtils.default.each(e.slots,e=>{_xeUtils.default.isFunction(e)||s[e]&&(t[e]=s[e])})}),[r?e(r,{props:Object.assign({},l,{data:a&&n.form?i:l.data}),on:{submit:o.submitFormEvent,reset:o.resetFormEvent,collapse:o.collapseEvent,"submit-invalid":o.submitInvalidEvent},scopedSlots:t}):renderEmptyElement(o)]}return[]},renderForm(e){var t=this,r=t.formConfig,o=t.$scopedSlots.form;return!o&&!(0,_utils.isEnableConf)(r)?renderEmptyElement(t):e("div",{key:"form",ref:"refFormWrapper",class:"vxe-grid--form-wrapper"},o?o.call(t,{$grid:t}):t.renderDefaultForm(e))},renderToolbar(e){var t=this,r=t.toolbarConfig,o=t.$scopedSlots.toolbar,r=!!(o||(0,_utils.isEnableConf)(r)||toolbar),a=t.computeToolbarOpts;return r?e("div",{key:"toolbar",ref:"refToolbarWrapper",class:"vxe-grid--toolbar-wrapper"},o?o.call(t,{$grid:t}):[e(_toolbar.default,{props:Object.assign({},a,{slots:void 0}),ref:"refToolbar",scopedSlots:t.getToolbarSlots()})]):renderEmptyElement(t)},renderTop(e){var t=this.$scopedSlots.top;return t?e("div",{key:"top",ref:"refTopWrapper",class:"vxe-grid--top-wrapper"},t.call(this,{$grid:this})):renderEmptyElement(this)},renderTableLeft(e){var t=this.$scopedSlots.left;return t?e("div",{class:"vxe-grid--left-wrapper"},t({$grid:this})):renderEmptyElement(this)},renderTableRight(e){var t=this.$scopedSlots.right;return t?e("div",{class:"vxe-grid--right-wrapper"},t({$grid:this})):renderEmptyElement(this)},renderTable(e){var t=this.$scopedSlots,r=this.computeTableProps;return e("div",{class:"vxe-grid--table-wrapper"},[e(_table.default,{key:"table",props:r,on:getTableOns(this),scopedSlots:t,ref:"refTable"})])},renderBottom(e){var t=this.$scopedSlots.bottom;return t?e("div",{key:"bottom",ref:"refBottomWrapper",class:"vxe-grid--bottom-wrapper"},t.call(this,{$grid:this})):renderEmptyElement(this)},renderPager(e){var t=_ui.VxeUI.getComponent("VxePager"),r=this,o=r.$scopedSlots,a=r.reactData,{proxyConfig:s,pagerConfig:i}=r,n=r.computeProxyOpts,l=r.computePagerOpts,g=o.pager;return i&&(0,_utils.isEnableConf)(l)||o.pager?e("div",{ref:"refPagerWrapper",key:"pager",class:"vxe-grid--pager-wrapper"},g?g.call(r,{$grid:r}):[t?e(t,{ref:"refPager",props:Object.assign(Object.assign({},l),s&&(0,_utils.isEnableConf)(n)?a.tablePage:{}),on:{"page-change":r.pageChangeEvent},scopedSlots:r.getConfigSlot(l.slots)}):renderEmptyElement(r)]):renderEmptyElement(r)},renderChildLayout(t,e){let r=this,o=[];return e.forEach(e=>{switch(e){case"Form":o.push(r.renderForm(t));break;case"Toolbar":o.push(r.renderToolbar(t));break;case"Top":o.push(r.renderTop(t));break;case"Table":o.push(t("div",{key:"table",class:"vxe-grid--table-container"},[r.renderTableLeft(t),r.renderTable(t),r.renderTableRight(t)]));break;case"Bottom":o.push(r.renderBottom(t));break;case"Pager":o.push(r.renderPager(t));break;default:(0,_log.errLog)("vxe.error.notProp",["layouts -> "+e])}}),o},renderLayout(e){var t=this,r=t.$scopedSlots,{headKeys:o,bodyKeys:a,footKeys:s}=t.computeCurrLayoutConf,i=r.asideLeft||r["aside-left"],r=r.asideRight||r["aside-right"];return[e("div",{class:"vxe-grid--layout-header-wrapper"},t.renderChildLayout(e,o)),e("div",{class:"vxe-grid--layout-body-wrapper"},[i?e("div",{class:"vxe-grid--layout-aside-left-wrapper"},i({})):renderEmptyElement(t),e("div",{class:"vxe-grid--layout-body-content-wrapper"},t.renderChildLayout(e,a)),r?e("div",{class:"vxe-grid--layout-aside-right-wrapper"},r({})):renderEmptyElement(t)]),e("div",{class:"vxe-grid--layout-footer-wrapper"},t.renderChildLayout(e,s))]},renderVN(e){var t=this,r=t.reactData,o=t.computeSize;return e("div",{ref:"refElem",class:["vxe-grid",{["size--"+o]:o,"is--animat":!!t.animat,"is--round":t.round,"is--maximize":r.isZMax,"is--loading":t.computeIsLoading}],style:t.computeStyles},t.renderLayout(e))}}),created(){let e=_ui.VxeUI.getComponent("VxeForm"),t=_ui.VxeUI.getComponent("VxePager");var r=this;let o=r;var a=r.computeProxyOpts;o.toolbar&&(0,_log.errLog)("vxe.error.delProp",["grid.toolbar","grid.toolbar-config"]),o.toolbarConfig&&!_xeUtils.default.isObject(o.toolbarConfig)&&(0,_log.errLog)("vxe.error.errProp",["grid.toolbar-config="+o.toolbarConfig,"grid.toolbar-config={}"]),a.props&&(0,_log.warnLog)("vxe.error.delProp",["proxy-config.props","proxy-config.response"]),r.$nextTick(()=>{o.formConfig&&!e&&(0,_log.errLog)("vxe.error.reqComp",["vxe-form"]),o.pagerConfig&&!t&&(0,_log.errLog)("vxe.error.reqComp",["vxe-pager"])}),r.initPages(),globalEvents.on(r,"keydown",r.handleGlobalKeydownEvent)},mounted(){var e=this.columns;e&&e.length&&this.loadColumn(e),this.initToolbar(),this.initProxy()},destroyed(){globalEvents.off(this,"keydown")},render(e){return this.renderVN(e)}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_ui=require("../../ui"),_table=_interopRequireDefault(require("../../table/src/table")),_toolbar=_interopRequireDefault(require("../../toolbar/src/toolbar")),_props=_interopRequireDefault(require("../../table/src/props")),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getConfig,getI18n,commands,globalEvents,globalMixins,createEvent,GLOBAL_EVENT_KEYS,renderEmptyElement}=_ui.VxeUI,tableMethods={},propKeys=Object.keys(_props.default),defaultLayouts=[["Form"],["Toolbar","Top","Table","Bottom","Pager"]];function getTableOns(r){var{$listeners:e,proxyConfig:t,proxyOpts:o}=r;let a={};return _xeUtils.default.each(e,(e,t)=>{a[t]=(...e)=>{r.$emit(t,...e)}}),t&&(o.sort&&(a["sort-change"]=r.sortChangeEvent),o.filter)&&(a["filter-change"]=r.filterChangeEvent),a}_xeUtils.default.each(_table.default.methods,(e,r)=>{tableMethods[r]=function(...e){var t=this.$refs.refTable;return t&&t[r](...e)}});var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeGrid",mixins:[globalMixins.sizeMixin],props:Object.assign(Object.assign({round:{type:Boolean,default:()=>getConfig().table.round},height:[Number,String],minHeight:{type:[Number,String],default:()=>getConfig().table.minHeight},maxHeight:[Number,String],seqConfig:Object,sortConfig:Object,filterConfig:Object,editConfig:[Boolean,Object],loading:Boolean,validConfig:Object,editRules:Object,animat:{type:Boolean,default:()=>getConfig().table.animat}},_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}}),provide(){return{$xeGrid:this}},data(){var e;return{xID:_xeUtils.default.uniqueId(),reactData:{tableLoading:!1,proxyInited:!1,isZMax:!1,tableData:[],filterData:[],formData:{},sortData:[],tZindex:0,tablePage:{total:0,pageSize:(null==(e=getConfig().pager)?void 0:e.pageSize)||10,currentPage:1}}}},computed:Object.assign(Object.assign({},{}),{isRespMsg(){return this.computeIsRespMsg},computeIsRespMsg(){var e=this.computeProxyOpts;return!!(_xeUtils.default.isBoolean(e.message)?e.message:e.showResponseMsg)},isActiveMsg(){return this.computeIsActiveMsg},computeIsActiveMsg(){var e=this.computeProxyOpts;return _xeUtils.default.isBoolean(e.showActionMsg)?e.showActionMsg:!!e.showActiveMsg},proxyOpts(){return this.computeProxyOpts},computeProxyOpts(){return _xeUtils.default.merge({},_xeUtils.default.clone(getConfig().grid.proxyConfig,!0),this.proxyConfig)},pagerOpts(){return this.computePagerOpts},computePagerOpts(){return Object.assign({},getConfig().grid.pagerConfig,this.pagerConfig)},formOpts(){return this.computeFormOpts},computeFormOpts(){return Object.assign({},getConfig().grid.formConfig,this.formConfig)},toolbarOpts(){return this.computeToolbarOpts},computeToolbarOpts(){return Object.assign({},getConfig().grid.toolbarConfig,this.toolbarConfig)},zoomOpts(){return this.computeZoomOpts},computeZoomOpts(){return Object.assign({},getConfig().grid.zoomConfig,this.zoomConfig)},computeStyles(){var{height:e,maxHeight:t}=this,{isZMax:r,tZindex:o}=this.reactData,a={};return r?a.zIndex=o:(e&&(a.height="auto"===e||"100%"===e?"100%":(0,_dom.toCssUnit)(e)),t&&(a.maxHeight="auto"===t||"100%"===t?"100%":(0,_dom.toCssUnit)(t))),a},computeTableExtendProps(){let t={},r=this;return propKeys.forEach(e=>{t[e]=r[e]}),t},computeTableProps(){var e=this,{seqConfig:t,pagerConfig:r,editConfig:o,proxyConfig:a}=e,{isZMax:s,tablePage:i}=e.reactData,n=e.computeTableExtendProps,l=e.computeProxyOpts,g=e.computePagerOpts,e=e.computeIsLoading,u=Object.assign({},n);return s&&(n.maxHeight?u.maxHeight="100%":u.height="100%"),a&&(0,_utils.isEnableConf)(l)&&(u.loading=e,r)&&l.seq&&(0,_utils.isEnableConf)(g)&&(u.seqConfig=Object.assign({},t,{startIndex:(i.currentPage-1)*i.pageSize})),o&&(u.editConfig=Object.assign({},o)),u},tableProps(){return this.computeTableProps},computeCurrLayoutConf(){var e=this.layouts;let t=[],r=[],o=[],a=[];return(t=e&&e.length?e:getConfig().grid.layouts||defaultLayouts).length&&(_xeUtils.default.isArray(t[0])?(r=t[0],o=t[1]||[],a=t[2]||[]):o=t),{headKeys:r,bodyKeys:o,footKeys:a}},computeCustomCurrentPageFlag(){return this.computePagerOpts.currentPage},computeCustomPageSizeFlag(){return this.computePagerOpts.pageSize},computeCustomTotalFlag(){return this.computePagerOpts.total},computeIsLoading(){var{loading:e,proxyConfig:t}=this,r=this.reactData.tableLoading,o=this.computeProxyOpts,a=o.showLoading;return e||r&&a&&t&&(0,_utils.isEnableConf)(o)}}),watch:{columns(e){let t=this;t.$nextTick(()=>t.loadColumn(e))},toolbar(e){e&&this.initToolbar()},toolbarConfig(e){e&&this.initToolbar()},proxyConfig(){this.initProxy()},computeCustomCurrentPageFlag(){this.initPages("currentPage")},computeCustomPageSizeFlag(){this.initPages("pageSize")},computeCustomTotalFlag(){this.initPages("total")}},methods:Object.assign(Object.assign({},tableMethods),{dispatchEvent(e,t,r){this.$emit(e,createEvent(r,{$grid:this},t))},initPages(e){var t=this.reactData.tablePage,r=this.pagerConfig,o=this.computePagerOpts;r&&(0,_utils.isEnableConf)(o)&&(e?o[e]&&(t[e]=_xeUtils.default.toNumber(o[e])):({currentPage:r,pageSize:e,total:o}=o,r&&(t.currentPage=r),e&&(t.pageSize=e),o&&(t.pageSize=o)))},callSlot(e,t,r,o){var a=this.$scopedSlots;return e&&(_xeUtils.default.isString(e)&&(e=a[e]||null),_xeUtils.default.isFunction(e))?(0,_vn.getSlotVNs)(e.call(this,t,r,o)):[]},getEl(){return this.$refs.refElem},getExcludeHeight(){var e,t,r,o,a,s=this,i=s.reactData.isZMax,n=s.$refs.refElem;return n?(e=s.$refs.refFormWrapper,t=s.$refs.refToolbarWrapper,r=s.$refs.refTopWrapper,o=s.$refs.refBottomWrapper,s=s.$refs.refPagerWrapper,a=n.parentElement,(!i&&a?(0,_dom.getPaddingTopBottomSize)(a):0)+(0,_dom.getPaddingTopBottomSize)(n)+(0,_dom.getOffsetHeight)(e)+(0,_dom.getOffsetHeight)(t)+(0,_dom.getOffsetHeight)(r)+(0,_dom.getOffsetHeight)(o)+(0,_dom.getOffsetHeight)(s)):0},getParentHeight(){var e=this.reactData,t=this.$refs.refElem;return t?(t=t.parentElement,(e.isZMax?(0,_dom.getDomNode)().visibleHeight:t?_xeUtils.default.toNumber(getComputedStyle(t).height):0)-this.getExcludeHeight()):0},initToolbar(){let r=this;r.$nextTick(()=>{var e=r.$refs.refTable,t=r.$refs.refToolbar;e&&t&&e.connect(t)})},getDefaultFormData(){var e=this.computeFormOpts;if(e.items){let a={};return e.items.forEach(t=>{var{field:r,itemRender:o}=t;if(r){let e=null;o&&(o=o.defaultValue,_xeUtils.default.isFunction(o)?e=o({item:t}):_xeUtils.default.isUndefined(o)||(e=o)),a[r]=e}}),a}return{}},initProxy(){let t=this;var e=t,r=t.reactData,{proxyConfig:e,formConfig:o}=e,a=r.proxyInited,s=t.computeProxyOpts,i=t.computeFormOpts;e&&((0,_utils.isEnableConf)(o)&&s.form&&i.items&&(r.formData=t.getDefaultFormData()),a||!1===s.autoLoad||(r.proxyInited=!0,t.$nextTick().then(()=>t.commitProxy("initial")).then(e=>{t.dispatchEvent("proxy-query",Object.assign(Object.assign({},e),{isInited:!0}),new Event("initial"))})))},handleGlobalKeydownEvent(e){var t=this.reactData,r=this.computeZoomOpts;globalEvents.hasKey(e,GLOBAL_EVENT_KEYS.ESCAPE)&&t.isZMax&&!1!==r.escRestore&&this.triggerZoomEvent(e)},getRespMsg(e,t){var r=this.computeProxyOpts,r=(r.response||r.props||{}).message;let o;return(o=e&&r?_xeUtils.default.isFunction(r)?r({data:e,$grid:this}):_xeUtils.default.get(e,r):o)||getI18n(t)},handleDeleteRow(e,t,r){var o=this.computeIsActiveMsg,a=this.getCheckboxRecords();if(o)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 r()})}else _ui.VxeUI.modal&&_ui.VxeUI.modal.message({id:"msg_"+e,content:getI18n("vxe.grid.selectOneRecord"),status:"warning"});else a.length&&r();return Promise.resolve()},triggerPendingEvent(e){var t=this.computeIsActiveMsg,r=this.$refs.refTable,o=r.getCheckboxRecords();o.length?(r.togglePendingRow(o),this.clearCheckboxRow()):t&&_ui.VxeUI.modal&&_ui.VxeUI.modal.message({id:e,content:getI18n("vxe.grid.selectOneRecord"),status:"warning"})},commitProxy(t,...d){let c=this;var e=c;let p=c.reactData;var r=e.toolbar;let{proxyConfig:o,toolbarConfig:a,pagerConfig:l,editRules:m,validConfig:f}=e,g=p.tablePage,h=c.computeIsActiveMsg,x=c.computeIsRespMsg;var u=c.computeProxyOpts;let b=c.computePagerOpts;var s,e=c.computeToolbarOpts;let{beforeQuery:v,afterQuery:y,beforeDelete:n,afterDelete:_,beforeSave:C,afterSave:E,ajax:P={}}=u,O=u.response||u.props||{},$=c.$refs.refTable,S=c.getFormData(),T=null,F=null;F=_xeUtils.default.isString(t)?(s=e.buttons,r=(a||r)&&(0,_utils.isEnableConf)(e)&&s?_xeUtils.default.findTree(s,e=>e.code===t,{children:"dropdowns"}):null,T=r?r.item:null,t):(T=t).code;var i=T?T.params:null;switch(F){case"insert":return $.insert({});case"insert_edit":return $.insert({}).then(({row:e})=>$.setEditRow(e,!0));case"insert_actived":return $.insert({}).then(({row:e})=>$.setEditRow(e,!0));case"mark_cancel":c.triggerPendingEvent(F);break;case"remove":return c.handleDeleteRow(F,"vxe.grid.removeSelectRecord",()=>$.removeCheckboxRow());case"import":$.importData(i);break;case"open_import":$.openImport(i);break;case"export":$.exportData(i);break;case"open_export":$.openExport(i);break;case"reset_custom":$.resetCustom(!0);break;case"initial":case"reload":case"query":{var D=P.query;let n=P.querySuccess,t=P.queryError;if(D){var U="initial"===F,j="reload"===F;if(!U&&p.tableLoading)return c.$nextTick();let r=[],a=[],e={};if(l&&((U||j)&&(g.currentPage=1),(0,_utils.isEnableConf)(l))&&(e=Object.assign({},g)),U){if(o&&(0,_utils.isEnableConf)(u)&&u.form&&(S=c.getDefaultFormData(),p.formData=S),$){let{tableFullColumn:e,fullColumnFieldData:o}=$,t=$.computeSortOpts.defaultSort;e.forEach(e=>{e.order=null}),t&&(_xeUtils.default.isArray(t)||(t=[t]),r=t.map(e=>{var{field:e,order:t}=e,r=o[e];return r&&(r=r.column)&&(r.order=t),{field:e,property:e,order:t}})),a=$.getCheckedFilters()}}else $&&(j?$.clearAll():(r=$.getSortColumns(),a=$.getCheckedFilters()));let s={code:F,button:T,isInited:U,isReload:j,$grid:c,page:e,sort:r.length?r[0]:{},sorts:r,filters:a,form:S,options:D},i=(p.sortData=r,p.filterData=a,p.tableLoading=!0,[s].concat(d));return Promise.resolve((v||D)(...i)).then(e=>{let t=[];var r,o;return p.tableLoading=!1,e&&(l&&(0,_utils.isEnableConf)(b)?(o=O.total,o=(_xeUtils.default.isFunction(o)?o({data:e,$grid:c}):_xeUtils.default.get(e,o||"page.total"))||0,g.total=_xeUtils.default.toNumber(o),r=O.result,t=(_xeUtils.default.isFunction(r)?r({data:e,$grid:c}):_xeUtils.default.get(e,r||"result"))||[],r=Math.max(Math.ceil(o/g.pageSize),1),g.currentPage>r&&(g.currentPage=r)):(o=O.list,t=(o?_xeUtils.default.isFunction(o)?o({data:e,$grid:c}):_xeUtils.default.get(e,o):e)||[])),$?$.loadData(t):$.$nextTick(()=>{$&&$.loadData(t)}),y&&y(...i),n&&n(Object.assign(Object.assign({},s),{response:e})),{status:!0}}).catch(e=>(p.tableLoading=!1,t&&t(Object.assign(Object.assign({},s),{response:e})),{status:!1}))}(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.query"]);break}case"delete":{let a=P.delete,s=P.deleteSuccess,i=P.deleteError;if(a){let e=$.getCheckboxRecords(),t=e.filter(e=>!$.isInsertByRow(e));U={removeRecords:t};let r={$grid:c,code:F,button:T,body:U,form:S,options:a},o=[r].concat(d);if(e.length)return c.handleDeleteRow(F,"vxe.grid.deleteSelectRecord",()=>t.length?(p.tableLoading=!0,Promise.resolve((n||a)(...o)).then(e=>(p.tableLoading=!1,$.setPendingRow(t,!1),x&&(_ui.VxeUI.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_ui.VxeUI.modal.message({content:c.getRespMsg(e,"vxe.grid.delSuccess"),status:"success"})),_?_(...o):c.commitProxy("query"),s&&s(Object.assign(Object.assign({},r),{response:e})),{status:!0})).catch(e=>(p.tableLoading=!1,x&&(_ui.VxeUI.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_ui.VxeUI.modal.message({id:F,content:c.getRespMsg(e,"vxe.grid.operError"),status:"error"})),i&&i(Object.assign(Object.assign({},r),{response:e})),{status:!1}))):$.remove(e));h&&(_ui.VxeUI.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_ui.VxeUI.modal.message({id:F,content:getI18n("vxe.grid.selectOneRecord"),status:"warning"}))}else(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.delete"]);break}case"save":{let l=P.save,g=P.saveSuccess,u=P.saveError;if(l){let t=c.getRecordset(),{insertRecords:r,removeRecords:o,updateRecords:a,pendingRecords:s}=t,i={$grid:c,code:F,button:T,body:t,form:S,options:l},n=[i].concat(d),e=(r.length&&(t.pendingRecords=s.filter(e=>-1===r.indexOf(e))),s.length&&(t.insertRecords=r.filter(e=>-1===s.indexOf(e))),Promise.resolve());return(e=m?c[f&&"full"===f.msgMode?"fullValidate":"validate"](t.insertRecords.concat(a)):e).then(e=>{if(!e)return t.insertRecords.length||o.length||a.length||t.pendingRecords.length?(p.tableLoading=!0,Promise.resolve((C||l)(...n)).then(e=>(p.tableLoading=!1,$.clearPendingRow(),x&&(_ui.VxeUI.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_ui.VxeUI.modal.message({content:c.getRespMsg(e,"vxe.grid.saveSuccess"),status:"success"})),E?E(...n):c.commitProxy("query"),g&&g(Object.assign(Object.assign({},i),{response:e})),{status:!0})).catch(e=>(p.tableLoading=!1,x&&(_ui.VxeUI.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_ui.VxeUI.modal.message({id:F,content:c.getRespMsg(e,"vxe.grid.operError"),status:"error"})),u&&u(Object.assign(Object.assign({},i),{response:e})),{status:!1}))):void(h&&(_ui.VxeUI.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"]),_ui.VxeUI.modal.message({id:F,content:getI18n("vxe.grid.dataUnchanged"),status:"info"})))})}(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.save"]);break}default:j=commands.get(F);j&&(j.commandMethod?j.commandMethod({code:F,button:T,$grid:c,$table:$},...d):(0,_log.errLog)("vxe.error.notCommands",[F]))}return c.$nextTick()},getFormData(){var e=this.proxyConfig,t=this.reactData.formData,r=this.computeProxyOpts,o=this.computeFormOpts;return e&&(0,_utils.isEnableConf)(r)&&r.form?t:o.data},getFormItems(e){var t=this.computeFormOpts,r=this.formConfig,o=t.items;let a=[];return _xeUtils.default.eachTree(r&&(0,_utils.isEnableConf)(t)&&o?o:[],e=>{a.push(e)},{children:"children"}),_xeUtils.default.isUndefined(e)?a:a[e]},resetForm(){var e=this.$refs.refForm;return e?e.reset():this.$nextTick()},validateForm(){var e=this.$refs.refForm;return e?e.validate():this.$nextTick()},validateFormField(e){var t=this.$refs.refForm;return t?t.validateField(e):this.$nextTick()},clearFormValidate(e){var t=this.$refs.refForm;return t?t.clearValidate(e):this.$nextTick()},homePage(){var e=this.$refs.refPager;return e?e.homePage():this.$nextTick()},endPage(){var e=this.$refs.refPager;return e?e.endPage():this.$nextTick()},jumpPage(e){var t=this.$refs.refPager;return t?t.jumpPage(e):this.$nextTick()},triggerToolbarCommitEvent(e,t){let r=this,o=e.code;return r.commitProxy(e,t).then(e=>{o&&e&&e.status&&["query","reload","delete","save"].includes(o)&&r.dispatchEvent("delete"===o||"save"===o?"proxy-"+o:"proxy-query",Object.assign(Object.assign({},e),{isReload:"reload"===o}),t)})},triggerToolbarBtnEvent(e,t){this.triggerToolbarCommitEvent(e,t),this.dispatchEvent("toolbar-button-click",{code:e.code,button:e},t)},triggerToolbarTolEvent(e,t){this.triggerToolbarCommitEvent(e,t),this.dispatchEvent("toolbar-tool-click",{code:e.code,tool:e},t)},sortChangeEvent(t){let r=this;var e=r,o=r.reactData,a=r.$refs.refTable,e=e.proxyConfig,s=r.computeProxyOpts;a.computeSortOpts.remote&&(o.sortData=t.sortList,e)&&(0,_utils.isEnableConf)(s)&&(o.tablePage.currentPage=1,r.commitProxy("query").then(e=>{r.dispatchEvent("proxy-query",e,t.$event)})),r.dispatchEvent("sort-change",t,t.$event)},pageChangeEvent(e){let t=this;var r=t.proxyConfig,o=t.reactData.tablePage;let{$event:a,currentPage:s,pageSize:i}=e;var n=t.computeProxyOpts;o.currentPage=s,o.pageSize=i,t.dispatchEvent("page-change",e,a),r&&(0,_utils.isEnableConf)(n)&&t.commitProxy("query").then(e=>{t.dispatchEvent("proxy-query",e,a)})},filterChangeEvent(t){let r=this;var e=r,o=r.reactData,a=r.$refs.refTable,e=e.proxyConfig,s=r.computeProxyOpts;a.computeFilterOpts.remote&&(o.filterData=t.filterList,e)&&(0,_utils.isEnableConf)(s)&&(o.tablePage.currentPage=1,r.commitProxy("query").then(e=>{r.dispatchEvent("proxy-query",e,t.$event)})),r.dispatchEvent("filter-change",t,t.$event)},submitFormEvent(t){let r=this;var e=r,o=r.reactData,e=e.proxyConfig,a=r.computeProxyOpts;o.tableLoading||(e&&(0,_utils.isEnableConf)(a)&&r.commitProxy("reload").then(e=>{r.dispatchEvent("proxy-query",Object.assign(Object.assign({},e),{isReload:!0}),t.$event)}),r.dispatchEvent("form-submit",t,t.$event))},resetFormEvent(e){let t=this;var r=t,o=t.$refs.refTable,r=r.proxyConfig;let a=e.$event;var s=t.computeProxyOpts;r&&(0,_utils.isEnableConf)(s)&&(o.clearScroll(),t.commitProxy("reload").then(e=>{t.dispatchEvent("proxy-query",Object.assign(Object.assign({},e),{isReload:!0}),a)})),t.dispatchEvent("form-reset",e,a)},submitInvalidEvent(e){this.dispatchEvent("form-submit-invalid",e,e.$event)},collapseEvent(e){var t=e.$event;this.dispatchEvent("form-toggle-collapse",e,t),this.dispatchEvent("form-collapse",e,t)},triggerZoomEvent(e){var t=this.reactData;this.zoom(),this.dispatchEvent("zoom",{type:t.isZMax?"max":"revert"},e)},zoom(){return this[this.reactData.isZMax?"revert":"maximize"]()},isMaximized(){return this.reactData.isZMax},maximize(){return this.handleZoom(!0)},revert(){return this.handleZoom()},handleZoom(e){let t=this,r=t.reactData;var o=r.isZMax;return(e?!o:o)&&(r.isZMax=!o,r.tZindex<(0,_utils.getLastZIndex)())&&(r.tZindex=(0,_utils.nextZIndex)()),t.$nextTick().then(()=>t.recalculate(!0)).then(()=>(setTimeout(()=>t.recalculate(!0),15),r.isZMax))},getProxyInfo(){var e,t=this.$refs.refTable,r=this.reactData;return this.proxyConfig?(e=r.sortData,{data:t?t.getFullData():[],filter:r.filterData,form:this.getFormData(),sort:e.length?e[0]:{},sorts:e,pager:r.tablePage,pendingRecords:t?t.getPendingRecords():[]}):null},loadColumn(e){let t=this.$scopedSlots;var r=this.$refs.refTable;return _xeUtils.default.eachTree(e,e=>{e.slots&&_xeUtils.default.each(e.slots,e=>{_xeUtils.default.isFunction(e)||t[e]||(0,_log.errLog)("vxe.error.notSlot",[e])})}),r.loadColumn(e)},reloadColumn(e){return this.clearAll(),this.loadColumn(e)},getConfigSlot(e){let r=this.$scopedSlots,o={};return _xeUtils.default.objectMap(e,(e,t)=>{e&&(_xeUtils.default.isString(e)?r[e]?o[t]=r[e]:(0,_log.errLog)("vxe.error.notSlot",[e]):o[t]=e)}),o},getToolbarSlots(){var e,t,r,o,a=this,s=a.$scopedSlots,i=a.computeToolbarOpts.slots,n={};return!s.buttons||i&&"buttons"===i.buttons||(0,_log.warnLog)("vxe.error.reqProp",["toolbar-config.slots.buttons"]),!s.tools||i&&"tools"===i.tools||(0,_log.warnLog)("vxe.error.reqProp",["toolbar-config.slots.tools"]),i&&(s=a.getFuncSlot(i,"buttons"),e=a.getFuncSlot(i,"buttonPrefix"),t=a.getFuncSlot(i,"buttonSuffix"),r=a.getFuncSlot(i,"tools"),o=a.getFuncSlot(i,"toolPrefix"),a=a.getFuncSlot(i,"toolSuffix"),s&&(n.buttons=s),e&&(n.buttonPrefix=e),t&&(n.buttonSuffix=t),r&&(n.tools=r),o&&(n.toolPrefix=o),a)&&(n.toolSuffix=a),n},getFuncSlot(e,t){var r=this.$scopedSlots,e=e[t];if(e){if(!_xeUtils.default.isString(e))return e;if(r[e])return r[e];(0,_log.errLog)("vxe.error.notSlot",[e])}return null},renderDefaultForm(e){var r=_ui.VxeUI.getComponent("VxeForm");let o=this;var a=o;let s=o.$scopedSlots;var{proxyConfig:a,formConfig:t}=a,i=o.reactData.formData,n=o.computeProxyOpts,l=o.computeFormOpts;if((0,_utils.isEnableConf)(t)&&l.items&&l.items.length){let t={};if(!l.inited){l.inited=!0;let t=n.beforeItem;n&&t&&l.items.forEach(e=>{t.call(o,{$grid:o,item:e})})}return l.items.forEach(e=>{_xeUtils.default.each(e.slots,e=>{_xeUtils.default.isFunction(e)||s[e]&&(t[e]=s[e])})}),[r?e(r,{props:Object.assign({},l,{data:a&&n.form?i:l.data}),on:{submit:o.submitFormEvent,reset:o.resetFormEvent,collapse:o.collapseEvent,"submit-invalid":o.submitInvalidEvent},scopedSlots:t}):renderEmptyElement(o)]}return[]},renderForm(e){var t=this,r=t.formConfig,o=t.$scopedSlots.form;return!o&&!(0,_utils.isEnableConf)(r)?renderEmptyElement(t):e("div",{key:"form",ref:"refFormWrapper",class:"vxe-grid--form-wrapper"},o?o.call(t,{$grid:t}):t.renderDefaultForm(e))},renderToolbar(e){var t=this,r=t.toolbarConfig,o=t.$scopedSlots.toolbar,r=!!(o||(0,_utils.isEnableConf)(r)||toolbar),a=t.computeToolbarOpts;return r?e("div",{key:"toolbar",ref:"refToolbarWrapper",class:"vxe-grid--toolbar-wrapper"},o?o.call(t,{$grid:t}):[e(_toolbar.default,{props:Object.assign({},a,{slots:void 0}),ref:"refToolbar",scopedSlots:t.getToolbarSlots()})]):renderEmptyElement(t)},renderTop(e){var t=this.$scopedSlots.top;return t?e("div",{key:"top",ref:"refTopWrapper",class:"vxe-grid--top-wrapper"},t.call(this,{$grid:this})):renderEmptyElement(this)},renderTableLeft(e){var t=this.$scopedSlots.left;return t?e("div",{class:"vxe-grid--left-wrapper"},t({$grid:this})):renderEmptyElement(this)},renderTableRight(e){var t=this.$scopedSlots.right;return t?e("div",{class:"vxe-grid--right-wrapper"},t({$grid:this})):renderEmptyElement(this)},renderTable(e){var t=this.$scopedSlots,r=this.computeTableProps;return e("div",{class:"vxe-grid--table-wrapper"},[e(_table.default,{key:"table",props:r,on:getTableOns(this),scopedSlots:t,ref:"refTable"})])},renderBottom(e){var t=this.$scopedSlots.bottom;return t?e("div",{key:"bottom",ref:"refBottomWrapper",class:"vxe-grid--bottom-wrapper"},t.call(this,{$grid:this})):renderEmptyElement(this)},renderPager(e){var t=_ui.VxeUI.getComponent("VxePager"),r=this,o=r.$scopedSlots,a=r.reactData,{proxyConfig:s,pagerConfig:i}=r,n=r.computeProxyOpts,l=r.computePagerOpts,g=o.pager;return i&&(0,_utils.isEnableConf)(l)||o.pager?e("div",{ref:"refPagerWrapper",key:"pager",class:"vxe-grid--pager-wrapper"},g?g.call(r,{$grid:r}):[t?e(t,{ref:"refPager",props:Object.assign(Object.assign({},l),s&&(0,_utils.isEnableConf)(n)?a.tablePage:{}),on:{"page-change":r.pageChangeEvent},scopedSlots:r.getConfigSlot(l.slots)}):renderEmptyElement(r)]):renderEmptyElement(r)},renderChildLayout(t,e){let r=this,o=[];return e.forEach(e=>{switch(e){case"Form":o.push(r.renderForm(t));break;case"Toolbar":o.push(r.renderToolbar(t));break;case"Top":o.push(r.renderTop(t));break;case"Table":o.push(t("div",{key:"table",class:"vxe-grid--table-container"},[r.renderTableLeft(t),r.renderTable(t),r.renderTableRight(t)]));break;case"Bottom":o.push(r.renderBottom(t));break;case"Pager":o.push(r.renderPager(t));break;default:(0,_log.errLog)("vxe.error.notProp",["layouts -> "+e])}}),o},renderLayout(e){var t=this,r=t.$scopedSlots,{headKeys:o,bodyKeys:a,footKeys:s}=t.computeCurrLayoutConf,i=r.asideLeft||r["aside-left"],r=r.asideRight||r["aside-right"];return[e("div",{class:"vxe-grid--layout-header-wrapper"},t.renderChildLayout(e,o)),e("div",{class:"vxe-grid--layout-body-wrapper"},[i?e("div",{class:"vxe-grid--layout-aside-left-wrapper"},i({})):renderEmptyElement(t),e("div",{class:"vxe-grid--layout-body-content-wrapper"},t.renderChildLayout(e,a)),r?e("div",{class:"vxe-grid--layout-aside-right-wrapper"},r({})):renderEmptyElement(t)]),e("div",{class:"vxe-grid--layout-footer-wrapper"},t.renderChildLayout(e,s))]},renderVN(e){var t=this,r=t.reactData,o=t.computeSize;return e("div",{ref:"refElem",class:["vxe-grid",{["size--"+o]:o,"is--animat":!!t.animat,"is--round":t.round,"is--maximize":r.isZMax,"is--loading":t.computeIsLoading}],style:t.computeStyles},t.renderLayout(e))}}),created(){let e=_ui.VxeUI.getComponent("VxeForm"),t=_ui.VxeUI.getComponent("VxePager");var r=this;let o=r;var a=r.computeProxyOpts;o.toolbar&&(0,_log.errLog)("vxe.error.delProp",["grid.toolbar","grid.toolbar-config"]),o.toolbarConfig&&!_xeUtils.default.isObject(o.toolbarConfig)&&(0,_log.errLog)("vxe.error.errProp",["grid.toolbar-config="+o.toolbarConfig,"grid.toolbar-config={}"]),a.props&&(0,_log.warnLog)("vxe.error.delProp",["proxy-config.props","proxy-config.response"]),r.$nextTick(()=>{o.formConfig&&!e&&(0,_log.errLog)("vxe.error.reqComp",["vxe-form"]),o.pagerConfig&&!t&&(0,_log.errLog)("vxe.error.reqComp",["vxe-pager"])}),r.initPages(),globalEvents.on(r,"keydown",r.handleGlobalKeydownEvent)},mounted(){var e=this.columns;e&&e.length&&this.loadColumn(e),this.initToolbar(),this.initProxy()},destroyed(){globalEvents.off(this,"keydown")},render(e){return this.renderVN(e)}});

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.17.0-beta.6";
+const version = "3.17.0-beta.7";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2667,7 +2667,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.17.0-beta.6"}`;
+const log_version = `table v${"3.17.0-beta.7"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5365,7 +5365,7 @@ function handleVirtualXVisible($xeTable) {
     }
     return {
       toVisibleIndex: Math.max(0, toVisibleIndex),
-      visibleSize: Math.max(1, visibleSize)
+      visibleSize: Math.max(6, visibleSize)
     };
   }
   return {
@@ -17880,7 +17880,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
   const _columnIndex = colRest._index;
   const isEdit = isEnableConf(editRender);
   const resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
-  let fixedHiddenColumn = fixedType ? column.fixed !== fixedType : column.fixed && overflowX;
+  let fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
   const isCellPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(padding) ? allPadding === null ? cellOpts.padding : allPadding : padding;
   const cellOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showOverflow) ? allShowOverflow : showOverflow;
   const showEllipsis = cellOverflow === 'ellipsis';
@@ -18038,7 +18038,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
   const isLastColumn = $columnIndex === columns.length - 1;
   const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
   let isVNPreEmptyStatus = false;
-  if (!isMergeCell) {
+  if (overflowX && !isMergeCell) {
     if (!dragRow || getRowid($xeTable, dragRow) !== rowid) {
       if (scrollYLoad && !treeConfig && !virtualYOpts.immediate && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
         isVNPreEmptyStatus = true;
@@ -18756,7 +18756,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     const renderOpts = editRender || cellRender;
     const compConf = renderOpts ? header_renderer.get(renderOpts.name) : null;
     const isColGroup = column.children && column.children.length;
-    const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : column.fixed && overflowX;
+    const fixedHiddenColumn = overflowX && !isColGroup && (fixedType ? column.fixed !== fixedType : !!column.fixed);
     const isPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(headerCellOpts.padding) ? headerCellOpts.padding : cellOpts.padding;
     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 headAlign = headerAlign || (compConf ? compConf.tableHeaderCellAlign : '') || allHeaderAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
@@ -18817,7 +18817,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     const showResizable = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable;
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
     let isVNPreEmptyStatus = false;
-    if (isOptimizeMode && !isGroup) {
+    if (isOptimizeMode && overflowX && !isGroup) {
       if (!dragCol || dragCol.id !== colid) {
         if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
           isVNPreEmptyStatus = true;
@@ -19199,8 +19199,7 @@ function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData,
     const renderOpts = editRender || cellRender;
     const compConf = renderOpts ? footer_renderer.get(renderOpts.name) : null;
     const showAllTip = tooltipOpts.showAll;
-    const isColGroup = column.children && column.children.length;
-    const fixedHiddenColumn = fixedType ? column.fixed !== fixedType && !isColGroup : column.fixed && overflowX;
+    const fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
     const isPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(footerCellOpts.padding) ? footerCellOpts.padding : cellOpts.padding;
     const footOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
     const footAlign = footerAlign || (compConf ? compConf.tableFooterCellAlign : '') || allFooterAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
@@ -19299,7 +19298,7 @@ function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData,
     const isLastColumn = $columnIndex === tableColumn.length - 1;
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
     let isVNPreEmptyStatus = false;
-    if (isOptimizeMode && !isMergeCell) {
+    if (isOptimizeMode && overflowX && !isMergeCell) {
       if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
         isVNPreEmptyStatus = true;
       }
@@ -32124,6 +32123,62 @@ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default(
       });
       return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(itemIndex) ? itemList : itemList[itemIndex];
     },
+    resetForm() {
+      const $xeGrid = this;
+      const $form = $xeGrid.$refs.refForm;
+      if ($form) {
+        return $form.reset();
+      }
+      return $xeGrid.$nextTick();
+    },
+    validateForm() {
+      const $xeGrid = this;
+      const $form = $xeGrid.$refs.refForm;
+      if ($form) {
+        return $form.validate();
+      }
+      return $xeGrid.$nextTick();
+    },
+    validateFormField(field) {
+      const $xeGrid = this;
+      const $form = $xeGrid.$refs.refForm;
+      if ($form) {
+        return $form.validateField(field);
+      }
+      return $xeGrid.$nextTick();
+    },
+    clearFormValidate(field) {
+      const $xeGrid = this;
+      const $form = $xeGrid.$refs.refForm;
+      if ($form) {
+        return $form.clearValidate(field);
+      }
+      return $xeGrid.$nextTick();
+    },
+    homePage() {
+      const $xeGrid = this;
+      const $pager = $xeGrid.$refs.refPager;
+      if ($pager) {
+        return $pager.homePage();
+      }
+      return $xeGrid.$nextTick();
+    },
+    endPage() {
+      const $xeGrid = this;
+      const $pager = $xeGrid.$refs.refPager;
+      if ($pager) {
+        return $pager.endPage();
+      }
+      return $xeGrid.$nextTick();
+    },
+    jumpPage(currentPage) {
+      const $xeGrid = this;
+      const $pager = $xeGrid.$refs.refPager;
+      if ($pager) {
+        return $pager.jumpPage(currentPage);
+      }
+      return $xeGrid.$nextTick();
+    },
     triggerToolbarCommitEvent(params, evnt) {
       const $xeGrid = this;
       const {