vxe-table 4.2.1 → 4.2.2

package/es/edit/src/hook.js

@@ -503,7 +503,7 @@ var editHook = {
                         $columnIndex: $xetable.getVMColumnIndex(column)
                     }, evnt || null);
                 }
-                return ($xetable.clearValidate ? $xetable.clearValidate() : nextTick()).then(function () { return $xetable.recalculate(); });
+                return $xetable.clearValidate ? $xetable.clearValidate() : nextTick();
             },
             /**
              * 清除所选中源状态
@@ -595,7 +595,9 @@ var editHook = {
                                 }
                             }
                             $xetable.closeTooltip();
-                            editMethods.clearActived(evnt);
+                            if (actived.column) {
+                                editMethods.clearActived(evnt);
+                            }
                             type = 'edit-actived';
                             column.renderHeight = cell.offsetHeight;
                             actived.args = params;

package/es/form/src/form.js

@@ -407,10 +407,13 @@ export default defineComponent({
             evnt.preventDefault();
             if (!props.preventSubmit) {
                 clearValidate();
-                beginValidate(getItems()).then(function () {
-                    formMethods.dispatchEvent('submit', { data: props.data }, evnt);
-                }).catch(function (errMap) {
-                    formMethods.dispatchEvent('submit-invalid', { data: props.data, errMap: errMap }, evnt);
+                beginValidate(getItems()).then(function (errMap) {
+                    if (errMap) {
+                        formMethods.dispatchEvent('submit-invalid', { data: props.data, errMap: errMap }, evnt);
+                    }
+                    else {
+                        formMethods.dispatchEvent('submit', { data: props.data }, evnt);
+                    }
                 });
             }
         };

package/es/grid/src/grid.js

@@ -730,7 +730,7 @@ export default defineComponent({
                                 if (rest) {
                                     if (isEnableConf(pagerConfig)) {
                                         var total = XEUtils.get(rest, proxyProps.total || 'page.total') || 0;
-                                        tablePage.total = total;
+                                        tablePage.total = XEUtils.toNumber(total);
                                         reactData.tableData = XEUtils.get(rest, proxyProps.result || 'result') || [];
                                         // 检验当前页码，不能超出当前最大页数
                                         var pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);

package/es/header/src/header.js

@@ -160,13 +160,13 @@ export default defineComponent({
         var renderVN = function () {
             var fixedType = props.fixedType, fixedColumn = props.fixedColumn, tableColumn = props.tableColumn;
             var resizable = tableProps.resizable, border = tableProps.border, columnKey = tableProps.columnKey, headerRowClassName = tableProps.headerRowClassName, headerCellClassName = tableProps.headerCellClassName, headerRowStyle = tableProps.headerRowStyle, headerCellStyle = tableProps.headerCellStyle, allColumnHeaderOverflow = tableProps.showHeaderOverflow, allHeaderAlign = tableProps.headerAlign, allAlign = tableProps.align, mouseConfig = tableProps.mouseConfig;
-            var isGroup = tableReactData.isGroup, currentColumn = tableReactData.currentColumn, scrollYLoad = tableReactData.scrollYLoad, overflowX = tableReactData.overflowX, scrollbarWidth = tableReactData.scrollbarWidth;
+            var isGroup = tableReactData.isGroup, currentColumn = tableReactData.currentColumn, scrollXLoad = tableReactData.scrollXLoad, overflowX = tableReactData.overflowX, scrollbarWidth = tableReactData.scrollbarWidth;
             var columnOpts = computeColumnOpts.value;
             var headerGroups = headerColumn.value;
             // 如果是使用优化模式
             if (!isGroup) {
                 if (fixedType) {
-                    if (scrollYLoad || allColumnHeaderOverflow) {
+                    if (scrollXLoad || allColumnHeaderOverflow) {
                         tableColumn = fixedColumn;
                     }
                 }
@@ -232,8 +232,8 @@ export default defineComponent({
                                 onClick: function (evnt) { return $xetable.triggerHeaderCellClickEvent(evnt, params); },
                                 onDblclick: function (evnt) { return $xetable.triggerHeaderCellDblclickEvent(evnt, params); }
                             };
-                            // 纵向虚拟滚动不支持动态行高
-                            if (scrollYLoad && !hasEllipsis) {
+                            // 横向虚拟滚动不支持动态行高
+                            if (scrollXLoad && !hasEllipsis) {
                                 showEllipsis = hasEllipsis = true;
                             }
                             // 按下事件处理

package/es/table/src/table.js

@@ -1329,9 +1329,7 @@ export default defineComponent({
                         if (isOptimize) {
                             tableColumn = fixedColumn;
                         }
-                        if (isOptimize || scrollXLoad) {
-                            tWidth = tableColumn.reduce(function (previous, column) { return previous + column.renderWidth; }, 0);
-                        }
+                        tWidth = tableColumn.reduce(function (previous, column) { return previous + column.renderWidth; }, 0);
                         if (tableElem) {
                             tableElem.style.width = tWidth ? tWidth + scrollbarWidth + "px" : '';
                             // 修复 IE 中高度无法自适应问题

package/es/tools/log.js

@@ -1,6 +1,6 @@
 import GlobalConfig from '../v-x-e-table/src/conf';
 export function getLog(message, params) {
-    return "[vxe-table v" + "4.2.1" + "] " + GlobalConfig.i18n(message, params);
+    return "[vxe-table v" + "4.2.2-beta.1" + "] " + GlobalConfig.i18n(message, params);
 }
 function outLog(type) {
     return function (message, params) {

package/es/v-x-e-table/index.js

@@ -83,7 +83,7 @@ export var config = new VXETableConfig();
 export var v = 'v4';
 export var VXETable = {
     v: v,
-    version: "4.2.1",
+    version: "4.2.2-beta.1",
     setup: setup,
     interceptor: interceptor,
     renderer: renderer,

package/lib/edit/src/hook.js

@@ -686,9 +686,7 @@ var editHook = {
           }, evnt || null);
         }
 
-        return ($xetable.clearValidate ? $xetable.clearValidate() : (0, _vue.nextTick)()).then(function () {
-          return $xetable.recalculate();
-        });
+        return $xetable.clearValidate ? $xetable.clearValidate() : (0, _vue.nextTick)();
       },
 
       /**
@@ -817,7 +815,11 @@ var editHook = {
               }
 
               $xetable.closeTooltip();
-              editMethods.clearActived(evnt);
+
+              if (actived.column) {
+                editMethods.clearActived(evnt);
+              }
+
               type = 'edit-actived';
               column.renderHeight = cell.offsetHeight;
               actived.args = params;

package/lib/edit/src/hook.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")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_util=require("../../table/src/util"),_dom=require("../../tools/dom"),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,r=1,l=arguments.length;r<l;r++)for(var n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)},__spreadArray=function(e,t){for(var r=0,l=t.length,n=e.length;r<l;r++,n++)e[n]=t[r];return e},tableEditMethodKeys=["insert","insertAt","remove","removeCheckboxRow","removeRadioRow","removeCurrentRow","getRecordset","getInsertRecords","getRemoveRecords","getUpdateRecords","getActiveRecord","getSelectedCell","clearActived","clearSelected","isActiveByRow","setActiveRow","setActiveCell","setSelectCell"],editHook={setupTable:function(_){function v(e,t){var r=t.model;t.editRender&&(r.value=(0,_util.getCellValue)(e,t),r.update=!1)}function n(e,t){var r=t.model;t.editRender&&r.update&&((0,_util.setCellValue)(e,t,r.value),r.update=!1,r.value=null)}function r(){var e=o.value;!e||(e=e.querySelector(".col--selected"))&&(0,_dom.removeClass)(e,"col--selected")}var R=_.props,C=_.reactData,b=_.internalData,o=_.getRefMaps().refElem,e=_.getComputeMaps(),s=e.computeMouseOpts,p=e.computeEditOpts,w=e.computeCheckboxOpts,I=e.computeTreeOpts,g={},m={};function a(){var e=C.editStore,t=C.tableColumn,r=p.value,e=e.actived,l=e.row,e=e.column;(l||e)&&("row"===r.mode?t.forEach(function(e){return n(l,e)}):n(l,e))}function A(e,t){var a=b.tableFullTreeData,i=b.afterFullData,u=b.fullDataRowIdData,c=b.fullAllDataRowIdData,r=I.value,d=r.rowField,s=r.parentField,f=r.children,v=r.mapChildren,p=t?"push":"unshift";e.forEach(function(e){var t,r,l=e[s],n=(0,_util.getRowid)(_,e),o=l?_xeUtils.default.findTree(a,function(e){return l===e[d]},{children:v}):null;e=o?(t=o.item,o=(r=c[(0,_util.getRowid)(_,t)])?r.level:0,r=t[f],(r=!_xeUtils.default.isArray(r)?t[f]=[]:r)[p](e),{row:e,rowid:n,seq:-1,index:-1,_index:-1,$index:-1,items:r,parent:parent,level:o+1}):("development"===process.env.NODE_ENV&&l&&(0,_log.warnLog)("vxe.error.unableInsert"),i[p](e),a[p](e),{row:e,rowid:n,seq:-1,index:-1,_index:-1,$index:-1,items:a,parent:null,level:0}),u[n]=e,c[n]=e})}return g={insert:function(e){return g.insertAt(e,null)},insertAt:function(e,t){var r=R.treeConfig,l=C.mergeList,n=C.editStore,o=b.tableFullTreeData,a=b.afterFullData,i=b.tableFullData,u=b.fullDataRowIdData,c=b.fullAllDataRowIdData,d=I.value,s=d.transform,f=d.rowField,v=d.mapChildren,p=(e=!_xeUtils.default.isArray(e)?[e]:e).map(function(e){return _.defineField(Object.assign({},e))});if(t)if(-1===t)r&&s?A(p,!0):(a.push.apply(a,p),i.push.apply(i,p),l.forEach(function(e){var t=e.row,r=e.rowspan;t+r>a.length&&(e.rowspan=r+p.length)}));else if(r&&s){var w,g,m,h=_xeUtils.default.findTree(o,function(e){return t[f]===e[f]},{children:v});h?(w=h.parent,g=h.items,v=c[(0,_util.getRowid)(_,w)],m=v?v.level:0,p.forEach(function(e,t){var r=(0,_util.getRowid)(_,e);"development"===process.env.NODE_ENV&&e[d.parentField]&&w&&e[d.parentField]!==w[f]&&(0,_log.errLog)("vxe.error.errProp",[d.parentField+"="+e[d.parentField],d.parentField+"="+w[f]]),w&&(e[d.parentField]=w[f]),g.splice(h.index+t,0,e);e={row:e,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,items:g,parent:w,level:m+1};u[r]=e,c[r]=e})):("development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.unableInsert"),A(p,!0))}else{if(r)throw new Error((0,_log.getLog)("vxe.error.noTree",["insert"]));var x=-1;if(_xeUtils.default.isNumber(t)?t<a.length&&(x=t):x=_.findRowIndexOf(a,t),-1===x)throw new Error((0,_log.errLog)("vxe.error.unableInsert"));a.splice.apply(a,__spreadArray([x,0],p)),i.splice.apply(i,__spreadArray([_.findRowIndexOf(i,t),0],p)),l.forEach(function(e){var t=e.row,r=e.rowspan;x<t?e.row=t+p.length:x<t+r&&(e.rowspan=r+p.length)})}else r&&s?A(p,!1):(a.unshift.apply(a,p),i.unshift.apply(i,p),l.forEach(function(e){var t=e.row;0<t&&(e.row=t+p.length)}));return(n=n.insertList).unshift.apply(n,p),_.updateFooter(),_.cacheRowMap(),_.handleTableData(r&&s),r&&s||_.updateAfterDataIndex(),_.checkSelectionStatus(),C.scrollYLoad&&_.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return _.updateCellAreas(),_.recalculate()}).then(function(){return{row:p.length?p[p.length-1]:null,rows:p}})},remove:function(e){var t=R.treeConfig,r=C.mergeList,l=C.editStore,n=C.selection,o=b.tableFullTreeData,a=b.afterFullData,i=b.tableFullData,u=w.value,c=I.value,d=c.transform,s=l.actived,f=l.removeList,v=l.insertList,u=u.checkField,p=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=i,e.forEach(function(e){_.isInsertByRow(e)||f.push(e)}),u||e.forEach(function(e){e=_.findRowIndexOf(n,e);-1<e&&n.splice(e,1)}),i===e?(e=p=i.slice(0),b.tableFullData=[],b.afterFullData=[],_.clearMergeCells()):t&&d?e.forEach(function(e){var t=(0,_util.getRowid)(_,e),r=_xeUtils.default.findTree(o,function(e){return t===(0,_util.getRowid)(_,e)},c);r&&(r=r.items.splice(r.index,1),p.push(r[0]));e=_.findRowIndexOf(a,e);-1<e&&a.splice(e,1)}):e.forEach(function(e){var t=_.findRowIndexOf(i,e);-1<t&&(t=i.splice(t,1),p.push(t[0]));var l=_.findRowIndexOf(a,e);-1<l&&(r.forEach(function(e){var t=e.row,r=e.rowspan;l<t?e.row=t-1:l<t+r&&(e.rowspan=r-1)}),a.splice(l,1))}),s.row&&-1<_.findRowIndexOf(e,s.row)&&g.clearActived(),e.forEach(function(e){e=_.findRowIndexOf(v,e);-1<e&&v.splice(e,1)}),_.updateFooter(),_.cacheRowMap(),_.handleTableData(t&&d),t&&d||_.updateAfterDataIndex(),_.checkSelectionStatus(),C.scrollYLoad&&_.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return _.updateCellAreas(),_.recalculate()}).then(function(){return{row:p.length?p[p.length-1]:null,rows:p}})},removeCheckboxRow:function(){return g.remove(_.getCheckboxRecords()).then(function(e){return _.clearCheckboxRow(),e})},removeRadioRow:function(){var e=_.getRadioRecord();return g.remove(e||[]).then(function(e){return _.clearRadioRow(),e})},removeCurrentRow:function(){var e=_.getCurrentRecord();return g.remove(e||[]).then(function(e){return _.clearCurrentRow(),e})},getRecordset:function(){return{insertRecords:g.getInsertRecords(),removeRecords:g.getRemoveRecords(),updateRecords:g.getUpdateRecords()}},getInsertRecords:function(){var e=R.treeConfig,t=C.editStore,r=b.tableFullTreeData,l=b.tableFullData,n=I.value,t=t.insertList,o=[];return t.length&&(e&&n.transform?t.forEach(function(e){var t=(0,_util.getRowid)(_,e);_xeUtils.default.findTree(r,function(e){return t===(0,_util.getRowid)(_,e)},n)&&o.push(e)}):t.forEach(function(e){-1<_.findRowIndexOf(l,e)&&o.push(e)})),o},getRemoveRecords:function(){return C.editStore.removeList},getUpdateRecords:function(){var e=R.keepSource,t=R.treeConfig,r=b.tableFullData,l=I.value;return e?(a(),t?_xeUtils.default.filterTree(r,function(e){return _.isUpdateByRow(e)},l):r.filter(function(e){return _.isUpdateByRow(e)})):[]},getActiveRecord:function(){var e=C.editStore,t=b.afterFullData,r=o.value,l=e.actived,e=l.args,l=l.row;return e&&-1<_.findRowIndexOf(t,l)&&r.querySelectorAll(".vxe-body--column.col--actived").length?Object.assign({},e):null},getSelectedCell:function(){var e=C.editStore.selected,t=e.args,e=e.column;return t&&e?Object.assign({},t):null},clearActived:function(e){var t=C.editStore.actived,r=t.row,l=t.column;return(r||l)&&(a(),t.args=null,t.row=null,t.column=null,_.updateFooter(),_.dispatchEvent("edit-closed",{row:r,rowIndex:_.getRowIndex(r),$rowIndex:_.getVMRowIndex(r),column:l,columnIndex:_.getColumnIndex(l),$columnIndex:_.getVMColumnIndex(l)},e||null)),(_.clearValidate?_.clearValidate():(0,_vue.nextTick)()).then(function(){return _.recalculate()})},clearSelected:function(){var e=C.editStore.selected;return e.row=null,e.column=null,r(),(0,_vue.nextTick)()},isActiveByRow:function(e){return C.editStore.actived.row===e},setActiveRow:function(e){var t=b.visibleColumn;return _.setActiveCell(e,_xeUtils.default.find(t,function(e){return(0,_utils.isEnableConf)(e.editRender)}))},setActiveCell:function(t,e){var r=R.editConfig,l=_xeUtils.default.isString(e)?_.getColumnByField(e):e;return t&&l&&(0,_utils.isEnableConf)(r)&&(0,_utils.isEnableConf)(l.editRender)?_.scrollToRow(t,l).then(function(){var e=_.getCell(t,l);return e&&(m.handleActived({row:t,rowIndex:_.getRowIndex(t),column:l,columnIndex:_.getColumnIndex(l),cell:e,$table:_}),b._lastCallTime=Date.now()),(0,_vue.nextTick)()}):(0,_vue.nextTick)()},setSelectCell:function(e,t){var r=C.tableData,l=b.visibleColumn,n=p.value,t=_xeUtils.default.isString(t)?_.getColumnByField(t):t;return e&&t&&"manual"!==n.trigger&&(-1<(n=_.findRowIndexOf(r,e))&&t&&(r=_.getCell(e,t),r={row:e,rowIndex:n,column:t,columnIndex:l.indexOf(t),cell:r},_.handleSelected(r,{}))),(0,_vue.nextTick)()}},m={handleActived:function(e,t){var r,l=R.editConfig,n=R.mouseConfig,o=C.editStore,a=C.tableColumn,i=p.value,u=i.mode,c=i.activeMethod,d=o.actived,s=e.row,f=e.column,i=f.editRender,o=e.cell||_.getCell(s,f);return e.cell=o,(0,_utils.isEnableConf)(l)&&(0,_utils.isEnableConf)(i)&&o&&(d.row!==s||"cell"===u&&d.column!==f?(r="edit-disabled",c&&!c(__assign(__assign({},e),{$table:_}))||(n&&(g.clearSelected(),_.clearCellAreas&&(_.clearCellAreas(),_.clearCopyCellArea())),_.closeTooltip(),g.clearActived(t),r="edit-actived",f.renderHeight=o.offsetHeight,d.args=e,d.row=s,d.column=f,"row"===u?a.forEach(function(e){return v(s,e)}):v(s,f),(0,_vue.nextTick)(function(){m.handleFocus(e,t)})),_.dispatchEvent(r,{row:s,rowIndex:_.getRowIndex(s),$rowIndex:_.getVMRowIndex(s),column:f,columnIndex:_.getColumnIndex(f),$columnIndex:_.getVMColumnIndex(f)},t)):(r=d.column,n&&(g.clearSelected(),_.clearCellAreas&&(_.clearCellAreas(),_.clearCopyCellArea())),r!==f&&((n=r.model).update&&(0,_util.setCellValue)(s,r,n.value),_.clearValidate&&_.clearValidate()),f.renderHeight=o.offsetHeight,d.args=e,d.column=f,setTimeout(function(){m.handleFocus(e,t)})),_.focus()),(0,_vue.nextTick)()},handleFocus:function(e){var t,r,l=e.row,n=e.column,o=e.cell,a=n.editRender;(0,_utils.isEnableConf)(a)&&(t=_vXETable.renderer.get(a.name),r=a.autofocus,e=a.autoselect,a=void 0,(a=!(a=r?o.querySelector(r):a)&&t&&t.autofocus?o.querySelector(t.autofocus):a)?(a.focus(),e?a.select():_dom.browse.msie&&((a=a.createTextRange()).collapse(!1),a.select())):_.scrollToRow(l,n))},handleSelected:function(e,t){var r=R.mouseConfig,l=C.editStore,n=s.value,o=p.value,a=l.actived,i=l.selected,u=e.row,c=e.column,d=r&&n.selected;return!d||i.row===u&&i.column===c||(a.row!==u||"cell"===o.mode&&a.column!==c)&&(g.clearActived(t),g.clearSelected(),_.clearCellAreas&&(_.clearCellAreas(),_.clearCopyCellArea()),i.args=e,i.row=u,i.column=c,d&&m.addCellSelectedClass(),_.focus(),t&&_.dispatchEvent("cell-selected",e,t)),(0,_vue.nextTick)()},addCellSelectedClass:function(){var e=C.editStore.selected,t=e.row,e=e.column;r(),t&&e&&((e=_.getCell(t,e))&&(0,_dom.addClass)(e,"col--selected"))}},__assign(__assign({},g),m)},setupGrid:function(e){return e.extendTableMethods(tableEditMethodKeys)}},_default=editHook;exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_util=require("../../table/src/util"),_dom=require("../../tools/dom"),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,r=1,l=arguments.length;r<l;r++)for(var n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)},__spreadArray=function(e,t){for(var r=0,l=t.length,n=e.length;r<l;r++,n++)e[n]=t[r];return e},tableEditMethodKeys=["insert","insertAt","remove","removeCheckboxRow","removeRadioRow","removeCurrentRow","getRecordset","getInsertRecords","getRemoveRecords","getUpdateRecords","getActiveRecord","getSelectedCell","clearActived","clearSelected","isActiveByRow","setActiveRow","setActiveCell","setSelectCell"],editHook={setupTable:function(_){function v(e,t){var r=t.model;t.editRender&&(r.value=(0,_util.getCellValue)(e,t),r.update=!1)}function n(e,t){var r=t.model;t.editRender&&r.update&&((0,_util.setCellValue)(e,t,r.value),r.update=!1,r.value=null)}function r(){var e=o.value;!e||(e=e.querySelector(".col--selected"))&&(0,_dom.removeClass)(e,"col--selected")}var R=_.props,C=_.reactData,b=_.internalData,o=_.getRefMaps().refElem,e=_.getComputeMaps(),s=e.computeMouseOpts,p=e.computeEditOpts,w=e.computeCheckboxOpts,I=e.computeTreeOpts,g={},m={};function a(){var e=C.editStore,t=C.tableColumn,r=p.value,e=e.actived,l=e.row,e=e.column;(l||e)&&("row"===r.mode?t.forEach(function(e){return n(l,e)}):n(l,e))}function A(e,t){var a=b.tableFullTreeData,i=b.afterFullData,u=b.fullDataRowIdData,c=b.fullAllDataRowIdData,r=I.value,d=r.rowField,s=r.parentField,f=r.children,v=r.mapChildren,p=t?"push":"unshift";e.forEach(function(e){var t,r,l=e[s],n=(0,_util.getRowid)(_,e),o=l?_xeUtils.default.findTree(a,function(e){return l===e[d]},{children:v}):null;e=o?(t=o.item,o=(r=c[(0,_util.getRowid)(_,t)])?r.level:0,r=t[f],(r=!_xeUtils.default.isArray(r)?t[f]=[]:r)[p](e),{row:e,rowid:n,seq:-1,index:-1,_index:-1,$index:-1,items:r,parent:parent,level:o+1}):("development"===process.env.NODE_ENV&&l&&(0,_log.warnLog)("vxe.error.unableInsert"),i[p](e),a[p](e),{row:e,rowid:n,seq:-1,index:-1,_index:-1,$index:-1,items:a,parent:null,level:0}),u[n]=e,c[n]=e})}return g={insert:function(e){return g.insertAt(e,null)},insertAt:function(e,t){var r=R.treeConfig,l=C.mergeList,n=C.editStore,o=b.tableFullTreeData,a=b.afterFullData,i=b.tableFullData,u=b.fullDataRowIdData,c=b.fullAllDataRowIdData,d=I.value,s=d.transform,f=d.rowField,v=d.mapChildren,p=(e=!_xeUtils.default.isArray(e)?[e]:e).map(function(e){return _.defineField(Object.assign({},e))});if(t)if(-1===t)r&&s?A(p,!0):(a.push.apply(a,p),i.push.apply(i,p),l.forEach(function(e){var t=e.row,r=e.rowspan;t+r>a.length&&(e.rowspan=r+p.length)}));else if(r&&s){var w,g,m,h=_xeUtils.default.findTree(o,function(e){return t[f]===e[f]},{children:v});h?(w=h.parent,g=h.items,v=c[(0,_util.getRowid)(_,w)],m=v?v.level:0,p.forEach(function(e,t){var r=(0,_util.getRowid)(_,e);"development"===process.env.NODE_ENV&&e[d.parentField]&&w&&e[d.parentField]!==w[f]&&(0,_log.errLog)("vxe.error.errProp",[d.parentField+"="+e[d.parentField],d.parentField+"="+w[f]]),w&&(e[d.parentField]=w[f]),g.splice(h.index+t,0,e);e={row:e,rowid:r,seq:-1,index:-1,_index:-1,$index:-1,items:g,parent:w,level:m+1};u[r]=e,c[r]=e})):("development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.unableInsert"),A(p,!0))}else{if(r)throw new Error((0,_log.getLog)("vxe.error.noTree",["insert"]));var x=-1;if(_xeUtils.default.isNumber(t)?t<a.length&&(x=t):x=_.findRowIndexOf(a,t),-1===x)throw new Error((0,_log.errLog)("vxe.error.unableInsert"));a.splice.apply(a,__spreadArray([x,0],p)),i.splice.apply(i,__spreadArray([_.findRowIndexOf(i,t),0],p)),l.forEach(function(e){var t=e.row,r=e.rowspan;x<t?e.row=t+p.length:x<t+r&&(e.rowspan=r+p.length)})}else r&&s?A(p,!1):(a.unshift.apply(a,p),i.unshift.apply(i,p),l.forEach(function(e){var t=e.row;0<t&&(e.row=t+p.length)}));return(n=n.insertList).unshift.apply(n,p),_.updateFooter(),_.cacheRowMap(),_.handleTableData(r&&s),r&&s||_.updateAfterDataIndex(),_.checkSelectionStatus(),C.scrollYLoad&&_.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return _.updateCellAreas(),_.recalculate()}).then(function(){return{row:p.length?p[p.length-1]:null,rows:p}})},remove:function(e){var t=R.treeConfig,r=C.mergeList,l=C.editStore,n=C.selection,o=b.tableFullTreeData,a=b.afterFullData,i=b.tableFullData,u=w.value,c=I.value,d=c.transform,s=l.actived,f=l.removeList,v=l.insertList,u=u.checkField,p=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=i,e.forEach(function(e){_.isInsertByRow(e)||f.push(e)}),u||e.forEach(function(e){e=_.findRowIndexOf(n,e);-1<e&&n.splice(e,1)}),i===e?(e=p=i.slice(0),b.tableFullData=[],b.afterFullData=[],_.clearMergeCells()):t&&d?e.forEach(function(e){var t=(0,_util.getRowid)(_,e),r=_xeUtils.default.findTree(o,function(e){return t===(0,_util.getRowid)(_,e)},c);r&&(r=r.items.splice(r.index,1),p.push(r[0]));e=_.findRowIndexOf(a,e);-1<e&&a.splice(e,1)}):e.forEach(function(e){var t=_.findRowIndexOf(i,e);-1<t&&(t=i.splice(t,1),p.push(t[0]));var l=_.findRowIndexOf(a,e);-1<l&&(r.forEach(function(e){var t=e.row,r=e.rowspan;l<t?e.row=t-1:l<t+r&&(e.rowspan=r-1)}),a.splice(l,1))}),s.row&&-1<_.findRowIndexOf(e,s.row)&&g.clearActived(),e.forEach(function(e){e=_.findRowIndexOf(v,e);-1<e&&v.splice(e,1)}),_.updateFooter(),_.cacheRowMap(),_.handleTableData(t&&d),t&&d||_.updateAfterDataIndex(),_.checkSelectionStatus(),C.scrollYLoad&&_.updateScrollYSpace(),(0,_vue.nextTick)().then(function(){return _.updateCellAreas(),_.recalculate()}).then(function(){return{row:p.length?p[p.length-1]:null,rows:p}})},removeCheckboxRow:function(){return g.remove(_.getCheckboxRecords()).then(function(e){return _.clearCheckboxRow(),e})},removeRadioRow:function(){var e=_.getRadioRecord();return g.remove(e||[]).then(function(e){return _.clearRadioRow(),e})},removeCurrentRow:function(){var e=_.getCurrentRecord();return g.remove(e||[]).then(function(e){return _.clearCurrentRow(),e})},getRecordset:function(){return{insertRecords:g.getInsertRecords(),removeRecords:g.getRemoveRecords(),updateRecords:g.getUpdateRecords()}},getInsertRecords:function(){var e=R.treeConfig,t=C.editStore,r=b.tableFullTreeData,l=b.tableFullData,n=I.value,t=t.insertList,o=[];return t.length&&(e&&n.transform?t.forEach(function(e){var t=(0,_util.getRowid)(_,e);_xeUtils.default.findTree(r,function(e){return t===(0,_util.getRowid)(_,e)},n)&&o.push(e)}):t.forEach(function(e){-1<_.findRowIndexOf(l,e)&&o.push(e)})),o},getRemoveRecords:function(){return C.editStore.removeList},getUpdateRecords:function(){var e=R.keepSource,t=R.treeConfig,r=b.tableFullData,l=I.value;return e?(a(),t?_xeUtils.default.filterTree(r,function(e){return _.isUpdateByRow(e)},l):r.filter(function(e){return _.isUpdateByRow(e)})):[]},getActiveRecord:function(){var e=C.editStore,t=b.afterFullData,r=o.value,l=e.actived,e=l.args,l=l.row;return e&&-1<_.findRowIndexOf(t,l)&&r.querySelectorAll(".vxe-body--column.col--actived").length?Object.assign({},e):null},getSelectedCell:function(){var e=C.editStore.selected,t=e.args,e=e.column;return t&&e?Object.assign({},t):null},clearActived:function(e){var t=C.editStore.actived,r=t.row,l=t.column;return(r||l)&&(a(),t.args=null,t.row=null,t.column=null,_.updateFooter(),_.dispatchEvent("edit-closed",{row:r,rowIndex:_.getRowIndex(r),$rowIndex:_.getVMRowIndex(r),column:l,columnIndex:_.getColumnIndex(l),$columnIndex:_.getVMColumnIndex(l)},e||null)),_.clearValidate?_.clearValidate():(0,_vue.nextTick)()},clearSelected:function(){var e=C.editStore.selected;return e.row=null,e.column=null,r(),(0,_vue.nextTick)()},isActiveByRow:function(e){return C.editStore.actived.row===e},setActiveRow:function(e){var t=b.visibleColumn;return _.setActiveCell(e,_xeUtils.default.find(t,function(e){return(0,_utils.isEnableConf)(e.editRender)}))},setActiveCell:function(t,e){var r=R.editConfig,l=_xeUtils.default.isString(e)?_.getColumnByField(e):e;return t&&l&&(0,_utils.isEnableConf)(r)&&(0,_utils.isEnableConf)(l.editRender)?_.scrollToRow(t,l).then(function(){var e=_.getCell(t,l);return e&&(m.handleActived({row:t,rowIndex:_.getRowIndex(t),column:l,columnIndex:_.getColumnIndex(l),cell:e,$table:_}),b._lastCallTime=Date.now()),(0,_vue.nextTick)()}):(0,_vue.nextTick)()},setSelectCell:function(e,t){var r=C.tableData,l=b.visibleColumn,n=p.value,t=_xeUtils.default.isString(t)?_.getColumnByField(t):t;return e&&t&&"manual"!==n.trigger&&(-1<(n=_.findRowIndexOf(r,e))&&t&&(r=_.getCell(e,t),r={row:e,rowIndex:n,column:t,columnIndex:l.indexOf(t),cell:r},_.handleSelected(r,{}))),(0,_vue.nextTick)()}},m={handleActived:function(e,t){var r,l=R.editConfig,n=R.mouseConfig,o=C.editStore,a=C.tableColumn,i=p.value,u=i.mode,c=i.activeMethod,d=o.actived,s=e.row,f=e.column,i=f.editRender,o=e.cell||_.getCell(s,f);return e.cell=o,(0,_utils.isEnableConf)(l)&&(0,_utils.isEnableConf)(i)&&o&&(d.row!==s||"cell"===u&&d.column!==f?(r="edit-disabled",c&&!c(__assign(__assign({},e),{$table:_}))||(n&&(g.clearSelected(),_.clearCellAreas&&(_.clearCellAreas(),_.clearCopyCellArea())),_.closeTooltip(),d.column&&g.clearActived(t),r="edit-actived",f.renderHeight=o.offsetHeight,d.args=e,d.row=s,d.column=f,"row"===u?a.forEach(function(e){return v(s,e)}):v(s,f),(0,_vue.nextTick)(function(){m.handleFocus(e,t)})),_.dispatchEvent(r,{row:s,rowIndex:_.getRowIndex(s),$rowIndex:_.getVMRowIndex(s),column:f,columnIndex:_.getColumnIndex(f),$columnIndex:_.getVMColumnIndex(f)},t)):(r=d.column,n&&(g.clearSelected(),_.clearCellAreas&&(_.clearCellAreas(),_.clearCopyCellArea())),r!==f&&((n=r.model).update&&(0,_util.setCellValue)(s,r,n.value),_.clearValidate&&_.clearValidate()),f.renderHeight=o.offsetHeight,d.args=e,d.column=f,setTimeout(function(){m.handleFocus(e,t)})),_.focus()),(0,_vue.nextTick)()},handleFocus:function(e){var t,r,l=e.row,n=e.column,o=e.cell,a=n.editRender;(0,_utils.isEnableConf)(a)&&(t=_vXETable.renderer.get(a.name),r=a.autofocus,e=a.autoselect,a=void 0,(a=!(a=r?o.querySelector(r):a)&&t&&t.autofocus?o.querySelector(t.autofocus):a)?(a.focus(),e?a.select():_dom.browse.msie&&((a=a.createTextRange()).collapse(!1),a.select())):_.scrollToRow(l,n))},handleSelected:function(e,t){var r=R.mouseConfig,l=C.editStore,n=s.value,o=p.value,a=l.actived,i=l.selected,u=e.row,c=e.column,d=r&&n.selected;return!d||i.row===u&&i.column===c||(a.row!==u||"cell"===o.mode&&a.column!==c)&&(g.clearActived(t),g.clearSelected(),_.clearCellAreas&&(_.clearCellAreas(),_.clearCopyCellArea()),i.args=e,i.row=u,i.column=c,d&&m.addCellSelectedClass(),_.focus(),t&&_.dispatchEvent("cell-selected",e,t)),(0,_vue.nextTick)()},addCellSelectedClass:function(){var e=C.editStore.selected,t=e.row,e=e.column;r(),t&&e&&((e=_.getCell(t,e))&&(0,_dom.addClass)(e,"col--selected"))}},__assign(__assign({},g),m)},setupGrid:function(e){return e.extendTableMethods(tableEditMethodKeys)}},_default=editHook;exports.default=_default;

package/lib/form/src/form.js

@@ -596,15 +596,17 @@ var _default2 = (0, _vue.defineComponent)({
 
       if (!props.preventSubmit) {
         clearValidate();
-        beginValidate(getItems()).then(function () {
-          formMethods.dispatchEvent('submit', {
-            data: props.data
-          }, evnt);
-        }).catch(function (errMap) {
-          formMethods.dispatchEvent('submit-invalid', {
-            data: props.data,
-            errMap: errMap
-          }, evnt);
+        beginValidate(getItems()).then(function (errMap) {
+          if (errMap) {
+            formMethods.dispatchEvent('submit-invalid', {
+              data: props.data,
+              errMap: errMap
+            }, evnt);
+          } else {
+            formMethods.dispatchEvent('submit', {
+              data: props.data
+            }, evnt);
+          }
         });
       }
     };

package/lib/form/src/form.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")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_log=require("../../tools/log"),_dom=require("../../tools/dom"),_util=require("./util"),_render=require("./render"),_size=require("../../hooks/size");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,i=1,n=arguments.length;i<n;i++)for(var l in t=arguments[i])Object.prototype.hasOwnProperty.call(t,l)&&(e[l]=t[l]);return e}).apply(this,arguments)},Rule=function(){function e(e){Object.assign(this,{$options:e,required:e.required,min:e.min,max:e.min,type:e.type,pattern:e.pattern,validator:e.validator,trigger:e.trigger,maxWidth:e.maxWidth})}return Object.defineProperty(e.prototype,"content",{get:function(){return(0,_utils.getFuncText)(this.$options.content||this.$options.message)},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"message",{get:function(){return this.content},enumerable:!1,configurable:!0}),e}(),validErrorRuleValue=function(e,t){var i=e.type,n=e.min,l=e.max,r=e.pattern,e="number"===i,i=e?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!e||!isNaN(t))||(!_xeUtils.default.eqNull(n)&&i<_xeUtils.default.toNumber(n)||(!_xeUtils.default.eqNull(l)&&i>_xeUtils.default.toNumber(l)||!(!r||(_xeUtils.default.isRegExp(r)?r:new RegExp(r)).test(t))))};function getResetValue(e,t){return t=_xeUtils.default.isArray(e)?[]:t}var _default2=(0,_vue.defineComponent)({name:"VxeForm",props:{collapseStatus:{type:Boolean,default:!0},loading:Boolean,data:Object,size:{type:String,default:function(){return _conf.default.form.size||_conf.default.size}},span:{type:[String,Number],default:function(){return _conf.default.form.span}},align:{type:String,default:function(){return _conf.default.form.align}},titleAlign:{type:String,default:function(){return _conf.default.form.titleAlign}},titleWidth:{type:[String,Number],default:function(){return _conf.default.form.titleWidth}},titleColon:{type:Boolean,default:function(){return _conf.default.form.titleColon}},titleAsterisk:{type:Boolean,default:function(){return _conf.default.form.titleAsterisk}},titleOverflow:{type:[Boolean,String],default:null},className:[String,Function],items:Array,rules:Object,preventSubmit:{type:Boolean,default:function(){return _conf.default.form.preventSubmit}},validConfig:Object,tooltipConfig:Object,customLayout:{type:Boolean,default:function(){return _conf.default.form.customLayout}}},emits:["update:collapseStatus","collapse","toggle-collapse","submit","submit-invalid","reset"],setup:function(q,e){function t(e){return e.length&&("development"===process.env.NODE_ENV&&e.forEach(function(e){e.slots&&_xeUtils.default.each(e.slots,function(e){_xeUtils.default.isFunction(e)||v[e]||(0,_log.errLog)("vxe.error.notSlot",[e])})}),p.staticItems=_xeUtils.default.mapTree(e,function(e){return(0,_util.createItem)(V,e)},{children:"children"})),(0,_vue.nextTick)()}function o(t){var e=_xeUtils.default.findTree(p.formItems,function(e){return e.field===t},{children:"children"});return e?e.item:null}function i(){return p.collapseAll}function n(){var e=!i();return p.collapseAll=e,l("update:collapseStatus",e),(0,_vue.nextTick)()}function c(e){e.preventDefault(),R(),h.dispatchEvent("reset",{data:q.data},e)}function f(t){t.preventDefault(),q.preventSubmit||(U(),w(T()).then(function(){h.dispatchEvent("submit",{data:q.data},t)}).catch(function(e){h.dispatchEvent("submit-invalid",{data:q.data,errMap:e},t)}))}function u(){var e=a.tooltipStore,t=g.value;return e.visible&&(Object.assign(e,{item:null,visible:!1}),t&&t.close()),(0,_vue.nextTick)()}function C(e){var R=q.data,O=q.rules,S=q.titleOverflow,w=p.collapseAll,N=x.value;return e.map(function(e){var t=e.slots,i=e.title,n=e.visible,l=e.folding,r=e.visibleMethod,o=e.field,u=e.collapseNode,a=e.itemRender,s=e.showError,c=e.errRule,f=e.className,d=e.titleOverflow,v=e.children,m=(0,_utils.isEnableConf)(a)?_vXETable.VXETable.renderer.get(a.name):null,p=t?t.default:null,_=t?t.title:null,g=e.span||q.span,h=e.align||q.align,x=e.titleAlign||q.titleAlign,b=e.titleWidth||q.titleWidth,y=_xeUtils.default.isUndefined(d)||_xeUtils.default.isNull(d)?S:d,E="title"===y,t=!0===y||"tooltip"===y,d=E||t||"ellipsis"===y,y=r,T={data:R,field:o,property:o,item:e,$form:V};if(!1===n)return(0,_vue.createCommentVNode)();r=!1;if(!O||(n=O[o])&&(r=n.some(function(e){return e.required})),v&&0<v.length){var U=C(e.children);return U.length?(0,_vue.h)("div",{class:["vxe-form--gather vxe-row",e.id,g?"vxe-col--"+g+" is--span":"",f?_xeUtils.default.isFunction(f)?f(T):f:""]},U):(0,_vue.createCommentVNode)()}!y&&m&&m.itemVisibleMethod&&(y=m.itemVisibleMethod);U=[];p?U=I(p,T):m&&m.renderItemContent?U=m.renderItemContent(a,T):o&&(U=[""+_xeUtils.default.get(R,o)]),u&&U.push((0,_vue.h)("div",{class:"vxe-form--item-trigger-node",onClick:j},[(0,_vue.h)("span",{class:"vxe-form--item-trigger-text"},w?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),(0,_vue.h)("i",{class:["vxe-form--item-trigger-icon",w?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})])),c&&N.showMessage&&U.push((0,_vue.h)("div",{class:"vxe-form--item-valid",style:c.maxWidth?{width:c.maxWidth+"px"}:null},c.content));t=t?{onMouseenter:function(e){F(e,T)},onMouseleave:A}:{};return(0,_vue.h)("div",{class:["vxe-form--item",e.id,g?"vxe-col--"+g+" is--span":"",f?_xeUtils.default.isFunction(f)?f(T):f:"",{"is--title":i,"is--required":r,"is--hidden":l&&w,"is--active":!y||y(T),"is--error":s}],key:e.id},[(0,_vue.h)("div",{class:"vxe-form--item-inner"},[i||_?(0,_vue.h)("div",__assign({class:["vxe-form--item-title",x?"align--"+x:null,{"is--ellipsis":d}],style:b?{width:isNaN(b)?b:b+"px"}:null,title:E?(0,_utils.getFuncText)(i):null},t),(0,_render.renderTitle)(V,e)):null,(0,_vue.h)("div",{class:["vxe-form--item-content",h?"align--"+h:null]},U)])])})}var s,d=_vXETable.VXETable.tooltip,v=e.slots,l=e.emit,r=_xeUtils.default.uniqueId(),m=(0,_size.useSize)(q),p=(0,_vue.reactive)({collapseAll:q.collapseStatus,staticItems:[],formItems:[]}),a=(0,_vue.reactive)({tooltipTimeout:null,tooltipStore:{item:null,visible:!1}}),_=(0,_vue.ref)(),g=(0,_vue.ref)(),h={},x=(0,_vue.computed)(function(){return Object.assign({},_conf.default.form.validConfig,q.validConfig)}),b=(0,_vue.computed)(function(){return Object.assign({},_conf.default.tooltip,_conf.default.form.tooltipConfig,q.tooltipConfig)}),y={refElem:_},E={computeSize:m,computeValidOpts:x,computeTooltipOpts:b},V={xID:r,props:q,context:e,reactData:p,getRefMaps:function(){return y},getComputeMaps:function(){return E}},I=function(e,t){return e&&(_xeUtils.default.isString(e)&&(e=v[e]||null),_xeUtils.default.isFunction(e))?e(t):[]},T=function(){var t=[];return _xeUtils.default.eachTree(p.formItems,function(e){t.push(e)},{children:"children"}),t},j=function(e){n();var t=i();h.dispatchEvent("toggle-collapse",{status:t,collapse:t,data:q.data},e),h.dispatchEvent("collapse",{status:t,collapse:t,data:q.data},e)},U=function(e){return e?(e=(0,_util.handleFieldOrItem)(V,e))&&(e.showError=!1):T().forEach(function(e){e.showError=!1}),(0,_vue.nextTick)()},R=function(){var l=q.data,e=T();return l&&e.forEach(function(e){var t=e.field,i=e.resetValue,n=e.itemRender;(0,_utils.isEnableConf)(n)&&((n=_vXETable.VXETable.renderer.get(n.name))&&n.itemResetMethod?n.itemResetMethod({data:l,field:t,property:t,item:e,$form:V}):t&&_xeUtils.default.set(l,t,null===i?getResetValue(_xeUtils.default.get(l,t),void 0):i))}),U()},O=function(e){var r=_.value;e.some(function(e,t){var i=o(e);if(i&&(0,_utils.isEnableConf)(i.itemRender)){var n=i.itemRender,l=_vXETable.VXETable.renderer.get(n.name),e=null;if(t||(0,_dom.scrollToView)(r.querySelector("."+i.id)),e=!(e=n.autofocus?r.querySelector("."+i.id+" "+n.autofocus):e)&&l&&l.autofocus?r.querySelector("."+i.id+" "+l.autofocus):e)return e.focus(),!0}})},S=function(r,o,e){var u,a,s=q.data,t=q.rules,c=[],f=[];return o&&t&&((u=_xeUtils.default.get(t,o))&&(a=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(s,o):e,u.forEach(function(t){var e,i=t.type,n=t.trigger,l=t.required;"all"!==r&&n&&r!==n||(_xeUtils.default.isFunction(t.validator)?(e=t.validator({itemValue:a,rule:t,rules:u,data:s,field:o,property:o,$form:V}))&&(_xeUtils.default.isError(e)?c.push(new Rule({type:"custom",trigger:n,content:e.message,rule:new Rule(t)})):e.catch&&f.push(e.catch(function(e){c.push(new Rule({type:"custom",trigger:n,content:e?e.message:t.content||t.message,rule:new Rule(t)}))}))):(i="array"===i?!_xeUtils.default.isArray(a)||!a.length:(0,_utils.eqEmptyValue)(a),(l?i||validErrorRuleValue(t,a):!i&&validErrorRuleValue(t,a))&&c.push(new Rule(t))))}))),Promise.all(f).then(function(){if(c.length){var e={rules:c,rule:c[0]};return Promise.reject(e)}})},w=function(t,e,i){var l=q.data,n=q.rules,r=x.value,o={},u=[],a=[];return clearTimeout(s),l&&n?(t.forEach(function(i){var n=i.field;n&&a.push(S(e||"all",n).then(function(){i.errRule=null}).catch(function(e){var t=e.rule,e={rule:t,rules:e.rules,data:l,field:n,property:n,$form:V};return o[n]||(o[n]=[]),o[n].push(e),u.push(n),i.errRule=t,Promise.reject(e)}))}),Promise.all(a).then(function(){i&&i()}).catch(function(){return new Promise(function(e){s=window.setTimeout(function(){t.forEach(function(e){e.errRule&&(e.showError=!0)})},20),!1!==r.autoPos&&(0,_vue.nextTick)(function(){O(u)}),i?(i(o),e()):e(o)})})):(i&&i(),Promise.resolve())},F=function(e,t){var i=t.item,n=a.tooltipStore,l=g.value,r=e.currentTarget.children[0],t=(r.textContent||"").trim(),e=r.scrollWidth>r.clientWidth;clearTimeout(a.tooltipTimeout),n.item!==i&&u(),t&&e&&(Object.assign(n,{item:i,visible:!0}),l&&l.open(r,t))},A=function(){var e=b.value,t=g.value;t&&t.setActived(!1),e.enterable?a.tooltipTimeout=setTimeout(function(){(t=g.value)&&!t.isActived()&&u()},e.leaveDelay):u()},h={dispatchEvent:function(e,t,i){l(e,Object.assign({$form:V,$event:i},t))},reset:R,validate:function(e){return U(),w(T(),"",e)},validateField:function(e,t){e=(0,_util.handleFieldOrItem)(V,e);return w(e?[e]:[],"",t)},clearValidate:U,updateStatus:function(e,t){var i=e.property;i&&S("change",i,t).then(function(){U(i)}).catch(function(e){var t=e.rule,e=o(i);e&&(e.showError=!0,e.errRule=t)})},toggleCollapse:n,getItems:T,getItemByField:o,closeTooltip:u};Object.assign(V,h,{callSlot:I,toggleCollapseEvent:j,triggerTitleTipEvent:F,handleTitleTipLeaveEvent:A}),(0,_vue.watch)(function(){return p.staticItems},function(e){p.formItems=e}),(0,_vue.watch)(function(){return q.items},function(e){t(e||[])}),(0,_vue.watch)(function(){return q.collapseStatus},function(e){p.collapseAll=!!e}),(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){"development"===process.env.NODE_ENV&&q.customLayout&&q.items&&(0,_log.errLog)("vxe.error.errConflicts",["custom-layout","items"]),t(q.items||[])})});return V.renderVN=function(){var e=q.loading,t=q.className,i=q.data,n=q.titleColon,l=q.titleAsterisk,r=q.customLayout,o=p.formItems,u=m.value,a=b.value,s=v.default;return(0,_vue.h)("form",{ref:_,class:["vxe-form",t?_xeUtils.default.isFunction(t)?t({items:o,data:i,$form:V}):t:"",((t={})["size--"+u]=u,t["is--colon"]=n,t["is--asterisk"]=l,t["is--loading"]=e,t)],onSubmit:f,onReset:c},[(0,_vue.h)("div",{class:"vxe-form--wrapper vxe-row"},r?s?s({}):[]:C(o)),(0,_vue.h)("div",{class:"vxe-form-slots",ref:"hideItem"},!r&&s?s({}):[]),(0,_vue.h)("div",{class:["vxe-loading",{"is--visible":e}]},[(0,_vue.h)("div",{class:"vxe-loading--spinner"})]),d?(0,_vue.h)((0,_vue.resolveComponent)("vxe-tooltip"),__assign({ref:g},a)):(0,_vue.createCommentVNode)()])},(0,_vue.provide)("$xeform",V),V},render:function(){return this.renderVN()}});exports.default=_default2;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_utils=require("../../tools/utils"),_log=require("../../tools/log"),_dom=require("../../tools/dom"),_util=require("./util"),_render=require("./render"),_size=require("../../hooks/size");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,i=1,n=arguments.length;i<n;i++)for(var l in t=arguments[i])Object.prototype.hasOwnProperty.call(t,l)&&(e[l]=t[l]);return e}).apply(this,arguments)},Rule=function(){function e(e){Object.assign(this,{$options:e,required:e.required,min:e.min,max:e.min,type:e.type,pattern:e.pattern,validator:e.validator,trigger:e.trigger,maxWidth:e.maxWidth})}return Object.defineProperty(e.prototype,"content",{get:function(){return(0,_utils.getFuncText)(this.$options.content||this.$options.message)},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"message",{get:function(){return this.content},enumerable:!1,configurable:!0}),e}(),validErrorRuleValue=function(e,t){var i=e.type,n=e.min,l=e.max,r=e.pattern,e="number"===i,i=e?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!e||!isNaN(t))||(!_xeUtils.default.eqNull(n)&&i<_xeUtils.default.toNumber(n)||(!_xeUtils.default.eqNull(l)&&i>_xeUtils.default.toNumber(l)||!(!r||(_xeUtils.default.isRegExp(r)?r:new RegExp(r)).test(t))))};function getResetValue(e,t){return t=_xeUtils.default.isArray(e)?[]:t}var _default2=(0,_vue.defineComponent)({name:"VxeForm",props:{collapseStatus:{type:Boolean,default:!0},loading:Boolean,data:Object,size:{type:String,default:function(){return _conf.default.form.size||_conf.default.size}},span:{type:[String,Number],default:function(){return _conf.default.form.span}},align:{type:String,default:function(){return _conf.default.form.align}},titleAlign:{type:String,default:function(){return _conf.default.form.titleAlign}},titleWidth:{type:[String,Number],default:function(){return _conf.default.form.titleWidth}},titleColon:{type:Boolean,default:function(){return _conf.default.form.titleColon}},titleAsterisk:{type:Boolean,default:function(){return _conf.default.form.titleAsterisk}},titleOverflow:{type:[Boolean,String],default:null},className:[String,Function],items:Array,rules:Object,preventSubmit:{type:Boolean,default:function(){return _conf.default.form.preventSubmit}},validConfig:Object,tooltipConfig:Object,customLayout:{type:Boolean,default:function(){return _conf.default.form.customLayout}}},emits:["update:collapseStatus","collapse","toggle-collapse","submit","submit-invalid","reset"],setup:function(q,e){function t(e){return e.length&&("development"===process.env.NODE_ENV&&e.forEach(function(e){e.slots&&_xeUtils.default.each(e.slots,function(e){_xeUtils.default.isFunction(e)||v[e]||(0,_log.errLog)("vxe.error.notSlot",[e])})}),p.staticItems=_xeUtils.default.mapTree(e,function(e){return(0,_util.createItem)(V,e)},{children:"children"})),(0,_vue.nextTick)()}function o(t){var e=_xeUtils.default.findTree(p.formItems,function(e){return e.field===t},{children:"children"});return e?e.item:null}function i(){return p.collapseAll}function n(){var e=!i();return p.collapseAll=e,l("update:collapseStatus",e),(0,_vue.nextTick)()}function c(e){e.preventDefault(),R(),h.dispatchEvent("reset",{data:q.data},e)}function f(t){t.preventDefault(),q.preventSubmit||(U(),w(T()).then(function(e){e?h.dispatchEvent("submit-invalid",{data:q.data,errMap:e},t):h.dispatchEvent("submit",{data:q.data},t)}))}function u(){var e=a.tooltipStore,t=g.value;return e.visible&&(Object.assign(e,{item:null,visible:!1}),t&&t.close()),(0,_vue.nextTick)()}function C(e){var R=q.data,O=q.rules,S=q.titleOverflow,w=p.collapseAll,N=x.value;return e.map(function(e){var t=e.slots,i=e.title,n=e.visible,l=e.folding,r=e.visibleMethod,o=e.field,u=e.collapseNode,a=e.itemRender,s=e.showError,c=e.errRule,f=e.className,d=e.titleOverflow,v=e.children,m=(0,_utils.isEnableConf)(a)?_vXETable.VXETable.renderer.get(a.name):null,p=t?t.default:null,_=t?t.title:null,g=e.span||q.span,h=e.align||q.align,x=e.titleAlign||q.titleAlign,b=e.titleWidth||q.titleWidth,y=_xeUtils.default.isUndefined(d)||_xeUtils.default.isNull(d)?S:d,E="title"===y,t=!0===y||"tooltip"===y,d=E||t||"ellipsis"===y,y=r,T={data:R,field:o,property:o,item:e,$form:V};if(!1===n)return(0,_vue.createCommentVNode)();r=!1;if(!O||(n=O[o])&&(r=n.some(function(e){return e.required})),v&&0<v.length){var U=C(e.children);return U.length?(0,_vue.h)("div",{class:["vxe-form--gather vxe-row",e.id,g?"vxe-col--"+g+" is--span":"",f?_xeUtils.default.isFunction(f)?f(T):f:""]},U):(0,_vue.createCommentVNode)()}!y&&m&&m.itemVisibleMethod&&(y=m.itemVisibleMethod);U=[];p?U=I(p,T):m&&m.renderItemContent?U=m.renderItemContent(a,T):o&&(U=[""+_xeUtils.default.get(R,o)]),u&&U.push((0,_vue.h)("div",{class:"vxe-form--item-trigger-node",onClick:j},[(0,_vue.h)("span",{class:"vxe-form--item-trigger-text"},w?_conf.default.i18n("vxe.form.unfolding"):_conf.default.i18n("vxe.form.folding")),(0,_vue.h)("i",{class:["vxe-form--item-trigger-icon",w?_conf.default.icon.FORM_FOLDING:_conf.default.icon.FORM_UNFOLDING]})])),c&&N.showMessage&&U.push((0,_vue.h)("div",{class:"vxe-form--item-valid",style:c.maxWidth?{width:c.maxWidth+"px"}:null},c.content));t=t?{onMouseenter:function(e){F(e,T)},onMouseleave:A}:{};return(0,_vue.h)("div",{class:["vxe-form--item",e.id,g?"vxe-col--"+g+" is--span":"",f?_xeUtils.default.isFunction(f)?f(T):f:"",{"is--title":i,"is--required":r,"is--hidden":l&&w,"is--active":!y||y(T),"is--error":s}],key:e.id},[(0,_vue.h)("div",{class:"vxe-form--item-inner"},[i||_?(0,_vue.h)("div",__assign({class:["vxe-form--item-title",x?"align--"+x:null,{"is--ellipsis":d}],style:b?{width:isNaN(b)?b:b+"px"}:null,title:E?(0,_utils.getFuncText)(i):null},t),(0,_render.renderTitle)(V,e)):null,(0,_vue.h)("div",{class:["vxe-form--item-content",h?"align--"+h:null]},U)])])})}var s,d=_vXETable.VXETable.tooltip,v=e.slots,l=e.emit,r=_xeUtils.default.uniqueId(),m=(0,_size.useSize)(q),p=(0,_vue.reactive)({collapseAll:q.collapseStatus,staticItems:[],formItems:[]}),a=(0,_vue.reactive)({tooltipTimeout:null,tooltipStore:{item:null,visible:!1}}),_=(0,_vue.ref)(),g=(0,_vue.ref)(),h={},x=(0,_vue.computed)(function(){return Object.assign({},_conf.default.form.validConfig,q.validConfig)}),b=(0,_vue.computed)(function(){return Object.assign({},_conf.default.tooltip,_conf.default.form.tooltipConfig,q.tooltipConfig)}),y={refElem:_},E={computeSize:m,computeValidOpts:x,computeTooltipOpts:b},V={xID:r,props:q,context:e,reactData:p,getRefMaps:function(){return y},getComputeMaps:function(){return E}},I=function(e,t){return e&&(_xeUtils.default.isString(e)&&(e=v[e]||null),_xeUtils.default.isFunction(e))?e(t):[]},T=function(){var t=[];return _xeUtils.default.eachTree(p.formItems,function(e){t.push(e)},{children:"children"}),t},j=function(e){n();var t=i();h.dispatchEvent("toggle-collapse",{status:t,collapse:t,data:q.data},e),h.dispatchEvent("collapse",{status:t,collapse:t,data:q.data},e)},U=function(e){return e?(e=(0,_util.handleFieldOrItem)(V,e))&&(e.showError=!1):T().forEach(function(e){e.showError=!1}),(0,_vue.nextTick)()},R=function(){var l=q.data,e=T();return l&&e.forEach(function(e){var t=e.field,i=e.resetValue,n=e.itemRender;(0,_utils.isEnableConf)(n)&&((n=_vXETable.VXETable.renderer.get(n.name))&&n.itemResetMethod?n.itemResetMethod({data:l,field:t,property:t,item:e,$form:V}):t&&_xeUtils.default.set(l,t,null===i?getResetValue(_xeUtils.default.get(l,t),void 0):i))}),U()},O=function(e){var r=_.value;e.some(function(e,t){var i=o(e);if(i&&(0,_utils.isEnableConf)(i.itemRender)){var n=i.itemRender,l=_vXETable.VXETable.renderer.get(n.name),e=null;if(t||(0,_dom.scrollToView)(r.querySelector("."+i.id)),e=!(e=n.autofocus?r.querySelector("."+i.id+" "+n.autofocus):e)&&l&&l.autofocus?r.querySelector("."+i.id+" "+l.autofocus):e)return e.focus(),!0}})},S=function(r,o,e){var u,a,s=q.data,t=q.rules,c=[],f=[];return o&&t&&((u=_xeUtils.default.get(t,o))&&(a=_xeUtils.default.isUndefined(e)?_xeUtils.default.get(s,o):e,u.forEach(function(t){var e,i=t.type,n=t.trigger,l=t.required;"all"!==r&&n&&r!==n||(_xeUtils.default.isFunction(t.validator)?(e=t.validator({itemValue:a,rule:t,rules:u,data:s,field:o,property:o,$form:V}))&&(_xeUtils.default.isError(e)?c.push(new Rule({type:"custom",trigger:n,content:e.message,rule:new Rule(t)})):e.catch&&f.push(e.catch(function(e){c.push(new Rule({type:"custom",trigger:n,content:e?e.message:t.content||t.message,rule:new Rule(t)}))}))):(i="array"===i?!_xeUtils.default.isArray(a)||!a.length:(0,_utils.eqEmptyValue)(a),(l?i||validErrorRuleValue(t,a):!i&&validErrorRuleValue(t,a))&&c.push(new Rule(t))))}))),Promise.all(f).then(function(){if(c.length){var e={rules:c,rule:c[0]};return Promise.reject(e)}})},w=function(t,e,i){var l=q.data,n=q.rules,r=x.value,o={},u=[],a=[];return clearTimeout(s),l&&n?(t.forEach(function(i){var n=i.field;n&&a.push(S(e||"all",n).then(function(){i.errRule=null}).catch(function(e){var t=e.rule,e={rule:t,rules:e.rules,data:l,field:n,property:n,$form:V};return o[n]||(o[n]=[]),o[n].push(e),u.push(n),i.errRule=t,Promise.reject(e)}))}),Promise.all(a).then(function(){i&&i()}).catch(function(){return new Promise(function(e){s=window.setTimeout(function(){t.forEach(function(e){e.errRule&&(e.showError=!0)})},20),!1!==r.autoPos&&(0,_vue.nextTick)(function(){O(u)}),i?(i(o),e()):e(o)})})):(i&&i(),Promise.resolve())},F=function(e,t){var i=t.item,n=a.tooltipStore,l=g.value,r=e.currentTarget.children[0],t=(r.textContent||"").trim(),e=r.scrollWidth>r.clientWidth;clearTimeout(a.tooltipTimeout),n.item!==i&&u(),t&&e&&(Object.assign(n,{item:i,visible:!0}),l&&l.open(r,t))},A=function(){var e=b.value,t=g.value;t&&t.setActived(!1),e.enterable?a.tooltipTimeout=setTimeout(function(){(t=g.value)&&!t.isActived()&&u()},e.leaveDelay):u()},h={dispatchEvent:function(e,t,i){l(e,Object.assign({$form:V,$event:i},t))},reset:R,validate:function(e){return U(),w(T(),"",e)},validateField:function(e,t){e=(0,_util.handleFieldOrItem)(V,e);return w(e?[e]:[],"",t)},clearValidate:U,updateStatus:function(e,t){var i=e.property;i&&S("change",i,t).then(function(){U(i)}).catch(function(e){var t=e.rule,e=o(i);e&&(e.showError=!0,e.errRule=t)})},toggleCollapse:n,getItems:T,getItemByField:o,closeTooltip:u};Object.assign(V,h,{callSlot:I,toggleCollapseEvent:j,triggerTitleTipEvent:F,handleTitleTipLeaveEvent:A}),(0,_vue.watch)(function(){return p.staticItems},function(e){p.formItems=e}),(0,_vue.watch)(function(){return q.items},function(e){t(e||[])}),(0,_vue.watch)(function(){return q.collapseStatus},function(e){p.collapseAll=!!e}),(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){"development"===process.env.NODE_ENV&&q.customLayout&&q.items&&(0,_log.errLog)("vxe.error.errConflicts",["custom-layout","items"]),t(q.items||[])})});return V.renderVN=function(){var e=q.loading,t=q.className,i=q.data,n=q.titleColon,l=q.titleAsterisk,r=q.customLayout,o=p.formItems,u=m.value,a=b.value,s=v.default;return(0,_vue.h)("form",{ref:_,class:["vxe-form",t?_xeUtils.default.isFunction(t)?t({items:o,data:i,$form:V}):t:"",((t={})["size--"+u]=u,t["is--colon"]=n,t["is--asterisk"]=l,t["is--loading"]=e,t)],onSubmit:f,onReset:c},[(0,_vue.h)("div",{class:"vxe-form--wrapper vxe-row"},r?s?s({}):[]:C(o)),(0,_vue.h)("div",{class:"vxe-form-slots",ref:"hideItem"},!r&&s?s({}):[]),(0,_vue.h)("div",{class:["vxe-loading",{"is--visible":e}]},[(0,_vue.h)("div",{class:"vxe-loading--spinner"})]),d?(0,_vue.h)((0,_vue.resolveComponent)("vxe-tooltip"),__assign({ref:g},a)):(0,_vue.createCommentVNode)()])},(0,_vue.provide)("$xeform",V),V},render:function(){return this.renderVN()}});exports.default=_default2;

package/lib/grid/src/grid.js

@@ -982,7 +982,7 @@ var _default2 = (0, _vue.defineComponent)({
                   if (rest) {
                     if ((0, _utils.isEnableConf)(pagerConfig)) {
                       var total = _xeUtils.default.get(rest, proxyProps.total || 'page.total') || 0;
-                      tablePage.total = total;
+                      tablePage.total = _xeUtils.default.toNumber(total);
                       reactData.tableData = _xeUtils.default.get(rest, proxyProps.result || 'result') || []; // 检验当前页码，不能超出当前最大页数
 
                       var pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);

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("../../tools/utils"),_dom=require("../../tools/dom"),_log=require("../../tools/log"),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_props=_interopRequireDefault(require("../../table/src/props")),_emits=_interopRequireDefault(require("../../table/src/emits")),_size=require("../../hooks/size"),_event=require("../../tools/event");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,o=1,r=arguments.length;o<r;o++)for(var n in t=arguments[o])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)},__spreadArray=function(e,t){for(var o=0,r=t.length,n=e.length;o<r;o++,n++)e[n]=t[o];return e},tableComponentPropKeys=Object.keys(_props.default),tableComponentMethodKeys=["clearAll","syncData","updateData","loadData","reloadData","reloadRow","loadColumn","reloadColumn","getRowNode","getColumnNode","getRowIndex","getVTRowIndex","getVMRowIndex","getColumnIndex","getVTColumnIndex","getVMColumnIndex","createData","createRow","revertData","clearData","isInsertByRow","isUpdateByRow","getColumns","getColumnById","getColumnByField","getTableColumn","getData","getCheckboxRecords","getParentRow","getRowSeq","getRowById","getRowid","getTableData","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","sort","clearSort","isSort","getSortColumns","closeFilter","isFilter","isRowExpandLoaded","clearRowExpandLoaded","reloadRowExpand","reloadRowExpand","toggleRowExpand","setAllRowExpand","setRowExpand","isExpandByRow","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","focus","blur","connect"],gridComponentEmits=__spreadArray(__spreadArray([],_emits.default),["page-change","form-submit","form-submit-invalid","form-reset","form-collapse","form-toggle-collapse","toolbar-button-click","toolbar-tool-click","zoom"]),_default2=(0,_vue.defineComponent)({name:"VxeGrid",props:__assign(__assign({},_props.default),{columns:Array,pagerConfig:Object,proxyConfig:Object,toolbarConfig:Object,formConfig:Object,zoomConfig:Object,size:{type:String,default:function(){return _conf.default.grid.size||_conf.default.size}}}),emits:gridComponentEmits,setup:function(H,e){function t(e){var t={};return e.forEach(function(r){t[r]=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var o=G.value;return o&&o[r].apply(o,e)}}),t}var f=e.slots,r=e.emit,o=_xeUtils.default.uniqueId(),n=(0,_vue.getCurrentInstance)(),v=(0,_size.useSize)(H),K=(0,_vue.reactive)({tableLoading:!1,proxyInited:!1,isZMax:!1,tableData:[],pendingRecords:[],filterData:[],formData:{},sortData:[],tZindex:0,tablePage:{total:0,pageSize:10,currentPage:1}}),p=(0,_vue.ref)(),G=(0,_vue.ref)(),m=(0,_vue.ref)(),_=(0,_vue.ref)(),x=(0,_vue.ref)(),b=(0,_vue.ref)(),h=(0,_vue.ref)(),C=(0,_vue.ref)(),E=(0,_vue.ref)(),R=(0,_vue.ref)(),Q=t(tableComponentMethodKeys);tableComponentMethodKeys.forEach(function(r){Q[r]=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var o=G.value;return o&&o[r].apply(o,e)}});function g(t){var e=K.pendingRecords,o=H.rowClassName,r=[];return e.some(function(e){return e===t.row})&&r.push("row--pending"),r.push(o?_xeUtils.default.isFunction(o)?o(t):o:""),r}function y(e){var t=H.editConfig,o=K.pendingRecords,r=G.value,t=t?t.activeMethod:null;return-1===r.findRowIndexOf(o,e.row)&&(!t||t(__assign(__assign({},e),{$grid:oe})))}function a(){(0,_vue.nextTick)(function(){var e=G.value,t=_.value;e&&t&&e.connect(t)})}function i(){var e=H.pagerConfig,t=K.tablePage,o=(r=T.value).currentPage,r=r.pageSize;e&&(o&&(t.currentPage=o),r&&(t.pageSize=r))}function Y(e,t){var o,r=void 0===(r=W.value.props)?{}:r;return(o=e&&r.message?_xeUtils.default.get(e,r.message):o)||_conf.default.i18n(t)}function J(e,t,o){var r=ee.value,n=Q.getCheckboxRecords();if(r){if(n.length)return _vXETable.VXETable.modal.confirm({id:"cfm_"+e,content:_conf.default.i18n(t),escClosable:!0}).then(function(e){"confirm"===e&&o()});"development"===process.env.NODE_ENV&&(_vXETable.VXETable.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"])),_vXETable.VXETable.modal.message({id:"msg_"+e,content:_conf.default.i18n("vxe.grid.selectOneRecord"),status:"warning"})}else n.length&&o();return Promise.resolve()}function l(e){var t=K.isZMax;return(e?!t:t)&&(K.isZMax=!t,K.tZindex<(0,_utils.getLastZIndex)()&&(K.tZindex=(0,_utils.nextZIndex)())),(0,_vue.nextTick)().then(function(){return Q.recalculate(!0)}).then(function(){return K.isZMax})}var W=(0,_vue.computed)(function(){return Object.assign({},_conf.default.grid.proxyConfig,H.proxyConfig)}),ee=(0,_vue.computed)(function(){return!1!==W.value.message}),T=(0,_vue.computed)(function(){return Object.assign({},_conf.default.grid.pagerConfig,H.pagerConfig)}),w=(0,_vue.computed)(function(){return Object.assign({},_conf.default.grid.formConfig,H.formConfig)}),te=(0,_vue.computed)(function(){return Object.assign({},_conf.default.grid.toolbarConfig,H.toolbarConfig)}),s=(0,_vue.computed)(function(){return Object.assign({},_conf.default.grid.zoomConfig,H.zoomConfig)}),O=(0,_vue.computed)(function(){return K.isZMax?{zIndex:K.tZindex}:null}),M=(0,_vue.computed)(function(){var t={},o=H;return tableComponentPropKeys.forEach(function(e){t[e]=o[e]}),t}),u={refElem:p,refTable:G,refForm:m,refToolbar:_,refPager:x},c={computeProxyOpts:W,computePagerOpts:T,computeFormOpts:w,computeToolbarOpts:te,computeZoomOpts:s},oe={xID:o,props:H,context:e,instance:n,reactData:K,getRefMaps:function(){return u},getComputeMaps:function(){return c}},re={},D=(0,_vue.computed)(function(){var e=H.seqConfig,t=H.pagerConfig,o=H.loading,r=H.editConfig,n=H.proxyConfig,a=K.isZMax,i=K.tableLoading,l=K.tablePage,s=K.tableData,u=M.value,c=W.value,d=Object.assign({},u);return a&&(u.maxHeight?d.maxHeight="auto":d.height="auto"),n&&(d.loading=o||i,d.data=s,d.rowClassName=g,c.seq&&(0,_utils.isEnableConf)(t)&&(d.seqConfig=Object.assign({},e,{startIndex:(l.currentPage-1)*l.pageSize}))),r&&(d.editConfig=Object.assign({},r,{activeMethod:y})),d}),k=function(e){var t=H.proxyConfig,o=K.tablePage,r=e.currentPage,n=e.pageSize;o.currentPage=r,o.pageSize=n,re.dispatchEvent("page-change",e),t&&re.commitProxy("query")},P=function(e){var t=G.value,o=H.proxyConfig;t.getComputeMaps().computeSortOpts.value.remote&&(K.sortData=e.sortList,o&&(K.tablePage.currentPage=1,re.commitProxy("query"))),re.dispatchEvent("sort-change",e)},S=function(e){var t=G.value,o=H.proxyConfig;t.getComputeMaps().computeFilterOpts.value.remote&&(K.filterData=e.filterList,o&&(K.tablePage.currentPage=1,re.commitProxy("query"))),re.dispatchEvent("filter-change",e)},V=function(e){H.proxyConfig&&re.commitProxy("reload"),re.dispatchEvent("form-submit",e)},X=function(e){H.proxyConfig&&re.commitProxy("reload"),re.dispatchEvent("form-reset",e)},I=function(e){re.dispatchEvent("form-submit-invalid",e)},q=function(e){(0,_vue.nextTick)(function(){return Q.recalculate(!0)}),re.dispatchEvent("form-toggle-collapse",e),re.dispatchEvent("form-collapse",e)},N=function(e,t){t=e[t];if(t){if(!_xeUtils.default.isString(t))return t;if(f[t])return f[t];"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notSlot",[t])}return null},L={};_emits.default.forEach(function(o){var e=_xeUtils.default.camelCase("on-"+o);L[e]=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return r.apply(void 0,__spreadArray([o],e))}});function d(){var n,e=H.proxyConfig,t=H.formConfig,o=K.proxyInited,r=W.value,a=w.value;e&&((0,_utils.isEnableConf)(t)&&r.form&&a.items&&(n={},a.items.forEach(function(e){var t,o=e.field,r=e.itemRender;o&&(t=null,r&&(r=r.defaultValue,_xeUtils.default.isFunction(r)?t=r({item:e}):_xeUtils.default.isUndefined(r)||(t=r)),n[o]=t)}),K.formData=n),o||!1===r.autoLoad||(K.proxyInited=!0,(0,_vue.nextTick)(function(){return re.commitProxy("_init")})))}re={dispatchEvent:function(e,t,o){r(e,Object.assign({$grid:oe,$event:o},t))},commitProxy:function(t){for(var e=[],o=1;o<arguments.length;o++)e[o-1]=arguments[o];var r=H.toolbarConfig,n=H.pagerConfig,a=H.editRules,i=K.tablePage,l=K.formData,s=ee.value,u=W.value,c=te.value,d=u.beforeQuery,g=u.afterQuery,f=u.beforeDelete,v=u.afterDelete,p=u.beforeSave,m=u.afterSave,_=u.ajax,x=void 0===_?{}:_,u=u.props,b=void 0===u?{}:u,h=G.value,C=null,E=null;E=_xeUtils.default.isString(t)?(c=c.buttons,C=(c=r&&c?_xeUtils.default.findTree(c,function(e){return e.code===t},{children:"dropdowns"}):null)?c.item:null,t):(C=t).code;var R,y,T,w,O=C?C.params:null;switch(E){case"insert":h.insert({});break;case"insert_actived":h.insert({}).then(function(e){e=e.row;return h.setActiveRow(e)});break;case"mark_cancel":V=E,T=K.pendingRecords,S=ee.value,w=G.value,(P=w.getCheckboxRecords()).length?(R=[],y=[],P.forEach(function(t){(T.some(function(e){return t===e})?y:R).push(t)}),y.length?K.pendingRecords=T.filter(function(e){return-1===w.findRowIndexOf(y,e)}).concat(R):R.length&&(K.pendingRecords=T.concat(R)),Q.clearCheckboxRow()):S&&("development"===process.env.NODE_ENV&&(_vXETable.VXETable.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"])),_vXETable.VXETable.modal.message({id:V,content:_conf.default.i18n("vxe.grid.selectOneRecord"),status:"warning"}));break;case"remove":return J(E,"vxe.grid.removeSelectRecord",function(){return h.removeCheckboxRow()});case"import":h.importData(O);break;case"open_import":h.openImport(O);break;case"export":h.exportData(O);break;case"open_export":h.openExport(O);break;case"reset_custom":h.resetColumn(!0);break;case"_init":case"reload":case"query":var M=x.query;if(M){var D="_init"===E,k="reload"===E,P=[],S=[],V={};n&&((D||k)&&(i.currentPage=1),(0,_utils.isEnableConf)(n)&&(V=__assign({},i))),D?((D=h.getComputeMaps().computeSortOpts.value.defaultSort)&&(P=(D=!_xeUtils.default.isArray(D)?[D]:D).map(function(e){return{field:e.field,property:e.field,order:e.order}})),S=h.getCheckedFilters()):k?(K.pendingRecords=[],h.clearAll()):(P=h.getSortColumns(),S=h.getCheckedFilters());V={code:E,button:C,$grid:oe,page:V,sort:P.length?P[0]:{},sorts:P,filters:S,form:l,options:M};K.sortData=P,K.filterData=S,K.tableLoading=!0;var X=[V].concat(e);return Promise.resolve((d||M).apply(void 0,X)).catch(function(e){return e}).then(function(e){var t;K.tableLoading=!1,e?(0,_utils.isEnableConf)(n)?(t=_xeUtils.default.get(e,b.total||"page.total")||0,i.total=t,K.tableData=_xeUtils.default.get(e,b.result||"result")||[],t=Math.max(Math.ceil(t/i.pageSize),1),i.currentPage>t&&(i.currentPage=t)):K.tableData=(b.list?_xeUtils.default.get(e,b.list):e)||[]:K.tableData=[],g&&g.apply(void 0,X)})}"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.query"]);break;case"delete":var I=x.delete;if(I){var q=Q.getCheckboxRecords(),N=q.filter(function(e){return!h.isInsertByRow(e)}),L=[{$grid:oe,code:E,button:C,body:{removeRecords:N},options:I}].concat(e);if(q.length)return J(E,"vxe.grid.deleteSelectRecord",function(){return N.length?(K.tableLoading=!0,Promise.resolve((f||I).apply(void 0,L)).then(function(e){K.tableLoading=!1,K.pendingRecords=K.pendingRecords.filter(function(e){return-1===h.findRowIndexOf(N,e)}),s&&("development"===process.env.NODE_ENV&&(_vXETable.VXETable.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"])),_vXETable.VXETable.modal.message({content:Y(e,"vxe.grid.delSuccess"),status:"success"})),v?v.apply(void 0,L):re.commitProxy("query")}).catch(function(e){K.tableLoading=!1,s&&("development"===process.env.NODE_ENV&&(_vXETable.VXETable.modal.message||(0,_log.errLog)("vxe.error.reqModule",["Modal"])),_vXETable.VXETable.modal.message({id:E,content:Y(e,"vxe.grid.operError"),status:"error"}))})):h.remove(q)});s&&("development"===process.env.NODE_ENV&&(_vXETable.VXETable.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"])),_vXETable.VXETable.modal.message({id:E,content:_conf.default.i18n("vxe.grid.selectOneRecord"),status:"warning"}))}else"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.delete"]);break;case"save":var U=x.save;if(U){var z=Object.assign({pendingRecords:K.pendingRecords},h.getRecordset()),j=z.insertRecords,F=z.removeRecords,Z=z.updateRecords,A=z.pendingRecords,$=[{$grid:oe,code:E,button:C,body:z,options:U}].concat(e);j.length&&(z.pendingRecords=A.filter(function(e){return-1===h.findRowIndexOf(j,e)})),A.length&&(z.insertRecords=j.filter(function(e){return-1===h.findRowIndexOf(A,e)}));var B=Promise.resolve();return(B=a?h.validate(z.insertRecords.concat(Z)):B).then(function(e){if(!e)return z.insertRecords.length||F.length||Z.length||z.pendingRecords.length?(K.tableLoading=!0,Promise.resolve((p||U).apply(void 0,$)).then(function(e){K.tableLoading=!1,K.pendingRecords=[],s&&("development"===process.env.NODE_ENV&&(_vXETable.VXETable.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"])),_vXETable.VXETable.modal.message({content:Y(e,"vxe.grid.saveSuccess"),status:"success"})),m?m.apply(void 0,$):re.commitProxy("query")}).catch(function(e){K.tableLoading=!1,s&&("development"===process.env.NODE_ENV&&(_vXETable.VXETable.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"])),_vXETable.VXETable.modal.message({id:E,content:Y(e,"vxe.grid.operError"),status:"error"}))})):void(s&&("development"===process.env.NODE_ENV&&(_vXETable.VXETable.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"])),_vXETable.VXETable.modal.message({id:E,content:_conf.default.i18n("vxe.grid.dataUnchanged"),status:"info"})))})}"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.save"]);break;default:B=_vXETable.VXETable.commands.get(E);B&&B.apply(void 0,__spreadArray([{code:E,button:C,$grid:oe,$table:h}],e))}return(0,_vue.nextTick)()},zoom:function(){return K.isZMax?re.revert():re.maximize()},isMaximized:function(){return K.isZMax},maximize:function(){return l(!0)},revert:function(){return l()},getFormItems:function(e){var t=w.value,o=H.formConfig,t=t.items,r=[];return _xeUtils.default.eachTree((0,_utils.isEnableConf)(o)&&t?t:[],function(e){r.push(e)},{children:"children"}),_xeUtils.default.isUndefined(e)?r:r[e]},getPendingRecords:function(){return K.pendingRecords},getProxyInfo:function(){if(H.proxyConfig){var e=K.sortData;return{data:K.tableData,filter:K.filterData,form:K.formData,sort:e.length?e[0]:{},sorts:e,pager:K.tablePage,pendingRecords:K.pendingRecords}}return null}};"development"===process.env.NODE_ENV&&(re.loadColumn=function(e){var t=G.value;return _xeUtils.default.eachTree(e,function(e){e.slots&&_xeUtils.default.each(e.slots,function(e){_xeUtils.default.isFunction(e)||f[e]||(0,_log.errLog)("vxe.error.notSlot",[e])})}),t.loadColumn(e)},re.reloadColumn=function(e){return Q.clearAll(),re.loadColumn(e)});var U={extendTableMethods:t,callSlot:function(e,t){return e&&(_xeUtils.default.isString(e)&&(e=f[e]||null),_xeUtils.default.isFunction(e))?e(t):[]},getExcludeHeight:function(){var e=H.height,t=K.isZMax,o=p.value,r=b.value,n=h.value,a=C.value,i=E.value,l=R.value;return(t||"auto"!==e?0:(0,_dom.getPaddingTopBottomSize)(o.parentNode))+(0,_dom.getPaddingTopBottomSize)(o)+(0,_dom.getOffsetHeight)(r)+(0,_dom.getOffsetHeight)(n)+(0,_dom.getOffsetHeight)(a)+(0,_dom.getOffsetHeight)(i)+(0,_dom.getOffsetHeight)(l)},getParentHeight:function(){var e=p.value;return e?(K.isZMax?(0,_dom.getDomNode)().visibleHeight:_xeUtils.default.toNumber(getComputedStyle(e.parentNode).height))-U.getExcludeHeight():0},triggerToolbarBtnEvent:function(e,t){re.commitProxy(e,t),re.dispatchEvent("toolbar-button-click",{code:e.code,button:e},t)},triggerToolbarTolEvent:function(e,t){re.commitProxy(e,t),re.dispatchEvent("toolbar-tool-click",{code:e.code,tool:e,$event:t})},triggerZoomEvent:function(e){re.zoom(),re.dispatchEvent("zoom",{type:K.isZMax?"max":"revert"},e)}};Object.assign(oe,Q,re,U),(0,_vue.watch)(function(){return H.columns},function(e){(0,_vue.nextTick)(function(){return oe.loadColumn(e||[])})}),(0,_vue.watch)(function(){return H.toolbarConfig},function(e){e&&a()}),(0,_vue.watch)(function(){return H.proxyConfig},function(){d()}),(0,_vue.watch)(function(){return H.pagerConfig},function(){i()});function z(e){var t=s.value;(0,_event.hasEventKey)(e,_event.EVENT_KEYS.ESCAPE)&&K.isZMax&&!1!==t.escRestore&&U.triggerZoomEvent(e)}_vXETable.VXETable.hooks.forEach(function(e){e=e.setupGrid;!e||(e=e(oe))&&_xeUtils.default.isObject(e)&&Object.assign(oe,e)}),(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=H.data,t=H.columns,o=H.proxyConfig,r=W.value,n=w.value;o&&(e||r.form&&n.data)&&(0,_log.errLog)("vxe.error.errConflicts",["grid.data","grid.proxy-config"]),t&&t.length&&oe.loadColumn(t),a(),i(),d()}),_event.GlobalEvent.on(oe,"keydown",z)}),(0,_vue.onUnmounted)(function(){_event.GlobalEvent.off(oe,"keydown")});return oe.renderVN=function(){var e,t,o,r,n,a,i,l,s,u,c,d=v.value,g=O.value;return(0,_vue.h)("div",{ref:p,class:["vxe-grid",((c={})["size--"+d]=d,c["is--animat"]=!!H.animat,c["is--round"]=H.round,c["is--maximize"]=K.isZMax,c["is--loading"]=H.loading||K.tableLoading,c)],style:g},(l=H.formConfig,s=H.proxyConfig,u=K.formData,d=W.value,c=w.value,g=[],((0,_utils.isEnableConf)(l)||f.form)&&(l=[],f.form?l=f.form({$grid:oe}):c.items&&(a={},c.inited||(c.inited=!0,i=d.beforeItem,d&&i&&c.items.forEach(function(e){i({$grid:oe,item:e})})),c.items.forEach(function(e){_xeUtils.default.each(e.slots,function(e){_xeUtils.default.isFunction(e)||f[e]&&(a[e]=f[e])})}),l.push((0,_vue.h)((0,_vue.resolveComponent)("vxe-form"),__assign(__assign({ref:m},Object.assign({},c,{data:s&&d.form?u:c.data})),{onSubmit:V,onReset:X,onSubmitInvalid:I,onCollapse:q}),a))),g.push((0,_vue.h)("div",{ref:b,class:"vxe-grid--form-wrapper"},l))),g.concat((c=H.toolbarConfig,l=te.value,g=[],((0,_utils.isEnableConf)(c)||f.toolbar)&&(t=[],f.toolbar?t=f.toolbar({$grid:oe}):(r=o=void 0,n={},(c=l.slots)&&(o=N(c,"buttons"),r=N(c,"tools"),o&&(n.buttons=o),r&&(n.tools=r)),t.push((0,_vue.h)((0,_vue.resolveComponent)("vxe-toolbar"),__assign({ref:_},l),n))),g.push((0,_vue.h)("div",{ref:h,class:"vxe-grid--toolbar-wrapper"},t))),g),f.top?[(0,_vue.h)("div",{ref:C,class:"vxe-grid--top-wrapper"},f.top({$grid:oe}))]:[],(c=H.proxyConfig,o=D.value,r=W.value,l=Object.assign({},L),e=f.empty,c&&(r.sort&&(l.onSortChange=P),r.filter&&(l.onFilterChange=S)),[(0,_vue.h)((0,_vue.resolveComponent)("vxe-table"),__assign(__assign({ref:G},o),l),e?{empty:function(){return e({})}}:{})]),f.bottom?[(0,_vue.h)("div",{ref:E,class:"vxe-grid--bottom-wrapper"},f.bottom({$grid:oe}))]:[],(n=H.pagerConfig,t=T.value,g=[],((0,_utils.isEnableConf)(n)||f.pager)&&(c=[],f.pager?c=f.pager({$grid:oe}):(r={},l=o=void 0,(n=t.slots)&&(o=N(n,"left"),l=N(n,"right"),o&&(r.left=o),l&&(r.right=l)),c.push((0,_vue.h)((0,_vue.resolveComponent)("vxe-pager"),__assign(__assign(__assign({ref:x},t),H.proxyConfig?K.tablePage:{}),{onPageChange:k}),r))),g.push((0,_vue.h)("div",{ref:R,class:"vxe-grid--pager-wrapper"},c))),g))))},(0,_vue.provide)("$xegrid",oe),oe},render:function(){return this.renderVN()}});exports.default=_default2;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_utils=require("../../tools/utils"),_dom=require("../../tools/dom"),_log=require("../../tools/log"),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_props=_interopRequireDefault(require("../../table/src/props")),_emits=_interopRequireDefault(require("../../table/src/emits")),_size=require("../../hooks/size"),_event=require("../../tools/event");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var t,o=1,r=arguments.length;o<r;o++)for(var n in t=arguments[o])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}).apply(this,arguments)},__spreadArray=function(e,t){for(var o=0,r=t.length,n=e.length;o<r;o++,n++)e[n]=t[o];return e},tableComponentPropKeys=Object.keys(_props.default),tableComponentMethodKeys=["clearAll","syncData","updateData","loadData","reloadData","reloadRow","loadColumn","reloadColumn","getRowNode","getColumnNode","getRowIndex","getVTRowIndex","getVMRowIndex","getColumnIndex","getVTColumnIndex","getVMColumnIndex","createData","createRow","revertData","clearData","isInsertByRow","isUpdateByRow","getColumns","getColumnById","getColumnByField","getTableColumn","getData","getCheckboxRecords","getParentRow","getRowSeq","getRowById","getRowid","getTableData","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","sort","clearSort","isSort","getSortColumns","closeFilter","isFilter","isRowExpandLoaded","clearRowExpandLoaded","reloadRowExpand","reloadRowExpand","toggleRowExpand","setAllRowExpand","setRowExpand","isExpandByRow","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","focus","blur","connect"],gridComponentEmits=__spreadArray(__spreadArray([],_emits.default),["page-change","form-submit","form-submit-invalid","form-reset","form-collapse","form-toggle-collapse","toolbar-button-click","toolbar-tool-click","zoom"]),_default2=(0,_vue.defineComponent)({name:"VxeGrid",props:__assign(__assign({},_props.default),{columns:Array,pagerConfig:Object,proxyConfig:Object,toolbarConfig:Object,formConfig:Object,zoomConfig:Object,size:{type:String,default:function(){return _conf.default.grid.size||_conf.default.size}}}),emits:gridComponentEmits,setup:function(H,e){function t(e){var t={};return e.forEach(function(r){t[r]=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var o=G.value;return o&&o[r].apply(o,e)}}),t}var f=e.slots,r=e.emit,o=_xeUtils.default.uniqueId(),n=(0,_vue.getCurrentInstance)(),v=(0,_size.useSize)(H),K=(0,_vue.reactive)({tableLoading:!1,proxyInited:!1,isZMax:!1,tableData:[],pendingRecords:[],filterData:[],formData:{},sortData:[],tZindex:0,tablePage:{total:0,pageSize:10,currentPage:1}}),p=(0,_vue.ref)(),G=(0,_vue.ref)(),m=(0,_vue.ref)(),_=(0,_vue.ref)(),x=(0,_vue.ref)(),b=(0,_vue.ref)(),h=(0,_vue.ref)(),C=(0,_vue.ref)(),E=(0,_vue.ref)(),R=(0,_vue.ref)(),Q=t(tableComponentMethodKeys);tableComponentMethodKeys.forEach(function(r){Q[r]=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var o=G.value;return o&&o[r].apply(o,e)}});function g(t){var e=K.pendingRecords,o=H.rowClassName,r=[];return e.some(function(e){return e===t.row})&&r.push("row--pending"),r.push(o?_xeUtils.default.isFunction(o)?o(t):o:""),r}function y(e){var t=H.editConfig,o=K.pendingRecords,r=G.value,t=t?t.activeMethod:null;return-1===r.findRowIndexOf(o,e.row)&&(!t||t(__assign(__assign({},e),{$grid:oe})))}function a(){(0,_vue.nextTick)(function(){var e=G.value,t=_.value;e&&t&&e.connect(t)})}function i(){var e=H.pagerConfig,t=K.tablePage,o=(r=T.value).currentPage,r=r.pageSize;e&&(o&&(t.currentPage=o),r&&(t.pageSize=r))}function Y(e,t){var o,r=void 0===(r=W.value.props)?{}:r;return(o=e&&r.message?_xeUtils.default.get(e,r.message):o)||_conf.default.i18n(t)}function J(e,t,o){var r=ee.value,n=Q.getCheckboxRecords();if(r){if(n.length)return _vXETable.VXETable.modal.confirm({id:"cfm_"+e,content:_conf.default.i18n(t),escClosable:!0}).then(function(e){"confirm"===e&&o()});"development"===process.env.NODE_ENV&&(_vXETable.VXETable.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"])),_vXETable.VXETable.modal.message({id:"msg_"+e,content:_conf.default.i18n("vxe.grid.selectOneRecord"),status:"warning"})}else n.length&&o();return Promise.resolve()}function l(e){var t=K.isZMax;return(e?!t:t)&&(K.isZMax=!t,K.tZindex<(0,_utils.getLastZIndex)()&&(K.tZindex=(0,_utils.nextZIndex)())),(0,_vue.nextTick)().then(function(){return Q.recalculate(!0)}).then(function(){return K.isZMax})}var W=(0,_vue.computed)(function(){return Object.assign({},_conf.default.grid.proxyConfig,H.proxyConfig)}),ee=(0,_vue.computed)(function(){return!1!==W.value.message}),T=(0,_vue.computed)(function(){return Object.assign({},_conf.default.grid.pagerConfig,H.pagerConfig)}),w=(0,_vue.computed)(function(){return Object.assign({},_conf.default.grid.formConfig,H.formConfig)}),te=(0,_vue.computed)(function(){return Object.assign({},_conf.default.grid.toolbarConfig,H.toolbarConfig)}),s=(0,_vue.computed)(function(){return Object.assign({},_conf.default.grid.zoomConfig,H.zoomConfig)}),O=(0,_vue.computed)(function(){return K.isZMax?{zIndex:K.tZindex}:null}),M=(0,_vue.computed)(function(){var t={},o=H;return tableComponentPropKeys.forEach(function(e){t[e]=o[e]}),t}),u={refElem:p,refTable:G,refForm:m,refToolbar:_,refPager:x},c={computeProxyOpts:W,computePagerOpts:T,computeFormOpts:w,computeToolbarOpts:te,computeZoomOpts:s},oe={xID:o,props:H,context:e,instance:n,reactData:K,getRefMaps:function(){return u},getComputeMaps:function(){return c}},re={},D=(0,_vue.computed)(function(){var e=H.seqConfig,t=H.pagerConfig,o=H.loading,r=H.editConfig,n=H.proxyConfig,a=K.isZMax,i=K.tableLoading,l=K.tablePage,s=K.tableData,u=M.value,c=W.value,d=Object.assign({},u);return a&&(u.maxHeight?d.maxHeight="auto":d.height="auto"),n&&(d.loading=o||i,d.data=s,d.rowClassName=g,c.seq&&(0,_utils.isEnableConf)(t)&&(d.seqConfig=Object.assign({},e,{startIndex:(l.currentPage-1)*l.pageSize}))),r&&(d.editConfig=Object.assign({},r,{activeMethod:y})),d}),k=function(e){var t=H.proxyConfig,o=K.tablePage,r=e.currentPage,n=e.pageSize;o.currentPage=r,o.pageSize=n,re.dispatchEvent("page-change",e),t&&re.commitProxy("query")},P=function(e){var t=G.value,o=H.proxyConfig;t.getComputeMaps().computeSortOpts.value.remote&&(K.sortData=e.sortList,o&&(K.tablePage.currentPage=1,re.commitProxy("query"))),re.dispatchEvent("sort-change",e)},S=function(e){var t=G.value,o=H.proxyConfig;t.getComputeMaps().computeFilterOpts.value.remote&&(K.filterData=e.filterList,o&&(K.tablePage.currentPage=1,re.commitProxy("query"))),re.dispatchEvent("filter-change",e)},V=function(e){H.proxyConfig&&re.commitProxy("reload"),re.dispatchEvent("form-submit",e)},X=function(e){H.proxyConfig&&re.commitProxy("reload"),re.dispatchEvent("form-reset",e)},I=function(e){re.dispatchEvent("form-submit-invalid",e)},N=function(e){(0,_vue.nextTick)(function(){return Q.recalculate(!0)}),re.dispatchEvent("form-toggle-collapse",e),re.dispatchEvent("form-collapse",e)},q=function(e,t){t=e[t];if(t){if(!_xeUtils.default.isString(t))return t;if(f[t])return f[t];"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notSlot",[t])}return null},L={};_emits.default.forEach(function(o){var e=_xeUtils.default.camelCase("on-"+o);L[e]=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return r.apply(void 0,__spreadArray([o],e))}});function d(){var n,e=H.proxyConfig,t=H.formConfig,o=K.proxyInited,r=W.value,a=w.value;e&&((0,_utils.isEnableConf)(t)&&r.form&&a.items&&(n={},a.items.forEach(function(e){var t,o=e.field,r=e.itemRender;o&&(t=null,r&&(r=r.defaultValue,_xeUtils.default.isFunction(r)?t=r({item:e}):_xeUtils.default.isUndefined(r)||(t=r)),n[o]=t)}),K.formData=n),o||!1===r.autoLoad||(K.proxyInited=!0,(0,_vue.nextTick)(function(){return re.commitProxy("_init")})))}re={dispatchEvent:function(e,t,o){r(e,Object.assign({$grid:oe,$event:o},t))},commitProxy:function(t){for(var e=[],o=1;o<arguments.length;o++)e[o-1]=arguments[o];var r=H.toolbarConfig,n=H.pagerConfig,a=H.editRules,i=K.tablePage,l=K.formData,s=ee.value,u=W.value,c=te.value,d=u.beforeQuery,g=u.afterQuery,f=u.beforeDelete,v=u.afterDelete,p=u.beforeSave,m=u.afterSave,_=u.ajax,x=void 0===_?{}:_,u=u.props,b=void 0===u?{}:u,h=G.value,C=null,E=null;E=_xeUtils.default.isString(t)?(c=c.buttons,C=(c=r&&c?_xeUtils.default.findTree(c,function(e){return e.code===t},{children:"dropdowns"}):null)?c.item:null,t):(C=t).code;var R,y,T,w,O=C?C.params:null;switch(E){case"insert":h.insert({});break;case"insert_actived":h.insert({}).then(function(e){e=e.row;return h.setActiveRow(e)});break;case"mark_cancel":V=E,T=K.pendingRecords,S=ee.value,w=G.value,(P=w.getCheckboxRecords()).length?(R=[],y=[],P.forEach(function(t){(T.some(function(e){return t===e})?y:R).push(t)}),y.length?K.pendingRecords=T.filter(function(e){return-1===w.findRowIndexOf(y,e)}).concat(R):R.length&&(K.pendingRecords=T.concat(R)),Q.clearCheckboxRow()):S&&("development"===process.env.NODE_ENV&&(_vXETable.VXETable.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"])),_vXETable.VXETable.modal.message({id:V,content:_conf.default.i18n("vxe.grid.selectOneRecord"),status:"warning"}));break;case"remove":return J(E,"vxe.grid.removeSelectRecord",function(){return h.removeCheckboxRow()});case"import":h.importData(O);break;case"open_import":h.openImport(O);break;case"export":h.exportData(O);break;case"open_export":h.openExport(O);break;case"reset_custom":h.resetColumn(!0);break;case"_init":case"reload":case"query":var M=x.query;if(M){var D="_init"===E,k="reload"===E,P=[],S=[],V={};n&&((D||k)&&(i.currentPage=1),(0,_utils.isEnableConf)(n)&&(V=__assign({},i))),D?((D=h.getComputeMaps().computeSortOpts.value.defaultSort)&&(P=(D=!_xeUtils.default.isArray(D)?[D]:D).map(function(e){return{field:e.field,property:e.field,order:e.order}})),S=h.getCheckedFilters()):k?(K.pendingRecords=[],h.clearAll()):(P=h.getSortColumns(),S=h.getCheckedFilters());V={code:E,button:C,$grid:oe,page:V,sort:P.length?P[0]:{},sorts:P,filters:S,form:l,options:M};K.sortData=P,K.filterData=S,K.tableLoading=!0;var X=[V].concat(e);return Promise.resolve((d||M).apply(void 0,X)).catch(function(e){return e}).then(function(e){var t;K.tableLoading=!1,e?(0,_utils.isEnableConf)(n)?(t=_xeUtils.default.get(e,b.total||"page.total")||0,i.total=_xeUtils.default.toNumber(t),K.tableData=_xeUtils.default.get(e,b.result||"result")||[],t=Math.max(Math.ceil(t/i.pageSize),1),i.currentPage>t&&(i.currentPage=t)):K.tableData=(b.list?_xeUtils.default.get(e,b.list):e)||[]:K.tableData=[],g&&g.apply(void 0,X)})}"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.query"]);break;case"delete":var I=x.delete;if(I){var N=Q.getCheckboxRecords(),q=N.filter(function(e){return!h.isInsertByRow(e)}),L=[{$grid:oe,code:E,button:C,body:{removeRecords:q},options:I}].concat(e);if(N.length)return J(E,"vxe.grid.deleteSelectRecord",function(){return q.length?(K.tableLoading=!0,Promise.resolve((f||I).apply(void 0,L)).then(function(e){K.tableLoading=!1,K.pendingRecords=K.pendingRecords.filter(function(e){return-1===h.findRowIndexOf(q,e)}),s&&("development"===process.env.NODE_ENV&&(_vXETable.VXETable.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"])),_vXETable.VXETable.modal.message({content:Y(e,"vxe.grid.delSuccess"),status:"success"})),v?v.apply(void 0,L):re.commitProxy("query")}).catch(function(e){K.tableLoading=!1,s&&("development"===process.env.NODE_ENV&&(_vXETable.VXETable.modal.message||(0,_log.errLog)("vxe.error.reqModule",["Modal"])),_vXETable.VXETable.modal.message({id:E,content:Y(e,"vxe.grid.operError"),status:"error"}))})):h.remove(N)});s&&("development"===process.env.NODE_ENV&&(_vXETable.VXETable.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"])),_vXETable.VXETable.modal.message({id:E,content:_conf.default.i18n("vxe.grid.selectOneRecord"),status:"warning"}))}else"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.delete"]);break;case"save":var U=x.save;if(U){var z=Object.assign({pendingRecords:K.pendingRecords},h.getRecordset()),j=z.insertRecords,F=z.removeRecords,Z=z.updateRecords,A=z.pendingRecords,$=[{$grid:oe,code:E,button:C,body:z,options:U}].concat(e);j.length&&(z.pendingRecords=A.filter(function(e){return-1===h.findRowIndexOf(j,e)})),A.length&&(z.insertRecords=j.filter(function(e){return-1===h.findRowIndexOf(A,e)}));var B=Promise.resolve();return(B=a?h.validate(z.insertRecords.concat(Z)):B).then(function(e){if(!e)return z.insertRecords.length||F.length||Z.length||z.pendingRecords.length?(K.tableLoading=!0,Promise.resolve((p||U).apply(void 0,$)).then(function(e){K.tableLoading=!1,K.pendingRecords=[],s&&("development"===process.env.NODE_ENV&&(_vXETable.VXETable.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"])),_vXETable.VXETable.modal.message({content:Y(e,"vxe.grid.saveSuccess"),status:"success"})),m?m.apply(void 0,$):re.commitProxy("query")}).catch(function(e){K.tableLoading=!1,s&&("development"===process.env.NODE_ENV&&(_vXETable.VXETable.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"])),_vXETable.VXETable.modal.message({id:E,content:Y(e,"vxe.grid.operError"),status:"error"}))})):void(s&&("development"===process.env.NODE_ENV&&(_vXETable.VXETable.modal||(0,_log.errLog)("vxe.error.reqModule",["Modal"])),_vXETable.VXETable.modal.message({id:E,content:_conf.default.i18n("vxe.grid.dataUnchanged"),status:"info"})))})}"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notFunc",["proxy-config.ajax.save"]);break;default:B=_vXETable.VXETable.commands.get(E);B&&B.apply(void 0,__spreadArray([{code:E,button:C,$grid:oe,$table:h}],e))}return(0,_vue.nextTick)()},zoom:function(){return K.isZMax?re.revert():re.maximize()},isMaximized:function(){return K.isZMax},maximize:function(){return l(!0)},revert:function(){return l()},getFormItems:function(e){var t=w.value,o=H.formConfig,t=t.items,r=[];return _xeUtils.default.eachTree((0,_utils.isEnableConf)(o)&&t?t:[],function(e){r.push(e)},{children:"children"}),_xeUtils.default.isUndefined(e)?r:r[e]},getPendingRecords:function(){return K.pendingRecords},getProxyInfo:function(){if(H.proxyConfig){var e=K.sortData;return{data:K.tableData,filter:K.filterData,form:K.formData,sort:e.length?e[0]:{},sorts:e,pager:K.tablePage,pendingRecords:K.pendingRecords}}return null}};"development"===process.env.NODE_ENV&&(re.loadColumn=function(e){var t=G.value;return _xeUtils.default.eachTree(e,function(e){e.slots&&_xeUtils.default.each(e.slots,function(e){_xeUtils.default.isFunction(e)||f[e]||(0,_log.errLog)("vxe.error.notSlot",[e])})}),t.loadColumn(e)},re.reloadColumn=function(e){return Q.clearAll(),re.loadColumn(e)});var U={extendTableMethods:t,callSlot:function(e,t){return e&&(_xeUtils.default.isString(e)&&(e=f[e]||null),_xeUtils.default.isFunction(e))?e(t):[]},getExcludeHeight:function(){var e=H.height,t=K.isZMax,o=p.value,r=b.value,n=h.value,a=C.value,i=E.value,l=R.value;return(t||"auto"!==e?0:(0,_dom.getPaddingTopBottomSize)(o.parentNode))+(0,_dom.getPaddingTopBottomSize)(o)+(0,_dom.getOffsetHeight)(r)+(0,_dom.getOffsetHeight)(n)+(0,_dom.getOffsetHeight)(a)+(0,_dom.getOffsetHeight)(i)+(0,_dom.getOffsetHeight)(l)},getParentHeight:function(){var e=p.value;return e?(K.isZMax?(0,_dom.getDomNode)().visibleHeight:_xeUtils.default.toNumber(getComputedStyle(e.parentNode).height))-U.getExcludeHeight():0},triggerToolbarBtnEvent:function(e,t){re.commitProxy(e,t),re.dispatchEvent("toolbar-button-click",{code:e.code,button:e},t)},triggerToolbarTolEvent:function(e,t){re.commitProxy(e,t),re.dispatchEvent("toolbar-tool-click",{code:e.code,tool:e,$event:t})},triggerZoomEvent:function(e){re.zoom(),re.dispatchEvent("zoom",{type:K.isZMax?"max":"revert"},e)}};Object.assign(oe,Q,re,U),(0,_vue.watch)(function(){return H.columns},function(e){(0,_vue.nextTick)(function(){return oe.loadColumn(e||[])})}),(0,_vue.watch)(function(){return H.toolbarConfig},function(e){e&&a()}),(0,_vue.watch)(function(){return H.proxyConfig},function(){d()}),(0,_vue.watch)(function(){return H.pagerConfig},function(){i()});function z(e){var t=s.value;(0,_event.hasEventKey)(e,_event.EVENT_KEYS.ESCAPE)&&K.isZMax&&!1!==t.escRestore&&U.triggerZoomEvent(e)}_vXETable.VXETable.hooks.forEach(function(e){e=e.setupGrid;!e||(e=e(oe))&&_xeUtils.default.isObject(e)&&Object.assign(oe,e)}),(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=H.data,t=H.columns,o=H.proxyConfig,r=W.value,n=w.value;o&&(e||r.form&&n.data)&&(0,_log.errLog)("vxe.error.errConflicts",["grid.data","grid.proxy-config"]),t&&t.length&&oe.loadColumn(t),a(),i(),d()}),_event.GlobalEvent.on(oe,"keydown",z)}),(0,_vue.onUnmounted)(function(){_event.GlobalEvent.off(oe,"keydown")});return oe.renderVN=function(){var e,t,o,r,n,a,i,l,s,u,c,d=v.value,g=O.value;return(0,_vue.h)("div",{ref:p,class:["vxe-grid",((c={})["size--"+d]=d,c["is--animat"]=!!H.animat,c["is--round"]=H.round,c["is--maximize"]=K.isZMax,c["is--loading"]=H.loading||K.tableLoading,c)],style:g},(l=H.formConfig,s=H.proxyConfig,u=K.formData,d=W.value,c=w.value,g=[],((0,_utils.isEnableConf)(l)||f.form)&&(l=[],f.form?l=f.form({$grid:oe}):c.items&&(a={},c.inited||(c.inited=!0,i=d.beforeItem,d&&i&&c.items.forEach(function(e){i({$grid:oe,item:e})})),c.items.forEach(function(e){_xeUtils.default.each(e.slots,function(e){_xeUtils.default.isFunction(e)||f[e]&&(a[e]=f[e])})}),l.push((0,_vue.h)((0,_vue.resolveComponent)("vxe-form"),__assign(__assign({ref:m},Object.assign({},c,{data:s&&d.form?u:c.data})),{onSubmit:V,onReset:X,onSubmitInvalid:I,onCollapse:N}),a))),g.push((0,_vue.h)("div",{ref:b,class:"vxe-grid--form-wrapper"},l))),g.concat((c=H.toolbarConfig,l=te.value,g=[],((0,_utils.isEnableConf)(c)||f.toolbar)&&(t=[],f.toolbar?t=f.toolbar({$grid:oe}):(r=o=void 0,n={},(c=l.slots)&&(o=q(c,"buttons"),r=q(c,"tools"),o&&(n.buttons=o),r&&(n.tools=r)),t.push((0,_vue.h)((0,_vue.resolveComponent)("vxe-toolbar"),__assign({ref:_},l),n))),g.push((0,_vue.h)("div",{ref:h,class:"vxe-grid--toolbar-wrapper"},t))),g),f.top?[(0,_vue.h)("div",{ref:C,class:"vxe-grid--top-wrapper"},f.top({$grid:oe}))]:[],(c=H.proxyConfig,o=D.value,r=W.value,l=Object.assign({},L),e=f.empty,c&&(r.sort&&(l.onSortChange=P),r.filter&&(l.onFilterChange=S)),[(0,_vue.h)((0,_vue.resolveComponent)("vxe-table"),__assign(__assign({ref:G},o),l),e?{empty:function(){return e({})}}:{})]),f.bottom?[(0,_vue.h)("div",{ref:E,class:"vxe-grid--bottom-wrapper"},f.bottom({$grid:oe}))]:[],(n=H.pagerConfig,t=T.value,g=[],((0,_utils.isEnableConf)(n)||f.pager)&&(c=[],f.pager?c=f.pager({$grid:oe}):(r={},l=o=void 0,(n=t.slots)&&(o=q(n,"left"),l=q(n,"right"),o&&(r.left=o),l&&(r.right=l)),c.push((0,_vue.h)((0,_vue.resolveComponent)("vxe-pager"),__assign(__assign(__assign({ref:x},t),H.proxyConfig?K.tablePage:{}),{onPageChange:k}),r))),g.push((0,_vue.h)("div",{ref:R,class:"vxe-grid--pager-wrapper"},c))),g))))},(0,_vue.provide)("$xegrid",oe),oe},render:function(){return this.renderVN()}});exports.default=_default2;

package/lib/header/src/header.js

@@ -221,7 +221,7 @@ var _default = (0, _vue.defineComponent)({
           mouseConfig = tableProps.mouseConfig;
       var isGroup = tableReactData.isGroup,
           currentColumn = tableReactData.currentColumn,
-          scrollYLoad = tableReactData.scrollYLoad,
+          scrollXLoad = tableReactData.scrollXLoad,
           overflowX = tableReactData.overflowX,
           scrollbarWidth = tableReactData.scrollbarWidth;
       var columnOpts = computeColumnOpts.value;
@@ -229,7 +229,7 @@ var _default = (0, _vue.defineComponent)({
 
       if (!isGroup) {
         if (fixedType) {
-          if (scrollYLoad || allColumnHeaderOverflow) {
+          if (scrollXLoad || allColumnHeaderOverflow) {
             tableColumn = fixedColumn;
           }
         }
@@ -326,9 +326,9 @@ var _default = (0, _vue.defineComponent)({
             onDblclick: function onDblclick(evnt) {
               return $xetable.triggerHeaderCellDblclickEvent(evnt, params);
             }
-          }; // 纵向虚拟滚动不支持动态行高
+          }; // 横向虚拟滚动不支持动态行高
 
-          if (scrollYLoad && !hasEllipsis) {
+          if (scrollXLoad && !hasEllipsis) {
             showEllipsis = hasEllipsis = true;
           } // 按下事件处理
 

package/lib/header/src/header.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")),_util=require("./util"),_util2=require("../../table/src/util"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var l,t=1,n=arguments.length;t<n;t++)for(var r in l=arguments[t])Object.prototype.hasOwnProperty.call(l,r)&&(e[r]=l[r]);return e}).apply(this,arguments)},renderType="header",_default=(0,_vue.defineComponent)({name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},setup:function(W){function t(){var e=s.isGroup;c.value=e?(0,_util.convertToRows)(W.tableGroupColumn):[]}var k=(0,_vue.inject)("$xetable",{}),o=k.xID,u=k.props,s=k.reactData,I=k.internalData,e=k.getRefMaps(),$=e.refElem,H=e.refTableBody,O=e.refLeftContainer,q=e.refRightContainer,A=e.refCellResizeBar,d=k.getComputeMaps().computeColumnOpts,c=(0,_vue.ref)([]),E=(0,_vue.ref)(),f=(0,_vue.ref)(),p=(0,_vue.ref)(),v=(0,_vue.ref)(),m=(0,_vue.ref)(),h=(0,_vue.ref)();(0,_vue.watch)(function(){return W.tableColumn},t),(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=W.fixedType,l=k.internalData.elemStore,e=(e||"main")+"-header-";l[e+"wrapper"]=E.value,l[e+"table"]=f.value,l[e+"colgroup"]=p.value,l[e+"list"]=v.value,l[e+"xSpace"]=m.value,l[e+"repair"]=h.value,t()})}),(0,_vue.onUnmounted)(function(){var e=W.fixedType,l=k.internalData.elemStore,e=(e||"main")+"-header-";l[e+"wrapper"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"repair"]=null});return function(){var _=W.fixedType,e=W.fixedColumn,l=W.tableColumn,x=u.resizable,g=u.border,b=u.columnKey,t=u.headerRowClassName,y=u.headerCellClassName,n=u.headerRowStyle,C=u.headerCellStyle,w=u.showHeaderOverflow,M=u.headerAlign,T=u.align,z=u.mouseConfig,r=s.isGroup,S=s.currentColumn,D=s.scrollYLoad,R=s.overflowX,a=s.scrollbarWidth,U=d.value,i=c.value;return r||(i=[l=_&&(D||w)?e:l]),(0,_vue.h)("div",{ref:E,class:["vxe-table--header-wrapper",_?"fixed-"+_+"--wrapper":"body--wrapper"],xid:o},[_?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:m,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:f,class:"vxe-table--header",xid:o,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:p},l.map(function(e,l){return(0,_vue.h)("col",{name:e.id,key:l})}).concat(a?[(0,_vue.h)("col",{name:"col_gutter"})]:[])),(0,_vue.h)("thead",{ref:v},i.map(function(m,h){return(0,_vue.h)("tr",{class:["vxe-header--row",t?_xeUtils.default.isFunction(t)?t({$table:k,$rowIndex:h,fixed:_,type:renderType}):t:""],style:n?_xeUtils.default.isFunction(n)?n({$table:k,$rowIndex:h,fixed:_,type:renderType}):n:null},m.map(function(e,l){var t=e.type,n=e.showHeaderOverflow,r=e.headerAlign,a=e.align,i=e.headerClassName,o=e.children&&e.children.length,u=_?e.fixed!==_&&!o:!!e.fixed&&R,s=_xeUtils.default.isUndefined(n)||_xeUtils.default.isNull(n)?w:n,d=r||a||M||T,c="ellipsis"===s,f="title"===s,p=!0===s||"tooltip"===s,n=f||p||c,r=e.filters&&e.filters.some(function(e){return e.checked}),a=k.getColumnIndex(e),s=k.getVTColumnIndex(e),v={$table:k,$rowIndex:h,column:e,columnIndex:a,$columnIndex:l,_columnIndex:s,fixed:_,type:renderType,isHidden:u,hasFilter:r},a={onClick:function(e){return k.triggerHeaderCellClickEvent(e,v)},onDblclick:function(e){return k.triggerHeaderCellDblclickEvent(e,v)}};return D&&!n&&(c=n=!0),z&&(a.onMousedown=function(e){return k.triggerHeaderCellMousedownEvent(e,v)}),(0,_vue.h)("th",__assign(__assign({class:["vxe-header--column",e.id,((s={})["col--"+d]=d,s["col--"+t]=t,s["col--last"]=l===m.length-1,s["col--fixed"]=e.fixed,s["col--group"]=o,s["col--ellipsis"]=n,s["fixed--hidden"]=u,s["is--sortable"]=e.sortable,s["col--filter"]=!!e.filters,s["is--filter-active"]=r,s["col--current"]=S===e,s),i?_xeUtils.default.isFunction(i)?i(v):i:"",y?_xeUtils.default.isFunction(y)?y(v):y:""],colid:e.id,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null,style:C?_xeUtils.default.isFunction(C)?C(v):C:null},a),{key:b||U.useKey||o?e.id:l}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":f,"c--tooltip":p,"c--ellipsis":c}]},e.renderHeader(v)),u||o||!(_xeUtils.default.isBoolean(e.resizable)?e.resizable:U.resizable||x)?null:(0,_vue.h)("div",{class:["vxe-resizable",{"is--line":!g||"none"===g}],onMousedown:function(e){return function(e,l){var t=l.column,n=W.fixedType,r=H.value,a=O.value,i=q.value,o=A.value,u=e.clientX,s=E.value,d=e.target,c=l.cell=d.parentNode,f=0,p=r.$el,r=(0,_dom.getOffsetPos)(d,s),s=d.clientWidth,d=Math.floor(s/2),v=(0,_util2.getColMinWidth)(l)-d,m=r.left-c.clientWidth+s+v,h=r.left+d,_=document.onmousemove,x=document.onmouseup,g="left"===n,b="right"===n,y=$.value,C=0;if(g||b){for(var w=g?"nextElementSibling":"previousElementSibling",M=c[w];M&&!(0,_dom.hasClass)(M,"fixed--hidden");)(0,_dom.hasClass)(M,"col--group")||(C+=M.offsetWidth),M=M[w];b&&i&&(h=i.offsetLeft+C)}d=function(e){e.stopPropagation(),e.preventDefault();var l=e.clientX-u,e=h+l,l=n?0:p.scrollLeft;g?e=Math.min(e,(i?i.offsetLeft:p.clientWidth)-C-v):b?(m=(a?a.clientWidth:0)+C+v,e=Math.min(e,h+c.clientWidth-v)):m=Math.max(p.scrollLeft,m),f=Math.max(e,m),o.style.left=f-l+"px"};I._isResize=!0,(0,_dom.addClass)(y,"drag--resize"),o.style.display="block",document.onmousemove=d,document.onmouseup=function(e){document.onmousemove=_,document.onmouseup=x,t.resizeWidth=t.renderWidth+(b?h-f:f-h),o.style.display="none",I._isResize=!1,I._lastResizeTime=Date.now(),k.analyColumnWidth(),k.recalculate(!0).then(function(){k.saveCustomResizable(),k.updateCellAreas(),k.dispatchEvent("resizable-change",l,e)}),(0,_dom.removeClass)(y,"drag--resize")},d(e),k.closeMenu&&k.closeMenu()}(e,v)}})])}).concat(a?[(0,_vue.h)("th",{class:"vxe-header--gutter col--gutter"})]:[]))}))]),(0,_vue.h)("div",{ref:h,class:"vxe-table--header-border-line"})])}}});exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("./util"),_util2=require("../../table/src/util"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var l,t=1,n=arguments.length;t<n;t++)for(var r in l=arguments[t])Object.prototype.hasOwnProperty.call(l,r)&&(e[r]=l[r]);return e}).apply(this,arguments)},renderType="header",_default=(0,_vue.defineComponent)({name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},setup:function(W){function t(){var e=s.isGroup;c.value=e?(0,_util.convertToRows)(W.tableGroupColumn):[]}var k=(0,_vue.inject)("$xetable",{}),o=k.xID,u=k.props,s=k.reactData,I=k.internalData,e=k.getRefMaps(),$=e.refElem,H=e.refTableBody,O=e.refLeftContainer,q=e.refRightContainer,A=e.refCellResizeBar,d=k.getComputeMaps().computeColumnOpts,c=(0,_vue.ref)([]),E=(0,_vue.ref)(),f=(0,_vue.ref)(),p=(0,_vue.ref)(),v=(0,_vue.ref)(),m=(0,_vue.ref)(),h=(0,_vue.ref)();(0,_vue.watch)(function(){return W.tableColumn},t),(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=W.fixedType,l=k.internalData.elemStore,e=(e||"main")+"-header-";l[e+"wrapper"]=E.value,l[e+"table"]=f.value,l[e+"colgroup"]=p.value,l[e+"list"]=v.value,l[e+"xSpace"]=m.value,l[e+"repair"]=h.value,t()})}),(0,_vue.onUnmounted)(function(){var e=W.fixedType,l=k.internalData.elemStore,e=(e||"main")+"-header-";l[e+"wrapper"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"repair"]=null});return function(){var _=W.fixedType,e=W.fixedColumn,l=W.tableColumn,x=u.resizable,g=u.border,b=u.columnKey,t=u.headerRowClassName,y=u.headerCellClassName,n=u.headerRowStyle,C=u.headerCellStyle,w=u.showHeaderOverflow,M=u.headerAlign,T=u.align,z=u.mouseConfig,r=s.isGroup,S=s.currentColumn,D=s.scrollXLoad,R=s.overflowX,a=s.scrollbarWidth,U=d.value,i=c.value;return r||(i=[l=_&&(D||w)?e:l]),(0,_vue.h)("div",{ref:E,class:["vxe-table--header-wrapper",_?"fixed-"+_+"--wrapper":"body--wrapper"],xid:o},[_?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:m,class:"vxe-body--x-space"}),(0,_vue.h)("table",{ref:f,class:"vxe-table--header",xid:o,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:p},l.map(function(e,l){return(0,_vue.h)("col",{name:e.id,key:l})}).concat(a?[(0,_vue.h)("col",{name:"col_gutter"})]:[])),(0,_vue.h)("thead",{ref:v},i.map(function(m,h){return(0,_vue.h)("tr",{class:["vxe-header--row",t?_xeUtils.default.isFunction(t)?t({$table:k,$rowIndex:h,fixed:_,type:renderType}):t:""],style:n?_xeUtils.default.isFunction(n)?n({$table:k,$rowIndex:h,fixed:_,type:renderType}):n:null},m.map(function(e,l){var t=e.type,n=e.showHeaderOverflow,r=e.headerAlign,a=e.align,i=e.headerClassName,o=e.children&&e.children.length,u=_?e.fixed!==_&&!o:!!e.fixed&&R,s=_xeUtils.default.isUndefined(n)||_xeUtils.default.isNull(n)?w:n,d=r||a||M||T,c="ellipsis"===s,f="title"===s,p=!0===s||"tooltip"===s,n=f||p||c,r=e.filters&&e.filters.some(function(e){return e.checked}),a=k.getColumnIndex(e),s=k.getVTColumnIndex(e),v={$table:k,$rowIndex:h,column:e,columnIndex:a,$columnIndex:l,_columnIndex:s,fixed:_,type:renderType,isHidden:u,hasFilter:r},a={onClick:function(e){return k.triggerHeaderCellClickEvent(e,v)},onDblclick:function(e){return k.triggerHeaderCellDblclickEvent(e,v)}};return D&&!n&&(c=n=!0),z&&(a.onMousedown=function(e){return k.triggerHeaderCellMousedownEvent(e,v)}),(0,_vue.h)("th",__assign(__assign({class:["vxe-header--column",e.id,((s={})["col--"+d]=d,s["col--"+t]=t,s["col--last"]=l===m.length-1,s["col--fixed"]=e.fixed,s["col--group"]=o,s["col--ellipsis"]=n,s["fixed--hidden"]=u,s["is--sortable"]=e.sortable,s["col--filter"]=!!e.filters,s["is--filter-active"]=r,s["col--current"]=S===e,s),i?_xeUtils.default.isFunction(i)?i(v):i:"",y?_xeUtils.default.isFunction(y)?y(v):y:""],colid:e.id,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null,style:C?_xeUtils.default.isFunction(C)?C(v):C:null},a),{key:b||U.useKey||o?e.id:l}),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":f,"c--tooltip":p,"c--ellipsis":c}]},e.renderHeader(v)),u||o||!(_xeUtils.default.isBoolean(e.resizable)?e.resizable:U.resizable||x)?null:(0,_vue.h)("div",{class:["vxe-resizable",{"is--line":!g||"none"===g}],onMousedown:function(e){return function(e,l){var t=l.column,n=W.fixedType,r=H.value,a=O.value,i=q.value,o=A.value,u=e.clientX,s=E.value,d=e.target,c=l.cell=d.parentNode,f=0,p=r.$el,r=(0,_dom.getOffsetPos)(d,s),s=d.clientWidth,d=Math.floor(s/2),v=(0,_util2.getColMinWidth)(l)-d,m=r.left-c.clientWidth+s+v,h=r.left+d,_=document.onmousemove,x=document.onmouseup,g="left"===n,b="right"===n,y=$.value,C=0;if(g||b){for(var w=g?"nextElementSibling":"previousElementSibling",M=c[w];M&&!(0,_dom.hasClass)(M,"fixed--hidden");)(0,_dom.hasClass)(M,"col--group")||(C+=M.offsetWidth),M=M[w];b&&i&&(h=i.offsetLeft+C)}d=function(e){e.stopPropagation(),e.preventDefault();var l=e.clientX-u,e=h+l,l=n?0:p.scrollLeft;g?e=Math.min(e,(i?i.offsetLeft:p.clientWidth)-C-v):b?(m=(a?a.clientWidth:0)+C+v,e=Math.min(e,h+c.clientWidth-v)):m=Math.max(p.scrollLeft,m),f=Math.max(e,m),o.style.left=f-l+"px"};I._isResize=!0,(0,_dom.addClass)(y,"drag--resize"),o.style.display="block",document.onmousemove=d,document.onmouseup=function(e){document.onmousemove=_,document.onmouseup=x,t.resizeWidth=t.renderWidth+(b?h-f:f-h),o.style.display="none",I._isResize=!1,I._lastResizeTime=Date.now(),k.analyColumnWidth(),k.recalculate(!0).then(function(){k.saveCustomResizable(),k.updateCellAreas(),k.dispatchEvent("resizable-change",l,e)}),(0,_dom.removeClass)(y,"drag--resize")},d(e),k.closeMenu&&k.closeMenu()}(e,v)}})])}).concat(a?[(0,_vue.h)("th",{class:"vxe-header--gutter col--gutter"})]:[]))}))]),(0,_vue.h)("div",{ref:h,class:"vxe-table--header-border-line"})])}}});exports.default=_default;

package/lib/index.umd.js

@@ -8754,7 +8754,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("4.2.1", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("4.2.2-beta.1", "] ").concat(conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10759,7 +10759,7 @@ var v_x_e_table_config = new v_x_e_table_VXETableConfig();
 var v = 'v4';
 var VXETable = {
   v: v,
-  version: "4.2.1",
+  version: "4.2.2-beta.1",
   setup: setup_setup,
   interceptor: interceptor,
   renderer: renderer,
@@ -12774,9 +12774,7 @@ var editHook = {
           }, evnt || null);
         }
 
-        return ($xetable.clearValidate ? $xetable.clearValidate() : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])()).then(function () {
-          return $xetable.recalculate();
-        });
+        return $xetable.clearValidate ? $xetable.clearValidate() : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])();
       },
 
       /**
@@ -12905,7 +12903,11 @@ var editHook = {
               }
 
               $xetable.closeTooltip();
-              editMethods.clearActived(evnt);
+
+              if (actived.column) {
+                editMethods.clearActived(evnt);
+              }
+
               type = 'edit-actived';
               column.renderHeight = cell.offsetHeight;
               actived.args = params;
@@ -22518,7 +22520,7 @@ var renderType = 'header';
           mouseConfig = tableProps.mouseConfig;
       var isGroup = tableReactData.isGroup,
           currentColumn = tableReactData.currentColumn,
-          scrollYLoad = tableReactData.scrollYLoad,
+          scrollXLoad = tableReactData.scrollXLoad,
           overflowX = tableReactData.overflowX,
           scrollbarWidth = tableReactData.scrollbarWidth;
       var columnOpts = computeColumnOpts.value;
@@ -22526,7 +22528,7 @@ var renderType = 'header';
 
       if (!isGroup) {
         if (fixedType) {
-          if (scrollYLoad || allColumnHeaderOverflow) {
+          if (scrollXLoad || allColumnHeaderOverflow) {
             tableColumn = fixedColumn;
           }
         }
@@ -22623,9 +22625,9 @@ var renderType = 'header';
             onDblclick: function onDblclick(evnt) {
               return $xetable.triggerHeaderCellDblclickEvent(evnt, params);
             }
-          }; // 纵向虚拟滚动不支持动态行高
+          }; // 横向虚拟滚动不支持动态行高
 
-          if (scrollYLoad && !hasEllipsis) {
+          if (scrollXLoad && !hasEllipsis) {
             showEllipsis = hasEllipsis = true;
           } // 按下事件处理
 
@@ -25486,7 +25488,7 @@ var gridComponentEmits = [].concat(_toConsumableArray(emits), ['page-change', 'f
                   if (rest) {
                     if (isEnableConf(pagerConfig)) {
                       var total = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(rest, proxyProps.total || 'page.total') || 0;
-                      tablePage.total = total;
+                      tablePage.total = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(total);
                       reactData.tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(rest, proxyProps.result || 'result') || []; // 检验当前页码，不能超出当前最大页数
 
                       var pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);
@@ -29271,15 +29273,17 @@ function getResetValue(value, resetValue) {
 
       if (!props.preventSubmit) {
         clearValidate();
-        beginValidate(getItems()).then(function () {
-          formMethods.dispatchEvent('submit', {
-            data: props.data
-          }, evnt);
-        }).catch(function (errMap) {
-          formMethods.dispatchEvent('submit-invalid', {
-            data: props.data,
-            errMap: errMap
-          }, evnt);
+        beginValidate(getItems()).then(function (errMap) {
+          if (errMap) {
+            formMethods.dispatchEvent('submit-invalid', {
+              data: props.data,
+              errMap: errMap
+            }, evnt);
+          } else {
+            formMethods.dispatchEvent('submit', {
+              data: props.data
+            }, evnt);
+          }
         });
       }
     };
@@ -33770,11 +33774,9 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
               tableColumn = fixedColumn;
             }
 
-            if (isOptimize || scrollXLoad) {
-              tWidth = tableColumn.reduce(function (previous, column) {
-                return previous + column.renderWidth;
-              }, 0);
-            }
+            tWidth = tableColumn.reduce(function (previous, column) {
+              return previous + column.renderWidth;
+            }, 0);
 
             if (tableElem) {
               tableElem.style.width = tWidth ? "".concat(tWidth + scrollbarWidth, "px") : ''; // 修复 IE 中高度无法自适应问题