vxe-table 4.7.76 → 4.7.78

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.assembleColumn=assembleColumn,exports.clearTableAllStatus=clearTableAllStatus,exports.clearTableDefaultStatus=clearTableDefaultStatus,exports.colToVisible=colToVisible,exports.convertHeaderColumnToRows=void 0,exports.createColumn=createColumn,exports.destroyColumn=destroyColumn,exports.getCellValue=getCellValue,exports.getColReMaxWidth=getColReMaxWidth,exports.getColReMinWidth=getColReMinWidth,exports.getRootColumn=getRootColumn,exports.getRowUniqueId=getRowUniqueId,exports.getRowid=getRowid,exports.getRowkey=getRowkey,exports.handleFieldOrColumn=void 0,exports.isColumnInfo=isColumnInfo,exports.mergeBodyMethod=mergeBodyMethod,exports.removeScrollListener=removeScrollListener,exports.restoreScrollListener=restoreScrollListener,exports.restoreScrollLocation=restoreScrollLocation,exports.rowToVisible=rowToVisible,exports.setCellValue=setCellValue,exports.toFilters=toFilters,exports.toTreePathSeq=toTreePathSeq,exports.watchColumn=watchColumn;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_columnInfo=require("./columnInfo"),_dom=require("../../ui/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const getAllConvertColumns=(e,l)=>{const t=[];return e.forEach(e=>{e.parentId=l?l.id:null,e.visible&&(e.children&&e.children.length&&e.children.some(e=>e.visible)?(t.push(e),t.push(...getAllConvertColumns(e.children,e))):t.push(e))}),t},convertHeaderColumnToRows=e=>{let l=1;const r=(t,e)=>{if(e&&(t.level=e.level+1,l<t.level)&&(l=t.level),t.children&&t.children.length&&t.children.some(e=>e.visible)){let l=0;t.children.forEach(e=>{e.visible&&(r(e,t),l+=e.colSpan)}),t.colSpan=l}else t.colSpan=1},t=(e.forEach(e=>{e.level=1,r(e)}),[]);for(let e=0;e<l;e++)t.push([]);return getAllConvertColumns(e).forEach(e=>{e.children&&e.children.length&&e.children.some(e=>e.visible)?e.rowSpan=1:e.rowSpan=l-e.level+1,t[e.level-1].push(e)}),t};function restoreScrollLocation(e,l,t){const r=e["internalData"];return e.clearScroll().then(()=>{if(l||t)return r.lastScrollLeft=0,r.lastScrollTop=0,e.scrollTo(l,t)})}function removeScrollListener(e){e&&e._onscroll&&(e.onscroll=null)}function restoreScrollListener(e){e&&e._onscroll&&(e.onscroll=e._onscroll)}function getRowUniqueId(){return _xeUtils.default.uniqueId("row_")}function getRowkey(e){var l=e["props"],e=e.getComputeMaps()["computeRowOpts"],l=l["rowId"],e=e.value;return l||e.keyField||"_X_ROW_KEY"}function getRowid(e,l){l=_xeUtils.default.get(l,getRowkey(e));return _xeUtils.default.eqNull(l)?"":encodeURIComponent(l)}exports.convertHeaderColumnToRows=convertHeaderColumnToRows;const handleFieldOrColumn=(e,l)=>l?_xeUtils.default.isString(l)?e.getColumnByField(l):l:null;function getPaddingLeftRightSize(e){return e?(e=getComputedStyle(e),_xeUtils.default.toNumber(e.paddingLeft)+_xeUtils.default.toNumber(e.paddingRight)):0}function getElemenMarginWidth(e){var l,t;return e?(t=getComputedStyle(e),l=_xeUtils.default.toNumber(t.marginLeft),t=_xeUtils.default.toNumber(t.marginRight),e.offsetWidth+l+t):0}function queryCellElement(e,l){return e.querySelector(".vxe-cell"+l)}function toFilters(e){return e&&_xeUtils.default.isArray(e)?e.map(({label:e,value:l,data:t,resetValue:r,checked:o})=>({label:e,value:l,data:t,resetValue:r,checked:!!o,_checked:!!o})):e}function toTreePathSeq(e){return e.map((e,l)=>l%2==0?Number(e)+1:".").join("")}function getCellValue(e,l){return _xeUtils.default.get(e,l.field)}function setCellValue(e,l,t){return _xeUtils.default.set(e,l.field,t)}function getColReMaxWidth(e){var l=e["$table"],l=l.getComputeMaps()["computeResizableOpts"],l=l.value["maxWidth"];if(l){e=_xeUtils.default.isFunction(l)?l(e):l;if("auto"!==e)return Math.max(1,_xeUtils.default.toNumber(e))}return-1}function getColReMinWidth(e){var{$table:l,column:t,cell:r}=e,o=l["props"],n=l.getComputeMaps()["computeResizableOpts"],n=n.value["minWidth"];if(n){e=_xeUtils.default.isFunction(n)?n(e):n;if("auto"!==e)return Math.max(1,_xeUtils.default.toNumber(e))}var i,a,n=o["showHeaderOverflow"],{showHeaderOverflow:e,minWidth:o}=t,t=_xeUtils.default.isUndefined(e)||_xeUtils.default.isNull(e)?n:e,n="title"===t||(!0===t||"tooltip"===t)||"ellipsis"===t;let u=_xeUtils.default.floor(1.6*(_xeUtils.default.toNumber(getComputedStyle(r).fontSize)||14))+(getPaddingLeftRightSize(r)+getPaddingLeftRightSize(queryCellElement(r,"")));if(n&&(e=getPaddingLeftRightSize(queryCellElement(r,"--title>.vxe-cell--checkbox")),t=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--required-icon")),n=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--edit-icon")),s=getElemenMarginWidth(queryCellElement(r,">.vxe-cell-title-prefix-icon")),i=getElemenMarginWidth(queryCellElement(r,">.vxe-cell-title-suffix-icon")),a=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--sort")),r=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--filter")),u+=e+t+n+s+i+r+a),o){var s,e=l.getRefMaps()["refTableBody"],t=e.value,n=t?t.$el:null;if(n){if((0,_dom.isScale)(o))return s=(n.clientWidth-1)/100,Math.max(u,Math.floor(_xeUtils.default.toInteger(o)*s));if((0,_dom.isPx)(o))return Math.max(u,_xeUtils.default.toInteger(o))}}return u}function isColumnInfo(e){return e&&(e.constructor===_columnInfo.ColumnInfo||e instanceof _columnInfo.ColumnInfo)}function createColumn(e,l,t){return isColumnInfo(l)?l:(0,_vue.reactive)(new _columnInfo.ColumnInfo(e,l,t))}function watchColumn(t,e,r){Object.keys(e).forEach(l=>{(0,_vue.watch)(()=>e[l],e=>{r.update(l,e),t&&("filters"===l?(t.setFilter(r,e),t.handleUpdateDataQueue()):["visible","fixed","width","minWidth","maxWidth"].includes(l)&&t.handleRefreshColumnQueue())})})}function assembleColumn(e,l,t,r){var e=e["reactData"],o=e["staticColumns"],n=l.parentNode,r=r?r.column:null,r=r?r.children:o;n&&r&&(r.splice(_xeUtils.default.arrayIndexOf(n.children,l),0,t),e.staticColumns=o.slice(0))}function destroyColumn(e,l){var e=e["reactData"],t=e["staticColumns"],r=_xeUtils.default.findTree(t,e=>e.id===l.id,{children:"children"});r&&r.items.splice(r.index,1),e.staticColumns=t.slice(0)}function getRootColumn(e,l){var e=e["internalData"],t=e["fullColumnIdData"];if(!l)return null;let r=l.parentId;for(;t[r];){const l=t[r].column;if(!(r=l.parentId))return l}return l}function mergeBodyMethod(l,t,r){for(let e=0;e<l.length;e++){var{row:o,col:n,rowspan:i,colspan:a}=l[e];if(-1<n&&-1<o&&i&&a){if(o===t&&n===r)return{rowspan:i,colspan:a};if(o<=t&&t<o+i&&n<=r&&r<n+a)return{rowspan:0,colspan:0}}}}function clearTableDefaultStatus(e){var{props:l,internalData:t}=e;return t.initStatus=!1,e.clearSort(),e.clearCurrentRow(),e.clearCurrentColumn(),e.clearRadioRow(),e.clearRadioReserve(),e.clearCheckboxRow(),e.clearCheckboxReserve(),e.clearRowExpand(),e.clearTreeExpand(),e.clearTreeExpandReserve(),e.clearPendingRow(),e.clearFilter&&e.clearFilter(),e.clearSelected&&(l.keyboardConfig||l.mouseConfig)&&e.clearSelected(),e.clearCellAreas&&l.mouseConfig&&(e.clearCellAreas(),e.clearCopyCellArea()),e.clearScroll()}function clearTableAllStatus(e){return e.clearFilter&&e.clearFilter(),clearTableDefaultStatus(e)}function rowToVisible(e,l){var{reactData:t,internalData:r}=e,o=e.getRefMaps()["refTableBody"],t=t["scrollYLoad"],{afterFullData:r,scrollYStore:n}=r,o=o.value,o=o?o.$el:null;if(o){var i=o.querySelector(`[rowid="${getRowid(e,l)}"]`);if(i){var a=o.clientHeight,o=o.scrollTop,u=i.offsetParent,u=i.offsetTop+(u?u.offsetTop:0),i=i.clientHeight;if(u<o||o+a<u)return e.scrollTo(null,u);if(a+o<=u+i)return e.scrollTo(null,o+i)}else if(t)return e.scrollTo(null,(e.findRowIndexOf(r,l)-1)*n.rowHeight)}return Promise.resolve()}function colToVisible(e,t){var{reactData:l,internalData:r}=e,o=e.getRefMaps()["refTableBody"],l=l["scrollXLoad"],n=r["visibleColumn"],r=o.value,o=r?r.$el:null;if(o){r=o.querySelector("."+t.id);if(r){var i=o.clientWidth,o=o.scrollLeft,a=r.offsetParent,a=r.offsetLeft+(a?a.offsetLeft:0),r=r.clientWidth;if(a<o||o+i<a)return e.scrollTo(a);if(i+o<=a+r)return e.scrollTo(o+r)}else if(l){let l=0;for(let e=0;e<n.length;e++){var u=n[e];if(u===t||u.id===t.id)break;l+=u.renderWidth}return e.scrollTo(l)}}return Promise.resolve()}exports.handleFieldOrColumn=handleFieldOrColumn;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.assembleColumn=assembleColumn,exports.clearTableAllStatus=clearTableAllStatus,exports.clearTableDefaultStatus=clearTableDefaultStatus,exports.colToVisible=colToVisible,exports.convertHeaderColumnToRows=void 0,exports.createColumn=createColumn,exports.destroyColumn=destroyColumn,exports.getCellValue=getCellValue,exports.getColReMaxWidth=getColReMaxWidth,exports.getColReMinWidth=getColReMinWidth,exports.getRootColumn=getRootColumn,exports.getRowUniqueId=getRowUniqueId,exports.getRowid=getRowid,exports.getRowkey=getRowkey,exports.handleFieldOrColumn=void 0,exports.isColumnInfo=isColumnInfo,exports.mergeBodyMethod=mergeBodyMethod,exports.removeScrollListener=removeScrollListener,exports.restoreScrollListener=restoreScrollListener,exports.restoreScrollLocation=restoreScrollLocation,exports.rowToVisible=rowToVisible,exports.setCellValue=setCellValue,exports.toFilters=toFilters,exports.toTreePathSeq=toTreePathSeq,exports.watchColumn=watchColumn;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_columnInfo=require("./columnInfo"),_dom=require("../../ui/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const getAllConvertColumns=(e,l)=>{const t=[];return e.forEach(e=>{e.parentId=l?l.id:null,e.visible&&(e.children&&e.children.length&&e.children.some(e=>e.visible)?(t.push(e),t.push(...getAllConvertColumns(e.children,e))):t.push(e))}),t},convertHeaderColumnToRows=e=>{let l=1;const r=(t,e)=>{if(e&&(t.level=e.level+1,l<t.level)&&(l=t.level),t.children&&t.children.length&&t.children.some(e=>e.visible)){let l=0;t.children.forEach(e=>{e.visible&&(r(e,t),l+=e.colSpan)}),t.colSpan=l}else t.colSpan=1},t=(e.forEach(e=>{e.level=1,r(e)}),[]);for(let e=0;e<l;e++)t.push([]);return getAllConvertColumns(e).forEach(e=>{e.children&&e.children.length&&e.children.some(e=>e.visible)?e.rowSpan=1:e.rowSpan=l-e.level+1,t[e.level-1].push(e)}),t};function restoreScrollLocation(e,l,t){const r=e["internalData"];return e.clearScroll().then(()=>{if(l||t)return r.lastScrollLeft=0,r.lastScrollTop=0,e.scrollTo(l,t)})}function removeScrollListener(e){e&&e._onscroll&&(e.onscroll=null)}function restoreScrollListener(e){e&&e._onscroll&&(e.onscroll=e._onscroll)}function getRowUniqueId(){return _xeUtils.default.uniqueId("row_")}function getRowkey(e){var l=e["props"],e=e.getComputeMaps()["computeRowOpts"],l=l["rowId"],e=e.value;return l||e.keyField||"_X_ROW_KEY"}function getRowid(e,l){l=_xeUtils.default.get(l,getRowkey(e));return _xeUtils.default.eqNull(l)?"":encodeURIComponent(l)}exports.convertHeaderColumnToRows=convertHeaderColumnToRows;const handleFieldOrColumn=(e,l)=>l?_xeUtils.default.isString(l)?e.getColumnByField(l):l:null;function getPaddingLeftRightSize(e){return e?(e=getComputedStyle(e),_xeUtils.default.toNumber(e.paddingLeft)+_xeUtils.default.toNumber(e.paddingRight)):0}function getElemenMarginWidth(e){var l,t;return e?(t=getComputedStyle(e),l=_xeUtils.default.toNumber(t.marginLeft),t=_xeUtils.default.toNumber(t.marginRight),e.offsetWidth+l+t):0}function queryCellElement(e,l){return e.querySelector(".vxe-cell"+l)}function toFilters(e){return e&&_xeUtils.default.isArray(e)?e.map(({label:e,value:l,data:t,resetValue:r,checked:o})=>({label:e,value:l,data:t,resetValue:r,checked:!!o,_checked:!!o})):e}function toTreePathSeq(e){return e.map((e,l)=>l%2==0?Number(e)+1:".").join("")}function getCellValue(e,l){return _xeUtils.default.get(e,l.field)}function setCellValue(e,l,t){return _xeUtils.default.set(e,l.field,t)}function getColReMaxWidth(e){var l=e["$table"],l=l.getComputeMaps()["computeResizableOpts"],l=l.value["maxWidth"];if(l){e=_xeUtils.default.isFunction(l)?l(e):l;if("auto"!==e)return Math.max(1,_xeUtils.default.toNumber(e))}return-1}function getColReMinWidth(e){var{$table:l,column:t,cell:r}=e,o=l["props"],n=l.getComputeMaps()["computeResizableOpts"],n=n.value["minWidth"];if(n){e=_xeUtils.default.isFunction(n)?n(e):n;if("auto"!==e)return Math.max(1,_xeUtils.default.toNumber(e))}var i,a,n=o["showHeaderOverflow"],{showHeaderOverflow:e,minWidth:o}=t,t=_xeUtils.default.isUndefined(e)||_xeUtils.default.isNull(e)?n:e,n="title"===t||(!0===t||"tooltip"===t)||"ellipsis"===t;let u=_xeUtils.default.floor(1.6*(_xeUtils.default.toNumber(getComputedStyle(r).fontSize)||14))+(getPaddingLeftRightSize(r)+getPaddingLeftRightSize(queryCellElement(r,"")));if(n&&(e=getPaddingLeftRightSize(queryCellElement(r,"--title>.vxe-cell--checkbox")),t=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--required-icon")),n=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--edit-icon")),s=getElemenMarginWidth(queryCellElement(r,">.vxe-cell-title-prefix-icon")),i=getElemenMarginWidth(queryCellElement(r,">.vxe-cell-title-suffix-icon")),a=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--sort")),r=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--filter")),u+=e+t+n+s+i+r+a),o){var s,e=l.getRefMaps()["refTableBody"],t=e.value,n=t?t.$el:null;if(n){if((0,_dom.isScale)(o))return s=(n.clientWidth-1)/100,Math.max(u,Math.floor(_xeUtils.default.toInteger(o)*s));if((0,_dom.isPx)(o))return Math.max(u,_xeUtils.default.toInteger(o))}}return u}function isColumnInfo(e){return e&&(e.constructor===_columnInfo.ColumnInfo||e instanceof _columnInfo.ColumnInfo)}function createColumn(e,l,t){return isColumnInfo(l)?l:(0,_vue.reactive)(new _columnInfo.ColumnInfo(e,l,t))}function watchColumn(t,e,r){Object.keys(e).forEach(l=>{(0,_vue.watch)(()=>e[l],e=>{r.update(l,e),t&&("filters"===l?(t.setFilter(r,e),t.handleUpdateDataQueue()):["visible","fixed","width","minWidth","maxWidth"].includes(l)&&t.handleRefreshColumnQueue())})})}function assembleColumn(e,l,t,r){var e=e["reactData"],o=e["staticColumns"],n=l.parentNode,r=r?r.columnConfig:null,r=r?r.children:o;n&&r&&(r.splice(_xeUtils.default.arrayIndexOf(n.children,l),0,t),e.staticColumns=o.slice(0))}function destroyColumn(e,l){var e=e["reactData"],t=e["staticColumns"],r=_xeUtils.default.findTree(t,e=>e.id===l.id,{children:"children"});r&&r.items.splice(r.index,1),e.staticColumns=t.slice(0)}function getRootColumn(e,l){var e=e["internalData"],t=e["fullColumnIdData"];if(!l)return null;let r=l.parentId;for(;t[r];){const l=t[r].column;if(!(r=l.parentId))return l}return l}function mergeBodyMethod(l,t,r){for(let e=0;e<l.length;e++){var{row:o,col:n,rowspan:i,colspan:a}=l[e];if(-1<n&&-1<o&&i&&a){if(o===t&&n===r)return{rowspan:i,colspan:a};if(o<=t&&t<o+i&&n<=r&&r<n+a)return{rowspan:0,colspan:0}}}}function clearTableDefaultStatus(e){var{props:l,internalData:t}=e;return t.initStatus=!1,e.clearSort(),e.clearCurrentRow(),e.clearCurrentColumn(),e.clearRadioRow(),e.clearRadioReserve(),e.clearCheckboxRow(),e.clearCheckboxReserve(),e.clearRowExpand(),e.clearTreeExpand(),e.clearTreeExpandReserve(),e.clearPendingRow(),e.clearFilter&&e.clearFilter(),e.clearSelected&&(l.keyboardConfig||l.mouseConfig)&&e.clearSelected(),e.clearCellAreas&&l.mouseConfig&&(e.clearCellAreas(),e.clearCopyCellArea()),e.clearScroll()}function clearTableAllStatus(e){return e.clearFilter&&e.clearFilter(),clearTableDefaultStatus(e)}function rowToVisible(e,l){var{reactData:t,internalData:r}=e,o=e.getRefMaps()["refTableBody"],t=t["scrollYLoad"],{afterFullData:r,scrollYStore:n}=r,o=o.value,o=o?o.$el:null;if(o){var i=o.querySelector(`[rowid="${getRowid(e,l)}"]`);if(i){var a=o.clientHeight,o=o.scrollTop,u=i.offsetParent,u=i.offsetTop+(u?u.offsetTop:0),i=i.clientHeight;if(u<o||o+a<u)return e.scrollTo(null,u);if(a+o<=u+i)return e.scrollTo(null,o+i)}else if(t)return e.scrollTo(null,(e.findRowIndexOf(r,l)-1)*n.rowHeight)}return Promise.resolve()}function colToVisible(e,t){var{reactData:l,internalData:r}=e,o=e.getRefMaps()["refTableBody"],l=l["scrollXLoad"],n=r["visibleColumn"],r=o.value,o=r?r.$el:null;if(o){r=o.querySelector("."+t.id);if(r){var i=o.clientWidth,o=o.scrollLeft,a=r.offsetParent,a=r.offsetLeft+(a?a.offsetLeft:0),r=r.clientWidth;if(a<o||o+i<a)return e.scrollTo(a);if(i+o<=a+r)return e.scrollTo(o+r)}else if(l){let l=0;for(let e=0;e<n.length;e++){var u=n[e];if(u===t||u.id===t.id)break;l+=u.renderWidth}return e.scrollTo(l)}}return Promise.resolve()}exports.handleFieldOrColumn=handleFieldOrColumn;

