vxe-table 3.23.0-beta.1 → 3.23.0-beta.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (147) hide show
  1. package/es/locale/lang/ar-EG.js +2 -0
  2. package/es/locale/lang/de-DE.js +2 -0
  3. package/es/locale/lang/en-US.js +2 -0
  4. package/es/locale/lang/es-ES.js +2 -0
  5. package/es/locale/lang/fr-FR.js +2 -0
  6. package/es/locale/lang/hu-HU.js +2 -0
  7. package/es/locale/lang/hy-AM.js +2 -0
  8. package/es/locale/lang/id-ID.js +2 -0
  9. package/es/locale/lang/it-IT.js +2 -0
  10. package/es/locale/lang/ja-JP.js +2 -0
  11. package/es/locale/lang/ko-KR.js +2 -0
  12. package/es/locale/lang/ms-MY.js +2 -0
  13. package/es/locale/lang/nb-NO.js +2 -0
  14. package/es/locale/lang/pt-BR.js +2 -0
  15. package/es/locale/lang/ru-RU.js +2 -0
  16. package/es/locale/lang/th-TH.js +2 -0
  17. package/es/locale/lang/ug-CN.js +2 -0
  18. package/es/locale/lang/uk-UA.js +2 -0
  19. package/es/locale/lang/uz-UZ.js +2 -0
  20. package/es/locale/lang/vi-VN.js +2 -0
  21. package/es/locale/lang/zh-CHT.js +2 -0
  22. package/es/locale/lang/zh-CN.js +2 -0
  23. package/es/style.css +1 -1
  24. package/es/table/module/export/export-panel.js +205 -193
  25. package/es/table/module/export/import-panel.js +28 -21
  26. package/es/table/module/export/mixin.js +80 -4
  27. package/es/table/src/methods.js +3 -0
  28. package/es/ui/index.js +1 -1
  29. package/es/ui/src/log.js +1 -1
  30. package/es/ui/src/utils.js +3 -0
  31. package/lib/index.umd.js +123 -30
  32. package/lib/index.umd.min.js +1 -1
  33. package/lib/locale/lang/ar-EG.js +2 -0
  34. package/lib/locale/lang/ar-EG.min.js +1 -1
  35. package/lib/locale/lang/ar-EG.umd.js +2 -0
  36. package/lib/locale/lang/de-DE.js +2 -0
  37. package/lib/locale/lang/de-DE.min.js +1 -1
  38. package/lib/locale/lang/de-DE.umd.js +2 -0
  39. package/lib/locale/lang/en-US.js +2 -0
  40. package/lib/locale/lang/en-US.min.js +1 -1
  41. package/lib/locale/lang/en-US.umd.js +2 -0
  42. package/lib/locale/lang/es-ES.js +2 -0
  43. package/lib/locale/lang/es-ES.min.js +1 -1
  44. package/lib/locale/lang/es-ES.umd.js +2 -0
  45. package/lib/locale/lang/fr-FR.js +2 -0
  46. package/lib/locale/lang/fr-FR.min.js +1 -1
  47. package/lib/locale/lang/fr-FR.umd.js +2 -0
  48. package/lib/locale/lang/hu-HU.js +2 -0
  49. package/lib/locale/lang/hu-HU.min.js +1 -1
  50. package/lib/locale/lang/hu-HU.umd.js +2 -0
  51. package/lib/locale/lang/hy-AM.js +2 -0
  52. package/lib/locale/lang/hy-AM.min.js +1 -1
  53. package/lib/locale/lang/hy-AM.umd.js +2 -0
  54. package/lib/locale/lang/id-ID.js +2 -0
  55. package/lib/locale/lang/id-ID.min.js +1 -1
  56. package/lib/locale/lang/id-ID.umd.js +2 -0
  57. package/lib/locale/lang/it-IT.js +2 -0
  58. package/lib/locale/lang/it-IT.min.js +1 -1
  59. package/lib/locale/lang/it-IT.umd.js +2 -0
  60. package/lib/locale/lang/ja-JP.js +2 -0
  61. package/lib/locale/lang/ja-JP.min.js +1 -1
  62. package/lib/locale/lang/ja-JP.umd.js +2 -0
  63. package/lib/locale/lang/ko-KR.js +2 -0
  64. package/lib/locale/lang/ko-KR.min.js +1 -1
  65. package/lib/locale/lang/ko-KR.umd.js +2 -0
  66. package/lib/locale/lang/ms-MY.js +2 -0
  67. package/lib/locale/lang/ms-MY.min.js +1 -1
  68. package/lib/locale/lang/ms-MY.umd.js +2 -0
  69. package/lib/locale/lang/nb-NO.js +2 -0
  70. package/lib/locale/lang/nb-NO.min.js +1 -1
  71. package/lib/locale/lang/nb-NO.umd.js +2 -0
  72. package/lib/locale/lang/pt-BR.js +2 -0
  73. package/lib/locale/lang/pt-BR.min.js +1 -1
  74. package/lib/locale/lang/pt-BR.umd.js +2 -0
  75. package/lib/locale/lang/ru-RU.js +2 -0
  76. package/lib/locale/lang/ru-RU.min.js +1 -1
  77. package/lib/locale/lang/ru-RU.umd.js +2 -0
  78. package/lib/locale/lang/th-TH.js +2 -0
  79. package/lib/locale/lang/th-TH.min.js +1 -1
  80. package/lib/locale/lang/th-TH.umd.js +2 -0
  81. package/lib/locale/lang/ug-CN.js +2 -0
  82. package/lib/locale/lang/ug-CN.min.js +1 -1
  83. package/lib/locale/lang/ug-CN.umd.js +2 -0
  84. package/lib/locale/lang/uk-UA.js +2 -0
  85. package/lib/locale/lang/uk-UA.min.js +1 -1
  86. package/lib/locale/lang/uk-UA.umd.js +2 -0
  87. package/lib/locale/lang/uz-UZ.js +2 -0
  88. package/lib/locale/lang/uz-UZ.min.js +1 -1
  89. package/lib/locale/lang/uz-UZ.umd.js +2 -0
  90. package/lib/locale/lang/vi-VN.js +2 -0
  91. package/lib/locale/lang/vi-VN.min.js +1 -1
  92. package/lib/locale/lang/vi-VN.umd.js +2 -0
  93. package/lib/locale/lang/zh-CHT.js +2 -0
  94. package/lib/locale/lang/zh-CHT.min.js +1 -1
  95. package/lib/locale/lang/zh-CHT.umd.js +2 -0
  96. package/lib/locale/lang/zh-CN.js +2 -0
  97. package/lib/locale/lang/zh-CN.min.js +1 -1
  98. package/lib/locale/lang/zh-CN.umd.js +2 -0
  99. package/lib/style.css +1 -1
  100. package/lib/table/module/export/export-panel.js +19 -13
  101. package/lib/table/module/export/export-panel.min.js +1 -1
  102. package/lib/table/module/export/import-panel.js +12 -7
  103. package/lib/table/module/export/import-panel.min.js +1 -1
  104. package/lib/table/module/export/mixin.js +84 -7
  105. package/lib/table/module/export/mixin.min.js +1 -1
  106. package/lib/table/src/methods.js +1 -1
  107. package/lib/table/src/methods.min.js +1 -1
  108. package/lib/ui/index.js +1 -1
  109. package/lib/ui/index.min.js +1 -1
  110. package/lib/ui/src/log.js +1 -1
  111. package/lib/ui/src/log.min.js +1 -1
  112. package/lib/ui/src/utils.js +4 -0
  113. package/lib/ui/src/utils.min.js +1 -1
  114. package/package.json +2 -2
  115. package/packages/locale/lang/ar-EG.ts +2 -0
  116. package/packages/locale/lang/de-DE.ts +2 -0
  117. package/packages/locale/lang/en-US.ts +2 -0
  118. package/packages/locale/lang/es-ES.ts +2 -0
  119. package/packages/locale/lang/fr-FR.ts +2 -0
  120. package/packages/locale/lang/hu-HU.ts +2 -0
  121. package/packages/locale/lang/hy-AM.ts +2 -0
  122. package/packages/locale/lang/id-ID.ts +2 -0
  123. package/packages/locale/lang/it-IT.ts +2 -0
  124. package/packages/locale/lang/ja-JP.ts +2 -0
  125. package/packages/locale/lang/ko-KR.ts +2 -0
  126. package/packages/locale/lang/ms-MY.ts +2 -0
  127. package/packages/locale/lang/nb-NO.ts +2 -0
  128. package/packages/locale/lang/pt-BR.ts +2 -0
  129. package/packages/locale/lang/ru-RU.ts +2 -0
  130. package/packages/locale/lang/th-TH.ts +2 -0
  131. package/packages/locale/lang/ug-CN.ts +2 -0
  132. package/packages/locale/lang/uk-UA.ts +2 -0
  133. package/packages/locale/lang/uz-UZ.ts +2 -0
  134. package/packages/locale/lang/vi-VN.ts +2 -0
  135. package/packages/locale/lang/zh-CHT.ts +2 -0
  136. package/packages/locale/lang/zh-CN.ts +2 -0
  137. package/packages/table/module/export/export-panel.ts +205 -193
  138. package/packages/table/module/export/import-panel.ts +28 -21
  139. package/packages/table/module/export/mixin.ts +77 -4
  140. package/packages/table/src/methods.ts +3 -0
  141. package/packages/ui/src/utils.ts +4 -0
  142. /package/es/{iconfont.1787020799795.ttf → iconfont.1787137343422.ttf} +0 -0
  143. /package/es/{iconfont.1787020799795.woff → iconfont.1787137343422.woff} +0 -0
  144. /package/es/{iconfont.1787020799795.woff2 → iconfont.1787137343422.woff2} +0 -0
  145. /package/lib/{iconfont.1787020799795.ttf → iconfont.1787137343422.ttf} +0 -0
  146. /package/lib/{iconfont.1787020799795.woff → iconfont.1787137343422.woff} +0 -0
  147. /package/lib/{iconfont.1787020799795.woff2 → iconfont.1787137343422.woff2} +0 -0
