vxe-table 3.18.16 → 3.18.18

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 (23) hide show
  1. package/es/style.css +1 -1
  2. package/es/table/src/methods.js +19 -17
  3. package/es/ui/index.js +1 -1
  4. package/es/ui/src/log.js +1 -1
  5. package/helper/vetur/attributes.json +1 -1
  6. package/helper/vetur/tags.json +1 -1
  7. package/lib/index.umd.js +23 -15
  8. package/lib/index.umd.min.js +1 -1
  9. package/lib/style.css +1 -1
  10. package/lib/table/src/methods.js +21 -13
  11. package/lib/table/src/methods.min.js +1 -1
  12. package/lib/ui/index.js +1 -1
  13. package/lib/ui/index.min.js +1 -1
  14. package/lib/ui/src/log.js +1 -1
  15. package/lib/ui/src/log.min.js +1 -1
  16. package/package.json +1 -1
  17. package/packages/table/src/methods.ts +19 -13
  18. /package/es/{iconfont.1758344480506.ttf → iconfont.1758524611561.ttf} +0 -0
  19. /package/es/{iconfont.1758344480506.woff → iconfont.1758524611561.woff} +0 -0
  20. /package/es/{iconfont.1758344480506.woff2 → iconfont.1758524611561.woff2} +0 -0
  21. /package/lib/{iconfont.1758344480506.ttf → iconfont.1758524611561.ttf} +0 -0
  22. /package/lib/{iconfont.1758344480506.woff → iconfont.1758524611561.woff} +0 -0
  23. /package/lib/{iconfont.1758344480506.woff2 → iconfont.1758524611561.woff2} +0 -0
package/lib/table/src/methods.js CHANGED
@@ -2453,8 +2453,12 @@ function removeBodyMerges($xeTable, merges) {
2453
2453
  return rest;
2454
2454
  }
2455
2455
  function handleHeaderMerge($xeTable, merges) {
2456
+ const props = $xeTable;
2456
2457
  const reactData = $xeTable;
2457
2458
  const internalData = $xeTable;
2459
+ const {
2460
+ showCustomHeader
2461
+ } = props;
2458
2462
  const {
2459
2463
  footerTableData
2460
2464
  } = reactData;
@@ -2491,6 +2495,10 @@ function handleHeaderMerge($xeTable, merges) {
2491
2495
  if (mergeRowIndex > -1 && mergeColumnIndex > -1 && (rowspan || colspan)) {
2492
2496
  rowspan = _xeUtils.default.toNumber(rowspan) || 1;
2493
2497
  colspan = _xeUtils.default.toNumber(colspan) || 1;
2498
+ if (!showCustomHeader && rowspan > 1) {
2499
+ (0, _log.errLog)('vxe.error.notSupportProp', ['[table] show-custom-header=false', `rowspan=${rowspan}`, 'rowspan=1']);
2500
+ return;
2501
+ }
2494
2502
  if (rowspan > 1 || colspan > 1) {
2495
2503
  const row = footerTableData[mergeRowIndex];
2496
2504
  const column = visibleColumn[mergeColumnIndex];
@@ -13563,19 +13571,19 @@ const Methods = {
13563
13571
  const funcs = 'setFilter,openFilter,clearFilter,saveFilterPanel,saveFilterPanelByEvent,resetFilterPanel,resetFilterPanelByEvent,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,insertChild,insertChildAt,insertChildNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getEditCell,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,getCustomVisible,openCustom,closeCustom,toggleCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
13564
13572
  funcs.forEach(name => {
13565
13573
  Methods[name] = function (...args) {
13566
- if (!this[`_${name}`]) {
13567
- if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
13568
- (0, _log.errLog)('vxe.error.reqModule', ['Export']);
13569
- } else if ('fullValidate,validate'.split(',').includes(name)) {
13570
- (0, _log.errLog)('vxe.error.reqModule', ['Validator']);
13571
- } else if ('setFilter,openFilter,clearFilter,getCheckedFilters'.split(',').includes(name)) {
13572
- (0, _log.errLog)('vxe.error.reqModule', ['Filter']);
13573
- } else if ('insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,getEditRecord,getEditCell,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell'.split(',').includes(name)) {
13574
- (0, _log.errLog)('vxe.error.reqModule', ['Edit']);
13575
- } else if ('openCustom'.split(',').includes(name)) {
13576
- (0, _log.errLog)('vxe.error.reqModule', ['Custom']);
13577
- }
13578
- }
13574
+ // if (!this[`_${name}`]) {
13575
+ // if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
13576
+ // errLog('vxe.error.reqModule', ['Export'])
13577
+ // } else if ('fullValidate,validate'.split(',').includes(name)) {
13578
+ // errLog('vxe.error.reqModule', ['Validator'])
13579
+ // } else if ('setFilter,openFilter,clearFilter,getCheckedFilters'.split(',').includes(name)) {
13580
+ // errLog('vxe.error.reqModule', ['Filter'])
13581
+ // } else if ('insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,getEditRecord,getEditCell,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell'.split(',').includes(name)) {
13582
+ // errLog('vxe.error.reqModule', ['Edit'])
13583
+ // } else if ('openCustom'.split(',').includes(name)) {
13584
+ // errLog('vxe.error.reqModule', ['Custom'])
13585
+ // }
13586
+ // }
13579
13587
  return this[`_${name}`] ? this[`_${name}`](...args) : null;
13580
13588
  };
13581
13589
  });