vxe-table 3.15.40 → 3.15.42

package/lib/toolbar/src/toolbar.js

@@ -26,11 +26,17 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
   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
@@ -74,32 +80,32 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
     computeRefreshOpts() {
       const $xeToolbar = this;
       const props = $xeToolbar;
-      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);
     },
     computeImportOpts() {
       const $xeToolbar = this;
       const props = $xeToolbar;
-      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);
     },
     computeExportOpts() {
       const $xeToolbar = this;
       const props = $xeToolbar;
-      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);
     },
     computePrintOpts() {
       const $xeToolbar = this;
       const props = $xeToolbar;
-      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);
     },
     computeZoomOpts() {
       const $xeToolbar = this;
       const props = $xeToolbar;
-      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);
     },
     computeCustomOpts() {
       const $xeToolbar = this;
       const props = $xeToolbar;
-      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);
     },
     computeTableCustomOpts() {
       const $xeToolbar = this;
@@ -248,80 +254,37 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
       const $xeGrid = $xeToolbar.$xeGrid;
       if ($xeGrid) {
         $xeGrid.triggerZoomEvent($event);
+      } else {
+        (0, _log.warnLog)('vxe.error.notProp', ['zoom']);
       }
     },
-    btnEvent(evnt, item) {
+    importEvent() {
       const $xeToolbar = this;
       const internalData = $xeToolbar.internalData;
-      const $xeGrid = $xeToolbar.$xeGrid;
-      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);
+      if ($xeToolbar.checkTable()) {
+        const {
+          connectTable
+        } = internalData;
+        const $table = connectTable;
+        if ($table) {
+          $table.importData();
         }
       }
     },
-    tolEvent(evnt, item) {
+    openImportEvent() {
       const $xeToolbar = this;
       const internalData = $xeToolbar.internalData;
-      const $xeGrid = $xeToolbar.$xeGrid;
-      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);
+      if ($xeToolbar.checkTable()) {
+        const {
+          connectTable
+        } = internalData;
+        const $table = connectTable;
+        if ($table) {
+          $table.openImport();
         }
       }
     },
-    importEvent() {
+    exportEvent() {
       const $xeToolbar = this;
       const internalData = $xeToolbar.internalData;
       if ($xeToolbar.checkTable()) {
@@ -330,11 +293,11 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
         } = internalData;
         const $table = connectTable;
         if ($table) {
-          $table.openImport();
+          $table.exportData();
         }
       }
     },
-    exportEvent() {
+    openExportEvent() {
       const $xeToolbar = this;
       const internalData = $xeToolbar.internalData;
       if ($xeToolbar.checkTable()) {
@@ -348,6 +311,19 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
       }
     },
     printEvent() {
+      const $xeToolbar = this;
+      const internalData = $xeToolbar.internalData;
+      if ($xeToolbar.checkTable()) {
+        const {
+          connectTable
+        } = internalData;
+        const $table = connectTable;
+        if ($table) {
+          $table.print();
+        }
+      }
+    },
+    openPrintEvent() {
       const $xeToolbar = this;
       const internalData = $xeToolbar.internalData;
       if ($xeToolbar.checkTable()) {
@@ -360,6 +336,122 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
         }
       }
     },
+    handleDefaultCodeEvent(eventParams, item, cb) {
+      const $xeToolbar = this;
+      switch (item.code) {
+        case 'print':
+          $xeToolbar.printEvent();
+          break;
+        case 'open_print':
+          $xeToolbar.openPrintEvent();
+          break;
+        case 'custom':
+          $xeToolbar.handleClickSettingEvent(eventParams);
+          break;
+        case 'export':
+          $xeToolbar.exportEvent();
+          break;
+        case 'open_export':
+          $xeToolbar.openExportEvent();
+          break;
+        case 'import':
+          $xeToolbar.importEvent();
+          break;
+        case 'open_import':
+          $xeToolbar.openImportEvent();
+          break;
+        case 'zoom':
+          $xeToolbar.zoomEvent(eventParams);
+          break;
+        case 'refresh':
+          $xeToolbar.refreshEvent(eventParams);
+          break;
+        default:
+          cb();
+          break;
+      }
+    },
+    btnEvent(eventParams, item) {
+      const $xeToolbar = this;
+      const internalData = $xeToolbar.internalData;
+      const $xeGrid = $xeToolbar.$xeGrid;
+      const {
+        $event
+      } = eventParams;
+      const {
+        connectTable
+      } = internalData;
+      const $table = connectTable;
+      const {
+        code
+      } = item;
+      if (code) {
+        $xeToolbar.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);
+          }
+        });
+      }
+    },
+    tolEvent(eventParams, item) {
+      const $xeToolbar = this;
+      const internalData = $xeToolbar.internalData;
+      const $xeGrid = $xeToolbar.$xeGrid;
+      const {
+        $event
+      } = eventParams;
+      const {
+        connectTable
+      } = internalData;
+      const $table = connectTable;
+      const {
+        code
+      } = item;
+      if (code) {
+        $xeToolbar.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);
+          }
+        });
+      }
+    },
     //
     // Render
     //
