vxe-table 4.11.14 → 4.11.15

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 (118) hide show
  1. package/es/locale/lang/ar-EG.js +1 -0
  2. package/es/locale/lang/de-DE.js +1 -0
  3. package/es/locale/lang/en-US.js +3 -2
  4. package/es/locale/lang/es-ES.js +1 -0
  5. package/es/locale/lang/fr-FR.js +1 -0
  6. package/es/locale/lang/hu-HU.js +1 -0
  7. package/es/locale/lang/hy-AM.js +1 -0
  8. package/es/locale/lang/id-ID.js +1 -0
  9. package/es/locale/lang/it-IT.js +1 -0
  10. package/es/locale/lang/ja-JP.js +1 -0
  11. package/es/locale/lang/ko-KR.js +1 -0
  12. package/es/locale/lang/nb-NO.js +1 -0
  13. package/es/locale/lang/pt-BR.js +1 -0
  14. package/es/locale/lang/ru-RU.js +1 -0
  15. package/es/locale/lang/th-TH.js +1 -0
  16. package/es/locale/lang/ug-CN.js +1 -0
  17. package/es/locale/lang/uk-UA.js +1 -0
  18. package/es/locale/lang/vi-VN.js +1 -0
  19. package/es/locale/lang/zh-CHT.js +1 -0
  20. package/es/locale/lang/zh-CN.js +1 -0
  21. package/es/style.css +1 -1
  22. package/es/table/module/custom/panel.js +18 -16
  23. package/es/table/src/cell.js +3 -2
  24. package/es/table/src/table.js +130 -134
  25. package/es/ui/index.js +1 -1
  26. package/es/ui/src/log.js +1 -1
  27. package/lib/index.umd.js +157 -156
  28. package/lib/index.umd.min.js +1 -1
  29. package/lib/locale/lang/ar-EG.js +1 -0
  30. package/lib/locale/lang/ar-EG.min.js +1 -1
  31. package/lib/locale/lang/de-DE.js +1 -0
  32. package/lib/locale/lang/de-DE.min.js +1 -1
  33. package/lib/locale/lang/en-US.js +3 -2
  34. package/lib/locale/lang/en-US.min.js +1 -1
  35. package/lib/locale/lang/en-US.umd.js +3 -2
  36. package/lib/locale/lang/es-ES.js +1 -0
  37. package/lib/locale/lang/es-ES.min.js +1 -1
  38. package/lib/locale/lang/es-ES.umd.js +1 -0
  39. package/lib/locale/lang/fr-FR.js +1 -0
  40. package/lib/locale/lang/fr-FR.min.js +1 -1
  41. package/lib/locale/lang/hu-HU.js +1 -0
  42. package/lib/locale/lang/hu-HU.min.js +1 -1
  43. package/lib/locale/lang/hu-HU.umd.js +1 -0
  44. package/lib/locale/lang/hy-AM.js +1 -0
  45. package/lib/locale/lang/hy-AM.min.js +1 -1
  46. package/lib/locale/lang/id-ID.js +1 -0
  47. package/lib/locale/lang/id-ID.min.js +1 -1
  48. package/lib/locale/lang/it-IT.js +1 -0
  49. package/lib/locale/lang/it-IT.min.js +1 -1
  50. package/lib/locale/lang/ja-JP.js +1 -0
  51. package/lib/locale/lang/ja-JP.min.js +1 -1
  52. package/lib/locale/lang/ja-JP.umd.js +1 -0
  53. package/lib/locale/lang/ko-KR.js +1 -0
  54. package/lib/locale/lang/ko-KR.min.js +1 -1
  55. package/lib/locale/lang/ko-KR.umd.js +1 -0
  56. package/lib/locale/lang/nb-NO.js +1 -0
  57. package/lib/locale/lang/nb-NO.min.js +1 -1
  58. package/lib/locale/lang/pt-BR.js +1 -0
  59. package/lib/locale/lang/pt-BR.min.js +1 -1
  60. package/lib/locale/lang/pt-BR.umd.js +1 -0
  61. package/lib/locale/lang/ru-RU.js +1 -0
  62. package/lib/locale/lang/ru-RU.min.js +1 -1
  63. package/lib/locale/lang/ru-RU.umd.js +1 -0
  64. package/lib/locale/lang/th-TH.js +1 -0
  65. package/lib/locale/lang/th-TH.min.js +1 -1
  66. package/lib/locale/lang/ug-CN.js +1 -0
  67. package/lib/locale/lang/ug-CN.min.js +1 -1
  68. package/lib/locale/lang/uk-UA.js +1 -0
  69. package/lib/locale/lang/uk-UA.min.js +1 -1
  70. package/lib/locale/lang/uk-UA.umd.js +1 -0
  71. package/lib/locale/lang/vi-VN.js +1 -0
  72. package/lib/locale/lang/vi-VN.min.js +1 -1
  73. package/lib/locale/lang/zh-CHT.js +1 -0
  74. package/lib/locale/lang/zh-CHT.min.js +1 -1
  75. package/lib/locale/lang/zh-CN.js +1 -0
  76. package/lib/locale/lang/zh-CN.min.js +1 -1
  77. package/lib/locale/lang/zh-CN.umd.js +1 -0
  78. package/lib/style.css +1 -1
  79. package/lib/table/module/custom/panel.js +18 -16
  80. package/lib/table/module/custom/panel.min.js +1 -1
  81. package/lib/table/src/cell.js +4 -2
  82. package/lib/table/src/cell.min.js +1 -1
  83. package/lib/table/src/table.js +132 -136
  84. package/lib/table/src/table.min.js +1 -1
  85. package/lib/ui/index.js +1 -1
  86. package/lib/ui/index.min.js +1 -1
  87. package/lib/ui/src/log.js +1 -1
  88. package/lib/ui/src/log.min.js +1 -1
  89. package/package.json +2 -2
  90. package/packages/locale/lang/ar-EG.ts +1 -0
  91. package/packages/locale/lang/de-DE.ts +1 -0
  92. package/packages/locale/lang/en-US.ts +3 -2
  93. package/packages/locale/lang/es-ES.ts +1 -0
  94. package/packages/locale/lang/fr-FR.ts +1 -0
  95. package/packages/locale/lang/hu-HU.ts +1 -0
  96. package/packages/locale/lang/hy-AM.ts +1 -0
  97. package/packages/locale/lang/id-ID.ts +1 -0
  98. package/packages/locale/lang/it-IT.ts +1 -0
  99. package/packages/locale/lang/ja-JP.ts +1 -0
  100. package/packages/locale/lang/ko-KR.ts +1 -0
  101. package/packages/locale/lang/nb-NO.ts +1 -0
  102. package/packages/locale/lang/pt-BR.ts +1 -0
  103. package/packages/locale/lang/ru-RU.ts +1 -0
  104. package/packages/locale/lang/th-TH.ts +1 -0
  105. package/packages/locale/lang/ug-CN.ts +1 -0
  106. package/packages/locale/lang/uk-UA.ts +1 -0
  107. package/packages/locale/lang/vi-VN.ts +1 -0
  108. package/packages/locale/lang/zh-CHT.ts +1 -0
  109. package/packages/locale/lang/zh-CN.ts +1 -0
  110. package/packages/table/module/custom/panel.ts +18 -16
  111. package/packages/table/src/cell.ts +3 -2
  112. package/packages/table/src/table.ts +130 -134
  113. /package/es/{iconfont.1740640573077.ttf → iconfont.1740723830079.ttf} +0 -0
  114. /package/es/{iconfont.1740640573077.woff → iconfont.1740723830079.woff} +0 -0
  115. /package/es/{iconfont.1740640573077.woff2 → iconfont.1740723830079.woff2} +0 -0
  116. /package/lib/{iconfont.1740640573077.ttf → iconfont.1740723830079.ttf} +0 -0
  117. /package/lib/{iconfont.1740640573077.woff → iconfont.1740723830079.woff} +0 -0
  118. /package/lib/{iconfont.1740640573077.woff2 → iconfont.1740723830079.woff2} +0 -0
