vxe-table 4.21.7 → 4.21.8

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 (54) hide show
  1. package/dist/all.esm.js +7 -4
  2. package/dist/style.css +1 -1
  3. package/dist/style.min.css +1 -1
  4. package/es/index.css +1 -1
  5. package/es/index.min.css +1 -1
  6. package/es/locale/lang/en-US.js +2 -2
  7. package/es/locale/lang/zh-CHT.js +2 -2
  8. package/es/locale/lang/zh-CN.js +2 -2
  9. package/es/style.css +1 -1
  10. package/es/style.min.css +1 -1
  11. package/es/table/src/table.js +3 -0
  12. package/es/toolbar/style.css +2 -0
  13. package/es/toolbar/style.min.css +1 -1
  14. package/es/ui/index.js +1 -1
  15. package/es/ui/src/log.js +1 -1
  16. package/es/vxe-toolbar/style.css +2 -0
  17. package/es/vxe-toolbar/style.min.css +1 -1
  18. package/lib/index.css +1 -1
  19. package/lib/index.min.css +1 -1
  20. package/lib/index.umd.js +5 -5
  21. package/lib/index.umd.min.js +1 -1
  22. package/lib/locale/lang/en-US.js +2 -2
  23. package/lib/locale/lang/en-US.min.js +1 -1
  24. package/lib/locale/lang/en-US.umd.js +2 -2
  25. package/lib/locale/lang/zh-CHT.js +2 -2
  26. package/lib/locale/lang/zh-CHT.min.js +1 -1
  27. package/lib/locale/lang/zh-CHT.umd.js +2 -2
  28. package/lib/locale/lang/zh-CN.js +2 -2
  29. package/lib/locale/lang/zh-CN.min.js +1 -1
  30. package/lib/locale/lang/zh-CN.umd.js +2 -2
  31. package/lib/style.css +1 -1
  32. package/lib/style.min.css +1 -1
  33. package/lib/table/src/table.js +1 -1
  34. package/lib/table/src/table.min.js +1 -1
  35. package/lib/toolbar/style/style.css +2 -0
  36. package/lib/toolbar/style/style.min.css +1 -1
  37. package/lib/ui/index.js +1 -1
  38. package/lib/ui/index.min.js +1 -1
  39. package/lib/ui/src/log.js +1 -1
  40. package/lib/ui/src/log.min.js +1 -1
  41. package/lib/vxe-toolbar/style/style.css +2 -0
  42. package/lib/vxe-toolbar/style/style.min.css +1 -1
  43. package/package.json +2 -2
  44. package/packages/locale/lang/en-US.ts +2 -2
  45. package/packages/locale/lang/zh-CHT.ts +2 -2
  46. package/packages/locale/lang/zh-CN.ts +2 -2
  47. package/packages/table/src/table.ts +3 -0
  48. package/styles/components/toolbar.scss +2 -0
  49. /package/es/{iconfont.1788696081971.ttf → iconfont.1788921188086.ttf} +0 -0
  50. /package/es/{iconfont.1788696081971.woff → iconfont.1788921188086.woff} +0 -0
  51. /package/es/{iconfont.1788696081971.woff2 → iconfont.1788921188086.woff2} +0 -0
  52. /package/lib/{iconfont.1788696081971.ttf → iconfont.1788921188086.ttf} +0 -0
  53. /package/lib/{iconfont.1788696081971.woff → iconfont.1788921188086.woff} +0 -0
  54. /package/lib/{iconfont.1788696081971.woff2 → iconfont.1788921188086.woff2} +0 -0
package/dist/all.esm.js CHANGED
@@ -47,7 +47,7 @@ function getDefaultConfig(val1, def1) {
47
47
  return XEUtils.eqNull(val1) ? def1 : val1;
48
48
  }
49
49
 
50
- const version = "4.21.7";
50
+ const version = "4.21.8";
51
51
  VxeUI.version = version;
52
52
  VxeUI.tableVersion = version;
53
53
  VxeUI.setConfig({
@@ -931,7 +931,7 @@ function getPopupWrapperElement(panelElem) {
931
931
  }
932
932
 
933
933
  const { log } = VxeUI;
934
- const tableVersion = `table v${"4.21.7"}`;
934
+ const tableVersion = `table v${"4.21.8"}`;
935
935
  function createComponentLog(name) {
936
936
  const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
937
937
  const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -30386,6 +30386,9 @@ var VxeTableComponent = defineVxeComponent({
30386
30386
  if (mouseOpts.area && areaOpts.selectCellByHeader && columnOpts.drag && columnDragOpts.trigger === 'cell') {
30387
30387
  errLog$2('vxe.error.notSupportProp', ['area-config.selectCellByHeader & column-config.drag', 'column-drag-config.trigger=cell', 'column-drag-config.trigger=default | area-config.selectCellByHeader=false']);
30388
30388
  }
30389
+ if (mouseOpts.area && props.spanMethod) {
30390
+ errLog$2('vxe.error.notSupportProp', ['mouse-config.area', 'span-method', 'merge-cells']);
30391
+ }
30389
30392
  }
30390
30393
  if (!$xeTable.handlePivotTableAggData) {
30391
30394
  if (customOpts.allowGroup) {
@@ -33724,7 +33727,7 @@ var zhCN = {
33724
33727
  mergeErr: '无法对合并单元格进行该操作',
33725
33728
  multiErr: '无法对多重选择区域进行该操作',
33726
33729
  selectErr: '无法操作指定区域的单元格',
33727
- extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同',
33730
+ extendErr: '若要执行此操作，所有合并的单元格需大小相同',
33728
33731
  pasteMultiErr: '无法粘贴，需要相同大小的复制的区域和粘贴的区域才能执行此操作',
33729
33732
  cpInvalidErr: '该操作无法进行，您选择的区域中存在被禁止的列（{0}）'
33730
33733
  },
@@ -33876,7 +33879,7 @@ var zhCN = {
33876
33879
  area: {
33877
33880
  mergeErr: '无法对合并单元格进行该操作',
33878
33881
  multiErr: '无法对多重选择区域进行该操作',
33879
- extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同',
33882
+ extendErr: '若要执行此操作，所有合并的单元格需大小相同',
33880
33883
  pasteMultiErr: '无法粘贴，需要相同大小的复制的区域和粘贴的区域才能执行此操作'
33881
33884
  },
33882
33885
  fnr: {