vxe-table 4.13.40 → 4.13.42

package/lib/toolbar/src/toolbar.js

@@ -25,11 +25,17 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
   props: {
     loading: Boolean,
     refresh: [Boolean, Object],
+    refreshOptions: Object,
     import: [Boolean, Object],
+    importOptions: Object,
     export: [Boolean, Object],
+    exportOptions: Object,
     print: [Boolean, Object],
+    printOptions: Object,
     zoom: [Boolean, Object],
+    zoomOptions: Object,
     custom: [Boolean, Object],
+    customOptions: Object,
     buttons: {
       type: Array,
       default: () => getConfig().toolbar.buttons
@@ -83,22 +89,22 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
     let toolbarMethods = {};
     const $xeGrid = (0, _vue.inject)('$xeGrid', null);
     const computeRefreshOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().toolbar.refresh, true), props.refresh);
+      return Object.assign({}, _xeUtils.default.clone(getConfig().toolbar.refresh, true), props.refreshOptions, props.refresh);
     });
     const computeImportOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().toolbar.import, true), props.import);
+      return Object.assign({}, _xeUtils.default.clone(getConfig().toolbar.import, true), props.importOptions, props.import);
     });
     const computeExportOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().toolbar.export, true), props.export);
+      return Object.assign({}, _xeUtils.default.clone(getConfig().toolbar.export, true), props.exportOptions, props.export);
     });
     const computePrintOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().toolbar.print, true), props.print);
+      return Object.assign({}, _xeUtils.default.clone(getConfig().toolbar.print, true), props.printOptions, props.print);
     });
     const computeZoomOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().toolbar.zoom, true), props.zoom);