@@ -395,9 +487,7 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
               suffixTooltip: child.suffixTooltip
             },
             on: {
-              click: ({
-                $event
-              }) => isBtn ? $xeToolbar.btnEvent($event, child) : $xeToolbar.tolEvent($event, child)
+              click: eventParams => isBtn ? $xeToolbar.btnEvent(eventParams, child) : $xeToolbar.tolEvent(eventParams, child)
             }
           }) : renderEmptyElement($xeToolbar);
         });
@@ -473,12 +563,10 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
                     transfer: item.transfer
                   },
                   on: {
-                    click: ({
-                      $event
-                    }) => this.btnEvent($event, item)
+                    click: eventParams => $xeToolbar.btnEvent(eventParams, item)
                   },
                   scopedSlots: dropdowns && dropdowns.length ? {
-                    dropdowns: () => this.renderDropdowns(h, item, true)
+                    dropdowns: () => $xeToolbar.renderDropdowns(h, item, true)
                   } : {}
                 }));
               }
@@ -567,9 +655,7 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
                     transfer: item.transfer
                   },
                   on: {
-                    click: ({
-                      $event
-                    }) => $xeToolbar.tolEvent($event, item)
+                    click: eventParams => $xeToolbar.tolEvent(eventParams, item)
                   },
                   scopedSlots: dropdowns && dropdowns.length ? {
                     dropdowns: () => $xeToolbar.renderDropdowns(h, item, false)
@@ -602,7 +688,7 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
           title: getI18n('vxe.toolbar.import')
         },
         on: {
-          click: $xeToolbar.importEvent
+          click: $xeToolbar.openImportEvent
         }
       }) : renderEmptyElement($xeToolbar);
     },
@@ -619,7 +705,7 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
           title: getI18n('vxe.toolbar.export')
         },
         on: {
-          click: $xeToolbar.exportEvent
+          click: $xeToolbar.openExportEvent
         }
       }) : renderEmptyElement($xeToolbar);
     },
@@ -636,7 +722,7 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
           title: getI18n('vxe.toolbar.print')
         },
         on: {
-          click: $xeToolbar.printEvent
+          click: $xeToolbar.openPrintEvent
         }
       }) : renderEmptyElement($xeToolbar);
     },
