vxe-table 3.15.40 → 3.15.42

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.39";
+const version = "3.15.42";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2097,6 +2097,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,
@@ -2650,7 +2658,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.39"}`;
+const log_version = `table v${"3.15.42"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3902,20 +3910,6 @@ const Cell = {
       aggFunc
     } = column;
     const renderOpts = editRender || cellRender;
-    if (slots && slots.default) {
-      return renderCellBaseVNs(h, params, $table.callSlot(slots.default, params, h));
-    }
-    if (renderOpts) {
-      const compConf = cell_renderer.get(renderOpts.name);
-      const rtDefault = compConf ? compConf.renderTableDefault || compConf.renderDefault : null;
-      const rtCell = compConf ? compConf.renderTableCell || compConf.renderCell : null;
-      const renderFn = editRender ? rtCell : rtDefault;
-      if (renderFn) {
-        return renderCellBaseVNs(h, params, getSlotVNs(renderFn.call($table, h, renderOpts, Object.assign({
-          $type: editRender ? 'edit' : 'cell'
-        }, params))));
-      }
-    }
     let cellValue = '';
     if (isRowGroupStatus && field && row.isAggregate) {
       const aggRow = row;
@@ -3969,6 +3963,20 @@ const Cell = {
         }
       }
     } else {
+      if (slots && slots.default) {
+        return renderCellBaseVNs(h, params, $table.callSlot(slots.default, params, h));
+      }
+      if (renderOpts) {
+        const compConf = cell_renderer.get(renderOpts.name);
+        const rtDefault = compConf ? compConf.renderTableDefault || compConf.renderDefault : null;
+        const rtCell = compConf ? compConf.renderTableCell || compConf.renderCell : null;
+        const renderFn = editRender ? rtCell : rtDefault;
+        if (renderFn) {
+          return renderCellBaseVNs(h, params, getSlotVNs(renderFn.call($table, h, renderOpts, Object.assign({
+            $type: editRender ? 'edit' : 'cell'
+          }, params))));
+        }
+      }
       cellValue = $table.getCellLabel(row, column);
     }
     const cellPlaceholder = editRender ? editRender.placeholder : '';
@@ -15596,8 +15604,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;
@@ -15605,8 +15615,10 @@ const Methods = {
     const internalData = $xeTable;
     internalData.rowGroupExpandedMaps = {};
     handleVirtualTreeToList($xeTable);
+    $xeTable.handleTableData();
+    updateAfterDataIndex($xeTable);
     reactData.rowGroupExpandedFlag++;
-    return $xeTable.handleTableData();
+    return $xeTable.recalculate(true);
   },
   getTreeExpandRecords() {
     const $xeTable = this;
@@ -29435,11 +29447,17 @@ const {
   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: () => toolbar_getConfig().toolbar.buttons
@@ -29484,32 +29502,32 @@ const {
     computeRefreshOpts() {
       const $xeToolbar = this;
       const props = $xeToolbar;
-      return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(toolbar_getConfig().toolbar.refresh, true), props.refresh);
+      return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(toolbar_getConfig().toolbar.refresh, true), props.refreshOptions, props.refresh);
     },
     computeImportOpts() {
       const $xeToolbar = this;
       const props = $xeToolbar;
-      return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(toolbar_getConfig().toolbar.import, true), props.import);
+      return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(toolbar_getConfig().toolbar.import, true), props.importOptions, props.import);
     },
     computeExportOpts() {
       const $xeToolbar = this;
       const props = $xeToolbar;
-      return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(toolbar_getConfig().toolbar.export, true), props.export);
+      return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(toolbar_getConfig().toolbar.export, true), props.exportOptions, props.export);
     },
     computePrintOpts() {
       const $xeToolbar = this;
       const props = $xeToolbar;
-      return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(toolbar_getConfig().toolbar.print, true), props.print);
+      return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(toolbar_getConfig().toolbar.print, true), props.printOptions, props.print);
     },
     computeZoomOpts() {
       const $xeToolbar = this;
       const props = $xeToolbar;
-      return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(toolbar_getConfig().toolbar.zoom, true), props.zoom);
+      return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(toolbar_getConfig().toolbar.zoom, true), props.zoomOptions, props.zoom);
     },
     computeCustomOpts() {
       const $xeToolbar = this;
       const props = $xeToolbar;
-      return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(toolbar_getConfig().toolbar.custom, true), props.custom);
+      return Object.assign({}, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(toolbar_getConfig().toolbar.custom, true), props.customOptions, props.custom);
     },
     computeTableCustomOpts() {
       const $xeToolbar = this;
@@ -29658,80 +29676,37 @@ const {
       const $xeGrid = $xeToolbar.$xeGrid;
       if ($xeGrid) {
         $xeGrid.triggerZoomEvent($event);
+      } else {
+        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 = toolbar_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 {
-              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 = toolbar_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 {
-              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()) {
@@ -29740,11 +29715,11 @@ const {
         } = internalData;
         const $table = connectTable;
         if ($table) {
-          $table.openImport();
+          $table.exportData();
         }
       }
     },
-    exportEvent() {
+    openExportEvent() {
       const $xeToolbar = this;
       const internalData = $xeToolbar.internalData;
       if ($xeToolbar.checkTable()) {
@@ -29758,6 +29733,19 @@ const {
       }
     },
     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()) {
@@ -29770,6 +29758,122 @@ const {
         }
       }
     },
+    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 = toolbar_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 {
+                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 = toolbar_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 {
+                errLog('vxe.error.notCommands', [code]);
+              }
+            }
+            $xeToolbar.dispatchEvent('tool-click', params, $event);
+          }
+        });
+      }
+    },
     //
     // Render
     //
@@ -29805,9 +29909,7 @@ const {
               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)
             }
           }) : toolbar_renderEmptyElement($xeToolbar);
         });
@@ -29883,12 +29985,10 @@ const {
                     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)
                   } : {}
                 }));
               }
@@ -29977,9 +30077,7 @@ const {
                     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)
@@ -30012,7 +30110,7 @@ const {
           title: toolbar_getI18n('vxe.toolbar.import')
         },
         on: {
-          click: $xeToolbar.importEvent
+          click: $xeToolbar.openImportEvent
         }
       }) : toolbar_renderEmptyElement($xeToolbar);
     },
@@ -30029,7 +30127,7 @@ const {
           title: toolbar_getI18n('vxe.toolbar.export')
         },
         on: {
-          click: $xeToolbar.exportEvent
+          click: $xeToolbar.openExportEvent
         }
       }) : toolbar_renderEmptyElement($xeToolbar);
     },
@@ -30046,7 +30144,7 @@ const {
           title: toolbar_getI18n('vxe.toolbar.print')
         },
         on: {
-          click: $xeToolbar.printEvent
+          click: $xeToolbar.openPrintEvent
         }
       }) : toolbar_renderEmptyElement($xeToolbar);
     },
@@ -30164,15 +30262,30 @@ const {
     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) {
         warnLog('vxe.error.notFunc', ['queryMethod']);
       }
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isPlainObject(props.custom)) {
+        warnLog('vxe.error.delProp', ['custom={...}', 'custom=boolean & custom-options={...}']);
+      }
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isPlainObject(props.print)) {
+        warnLog('vxe.error.delProp', ['print={...}', 'print=boolean & print-options={...}']);
+      }
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isPlainObject(props.export)) {
+        warnLog('vxe.error.delProp', ['export={...}', 'export=boolean & export-options={...}']);
+      }
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isPlainObject(props.import)) {
+        warnLog('vxe.error.delProp', ['import={...}', 'import=boolean & import-options={...}']);
+      }
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isPlainObject(props.refresh)) {
+        warnLog('vxe.error.delProp', ['refresh={...}', 'refresh=boolean & refresh-options={...}']);
+      }
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isPlainObject(props.refresh)) {
+        warnLog('vxe.error.delProp', ['zoom={...}', 'zoom=boolean & zoom-options={...}']);
+      }
       if ($xeTable) {
         $xeTable.connect(this);
       }