package/lib/toolbar/src/toolbar.js

@@ -61,8 +61,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
     } = useFns.useSize(props);
     const reactData = (0, _vue.reactive)({
       isRefresh: false,
+      connectFlag: 0,
       columns: []
     });
+    const internalData = {
+      connectTable: null
+    };
     const refElem = (0, _vue.ref)();
     const refMaps = {
       refElem
@@ -72,12 +76,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
       props,
       context,
       reactData,
+      internalData,
       getRefMaps: () => refMaps
     };
     let toolbarMethods = {};
     const $xeGrid = (0, _vue.inject)('$xeGrid', null);
-    const refTable = (0, _vue.ref)();
-    const connectFlag = (0, _vue.ref)(0);
     const computeRefreshOpts = (0, _vue.computed)(() => {
       return Object.assign({}, getConfig().toolbar.refresh, props.refresh);
     });
@@ -97,8 +100,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
       return Object.assign({}, getConfig().toolbar.custom, props.custom);
     });
     const computeTableCustomOpts = (0, _vue.computed)(() => {
-      const $table = refTable.value;
-      if (connectFlag.value || $table) {
+      const {
+        connectTable
+      } = internalData;
+      const $table = connectTable;
+      if (reactData.connectFlag || $table) {
         if ($table) {
           const {
             computeCustomOpts
@@ -115,7 +121,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
       return tableCustomOpts.trigger;
     });
     const checkTable = () => {
-      const $table = refTable.value;
+      const {
+        connectTable
+      } = internalData;
+      const $table = connectTable;
       if ($table) {
         return true;
       }
@@ -124,7 +133,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
     const handleClickSettingEvent = ({
       $event
     }) => {
-      const $table = refTable.value;
+      const {
+        connectTable
+      } = internalData;
+      const $table = connectTable;
       if ($table) {
         if ($table.triggerCustomEvent) {
           $table.triggerCustomEvent($event);
@@ -136,7 +148,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
     const handleMouseenterSettingEvent = ({
       $event
     }) => {
-      const $table = refTable.value;
+      const {
+        connectTable
+      } = internalData;
+      const $table = connectTable;
       if ($table) {
         $table.customOpenEvent($event);
       } else {
@@ -146,7 +161,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
     const handleMouseleaveSettingEvent = ({
       $event
     }) => {
-      const $table = refTable.value;
+      const {
+        connectTable
+      } = internalData;
+      const $table = connectTable;
       if ($table) {
         const {
           customStore
@@ -195,7 +213,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
       }
     };
     const btnEvent = (evnt, item) => {
-      const $table = refTable.value;
+      const {
+        connectTable
+      } = internalData;
+      const $table = connectTable;
       const {
         code
       } = item;
@@ -226,7 +247,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
       }
     };
     const tolEvent = (evnt, item) => {
-      const $table = refTable.value;
+      const {
+        connectTable
+      } = internalData;
+      const $table = connectTable;
       const {
         code
       } = item;
@@ -258,7 +282,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     const importEvent = () => {
       if (checkTable()) {
-        const $table = refTable.value;
+        const {
+          connectTable
+        } = internalData;
+        const $table = connectTable;
         if ($table) {
           $table.openImport();
         }
@@ -266,7 +293,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     const exportEvent = () => {
       if (checkTable()) {
-        const $table = refTable.value;
+        const {
+          connectTable
+        } = internalData;
+        const $table = connectTable;
         if ($table) {
           $table.openExport();
         }
@@ -274,12 +304,29 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     const printEvent = () => {
       if (checkTable()) {
-        const $table = refTable.value;
+        const {
+          connectTable
+        } = internalData;
+        const $table = connectTable;
         if ($table) {
           $table.openPrint();
         }
       }
     };
+    const dispatchEvent = (type, params, evnt) => {
+      emit(type, createEvent(evnt, {
+        $toolbar: $xeToolbar
+      }, params));
+    };
+    toolbarMethods = {
+      dispatchEvent,
+      syncUpdate(params) {
+        internalData.connectTable = params.$table;
+        reactData.columns = params.collectColumn;
+        reactData.connectFlag++;
+      }
+    };
+    Object.assign($xeToolbar, toolbarMethods);
     const renderDropdowns = (item, isBtn) => {
       const {
         dropdowns
@@ -316,14 +363,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const {
         buttons
       } = props;
-      const $table = refTable.value;
-      const buttonsSlot = slots.buttons;
-      if (buttonsSlot) {
-        return (0, _vn.getSlotVNs)(buttonsSlot({
-          $grid: $xeGrid,
-          $table: $table
-        }));
-      }
+      const {
+        connectTable
+      } = internalData;
+      const $table = connectTable;
       const btnVNs = [];
       if (buttons) {
         buttons.forEach(item => {
@@ -379,14 +422,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const {
         tools
       } = props;
-      const $table = refTable.value;
-      const toolsSlot = slots.tools;
-      if (toolsSlot) {
-        return (0, _vn.getSlotVNs)(toolsSlot({
-          $grid: $xeGrid,
-          $table: $table
-        }));
-      }
+      const {
+        connectTable
+      } = internalData;
+      const $table = connectTable;
       const btnVNs = [];
       if (tools) {
         tools.forEach((item, tIndex) => {
@@ -509,47 +548,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
         className: 'vxe-toolbar-custom-target'
       }, customBtnOns)) : (0, _vue.createCommentVNode)();
     };
-    toolbarMethods = {
-      dispatchEvent(type, params, evnt) {
-        emit(type, createEvent(evnt, {
-          $toolbar: $xeToolbar
-        }, params));
-      },
-      syncUpdate(params) {
-        const {
-          collectColumn
-        } = params;
-        refTable.value = params.$table;
-        reactData.columns = collectColumn;
-        connectFlag.value++;
-      }
-    };
-    Object.assign($xeToolbar, toolbarMethods);
-    (0, _vue.nextTick)(() => {
-      const {
-        refresh
-      } = props;
-      const refreshOpts = computeRefreshOpts.value;
-      const queryMethod = refreshOpts.queryMethod || refreshOpts.query;
-      if (refresh && !$xeGrid && !queryMethod) {
-        (0, _log.warnLog)('vxe.error.notFunc', ['queryMethod']);
-      }
-      const customOpts = computeCustomOpts.value;
-      if (process.env.NODE_ENV === 'development') {
-        if (customOpts.isFooter) {
-          (0, _log.warnLog)('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
-        }
-        if (customOpts.showFooter) {
-          (0, _log.warnLog)('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
-        }
-        if (customOpts.immediate) {
-          (0, _log.warnLog)('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
-        }
-        if (customOpts.trigger) {
-          (0, _log.warnLog)('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
-        }
-      }
-    });
     const renderVN = () => {
       const {
         perfect,
@@ -559,7 +557,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
         custom,
         className
       } = props;
+      const {
+        connectTable
+      } = internalData;
       const vSize = computeSize.value;
+      const toolsSlot = slots.tools;
+      const buttonsSlot = slots.buttons;
+      const $table = connectTable;
       return (0, _vue.h)('div', {
         ref: refElem,
         class: ['vxe-toolbar', className ? _xeUtils.default.isFunction(className) ? className({
@@ -571,22 +575,51 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }]
       }, [(0, _vue.h)('div', {
         class: 'vxe-buttons--wrapper'
-      }, renderBtns()), (0, _vue.h)('div', {
+      }, buttonsSlot ? buttonsSlot({
+        $grid: $xeGrid,
+        $table: $table
+      }) : renderBtns()), (0, _vue.h)('div', {
         class: 'vxe-tools--wrapper'
-      }, renderRightTools()), (0, _vue.h)('div', {
+      }, toolsSlot ? toolsSlot({
+        $grid: $xeGrid,
+        $table: $table
+      }) : renderRightTools()), (0, _vue.h)('div', {
         class: 'vxe-tools--operate'
       }, [props.import ? renderToolImport() : (0, _vue.createCommentVNode)(), props.export ? renderToolExport() : (0, _vue.createCommentVNode)(), props.print ? renderToolPrint() : (0, _vue.createCommentVNode)(), refresh ? renderToolRefresh() : (0, _vue.createCommentVNode)(), zoom && $xeGrid ? renderToolZoom() : (0, _vue.createCommentVNode)(), custom ? renderToolCustom() : (0, _vue.createCommentVNode)()])]);
     };
     $xeToolbar.renderVN = renderVN;
-    if (process.env.NODE_ENV === 'development') {
-      (0, _vue.nextTick)(() => {
+    (0, _vue.nextTick)(() => {
+      const {
+        refresh
+      } = props;
+      const refreshOpts = computeRefreshOpts.value;
+      const queryMethod = refreshOpts.queryMethod || refreshOpts.query;
+      if (refresh && !$xeGrid && !queryMethod) {
+        (0, _log.warnLog)('vxe.error.notFunc', ['queryMethod']);
+      }
+      const customOpts = computeCustomOpts.value;
+      if (process.env.NODE_ENV === 'development') {
+        if (customOpts.isFooter) {
+          (0, _log.warnLog)('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
+        }
+        if (customOpts.showFooter) {
+          (0, _log.warnLog)('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
+        }
+        if (customOpts.immediate) {
+          (0, _log.warnLog)('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
+        }
+        if (customOpts.trigger) {
+          (0, _log.warnLog)('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
+        }
+      }
+      if (process.env.NODE_ENV === 'development') {
         if (props.refresh || props.import || props.export || props.print || props.zoom) {
           if (!VxeUIButtonComponent) {
             (0, _log.errLog)('vxe.error.reqComp', ['vxe-button']);
           }
         }
-      });
-    }
+      }
+    });
     return $xeToolbar;
   },
   render() {

package/lib/toolbar/src/toolbar.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")),_ui=require("../../ui"),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const{getConfig,getIcon,getI18n,renderer,commands,createEvent,useFns}=_ui.VxeUI;var _default=exports.default=(0,_vue.defineComponent)({name:"VxeToolbar",props:{loading:Boolean,refresh:[Boolean,Object],import:[Boolean,Object],export:[Boolean,Object],print:[Boolean,Object],zoom:[Boolean,Object],custom:[Boolean,Object],buttons:{type:Array,default:()=>getConfig().toolbar.buttons},tools:{type:Array,default:()=>getConfig().toolbar.tools},perfect:{type:Boolean,default:()=>getConfig().toolbar.perfect},size:{type:String,default:()=>getConfig().toolbar.size||getConfig().size},className:[String,Function]},emits:["button-click","tool-click"],setup(c,e){const{slots:v,emit:r}=e;var o=_xeUtils.default.uniqueId();const d=_ui.VxeUI.getComponent("VxeButton"),s=useFns.useSize(c)["computeSize"],i=(0,_vue.reactive)({isRefresh:!1,columns:[]}),u=(0,_vue.ref)(),t={refElem:u},m={xID:o,props:c,context:e,reactData:i,getRefMaps:()=>t};const g=(0,_vue.inject)("$xeGrid",null),p=(0,_vue.ref)(),n=(0,_vue.ref)(0),_=(0,_vue.computed)(()=>Object.assign({},getConfig().toolbar.refresh,c.refresh)),b=(0,_vue.computed)(()=>Object.assign({},getConfig().toolbar.import,c.import)),f=(0,_vue.computed)(()=>Object.assign({},getConfig().toolbar.export,c.export)),O=(0,_vue.computed)(()=>Object.assign({},getConfig().toolbar.print,c.print)),h=(0,_vue.computed)(()=>Object.assign({},getConfig().toolbar.zoom,c.zoom)),x=(0,_vue.computed)(()=>Object.assign({},getConfig().toolbar.custom,c.custom)),a=(0,_vue.computed)(()=>{var e=p.value;if((n.value||e)&&e)return e=e.getComputeMaps()["computeCustomOpts"],e.value;return{trigger:""}}),C=(0,_vue.computed)(()=>{return a.value.trigger}),l=()=>{if(p.value)return!0;(0,_log.errLog)("vxe.error.barUnableLink")},T=({$event:e})=>{var o=p.value;o&&(o.triggerCustomEvent?o.triggerCustomEvent(e):(0,_log.errLog)("vxe.error.reqModule",["VxeTableCustomModule"]))},y=({$event:e})=>{var o=p.value;o?o.customOpenEvent(e):(0,_log.errLog)("vxe.error.reqModule",["VxeTableCustomModule"])},E=({$event:e})=>{const o=p.value;if(o){const t=o.reactData["customStore"];t.activeBtn=!1,setTimeout(()=>{t.activeBtn||t.activeWrapper||o.customCloseEvent(e)},350)}},L=({$event:e})=>{var o=i["isRefresh"],t=_.value;if(!o){o=t.queryMethod||t.query;if(o){i.isRefresh=!0;try{Promise.resolve(o({})).catch(e=>e).then(()=>{i.isRefresh=!1})}catch(e){i.isRefresh=!1}}else g&&(i.isRefresh=!0,g.triggerToolbarCommitEvent({code:t.code||"reload"},e).catch(e=>e).then(()=>{i.isRefresh=!1}))}},N=({$event:e})=>{g&&g.triggerZoomEvent(e)},I=(e,o)=>{var t,r=p.value,n=o["code"];n&&(g?g.triggerToolbarBtnEvent(o,e):(t=commands.get(n),o={code:n,button:o,$table:r,$grid:g,$event:e},t&&((r=t.tableCommandMethod||t.commandMethod)?r(o):"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notCommands",[n])),m.dispatchEvent("button-click",o,e)))},R=(e,o)=>{var t,r=p.value,n=o["code"];n&&(g?g.triggerToolbarTolEvent(o,e):(t=commands.get(n),o={code:n,tool:o,$table:r,$grid:g,$event:e},t&&((r=t.tableCommandMethod||t.commandMethod)?r(o):"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notCommands",[n])),m.dispatchEvent("tool-click",o,e)))},$=()=>{var e;l()&&(e=p.value)&&e.openImport()},k=()=>{var e;l()&&(e=p.value)&&e.openExport()},B=()=>{var e;l()&&(e=p.value)&&e.openPrint()},M=(e,t)=>{e=e.dropdowns;return e?e.map((o,e)=>!1!==o.visible&&d?(0,_vue.h)(d,{key:e,disabled:o.disabled,loading:o.loading,type:o.type,mode:o.mode,icon:o.icon,circle:o.circle,round:o.round,status:o.status,content:o.name,onClick:({$event:e})=>(t?I:R)(e,o)}):(0,_vue.createCommentVNode)()):[]};Object.assign(m,{dispatchEvent(e,o,t){r(e,createEvent(t,{$toolbar:m},o))},syncUpdate(e){var o=e["collectColumn"];p.value=e.$table,i.columns=o,n.value++}}),(0,_vue.nextTick)(()=>{var e=c["refresh"],o=_.value,o=o.queryMethod||o.query,e=(!e||g||o||(0,_log.warnLog)("vxe.error.notFunc",["queryMethod"]),x.value);"development"===process.env.NODE_ENV&&(e.isFooter&&(0,_log.warnLog)("vxe.error.delProp",["toolbar.custom.isFooter","table.custom-config.showFooter"]),e.showFooter&&(0,_log.warnLog)("vxe.error.delProp",["toolbar.custom.showFooter","table.custom-config.showFooter"]),e.immediate&&(0,_log.warnLog)("vxe.error.delProp",["toolbar.custom.immediate","table.custom-config.immediate"]),e.trigger)&&(0,_log.warnLog)("vxe.error.delProp",["toolbar.custom.trigger","table.custom-config.trigger"])});return m.renderVN=()=>{var{perfect:e,loading:o,refresh:t,zoom:r,custom:n,className:a}=c,l=s.value;return(0,_vue.h)("div",{ref:u,class:["vxe-toolbar",a?_xeUtils.default.isFunction(a)?a({$toolbar:m}):a:"",{["size--"+l]:l,"is--perfect":e,"is--loading":o}]},[(0,_vue.h)("div",{class:"vxe-buttons--wrapper"},(()=>{var e=c["buttons"];const l=p.value;var o=v.buttons;if(o)return(0,_vn.getSlotVNs)(o({$grid:g,$table:l}));const s=[];return e&&e.forEach(o=>{var e,t,r,{dropdowns:n,buttonRender:a}=o;!1!==o.visible&&(e=a?renderer.get(a.name):null,a&&e&&e.renderToolbarButton?(t=e.toolbarButtonClassName,r={$grid:g,$table:l,button:o},s.push((0,_vue.h)("span",{class:["vxe-button--item",t?_xeUtils.default.isFunction(t)?t(r):t:""]},(0,_vn.getSlotVNs)(e.renderToolbarButton(a,r))))):d&&s.push((0,_vue.h)(d,{disabled:o.disabled,loading:o.loading,type:o.type,mode:o.mode,icon:o.icon,circle:o.circle,round:o.round,status:o.status,content:o.name,permissionCode:o.permissionCode,destroyOnClose:o.destroyOnClose,placement:o.placement,transfer:o.transfer,onClick:({$event:e})=>I(e,o)},n&&n.length?{dropdowns:()=>M(o,!0)}:{})))}),s})()),(0,_vue.h)("div",{class:"vxe-tools--wrapper"},(()=>{var e=c["tools"];const i=p.value;var o=v.tools;if(o)return(0,_vn.getSlotVNs)(o({$grid:g,$table:i}));const u=[];return e&&e.forEach((o,e)=>{var t,r,n,a,{dropdowns:l,toolRender:s}=o;!1!==o.visible&&(t=s?s.name:null,r=s?renderer.get(t):null,s&&r&&r.renderToolbarTool?(n=r.toolbarToolClassName,a={$grid:g,$table:i,tool:o},u.push((0,_vue.h)("span",{key:t,class:["vxe-tool--item",n?_xeUtils.default.isFunction(n)?n(a):n:""]},(0,_vn.getSlotVNs)(r.renderToolbarTool(s,a))))):d&&u.push((0,_vue.h)(d,{key:e,disabled:o.disabled,loading:o.loading,type:o.type,mode:o.mode,icon:o.icon,circle:o.circle,round:o.round,status:o.status,content:o.name,destroyOnClose:o.destroyOnClose,placement:o.placement,transfer:o.transfer,onClick:({$event:e})=>R(e,o)},l&&l.length?{dropdowns:()=>M(o,!1)}:{})))}),u})()),(0,_vue.h)("div",{class:"vxe-tools--operate"},[c.import&&(a=b.value,d)?(0,_vue.h)(d,{key:"import",circle:!0,icon:a.icon||getIcon().TOOLBAR_TOOLS_IMPORT,title:getI18n("vxe.toolbar.import"),onClick:$}):(0,_vue.createCommentVNode)(),c.export&&(l=f.value,d)?(0,_vue.h)(d,{key:"export",circle:!0,icon:l.icon||getIcon().TOOLBAR_TOOLS_EXPORT,title:getI18n("vxe.toolbar.export"),onClick:k}):(0,_vue.createCommentVNode)(),c.print&&(e=O.value,d)?(0,_vue.h)(d,{key:"print",circle:!0,icon:e.icon||getIcon().TOOLBAR_TOOLS_PRINT,title:getI18n("vxe.toolbar.print"),onClick:B}):(0,_vue.createCommentVNode)(),t&&(o=_.value,d)?(0,_vue.h)(d,{key:"refresh",circle:!0,icon:i.isRefresh?o.iconLoading||getIcon().TOOLBAR_TOOLS_REFRESH_LOADING:o.icon||getIcon().TOOLBAR_TOOLS_REFRESH,title:getI18n("vxe.toolbar.refresh"),onClick:L}):(0,_vue.createCommentVNode)(),r&&g&&(a=h.value,g)&&d?(0,_vue.h)(d,{key:"zoom",circle:!0,icon:g.isMaximized()?a.iconOut||getIcon().TOOLBAR_TOOLS_MINIMIZE:a.iconIn||getIcon().TOOLBAR_TOOLS_FULLSCREEN,title:getI18n("vxe.toolbar.zoom"+(g.isMaximized()?"Out":"In")),onClick:N}):(0,_vue.createCommentVNode)(),n&&(l=x.value,e=C.value,t={},"manual"!==e&&("hover"===e?(t.onMouseenter=y,t.onMouseleave=E):t.onClick=T),d)?(0,_vue.h)(d,Object.assign({key:"custom",circle:!0,icon:l.icon||getIcon().TOOLBAR_TOOLS_CUSTOM,title:getI18n("vxe.toolbar.custom"),className:"vxe-toolbar-custom-target"},t)):(0,_vue.createCommentVNode)()])])},"development"===process.env.NODE_ENV&&(0,_vue.nextTick)(()=>{!(c.refresh||c.import||c.export||c.print||c.zoom)||d||(0,_log.errLog)("vxe.error.reqComp",["vxe-button"])}),m},render(){return this.renderVN()}});
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_vn=require("../../ui/src/vn"),_log=require("../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const{getConfig,getIcon,getI18n,renderer,commands,createEvent,useFns}=_ui.VxeUI;var _default=exports.default=(0,_vue.defineComponent)({name:"VxeToolbar",props:{loading:Boolean,refresh:[Boolean,Object],import:[Boolean,Object],export:[Boolean,Object],print:[Boolean,Object],zoom:[Boolean,Object],custom:[Boolean,Object],buttons:{type:Array,default:()=>getConfig().toolbar.buttons},tools:{type:Array,default:()=>getConfig().toolbar.tools},perfect:{type:Boolean,default:()=>getConfig().toolbar.perfect},size:{type:String,default:()=>getConfig().toolbar.size||getConfig().size},className:[String,Function]},emits:["button-click","tool-click"],setup(u,e){const{slots:d,emit:r}=e;var o=_xeUtils.default.uniqueId();const v=_ui.VxeUI.getComponent("VxeButton"),m=useFns.useSize(u)["computeSize"],g=(0,_vue.reactive)({isRefresh:!1,connectFlag:0,columns:[]}),p={connectTable:null},b=(0,_vue.ref)(),t={refElem:b},_={xID:o,props:u,context:e,reactData:g,internalData:p,getRefMaps:()=>t};const f=(0,_vue.inject)("$xeGrid",null),O=(0,_vue.computed)(()=>Object.assign({},getConfig().toolbar.refresh,u.refresh)),h=(0,_vue.computed)(()=>Object.assign({},getConfig().toolbar.import,u.import)),x=(0,_vue.computed)(()=>Object.assign({},getConfig().toolbar.export,u.export)),C=(0,_vue.computed)(()=>Object.assign({},getConfig().toolbar.print,u.print)),T=(0,_vue.computed)(()=>Object.assign({},getConfig().toolbar.zoom,u.zoom)),y=(0,_vue.computed)(()=>Object.assign({},getConfig().toolbar.custom,u.custom)),n=(0,_vue.computed)(()=>{var e=p["connectTable"];if((g.connectFlag||e)&&e)return e=e.getComputeMaps()["computeCustomOpts"],e.value;return{trigger:""}}),E=(0,_vue.computed)(()=>{return n.value.trigger}),a=()=>{var e=p["connectTable"];if(e)return!0;(0,_log.errLog)("vxe.error.barUnableLink")},L=({$event:e})=>{var o=p["connectTable"];o&&(o.triggerCustomEvent?o.triggerCustomEvent(e):(0,_log.errLog)("vxe.error.reqModule",["VxeTableCustomModule"]))},I=({$event:e})=>{var o=p["connectTable"];o?o.customOpenEvent(e):(0,_log.errLog)("vxe.error.reqModule",["VxeTableCustomModule"])},R=({$event:e})=>{var o=p["connectTable"];const t=o;if(t){const r=t.reactData["customStore"];r.activeBtn=!1,setTimeout(()=>{r.activeBtn||r.activeWrapper||t.customCloseEvent(e)},350)}},N=({$event:e})=>{var o=g["isRefresh"],t=O.value;if(!o){o=t.queryMethod||t.query;if(o){g.isRefresh=!0;try{Promise.resolve(o({})).catch(e=>e).then(()=>{g.isRefresh=!1})}catch(e){g.isRefresh=!1}}else f&&(g.isRefresh=!0,f.triggerToolbarCommitEvent({code:t.code||"reload"},e).catch(e=>e).then(()=>{g.isRefresh=!1}))}},$=({$event:e})=>{f&&f.triggerZoomEvent(e)},k=(e,o)=>{var t,r=p["connectTable"],n=o["code"];n&&(f?f.triggerToolbarBtnEvent(o,e):(t=commands.get(n),o={code:n,button:o,$table:r,$grid:f,$event:e},t&&((r=t.tableCommandMethod||t.commandMethod)?r(o):"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notCommands",[n])),_.dispatchEvent("button-click",o,e)))},B=(e,o)=>{var t,r=p["connectTable"],n=o["code"];n&&(f?f.triggerToolbarTolEvent(o,e):(t=commands.get(n),o={code:n,tool:o,$table:r,$grid:f,$event:e},t&&((r=t.tableCommandMethod||t.commandMethod)?r(o):"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notCommands",[n])),_.dispatchEvent("tool-click",o,e)))},M=()=>{var e;a()&&(e=p["connectTable"],e)&&e.openImport()},V=()=>{var e;a()&&(e=p["connectTable"],e)&&e.openExport()},F=()=>{var e;a()&&(e=p["connectTable"],e)&&e.openPrint()};Object.assign(_,{dispatchEvent:(e,o,t)=>{r(e,createEvent(t,{$toolbar:_},o))},syncUpdate(e){p.connectTable=e.$table,g.columns=e.collectColumn,g.connectFlag++}});const S=(e,t)=>{e=e.dropdowns;return e?e.map((o,e)=>!1!==o.visible&&v?(0,_vue.h)(v,{key:e,disabled:o.disabled,loading:o.loading,type:o.type,mode:o.mode,icon:o.icon,circle:o.circle,round:o.round,status:o.status,content:o.name,onClick:({$event:e})=>(t?k:B)(e,o)}):(0,_vue.createCommentVNode)()):[]};return _.renderVN=()=>{var{perfect:e,loading:o,refresh:t,zoom:r,custom:n,className:a}=u,l=p["connectTable"],c=m.value,i=d.tools,s=d.buttons;return(0,_vue.h)("div",{ref:b,class:["vxe-toolbar",a?_xeUtils.default.isFunction(a)?a({$toolbar:_}):a:"",{["size--"+c]:c,"is--perfect":e,"is--loading":o}]},[(0,_vue.h)("div",{class:"vxe-buttons--wrapper"},s?s({$grid:f,$table:l}):(()=>{var e=u["buttons"],o=p["connectTable"];const l=o,c=[];return e&&e.forEach(o=>{var e,t,r,{dropdowns:n,buttonRender:a}=o;!1!==o.visible&&(e=a?renderer.get(a.name):null,a&&e&&e.renderToolbarButton?(t=e.toolbarButtonClassName,r={$grid:f,$table:l,button:o},c.push((0,_vue.h)("span",{class:["vxe-button--item",t?_xeUtils.default.isFunction(t)?t(r):t:""]},(0,_vn.getSlotVNs)(e.renderToolbarButton(a,r))))):v&&c.push((0,_vue.h)(v,{disabled:o.disabled,loading:o.loading,type:o.type,mode:o.mode,icon:o.icon,circle:o.circle,round:o.round,status:o.status,content:o.name,permissionCode:o.permissionCode,destroyOnClose:o.destroyOnClose,placement:o.placement,transfer:o.transfer,onClick:({$event:e})=>k(e,o)},n&&n.length?{dropdowns:()=>S(o,!0)}:{})))}),c})()),(0,_vue.h)("div",{class:"vxe-tools--wrapper"},i?i({$grid:f,$table:l}):(()=>{var e=u["tools"],o=p["connectTable"];const i=o,s=[];return e&&e.forEach((o,e)=>{var t,r,n,a,{dropdowns:l,toolRender:c}=o;!1!==o.visible&&(t=c?c.name:null,r=c?renderer.get(t):null,c&&r&&r.renderToolbarTool?(n=r.toolbarToolClassName,a={$grid:f,$table:i,tool:o},s.push((0,_vue.h)("span",{key:t,class:["vxe-tool--item",n?_xeUtils.default.isFunction(n)?n(a):n:""]},(0,_vn.getSlotVNs)(r.renderToolbarTool(c,a))))):v&&s.push((0,_vue.h)(v,{key:e,disabled:o.disabled,loading:o.loading,type:o.type,mode:o.mode,icon:o.icon,circle:o.circle,round:o.round,status:o.status,content:o.name,destroyOnClose:o.destroyOnClose,placement:o.placement,transfer:o.transfer,onClick:({$event:e})=>B(e,o)},l&&l.length?{dropdowns:()=>S(o,!1)}:{})))}),s})()),(0,_vue.h)("div",{class:"vxe-tools--operate"},[u.import&&(a=h.value,v)?(0,_vue.h)(v,{key:"import",circle:!0,icon:a.icon||getIcon().TOOLBAR_TOOLS_IMPORT,title:getI18n("vxe.toolbar.import"),onClick:M}):(0,_vue.createCommentVNode)(),u.export&&(c=x.value,v)?(0,_vue.h)(v,{key:"export",circle:!0,icon:c.icon||getIcon().TOOLBAR_TOOLS_EXPORT,title:getI18n("vxe.toolbar.export"),onClick:V}):(0,_vue.createCommentVNode)(),u.print&&(e=C.value,v)?(0,_vue.h)(v,{key:"print",circle:!0,icon:e.icon||getIcon().TOOLBAR_TOOLS_PRINT,title:getI18n("vxe.toolbar.print"),onClick:F}):(0,_vue.createCommentVNode)(),t&&(o=O.value,v)?(0,_vue.h)(v,{key:"refresh",circle:!0,icon:g.isRefresh?o.iconLoading||getIcon().TOOLBAR_TOOLS_REFRESH_LOADING:o.icon||getIcon().TOOLBAR_TOOLS_REFRESH,title:getI18n("vxe.toolbar.refresh"),onClick:N}):(0,_vue.createCommentVNode)(),r&&f&&(s=T.value,f)&&v?(0,_vue.h)(v,{key:"zoom",circle:!0,icon:f.isMaximized()?s.iconOut||getIcon().TOOLBAR_TOOLS_MINIMIZE:s.iconIn||getIcon().TOOLBAR_TOOLS_FULLSCREEN,title:getI18n("vxe.toolbar.zoom"+(f.isMaximized()?"Out":"In")),onClick:$}):(0,_vue.createCommentVNode)(),n&&(i=y.value,l=E.value,a={},"manual"!==l&&("hover"===l?(a.onMouseenter=I,a.onMouseleave=R):a.onClick=L),v)?(0,_vue.h)(v,Object.assign({key:"custom",circle:!0,icon:i.icon||getIcon().TOOLBAR_TOOLS_CUSTOM,title:getI18n("vxe.toolbar.custom"),className:"vxe-toolbar-custom-target"},a)):(0,_vue.createCommentVNode)()])])},(0,_vue.nextTick)(()=>{var e=u["refresh"],o=O.value,o=o.queryMethod||o.query,e=(!e||f||o||(0,_log.warnLog)("vxe.error.notFunc",["queryMethod"]),y.value);"development"===process.env.NODE_ENV&&(e.isFooter&&(0,_log.warnLog)("vxe.error.delProp",["toolbar.custom.isFooter","table.custom-config.showFooter"]),e.showFooter&&(0,_log.warnLog)("vxe.error.delProp",["toolbar.custom.showFooter","table.custom-config.showFooter"]),e.immediate&&(0,_log.warnLog)("vxe.error.delProp",["toolbar.custom.immediate","table.custom-config.immediate"]),e.trigger)&&(0,_log.warnLog)("vxe.error.delProp",["toolbar.custom.trigger","table.custom-config.trigger"]),"development"===process.env.NODE_ENV&&(u.refresh||u.import||u.export||u.print||u.zoom)&&!v&&(0,_log.errLog)("vxe.error.reqComp",["vxe-button"])}),_},render(){return this.renderVN()}});

package/lib/ui/index.js

@@ -13,9 +13,9 @@ 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.hooks = 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 = "4.7.76";
+const version = exports.version = "4.7.78";
 _core.VxeUI.version = version;
-_core.VxeUI.tableVersion = "4.7.76";
+_core.VxeUI.tableVersion = "4.7.78";
 _core.VxeUI.setConfig({
   emptyCell: '　',
   table: {

package/lib/ui/index.min.js

@@ -1 +1 @@
-"use strict";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.hooks=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");const version=exports.version="4.7.76",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion="4.7.76",_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{refreshDelay:250},radioConfig:{strict:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single"},columnConfig:{maxFixedSize:4},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}},sortConfig:{showIcon:!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},editConfig:{showIcon:!0,showAsterisk:!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},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},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",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,hooks=exports.hooks=_core.VxeUI.hooks,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;
+"use strict";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.hooks=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");const version=exports.version="4.7.78",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion="4.7.78",_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{refreshDelay:250},radioConfig:{strict:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single"},columnConfig:{maxFixedSize:4},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}},sortConfig:{showIcon:!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},editConfig:{showIcon:!0,showAsterisk:!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},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},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",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,hooks=exports.hooks=_core.VxeUI.hooks,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${"4.7.76"}`;
+const version = `table v${"4.7.78"}`;
 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 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");const log=_core.VxeUI["log"],version="table v4.7.76",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");const log=_core.VxeUI["log"],version="table v4.7.78",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": "4.7.76",
+  "version": "4.7.78",
   "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": "^4.1.17"
+    "vxe-pc-ui": "^4.1.25"
   },
   "devDependencies": {
     "@types/resize-observer-browser": "^0.1.11",

package/packages/grid/src/grid.ts

@@ -10,7 +10,7 @@ import tableComponentEmits from '../../table/src/emits'
 import { getSlotVNs } from '../../ui/src/vn'
 import { errLog } from '../../ui/src/log'
 
-import type { VxePagerComponent, VxeFormComponent, VxeFormEvents, VxeFormInstance, VxePagerEvents, VxeFormItemProps, VxePagerInstance } from 'vxe-pc-ui'
+import type { ValueOf, VxePagerComponent, VxeFormComponent, VxeFormEvents, VxeFormInstance, VxePagerEvents, VxeFormItemProps, VxePagerInstance } from 'vxe-pc-ui'
 import type { VxeTableMethods, VxeGridConstructor, VxeGridEmits, GridReactData, VxeGridPropTypes, VxeToolbarPropTypes, GridMethods, GridPrivateMethods, VxeGridPrivateComputed, VxeGridPrivateMethods, VxeToolbarInstance, GridPrivateRef, VxeTableProps, VxeTableConstructor, VxeTablePrivateMethods, VxeTableEvents, VxeTableDefines, VxeTableEventProps, VxeGridProps } from '../../../types'
 
 const { getConfig, getI18n, commands, hooks, useFns, createEvent, globalEvents, GLOBAL_EVENT_KEYS } = VxeUI
@@ -46,7 +46,10 @@ export default defineComponent({
     toolbarConfig: Object as PropType<VxeGridPropTypes.ToolbarConfig>,
     formConfig: Object as PropType<VxeGridPropTypes.FormConfig>,
     zoomConfig: Object as PropType<VxeGridPropTypes.ZoomConfig>,
-    size: { type: String as PropType<VxeGridPropTypes.Size>, default: () => getConfig().grid.size || getConfig().size }
+    size: {
+      type: String as PropType<VxeGridPropTypes.Size>,
+      default: () => getConfig().grid.size || getConfig().size
+    }
   },
   emits: gridComponentEmits,
   setup (props, context) {
@@ -60,7 +63,7 @@ export default defineComponent({
 
     const { computeSize } = useFns.useSize(props)
 
-    const reactData = reactive({
+    const reactData = reactive<GridReactData>({
       tableLoading: false,
       proxyInited: false,
       isZMax: false,
@@ -74,7 +77,7 @@ export default defineComponent({
         pageSize: getConfig().pager?.pageSize || 10,
         currentPage: 1
       }
-    } as GridReactData<any>)
+    })
 
     const refElem = ref() as Ref<HTMLDivElement>
     const refTable = ref() as Ref<ComponentPublicInstance<VxeTableProps, VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods>>
@@ -155,31 +158,6 @@ export default defineComponent({
       return rest
     })
 
-    const refMaps: GridPrivateRef = {
-      refElem,
-      refTable,
-      refForm,
-      refToolbar,
-      refPager
-    }
-
-    const computeMaps: VxeGridPrivateComputed = {
-      computeProxyOpts,
-      computePagerOpts,
-      computeFormOpts,
-      computeToolbarOpts,
-      computeZoomOpts
-    }
-
-    const $xeGrid = {
-      xID,
-      props: props as VxeGridProps,
-      context,
-      reactData,
-      getRefMaps: () => refMaps,
-      getComputeMaps: () => computeMaps
-    } as VxeGridConstructor & VxeGridPrivateMethods
-
     const computeTableProps = computed(() => {
       const { seqConfig, pagerConfig, loading, editConfig, proxyConfig } = props
       const { isZMax, tableLoading, tablePage, tableData } = reactData
@@ -207,6 +185,39 @@ export default defineComponent({
       return tableProps
     })
 
+    const computeCurrLayout = computed(() => {
+      const { layouts } = props
+      if (layouts && layouts.length) {
+        return layouts
+      }
+      return getConfig().grid.layouts || ['Form', 'Toolbar', 'Top', 'Table', 'Bottom', 'Pager']
+    })
+
+    const refMaps: GridPrivateRef = {
+      refElem,
+      refTable,
+      refForm,
+      refToolbar,
+      refPager
+    }
+
+    const computeMaps: VxeGridPrivateComputed = {
+      computeProxyOpts,
+      computePagerOpts,
+      computeFormOpts,
+      computeToolbarOpts,
+      computeZoomOpts
+    }
+
+    const $xeGrid = {
+      xID,
+      props: props as VxeGridProps,
+      context,
+      reactData,
+      getRefMaps: () => refMaps,
+      getComputeMaps: () => computeMaps
+    } as VxeGridConstructor & VxeGridPrivateMethods
+
     const initToolbar = () => {
       const toolbarOpts = computeToolbarOpts.value
       if (props.toolbarConfig && isEnableConf(toolbarOpts)) {
@@ -644,12 +655,9 @@ export default defineComponent({
       return createCommentVNode()
     }
 
-    const defaultLayouts = ['Form', 'Toolbar', 'Top', 'Table', 'Bottom', 'Pager']
-
     const renderLayout = () => {
-      const { layouts } = props
       const vns: VNode[] = []
-      const currLayouts = (layouts && layouts.length ? layouts : (getConfig().grid.layouts || defaultLayouts))
+      const currLayouts = computeCurrLayout.value
       currLayouts.forEach(name => {
         switch (name) {
           case 'Form':
@@ -731,10 +739,20 @@ export default defineComponent({
       }
     }
 
+    const handleGlobalKeydownEvent = (evnt: any) => {
+      const zoomOpts = computeZoomOpts.value
+      const isEsc = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE)
+      if (isEsc && reactData.isZMax && zoomOpts.escRestore !== false) {
+        gridPrivateMethods.triggerZoomEvent(evnt)
+      }
+    }
+
+    const dispatchEvent = (type: ValueOf<VxeGridEmits>, params: Record<string, any>, evnt: Event | null) => {
+      emit(type, createEvent(evnt, { $grid: $xeGrid }, params))
+    }
+
     const gridMethods: GridMethods = {
-      dispatchEvent (type, params, evnt) {
-        emit(type, createEvent(evnt, { $grid: $xeGrid }, params))
-      },
+      dispatchEvent,
       /**
        * 提交指令，支持 code 或 button
        * @param {String/Object} code 字符串或对象
@@ -1219,14 +1237,6 @@ export default defineComponent({
       initProxy()
     })
 
-    const handleGlobalKeydownEvent = (evnt: any) => {
-      const zoomOpts = computeZoomOpts.value
-      const isEsc = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE)
-      if (isEsc && reactData.isZMax && zoomOpts.escRestore !== false) {
-        gridPrivateMethods.triggerZoomEvent(evnt)
-      }
-    }
-
     hooks.forEach((options) => {
       const { setupGrid } = options
       if (setupGrid) {