@@ -754,15 +840,30 @@ var _default = exports.default = /* define-vxe-component start */(0, _comp.defin
     const props = $xeToolbar;
     const $xeGrid = $xeToolbar.$xeGrid;
     $xeToolbar.$nextTick(() => {
-      const {
-        refresh
-      } = props;
       const refreshOpts = $xeToolbar.computeRefreshOpts;
-      const $xeTable = this.fintTable();
+      const $xeTable = $xeToolbar.fintTable();
       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={...}']);
+      }
       if ($xeTable) {
         $xeTable.connect(this);
       }

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_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,globalMixins,renderEmptyElement}=_ui.VxeUI;var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeToolbar",mixins:[globalMixins.sizeMixin],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]},inject:{$xeGrid:{default:null}},data(){return{xID:_xeUtils.default.uniqueId(),reactData:{isRefresh:!1,connectFlag:0,columns:[]},internalData:{connectTable:null}}},computed:Object.assign(Object.assign({},{}),{computeRefreshOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.refresh,!0),this.refresh)},computeImportOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.import,!0),this.import)},computeExportOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.export,!0),this.export)},computePrintOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.print,!0),this.print)},computeZoomOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.zoom,!0),this.zoom)},computeCustomOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.custom,!0),this.custom)},computeTableCustomOpts(){var e=this.reactData,t=this.internalData.connectTable;return(e.connectFlag||t)&&t?t.computeCustomOpts:{trigger:""}},computeTrigger(){return this.computeTableCustomOpts.trigger}}),methods:{dispatchEvent(e,t,o){this.$emit(e,createEvent(o,{$toolbar:this},t))},fintTable(){var e=this.$parent.$children;let o=e.indexOf(this);return _xeUtils.default.find(e,(e,t)=>e&&e.loadData&&t>o&&"vxe-table"===e.$vnode.componentOptions.tag)},syncUpdate(e){var t=this.reactData;this.internalData.connectTable=e.$table,t.columns=e.collectColumn,t.connectFlag++},checkTable(){var e=this.internalData.connectTable;if(e)return!0;(0,_log.errLog)("vxe.error.barUnableLink")},handleClickSettingEvent({$event:e}){var t=this.internalData.connectTable;t&&t.triggerCustomEvent&&t.triggerCustomEvent(e)},handleMouseenterSettingEvent({$event:e}){var t=this.internalData.connectTable;t&&t.customOpenEvent(e)},handleMouseleaveSettingEvent({$event:t}){var e=this.internalData.connectTable;let o=e;if(o){let e=o.reactData.customStore;e.activeBtn=!1,setTimeout(()=>{e.activeBtn||e.activeWrapper||o.customCloseEvent(t)},350)}},refreshEvent({$event:e}){let t=this.reactData;var o=this.$xeGrid,r=t.isRefresh,n=this.computeRefreshOpts;if(!r){r=n.queryMethod||n.query;if(r){t.isRefresh=!0;try{Promise.resolve(r({})).catch(e=>e).then(()=>{t.isRefresh=!1})}catch(e){t.isRefresh=!1}}else o&&(t.isRefresh=!0,o.triggerToolbarCommitEvent({code:n.code||"reload"},e).catch(e=>e).then(()=>{t.isRefresh=!1}))}},zoomEvent({$event:e}){var t=this.$xeGrid;t&&t.triggerZoomEvent(e)},btnEvent(e,t){var o=this.internalData,r=this.$xeGrid,o=o.connectTable,n=t.code;n&&(r?r.triggerToolbarBtnEvent(t,e):(t={code:n,button:t,$table:o,$grid:r,$event:e},(o=commands.get(n))&&((r=o.tableCommandMethod||o.commandMethod)?r(t):(0,_log.errLog)("vxe.error.notCommands",[n])),this.dispatchEvent("button-click",t,e)))},tolEvent(e,t){var o=this.internalData,r=this.$xeGrid,o=o.connectTable,n=t.code;n&&(r?r.triggerToolbarTolEvent(t,e):(t={code:n,button:null,tool:t,$table:o,$grid:r,$event:e},(o=commands.get(n))&&((r=o.tableCommandMethod||o.commandMethod)?r(t):(0,_log.errLog)("vxe.error.notCommands",[n])),this.dispatchEvent("tool-click",t,e)))},importEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.openImport()},exportEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.openExport()},printEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.openPrint()},renderDropdowns(o,e,r){let n=_ui.VxeUI.getComponent("VxeButton"),i=this;e=e.dropdowns;return e?e.map((t,e)=>!1!==t.visible&&n?o(n,{key:e,props:{disabled:t.disabled,loading:t.loading,type:t.type,mode:t.mode,icon:t.icon,circle:t.circle,round:t.round,status:t.status,content:t.name,title:t.title,routerLink:t.routerLink,permissionCode:t.permissionCode,prefixTooltip:t.prefixTooltip,suffixTooltip:t.suffixTooltip},on:{click:({$event:e})=>r?i.btnEvent(e,t):i.tolEvent(e,t)}}):renderEmptyElement(i)):[]},renderLeftBtns(l){let s=_ui.VxeUI.getComponent("VxeButton");var e=this,t=e.$scopedSlots;let a=e.$xeGrid;var o=e.buttons,r=e.internalData.connectTable;let c=r;r=t.buttonPrefix||t["button-prefix"],t=t.buttonSuffix||t["button-suffix"];let p=[];return r&&p.push(...(0,_vn.getSlotVNs)(r.call(e,{buttons:o||[],$grid:a,$table:c}))),o&&o.forEach(t=>{var e,o,r,{dropdowns:n,buttonRender:i}=t;!1!==t.visible&&(e=i?renderer.get(i.name):null,i&&e&&e.renderToolbarButton?(o=e.toolbarButtonClassName,r={$grid:a,$table:c,button:t},p.push(l("span",{class:["vxe-button--item",o?_xeUtils.default.isFunction(o)?o(r):o:""]},(0,_vn.getSlotVNs)(e.renderToolbarButton(l,i,r))))):s&&p.push(l(s,{props:{disabled:t.disabled,loading:t.loading,type:t.type,mode:t.mode,icon:t.icon,circle:t.circle,round:t.round,status:t.status,content:t.name,title:t.title,routerLink:t.routerLink,permissionCode:t.permissionCode,prefixTooltip:t.prefixTooltip,suffixTooltip:t.suffixTooltip,destroyOnClose:t.destroyOnClose,placement:t.placement,transfer:t.transfer},on:{click:({$event:e})=>this.btnEvent(e,t)},scopedSlots:n&&n.length?{dropdowns:()=>this.renderDropdowns(l,t,!0)}:{}})))}),t&&p.push(...(0,_vn.getSlotVNs)(t.call(e,{buttons:o||[],$grid:a,$table:c}))),p},renderRightTools(a){let c=_ui.VxeUI.getComponent("VxeButton"),p=this;var e=p,t=p.$scopedSlots,o=p.internalData;let u=p.$xeGrid;e=e.tools,o=o.connectTable;let d=o;o=t.toolPrefix||t["tool-prefix"],t=t.toolSuffix||t["tool-suffix"];let m=[];return o&&m.push(...(0,_vn.getSlotVNs)(o.call(p,{tools:e||[],$grid:u,$table:d}))),e&&e.forEach((t,e)=>{var o,r,n,i,{dropdowns:l,toolRender:s}=t;!1!==t.visible&&(o=s?s.name:null,r=s?renderer.get(o):null,s&&r&&r.renderToolbarTool?(n=r.toolbarToolClassName,i={$grid:u,$table:d,tool:t},m.push(a("span",{key:o,class:["vxe-tool--item",n?_xeUtils.default.isFunction(n)?n(i):n:""]},(0,_vn.getSlotVNs)(r.renderToolbarTool(a,s,i))))):c&&m.push(a(c,{key:e,props:{disabled:t.disabled,loading:t.loading,type:t.type,mode:t.mode,icon:t.icon,circle:t.circle,round:t.round,status:t.status,content:t.name,title:t.title,routerLink:t.routerLink,permissionCode:t.permissionCode,prefixTooltip:t.prefixTooltip,suffixTooltip:t.suffixTooltip,destroyOnClose:t.destroyOnClose,placement:t.placement,transfer:t.transfer},on:{click:({$event:e})=>p.tolEvent(e,t)},scopedSlots:l&&l.length?{dropdowns:()=>p.renderDropdowns(a,t,!1)}:{}})))}),t&&m.push(...(0,_vn.getSlotVNs)(t.call(p,{tools:e||[],$grid:u,$table:d}))),m},renderToolImport(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.computeImportOpts;return t?e(t,{key:"import",props:{circle:!0,icon:o.icon||getIcon().TOOLBAR_TOOLS_IMPORT,title:getI18n("vxe.toolbar.import")},on:{click:this.importEvent}}):renderEmptyElement(this)},renderToolExport(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.computeExportOpts;return t?e(t,{key:"export",props:{circle:!0,icon:o.icon||getIcon().TOOLBAR_TOOLS_EXPORT,title:getI18n("vxe.toolbar.export")},on:{click:this.exportEvent}}):renderEmptyElement(this)},renderToolPrint(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.computePrintOpts;return t?e(t,{key:"print",props:{circle:!0,icon:o.icon||getIcon().TOOLBAR_TOOLS_PRINT,title:getI18n("vxe.toolbar.print")},on:{click:this.printEvent}}):renderEmptyElement(this)},renderToolRefresh(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.reactData,r=this.computeRefreshOpts;return t?e(t,{key:"refresh",props:{circle:!0,icon:o.isRefresh?r.iconLoading||getIcon().TOOLBAR_TOOLS_REFRESH_LOADING:r.icon||getIcon().TOOLBAR_TOOLS_REFRESH,title:getI18n("vxe.toolbar.refresh")},on:{click:this.refreshEvent}}):renderEmptyElement(this)},renderToolZoom(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.$xeGrid,r=this.computeZoomOpts;return o&&t?e(t,{key:"zoom",props:{circle:!0,icon:o.isMaximized()?r.iconOut||getIcon().TOOLBAR_TOOLS_MINIMIZE:r.iconIn||getIcon().TOOLBAR_TOOLS_FULLSCREEN,title:getI18n("vxe.toolbar.zoom"+(o.isMaximized()?"Out":"In"))},on:{click:this.zoomEvent}}):renderEmptyElement(this)},renderToolCustom(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this,r=o.computeCustomOpts,n=o.computeTrigger,i={};return"manual"!==n&&("hover"===n?(i.mouseenter=o.handleMouseenterSettingEvent,i.mouseleave=o.handleMouseleaveSettingEvent):i.click=o.handleClickSettingEvent),t?e(t,{key:"custom",props:{circle:!0,icon:r.icon||getIcon().TOOLBAR_TOOLS_CUSTOM,title:getI18n("vxe.toolbar.custom"),className:"vxe-toolbar-custom-target"},on:i}):renderEmptyElement(o)},renderVN(e){var t=this,o=t,r=t.$scopedSlots,n=t.$xeGrid,{perfect:i,loading:l,refresh:s,zoom:a,custom:c,className:p}=o,u=t.internalData.connectTable,d=r.tools,r=r.buttons,m=t.computeSize;return e("div",{ref:"refElem",class:["vxe-toolbar",p?_xeUtils.default.isFunction(p)?p({$toolbar:t}):p:"",{["size--"+m]:m,"is--perfect":i,"is--loading":l}]},[e("div",{class:"vxe-buttons--wrapper"},r?r({$grid:n,$table:u}):t.renderLeftBtns(e)),e("div",{class:"vxe-tools--wrapper"},d?d({$grid:n,$table:u}):t.renderRightTools(e)),e("div",{class:"vxe-tools--operate"},[o.import?t.renderToolImport(e):renderEmptyElement(t),o.export?t.renderToolExport(e):renderEmptyElement(t),o.print?t.renderToolPrint(e):renderEmptyElement(t),s?t.renderToolRefresh(e):renderEmptyElement(t),a&&n?t.renderToolZoom(e):renderEmptyElement(t),c?t.renderToolCustom(e):renderEmptyElement(t)])])}},created(){let r=this,n=r,i=r.$xeGrid;r.$nextTick(()=>{var e=n.refresh,t=r.computeRefreshOpts,o=this.fintTable(),t=t.queryMethod||t.query,e=(!e||i||t||(0,_log.warnLog)("vxe.error.notFunc",["queryMethod"]),o&&o.connect(this),r.computeCustomOpts);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"])});var e=_ui.VxeUI.getComponent("VxeButton");(n.refresh||n.import||n.export||n.print||n.zoom)&&!e&&(0,_log.errLog)("vxe.error.reqComp",["vxe-button"])},render(e){return this.renderVN(e)}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_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,globalMixins,renderEmptyElement}=_ui.VxeUI;var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeToolbar",mixins:[globalMixins.sizeMixin],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]},inject:{$xeGrid:{default:null}},data(){return{xID:_xeUtils.default.uniqueId(),reactData:{isRefresh:!1,connectFlag:0,columns:[]},internalData:{connectTable:null}}},computed:Object.assign(Object.assign({},{}),{computeRefreshOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.refresh,!0),this.refreshOptions,this.refresh)},computeImportOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.import,!0),this.importOptions,this.import)},computeExportOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.export,!0),this.exportOptions,this.export)},computePrintOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.print,!0),this.printOptions,this.print)},computeZoomOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.zoom,!0),this.zoomOptions,this.zoom)},computeCustomOpts(){return Object.assign({},_xeUtils.default.clone(getConfig().toolbar.custom,!0),this.customOptions,this.custom)},computeTableCustomOpts(){var e=this.reactData,t=this.internalData.connectTable;return(e.connectFlag||t)&&t?t.computeCustomOpts:{trigger:""}},computeTrigger(){return this.computeTableCustomOpts.trigger}}),methods:{dispatchEvent(e,t,o){this.$emit(e,createEvent(o,{$toolbar:this},t))},fintTable(){var e=this.$parent.$children;let o=e.indexOf(this);return _xeUtils.default.find(e,(e,t)=>e&&e.loadData&&t>o&&"vxe-table"===e.$vnode.componentOptions.tag)},syncUpdate(e){var t=this.reactData;this.internalData.connectTable=e.$table,t.columns=e.collectColumn,t.connectFlag++},checkTable(){var e=this.internalData.connectTable;if(e)return!0;(0,_log.errLog)("vxe.error.barUnableLink")},handleClickSettingEvent({$event:e}){var t=this.internalData.connectTable;t&&t.triggerCustomEvent&&t.triggerCustomEvent(e)},handleMouseenterSettingEvent({$event:e}){var t=this.internalData.connectTable;t&&t.customOpenEvent(e)},handleMouseleaveSettingEvent({$event:t}){var e=this.internalData.connectTable;let o=e;if(o){let e=o.reactData.customStore;e.activeBtn=!1,setTimeout(()=>{e.activeBtn||e.activeWrapper||o.customCloseEvent(t)},350)}},refreshEvent({$event:e}){let t=this.reactData;var o=this.$xeGrid,r=t.isRefresh,n=this.computeRefreshOpts;if(!r){r=n.queryMethod||n.query;if(r){t.isRefresh=!0;try{Promise.resolve(r({})).catch(e=>e).then(()=>{t.isRefresh=!1})}catch(e){t.isRefresh=!1}}else o&&(t.isRefresh=!0,o.triggerToolbarCommitEvent({code:n.code||"reload"},e).catch(e=>e).then(()=>{t.isRefresh=!1}))}},zoomEvent({$event:e}){var t=this.$xeGrid;t?t.triggerZoomEvent(e):(0,_log.warnLog)("vxe.error.notProp",["zoom"])},importEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.importData()},openImportEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.openImport()},exportEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.exportData()},openExportEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.openExport()},printEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.print()},openPrintEvent(){var e=this.internalData;this.checkTable()&&(e=e.connectTable,e)&&e.openPrint()},handleDefaultCodeEvent(e,t,o){var r=this;switch(t.code){case"print":r.printEvent();break;case"open_print":r.openPrintEvent();break;case"custom":r.handleClickSettingEvent(e);break;case"export":r.exportEvent();break;case"open_export":r.openExportEvent();break;case"import":r.importEvent();break;case"open_import":r.openImportEvent();break;case"zoom":r.zoomEvent(e);break;case"refresh":r.refreshEvent(e);break;default:o()}},btnEvent(e,o){let r=this;var t=r.internalData;let n=r.$xeGrid,i=e.$event;t=t.connectTable;let l=t,s=o.code;s&&r.handleDefaultCodeEvent(e,o,()=>{var e,t;n?n.triggerToolbarBtnEvent(o,i):(t=commands.get(s),e={code:s,button:o,$table:l,$grid:n,$event:i},t&&((t=t.tableCommandMethod||t.commandMethod)?t(e):(0,_log.errLog)("vxe.error.notCommands",[s])),r.dispatchEvent("button-click",e,i))})},tolEvent(e,o){let r=this;var t=r.internalData;let n=r.$xeGrid,i=e.$event;t=t.connectTable;let l=t,s=o.code;s&&r.handleDefaultCodeEvent(e,o,()=>{var e,t;n?n.triggerToolbarTolEvent(o,i):(t=commands.get(s),e={code:s,button:null,tool:o,$table:l,$grid:n,$event:i},t&&((t=t.tableCommandMethod||t.commandMethod)?t(e):(0,_log.errLog)("vxe.error.notCommands",[s])),r.dispatchEvent("tool-click",e,i))})},renderDropdowns(o,e,r){let n=_ui.VxeUI.getComponent("VxeButton"),i=this;e=e.dropdowns;return e?e.map((t,e)=>!1!==t.visible&&n?o(n,{key:e,props:{disabled:t.disabled,loading:t.loading,type:t.type,mode:t.mode,icon:t.icon,circle:t.circle,round:t.round,status:t.status,content:t.name,title:t.title,routerLink:t.routerLink,permissionCode:t.permissionCode,prefixTooltip:t.prefixTooltip,suffixTooltip:t.suffixTooltip},on:{click:e=>r?i.btnEvent(e,t):i.tolEvent(e,t)}}):renderEmptyElement(i)):[]},renderLeftBtns(l){let s=_ui.VxeUI.getComponent("VxeButton"),a=this;var e=a,t=a.$scopedSlots,o=a.internalData;let c=a.$xeGrid;e=e.buttons,o=o.connectTable;let p=o;o=t.buttonPrefix||t["button-prefix"],t=t.buttonSuffix||t["button-suffix"];let u=[];return o&&u.push(...(0,_vn.getSlotVNs)(o.call(a,{buttons:e||[],$grid:c,$table:p}))),e&&e.forEach(t=>{var e,o,r,{dropdowns:n,buttonRender:i}=t;!1!==t.visible&&(e=i?renderer.get(i.name):null,i&&e&&e.renderToolbarButton?(o=e.toolbarButtonClassName,r={$grid:c,$table:p,button:t},u.push(l("span",{class:["vxe-button--item",o?_xeUtils.default.isFunction(o)?o(r):o:""]},(0,_vn.getSlotVNs)(e.renderToolbarButton(l,i,r))))):s&&u.push(l(s,{props:{disabled:t.disabled,loading:t.loading,type:t.type,mode:t.mode,icon:t.icon,circle:t.circle,round:t.round,status:t.status,content:t.name,title:t.title,routerLink:t.routerLink,permissionCode:t.permissionCode,prefixTooltip:t.prefixTooltip,suffixTooltip:t.suffixTooltip,destroyOnClose:t.destroyOnClose,placement:t.placement,transfer:t.transfer},on:{click:e=>a.btnEvent(e,t)},scopedSlots:n&&n.length?{dropdowns:()=>a.renderDropdowns(l,t,!0)}:{}})))}),t&&u.push(...(0,_vn.getSlotVNs)(t.call(a,{buttons:e||[],$grid:c,$table:p}))),u},renderRightTools(a){let c=_ui.VxeUI.getComponent("VxeButton"),p=this;var e=p,t=p.$scopedSlots,o=p.internalData;let u=p.$xeGrid;e=e.tools,o=o.connectTable;let d=o;o=t.toolPrefix||t["tool-prefix"],t=t.toolSuffix||t["tool-suffix"];let m=[];return o&&m.push(...(0,_vn.getSlotVNs)(o.call(p,{tools:e||[],$grid:u,$table:d}))),e&&e.forEach((t,e)=>{var o,r,n,i,{dropdowns:l,toolRender:s}=t;!1!==t.visible&&(o=s?s.name:null,r=s?renderer.get(o):null,s&&r&&r.renderToolbarTool?(n=r.toolbarToolClassName,i={$grid:u,$table:d,tool:t},m.push(a("span",{key:o,class:["vxe-tool--item",n?_xeUtils.default.isFunction(n)?n(i):n:""]},(0,_vn.getSlotVNs)(r.renderToolbarTool(a,s,i))))):c&&m.push(a(c,{key:e,props:{disabled:t.disabled,loading:t.loading,type:t.type,mode:t.mode,icon:t.icon,circle:t.circle,round:t.round,status:t.status,content:t.name,title:t.title,routerLink:t.routerLink,permissionCode:t.permissionCode,prefixTooltip:t.prefixTooltip,suffixTooltip:t.suffixTooltip,destroyOnClose:t.destroyOnClose,placement:t.placement,transfer:t.transfer},on:{click:e=>p.tolEvent(e,t)},scopedSlots:l&&l.length?{dropdowns:()=>p.renderDropdowns(a,t,!1)}:{}})))}),t&&m.push(...(0,_vn.getSlotVNs)(t.call(p,{tools:e||[],$grid:u,$table:d}))),m},renderToolImport(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.computeImportOpts;return t?e(t,{key:"import",props:{circle:!0,icon:o.icon||getIcon().TOOLBAR_TOOLS_IMPORT,title:getI18n("vxe.toolbar.import")},on:{click:this.openImportEvent}}):renderEmptyElement(this)},renderToolExport(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.computeExportOpts;return t?e(t,{key:"export",props:{circle:!0,icon:o.icon||getIcon().TOOLBAR_TOOLS_EXPORT,title:getI18n("vxe.toolbar.export")},on:{click:this.openExportEvent}}):renderEmptyElement(this)},renderToolPrint(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.computePrintOpts;return t?e(t,{key:"print",props:{circle:!0,icon:o.icon||getIcon().TOOLBAR_TOOLS_PRINT,title:getI18n("vxe.toolbar.print")},on:{click:this.openPrintEvent}}):renderEmptyElement(this)},renderToolRefresh(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.reactData,r=this.computeRefreshOpts;return t?e(t,{key:"refresh",props:{circle:!0,icon:o.isRefresh?r.iconLoading||getIcon().TOOLBAR_TOOLS_REFRESH_LOADING:r.icon||getIcon().TOOLBAR_TOOLS_REFRESH,title:getI18n("vxe.toolbar.refresh")},on:{click:this.refreshEvent}}):renderEmptyElement(this)},renderToolZoom(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this.$xeGrid,r=this.computeZoomOpts;return o&&t?e(t,{key:"zoom",props:{circle:!0,icon:o.isMaximized()?r.iconOut||getIcon().TOOLBAR_TOOLS_MINIMIZE:r.iconIn||getIcon().TOOLBAR_TOOLS_FULLSCREEN,title:getI18n("vxe.toolbar.zoom"+(o.isMaximized()?"Out":"In"))},on:{click:this.zoomEvent}}):renderEmptyElement(this)},renderToolCustom(e){var t=_ui.VxeUI.getComponent("VxeButton"),o=this,r=o.computeCustomOpts,n=o.computeTrigger,i={};return"manual"!==n&&("hover"===n?(i.mouseenter=o.handleMouseenterSettingEvent,i.mouseleave=o.handleMouseleaveSettingEvent):i.click=o.handleClickSettingEvent),t?e(t,{key:"custom",props:{circle:!0,icon:r.icon||getIcon().TOOLBAR_TOOLS_CUSTOM,title:getI18n("vxe.toolbar.custom"),className:"vxe-toolbar-custom-target"},on:i}):renderEmptyElement(o)},renderVN(e){var t=this,o=t,r=t.$scopedSlots,n=t.$xeGrid,{perfect:i,loading:l,refresh:s,zoom:a,custom:c,className:p}=o,u=t.internalData.connectTable,d=r.tools,r=r.buttons,m=t.computeSize;return e("div",{ref:"refElem",class:["vxe-toolbar",p?_xeUtils.default.isFunction(p)?p({$toolbar:t}):p:"",{["size--"+m]:m,"is--perfect":i,"is--loading":l}]},[e("div",{class:"vxe-buttons--wrapper"},r?r({$grid:n,$table:u}):t.renderLeftBtns(e)),e("div",{class:"vxe-tools--wrapper"},d?d({$grid:n,$table:u}):t.renderRightTools(e)),e("div",{class:"vxe-tools--operate"},[o.import?t.renderToolImport(e):renderEmptyElement(t),o.export?t.renderToolExport(e):renderEmptyElement(t),o.print?t.renderToolPrint(e):renderEmptyElement(t),s?t.renderToolRefresh(e):renderEmptyElement(t),a&&n?t.renderToolZoom(e):renderEmptyElement(t),c?t.renderToolCustom(e):renderEmptyElement(t)])])}},created(){let o=this,r=o,n=o.$xeGrid;o.$nextTick(()=>{var e=o.computeRefreshOpts,t=o.fintTable(),e=e.queryMethod||e.query,e=(!r.refresh||n||e||(0,_log.warnLog)("vxe.error.notFunc",["queryMethod"]),_xeUtils.default.isPlainObject(r.custom)&&(0,_log.warnLog)("vxe.error.delProp",["custom={...}","custom=boolean & custom-options={...}"]),_xeUtils.default.isPlainObject(r.print)&&(0,_log.warnLog)("vxe.error.delProp",["print={...}","print=boolean & print-options={...}"]),_xeUtils.default.isPlainObject(r.export)&&(0,_log.warnLog)("vxe.error.delProp",["export={...}","export=boolean & export-options={...}"]),_xeUtils.default.isPlainObject(r.import)&&(0,_log.warnLog)("vxe.error.delProp",["import={...}","import=boolean & import-options={...}"]),_xeUtils.default.isPlainObject(r.refresh)&&(0,_log.warnLog)("vxe.error.delProp",["refresh={...}","refresh=boolean & refresh-options={...}"]),_xeUtils.default.isPlainObject(r.refresh)&&(0,_log.warnLog)("vxe.error.delProp",["zoom={...}","zoom=boolean & zoom-options={...}"]),t&&t.connect(this),o.computeCustomOpts);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"])});var e=_ui.VxeUI.getComponent("VxeButton");(r.refresh||r.import||r.export||r.print||r.zoom)&&!e&&(0,_log.errLog)("vxe.error.reqComp",["vxe-button"])},render(e){return this.renderVN(e)}});