+      return Object.assign({}, _xeUtils.default.clone(getConfig().toolbar.zoom, true), props.zoomOptions, props.zoom);
     });
     const computeCustomOpts = (0, _vue.computed)(() => {
-      return Object.assign({}, _xeUtils.default.clone(getConfig().toolbar.custom, true), props.custom);
+      return Object.assign({}, _xeUtils.default.clone(getConfig().toolbar.custom, true), props.customOptions, props.custom);
     });
     const computeTableCustomOpts = (0, _vue.computed)(() => {
       const {
@@ -207,85 +213,44 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
     }) => {
       if ($xeGrid) {
         $xeGrid.triggerZoomEvent($event);
+      } else {
+        (0, _log.warnLog)('vxe.error.notProp', ['zoom']);
       }
     };
-    const btnEvent = (evnt, item) => {
-      const {
-        connectTable
-      } = internalData;
-      const $table = connectTable;
-      const {
-        code
-      } = item;
-      if (code) {
-        if ($xeGrid) {
-          $xeGrid.triggerToolbarBtnEvent(item, evnt);
-        } else {
-          const gCommandOpts = commands.get(code);
-          const params = {
-            code,
-            button: item,
-            $table: $table,
-            $grid: $xeGrid,
-            $event: evnt
-          };
-          if (gCommandOpts) {
-            const tCommandMethod = gCommandOpts.tableCommandMethod || gCommandOpts.commandMethod;
-            if (tCommandMethod) {
-              tCommandMethod(params);
-            } else {
-              (0, _log.errLog)('vxe.error.notCommands', [code]);
-            }
-          }
-          $xeToolbar.dispatchEvent('button-click', params, evnt);
+    const importEvent = () => {
+      if (checkTable()) {
+        const {
+          connectTable
+        } = internalData;
+        const $table = connectTable;
+        if ($table) {
+          $table.importData();
         }
       }
     };
-    const tolEvent = (evnt, item) => {
-      const {
-        connectTable
-      } = internalData;
-      const $table = connectTable;
-      const {
-        code
-      } = item;
-      if (code) {
-        if ($xeGrid) {
-          $xeGrid.triggerToolbarTolEvent(item, evnt);
-        } else {
-          const gCommandOpts = commands.get(code);
-          const params = {
-            code,
-            button: null,
-            tool: item,
-            $table: $table,
-            $grid: $xeGrid,
-            $event: evnt
-          };
-          if (gCommandOpts) {
-            const tCommandMethod = gCommandOpts.tableCommandMethod || gCommandOpts.commandMethod;
-            if (tCommandMethod) {
-              tCommandMethod(params);
-            } else {
-              (0, _log.errLog)('vxe.error.notCommands', [code]);
-            }
-          }
-          $xeToolbar.dispatchEvent('tool-click', params, evnt);
+    const openImportEvent = () => {
+      if (checkTable()) {
+        const {
+          connectTable
+        } = internalData;
+        const $table = connectTable;
+        if ($table) {
+          $table.openImport();
         }
       }
     };
-    const importEvent = () => {
+    const exportEvent = () => {
       if (checkTable()) {
         const {
           connectTable
         } = internalData;
         const $table = connectTable;
         if ($table) {
-          $table.openImport();
+          $table.exportData();
         }
       }
     };
-    const exportEvent = () => {
+    const openExportEvent = () => {
       if (checkTable()) {
         const {
           connectTable
@@ -297,6 +262,17 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       }
     };
     const printEvent = () => {
+      if (checkTable()) {
+        const {
+          connectTable
+        } = internalData;
+        const $table = connectTable;
+        if ($table) {
+          $table.print();
+        }
+      }
+    };
+    const openPrintEvent = () => {
       if (checkTable()) {
         const {
           connectTable
@@ -307,6 +283,115 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         }
       }
     };
+    const handleDefaultCodeEvent = (eventParams, item, cb) => {
+      switch (item.code) {
+        case 'print':
+          printEvent();
+          break;
+        case 'open_print':
+          openPrintEvent();
+          break;
+        case 'custom':
+          handleClickSettingEvent(eventParams);
+          break;
+        case 'export':
+          exportEvent();
+          break;
+        case 'open_export':
+          openExportEvent();
+          break;
+        case 'import':
+          importEvent();
+          break;
+        case 'open_import':
+          openImportEvent();
+          break;
+        case 'zoom':
+          zoomEvent(eventParams);
+          break;
+        case 'refresh':
+          refreshEvent(eventParams);
+          break;
+        default:
+          cb();
+          break;
+      }
+    };
+    const btnEvent = (eventParams, item) => {
+      const {
+        $event
+      } = eventParams;
+      const {
+        connectTable
+      } = internalData;
+      const $table = connectTable;
+      const {
+        code
+      } = item;
+      if (code) {
+        handleDefaultCodeEvent(eventParams, item, () => {
+          if ($xeGrid) {
+            $xeGrid.triggerToolbarBtnEvent(item, $event);
+          } else {
+            const gCommandOpts = commands.get(code);
+            const params = {
+              code,
+              button: item,
+              $table: $table,
+              $grid: $xeGrid,
+              $event
+            };
+            if (gCommandOpts) {
+              const tCommandMethod = gCommandOpts.tableCommandMethod || gCommandOpts.commandMethod;
+              if (tCommandMethod) {
+                tCommandMethod(params);
+              } else {
+                (0, _log.errLog)('vxe.error.notCommands', [code]);
+              }
+            }
+            $xeToolbar.dispatchEvent('button-click', params, $event);
+          }
+        });
+      }
+    };
+    const tolEvent = (eventParams, item) => {
+      const {
+        $event
+      } = eventParams;
+      const {
+        connectTable
+      } = internalData;
+      const $table = connectTable;
+      const {
+        code
+      } = item;
+      if (code) {
+        handleDefaultCodeEvent(eventParams, item, () => {
+          if ($xeGrid) {
+            $xeGrid.triggerToolbarTolEvent(item, $event);
+          } else {
+            const gCommandOpts = commands.get(code);
+            const params = {
+              code,
+              button: null,
+              tool: item,
+              $table: $table,
+              $grid: $xeGrid,
+              $event
+            };
+            if (gCommandOpts) {
+              const tCommandMethod = gCommandOpts.tableCommandMethod || gCommandOpts.commandMethod;
+              if (tCommandMethod) {
+                tCommandMethod(params);
+              } else {
+                (0, _log.errLog)('vxe.error.notCommands', [code]);
+              }
+            }
+            $xeToolbar.dispatchEvent('tool-click', params, $event);
+          }
+        });
+      }
+    };
     const dispatchEvent = (type, params, evnt) => {
       emit(type, createEvent(evnt, {
         $toolbar: $xeToolbar
@@ -347,9 +432,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
             permissionCode: child.permissionCode,
             prefixTooltip: child.prefixTooltip,
             suffixTooltip: child.suffixTooltip,
-            onClick: ({
-              $event
-            }) => isBtn ? btnEvent($event, child) : tolEvent($event, child)
+            onClick: eventParams => isBtn ? btnEvent(eventParams, child) : tolEvent(eventParams, child)
           }) : (0, _vue.createCommentVNode)();
         });
       }
@@ -416,9 +499,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                   destroyOnClose: item.destroyOnClose,
                   placement: item.placement,
                   transfer: item.transfer,
-                  onClick: ({
-                    $event
-                  }) => btnEvent($event, item)
+                  onClick: eventParams => btnEvent(eventParams, item)
                 }, dropdowns && dropdowns.length ? {
                   dropdowns: () => renderDropdowns(item, true)
                 } : {}));
@@ -498,9 +579,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
                   destroyOnClose: item.destroyOnClose,
                   placement: item.placement,
                   transfer: item.transfer,
-                  onClick: ({
-                    $event
-                  }) => tolEvent($event, item)
+                  onClick: eventParams => tolEvent(eventParams, item)
                 }, dropdowns && dropdowns.length ? {
                   dropdowns: () => renderDropdowns(item, false)
                 } : {}));
@@ -525,7 +604,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         circle: true,
         icon: importOpts.icon || getIcon().TOOLBAR_TOOLS_IMPORT,
         title: getI18n('vxe.toolbar.import'),
-        onClick: importEvent
+        onClick: openImportEvent
       }) : (0, _vue.createCommentVNode)();
     };
     const renderToolExport = () => {
@@ -535,7 +614,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         circle: true,
         icon: exportOpts.icon || getIcon().TOOLBAR_TOOLS_EXPORT,
         title: getI18n('vxe.toolbar.export'),
-        onClick: exportEvent
+        onClick: openExportEvent
       }) : (0, _vue.createCommentVNode)();
     };
     const renderToolPrint = () => {
@@ -545,7 +624,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         circle: true,
         icon: printOpts.icon || getIcon().TOOLBAR_TOOLS_PRINT,
         title: getI18n('vxe.toolbar.print'),
-        onClick: printEvent
+        onClick: openPrintEvent
       }) : (0, _vue.createCommentVNode)();
     };
     const renderToolRefresh = () => {
@@ -631,14 +710,29 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
     };
     $xeToolbar.renderVN = renderVN;
     (0, _vue.nextTick)(() => {
-      const {
-        refresh
-      } = props;
       const refreshOpts = computeRefreshOpts.value;
       const queryMethod = refreshOpts.queryMethod || refreshOpts.query;
-      if (refresh && !$xeGrid && !queryMethod) {
+      if (props.refresh && !$xeGrid && !queryMethod) {
         (0, _log.warnLog)('vxe.error.notFunc', ['queryMethod']);
       }
+      if (_xeUtils.default.isPlainObject(props.custom)) {
+        (0, _log.warnLog)('vxe.error.delProp', ['custom={...}', 'custom=boolean & custom-options={...}']);
+      }
+      if (_xeUtils.default.isPlainObject(props.print)) {
+        (0, _log.warnLog)('vxe.error.delProp', ['print={...}', 'print=boolean & print-options={...}']);
+      }
+      if (_xeUtils.default.isPlainObject(props.export)) {
+        (0, _log.warnLog)('vxe.error.delProp', ['export={...}', 'export=boolean & export-options={...}']);
+      }
+      if (_xeUtils.default.isPlainObject(props.import)) {
+        (0, _log.warnLog)('vxe.error.delProp', ['import={...}', 'import=boolean & import-options={...}']);
+      }
+      if (_xeUtils.default.isPlainObject(props.refresh)) {
+        (0, _log.warnLog)('vxe.error.delProp', ['refresh={...}', 'refresh=boolean & refresh-options={...}']);
+      }
+      if (_xeUtils.default.isPlainObject(props.refresh)) {
+        (0, _log.warnLog)('vxe.error.delProp', ['zoom={...}', 'zoom=boolean & zoom-options={...}']);
+      }
       const customOpts = computeCustomOpts.value;
       if (customOpts.isFooter) {
         (0, _log.warnLog)('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);

package/lib/toolbar/src/toolbar.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_comp=require("../../ui/src/comp"),_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}}let{getConfig,getIcon,getI18n,renderer,commands,createEvent,useFns}=_ui.VxeUI;var _default=exports.default=(0,_comp.defineVxeComponent)({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){let{slots:d,emit:r}=e;var o=_xeUtils.default.uniqueId();let v=_ui.VxeUI.getComponent("VxeButton"),g=useFns.useSize(u).computeSize,m=(0,_vue.reactive)({isRefresh:!1,connectFlag:0,columns:[]}),p={connectTable:null},b=(0,_vue.ref)(),t={refElem:b},f={xID:o,props:u,context:e,reactData:m,internalData:p,getRefMaps:()=>t};let _=(0,_vue.inject)("$xeGrid",null),x=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.refresh,!0),u.refresh)),h=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.import,!0),u.import)),T=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.export,!0),u.export)),O=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.print,!0),u.print)),C=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.zoom,!0),u.zoom)),L=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.custom,!0),u.custom)),n=(0,_vue.computed)(()=>{var e=p.connectTable;if((m.connectFlag||e)&&e)return e=e.getComputeMaps().computeCustomOpts,e.value;return{trigger:""}}),y=(0,_vue.computed)(()=>n.value.trigger),l=()=>{var e=p.connectTable;if(e)return!0;(0,_log.errLog)("vxe.error.barUnableLink")},$=({$event:e})=>{var o=p.connectTable;o&&o.triggerCustomEvent&&o.triggerCustomEvent(e)},k=({$event:e})=>{var o=p.connectTable;o&&o.customOpenEvent(e)},I=({$event:o})=>{var e=p.connectTable;let t=e;if(t){let e=t.reactData.customStore;e.activeBtn=!1,setTimeout(()=>{e.activeBtn||e.activeWrapper||t.customCloseEvent(o)},350)}},R=({$event:e})=>{var o=m.isRefresh,t=x.value;if(!o){o=t.queryMethod||t.query;if(o){m.isRefresh=!0;try{Promise.resolve(o({})).catch(e=>e).then(()=>{m.isRefresh=!1})}catch(e){m.isRefresh=!1}}else _&&(m.isRefresh=!0,_.triggerToolbarCommitEvent({code:t.code||"reload"},e).catch(e=>e).then(()=>{m.isRefresh=!1}))}},E=({$event:e})=>{_&&_.triggerZoomEvent(e)},S=(e,o)=>{var t,r=p.connectTable,n=o.code;n&&(_?_.triggerToolbarBtnEvent(o,e):(t=commands.get(n),o={code:n,button:o,$table:r,$grid:_,$event:e},t&&((r=t.tableCommandMethod||t.commandMethod)?r(o):(0,_log.errLog)("vxe.error.notCommands",[n])),f.dispatchEvent("button-click",o,e)))},N=(e,o)=>{var t,r=p.connectTable,n=o.code;n&&(_?_.triggerToolbarTolEvent(o,e):(t=commands.get(n),o={code:n,button:null,tool:o,$table:r,$grid:_,$event:e},t&&((r=t.tableCommandMethod||t.commandMethod)?r(o):(0,_log.errLog)("vxe.error.notCommands",[n])),f.dispatchEvent("tool-click",o,e)))},B=()=>{var e;l()&&(e=p.connectTable,e)&&e.openImport()},V=()=>{var e;l()&&(e=p.connectTable,e)&&e.openExport()},F=()=>{var e;l()&&(e=p.connectTable,e)&&e.openPrint()};Object.assign(f,{dispatchEvent:(e,o,t)=>{r(e,createEvent(t,{$toolbar:f},o))},syncUpdate(e){p.connectTable=e.$table,m.columns=e.collectColumn,m.connectFlag++}});let M=(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,title:o.title,routerLink:o.routerLink,permissionCode:o.permissionCode,prefixTooltip:o.prefixTooltip,suffixTooltip:o.suffixTooltip,onClick:({$event:e})=>(t?S:N)(e,o)}):(0,_vue.createCommentVNode)()):[]};return f.renderVN=()=>{var{perfect:e,loading:o,refresh:t,zoom:r,custom:n,className:l}=u,i=p.connectTable,a=g.value,s=d.tools,c=d.buttons;return(0,_vue.h)("div",{ref:b,class:["vxe-toolbar",l?_xeUtils.default.isFunction(l)?l({$toolbar:f}):l:"",{["size--"+a]:a,"is--perfect":e,"is--loading":o}]},[(0,_vue.h)("div",{class:"vxe-buttons--wrapper"},c?c({$grid:_,$table:i}):(()=>{var e=u.buttons,o=p.connectTable;let a=o;var o=d.buttonPrefix||d["button-prefix"],t=d.buttonSuffix||d["button-suffix"];let s=[];return o&&s.push(...(0,_vn.getSlotVNs)(o({buttons:e||[],$grid:_,$table:a}))),e&&e.forEach((o,e)=>{var t,r,n,{dropdowns:l,buttonRender:i}=o;!1!==o.visible&&(t=i?renderer.get(i.name):null,i&&t&&t.renderToolbarButton?(r=t.toolbarButtonClassName,n={$grid:_,$table:a,button:o},s.push((0,_vue.h)("span",{key:"br"+(o.code||e),class:["vxe-button--item",r?_xeUtils.default.isFunction(r)?r(n):r:""]},(0,_vn.getSlotVNs)(t.renderToolbarButton(i,n))))):v&&s.push((0,_vue.h)(v,{key:"bd"+(o.code||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,title:o.title,routerLink:o.routerLink,permissionCode:o.permissionCode,prefixTooltip:o.prefixTooltip,suffixTooltip:o.suffixTooltip,destroyOnClose:o.destroyOnClose,placement:o.placement,transfer:o.transfer,onClick:({$event:e})=>S(e,o)},l&&l.length?{dropdowns:()=>M(o,!0)}:{})))}),t&&s.push(...(0,_vn.getSlotVNs)(t({buttons:e||[],$grid:_,$table:a}))),s})()),(0,_vue.h)("div",{class:"vxe-tools--wrapper"},s?s({$grid:_,$table:i}):(()=>{var e=u.tools,o=p.connectTable;let s=o;var o=d.toolPrefix||d["tool-prefix"],t=d.toolSuffix||d["tool-suffix"];let c=[];return o&&c.push(...(0,_vn.getSlotVNs)(o({tools:e||[],$grid:_,$table:s}))),e&&e.forEach((o,e)=>{var t,r,n,l,{dropdowns:i,toolRender:a}=o;!1!==o.visible&&(t=a?a.name:null,r=a?renderer.get(t):null,a&&r&&r.renderToolbarTool?(n=r.toolbarToolClassName,l={$grid:_,$table:s,tool:o},c.push((0,_vue.h)("span",{key:t,class:["vxe-tool--item",n?_xeUtils.default.isFunction(n)?n(l):n:""]},(0,_vn.getSlotVNs)(r.renderToolbarTool(a,l))))):v&&c.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,title:o.title,routerLink:o.routerLink,permissionCode:o.permissionCode,prefixTooltip:o.prefixTooltip,suffixTooltip:o.suffixTooltip,destroyOnClose:o.destroyOnClose,placement:o.placement,transfer:o.transfer,onClick:({$event:e})=>N(e,o)},i&&i.length?{dropdowns:()=>M(o,!1)}:{})))}),t&&c.push(...(0,_vn.getSlotVNs)(t({tools:e||[],$grid:_,$table:s}))),c})()),(0,_vue.h)("div",{class:"vxe-tools--operate"},[u.import&&(l=h.value,v)?(0,_vue.h)(v,{key:"import",circle:!0,icon:l.icon||getIcon().TOOLBAR_TOOLS_IMPORT,title:getI18n("vxe.toolbar.import"),onClick:B}):(0,_vue.createCommentVNode)(),u.export&&(a=T.value,v)?(0,_vue.h)(v,{key:"export",circle:!0,icon:a.icon||getIcon().TOOLBAR_TOOLS_EXPORT,title:getI18n("vxe.toolbar.export"),onClick:V}):(0,_vue.createCommentVNode)(),u.print&&(e=O.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=x.value,v)?(0,_vue.h)(v,{key:"refresh",circle:!0,icon:m.isRefresh?o.iconLoading||getIcon().TOOLBAR_TOOLS_REFRESH_LOADING:o.icon||getIcon().TOOLBAR_TOOLS_REFRESH,title:getI18n("vxe.toolbar.refresh"),onClick:R}):(0,_vue.createCommentVNode)(),r&&_&&(c=C.value,_)&&v?(0,_vue.h)(v,{key:"zoom",circle:!0,icon:_.isMaximized()?c.iconOut||getIcon().TOOLBAR_TOOLS_MINIMIZE:c.iconIn||getIcon().TOOLBAR_TOOLS_FULLSCREEN,title:getI18n("vxe.toolbar.zoom"+(_.isMaximized()?"Out":"In")),onClick:E}):(0,_vue.createCommentVNode)(),n&&(s=L.value,i=y.value,l={},"manual"!==i&&("hover"===i?(l.onMouseenter=k,l.onMouseleave=I):l.onClick=$),v)?(0,_vue.h)(v,Object.assign({key:"custom",circle:!0,icon:s.icon||getIcon().TOOLBAR_TOOLS_CUSTOM,title:getI18n("vxe.toolbar.custom"),className:"vxe-toolbar-custom-target"},l)):(0,_vue.createCommentVNode)()])])},(0,_vue.nextTick)(()=>{var e=u.refresh,o=x.value,o=o.queryMethod||o.query,e=(!e||_||o||(0,_log.warnLog)("vxe.error.notFunc",["queryMethod"]),L.value);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"]),(u.refresh||u.import||u.export||u.print||u.zoom)&&!v&&(0,_log.errLog)("vxe.error.reqComp",["vxe-button"])}),f},render(){return this.renderVN()}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_comp=require("../../ui/src/comp"),_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}}let{getConfig,getIcon,getI18n,renderer,commands,createEvent,useFns}=_ui.VxeUI;var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeToolbar",props:{loading:Boolean,refresh:[Boolean,Object],refreshOptions:Object,import:[Boolean,Object],importOptions:Object,export:[Boolean,Object],exportOptions:Object,print:[Boolean,Object],printOptions:Object,zoom:[Boolean,Object],zoomOptions:Object,custom:[Boolean,Object],customOptions: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){let{slots:p,emit:r}=e;var o=_xeUtils.default.uniqueId();let d=_ui.VxeUI.getComponent("VxeButton"),m=useFns.useSize(u).computeSize,v=(0,_vue.reactive)({isRefresh:!1,connectFlag:0,columns:[]}),g={connectTable:null},b=(0,_vue.ref)(),t={refElem:b},f={xID:o,props:u,context:e,reactData:v,internalData:g,getRefMaps:()=>t};let _=(0,_vue.inject)("$xeGrid",null),x=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.refresh,!0),u.refreshOptions,u.refresh)),O=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.import,!0),u.importOptions,u.import)),h=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.export,!0),u.exportOptions,u.export)),T=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.print,!0),u.printOptions,u.print)),C=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.zoom,!0),u.zoomOptions,u.zoom)),L=(0,_vue.computed)(()=>Object.assign({},_xeUtils.default.clone(getConfig().toolbar.custom,!0),u.customOptions,u.custom)),n=(0,_vue.computed)(()=>{var e=g.connectTable;if((v.connectFlag||e)&&e)return e=e.getComputeMaps().computeCustomOpts,e.value;return{trigger:""}}),k=(0,_vue.computed)(()=>n.value.trigger),i=()=>{var e=g.connectTable;if(e)return!0;(0,_log.errLog)("vxe.error.barUnableLink")},y=({$event:e})=>{var o=g.connectTable;o&&o.triggerCustomEvent&&o.triggerCustomEvent(e)},$=({$event:e})=>{var o=g.connectTable;o&&o.customOpenEvent(e)},I=({$event:o})=>{var e=g.connectTable;let t=e;if(t){let e=t.reactData.customStore;e.activeBtn=!1,setTimeout(()=>{e.activeBtn||e.activeWrapper||t.customCloseEvent(o)},350)}},R=({$event:e})=>{var o=v.isRefresh,t=x.value;if(!o){o=t.queryMethod||t.query;if(o){v.isRefresh=!0;try{Promise.resolve(o({})).catch(e=>e).then(()=>{v.isRefresh=!1})}catch(e){v.isRefresh=!1}}else _&&(v.isRefresh=!0,_.triggerToolbarCommitEvent({code:t.code||"reload"},e).catch(e=>e).then(()=>{v.isRefresh=!1}))}},j=({$event:e})=>{_?_.triggerZoomEvent(e):(0,_log.warnLog)("vxe.error.notProp",["zoom"])},l=()=>{var e;i()&&(e=g.connectTable,e)&&e.importData()},E=()=>{var e;i()&&(e=g.connectTable,e)&&e.openImport()},a=()=>{var e;i()&&(e=g.connectTable,e)&&e.exportData()},P=()=>{var e;i()&&(e=g.connectTable,e)&&e.openExport()},c=()=>{var e;i()&&(e=g.connectTable,e)&&e.print()},S=()=>{var e;i()&&(e=g.connectTable,e)&&e.openPrint()},s=(e,o,t)=>{switch(o.code){case"print":c();break;case"open_print":S();break;case"custom":y(e);break;case"export":a();break;case"open_export":P();break;case"import":l();break;case"open_import":E();break;case"zoom":j(e);break;case"refresh":R(e);break;default:t()}},w=(e,t)=>{let r=e.$event;var o=g.connectTable;let n=o,i=t.code;i&&s(e,t,()=>{var e,o;_?_.triggerToolbarBtnEvent(t,r):(o=commands.get(i),e={code:i,button:t,$table:n,$grid:_,$event:r},o&&((o=o.tableCommandMethod||o.commandMethod)?o(e):(0,_log.errLog)("vxe.error.notCommands",[i])),f.dispatchEvent("button-click",e,r))})},N=(e,t)=>{let r=e.$event;var o=g.connectTable;let n=o,i=t.code;i&&s(e,t,()=>{var e,o;_?_.triggerToolbarTolEvent(t,r):(o=commands.get(i),e={code:i,button:null,tool:t,$table:n,$grid:_,$event:r},o&&((o=o.tableCommandMethod||o.commandMethod)?o(e):(0,_log.errLog)("vxe.error.notCommands",[i])),f.dispatchEvent("tool-click",e,r))})};Object.assign(f,{dispatchEvent:(e,o,t)=>{r(e,createEvent(t,{$toolbar:f},o))},syncUpdate(e){g.connectTable=e.$table,v.columns=e.collectColumn,v.connectFlag++}});let B=(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,title:o.title,routerLink:o.routerLink,permissionCode:o.permissionCode,prefixTooltip:o.prefixTooltip,suffixTooltip:o.suffixTooltip,onClick:e=>(t?w:N)(e,o)}):(0,_vue.createCommentVNode)()):[]};return f.renderVN=()=>{var{perfect:e,loading:o,refresh:t,zoom:r,custom:n,className:i}=u,l=g.connectTable,a=m.value,s=p.tools,c=p.buttons;return(0,_vue.h)("div",{ref:b,class:["vxe-toolbar",i?_xeUtils.default.isFunction(i)?i({$toolbar:f}):i:"",{["size--"+a]:a,"is--perfect":e,"is--loading":o}]},[(0,_vue.h)("div",{class:"vxe-buttons--wrapper"},c?c({$grid:_,$table:l}):(()=>{var e=u.buttons,o=g.connectTable;let a=o;var o=p.buttonPrefix||p["button-prefix"],t=p.buttonSuffix||p["button-suffix"];let s=[];return o&&s.push(...(0,_vn.getSlotVNs)(o({buttons:e||[],$grid:_,$table:a}))),e&&e.forEach((o,e)=>{var t,r,n,{dropdowns:i,buttonRender:l}=o;!1!==o.visible&&(t=l?renderer.get(l.name):null,l&&t&&t.renderToolbarButton?(r=t.toolbarButtonClassName,n={$grid:_,$table:a,button:o},s.push((0,_vue.h)("span",{key:"br"+(o.code||e),class:["vxe-button--item",r?_xeUtils.default.isFunction(r)?r(n):r:""]},(0,_vn.getSlotVNs)(t.renderToolbarButton(l,n))))):d&&s.push((0,_vue.h)(d,{key:"bd"+(o.code||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,title:o.title,routerLink:o.routerLink,permissionCode:o.permissionCode,prefixTooltip:o.prefixTooltip,suffixTooltip:o.suffixTooltip,destroyOnClose:o.destroyOnClose,placement:o.placement,transfer:o.transfer,onClick:e=>w(e,o)},i&&i.length?{dropdowns:()=>B(o,!0)}:{})))}),t&&s.push(...(0,_vn.getSlotVNs)(t({buttons:e||[],$grid:_,$table:a}))),s})()),(0,_vue.h)("div",{class:"vxe-tools--wrapper"},s?s({$grid:_,$table:l}):(()=>{var e=u.tools,o=g.connectTable;let s=o;var o=p.toolPrefix||p["tool-prefix"],t=p.toolSuffix||p["tool-suffix"];let c=[];return o&&c.push(...(0,_vn.getSlotVNs)(o({tools:e||[],$grid:_,$table:s}))),e&&e.forEach((o,e)=>{var t,r,n,i,{dropdowns:l,toolRender:a}=o;!1!==o.visible&&(t=a?a.name:null,r=a?renderer.get(t):null,a&&r&&r.renderToolbarTool?(n=r.toolbarToolClassName,i={$grid:_,$table:s,tool:o},c.push((0,_vue.h)("span",{key:t,class:["vxe-tool--item",n?_xeUtils.default.isFunction(n)?n(i):n:""]},(0,_vn.getSlotVNs)(r.renderToolbarTool(a,i))))):d&&c.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,title:o.title,routerLink:o.routerLink,permissionCode:o.permissionCode,prefixTooltip:o.prefixTooltip,suffixTooltip:o.suffixTooltip,destroyOnClose:o.destroyOnClose,placement:o.placement,transfer:o.transfer,onClick:e=>N(e,o)},l&&l.length?{dropdowns:()=>B(o,!1)}:{})))}),t&&c.push(...(0,_vn.getSlotVNs)(t({tools:e||[],$grid:_,$table:s}))),c})()),(0,_vue.h)("div",{class:"vxe-tools--operate"},[u.import&&(i=O.value,d)?(0,_vue.h)(d,{key:"import",circle:!0,icon:i.icon||getIcon().TOOLBAR_TOOLS_IMPORT,title:getI18n("vxe.toolbar.import"),onClick:E}):(0,_vue.createCommentVNode)(),u.export&&(a=h.value,d)?(0,_vue.h)(d,{key:"export",circle:!0,icon:a.icon||getIcon().TOOLBAR_TOOLS_EXPORT,title:getI18n("vxe.toolbar.export"),onClick:P}):(0,_vue.createCommentVNode)(),u.print&&(e=T.value,d)?(0,_vue.h)(d,{key:"print",circle:!0,icon:e.icon||getIcon().TOOLBAR_TOOLS_PRINT,title:getI18n("vxe.toolbar.print"),onClick:S}):(0,_vue.createCommentVNode)(),t&&(o=x.value,d)?(0,_vue.h)(d,{key:"refresh",circle:!0,icon:v.isRefresh?o.iconLoading||getIcon().TOOLBAR_TOOLS_REFRESH_LOADING:o.icon||getIcon().TOOLBAR_TOOLS_REFRESH,title:getI18n("vxe.toolbar.refresh"),onClick:R}):(0,_vue.createCommentVNode)(),r&&_&&(c=C.value,_)&&d?(0,_vue.h)(d,{key:"zoom",circle:!0,icon:_.isMaximized()?c.iconOut||getIcon().TOOLBAR_TOOLS_MINIMIZE:c.iconIn||getIcon().TOOLBAR_TOOLS_FULLSCREEN,title:getI18n("vxe.toolbar.zoom"+(_.isMaximized()?"Out":"In")),onClick:j}):(0,_vue.createCommentVNode)(),n&&(s=L.value,l=k.value,i={},"manual"!==l&&("hover"===l?(i.onMouseenter=$,i.onMouseleave=I):i.onClick=y),d)?(0,_vue.h)(d,Object.assign({key:"custom",circle:!0,icon:s.icon||getIcon().TOOLBAR_TOOLS_CUSTOM,title:getI18n("vxe.toolbar.custom"),className:"vxe-toolbar-custom-target"},i)):(0,_vue.createCommentVNode)()])])},(0,_vue.nextTick)(()=>{var e=x.value,e=e.queryMethod||e.query,e=(!u.refresh||_||e||(0,_log.warnLog)("vxe.error.notFunc",["queryMethod"]),_xeUtils.default.isPlainObject(u.custom)&&(0,_log.warnLog)("vxe.error.delProp",["custom={...}","custom=boolean & custom-options={...}"]),_xeUtils.default.isPlainObject(u.print)&&(0,_log.warnLog)("vxe.error.delProp",["print={...}","print=boolean & print-options={...}"]),_xeUtils.default.isPlainObject(u.export)&&(0,_log.warnLog)("vxe.error.delProp",["export={...}","export=boolean & export-options={...}"]),_xeUtils.default.isPlainObject(u.import)&&(0,_log.warnLog)("vxe.error.delProp",["import={...}","import=boolean & import-options={...}"]),_xeUtils.default.isPlainObject(u.refresh)&&(0,_log.warnLog)("vxe.error.delProp",["refresh={...}","refresh=boolean & refresh-options={...}"]),_xeUtils.default.isPlainObject(u.refresh)&&(0,_log.warnLog)("vxe.error.delProp",["zoom={...}","zoom=boolean & zoom-options={...}"]),L.value);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"]),(u.refresh||u.import||u.export||u.print||u.zoom)&&!d&&(0,_log.errLog)("vxe.error.reqComp",["vxe-button"])}),f},render(){return this.renderVN()}});

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.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.13.39";
+const version = exports.version = "4.13.42";
 _core.VxeUI.version = version;
 _core.VxeUI.tableVersion = version;
 _core.VxeUI.setConfig({
@@ -107,6 +107,14 @@ _core.VxeUI.setConfig({
       showFooter: true,
       placement: 'top-right',
       //  storage: false,
+      storeOptions: {
+        visible: true,
+        resizable: true,
+        sort: true,
+        fixed: true
+        // rowGroup: false,
+        // aggFunc: false
+      },
       //  checkMethod () {},
       modalOptions: {
         showMaximize: true,

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.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");let version=exports.version="4.13.39",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!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},aggregateConfig:{padding:!0,rowField:"id",parentField:"_X_ROW_PARENT_KEY",childrenField:"_X_ROW_CHILDREN",mapChildrenField:"_X_ROW_CHILD_LIST",indent:20,showIcon:!0},treeConfig:{padding:!0,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:{isAll:!0,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:{gt:24,preSize:1,oSize:0},virtualYConfig:{gt:100,preSize:1,oSize:0},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",TABLE_ROW_GROUP_OPEN:iconPrefix+"arrow-right rotate90",TABLE_ROW_GROUP_CLOSE:iconPrefix+"arrow-right",TABLE_AGGREGATION_GROUPING:iconPrefix+"grouping",TABLE_AGGREGATION_VALUES:iconPrefix+"values",TABLE_AGGREGATION_DELETE:iconPrefix+"close",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;
+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");let version=exports.version="4.13.42",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!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",storeOptions:{visible:!0,resizable:!0,sort:!0,fixed:!0},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},aggregateConfig:{padding:!0,rowField:"id",parentField:"_X_ROW_PARENT_KEY",childrenField:"_X_ROW_CHILDREN",mapChildrenField:"_X_ROW_CHILD_LIST",indent:20,showIcon:!0},treeConfig:{padding:!0,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:{isAll:!0,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:{gt:24,preSize:1,oSize:0},virtualYConfig:{gt:100,preSize:1,oSize:0},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",TABLE_ROW_GROUP_OPEN:iconPrefix+"arrow-right rotate90",TABLE_ROW_GROUP_CLOSE:iconPrefix+"arrow-right",TABLE_AGGREGATION_GROUPING:iconPrefix+"grouping",TABLE_AGGREGATION_VALUES:iconPrefix+"values",TABLE_AGGREGATION_DELETE:iconPrefix+"close",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.13.39"}`;
+const version = `table v${"4.13.42"}`;
 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 v4.13.39",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 v4.13.42",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.13.40",
+  "version": "4.13.42",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、拖拽排序，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/table/src/table.ts

@@ -6287,14 +6287,18 @@ export default defineVxeComponent({
         }
         internalData.rowGroupExpandedMaps = rgExpandedMaps
         handleVirtualTreeToList()
+        $xeTable.handleTableData()
+        updateAfterDataIndex()
         reactData.rowGroupExpandedFlag++
-        return $xeTable.handleTableData()
+        return $xeTable.recalculate(true)
       },
       clearRowGroupExpand () {
         internalData.rowGroupExpandedMaps = {}
         handleVirtualTreeToList()
+        $xeTable.handleTableData()
+        updateAfterDataIndex()
         reactData.rowGroupExpandedFlag++
-        return $xeTable.handleTableData()
+        return $xeTable.recalculate(true)
       },
       getTreeExpandRecords () {
         const rest: any[] = []