vxe-table 4.13.40 → 4.13.41

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.13.39";
+const version = "4.13.41";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3232,6 +3232,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,
@@ -3606,7 +3614,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.13.39"}`;
+const log_version = `table v${"4.13.41"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -5165,22 +5173,6 @@ const Cell = {
     } = column;
     const renderOpts = editRender || cellRender;
     const defaultSlot = slots ? slots.default : null;
-    if (defaultSlot) {
-      return renderCellBaseVNs(params, $table.callSlot(defaultSlot, params));
-    }
-    if (renderOpts) {
-      const compConf = cell_renderer.get(renderOpts.name);
-      if (compConf) {
-        const rtCell = compConf.renderTableCell || compConf.renderCell;
-        const rtDefault = compConf.renderTableDefault || compConf.renderDefault;
-        const renderFn = editRender ? rtCell : rtDefault;
-        if (renderFn) {
-          return renderCellBaseVNs(params, getSlotVNs(renderFn(renderOpts, Object.assign({
-            $type: editRender ? 'edit' : 'cell'
-          }, params))));
-        }
-      }
-    }
     let cellValue = '';
     if (isRowGroupStatus && field && row.isAggregate) {
       const aggRow = row;
@@ -5237,6 +5229,22 @@ const Cell = {
         }
       }
     } else {
+      if (defaultSlot) {
+        return renderCellBaseVNs(params, $table.callSlot(defaultSlot, params));
+      }
+      if (renderOpts) {
+        const compConf = cell_renderer.get(renderOpts.name);
+        if (compConf) {
+          const rtCell = compConf.renderTableCell || compConf.renderCell;
+          const rtDefault = compConf.renderTableDefault || compConf.renderDefault;
+          const renderFn = editRender ? rtCell : rtDefault;
+          if (renderFn) {
+            return renderCellBaseVNs(params, getSlotVNs(renderFn(renderOpts, Object.assign({
+              $type: editRender ? 'edit' : 'cell'
+            }, params))));
+          }
+        }
+      }
       cellValue = $table.getCellLabel(row, column);
     }
     const cellPlaceholder = editRender ? editRender.placeholder : '';
@@ -11663,11 +11671,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
@@ -11721,22 +11735,22 @@ const {
     let toolbarMethods = {};
     const $xeGrid = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('$xeGrid', null);
     const computeRefreshOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
-      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);
     });
     const computeImportOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
-      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);
     });
     const computeExportOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
-      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);
     });
     const computePrintOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
-      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);
     });
     const computeZoomOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
-      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);
     });
     const computeCustomOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
-      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);
     });
     const computeTableCustomOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const {
@@ -11845,85 +11859,44 @@ const {
     }) => {
       if ($xeGrid) {
         $xeGrid.triggerZoomEvent($event);
+      } else {
+        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 = 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);
+    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 = 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);
+    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
@@ -11935,6 +11908,17 @@ const {
       }
     };
     const printEvent = () => {
+      if (checkTable()) {
+        const {
+          connectTable
+        } = internalData;
+        const $table = connectTable;
+        if ($table) {
+          $table.print();
+        }
+      }
+    };
+    const openPrintEvent = () => {
       if (checkTable()) {
         const {
           connectTable
@@ -11945,6 +11929,115 @@ const {
         }
       }
     };
+    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 = 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);
+          }
+        });
+      }
+    };
+    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 = 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);
+          }
+        });
+      }
+    };
     const dispatchEvent = (type, params, evnt) => {
       emit(type, toolbar_createEvent(evnt, {
         $toolbar: $xeToolbar
@@ -11985,9 +12078,7 @@ const {
             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,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)();
         });
       }
@@ -12054,9 +12145,7 @@ const {
                   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)
                 } : {}));
@@ -12136,9 +12225,7 @@ const {
                   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)
                 } : {}));
@@ -12163,7 +12250,7 @@ const {
         circle: true,
         icon: importOpts.icon || toolbar_getIcon().TOOLBAR_TOOLS_IMPORT,
         title: toolbar_getI18n('vxe.toolbar.import'),
-        onClick: importEvent
+        onClick: openImportEvent
       }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)();
     };
     const renderToolExport = () => {
@@ -12173,7 +12260,7 @@ const {
         circle: true,
         icon: exportOpts.icon || toolbar_getIcon().TOOLBAR_TOOLS_EXPORT,
         title: toolbar_getI18n('vxe.toolbar.export'),
-        onClick: exportEvent
+        onClick: openExportEvent
       }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)();
     };
     const renderToolPrint = () => {
@@ -12183,7 +12270,7 @@ const {
         circle: true,
         icon: printOpts.icon || toolbar_getIcon().TOOLBAR_TOOLS_PRINT,
         title: toolbar_getI18n('vxe.toolbar.print'),
-        onClick: printEvent
+        onClick: openPrintEvent
       }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)();
     };
     const renderToolRefresh = () => {
@@ -12270,14 +12357,29 @@ const {
     };
     $xeToolbar.renderVN = renderVN;
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
-      const {
-        refresh
-      } = props;
       const refreshOpts = computeRefreshOpts.value;
       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={...}']);
+      }
       const customOpts = computeCustomOpts.value;
       if (customOpts.isFooter) {
         warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);