package/lib/index.umd.js CHANGED
@@ -3051,7 +3051,7 @@ function eqEmptyValue(cellValue) {
3051
3051
  ;// ./packages/ui/index.ts
3052
3052
 
3053
3053
 
3054
- const version = "4.11.14";
3054
+ const version = "4.11.15";
3055
3055
  core_.VxeUI.version = version;
3056
3056
  core_.VxeUI.tableVersion = version;
3057
3057
  core_.VxeUI.setConfig({
@@ -3499,7 +3499,7 @@ var es_iterator_some = __webpack_require__(3579);
3499
3499
  const {
3500
3500
  log: log_log
3501
3501
  } = core_.VxeUI;
3502
- const log_version = `table v${"4.11.14"}`;
3502
+ const log_version = `table v${"4.11.15"}`;
3503
3503
  const warnLog = log_log.create('warn', log_version);
3504
3504
  const errLog = log_log.create('error', log_version);
3505
3505
  ;// ./packages/table/src/columnInfo.ts
@@ -4645,10 +4645,12 @@ function renderCellBaseVNs(params, content) {
4645
4645
  } = tableProps;
4646
4646
  const {
4647
4647
  computeRowOpts,
4648
- computeRowDragOpts
4648
+ computeRowDragOpts,
4649
+ computeTreeOpts
4649
4650
  } = $table.getComputeMaps();
4650
4651
  const rowOpts = computeRowOpts.value;
4651
4652
  const rowDragOpts = computeRowDragOpts.value;
4653
+ const treeOpts = computeTreeOpts.value;
4652
4654
  const {
4653
4655
  showIcon,
4654
4656
  isPeerDrag,
@@ -4659,7 +4661,7 @@ function renderCellBaseVNs(params, content) {
4659
4661
  const vns = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(content) ? content : [content];
4660
4662
  if (dragSort && rowOpts.drag && (showIcon || (dragConfig ? dragConfig.showRowIcon : false)) && (!rVisibleMethod || rVisibleMethod(params))) {
4661
4663
  if (treeConfig) {
4662
- if (isPeerDrag || isCrossDrag || !level) {
4664
+ if (treeOpts.transform && (isPeerDrag || isCrossDrag || !level)) {
4663
4665
  vns.unshift(renderCellDragIcon(params));
4664
4666
  }
4665
4667
  } else {
@@ -8448,11 +8450,12 @@ const {
8448
8450
  if (prevDragCol && dragCol) {
8449
8451
  // 判断是否有拖动
8450
8452
  if (prevDragCol !== dragCol) {
8451
- const oldColumn = dragCol;
8453
+ const dragColumn = dragCol;
8452
8454
  const newColumn = prevDragCol;
8453
8455
  Promise.resolve(dragEndMethod ? dragEndMethod({
8454
- oldColumn,
8456
+ oldColumn: dragColumn,
8455
8457
  newColumn,
8458
+ dragColumn,
8456
8459
  dragPos: prevDragPos,
8457
8460
  dragToChild: !!prevDragToChild,
8458
8461
  offsetIndex: dragOffsetIndex
@@ -8463,13 +8466,13 @@ const {
8463
8466
  let oafIndex = -1;
8464
8467
  let nafIndex = -1;
8465
8468
  const oldAllMaps = {};
8466
- external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([oldColumn], column => {
8469
+ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([dragColumn], column => {
8467
8470
  oldAllMaps[column.id] = column;
8468
8471
  });
8469
8472
  let isSelfToChildStatus = false;
8470
8473
  // 只有实时拖拽支持跨层级
8471
8474
  if (immediate) {
8472
- if (oldColumn.parentId && newColumn.parentId) {
8475
+ if (dragColumn.parentId && newColumn.parentId) {
8473
8476
  // 子到子
8474
8477
  if (!isCrossDrag) {
8475
8478
  return;
@@ -8486,7 +8489,7 @@ const {
8486
8489
  return;
8487
8490
  }
8488
8491
  }
8489
- } else if (oldColumn.parentId) {
8492
+ } else if (dragColumn.parentId) {
8490
8493
  // 子到根
8491
8494
  if (!isCrossDrag) {
8492
8495
  return;
@@ -8511,7 +8514,7 @@ const {
8511
8514
  } else {
8512
8515
  // 根到根
8513
8516
  }
8514
- const oldewMatchRest = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(collectColumn, item => item.id === oldColumn.id);
8517
+ const oldewMatchRest = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(collectColumn, item => item.id === dragColumn.id);
8515
8518
  // 改变层级
8516
8519
  if (isSelfToChildStatus && isCrossDrag && isSelfToChildDrag) {
8517
8520
  if (oldewMatchRest) {
@@ -8519,12 +8522,12 @@ const {
8519
8522
  items: oCols,
8520
8523
  index: oIndex
8521
8524
  } = oldewMatchRest;
8522
- const childList = oldColumn.children || [];
8525
+ const childList = dragColumn.children || [];
8523
8526
  childList.forEach(column => {
8524
- column.parentId = oldColumn.parentId;
8527
+ column.parentId = dragColumn.parentId;
8525
8528
  });
8526
8529
  oCols.splice(oIndex, 1, ...childList);
8527
- oldColumn.children = [];
8530
+ dragColumn.children = [];
8528
8531
  }
8529
8532
  } else {
8530
8533
  if (oldewMatchRest) {
@@ -8548,11 +8551,11 @@ const {
8548
8551
  } = newMatchRest;
8549
8552
  // 转子级
8550
8553
  if (isCrossDrag && isToChildDrag && prevDragToChild) {
8551
- oldColumn.parentId = newColumn.id;
8552
- newColumn.children = (newColumn.children || []).concat([oldColumn]);
8554
+ dragColumn.parentId = newColumn.id;
8555
+ newColumn.children = (newColumn.children || []).concat([dragColumn]);
8553
8556
  } else {
8554
- oldColumn.parentId = newColumn.parentId;
8555
- nCols.splice(nIndex + dragOffsetIndex, 0, oldColumn);
8557
+ dragColumn.parentId = newColumn.parentId;
8558
+ nCols.splice(nIndex + dragOffsetIndex, 0, dragColumn);
8556
8559
  }
8557
8560
  if (!nParent) {
8558
8561
  nafIndex = nIndex;
@@ -8565,10 +8568,10 @@ const {
8565
8568
  }
8566
8569
  });
8567
8570
  } else {
8568
- oafIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(customColumnList, item => item.id === oldColumn.id);
8571
+ oafIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(customColumnList, item => item.id === dragColumn.id);
8569
8572
  customColumnList.splice(oafIndex, 1);
8570
8573
  nafIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(customColumnList, item => item.id === newColumn.id);
8571
- customColumnList.splice(nafIndex + dragOffsetIndex, 0, oldColumn);
8574
+ customColumnList.splice(nafIndex + dragOffsetIndex, 0, dragColumn);
8572
8575
  }
8573
8576
  reactData.isDragColMove = true;
8574
8577
  if (mouseConfig) {
@@ -8581,8 +8584,9 @@ const {
8581
8584
  }
8582
8585
  }
8583
8586
  $xeTable.dispatchEvent('column-dragend', {
8584
- oldColumn,
8587
+ oldColumn: dragColumn,
8585
8588
  newColumn,
8589
+ dragColumn,
8586
8590
  dragPos: prevDragPos,
8587
8591
  offsetIndex: dragOffsetIndex,
8588
8592
  _index: {
@@ -19551,6 +19555,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
19551
19555
  const dragParams = {
19552
19556
  oldRow: dragRow,
19553
19557
  newRow: prevDragRow,
19558
+ dragRow,
19554
19559
  dragPos: prevDragPos,
19555
19560
  dragToChild: !!prevDragToChild,
19556
19561
  offsetIndex: dragOffsetIndex
@@ -19692,6 +19697,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
19692
19697
  dispatchEvent('row-dragend', {
19693
19698
  oldRow: dragRow,
19694
19699
  newRow: prevDragRow,
19700
+ dragRow,
19695
19701
  dragPos: prevDragPos,
19696
19702
  dragToChild: isDragToChildFlag,
19697
19703
  offsetIndex: dragOffsetIndex,
@@ -19874,11 +19880,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
19874
19880
  if (prevDragCol && dragCol) {
19875
19881
  // 判断是否有拖动
19876
19882
  if (prevDragCol !== dragCol) {
19877
- const oldColumn = dragCol;
19883
+ const dragColumn = dragCol;
19878
19884
  const newColumn = prevDragCol;
19879
19885
  const dragParams = {
19880
- oldColumn,
19886
+ oldColumn: dragColumn,
19881
19887
  newColumn,
19888
+ dragColumn,
19882
19889
  dragPos: prevDragPos,
19883
19890
  dragToChild: !!prevDragToChild,
19884
19891
  offsetIndex: dragOffsetIndex
@@ -19891,14 +19898,14 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
19891
19898
  let oafIndex = -1;
19892
19899
  let nafIndex = -1;
19893
19900
  const oldAllMaps = {};
19894
- external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([oldColumn], column => {
19901
+ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([dragColumn], column => {
19895
19902
  oldAllMaps[column.id] = column;
19896
19903
  });
19897
19904
  let isSelfToChildStatus = false;
19898
- if (oldColumn.parentId && newColumn.parentId) {
19905
+ if (dragColumn.parentId && newColumn.parentId) {
19899
19906
  // 子到子
19900
19907
  if (isPeerDrag && !isCrossDrag) {
19901
- if (oldColumn.parentId !== newColumn.parentId) {
19908
+ if (dragColumn.parentId !== newColumn.parentId) {
19902
19909
  // 非同级
19903
19910
  return;
19904
19911
  }
@@ -19919,7 +19926,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
19919
19926
  }
19920
19927
  }
19921
19928
  }
19922
- } else if (oldColumn.parentId) {
19929
+ } else if (dragColumn.parentId) {
19923
19930
  // 子到根
19924
19931
  if (!isCrossDrag) {
19925
19932
  return;
@@ -19944,7 +19951,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
19944
19951
  } else {
19945
19952
  // 根到根
19946
19953
  }
19947
- const oldewMatchRest = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(collectColumn, item => item.id === oldColumn.id);
19954
+ const oldewMatchRest = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(collectColumn, item => item.id === dragColumn.id);
19948
19955
  // 改变层级
19949
19956
  if (isSelfToChildStatus && isCrossDrag && isSelfToChildDrag) {
19950
19957
  if (oldewMatchRest) {
@@ -19952,12 +19959,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
19952
19959
  items: oCols,
19953
19960
  index: oIndex
19954
19961
  } = oldewMatchRest;
19955
- const childList = oldColumn.children || [];
19962
+ const childList = dragColumn.children || [];
19956
19963
  childList.forEach(column => {
19957
- column.parentId = oldColumn.parentId;
19964
+ column.parentId = dragColumn.parentId;
19958
19965
  });
19959
19966
  oCols.splice(oIndex, 1, ...childList);
19960
- oldColumn.children = [];
19967
+ dragColumn.children = [];
19961
19968
  }
19962
19969
  } else {
19963
19970
  if (oldewMatchRest) {
@@ -19981,11 +19988,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
19981
19988
  } = newMatchRest;
19982
19989
  // 转子级
19983
19990
  if (isCrossDrag && isToChildDrag && isDragToChildFlag) {
19984
- oldColumn.parentId = newColumn.id;
19985
- newColumn.children = (newColumn.children || []).concat([oldColumn]);
19991
+ dragColumn.parentId = newColumn.id;
19992
+ newColumn.children = (newColumn.children || []).concat([dragColumn]);
19986
19993
  } else {
19987
- oldColumn.parentId = newColumn.parentId;
19988
- nCols.splice(nIndex + dragOffsetIndex, 0, oldColumn);
19994
+ dragColumn.parentId = newColumn.parentId;
19995
+ nCols.splice(nIndex + dragOffsetIndex, 0, dragColumn);
19989
19996
  }
19990
19997
  if (!nParent) {
19991
19998
  nafIndex = nIndex;
@@ -20008,8 +20015,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
20008
20015
  }
20009
20016
  }
20010
20017
  dispatchEvent('column-dragend', {
20011
- oldColumn,
20018
+ oldColumn: dragColumn,
20012
20019
  newColumn,
20020
+ dragColumn,
20013
20021
  dragPos: prevDragPos,
20014
20022
  dragToChild: isDragToChildFlag,
20015
20023
  offsetIndex: dragOffsetIndex,
@@ -20466,7 +20474,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
20466
20474
  const {
20467
20475
  target,
20468
20476
  deltaY,
20469
- deltaX
20477
+ deltaX,
20478
+ shiftKey
20470
20479
  } = evnt;
20471
20480
  if (target && /^textarea$/i.test(target.tagName)) {
20472
20481
  return;
@@ -20507,8 +20516,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
20507
20516
  return;
20508
20517
  }
20509
20518
  const wheelSpeed = getWheelSpeed(reactData.lastScrollTime);
20510
- const deltaTop = Math.ceil(deltaY * wheelSpeed);
20511
- const deltaLeft = Math.ceil(deltaX * wheelSpeed);
20519
+ const deltaTop = Math.ceil((shiftKey ? deltaX : deltaY) * wheelSpeed);
20520
+ const deltaLeft = Math.ceil((shiftKey ? deltaY : deltaX) * wheelSpeed);
20512
20521
  const isTopWheel = deltaTop < 0;
20513
20522
  const currScrollTop = bodyScrollElem.scrollTop;
20514
20523
  // 如果滚动位置已经是顶部或底部,则不需要触发
@@ -21698,6 +21707,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
21698
21707
  (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
21699
21708
  const {
21700
21709
  data,
21710
+ exportConfig,
21711
+ importConfig,
21701
21712
  treeConfig,
21702
21713
  showOverflow
21703
21714
  } = props;
@@ -21712,132 +21723,121 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
21712
21723
  const checkboxOpts = computeCheckboxOpts.value;
21713
21724
  const expandOpts = computeExpandOpts.value;
21714
21725
  const rowOpts = computeRowOpts.value;
21715
- if (true) {
21716
- if (props.rowId) {
21717
- warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
21718
- }
21719
- if (props.rowKey) {
21720
- warnLog('vxe.error.delProp', ['row-key', 'row-config.useKey']);
21721
- }
21722
- if (props.columnKey) {
21723
- warnLog('vxe.error.delProp', ['column-id', 'column-config.useKey']);
21724
- }
21725
- if (!(props.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
21726
- warnLog('vxe.error.reqProp', ['row-config.keyField']);
21727
- }
21728
- if (props.editConfig && (editOpts.showStatus || editOpts.showUpdateStatus || editOpts.showInsertStatus) && !props.keepSource) {
21729
- warnLog('vxe.error.reqProp', ['keep-source']);
21730
- }
21731
- if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(props.rowKey || rowOpts.useKey) || !showOverflow)) {
21732
- warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
21733
- }
21734
- if (treeConfig && !treeOpts.transform && props.stripe) {
21735
- warnLog('vxe.error.noTree', ['stripe']);
21736
- }
21737
- if (props.showFooter && !(props.footerMethod || props.footerData)) {
21738
- warnLog('vxe.error.reqProp', ['footer-data | footer-method']);
21739
- }
21740
- if (rowOpts.height) {
21741
- warnLog('vxe.error.delProp', ['row-config.height', 'cell-config.height']);
21742
- }
21743
- // if (props.highlightCurrentRow) {
21744
- // warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent'])
21745
- // }
21746
- // if (props.highlightHoverRow) {
21747
- // warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover'])
21748
- // }
21749
- // if (props.highlightCurrentColumn) {
21750
- // warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent'])
21751
- // }
21752
- // if (props.highlightHoverColumn) {
21753
- // warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover'])
21754
- // }
21755
- // 检查导入导出类型,如果自定义导入导出方法,则不校验类型
21756
- const {
21757
- exportConfig,
21758
- importConfig
21759
- } = props;
21760
- const exportOpts = computeExportOpts.value;
21761
- const importOpts = computeImportOpts.value;
21762
- if (importConfig && importOpts.types && !importOpts.importMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps), importOpts.types)) {
21763
- warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter(type => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps), type)).join(',') || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps).join(',')]);
21764
- }
21765
- if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps), exportOpts.types)) {
21766
- warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter(type => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps), type)).join(',') || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps).join(',')]);
21767
- }
21726
+ const customOpts = computeCustomOpts.value;
21727
+ const mouseOpts = computeMouseOpts.value;
21728
+ const exportOpts = computeExportOpts.value;
21729
+ const importOpts = computeImportOpts.value;
21730
+ if (props.rowId) {
21731
+ warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
21768
21732
  }
21769
- if (true) {
21770
- const customOpts = computeCustomOpts.value;
21771
- const mouseOpts = computeMouseOpts.value;
21772
- const rowOpts = computeRowOpts.value;
21773
- if (!props.id) {
21774
- if ((props.customConfig ? isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {
21775
- errLog('vxe.error.reqProp', ['id']);
21776
- }
21777
- }
21778
- if (props.treeConfig && checkboxOpts.range) {
21779
- errLog('vxe.error.noTree', ['checkbox-config.range']);
21780
- }
21781
- if (rowOpts.height && !props.showOverflow) {
21782
- warnLog('vxe.error.notProp', ['table.show-overflow']);
21783
- }
21784
- if (!$xeTable.handleMousedownCellAreaEvent) {
21785
- if (props.areaConfig) {
21786
- warnLog('vxe.error.notProp', ['area-config']);
21787
- }
21788
- if (props.clipConfig) {
21789
- warnLog('vxe.error.notProp', ['clip-config']);
21790
- }
21791
- if (props.fnrConfig) {
21792
- warnLog('vxe.error.notProp', ['fnr-config']);
21793
- }
21794
- if (mouseOpts.area) {
21795
- errLog('vxe.error.notProp', ['mouse-config.area']);
21796
- return;
21797
- }
21798
- }
21799
- if (props.dragConfig) {
21800
- warnLog('vxe.error.delProp', ['drag-config', 'row-drag-config']);
21801
- }
21802
- if (props.treeConfig && treeOpts.children) {
21803
- warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);
21804
- }
21805
- if (props.treeConfig && treeOpts.line) {
21806
- warnLog('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine']);
21807
- }
21808
- if (mouseOpts.area && mouseOpts.selected) {
21809
- warnLog('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected']);
21733
+ if (props.rowKey) {
21734
+ warnLog('vxe.error.delProp', ['row-key', 'row-config.useKey']);
21735
+ }
21736
+ if (props.columnKey) {
21737
+ warnLog('vxe.error.delProp', ['column-id', 'column-config.useKey']);
21738
+ }
21739
+ if (!(props.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
21740
+ warnLog('vxe.error.reqProp', ['row-config.keyField']);
21741
+ }
21742
+ if (props.editConfig && (editOpts.showStatus || editOpts.showUpdateStatus || editOpts.showInsertStatus) && !props.keepSource) {
21743
+ warnLog('vxe.error.reqProp', ['keep-source']);
21744
+ }
21745
+ if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(props.rowKey || rowOpts.useKey) || !showOverflow)) {
21746
+ warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
21747
+ }
21748
+ if (treeConfig && !treeOpts.transform && props.stripe) {
21749
+ warnLog('vxe.error.noTree', ['stripe']);
21750
+ }
21751
+ if (props.showFooter && !(props.footerMethod || props.footerData)) {
21752
+ warnLog('vxe.error.reqProp', ['footer-data | footer-method']);
21753
+ }
21754
+ if (rowOpts.height) {
21755
+ warnLog('vxe.error.delProp', ['row-config.height', 'cell-config.height']);
21756
+ }
21757
+ if (props.highlightCurrentRow) {
21758
+ warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent']);
21759
+ }
21760
+ if (props.highlightHoverRow) {
21761
+ warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover']);
21762
+ }
21763
+ if (props.highlightCurrentColumn) {
21764
+ warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent']);
21765
+ }
21766
+ if (props.highlightHoverColumn) {
21767
+ warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover']);
21768
+ }
21769
+ // 检查导入导出类型,如果自定义导入导出方法,则不校验类型
21770
+ if (importConfig && importOpts.types && !importOpts.importMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps), importOpts.types)) {
21771
+ warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter(type => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps), type)).join(',') || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(importOpts._typeMaps).join(',')]);
21772
+ }
21773
+ if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includeArrays(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps), exportOpts.types)) {
21774
+ warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter(type => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps), type)).join(',') || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps).join(',')]);
21775
+ }
21776
+ if (!props.id) {
21777
+ if ((props.customConfig ? isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {
21778
+ errLog('vxe.error.reqProp', ['id']);
21810
21779
  }
21811
- // if (mouseOpts.area && checkboxOpts.range) {
21812
- // warnLog('vxe.error.errConflicts', ['mouse-config.area', 'checkbox-config.range'])
21813
- // }
21814
- if (mouseOpts.area && props.treeConfig && !treeOpts.transform) {
21815
- errLog('vxe.error.noTree', ['mouse-config.area']);
21780
+ }
21781
+ if (props.treeConfig && checkboxOpts.range) {
21782
+ errLog('vxe.error.noTree', ['checkbox-config.range']);
21783
+ }
21784
+ if (rowOpts.height && !props.showOverflow) {
21785
+ warnLog('vxe.error.notProp', ['table.show-overflow']);
21786
+ }
21787
+ if (!$xeTable.handleMousedownCellAreaEvent) {
21788
+ if (props.areaConfig) {
21789
+ warnLog('vxe.error.notProp', ['area-config']);
21816
21790
  }
21817
- if (props.editConfig && editOpts.activeMethod) {
21818
- warnLog('vxe.error.delProp', ['edit-config.activeMethod', 'edit-config.beforeEditMethod']);
21791
+ if (props.clipConfig) {
21792
+ warnLog('vxe.error.notProp', ['clip-config']);
21819
21793
  }
21820
- if (props.treeConfig && checkboxOpts.isShiftKey) {
21821
- errLog('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey']);
21794
+ if (props.fnrConfig) {
21795
+ warnLog('vxe.error.notProp', ['fnr-config']);
21822
21796
  }
21823
- if (checkboxOpts.halfField) {
21824
- warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
21797
+ if (mouseOpts.area) {
21798
+ errLog('vxe.error.notProp', ['mouse-config.area']);
21799
+ return;
21825
21800
  }
21826
21801
  }
21802
+ if (treeConfig && rowOpts.drag && !treeOpts.transform) {
21803
+ warnLog('vxe.error.notSupportProp', ['column-config.drag', 'tree-config.transform=false', 'tree-config.transform=true']);
21804
+ }
21805
+ if (props.dragConfig) {
21806
+ warnLog('vxe.error.delProp', ['drag-config', 'row-drag-config']);
21807
+ }
21808
+ if (props.treeConfig && treeOpts.children) {
21809
+ warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);
21810
+ }
21811
+ if (props.treeConfig && treeOpts.line) {
21812
+ warnLog('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine']);
21813
+ }
21814
+ if (mouseOpts.area && mouseOpts.selected) {
21815
+ warnLog('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected']);
21816
+ }
21817
+ if (mouseOpts.area && props.treeConfig && !treeOpts.transform) {
21818
+ errLog('vxe.error.noTree', ['mouse-config.area']);
21819
+ }
21820
+ if (props.editConfig && editOpts.activeMethod) {
21821
+ warnLog('vxe.error.delProp', ['edit-config.activeMethod', 'edit-config.beforeEditMethod']);
21822
+ }
21823
+ if (props.treeConfig && checkboxOpts.isShiftKey) {
21824
+ errLog('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey']);
21825
+ }
21826
+ if (checkboxOpts.halfField) {
21827
+ warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
21828
+ }
21827
21829
  // 检查是否有安装需要的模块
21828
- if (true) {
21829
- if (props.editConfig && !$xeTable.insert) {
21830
- errLog('vxe.error.reqModule', ['Edit']);
21831
- }
21832
- if (props.editRules && !$xeTable.validate) {
21833
- errLog('vxe.error.reqModule', ['Validator']);
21834
- }
21835
- if ((checkboxOpts.range || props.keyboardConfig || props.mouseConfig) && !$xeTable.handleCellMousedownEvent) {
21836
- errLog('vxe.error.reqModule', ['Keyboard']);
21837
- }
21838
- if ((props.printConfig || props.importConfig || props.exportConfig) && !$xeTable.exportData) {
21839
- errLog('vxe.error.reqModule', ['Export']);
21840
- }
21830
+ if (props.editConfig && !$xeTable.insert) {
21831
+ errLog('vxe.error.reqModule', ['Edit']);
21832
+ }
21833
+ if (props.editRules && !$xeTable.validate) {
21834
+ errLog('vxe.error.reqModule', ['Validator']);
21835
+ }
21836
+ if ((checkboxOpts.range || props.keyboardConfig || props.mouseConfig) && !$xeTable.handleCellMousedownEvent) {
21837
+ errLog('vxe.error.reqModule', ['Keyboard']);
21838
+ }
21839
+ if ((props.printConfig || props.importConfig || props.exportConfig) && !$xeTable.exportData) {
21840
+ errLog('vxe.error.reqModule', ['Export']);
21841
21841
  }
21842
21842
  Object.assign(scrollYStore, {
21843
21843
  startIndex: 0,
@@ -30883,6 +30883,7 @@ const Grid = VxeGrid;
30883
30883
  groupTag: '分组列头应该使用 "{0}" 而不是 "{1}",这可能会出现错误',
30884
30884
  scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
30885
30885
  errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
30886
+ notSupportProp: '当启用参数 "{0}" 时不支持 "{1}",应该为 "{2}",否则将会出现错误',
30886
30887
  unableInsert: '无法插入到指定位置,请检查参数是否正确',
30887
30888
  useErr: '安装 "{0}" 模块时发生错误,可能顺序不正确,依赖的模块需要在 Table 之前安装',
30888
30889
  barUnableLink: '工具栏无法关联表格',