@@ -1586,7 +1586,16 @@ export default {
1586
1586
  }
1587
1587
  if (!handleOptions.print) {
1588
1588
  if (beforeExportMethod) {
1589
- beforeExportMethod({ options: handleOptions, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt });
1589
+ const beRest = beforeExportMethod({ options: handleOptions, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt });
1590
+ if (XEUtils.isBoolean(beRest)) {
1591
+ if (!beRest) {
1592
+ const params = { status: false };
1593
+ return Promise.reject(params);
1594
+ }
1595
+ }
1596
+ else {
1597
+ warnLog('vxe.error.returnErr', ['beforeExportMethod', 'boolean', beRest]);
1598
+ }
1590
1599
  }
1591
1600
  }
1592
1601
  if (!handleOptions.data) {
@@ -1694,13 +1703,22 @@ export default {
1694
1703
  const opts = Object.assign({}, options);
1695
1704
  const { beforeImportMethod } = opts;
1696
1705
  if (beforeImportMethod) {
1697
- beforeImportMethod({ options: opts, $table: $xeTable });
1706
+ const biRest = beforeImportMethod({ options: opts, $table: $xeTable });
1707
+ if (XEUtils.isBoolean(biRest)) {
1708
+ if (!biRest) {
1709
+ const params = { status: false };
1710
+ return Promise.reject(params);
1711
+ }
1712
+ }
1713
+ else {
1714
+ warnLog('vxe.error.returnErr', ['beforeImportMethod', 'boolean', biRest]);
1715
+ }
1698
1716
  }
1699
1717
  return handleFileImport($xeTable, file, opts);
1700
1718
  },
1701
1719
  _importData(options) {
1702
1720
  const $xeTable = this;
1703
- const { importOpts } = this;
1721
+ const importOpts = $xeTable.computeImportOpts;
1704
1722
  const opts = Object.assign({
1705
1723
  types: XEUtils.keys(importOpts._typeMaps)
1706
1724
  // beforeImportMethod: null,
@@ -1708,7 +1726,16 @@ export default {
1708
1726
  }, importOpts, options);
1709
1727
  const { beforeImportMethod, afterImportMethod } = opts;
1710
1728
  if (beforeImportMethod) {
1711
- beforeImportMethod({ options: opts, $table: this });
1729
+ const biRest = beforeImportMethod({ options: opts, $table: $xeTable });
1730
+ if (XEUtils.isBoolean(biRest)) {
1731
+ if (!biRest) {
1732
+ const params = { status: false };
1733
+ return Promise.reject(params);
1734
+ }
1735
+ }
1736
+ else {
1737
+ warnLog('vxe.error.returnErr', ['beforeImportMethod', 'boolean', biRest]);
1738
+ }
1712
1739
  }
1713
1740
  return VxeUI.readFile(opts).catch(e => {
1714
1741
  if (afterImportMethod) {
@@ -1759,6 +1786,7 @@ export default {
1759
1786
  printTitle = document.title || '';
1760
1787
  }
1761
1788
  const beforePrintMethod = opts.beforePrintMethod;
1789
+ const printMethod = opts.printMethod;
1762
1790
  const tableHtml = opts.html || opts.content;
1763
1791
  return new Promise((resolve, reject) => {
1764
1792
  if (VxeUI.print) {
@@ -1778,6 +1806,30 @@ export default {
1778
1806
  $gantt: $xeGantt
1779
1807
  });
1780
1808
  }
1809
+ : undefined,
1810
+ beforePrintMethod: beforePrintMethod
1811
+ ? ({ html }) => {
1812
+ return beforePrintMethod({
1813
+ html,
1814
+ content: html,
1815
+ options: opts,
1816
+ $table: $xeTable,
1817
+ $grid: $xeGrid,
1818
+ $gantt: $xeGantt
1819
+ });
1820
+ }
1821
+ : undefined,
1822
+ printMethod: printMethod
1823
+ ? ({ html }) => {
1824
+ return printMethod({
1825
+ html,
1826
+ content: html,
1827
+ options: opts,
1828
+ $table: $xeTable,
1829
+ $grid: $xeGrid,
1830
+ $gantt: $xeGantt
1831
+ });
1832
+ }
1781
1833
  : undefined
1782
1834
  }));
1783
1835
  }
@@ -1798,6 +1850,30 @@ export default {
1798
1850
  $gantt: $xeGantt
1799
1851
  });
1800
1852
  }
1853
+ : undefined,
1854
+ beforePrintMethod: beforePrintMethod
1855
+ ? ({ html }) => {
1856
+ return beforePrintMethod({
1857
+ html,
1858
+ content: html,
1859
+ options: opts,
1860
+ $table: $xeTable,
1861
+ $grid: $xeGrid,
1862
+ $gantt: $xeGantt
1863
+ });
1864
+ }
1865
+ : undefined,
1866
+ printMethod: printMethod
1867
+ ? ({ html }) => {
1868
+ return printMethod({
1869
+ html,
1870
+ content: html,
1871
+ options: opts,
1872
+ $table: $xeTable,
1873
+ $grid: $xeGrid,
1874
+ $gantt: $xeGantt
1875
+ });
1876
+ }
1801
1877
  : undefined
1802
1878
  });