package/lib/ui/index.js

@@ -13,7 +13,7 @@ Object.defineProperty(exports, "VxeUI", {
 exports.version = exports.validators = exports.use = exports.t = exports.setup = exports.setTheme = exports.setLanguage = exports.setIcon = exports.setI18n = exports.setConfig = exports.saveFile = exports.renderer = exports.readFile = exports.print = exports.modal = exports.menus = exports.log = exports.interceptor = exports.globalResize = exports.globalEvents = exports.getTheme = exports.getIcon = exports.getI18n = exports.getConfig = exports.formats = exports.default = exports.config = exports.commands = exports.clipboard = exports._t = void 0;
 var _core = require("@vxe-ui/core");
 var _utils = require("./src/utils");
-const version = exports.version = "3.15.39";
+const version = exports.version = "3.15.42";
 _core.VxeUI.version = version;
 _core.VxeUI.tableVersion = version;
 _core.VxeUI.setConfig({
@@ -108,6 +108,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.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="3.15.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,padding:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0},drawerOptions:{mask:!0,lockView:!0,escClosable:!0,resize:!0}},sortConfig:{showIcon:!0,allowClear:!0,allowBtn:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},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:0,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,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="3.15.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,padding:!0,minHeight:144,resizeConfig:{},resizableConfig:{dragMode:"auto",showDragTip:!0,isSyncAutoHeight:!0,isSyncAutoWidth:!0,minHeight:18},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},columnDragConfig:{showIcon:!0,animation:!0,showGuidesStatus:!0,showDragTip:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"beautify"},columnConfig:{maxFixedSize:4},cellConfig:{padding:!0},headerCellConfig:{height:"unset"},footerCellConfig:{height:"unset"},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",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:0,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,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;

package/lib/ui/src/log.js

@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
 const {
   log
 } = _core.VxeUI;
-const version = `table v${"3.15.39"}`;
+const version = `table v${"3.15.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 v3.15.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 v3.15.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": "3.15.40",
+  "version": "3.15.42",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、拖拽排序，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/table/src/methods.ts

@@ -9205,8 +9205,10 @@ const Methods = {
     }
     internalData.rowGroupExpandedMaps = rgExpandedMaps
     handleVirtualTreeToList($xeTable)
+    $xeTable.handleTableData()
+    updateAfterDataIndex($xeTable)
     reactData.rowGroupExpandedFlag++
-    return $xeTable.handleTableData()
+    return $xeTable.recalculate(true)
   },
   clearRowGroupExpand () {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
@@ -9215,8 +9217,10 @@ const Methods = {
 
     internalData.rowGroupExpandedMaps = {}
     handleVirtualTreeToList($xeTable)
+    $xeTable.handleTableData()
+    updateAfterDataIndex($xeTable)
     reactData.rowGroupExpandedFlag++
-    return $xeTable.handleTableData()
+    return $xeTable.recalculate(true)
   },
   getTreeExpandRecords () {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods