vxe-table 3.23.0-beta.2 → 3.23.0-beta.4

package/es/ui/src/log.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const tableVersion = `table v${"3.23.0-beta.2"}`;
+const tableVersion = `table v${"3.23.0-beta.4"}`;
 export function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';

package/es/ui/src/utils.js

@@ -43,3 +43,6 @@ export function eqEmptyValue(cellValue) {
 export function getClass(property, params) {
     return property ? XEUtils.isFunction(property) ? property(params) : property : '';
 }
+export function getDefaultConfig(val1, def1) {
+    return XEUtils.eqNull(val1) ? def1 : val1;
+}

package/lib/index.umd.js

@@ -3307,11 +3307,14 @@ function eqEmptyValue(cellValue) {
 function getClass(property, params) {
   return property ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(property) ? property(params) : property : '';
 }
+function getDefaultConfig(val1, def1) {
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(val1) ? def1 : val1;
+}
 ;// ./packages/ui/index.ts
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "3.23.0-beta.2";
+const version = "3.23.0-beta.4";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -4095,17 +4098,21 @@ function wheelScrollTopTo(diffNum, cb) {
 }
 function getPopupContainer(appendTo) {
   const selectElem = appendTo && XEUtils.isFunction(appendTo) ? appendTo({}) : appendTo;
+  return selectElem || 'body';
+}
+function getPopupAppendElement(appendTo) {
+  const selectElem = getPopupContainer(appendTo);
   if (XEUtils.isString(selectElem)) {
     return document.querySelector(selectElem) || document.body;
   }
-  return selectElem || document.body;
+  return selectElem;
 }
 ;// ./packages/ui/src/log.ts
 
 const {
   log: log_log
 } = core_.VxeUI;
-const tableVersion = `table v${"3.23.0-beta.2"}`;
+const tableVersion = `table v${"3.23.0-beta.4"}`;
 function createComponentLog(name) {
   const uiVersion = core_.VxeUI.uiVersion ? `ui v${core_.VxeUI.uiVersion}` : '';
   const ganttVersion = core_.VxeUI.ganttVersion ? `gantt v${core_.VxeUI.ganttVersion}` : '';
@@ -13130,7 +13137,10 @@ const {
       } = props;
       const selectName = $xeImportPanel.computeSelectName;
       const hasFile = $xeImportPanel.computeHasFile;
+      const importOpts = $xeTable.computeImportOpts;
       const parseTypeLabel = $xeImportPanel.computeParseTypeLabel;
+      const modelOptions = importOpts.modelOptions || {};
+      const settingOptions = importOpts.settingOptions || {};
       const slots = defaultOptions.slots || {};
       const topSlot = slots.top;
       const bottomSlot = slots.bottom;
@@ -13141,17 +13151,20 @@ const {
         props: {
           id: 'VXE_IMPORT_MODAL',
           value: storeData.visible,
-          title: import_panel_getI18n('vxe.import.impTitle'),
-          width: 540,
-          minWidth: 360,
-          minHeight: 240,
-          mask: true,
-          lockView: true,
+          title: modelOptions.title || import_panel_getI18n('vxe.import.impTitle'),
+          width: modelOptions.width || 540,
+          height: modelOptions.height,
+          minWidth: modelOptions.minWidth || 360,
+          minHeight: modelOptions.minHeight || 240,
+          mask: getDefaultConfig(modelOptions.mask, true),
+          lockView: getDefaultConfig(modelOptions.lockView, true),
           showFooter: true,
           escClosable: true,
           maskClosable: true,
-          showMaximize: true,
-          resize: true,
+          fullscreen: modelOptions.fullscreen,
+          showMinimize: modelOptions.showMinimize,
+          showMaximize: getDefaultConfig(modelOptions.showMaximize, true),
+          resize: getDefaultConfig(modelOptions.resize, true),
           loading: reactData.loading
         },
         on: {
@@ -13201,7 +13214,7 @@ const {
               on: {
                 click: $xeImportPanel.selectFileEvent
               }
-            }, import_panel_getI18n('vxe.import.impSelect'))])]), h('tr', [h('td', import_panel_getI18n('vxe.import.impType')), h('td', parseTypeLabel)]), h('tr', [h('td', import_panel_getI18n('vxe.import.impMode')), h('td', [h('vxe-select', {
+            }, import_panel_getI18n('vxe.import.impSelect'))])]), h('tr', [h('td', import_panel_getI18n('vxe.import.impType')), h('td', parseTypeLabel)]), settingOptions.showMode === false ? import_panel_renderEmptyElement($xeTable) : h('tr', [h('td', import_panel_getI18n('vxe.import.impMode')), h('td', [h('vxe-select', {
               props: {
                 value: defaultOptions.mode,
                 options: storeData.modeList
@@ -13544,6 +13557,10 @@ const {
         isHeader
       } = defaultOptions;
       const colVNs = [];
+      const exportOpts = $xeTable.computeExportOpts;
+      const printOpts = $xeTable.computePrintOpts;
+      const modelOptions = (isPrint ? printOpts : exportOpts).modelOptions || {};
+      const settingOptions = (isPrint ? printOpts : exportOpts).settingOptions || {};
       const checkedAll = $xeExportPanel.computeCheckedAll;
       const showSheet = $xeExportPanel.computeShowSheet;
       const supportMerge = $xeExportPanel.computeSupportMerge;
@@ -13597,17 +13614,20 @@ const {
         props: {
           id: 'VXE_EXPORT_MODAL',
           value: storeData.visible,
-          title: export_panel_getI18n(isPrint ? 'vxe.export.printTitle' : 'vxe.export.expTitle'),
-          width: 660,
-          minWidth: 500,
-          minHeight: 400,
-          mask: true,
-          lockView: true,
+          title: modelOptions.title || export_panel_getI18n(isPrint ? 'vxe.export.printTitle' : 'vxe.export.expTitle'),
+          width: modelOptions.width || 660,
+          height: modelOptions.height,
+          minWidth: modelOptions.minWidth || 500,
+          minHeight: modelOptions.minHeight || 400,
+          mask: getDefaultConfig(modelOptions.mask, true),
+          lockView: getDefaultConfig(modelOptions.lockView, true),
           showFooter: true,
           escClosable: true,
           maskClosable: true,
-          showMaximize: true,
-          resize: true,
+          fullscreen: modelOptions.fullscreen,
+          showMinimize: modelOptions.showMinimize,
+          showMaximize: getDefaultConfig(modelOptions.showMaximize, true),
+          resize: getDefaultConfig(modelOptions.resize, true),
           loading: reactData.loading
         },
         on: {
@@ -13640,7 +13660,7 @@ const {
                 cellpadding: 0,
                 border: 0
               }
-            }, [h('tbody', [[isPrint ? export_panel_renderEmptyElement($xeTable) : h('tr', [h('td', export_panel_getI18n('vxe.export.expName')), h('td', [VxeUIInputComponent ? h(VxeUIInputComponent, {
+            }, [h('tbody', [[isPrint || settingOptions.showFileName === false ? export_panel_renderEmptyElement($xeTable) : h('tr', [h('td', export_panel_getI18n('vxe.export.expName')), h('td', [VxeUIInputComponent ? h(VxeUIInputComponent, {
               ref: 'filename',
               props: {
                 value: defaultOptions.filename,
@@ -13653,7 +13673,7 @@ const {
                   defaultOptions.filename = value;
                 }
               }
-            }) : export_panel_renderEmptyElement($xeTable)])]), isPrint ? export_panel_renderEmptyElement($xeTable) : h('tr', [h('td', export_panel_getI18n('vxe.export.expType')), h('td', [h('vxe-select', {
+            }) : export_panel_renderEmptyElement($xeTable)])]), isPrint || settingOptions.showType === false ? export_panel_renderEmptyElement($xeTable) : h('tr', [h('td', export_panel_getI18n('vxe.export.expType')), h('td', [h('vxe-select', {
               props: {
                 value: defaultOptions.type,
                 options: storeData.typeList
@@ -13663,7 +13683,7 @@ const {
                   defaultOptions.type = value;
                 }
               }
-            })])]), isPrint || showSheet ? h('tr', [h('td', export_panel_getI18n('vxe.export.expSheetName')), h('td', [VxeUIInputComponent ? h(VxeUIInputComponent, {
+            })])]), (isPrint || showSheet) && settingOptions.showSheet !== false ? h('tr', [h('td', export_panel_getI18n('vxe.export.expSheetName')), h('td', [VxeUIInputComponent ? h(VxeUIInputComponent, {
               ref: 'sheetname',
               props: {
                 value: defaultOptions.sheetName,
@@ -13676,7 +13696,7 @@ const {
                   defaultOptions.sheetName = value;
                 }
               }
-            }) : export_panel_renderEmptyElement($xeTable)])]) : export_panel_renderEmptyElement($xeTable), h('tr', [h('td', export_panel_getI18n('vxe.export.expMode')), h('td', [h(VxeUISelectComponent, {
+            }) : export_panel_renderEmptyElement($xeTable)])]) : export_panel_renderEmptyElement($xeTable), settingOptions.showMode === false ? export_panel_renderEmptyElement($xeTable) : h('tr', [h('td', export_panel_getI18n('vxe.export.expMode')), h('td', [h(VxeUISelectComponent, {
               props: {
                 value: defaultOptions.mode,
                 options: storeData.modeList
@@ -13686,7 +13706,7 @@ const {
                   defaultOptions.mode = value;
                 }
               }
-            })])]), h('tr', [h('td', [export_panel_getI18n('vxe.export.expColumn')]), h('td', [h('div', {
+            })])]), settingOptions.showColumn === false ? export_panel_renderEmptyElement($xeTable) : h('tr', [h('td', [export_panel_getI18n('vxe.export.expColumn')]), h('td', [h('div', {
               class: 'vxe-table-export--panel-column'
             }, [h('ul', {
               class: 'vxe-table-export--panel-column-header'
@@ -13707,7 +13727,7 @@ const {
               class: 'vxe-checkbox--label'
             }, export_panel_getI18n('vxe.export.expCurrentColumn'))])]), h('ul', {
               class: 'vxe-table-export--panel-column-body'
-            }, colVNs)])])]), isPrint ? h('tr', [h('td', export_panel_getI18n('vxe.export.widthMode')), h('td', [VxeUISelectComponent ? h(VxeUISelectComponent, {
+            }, colVNs)])])]), isPrint && settingOptions.showWidthMode !== false ? h('tr', [h('td', export_panel_getI18n('vxe.export.widthMode')), h('td', [VxeUISelectComponent ? h(VxeUISelectComponent, {
               props: {
                 value: defaultOptions.widthMode,
                 options: colWidthModeOptions
@@ -13717,7 +13737,7 @@ const {
                   defaultOptions.widthMode = value;
                 }
               }
-            }) : export_panel_renderEmptyElement($xeTable)])]) : export_panel_renderEmptyElement($xeTable), h('tr', [h('td', export_panel_getI18n('vxe.export.expOpts')), parameterSlot ? h('td', [h('div', {
+            }) : export_panel_renderEmptyElement($xeTable)])]) : export_panel_renderEmptyElement($xeTable), settingOptions.showParameter === false ? export_panel_renderEmptyElement($xeTable) : h('tr', [h('td', export_panel_getI18n('vxe.export.expOpts')), parameterSlot ? h('td', [h('div', {
               class: 'vxe-table-export--panel-option-row'
             }, $xeTable.callSlot(parameterSlot, params, h))]) : h('td', [h('div', {
               class: 'vxe-table-export--panel-option-row'