1803
1879
  }));
@@ -4076,6 +4076,9 @@ function handleSyncScroll($xeTable, isRollX, isRollY) {
4076
4076
  xRest = $xeTable.updateScrollXData();
4077
4077
  }
4078
4078
  if (isRollY && scrollYLoad) {
4079
+ if (autoWidthColumnList.length) {
4080
+ calcCellWidth($xeTable);
4081
+ }
4079
4082
  yRest = $xeTable.updateScrollYData().then(() => {
4080
4083
  if (autoWidthColumnList.length) {
4081
4084
  calcCellWidth($xeTable);
package/es/ui/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { VxeUI } from '@vxe-ui/core';
2
2
  import { getFuncText } from './src/utils';
3
- export const version = "3.23.0-beta.1";
3
+ export const version = "3.23.0-beta.3";
4
4
  VxeUI.version = version;
5
5
  VxeUI.tableVersion = version;
6
6
  VxeUI.setConfig({
package/es/ui/src/log.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { VxeUI } from '@vxe-ui/core';
2
2
  const { log } = VxeUI;
3
- const tableVersion = `table v${"3.23.0-beta.1"}`;
3
+ const tableVersion = `table v${"3.23.0-beta.3"}`;
4
4
  export function createComponentLog(name) {
5
5
  const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
6
6
  const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -43,3 +43,6 @@ export function eqEmptyValue(cellValue) {
43
43
  export function getClass(property, params) {
44
44
  return property ? XEUtils.isFunction(property) ? property(params) : property : '';
45
45
  }
46
+ export function getDefaultConfig(val1, def1) {
47
+ return XEUtils.eqNull(val1) ? def1 : val1;
48
+ }
package/lib/index.umd.js CHANGED
@@ -3307,11 +3307,14 @@ function eqEmptyValue(cellValue) {
3307
3307
  function getClass(property, params) {
3308
3308
  return property ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(property) ? property(params) : property : '';
3309
3309
  }
3310
+ function getDefaultConfig(val1, def1) {
3311
+ return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(val1) ? def1 : val1;
3312
+ }
3310
3313
  ;// ./packages/ui/index.ts
3311
3314
  /* unused harmony import specifier */ var VxeUI;
3312
3315
 
3313
3316
 
3314
- const version = "3.23.0-beta.1";
3317
+ const version = "3.23.0-beta.3";
3315
3318
  core_.VxeUI.version = version;
3316
3319
  core_.VxeUI.tableVersion = version;
3317
3320
  core_.VxeUI.setConfig({
@@ -4105,7 +4108,7 @@ function getPopupContainer(appendTo) {
4105
4108
  const {
4106
4109
  log: log_log
4107
4110
  } = core_.VxeUI;
4108
- const tableVersion = `table v${"3.23.0-beta.1"}`;
4111
+ const tableVersion = `table v${"3.23.0-beta.3"}`;
4109
4112
  function createComponentLog(name) {
4110
4113
  const uiVersion = core_.VxeUI.uiVersion ? `ui v${core_.VxeUI.uiVersion}` : '';
4111
4114
  const ganttVersion = core_.VxeUI.ganttVersion ? `gantt v${core_.VxeUI.ganttVersion}` : '';
@@ -8034,7 +8037,7 @@ if(props.spanMethod){methods_warnLog('vxe.error.scrollErrProp',['span-method']);
8034
8037
  // 如果列被设置为固定,则清除合并状态
8035
8038
  if(visibleColumn.length!==internalData.visibleColumn.length||!internalData.visibleColumn.every((column,index)=>column===visibleColumn[index])){$xeTable.clearMergeCells();$xeTable.clearMergeFooterItems();}visibleColumn.forEach((column,index)=>{const colid=column.id;const colRest=fullColumnIdData[colid];if(colRest){colRest._index=index;}});handleTableColumn($xeTable);handleUpdateAggValues($xeTable);if(isReset){return $xeTable.updateFooter().then(()=>{return $xeTable.recalculate();}).then(()=>{$xeTable.updateCellAreas();return $xeTable.recalculate();});}return $xeTable.updateFooter();}function initColumnHierarchy($xeTable){const internalData=$xeTable;const{collectColumn}=internalData;const fullColIdData={};const fullColFieldData={};let sortIndex=1;external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn,(column,index,items,path,parentColumn)=>{const{id:colid,field}=column;const parentId=parentColumn?parentColumn.id:null;const rest={$index:-1,_index:-1,column,colid,index,items,parent:parentColumn||null,width:0,oLeft:0};column.parentId=parentId;column.defaultParentId=parentId;column.sortNumber=sortIndex;column.renderSortNumber=sortIndex;sortIndex++;if(field){if(fullColFieldData[field]){methods_errLog('vxe.error.colRepet',['field',field]);}fullColFieldData[field]=rest;}fullColIdData[colid]=rest;});internalData.fullColumnIdData=fullColIdData;internalData.fullColumnFieldData=fullColFieldData;}function buildColumnInfo($xeTable){const props=$xeTable;const $xeToolbar=$xeTable.$refs.$xeToolbar;const reactData=$xeTable;const internalData=$xeTable;const{scrollXLoad,scrollYLoad,expandColumn}=reactData;const expandOpts=$xeTable.computeExpandOpts;cacheColumnMap($xeTable);parseColumns($xeTable,true).then(()=>{if(reactData.scrollXLoad){loadScrollXData($xeTable);}});$xeTable.clearHeaderFormatterCache();$xeTable.clearMergeCells();$xeTable.clearMergeFooterItems();$xeTable.handleTableData(true);$xeTable.handleAggregateSummaryData();if((scrollXLoad||scrollYLoad)&&expandColumn&&expandOpts.mode!=='fixed'){methods_warnLog('vxe.error.scrollErrProp',['column.type=expand']);}return $xeTable.$nextTick().then(()=>{if($xeToolbar){$xeToolbar.syncUpdate({collectColumn:internalData.collectColumn,$table:$xeTable});}if($xeTable.handleUpdateCustomColumn){$xeTable.handleUpdateCustomColumn();}const columnOpts=$xeTable.computeColumnOpts;if(props.showCustomHeader&&reactData.isGroup&&(columnOpts.resizable||props.resizable)){methods_warnLog('vxe.error.notConflictProp',['show-custom-header & colgroup','column-config.resizable=false']);}reactData.isColLoading=false;return handleLazyRecalculate($xeTable,false,true,true);});}function handleInitColumn($xeTable,collectColumn){const reactData=$xeTable;const internalData=$xeTable;internalData.collectColumn=collectColumn;const tFullColumn=getColumnList(collectColumn);internalData.tableFullColumn=tFullColumn;reactData.updateColFlag++;reactData.isColLoading=true;initColumnHierarchy($xeTable);return Promise.resolve(restoreCustomStorage($xeTable)).then(()=>{return buildColumnInfo($xeTable);});}/**
8036
8039
  * 纵向 Y 可视渲染处理
8037
- */function loadScrollYData($xeTable){const reactData=$xeTable;const internalData=$xeTable;const{isAllOverflow,isScrollYBig}=reactData;const{mergeBodyList,mergeBodyRowMaps,scrollYStore}=internalData;const{preloadSize,startIndex,endIndex,offsetSize}=scrollYStore;const autoOffsetYSize=isAllOverflow?offsetSize:offsetSize+1;const{toVisibleIndex,visibleSize}=handleVirtualYVisible($xeTable);const offsetItem={startIndex:Math.max(0,isScrollYBig?toVisibleIndex-1:toVisibleIndex-1-offsetSize-preloadSize),endIndex:isScrollYBig?toVisibleIndex+visibleSize:toVisibleIndex+visibleSize+autoOffsetYSize+preloadSize};scrollYStore.visibleStartIndex=toVisibleIndex-1;scrollYStore.visibleEndIndex=toVisibleIndex+visibleSize+1;calculateMergerOffsetIndex(mergeBodyList,mergeBodyRowMaps,offsetItem,'row');const{startIndex:offsetStartIndex,endIndex:offsetEndIndex}=offsetItem;if(toVisibleIndex<=startIndex||toVisibleIndex>=endIndex-visibleSize-1){if(startIndex!==offsetStartIndex||endIndex!==offsetEndIndex){scrollYStore.startIndex=offsetStartIndex;scrollYStore.endIndex=offsetEndIndex;$xeTable.updateScrollYData();}}}const createGetRowCacheProp=prop=>{return function(row){const $xeTable=this;const internalData=$xeTable;const{fullAllDataRowIdData}=internalData;if(row){const rowid=getRowid($xeTable,row);const rowRest=fullAllDataRowIdData[rowid];if(rowRest){return rowRest[prop];}}return-1;};};const createGetColumnCacheProp=prop=>{return function(column){const $xeTable=this;const internalData=$xeTable;const{fullColumnIdData}=internalData;if(column){const colRest=fullColumnIdData[column.id];if(colRest){return colRest[prop];}}return-1;};};function lazyScrollXData($xeTable){const internalData=$xeTable;const{lxTimeout,lxRunTime,scrollXStore}=internalData;const{visibleSize}=scrollXStore;const fpsTime=visibleSize>26?26:visibleSize>16?14:6;if(lxTimeout){clearTimeout(lxTimeout);}if(!lxRunTime||lxRunTime+fpsTime<Date.now()){internalData.lxRunTime=Date.now();loadScrollXData($xeTable);}internalData.lxTimeout=setTimeout(()=>{internalData.lxTimeout=undefined;internalData.lxRunTime=undefined;loadScrollXData($xeTable);},fpsTime);}function lazyScrollYData($xeTable){const internalData=$xeTable;const{lyTimeout,lyRunTime,scrollYStore}=internalData;const{visibleSize}=scrollYStore;const fpsTime=visibleSize>30?32:visibleSize>20?18:8;if(lyTimeout){clearTimeout(lyTimeout);}if(!lyRunTime||lyRunTime+fpsTime<Date.now()){internalData.lyRunTime=Date.now();loadScrollYData($xeTable);}internalData.lyTimeout=setTimeout(()=>{internalData.lyTimeout=undefined;internalData.lyRunTime=undefined;loadScrollYData($xeTable);},fpsTime);}function handleSyncScroll($xeTable,isRollX,isRollY){const reactData=$xeTable;const internalData=$xeTable;const{scrollXLoad,scrollYLoad,isAllOverflow}=reactData;const autoWidthColumnList=$xeTable.computeAutoWidthColumnList;internalData.lcsRunTime=Date.now();internalData.lcsTimeout=undefined;internalData.intoRunScroll=false;internalData.inVirtualScroll=false;internalData.inWheelScroll=false;internalData.inHeaderScroll=false;internalData.inBodyScroll=false;internalData.inFooterScroll=false;reactData.lazScrollLoading=false;internalData.scrollRenderType='';let xRest=null;let yRest=null;if(!isAllOverflow){calcCellHeight($xeTable);updateRowOffsetTop($xeTable);}if(isRollX&&scrollXLoad){xRest=$xeTable.updateScrollXData();}if(isRollY&&scrollYLoad){yRest=$xeTable.updateScrollYData().then(()=>{if(autoWidthColumnList.length){calcCellWidth($xeTable);autoCellWidth($xeTable);}if(!isAllOverflow){calcCellHeight($xeTable);updateRowOffsetTop($xeTable);}return $xeTable.updateScrollYSpace();});}updateRowExpandStyle($xeTable);return Promise.all([xRest,yRest,scrollXLoad||scrollYLoad?$xeTable.updateCellAreas():null]);}function checkLastSyncScroll($xeTable,isRollX,isRollY){const reactData=$xeTable;const internalData=$xeTable;const{lcsTimeout}=internalData;reactData.lazScrollLoading=true;if(lcsTimeout){clearTimeout(lcsTimeout);}internalData.lcsTimeout=setTimeout(()=>{handleSyncScroll($xeTable,isRollX,isRollY).then(()=>{if(reactData.scrollXLoad||reactData.scrollYLoad){$xeTable.$nextTick(()=>{updateRowExpandStyle($xeTable);if(!internalData.lcsTimeout){handleSyncScroll($xeTable,isRollX,isRollY);}});}});},240);}const getWheelSpeed=lastScrollTime=>{let multiple=1;const currTime=Date.now();if(lastScrollTime+25>currTime){multiple=1.18;}else if(lastScrollTime+30>currTime){multiple=1.15;}else if(lastScrollTime+40>currTime){multiple=1.12;}else if(lastScrollTime+55>currTime){multiple=1.09;}else if(lastScrollTime+75>currTime){multiple=1.06;}else if(lastScrollTime+100>currTime){multiple=1.03;}return multiple;};const syncGanttScrollTop=($xeTable,scrollTop)=>{const internalData=$xeTable;const $xeGanttView=internalData.xeGanttView;if($xeGanttView){const ganttInternalData=$xeGanttView.internalData;const{elemStore:ganttElemStore}=ganttInternalData;const ganttBodyScrollElem=getRefElem(ganttElemStore['main-body-scroll']);if(ganttBodyScrollElem){ganttBodyScrollElem.scrollTop=scrollTop;}}};function updateHeight($xeTable){const reactData=$xeTable;const internalData=$xeTable;internalData.customHeight=calcTableHeight($xeTable,'height');internalData.customMinHeight=calcTableHeight($xeTable,'minHeight');internalData.customMaxHeight=calcTableHeight($xeTable,'maxHeight');// 如果启用虚拟滚动,纠正高度
8040
+ */function loadScrollYData($xeTable){const reactData=$xeTable;const internalData=$xeTable;const{isAllOverflow,isScrollYBig}=reactData;const{mergeBodyList,mergeBodyRowMaps,scrollYStore}=internalData;const{preloadSize,startIndex,endIndex,offsetSize}=scrollYStore;const autoOffsetYSize=isAllOverflow?offsetSize:offsetSize+1;const{toVisibleIndex,visibleSize}=handleVirtualYVisible($xeTable);const offsetItem={startIndex:Math.max(0,isScrollYBig?toVisibleIndex-1:toVisibleIndex-1-offsetSize-preloadSize),endIndex:isScrollYBig?toVisibleIndex+visibleSize:toVisibleIndex+visibleSize+autoOffsetYSize+preloadSize};scrollYStore.visibleStartIndex=toVisibleIndex-1;scrollYStore.visibleEndIndex=toVisibleIndex+visibleSize+1;calculateMergerOffsetIndex(mergeBodyList,mergeBodyRowMaps,offsetItem,'row');const{startIndex:offsetStartIndex,endIndex:offsetEndIndex}=offsetItem;if(toVisibleIndex<=startIndex||toVisibleIndex>=endIndex-visibleSize-1){if(startIndex!==offsetStartIndex||endIndex!==offsetEndIndex){scrollYStore.startIndex=offsetStartIndex;scrollYStore.endIndex=offsetEndIndex;$xeTable.updateScrollYData();}}}const createGetRowCacheProp=prop=>{return function(row){const $xeTable=this;const internalData=$xeTable;const{fullAllDataRowIdData}=internalData;if(row){const rowid=getRowid($xeTable,row);const rowRest=fullAllDataRowIdData[rowid];if(rowRest){return rowRest[prop];}}return-1;};};const createGetColumnCacheProp=prop=>{return function(column){const $xeTable=this;const internalData=$xeTable;const{fullColumnIdData}=internalData;if(column){const colRest=fullColumnIdData[column.id];if(colRest){return colRest[prop];}}return-1;};};function lazyScrollXData($xeTable){const internalData=$xeTable;const{lxTimeout,lxRunTime,scrollXStore}=internalData;const{visibleSize}=scrollXStore;const fpsTime=visibleSize>26?26:visibleSize>16?14:6;if(lxTimeout){clearTimeout(lxTimeout);}if(!lxRunTime||lxRunTime+fpsTime<Date.now()){internalData.lxRunTime=Date.now();loadScrollXData($xeTable);}internalData.lxTimeout=setTimeout(()=>{internalData.lxTimeout=undefined;internalData.lxRunTime=undefined;loadScrollXData($xeTable);},fpsTime);}function lazyScrollYData($xeTable){const internalData=$xeTable;const{lyTimeout,lyRunTime,scrollYStore}=internalData;const{visibleSize}=scrollYStore;const fpsTime=visibleSize>30?32:visibleSize>20?18:8;if(lyTimeout){clearTimeout(lyTimeout);}if(!lyRunTime||lyRunTime+fpsTime<Date.now()){internalData.lyRunTime=Date.now();loadScrollYData($xeTable);}internalData.lyTimeout=setTimeout(()=>{internalData.lyTimeout=undefined;internalData.lyRunTime=undefined;loadScrollYData($xeTable);},fpsTime);}function handleSyncScroll($xeTable,isRollX,isRollY){const reactData=$xeTable;const internalData=$xeTable;const{scrollXLoad,scrollYLoad,isAllOverflow}=reactData;const autoWidthColumnList=$xeTable.computeAutoWidthColumnList;internalData.lcsRunTime=Date.now();internalData.lcsTimeout=undefined;internalData.intoRunScroll=false;internalData.inVirtualScroll=false;internalData.inWheelScroll=false;internalData.inHeaderScroll=false;internalData.inBodyScroll=false;internalData.inFooterScroll=false;reactData.lazScrollLoading=false;internalData.scrollRenderType='';let xRest=null;let yRest=null;if(!isAllOverflow){calcCellHeight($xeTable);updateRowOffsetTop($xeTable);}if(isRollX&&scrollXLoad){xRest=$xeTable.updateScrollXData();}if(isRollY&&scrollYLoad){if(autoWidthColumnList.length){calcCellWidth($xeTable);}yRest=$xeTable.updateScrollYData().then(()=>{if(autoWidthColumnList.length){calcCellWidth($xeTable);autoCellWidth($xeTable);}if(!isAllOverflow){calcCellHeight($xeTable);updateRowOffsetTop($xeTable);}return $xeTable.updateScrollYSpace();});}updateRowExpandStyle($xeTable);return Promise.all([xRest,yRest,scrollXLoad||scrollYLoad?$xeTable.updateCellAreas():null]);}function checkLastSyncScroll($xeTable,isRollX,isRollY){const reactData=$xeTable;const internalData=$xeTable;const{lcsTimeout}=internalData;reactData.lazScrollLoading=true;if(lcsTimeout){clearTimeout(lcsTimeout);}internalData.lcsTimeout=setTimeout(()=>{handleSyncScroll($xeTable,isRollX,isRollY).then(()=>{if(reactData.scrollXLoad||reactData.scrollYLoad){$xeTable.$nextTick(()=>{updateRowExpandStyle($xeTable);if(!internalData.lcsTimeout){handleSyncScroll($xeTable,isRollX,isRollY);}});}});},240);}const getWheelSpeed=lastScrollTime=>{let multiple=1;const currTime=Date.now();if(lastScrollTime+25>currTime){multiple=1.18;}else if(lastScrollTime+30>currTime){multiple=1.15;}else if(lastScrollTime+40>currTime){multiple=1.12;}else if(lastScrollTime+55>currTime){multiple=1.09;}else if(lastScrollTime+75>currTime){multiple=1.06;}else if(lastScrollTime+100>currTime){multiple=1.03;}return multiple;};const syncGanttScrollTop=($xeTable,scrollTop)=>{const internalData=$xeTable;const $xeGanttView=internalData.xeGanttView;if($xeGanttView){const ganttInternalData=$xeGanttView.internalData;const{elemStore:ganttElemStore}=ganttInternalData;const ganttBodyScrollElem=getRefElem(ganttElemStore['main-body-scroll']);if(ganttBodyScrollElem){ganttBodyScrollElem.scrollTop=scrollTop;}}};function updateHeight($xeTable){const reactData=$xeTable;const internalData=$xeTable;internalData.customHeight=calcTableHeight($xeTable,'height');internalData.customMinHeight=calcTableHeight($xeTable,'minHeight');internalData.customMaxHeight=calcTableHeight($xeTable,'maxHeight');// 如果启用虚拟滚动,纠正高度
8038
8041
  if(reactData.scrollYLoad&&!(internalData.customHeight||internalData.customMinHeight||internalData.customMaxHeight)){internalData.customHeight=300;}}/**
8039
8042
  * 计算自适应列宽
8040
8043
  */function calcColumnAutoWidth($xeTable,column,wrapperEl){const reactData=$xeTable;const{scrollYLoad}=reactData;const columnOpts=$xeTable.computeColumnOpts;const{autoOptions}=columnOpts;const{isCalcHeader,isCalcBody,isCalcFooter}=autoOptions||{};const querySelections=[];if(isCalcHeader){querySelections.push(`.vxe-header-cell--wrapper[colid="${column.id}"]`);}if(isCalcBody){querySelections.push(`.vxe-body-cell--wrapper[colid="${column.id}"]`);}if(isCalcFooter){querySelections.push(`.vxe-footer-cell--wrapper[colid="${column.id}"]`);}const cellElemList=querySelections.length?wrapperEl.querySelectorAll(querySelections.join(',')):[];let leftRightPadding=0;const firstCellEl=cellElemList[0];if(firstCellEl&&firstCellEl.parentElement){const cellStyle=getComputedStyle(firstCellEl.parentElement);leftRightPadding=Math.ceil(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingLeft)+external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingRight));}let colWidth=(scrollYLoad?column.renderAutoWidth:0)-leftRightPadding;for(let i=0;i<cellElemList.length;i++){const celEl=cellElemList[i];colWidth=Math.max(colWidth,celEl?Math.ceil(celEl.scrollWidth)+4:0);}return colWidth+leftRightPadding;}/**
@@ -13130,7 +13133,10 @@ const {
13130
13133
  } = props;
13131
13134
  const selectName = $xeImportPanel.computeSelectName;
13132
13135
  const hasFile = $xeImportPanel.computeHasFile;
13136
+ const importOpts = $xeTable.computeImportOpts;
13133
13137
  const parseTypeLabel = $xeImportPanel.computeParseTypeLabel;
13138
+ const modelOptions = importOpts.modelOptions || {};
13139
+ const settingOptions = importOpts.settingOptions || {};
13134
13140
  const slots = defaultOptions.slots || {};
13135
13141
  const topSlot = slots.top;
13136
13142
  const bottomSlot = slots.bottom;
@@ -13141,17 +13147,19 @@ const {
13141
13147
  props: {
13142
13148
  id: 'VXE_IMPORT_MODAL',
13143
13149
  value: storeData.visible,
13144
- title: import_panel_getI18n('vxe.import.impTitle'),
13145
- width: 540,
13146
- minWidth: 360,
13147
- minHeight: 240,
13150
+ title: modelOptions.title || import_panel_getI18n('vxe.import.impTitle'),
13151
+ width: modelOptions.width || 540,
13152
+ height: modelOptions.height,
13153
+ minWidth: modelOptions.minWidth || 360,
13154
+ minHeight: modelOptions.minHeight || 240,
13148
13155
  mask: true,
13149
13156
  lockView: true,
13150
13157
  showFooter: true,
13151
13158
  escClosable: true,
13152
13159
  maskClosable: true,
13153
- showMaximize: true,
13154
- resize: true,
13160
+ showMinimize: modelOptions.showMinimize,
13161
+ showMaximize: getDefaultConfig(modelOptions.showMaximize, true),
13162
+ resize: getDefaultConfig(modelOptions.resize, true),
13155
13163
  loading: reactData.loading
13156
13164
  },
13157
13165
  on: {
@@ -13201,7 +13209,7 @@ const {
13201
13209
  on: {
13202
13210
  click: $xeImportPanel.selectFileEvent
13203
13211
  }
13204
- }, 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', {
13212
+ }, 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', {
13205
13213
  props: {
13206
13214
  value: defaultOptions.mode,
13207
13215
  options: storeData.modeList
@@ -13544,6 +13552,10 @@ const {
13544
13552
  isHeader
13545
13553
  } = defaultOptions;
13546
13554
  const colVNs = [];
13555
+ const exportOpts = $xeTable.computeExportOpts;
13556
+ const printOpts = $xeTable.computePrintOpts;
13557
+ const modelOptions = (isPrint ? printOpts : exportOpts).modelOptions || {};
13558
+ const settingOptions = (isPrint ? printOpts : exportOpts).settingOptions || {};
13547
13559
  const checkedAll = $xeExportPanel.computeCheckedAll;
13548
13560
  const showSheet = $xeExportPanel.computeShowSheet;
13549
13561
  const supportMerge = $xeExportPanel.computeSupportMerge;
@@ -13597,17 +13609,19 @@ const {
13597
13609
  props: {
13598
13610
  id: 'VXE_EXPORT_MODAL',
13599
13611
  value: storeData.visible,
13600
- title: export_panel_getI18n(isPrint ? 'vxe.export.printTitle' : 'vxe.export.expTitle'),
13601
- width: 660,
13602
- minWidth: 500,
13603
- minHeight: 400,
13612
+ title: modelOptions.title || export_panel_getI18n(isPrint ? 'vxe.export.printTitle' : 'vxe.export.expTitle'),
13613
+ width: modelOptions.width || 660,
13614
+ height: modelOptions.height,
13615
+ minWidth: modelOptions.minWidth || 500,
13616
+ minHeight: modelOptions.minHeight || 400,
13604
13617
  mask: true,
13605
13618
  lockView: true,
13606
13619
  showFooter: true,
13607
13620
  escClosable: true,
13608
13621
  maskClosable: true,
13609
- showMaximize: true,
13610
- resize: true,
13622
+ showMinimize: modelOptions.showMinimize,
13623
+ showMaximize: getDefaultConfig(modelOptions.showMaximize, true),
13624
+ resize: getDefaultConfig(modelOptions.resize, true),
13611
13625
  loading: reactData.loading
13612
13626
  },
13613
13627
  on: {
@@ -13640,7 +13654,7 @@ const {
13640
13654
  cellpadding: 0,
13641
13655
  border: 0
13642
13656
  }
13643
- }, [h('tbody', [[isPrint ? export_panel_renderEmptyElement($xeTable) : h('tr', [h('td', export_panel_getI18n('vxe.export.expName')), h('td', [VxeUIInputComponent ? h(VxeUIInputComponent, {
13657
+ }, [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, {
13644
13658
  ref: 'filename',
13645
13659
  props: {
13646
13660
  value: defaultOptions.filename,
@@ -13653,7 +13667,7 @@ const {
13653
13667
  defaultOptions.filename = value;
13654
13668
  }
13655
13669
  }
13656
- }) : export_panel_renderEmptyElement($xeTable)])]), isPrint ? export_panel_renderEmptyElement($xeTable) : h('tr', [h('td', export_panel_getI18n('vxe.export.expType')), h('td', [h('vxe-select', {
13670
+ }) : 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', {
13657
13671
  props: {
13658
13672
  value: defaultOptions.type,
13659
13673
  options: storeData.typeList
@@ -13663,7 +13677,7 @@ const {
13663
13677
  defaultOptions.type = value;
13664
13678
  }
13665
13679
  }
13666
- })])]), isPrint || showSheet ? h('tr', [h('td', export_panel_getI18n('vxe.export.expSheetName')), h('td', [VxeUIInputComponent ? h(VxeUIInputComponent, {
13680
+ })])]), (isPrint || showSheet) && settingOptions.showSheet !== false ? h('tr', [h('td', export_panel_getI18n('vxe.export.expSheetName')), h('td', [VxeUIInputComponent ? h(VxeUIInputComponent, {
13667
13681
  ref: 'sheetname',
13668
13682
  props: {
13669
13683
  value: defaultOptions.sheetName,
@@ -13676,7 +13690,7 @@ const {
13676
13690
  defaultOptions.sheetName = value;
13677
13691
  }
13678
13692
  }
13679
- }) : export_panel_renderEmptyElement($xeTable)])]) : export_panel_renderEmptyElement($xeTable), h('tr', [h('td', export_panel_getI18n('vxe.export.expMode')), h('td', [h(VxeUISelectComponent, {
13693
+ }) : 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, {
13680
13694
  props: {
13681
13695
  value: defaultOptions.mode,
13682
13696
  options: storeData.modeList
@@ -13686,7 +13700,7 @@ const {
13686
13700
  defaultOptions.mode = value;
13687
13701
  }
13688
13702
  }
13689
- })])]), h('tr', [h('td', [export_panel_getI18n('vxe.export.expColumn')]), h('td', [h('div', {
13703
+ })])]), settingOptions.showColumn === false ? export_panel_renderEmptyElement($xeTable) : h('tr', [h('td', [export_panel_getI18n('vxe.export.expColumn')]), h('td', [h('div', {
13690
13704
  class: 'vxe-table-export--panel-column'
13691
13705
  }, [h('ul', {
13692
13706
  class: 'vxe-table-export--panel-column-header'
@@ -13707,7 +13721,7 @@ const {
13707
13721
  class: 'vxe-checkbox--label'
13708
13722
  }, export_panel_getI18n('vxe.export.expCurrentColumn'))])]), h('ul', {
13709
13723
  class: 'vxe-table-export--panel-column-body'
13710
- }, colVNs)])])]), isPrint ? h('tr', [h('td', export_panel_getI18n('vxe.export.widthMode')), h('td', [VxeUISelectComponent ? h(VxeUISelectComponent, {
13724
+ }, colVNs)])])]), isPrint && settingOptions.showWidthMode !== false ? h('tr', [h('td', export_panel_getI18n('vxe.export.widthMode')), h('td', [VxeUISelectComponent ? h(VxeUISelectComponent, {
13711
13725
  props: {
13712
13726
  value: defaultOptions.widthMode,
13713
13727
  options: colWidthModeOptions
@@ -13717,7 +13731,7 @@ const {
13717
13731
  defaultOptions.widthMode = value;
13718
13732
  }
13719
13733
  }
13720
- }) : export_panel_renderEmptyElement($xeTable)])]) : export_panel_renderEmptyElement($xeTable), h('tr', [h('td', export_panel_getI18n('vxe.export.expOpts')), parameterSlot ? h('td', [h('div', {
13734
+ }) : 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', {
13721
13735
  class: 'vxe-table-export--panel-option-row'
13722
13736
  }, $xeTable.callSlot(parameterSlot, params, h))]) : h('td', [h('div', {
13723
13737
  class: 'vxe-table-export--panel-option-row'
@@ -18420,12 +18434,22 @@ const convertToRows = originColumns => {
18420
18434
  }
18421
18435
  if (!handleOptions.print) {
18422
18436
  if (beforeExportMethod) {
18423
- beforeExportMethod({
18437
+ const beRest = beforeExportMethod({
18424
18438
  options: handleOptions,
18425
18439
  $table: $xeTable,
18426
18440
  $grid: $xeGrid,
18427
18441
  $gantt: $xeGantt
18428
18442
  });
18443
+ if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(beRest)) {
18444
+ if (!beRest) {
18445
+ const params = {
18446
+ status: false
18447
+ };
18448
+ return Promise.reject(params);
18449
+ }
18450
+ } else {
18451
+ export_mixin_warnLog('vxe.error.returnErr', ['beforeExportMethod', 'boolean', beRest]);
18452
+ }
18429
18453
  }
18430
18454
  }
18431
18455
  if (!handleOptions.data) {
@@ -18556,18 +18580,26 @@ const convertToRows = originColumns => {
18556
18580
  beforeImportMethod
18557
18581
  } = opts;
18558
18582
  if (beforeImportMethod) {
18559
- beforeImportMethod({
18583
+ const biRest = beforeImportMethod({
18560
18584
  options: opts,
18561
18585
  $table: $xeTable
18562
18586
  });
18587
+ if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(biRest)) {
18588
+ if (!biRest) {
18589
+ const params = {
18590
+ status: false
18591
+ };
18592
+ return Promise.reject(params);
18593
+ }
18594
+ } else {
18595
+ export_mixin_warnLog('vxe.error.returnErr', ['beforeImportMethod', 'boolean', biRest]);
18596
+ }
18563
18597
  }
18564
18598
  return handleFileImport($xeTable, file, opts);
18565
18599
  },
18566
18600
  _importData(options) {
18567
18601
  const $xeTable = this;
18568
- const {
18569
- importOpts
18570
- } = this;
18602
+ const importOpts = $xeTable.computeImportOpts;
18571
18603
  const opts = Object.assign({
18572
18604
  types: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps)
18573
18605
  // beforeImportMethod: null,
@@ -18578,10 +18610,20 @@ const convertToRows = originColumns => {
18578
18610
  afterImportMethod
18579
18611
  } = opts;
18580
18612
  if (beforeImportMethod) {
18581
- beforeImportMethod({
18613
+ const biRest = beforeImportMethod({
18582
18614
  options: opts,
18583
- $table: this
18615
+ $table: $xeTable
18584
18616
  });
18617
+ if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(biRest)) {
18618
+ if (!biRest) {
18619
+ const params = {
18620
+ status: false
18621
+ };
18622
+ return Promise.reject(params);
18623
+ }
18624
+ } else {
18625
+ export_mixin_warnLog('vxe.error.returnErr', ['beforeImportMethod', 'boolean', biRest]);
18626
+ }
18585
18627
  }
18586
18628
  return core_.VxeUI.readFile(opts).catch(e => {
18587
18629
  if (afterImportMethod) {
@@ -18639,6 +18681,7 @@ const convertToRows = originColumns => {
18639
18681
  printTitle = document.title || '';
18640
18682
  }
18641
18683
  const beforePrintMethod = opts.beforePrintMethod;
18684
+ const printMethod = opts.printMethod;
18642
18685
  const tableHtml = opts.html || opts.content;
18643
18686
  return new Promise((resolve, reject) => {
18644
18687
  if (core_.VxeUI.print) {
@@ -18658,6 +18701,30 @@ const convertToRows = originColumns => {
18658
18701
  $grid: $xeGrid,
18659
18702
  $gantt: $xeGantt
18660
18703
  });
18704
+ } : undefined,
18705
+ beforePrintMethod: beforePrintMethod ? ({
18706
+ html
18707
+ }) => {
18708
+ return beforePrintMethod({
18709
+ html,
18710
+ content: html,
18711
+ options: opts,
18712
+ $table: $xeTable,
18713
+ $grid: $xeGrid,
18714
+ $gantt: $xeGantt
18715
+ });
18716
+ } : undefined,
18717
+ printMethod: printMethod ? ({
18718
+ html
18719
+ }) => {
18720
+ return printMethod({
18721
+ html,
18722
+ content: html,
18723
+ options: opts,
18724
+ $table: $xeTable,
18725
+ $grid: $xeGrid,
18726
+ $gantt: $xeGantt
18727
+ });
18661
18728
  } : undefined
18662
18729
  }));
18663
18730
  } else {
@@ -18679,6 +18746,30 @@ const convertToRows = originColumns => {
18679
18746
  $grid: $xeGrid,
18680
18747
  $gantt: $xeGantt
18681
18748
  });
18749
+ } : undefined,
18750
+ beforePrintMethod: beforePrintMethod ? ({
18751
+ html
18752
+ }) => {
18753
+ return beforePrintMethod({
18754
+ html,
18755
+ content: html,
18756
+ options: opts,
18757
+ $table: $xeTable,
18758
+ $grid: $xeGrid,
18759
+ $gantt: $xeGantt
18760
+ });
18761
+ } : undefined,
18762
+ printMethod: printMethod ? ({
18763
+ html
18764
+ }) => {
18765
+ return printMethod({
18766
+ html,
18767
+ content: html,
18768
+ options: opts,
18769
+ $table: $xeTable,
18770
+ $grid: $xeGrid,
18771
+ $gantt: $xeGantt
18772
+ });
18682
18773
  } : undefined
18683
18774
  });
18684
18775
  }));
@@ -28693,6 +28784,8 @@ const Toolbar = VxeToolbar;
28693
28784
  noTree: '树结构不支持 "{0}"',
28694
28785
  noGroup: '数据分组后不支持 "{0}"',
28695
28786
  notProp: '不支持的参数 "{0}"',
28787
+ returnErr: '参数 "{0}" 的返回值期望是 "{1}" 实际是 "{2}"',
28788
+ notSupportReturn: '当返回值为 "{0}" 时的参数应该使用用 "{1}" 而不是 "{2}"',
28696
28789
  checkProp: '当数据量过大时可能会导致复选框卡顿,建议设置参数 "{0}" 提升渲染速度',
28697
28790
  coverProp: '"{0}" 的参数 "{1}" 重复定义,这可能会出现错误',
28698
28791
  uniField: '字段名 "{0}" 重复定义,这可能会出现错误',