vxe-table 3.14.0-beta.9 → 3.14.1

package/lib/table/src/util.js

@@ -10,6 +10,8 @@ exports.clearTableDefaultStatus = clearTableDefaultStatus;
 exports.colToVisible = colToVisible;
 exports.convertHeaderColumnToRows = void 0;
 exports.createColumn = createColumn;
+exports.createHandleGetRowId = createHandleGetRowId;
+exports.createHandleUpdateRowId = createHandleUpdateRowId;
 exports.destroyColumn = destroyColumn;
 exports.encodeRowid = encodeRowid;
 exports.getCellHeight = getCellHeight;
@@ -130,27 +132,55 @@ function getRowkey($xeTable) {
   return `${props.rowId || rowOpts.keyField || '_X_ROW_KEY'}`;
 }
 // 行主键 value
-function getRowid($xetable, row) {
-  const rowid = _xeUtils.default.get(row, getRowkey($xetable));
+function getRowid($xeTable, row) {
+  const rowid = _xeUtils.default.get(row, getRowkey($xeTable));
   return encodeRowid(rowid);
 }
+function createHandleUpdateRowId($xeTable) {
+  const rowKey = getRowkey($xeTable);
+  const isDeepKey = rowKey.indexOf('.') > -1;
+  const updateRId = isDeepKey ? updateDeepRowKey : updateFastRowKey;
+  return {
+    rowKey,
+    handleUpdateRowId(row) {
+      return row ? updateRId(row, rowKey) : null;
+    }
+  };
+}
+function createHandleGetRowId($xeTable) {
+  const rowKey = getRowkey($xeTable);
+  const isDeepKey = rowKey.indexOf('.') > -1;
+  const getRId = isDeepKey ? getDeepRowIdByKey : getFastRowIdByKey;
+  return {
+    rowKey,
+    handleGetRowId(row) {
+      return row ? getRId(row, rowKey) : null;
+    }
+  };
+}
 // 编码行主键
 function encodeRowid(rowVal) {
   return _xeUtils.default.eqNull(rowVal) ? '' : encodeURIComponent(rowVal);
 }
-function updateDeepRowKey(row, rowkey) {
-  let rowid = _xeUtils.default.get(row, rowkey);
+function getDeepRowIdByKey(row, rowKey) {
+  return _xeUtils.default.get(row, rowKey);
+}
+function updateDeepRowKey(row, rowKey) {
+  let rowid = getDeepRowIdByKey(row, rowKey);
   if ((0, _utils.eqEmptyValue)(rowid)) {
     rowid = getRowUniqueId();
-    _xeUtils.default.set(row, rowkey, rowid);
+    _xeUtils.default.set(row, rowKey, rowid);
   }
   return rowid;
 }
-function updateFastRowKey(row, rowkey) {
-  let rowid = row[rowkey];
+function getFastRowIdByKey(row, rowKey) {
+  return row[rowKey];
+}
+function updateFastRowKey(row, rowKey) {
+  let rowid = getFastRowIdByKey(row, rowKey);
   if ((0, _utils.eqEmptyValue)(rowid)) {
     rowid = getRowUniqueId();
-    row[rowkey] = rowid;
+    row[rowKey] = rowid;
   }
   return rowid;
 }
@@ -194,40 +224,51 @@ const handleRowidOrRow = ($xeTable, rowidOrRow) => {
 // 组装列配置
 exports.handleRowidOrRow = handleRowidOrRow;
 function assembleColumn(_vm) {
+  const $xeTable = _vm.$xeTable;
+  const reactData = $xeTable;
+  const {
+    staticColumns
+  } = reactData;
   const {
     $el,
-    $xetable,
-    $xecolumn,
+    $xeColumn,
     columnConfig
   } = _vm;
-  const groupConfig = $xecolumn ? $xecolumn.columnConfig : null;
+  const groupConfig = $xeColumn ? $xeColumn.columnConfig : null;
   if (groupConfig) {
-    if ($xecolumn.$options._componentTag === 'vxe-table-column') {
-      (0, _log.errLog)('vxe.error.groupTag', [`<vxe-table-colgroup title=${$xecolumn.title} ...>`, `<vxe-table-column title=${$xecolumn.title} ...>`]);
-    } else if ($xecolumn.$options._componentTag === 'vxe-column') {
-      (0, _log.warnLog)('vxe.error.groupTag', [`<vxe-colgroup title=${$xecolumn.title} ...>`, `<vxe-column title=${$xecolumn.title} ...>`]);
+    if ($xeColumn.$options._componentTag === 'vxe-table-column') {
+      (0, _log.errLog)('vxe.error.groupTag', [`<vxe-table-colgroup title=${$xeColumn.title} ...>`, `<vxe-table-column title=${$xeColumn.title} ...>`]);
+    } else if ($xeColumn.$options._componentTag === 'vxe-column') {
+      (0, _log.warnLog)('vxe.error.groupTag', [`<vxe-colgroup title=${$xeColumn.title} ...>`, `<vxe-column title=${$xeColumn.title} ...>`]);
     }
     if (!groupConfig.children) {
       groupConfig.children = [];
     }
-    groupConfig.children.splice(_xeUtils.default.arrayIndexOf($xecolumn.$el.children, $el), 0, columnConfig);
+    groupConfig.children.splice(_xeUtils.default.arrayIndexOf($xeColumn.$el.children, $el), 0, columnConfig);
   } else {
-    $xetable.staticColumns.splice(_xeUtils.default.arrayIndexOf($xetable.$refs.hideColumn.children, $el), 0, columnConfig);
+    staticColumns.splice(_xeUtils.default.arrayIndexOf($xeTable.$refs.hideColumn.children, $el), 0, columnConfig);
   }
 }
 // 销毁列
 function destroyColumn(_vm) {
+  const $xeTable = _vm.$xeTable;
+  const reactData = $xeTable;
+  const {
+    staticColumns
+  } = reactData;
   const {
-    $xetable,
     columnConfig
   } = _vm;
-  const matchObj = _xeUtils.default.findTree($xetable.staticColumns, column => column === columnConfig);
+  const matchObj = _xeUtils.default.findTree(staticColumns, column => column === columnConfig);
   if (matchObj) {
     matchObj.items.splice(matchObj.index, 1);
   }
 }
-function getRootColumn($xetable, column) {
-  const fullColumnIdData = $xetable.fullColumnIdData;
+function getRootColumn($xeTable, column) {
+  const internalData = $xeTable;
+  const {
+    fullColumnIdData
+  } = internalData;
   if (!column) {
     return null;
   }

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.assembleColumn=assembleColumn,exports.calcTreeLine=calcTreeLine,exports.clearTableAllStatus=clearTableAllStatus,exports.clearTableDefaultStatus=clearTableDefaultStatus,exports.colToVisible=colToVisible,exports.convertHeaderColumnToRows=void 0,exports.createColumn=createColumn,exports.destroyColumn=destroyColumn,exports.encodeRowid=encodeRowid,exports.getCellHeight=getCellHeight,exports.getCellValue=getCellValue,exports.getColReMinWidth=getColReMinWidth,exports.getOffsetSize=getOffsetSize,exports.getRefElem=getRefElem,exports.getRootColumn=getRootColumn,exports.getRowUniqueId=getRowUniqueId,exports.getRowid=getRowid,exports.getRowkey=getRowkey,exports.handleFieldOrColumn=handleFieldOrColumn,exports.handleRowidOrRow=void 0,exports.isColumnInfo=isColumnInfo,exports.mergeBodyMethod=mergeBodyMethod,exports.restoreScrollLocation=restoreScrollLocation,exports.rowToVisible=rowToVisible,exports.setCellValue=setCellValue,exports.toFilters=toFilters,exports.toTreePathSeq=toTreePathSeq,exports.updateDeepRowKey=updateDeepRowKey,exports.updateFastRowKey=updateFastRowKey;var _xeUtils=_interopRequireDefault(require("xe-utils")),_columnInfo=require("./columnInfo"),_dom=require("../../ui/src/dom"),_log=require("../../ui/src/log"),_utils=require("../../ui/src/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let getAllConvertColumns=(e,t)=>{let l=[];return e.forEach(e=>{e.parentId=t?t.id:null,e.visible&&(e.children&&e.children.length&&e.children.some(e=>e.visible)?(l.push(e),l.push(...getAllConvertColumns(e.children,e))):l.push(e))}),l},convertHeaderColumnToRows=e=>{let t=1,o=(l,e)=>{if(e&&(l.level=e.level+1,t<l.level)&&(t=l.level),l.children&&l.children.length&&l.children.some(e=>e.visible)){let t=0;l.children.forEach(e=>{e.visible&&(o(e,l),t+=e.colSpan)}),l.colSpan=t}else l.colSpan=1},l=(e.forEach(e=>{e.level=1,o(e)}),[]);for(let e=0;e<t;e++)l.push([]);return getAllConvertColumns(e).forEach(e=>{e.children&&e.children.length&&e.children.some(e=>e.visible)?e.rowSpan=1:e.rowSpan=t-e.level+1,l[e.level-1].push(e)}),l};function restoreScrollLocation(e,t,l){let o=e;return e.clearScroll().then(()=>{if(t||l)return o.lastScrollLeft=0,o.lastScrollTop=0,o.intoRunScroll=!1,o.inVirtualScroll=!1,o.inWheelScroll=!1,o.inHeaderScroll=!1,o.inBodyScroll=!1,o.inFooterScroll=!1,o.scrollRenderType="",e.scrollTo(t,l)})}function toTreePathSeq(e){return e.map((e,t)=>t%2==0?Number(e)+1:".").join("")}function getRowUniqueId(){return _xeUtils.default.uniqueId("row_")}function getRowkey(e){var t=e.computeRowOpts;return""+(e.rowId||t.keyField||"_X_ROW_KEY")}function getRowid(e,t){return encodeRowid(_xeUtils.default.get(t,getRowkey(e)))}function encodeRowid(e){return _xeUtils.default.eqNull(e)?"":encodeURIComponent(e)}function updateDeepRowKey(e,t){let l=_xeUtils.default.get(e,t);return(0,_utils.eqEmptyValue)(l)&&(l=getRowUniqueId(),_xeUtils.default.set(e,t,l)),l}function updateFastRowKey(e,t){let l=e[t];return(0,_utils.eqEmptyValue)(l)&&(l=getRowUniqueId(),e[t]=l),l}function getPaddingLeftRightSize(e){return e?(e=getComputedStyle(e),_xeUtils.default.toNumber(e.paddingLeft)+_xeUtils.default.toNumber(e.paddingRight)):0}function getElementMarginWidth(e){var t,l;return e?(l=getComputedStyle(e),t=_xeUtils.default.toNumber(l.marginLeft),l=_xeUtils.default.toNumber(l.marginRight),e.offsetWidth+t+l):0}function getCellHeight(e){return"unset"!==e&&e||0}function handleFieldOrColumn(e,t){return t?_xeUtils.default.isString(t)||_xeUtils.default.isNumber(t)?e.getColumnByField(""+t):t:null}exports.convertHeaderColumnToRows=convertHeaderColumnToRows;let handleRowidOrRow=(e,t)=>t?(t=_xeUtils.default.isString(t)||_xeUtils.default.isNumber(t)?t:getRowid(e,t),e.getRowById(t)):null;function assembleColumn(e){var{$el:e,$xetable:t,$xecolumn:l,columnConfig:o}=e,r=l?l.columnConfig:null;r?("vxe-table-column"===l.$options._componentTag?(0,_log.errLog)("vxe.error.groupTag",[`<vxe-table-colgroup title=${l.title} ...>`,`<vxe-table-column title=${l.title} ...>`]):"vxe-column"===l.$options._componentTag&&(0,_log.warnLog)("vxe.error.groupTag",[`<vxe-colgroup title=${l.title} ...>`,`<vxe-column title=${l.title} ...>`]),r.children||(r.children=[]),r.children.splice(_xeUtils.default.arrayIndexOf(l.$el.children,e),0,o)):t.staticColumns.splice(_xeUtils.default.arrayIndexOf(t.$refs.hideColumn.children,e),0,o)}function destroyColumn(e){let{$xetable:t,columnConfig:l}=e;e=_xeUtils.default.findTree(t.staticColumns,e=>e===l);e&&e.items.splice(e.index,1)}function getRootColumn(e,t){var l=e.fullColumnIdData;if(!t)return null;let o=t.parentId;for(;l[o];){let e=l[o].column;if(!(o=e.parentId))return e}return t}function queryCellElement(e,t){return e.querySelector(".vxe-cell"+t)}function toFilters(e){return e&&_xeUtils.default.isArray(e)?e.map(({label:e,value:t,data:l,resetValue:o,checked:r})=>({label:e,value:t,data:l,resetValue:o,checked:!!r,_checked:!!r})):e}function getColReMinWidth(e){var{$table:t,column:l,cell:o}=e,r=t,{showHeaderOverflow:t,resizableOpts:i}=t,i=i.minWidth;if(i){e=_xeUtils.default.isFunction(i)?i(e):i;if("auto"!==e)return Math.max(1,_xeUtils.default.toNumber(e))}var n,u,a,s,i=r.elemStore,{showHeaderOverflow:e,minWidth:r}=l,l=_xeUtils.default.isUndefined(e)||_xeUtils.default.isNull(e)?t:e,t="title"===l||(!0===l||"tooltip"===l)||"ellipsis"===l;let c=_xeUtils.default.floor(1.6*(_xeUtils.default.toNumber(getComputedStyle(o).fontSize)||14))+(getPaddingLeftRightSize(o)+getPaddingLeftRightSize(queryCellElement(o,"")));if(t&&(e=getPaddingLeftRightSize(queryCellElement(o,">.vxe-cell--drag-handle")),l=getPaddingLeftRightSize(queryCellElement(o,">.vxe-cell--checkbox")),t=getElementMarginWidth(queryCellElement(o,">.vxe-cell--required-icon")),n=getElementMarginWidth(queryCellElement(o,">.vxe-cell--edit-icon")),u=getElementMarginWidth(queryCellElement(o,">.vxe-cell-title-prefix-icon")),a=getElementMarginWidth(queryCellElement(o,">.vxe-cell-title-suffix-icon")),s=getElementMarginWidth(queryCellElement(o,">.vxe-cell--sort")),o=getElementMarginWidth(queryCellElement(o,">.vxe-cell--filter")),c+=e+l+t+n+u+a+o+s),r){e=getRefElem(i["main-body-scroll"]);if(e){if((0,_dom.isScale)(r))return l=(e.clientWidth-1)/100,Math.max(c,Math.floor(_xeUtils.default.toInteger(r)*l));if((0,_dom.isPx)(r))return Math.max(c,_xeUtils.default.toInteger(r))}}return c}exports.handleRowidOrRow=handleRowidOrRow;let lineOffsetSizes={mini:3,small:2,medium:1};function countTreeExpand(e,t){let l=1;if(e){var o=t.$table,r=o.computeTreeOpts,{transform:i,mapChildrenField:n}=r,r=r.children||r.childrenField,u=e[i?n:r];if(u&&o.isTreeExpandByRow(e))for(let e=0;e<u.length;e++)l+=countTreeExpand(u[e],t)}return l}function getOffsetSize(e){e=e.computeSize;return e&&lineOffsetSizes[e]||0}function calcTreeLine(e,t){var{$table:l,row:o}=e,r=l.showOverflow,i=l.scrollYLoad,n=l.fullAllDataRowIdData,u=l.computeRowOpts,a=l.computeCellOpts,s=l.computeDefaultRowHeight,n=n[getRowid(l,o)],o=n.resizeHeight||a.height||u.height||n.height||s;let c=1,d=(t&&(c=countTreeExpand(t,e)),o);return(d=i&&!r?n.height||o:d)*c-(t?1:12-getOffsetSize(l))}function mergeBodyMethod(t,l,o){for(let e=0;e<t.length;e++){var{row:r,col:i,rowspan:n,colspan:u}=t[e];if(-1<i&&-1<r&&n&&u){if(r===l&&i===o)return{rowspan:n,colspan:u};if(r<=l&&l<r+n&&i<=o&&o<i+u)return{rowspan:0,colspan:0}}}}function getCellValue(e,t){return _xeUtils.default.get(e,t.field)}function setCellValue(e,t,l){return _xeUtils.default.set(e,t.field,l)}function getRefElem(e){return e?e.$el||e:null}function clearTableDefaultStatus(e){return e.initStatus=!1,e.clearSort(),e.clearCurrentRow(),e.clearCurrentColumn(),e.clearRadioRow(),e.clearRadioReserve(),e.clearCheckboxRow(),e.clearCheckboxReserve(),e.clearRowExpand(),e.clearTreeExpand(),e.clearTreeExpandReserve(),e.clearEdit&&e.clearEdit(),e.clearSelected&&(e.keyboardConfig||e.mouseConfig)&&e.clearSelected(),e.clearCellAreas&&e.mouseConfig&&(e.clearCellAreas(),e.clearCopyCellArea()),e.clearScroll()}function clearTableAllStatus(e){return e.clearFilter&&e.clearFilter(),clearTableDefaultStatus(e)}function isColumnInfo(e){return e instanceof _columnInfo.ColumnInfo}function createColumn(e,t,l){return isColumnInfo(t)?t:new _columnInfo.ColumnInfo(e,t,l)}function rowToVisible(l,o){var e=l.showOverflow,t=l.scrollYLoad,{elemStore:r,afterFullData:i,fullAllDataRowIdData:n,isResizeCellHeight:u}=l,a=l.computeRowOpts,s=l.computeCellOpts,c=l.computeDefaultRowHeight,d=l.computeLeftFixedWidth,f=l.computeRightFixedWidth,r=getRefElem(r["main-body-scroll"]),g=getRowid(l,o);if(r){var m=r.clientHeight,h=r.scrollTop,r=r.querySelector(`[rowid="${g}"]`);if(r){var p=r.offsetParent,p=r.offsetTop+(p?p.offsetTop:0),r=r.clientHeight;if(p<h||h+m<p)return l.scrollTo(null,p);if(m+h<=p+r)return l.scrollTo(null,h+r)}else if(t){if(!(u||s.height||a.height)&&e)return l.scrollTo(null,(l.findRowIndexOf(i,o)-1)*c);let t=0;p=n[g],r=p.resizeHeight||s.height||a.height||p.height||c;for(let e=0;e<i.length;e++){var x=i[e],R=getRowid(l,x);if(x===o||R===g)break;x=n[R];t+=x.resizeHeight||s.height||a.height||x.height||c}return t<h?l.scrollTo(null,t-d-1):l.scrollTo(null,t+r-(m-f-1))}}return Promise.resolve()}function colToVisible(l,o,t){var r=l.scrollXLoad,{elemStore:i,visibleColumn:n}=l,u=l.computeLeftFixedWidth,a=l.computeRightFixedWidth,i=getRefElem(i["main-body-scroll"]);if(!o.fixed&&i){var s=i.clientWidth,c=i.scrollLeft;let e=null;if(t&&(t=getRowid(l,t),e=i.querySelector(`[rowid="${t}"] .`+o.id)),e=e||i.querySelector("."+o.id)){t=e.offsetParent,i=e.offsetLeft+(t?t.offsetLeft:0),t=e.clientWidth;if(i<c+u)return l.scrollTo(i-u-1);if(s-a<i+t-c)return l.scrollTo(i+t-(s-a-1))}else if(r){let t=0;i=o.renderWidth;for(let e=0;e<n.length;e++){var d=n[e];if(d===o||d.id===o.id)break;t+=d.renderWidth}return t<c?l.scrollTo(t-u-1):l.scrollTo(t+i-(s-a-1))}}return Promise.resolve()}
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.assembleColumn=assembleColumn,exports.calcTreeLine=calcTreeLine,exports.clearTableAllStatus=clearTableAllStatus,exports.clearTableDefaultStatus=clearTableDefaultStatus,exports.colToVisible=colToVisible,exports.convertHeaderColumnToRows=void 0,exports.createColumn=createColumn,exports.createHandleGetRowId=createHandleGetRowId,exports.createHandleUpdateRowId=createHandleUpdateRowId,exports.destroyColumn=destroyColumn,exports.encodeRowid=encodeRowid,exports.getCellHeight=getCellHeight,exports.getCellValue=getCellValue,exports.getColReMinWidth=getColReMinWidth,exports.getOffsetSize=getOffsetSize,exports.getRefElem=getRefElem,exports.getRootColumn=getRootColumn,exports.getRowUniqueId=getRowUniqueId,exports.getRowid=getRowid,exports.getRowkey=getRowkey,exports.handleFieldOrColumn=handleFieldOrColumn,exports.handleRowidOrRow=void 0,exports.isColumnInfo=isColumnInfo,exports.mergeBodyMethod=mergeBodyMethod,exports.restoreScrollLocation=restoreScrollLocation,exports.rowToVisible=rowToVisible,exports.setCellValue=setCellValue,exports.toFilters=toFilters,exports.toTreePathSeq=toTreePathSeq,exports.updateDeepRowKey=updateDeepRowKey,exports.updateFastRowKey=updateFastRowKey;var _xeUtils=_interopRequireDefault(require("xe-utils")),_columnInfo=require("./columnInfo"),_dom=require("../../ui/src/dom"),_log=require("../../ui/src/log"),_utils=require("../../ui/src/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let getAllConvertColumns=(e,t)=>{let l=[];return e.forEach(e=>{e.parentId=t?t.id:null,e.visible&&(e.children&&e.children.length&&e.children.some(e=>e.visible)?(l.push(e),l.push(...getAllConvertColumns(e.children,e))):l.push(e))}),l},convertHeaderColumnToRows=e=>{let t=1,o=(l,e)=>{if(e&&(l.level=e.level+1,t<l.level)&&(t=l.level),l.children&&l.children.length&&l.children.some(e=>e.visible)){let t=0;l.children.forEach(e=>{e.visible&&(o(e,l),t+=e.colSpan)}),l.colSpan=t}else l.colSpan=1},l=(e.forEach(e=>{e.level=1,o(e)}),[]);for(let e=0;e<t;e++)l.push([]);return getAllConvertColumns(e).forEach(e=>{e.children&&e.children.length&&e.children.some(e=>e.visible)?e.rowSpan=1:e.rowSpan=t-e.level+1,l[e.level-1].push(e)}),l};function restoreScrollLocation(e,t,l){let o=e;return e.clearScroll().then(()=>{if(t||l)return o.lastScrollLeft=0,o.lastScrollTop=0,o.intoRunScroll=!1,o.inVirtualScroll=!1,o.inWheelScroll=!1,o.inHeaderScroll=!1,o.inBodyScroll=!1,o.inFooterScroll=!1,o.scrollRenderType="",e.scrollTo(t,l)})}function toTreePathSeq(e){return e.map((e,t)=>t%2==0?Number(e)+1:".").join("")}function getRowUniqueId(){return _xeUtils.default.uniqueId("row_")}function getRowkey(e){var t=e.computeRowOpts;return""+(e.rowId||t.keyField||"_X_ROW_KEY")}function getRowid(e,t){return encodeRowid(_xeUtils.default.get(t,getRowkey(e)))}function createHandleUpdateRowId(e){let t=getRowkey(e);let l=-1<t.indexOf(".")?updateDeepRowKey:updateFastRowKey;return{rowKey:t,handleUpdateRowId(e){return e?l(e,t):null}}}function createHandleGetRowId(e){let t=getRowkey(e);let l=-1<t.indexOf(".")?getDeepRowIdByKey:getFastRowIdByKey;return{rowKey:t,handleGetRowId(e){return e?l(e,t):null}}}function encodeRowid(e){return _xeUtils.default.eqNull(e)?"":encodeURIComponent(e)}function getDeepRowIdByKey(e,t){return _xeUtils.default.get(e,t)}function updateDeepRowKey(e,t){let l=getDeepRowIdByKey(e,t);return(0,_utils.eqEmptyValue)(l)&&(l=getRowUniqueId(),_xeUtils.default.set(e,t,l)),l}function getFastRowIdByKey(e,t){return e[t]}function updateFastRowKey(e,t){let l=getFastRowIdByKey(e,t);return(0,_utils.eqEmptyValue)(l)&&(l=getRowUniqueId(),e[t]=l),l}function getPaddingLeftRightSize(e){return e?(e=getComputedStyle(e),_xeUtils.default.toNumber(e.paddingLeft)+_xeUtils.default.toNumber(e.paddingRight)):0}function getElementMarginWidth(e){var t,l;return e?(l=getComputedStyle(e),t=_xeUtils.default.toNumber(l.marginLeft),l=_xeUtils.default.toNumber(l.marginRight),e.offsetWidth+t+l):0}function getCellHeight(e){return"unset"!==e&&e||0}function handleFieldOrColumn(e,t){return t?_xeUtils.default.isString(t)||_xeUtils.default.isNumber(t)?e.getColumnByField(""+t):t:null}exports.convertHeaderColumnToRows=convertHeaderColumnToRows;let handleRowidOrRow=(e,t)=>t?(t=_xeUtils.default.isString(t)||_xeUtils.default.isNumber(t)?t:getRowid(e,t),e.getRowById(t)):null;function assembleColumn(e){var t=e.$xeTable,l=t.staticColumns,{$el:e,$xeColumn:o,columnConfig:r}=e,n=o?o.columnConfig:null;n?("vxe-table-column"===o.$options._componentTag?(0,_log.errLog)("vxe.error.groupTag",[`<vxe-table-colgroup title=${o.title} ...>`,`<vxe-table-column title=${o.title} ...>`]):"vxe-column"===o.$options._componentTag&&(0,_log.warnLog)("vxe.error.groupTag",[`<vxe-colgroup title=${o.title} ...>`,`<vxe-column title=${o.title} ...>`]),n.children||(n.children=[]),n.children.splice(_xeUtils.default.arrayIndexOf(o.$el.children,e),0,r)):l.splice(_xeUtils.default.arrayIndexOf(t.$refs.hideColumn.children,e),0,r)}function destroyColumn(e){var t=e.$xeTable.staticColumns;let l=e.columnConfig;e=_xeUtils.default.findTree(t,e=>e===l);e&&e.items.splice(e.index,1)}function getRootColumn(e,t){var l=e.fullColumnIdData;if(!t)return null;let o=t.parentId;for(;l[o];){let e=l[o].column;if(!(o=e.parentId))return e}return t}function queryCellElement(e,t){return e.querySelector(".vxe-cell"+t)}function toFilters(e){return e&&_xeUtils.default.isArray(e)?e.map(({label:e,value:t,data:l,resetValue:o,checked:r})=>({label:e,value:t,data:l,resetValue:o,checked:!!r,_checked:!!r})):e}function getColReMinWidth(e){var{$table:t,column:l,cell:o}=e,r=t,{showHeaderOverflow:t,resizableOpts:n}=t,n=n.minWidth;if(n){e=_xeUtils.default.isFunction(n)?n(e):n;if("auto"!==e)return Math.max(1,_xeUtils.default.toNumber(e))}var i,u,a,d,n=r.elemStore,{showHeaderOverflow:e,minWidth:r}=l,l=_xeUtils.default.isUndefined(e)||_xeUtils.default.isNull(e)?t:e,t="title"===l||(!0===l||"tooltip"===l)||"ellipsis"===l;let s=_xeUtils.default.floor(1.6*(_xeUtils.default.toNumber(getComputedStyle(o).fontSize)||14))+(getPaddingLeftRightSize(o)+getPaddingLeftRightSize(queryCellElement(o,"")));if(t&&(e=getPaddingLeftRightSize(queryCellElement(o,">.vxe-cell--drag-handle")),l=getPaddingLeftRightSize(queryCellElement(o,">.vxe-cell--checkbox")),t=getElementMarginWidth(queryCellElement(o,">.vxe-cell--required-icon")),i=getElementMarginWidth(queryCellElement(o,">.vxe-cell--edit-icon")),u=getElementMarginWidth(queryCellElement(o,">.vxe-cell-title-prefix-icon")),a=getElementMarginWidth(queryCellElement(o,">.vxe-cell-title-suffix-icon")),d=getElementMarginWidth(queryCellElement(o,">.vxe-cell--sort")),o=getElementMarginWidth(queryCellElement(o,">.vxe-cell--filter")),s+=e+l+t+i+u+a+o+d),r){e=getRefElem(n["main-body-scroll"]);if(e){if((0,_dom.isScale)(r))return l=(e.clientWidth-1)/100,Math.max(s,Math.floor(_xeUtils.default.toInteger(r)*l));if((0,_dom.isPx)(r))return Math.max(s,_xeUtils.default.toInteger(r))}}return s}exports.handleRowidOrRow=handleRowidOrRow;let lineOffsetSizes={mini:3,small:2,medium:1};function countTreeExpand(e,t){let l=1;if(e){var o=t.$table,r=o.computeTreeOpts,{transform:n,mapChildrenField:i}=r,r=r.children||r.childrenField,u=e[n?i:r];if(u&&o.isTreeExpandByRow(e))for(let e=0;e<u.length;e++)l+=countTreeExpand(u[e],t)}return l}function getOffsetSize(e){e=e.computeSize;return e&&lineOffsetSizes[e]||0}function calcTreeLine(e,t){var{$table:l,row:o}=e,r=l.showOverflow,n=l.scrollYLoad,i=l.fullAllDataRowIdData,u=l.computeRowOpts,a=l.computeCellOpts,d=l.computeDefaultRowHeight,i=i[getRowid(l,o)],o=i.resizeHeight||a.height||u.height||i.height||d;let s=1,c=(t&&(s=countTreeExpand(t,e)),o);return(c=n&&!r?i.height||o:c)*s-(t?1:12-getOffsetSize(l))}function mergeBodyMethod(t,l,o){for(let e=0;e<t.length;e++){var{row:r,col:n,rowspan:i,colspan:u}=t[e];if(-1<n&&-1<r&&i&&u){if(r===l&&n===o)return{rowspan:i,colspan:u};if(r<=l&&l<r+i&&n<=o&&o<n+u)return{rowspan:0,colspan:0}}}}function getCellValue(e,t){return _xeUtils.default.get(e,t.field)}function setCellValue(e,t,l){return _xeUtils.default.set(e,t.field,l)}function getRefElem(e){return e?e.$el||e:null}function clearTableDefaultStatus(e){return e.initStatus=!1,e.clearSort(),e.clearCurrentRow(),e.clearCurrentColumn(),e.clearRadioRow(),e.clearRadioReserve(),e.clearCheckboxRow(),e.clearCheckboxReserve(),e.clearRowExpand(),e.clearTreeExpand(),e.clearTreeExpandReserve(),e.clearEdit&&e.clearEdit(),e.clearSelected&&(e.keyboardConfig||e.mouseConfig)&&e.clearSelected(),e.clearCellAreas&&e.mouseConfig&&(e.clearCellAreas(),e.clearCopyCellArea()),e.clearScroll()}function clearTableAllStatus(e){return e.clearFilter&&e.clearFilter(),clearTableDefaultStatus(e)}function isColumnInfo(e){return e instanceof _columnInfo.ColumnInfo}function createColumn(e,t,l){return isColumnInfo(t)?t:new _columnInfo.ColumnInfo(e,t,l)}function rowToVisible(l,o){var e=l.showOverflow,t=l.scrollYLoad,{elemStore:r,afterFullData:n,fullAllDataRowIdData:i,isResizeCellHeight:u}=l,a=l.computeRowOpts,d=l.computeCellOpts,s=l.computeDefaultRowHeight,c=l.computeLeftFixedWidth,f=l.computeRightFixedWidth,r=getRefElem(r["main-body-scroll"]),g=getRowid(l,o);if(r){var m=r.clientHeight,h=r.scrollTop,r=r.querySelector(`[rowid="${g}"]`);if(r){var p=r.offsetParent,p=r.offsetTop+(p?p.offsetTop:0),r=r.clientHeight;if(p<h||h+m<p)return l.scrollTo(null,p);if(m+h<=p+r)return l.scrollTo(null,h+r)}else if(t){if(!(u||d.height||a.height)&&e)return l.scrollTo(null,(l.findRowIndexOf(n,o)-1)*s);let t=0;p=i[g],r=p.resizeHeight||d.height||a.height||p.height||s;for(let e=0;e<n.length;e++){var x=n[e],R=getRowid(l,x);if(x===o||R===g)break;x=i[R];t+=x.resizeHeight||d.height||a.height||x.height||s}return t<h?l.scrollTo(null,t-c-1):l.scrollTo(null,t+r-(m-f-1))}}return Promise.resolve()}function colToVisible(l,o,t){var r=l.scrollXLoad,{elemStore:n,visibleColumn:i}=l,u=l.computeLeftFixedWidth,a=l.computeRightFixedWidth,n=getRefElem(n["main-body-scroll"]);if(!o.fixed&&n){var d=n.clientWidth,s=n.scrollLeft;let e=null;if(t&&(t=getRowid(l,t),e=n.querySelector(`[rowid="${t}"] .`+o.id)),e=e||n.querySelector("."+o.id)){t=e.offsetParent,n=e.offsetLeft+(t?t.offsetLeft:0),t=e.clientWidth;if(n<s+u)return l.scrollTo(n-u-1);if(d-a<n+t-s)return l.scrollTo(n+t-(d-a-1))}else if(r){let t=0;n=o.renderWidth;for(let e=0;e<i.length;e++){var c=i[e];if(c===o||c.id===o.id)break;t+=c.renderWidth}return t<s?l.scrollTo(t-u-1):l.scrollTo(t+n-(d-a-1))}}return Promise.resolve()}

package/lib/toolbar/src/toolbar.js

@@ -761,13 +761,13 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
         refresh
       } = props;
       const refreshOpts = $xeToolbar.computeRefreshOpts;
-      const $xetable = this.fintTable();
+      const $xeTable = this.fintTable();
       const queryMethod = refreshOpts.queryMethod || refreshOpts.query;
       if (refresh && !$xeGrid && !queryMethod) {
         (0, _log.warnLog)('vxe.error.notFunc', ['queryMethod']);
       }
-      if ($xetable) {
-        $xetable.connect(this);
+      if ($xeTable) {
+        $xeTable.connect(this);
       }
       const customOpts = $xeToolbar.computeCustomOpts;
       if (customOpts.isFooter) {

package/lib/ui/index.js

@@ -13,7 +13,7 @@ Object.defineProperty(exports, "VxeUI", {
 exports.version = exports.validators = exports.use = exports.t = exports.setup = exports.setTheme = exports.setLanguage = exports.setIcon = exports.setI18n = exports.setConfig = exports.saveFile = exports.renderer = exports.readFile = exports.print = exports.modal = exports.menus = exports.log = exports.interceptor = exports.globalResize = exports.globalEvents = exports.getTheme = exports.getIcon = exports.getI18n = exports.getConfig = exports.formats = exports.default = exports.config = exports.commands = exports.clipboard = exports._t = void 0;
 var _core = require("@vxe-ui/core");
 var _utils = require("./src/utils");
-const version = exports.version = "3.14.0-beta.9";
+const version = exports.version = "3.14.1";
 _core.VxeUI.version = version;
 _core.VxeUI.tableVersion = version;
 _core.VxeUI.setConfig({
@@ -137,6 +137,7 @@ _core.VxeUI.setConfig({
       // remote: false,
       // filterMethod: null,
       // destroyOnClose: false,
+      // isEvery: false,
       showIcon: true
     },
     treeConfig: {

package/lib/ui/index.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="3.14.0-beta.9",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0,mode:"fixed"},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{enabled:!0,gt:60,preSize:0,oSize:1},virtualYConfig:{enabled:!0,gt:100,preSize:1,oSize:2},scrollbarConfig:{}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="3.14.1",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0,mode:"fixed"},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0,extendDirection:{top:!0,left:!0,bottom:!0,right:!0}},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},virtualXConfig:{enabled:!0,gt:60,preSize:0,oSize:1},virtualYConfig:{enabled:!0,gt:100,preSize:1,oSize:2},scrollbarConfig:{}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TABLE_DRAG_STATUS_ROW:iconPrefix+"sort",TABLE_DRAG_STATUS_SUB_ROW:iconPrefix+"add-sub",TABLE_DRAG_STATUS_COLUMN:iconPrefix+"swap",TABLE_DRAG_DISABLED:iconPrefix+"no-drop",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;

package/lib/ui/src/log.js

@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
 const {
   log
 } = _core.VxeUI;
-const version = `table v${"3.14.0-beta.9"}`;
+const version = `table v${"3.14.1"}`;
 const warnLog = exports.warnLog = log.create('warn', version);
 const errLog = exports.errLog = log.create('error', version);

package/lib/ui/src/log.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v3.14.0-beta.9",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v3.14.1",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.14.0-beta.9",
+  "version": "3.14.1",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、拖拽排序，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "dependencies": {
-    "vxe-pc-ui": "^3.4.6"
+    "vxe-pc-ui": "^3.5.0"
   },
   "devDependencies": {
     "@babel/plugin-transform-modules-commonjs": "^7.25.7",

package/packages/grid/src/grid.ts

@@ -10,7 +10,7 @@ import { getSlotVNs } from '../../ui/src/vn'
 import { warnLog, errLog } from '../../ui/src/log'
 
 import type { VxeFormComponent, VxePagerComponent, VxeComponentStyleType } from 'vxe-pc-ui'
-import type{ GridReactData, VxeGridConstructor, VxeGridPropTypes } from '../../../types'
+import type{ GridReactData, VxeGridConstructor, VxeGridPropTypes, VxeGridPrivateMethods, VxePagerDefines } from '../../../types'
 
 const { getConfig, getI18n, commands, globalEvents, globalMixins, renderEmptyElement } = VxeUI
 
@@ -67,7 +67,7 @@ function renderDefaultForm (h: CreateElement, $xeGrid: any) {
   return []
 }
 
-function getFuncSlot ($xeGrid: any, optSlots: any, slotKey: any) {
+function getFuncSlot ($xeGrid: VxeGridConstructor, optSlots: any, slotKey: any) {
   const slots = $xeGrid.$scopedSlots
 
   const funcSlot = optSlots[slotKey]
@@ -85,6 +85,26 @@ function getFuncSlot ($xeGrid: any, optSlots: any, slotKey: any) {
   return null
 }
 
+const getConfigSlot = ($xeGrid: VxeGridConstructor, slotConfigs?: Record<string, any>) => {
+  const slots = $xeGrid.$scopedSlots
+
+  const slotConf: Record<string, any> = {}
+  XEUtils.objectMap(slotConfigs, (slotFunc, slotKey) => {
+    if (slotFunc) {
+      if (XEUtils.isString(slotFunc)) {
+        if (slots[slotFunc]) {
+          slotConf[slotKey] = slots[slotFunc]
+        } else {
+          errLog('vxe.error.notSlot', [slotFunc])
+        }
+      } else {
+        slotConf[slotKey] = slotFunc
+      }
+    }
+  })
+  return slotConf
+}
+
 function getToolbarSlots (_vm: any) {
   const { $scopedSlots, toolbarOpts } = _vm
   const toolbarOptSlots = toolbarOpts.slots
@@ -112,25 +132,6 @@ function getToolbarSlots (_vm: any) {
   return slots
 }
 
-function getPagerSlots (_vm: any) {
-  const { pagerOpts } = _vm
-  const pagerOptSlots = pagerOpts.slots
-  const slots: any = {}
-  let leftSlot
-  let rightSlot
-  if (pagerOptSlots) {
-    leftSlot = getFuncSlot(_vm, pagerOptSlots, 'left')
-    rightSlot = getFuncSlot(_vm, pagerOptSlots, 'right')
-    if (leftSlot) {
-      slots.left = leftSlot
-    }
-    if (rightSlot) {
-      slots.right = rightSlot
-    }
-  }
-  return slots
-}
-
 function getTableOns (_vm: any) {
   const { $listeners, proxyConfig, proxyOpts } = _vm
   const ons: any = {}
@@ -150,6 +151,24 @@ function getTableOns (_vm: any) {
   return ons
 }
 
+function pageChangeEvent ($xeGrid: VxeGridConstructor & VxeGridPrivateMethods, params: VxePagerDefines.PageChangeEventParams) {
+  const props = $xeGrid
+  const reactData = $xeGrid as unknown as GridReactData
+
+  const { proxyConfig } = props
+  const { tablePage } = reactData
+  const { $event, currentPage, pageSize } = params
+  const proxyOpts = $xeGrid.computeProxyOpts
+  tablePage.currentPage = currentPage
+  tablePage.pageSize = pageSize
+  $xeGrid.dispatchEvent('page-change', params, $event)
+  if (proxyConfig && isEnableConf(proxyOpts)) {
+    $xeGrid.commitProxy('query').then((rest) => {
+      $xeGrid.dispatchEvent('proxy-query', rest, $event)
+    })
+  }
+}
+
 /**
  * 渲染表单
  */
@@ -271,39 +290,45 @@ function renderBottom (h: CreateElement, _vm: any) {
 /**
  * 渲染分页
  */
-function renderPager (h: CreateElement, $xeGrid: any) {
+function renderPager (h: CreateElement, $xeGrid: VxeGridConstructor & VxeGridPrivateMethods) {
   const VxeUIPagerComponent = VxeUI.getComponent<VxePagerComponent>('VxePager')
   const props = $xeGrid
+  const slots = $xeGrid.$scopedSlots
+  const reactData = $xeGrid as unknown as GridReactData
 
-  const { pagerConfig, proxyConfig } = props
-  const { $scopedSlots, tablePage } = $xeGrid
-  const pagerSlot = $scopedSlots.pager
-  const hasPager = !!(pagerSlot || isEnableConf(pagerConfig))
-
-  if (hasPager) {
+  const { proxyConfig, pagerConfig } = props
+  const proxyOpts = $xeGrid.computeProxyOpts
+  const pagerOpts = $xeGrid.computePagerOpts
+  const pagerSlot = slots.pager
+  if ((pagerConfig && isEnableConf(pagerOpts)) || slots.pager) {
     return h('div', {
-      key: 'pager',
       ref: 'refPagerWrapper',
+      key: 'pager',
       class: 'vxe-grid--pager-wrapper'
     }, pagerSlot
-      ? pagerSlot.call($xeGrid, { $grid: $xeGrid }, h)
+      ? pagerSlot.call($xeGrid, { $grid: $xeGrid })
       : [
           VxeUIPagerComponent
             ? h(VxeUIPagerComponent, {
-              props: { ...$xeGrid.pagerOpts, ...(proxyConfig ? tablePage : {}) },
+              ref: 'refPager',
+              props: {
+                ...pagerOpts,
+                ...(proxyConfig && isEnableConf(proxyOpts) ? reactData.tablePage : {})
+              },
               on: {
-                'page-change': $xeGrid.pageChangeEvent
+                'page-change' (params: any) {
+                  pageChangeEvent($xeGrid, params)
+                }
               },
-              scopedSlots: getPagerSlots($xeGrid)
+              scopedSlots: getConfigSlot($xeGrid, pagerOpts.slots)
             })
             : renderEmptyElement($xeGrid)
-        ]
-    )
+        ])
   }
   return renderEmptyElement($xeGrid)
 }
 
-function renderChildLayout (h: CreateElement, $xeGrid: VxeGridConstructor, layoutKeys: VxeGridPropTypes.LayoutKey[]) {
+function renderChildLayout (h: CreateElement, $xeGrid: VxeGridConstructor & VxeGridPrivateMethods, layoutKeys: VxeGridPropTypes.LayoutKey[]) {
   const childVNs: VNode[] = []
   layoutKeys.forEach(key => {
     switch (key) {
@@ -342,7 +367,7 @@ function renderChildLayout (h: CreateElement, $xeGrid: VxeGridConstructor, layou
   return childVNs
 }
 
-function renderLayout (h: CreateElement, $xeGrid: VxeGridConstructor) {
+function renderLayout (h: CreateElement, $xeGrid: VxeGridConstructor & VxeGridPrivateMethods) {
   const slots = $xeGrid.$scopedSlots
 
   const currLayoutConf = ($xeGrid as any).computeCurrLayoutConf as {
@@ -405,8 +430,7 @@ export default {
   },
   provide () {
     return {
-      $xeGrid: this,
-      $xegrid: this
+      $xeGrid: this
     }
   },
   data () {
@@ -753,6 +777,9 @@ export default {
      * @param {String/Object} code 字符串或对象
      */
     commitProxy (proxyTarget: any, ...args: any[]) {
+      const $xeGrid = this
+      const reactData = $xeGrid
+
       const { $refs, toolbar, toolbarConfig, toolbarOpts, proxyOpts, tablePage, pagerConfig, editRules, isRespMsg, isActiveMsg, validConfig, pagerOpts } = this
       const { beforeQuery, afterQuery, beforeDelete, afterDelete, beforeSave, afterSave, ajax = {} } = proxyOpts
       const resConfigs = proxyOpts.response || proxyOpts.props || {}
@@ -809,6 +836,9 @@ export default {
           if (ajaxMethods) {
             const isInited = code === '_init'
             const isReload = code === 'reload'
+            if (!isInited && reactData.tableLoading) {
+              return $xeGrid.$nextTick()
+            }
             let sortList = []
             let filterList = []
             let pageParams = {}
@@ -1152,18 +1182,6 @@ export default {
         }
       }
     },
-    pageChangeEvent (params: any) {
-      const { proxyConfig, tablePage } = this
-      const { currentPage, pageSize } = params
-      tablePage.currentPage = currentPage
-      tablePage.pageSize = pageSize
-      this.$emit('page-change', Object.assign({ $grid: this }, params))
-      if (proxyConfig) {
-        this.commitProxy('query').then((rest: any) => {
-          this.$emit('proxy-query', { ...rest, $grid: this, $event: params.$event })
-        })
-      }
-    },
     sortChangeEvent (params: any) {
       const { $table, column, sortList } = params
       const isRemote = XEUtils.isBoolean(column.remoteSort) ? column.remoteSort : $table.sortOpts.remote
@@ -1194,7 +1212,13 @@ export default {
       this.$emit('filter-change', Object.assign({ $grid: this }, params))
     },
     submitEvent (params: any) {
+      const $xeGrid = this
+      const reactData = $xeGrid
+
       const { proxyConfig } = this
+      if (reactData.tableLoading) {
+        return
+      }
       if (proxyConfig) {
         this.commitProxy('reload').then((rest: any) => {
           this.$emit('proxy-query', { ...rest, isReload: true, $grid: this, $event: params.$event })

package/packages/locale/lang/ar-EG.ts

@@ -51,7 +51,8 @@ export default {
       treeNotImp: '树表格不支持导入',
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
-      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
+      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误'
     },
     table: {
       emptyText: 'لا توجد بيانات حتى الآن',
@@ -237,6 +238,9 @@ export default {
       fixedRight: '冻结在右侧',
       cancelFixed: '取消冻结列'
     },
+    datePicker: {
+      yearTitle: '{0} 年'
+    },
     input: {
       date: {
         m1: '01 月',
@@ -567,6 +571,7 @@ export default {
       },
       filterCombination: {
         menus: {
+          sort: '排序',
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',
@@ -671,6 +676,7 @@ export default {
       },
       combination: {
         menus: {
+          sort: '排序',
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',

package/packages/locale/lang/de-DE.ts

@@ -52,7 +52,8 @@ export default
       treeNotImp: 'Baumtabellen unterstützen den Import nicht',
       treeCrossDrag: 'Nur die erste Ebene kann gezogen werden',
       treeDragChild: 'Ein übergeordnetes Element kann nicht in seine eigenen untergeordneten Elemente gezogen werden',
-      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
+      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误'
     },
     table: {
       emptyText: 'Noch keine Daten',
@@ -238,6 +239,9 @@ export default
       fixedRight: 'rechts eingefroren',
       cancelFixed: 'Spalte freigeben'
     },
+    datePicker: {
+      yearTitle: '{0} Jahre'
+    },
     input: {
       date: {
         m1: 'Januar',
@@ -568,6 +572,7 @@ export default
       },
       filterCombination: {
         menus: {
+          sort: '排序',
           clearSort: 'Klare Sortierung',
           sortAsc: 'Aufsteigende Reihenfolge',
           sortDesc: 'absteigende Reihenfolge',
@@ -672,6 +677,7 @@ export default
       },
       combination: {
         menus: {
+          sort: '排序',
           clearSort: 'Klare Sortierung',
           sortAsc: 'Aufsteigende Reihenfolge',
           sortDesc: 'absteigende Reihenfolge',

package/packages/locale/lang/en-US.ts

@@ -51,7 +51,8 @@ export default {
       treeNotImp: 'Tree tables do not support importing',
       treeCrossDrag: 'Only the first level can be dragged',
       treeDragChild: 'A parent cannot be dragged into its own children',
-      reqPlugin: 'Extension plugin not installed "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: 'Extension plugin not installed "{1}" https://vxeui.com/other{0}/#/{1}/install',
+      errMaxRow: 'The maximum supported data volume {0} line is exceeded, which may cause an error.'
     },
     table: {
       emptyText: 'No data yet',
@@ -237,6 +238,9 @@ export default {
       fixedRight: 'frozen on right',
       cancelFixed: 'Unfreeze column'
     },
+    datePicker: {
+      yearTitle: '{0} years'
+    },
     input: {
       date: {
         m1: 'January',
@@ -567,6 +571,7 @@ export default {
       },
       filterCombination: {
         menus: {
+          sort: 'Sort',
           clearSort: 'Clear sort',
           sortAsc: 'Ascending order',
           sortDesc: 'descending order',
@@ -671,6 +676,7 @@ export default {
       },
       combination: {
         menus: {
+          sort: 'Sort',
           clearSort: 'Clear sort',
           sortAsc: 'Ascending order',
           sortDesc: 'descending order',

package/packages/locale/lang/es-ES.ts

@@ -51,7 +51,8 @@ export default {
       treeNotImp: 'La tabla de árbol no soporta importación.',
       treeCrossDrag: 'Only drag and drop the first level',
       treeDragChild: 'The parent cannot be dragged into its own child',
-      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install'
+      reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
+      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误'
     },
     table: {
       emptyText: 'No hay datos',
@@ -237,6 +238,9 @@ export default {
       fixedRight: 'Freeze on the right',
       cancelFixed: 'Unfreeze column'
     },
+    datePicker: {
+      yearTitle: '{0}'
+    },
     input: {
       date: {
         m1: 'Enero',
@@ -571,6 +575,7 @@ export default {
       },
       filterCombination: {
         menus: {
+          sort: '排序',
           clearSort: '清除排序',
           sortAsc: '升序',
           sortDesc: '降序',
@@ -639,6 +644,7 @@ export default {
       },
       combination: {
         menus: {
+          sort: '排序',
           clearSort: 'Limpiar ordenamiento',
           sortAsc: 'Orden ascendente',
           sortDesc: 'Orden descendente',