vxe-table 4.7.5 → 4.7.7

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 (65) hide show
  1. package/es/grid/src/grid.js +10 -9
  2. package/es/style.css +1 -1
  3. package/es/style.min.css +1 -1
  4. package/es/table/module/custom/hook.js +8 -15
  5. package/es/table/module/custom/panel.js +166 -102
  6. package/es/table/module/edit/hook.js +11 -10
  7. package/es/table/module/export/hook.js +31 -11
  8. package/es/table/module/validator/hook.js +6 -5
  9. package/es/table/render/index.js +3 -2
  10. package/es/table/src/columnInfo.js +10 -8
  11. package/es/table/src/table.js +143 -85
  12. package/es/table/style.css +49 -12
  13. package/es/table/style.min.css +1 -1
  14. package/es/toolbar/src/toolbar.js +12 -11
  15. package/es/ui/index.js +6 -3
  16. package/es/ui/src/log.js +5 -0
  17. package/es/vxe-table/style.css +49 -12
  18. package/es/vxe-table/style.min.css +1 -1
  19. package/lib/grid/src/grid.js +9 -9
  20. package/lib/grid/src/grid.min.js +1 -1
  21. package/lib/index.umd.js +348 -206
  22. package/lib/index.umd.min.js +1 -1
  23. package/lib/style.css +1 -1
  24. package/lib/style.min.css +1 -1
  25. package/lib/table/module/custom/hook.js +8 -17
  26. package/lib/table/module/custom/hook.min.js +1 -1
  27. package/lib/table/module/custom/panel.js +96 -42
  28. package/lib/table/module/custom/panel.min.js +1 -1
  29. package/lib/table/module/edit/hook.js +10 -10
  30. package/lib/table/module/edit/hook.min.js +1 -1
  31. package/lib/table/module/export/hook.js +33 -12
  32. package/lib/table/module/export/hook.min.js +1 -1
  33. package/lib/table/module/validator/hook.js +6 -6
  34. package/lib/table/module/validator/hook.min.js +1 -1
  35. package/lib/table/render/index.js +3 -3
  36. package/lib/table/render/index.min.js +1 -1
  37. package/lib/table/src/columnInfo.js +10 -9
  38. package/lib/table/src/columnInfo.min.js +1 -1
  39. package/lib/table/src/table.js +149 -85
  40. package/lib/table/src/table.min.js +1 -1
  41. package/lib/table/style/style.css +49 -12
  42. package/lib/table/style/style.min.css +1 -1
  43. package/lib/toolbar/src/toolbar.js +11 -11
  44. package/lib/toolbar/src/toolbar.min.js +1 -1
  45. package/lib/ui/index.js +6 -3
  46. package/lib/ui/index.min.js +1 -1
  47. package/lib/ui/src/log.js +13 -0
  48. package/lib/ui/src/log.min.js +1 -0
  49. package/lib/vxe-table/style/style.css +49 -12
  50. package/lib/vxe-table/style/style.min.css +1 -1
  51. package/package.json +2 -2
  52. package/packages/grid/src/grid.ts +10 -9
  53. package/packages/table/module/custom/hook.ts +10 -17
  54. package/packages/table/module/custom/panel.ts +166 -104
  55. package/packages/table/module/edit/hook.ts +11 -10
  56. package/packages/table/module/export/hook.ts +35 -13
  57. package/packages/table/module/validator/hook.ts +6 -5
  58. package/packages/table/render/index.ts +3 -2
  59. package/packages/table/src/columnInfo.ts +11 -8
  60. package/packages/table/src/table.ts +142 -85
  61. package/packages/toolbar/src/toolbar.ts +12 -11
  62. package/packages/ui/index.ts +4 -1
  63. package/packages/ui/src/log.ts +8 -0
  64. package/styles/components/table-module/custom.scss +45 -9
  65. package/styles/components/table.scss +1 -0
@@ -17,6 +17,7 @@ var _props = _interopRequireDefault(require("./props"));
17
17
  var _emits = _interopRequireDefault(require("./emits"));
18
18
  var _util = require("./util");
19
19
  var _vn = require("../../ui/src/vn");
20
+ var _log = require("../../ui/src/log");
20
21
  var _panel = _interopRequireDefault(require("../module/custom/panel"));
21
22
  var _panel2 = _interopRequireDefault(require("../module/filter/panel"));
22
23
  var _importPanel = _interopRequireDefault(require("../module/export/import-panel"));
@@ -34,7 +35,6 @@ const {
34
35
  hooks,
35
36
  globalEvents,
36
37
  GLOBAL_EVENT_KEYS,
37
- log,
38
38
  useFns
39
39
  } = _ui.VxeUI;
40
40
  const isWebkit = _dom.browse['-webkit'] && !_dom.browse.edge;
@@ -797,7 +797,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
797
797
  merges = [merges];
798
798
  }
799
799
  if (treeConfig && merges.length) {
800
- log.err('vxe.error.noTree', ['merge-cells | merge-footer-items']);
800
+ (0, _log.errLog)('vxe.error.noTree', ['merge-cells | merge-footer-items']);
801
801
  }
802
802
  merges.forEach(item => {
803
803
  let {
@@ -855,7 +855,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
855
855
  merges = [merges];
856
856
  }
857
857
  if (treeConfig && merges.length) {
858
- log.err('vxe.error.noTree', ['merge-cells | merge-footer-items']);
858
+ (0, _log.errLog)('vxe.error.noTree', ['merge-cells | merge-footer-items']);
859
859
  }
860
860
  merges.forEach(item => {
861
861
  let {
@@ -933,7 +933,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
933
933
  if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
934
934
  const customMap = {};
935
935
  if (!id) {
936
- log.err('vxe.error.reqProp', ['id']);
936
+ (0, _log.errLog)('vxe.error.reqProp', ['id']);
937
937
  return;
938
938
  }
939
939
  // 自定义列宽
@@ -1090,7 +1090,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
1090
1090
  if (field) {
1091
1091
  if (process.env.NODE_ENV === 'development') {
1092
1092
  if (fullColumnFieldData[field]) {
1093
- log.warn('vxe.error.colRepet', ['field', field]);
1093
+ (0, _log.warnLog)('vxe.error.colRepet', ['field', field]);
1094
1094
  }
1095
1095
  }
1096
1096
  fullColumnFieldData[field] = rest;
@@ -1104,7 +1104,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
1104
1104
  if (treeNode) {
1105
1105
  if (process.env.NODE_ENV === 'development') {
1106
1106
  if (treeNodeColumn) {
1107
- log.warn('vxe.error.colRepet', ['tree-node', treeNode]);
1107
+ (0, _log.warnLog)('vxe.error.colRepet', ['tree-node', treeNode]);
1108
1108
  }
1109
1109
  }
1110
1110
  if (!treeNodeColumn) {
@@ -1113,7 +1113,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
1113
1113
  } else if (type === 'expand') {
1114
1114
  if (process.env.NODE_ENV === 'development') {
1115
1115
  if (expandColumn) {
1116
- log.warn('vxe.error.colRepet', ['type', type]);
1116
+ (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
1117
1117
  }
1118
1118
  }
1119
1119
  if (!expandColumn) {
@@ -1123,14 +1123,14 @@ var _default = exports.default = (0, _vue.defineComponent)({
1123
1123
  if (process.env.NODE_ENV === 'development') {
1124
1124
  if (type === 'checkbox') {
1125
1125
  if (checkboxColumn) {
1126
- log.warn('vxe.error.colRepet', ['type', type]);
1126
+ (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
1127
1127
  }
1128
1128
  if (!checkboxColumn) {
1129
1129
  checkboxColumn = column;
1130
1130
  }
1131
1131
  } else if (type === 'radio') {
1132
1132
  if (radioColumn) {
1133
- log.warn('vxe.error.colRepet', ['type', type]);
1133
+ (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
1134
1134
  }
1135
1135
  if (!radioColumn) {
1136
1136
  radioColumn = column;
@@ -1141,7 +1141,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
1141
1141
  isAllOverflow = false;
1142
1142
  }
1143
1143
  if (fullColumnIdData[colid]) {
1144
- log.err('vxe.error.colRepet', ['colId', colid]);
1144
+ (0, _log.errLog)('vxe.error.colRepet', ['colId', colid]);
1145
1145
  }
1146
1146
  fullColumnIdData[colid] = rest;
1147
1147
  };
@@ -1155,16 +1155,16 @@ var _default = exports.default = (0, _vue.defineComponent)({
1155
1155
  }
1156
1156
  if (process.env.NODE_ENV === 'development') {
1157
1157
  if (expandColumn && mouseOpts.area) {
1158
- log.err('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
1158
+ (0, _log.errLog)('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
1159
1159
  }
1160
1160
  }
1161
1161
  if (process.env.NODE_ENV === 'development') {
1162
1162
  if (htmlColumn) {
1163
1163
  if (!columnOpts.useKey) {
1164
- log.err('vxe.error.reqProp', ['column-config.useKey', 'column.type=html']);
1164
+ (0, _log.errLog)('vxe.error.reqProp', ['column-config.useKey', 'column.type=html']);
1165
1165
  }
1166
1166
  if (!rowOpts.useKey) {
1167
- log.err('vxe.error.reqProp', ['row-config.useKey', 'column.type=html']);
1167
+ (0, _log.errLog)('vxe.error.reqProp', ['row-config.useKey', 'column.type=html']);
1168
1168
  }
1169
1169
  }
1170
1170
  }
@@ -2588,23 +2588,23 @@ var _default = exports.default = (0, _vue.defineComponent)({
2588
2588
  // 树结构自动转换
2589
2589
  if (process.env.NODE_ENV === 'development') {
2590
2590
  if (!treeOpts.rowField) {
2591
- log.err('vxe.error.reqProp', ['tree-config.rowField']);
2591
+ (0, _log.errLog)('vxe.error.reqProp', ['tree-config.rowField']);
2592
2592
  }
2593
2593
  if (!treeOpts.parentField) {
2594
- log.err('vxe.error.reqProp', ['tree-config.parentField']);
2594
+ (0, _log.errLog)('vxe.error.reqProp', ['tree-config.parentField']);
2595
2595
  }
2596
2596
  if (!childrenField) {
2597
- log.err('vxe.error.reqProp', ['tree-config.childrenField']);
2597
+ (0, _log.errLog)('vxe.error.reqProp', ['tree-config.childrenField']);
2598
2598
  }
2599
2599
  if (!treeOpts.mapChildrenField) {
2600
- log.err('vxe.error.reqProp', ['tree-config.mapChildrenField']);
2600
+ (0, _log.errLog)('vxe.error.reqProp', ['tree-config.mapChildrenField']);
2601
2601
  }
2602
2602
  if (childrenField === treeOpts.mapChildrenField) {
2603
- log.err('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
2603
+ (0, _log.errLog)('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
2604
2604
  }
2605
2605
  // fullData.forEach(row => {
2606
2606
  // if (row[treeOpts.children] && row[treeOpts.children].length) {
2607
- // log.warn('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.children}`])
2607
+ // warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.children}`])
2608
2608
  // }
2609
2609
  // })
2610
2610
  }
@@ -2642,13 +2642,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
2642
2642
  if (process.env.NODE_ENV === 'development') {
2643
2643
  if (sYLoad) {
2644
2644
  if (!(props.height || props.maxHeight)) {
2645
- log.err('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
2645
+ (0, _log.errLog)('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
2646
2646
  }
2647
2647
  if (!props.showOverflow) {
2648
- log.warn('vxe.error.reqProp', ['table.show-overflow']);
2648
+ (0, _log.warnLog)('vxe.error.reqProp', ['table.show-overflow']);
2649
2649
  }
2650
2650
  if (props.spanMethod) {
2651
- log.warn('vxe.error.scrollErrProp', ['table.span-method']);
2651
+ (0, _log.warnLog)('vxe.error.scrollErrProp', ['table.span-method']);
2652
2652
  }
2653
2653
  }
2654
2654
  }
@@ -2804,7 +2804,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
2804
2804
  column.fixed = parent.fixed;
2805
2805
  }
2806
2806
  if (parent && column.fixed !== parent.fixed) {
2807
- log.err('vxe.error.groupFixed');
2807
+ (0, _log.errLog)('vxe.error.groupFixed');
2808
2808
  }
2809
2809
  if (isColGroup) {
2810
2810
  column.visible = !!_xeUtils.default.findTree(column.children, subColumn => (0, _utils.hasChildrenList)(subColumn) ? false : subColumn.visible);
@@ -2856,16 +2856,16 @@ var _default = exports.default = (0, _vue.defineComponent)({
2856
2856
  if (scrollXLoad) {
2857
2857
  if (process.env.NODE_ENV === 'development') {
2858
2858
  // if (props.showHeader && !props.showHeaderOverflow) {
2859
- // log.warn('vxe.error.reqProp', ['show-header-overflow'])
2859
+ // warnLog('vxe.error.reqProp', ['show-header-overflow'])
2860
2860
  // }
2861
2861
  // if (props.showFooter && !props.showFooterOverflow) {
2862
- // log.warn('vxe.error.reqProp', ['show-footer-overflow'])
2862
+ // warnLog('vxe.error.reqProp', ['show-footer-overflow'])
2863
2863
  // }
2864
2864
  if (props.spanMethod) {
2865
- log.warn('vxe.error.scrollErrProp', ['span-method']);
2865
+ (0, _log.warnLog)('vxe.error.scrollErrProp', ['span-method']);
2866
2866
  }
2867
2867
  if (props.footerSpanMethod) {
2868
- log.warn('vxe.error.scrollErrProp', ['footer-span-method']);
2868
+ (0, _log.warnLog)('vxe.error.scrollErrProp', ['footer-span-method']);
2869
2869
  }
2870
2870
  }
2871
2871
  const {
@@ -2925,7 +2925,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
2925
2925
  tablePrivateMethods.handleTableData(true);
2926
2926
  if (process.env.NODE_ENV === 'development') {
2927
2927
  if ((reactData.scrollXLoad || reactData.scrollYLoad) && reactData.expandColumn) {
2928
- log.warn('vxe.error.scrollErrProp', ['column.type=expand']);
2928
+ (0, _log.warnLog)('vxe.error.scrollErrProp', ['column.type=expand']);
2929
2929
  }
2930
2930
  }
2931
2931
  return (0, _vue.nextTick)().then(() => {
@@ -3143,7 +3143,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
3143
3143
  * 对于某些特殊的场景,比如深层树节点元素发生变动时可能会用到
3144
3144
  */
3145
3145
  syncData() {
3146
- log.warn('vxe.error.delFunc', ['syncData', 'getData']);
3146
+ (0, _log.warnLog)('vxe.error.delFunc', ['syncData', 'getData']);
3147
3147
  return (0, _vue.nextTick)().then(() => {
3148
3148
  reactData.tableData = [];
3149
3149
  emit('update:data', internalData.tableFullData);
@@ -3265,7 +3265,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
3265
3265
  reactData.tableData = tableData.slice(0);
3266
3266
  } else {
3267
3267
  if (process.env.NODE_ENV === 'development') {
3268
- log.warn('vxe.error.reqProp', ['keep-source']);
3268
+ (0, _log.warnLog)('vxe.error.reqProp', ['keep-source']);
3269
3269
  }
3270
3270
  }
3271
3271
  return (0, _vue.nextTick)();
@@ -3475,7 +3475,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
3475
3475
  } = internalData;
3476
3476
  if (!keepSource) {
3477
3477
  if (process.env.NODE_ENV === 'development') {
3478
- log.warn('vxe.error.reqProp', ['keep-source']);
3478
+ (0, _log.warnLog)('vxe.error.reqProp', ['keep-source']);
3479
3479
  }
3480
3480
  return (0, _vue.nextTick)();
3481
3481
  }
@@ -3879,6 +3879,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
3879
3879
  })) {
3880
3880
  column.visible = column.defaultVisible;
3881
3881
  }
3882
+ column.renderResizeWidth = column.renderWidth;
3882
3883
  });
3883
3884
  if (opts.resizable) {
3884
3885
  tablePrivateMethods.saveCustomResizable(true);
@@ -4602,7 +4603,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
4602
4603
  },
4603
4604
  reloadExpandContent(row) {
4604
4605
  if (process.env.NODE_ENV === 'development') {
4605
- log.warn('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
4606
+ (0, _log.warnLog)('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
4606
4607
  }
4607
4608
  // 即将废弃
4608
4609
  return tableMethods.reloadRowExpand(row);
@@ -4724,7 +4725,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
4724
4725
  isExpandByRow(row) {
4725
4726
  // 已废弃
4726
4727
  if (process.env.NODE_ENV === 'development') {
4727
- log.warn('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow']);
4728
+ (0, _log.warnLog)('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow']);
4728
4729
  }
4729
4730
  return tableMethods.isRowExpandByRow(row);
4730
4731
  },
@@ -4840,7 +4841,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
4840
4841
  },
4841
4842
  reloadTreeChilds(row) {
4842
4843
  if (process.env.NODE_ENV === 'development') {
4843
- log.warn('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
4844
+ (0, _log.warnLog)('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
4844
4845
  }
4845
4846
  // 即将废弃
4846
4847
  return tableMethods.reloadTreeExpand(row);
@@ -5143,7 +5144,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
5143
5144
  */
5144
5145
  setMergeCells(merges) {
5145
5146
  if (props.spanMethod) {
5146
- log.err('vxe.error.errConflicts', ['merge-cells', 'span-method']);
5147
+ (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
5147
5148
  }
5148
5149
  setMerges(merges, reactData.mergeList, internalData.afterFullData);
5149
5150
  return (0, _vue.nextTick)().then(() => {
@@ -5157,7 +5158,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
5157
5158
  */
5158
5159
  removeMergeCells(merges) {
5159
5160
  if (props.spanMethod) {
5160
- log.err('vxe.error.errConflicts', ['merge-cells', 'span-method']);
5161
+ (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
5161
5162
  }
5162
5163
  const rest = removeMerges(merges, reactData.mergeList, internalData.afterFullData);
5163
5164
  return (0, _vue.nextTick)().then(() => {
@@ -5183,7 +5184,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
5183
5184
  },
5184
5185
  setMergeFooterItems(merges) {
5185
5186
  if (props.footerSpanMethod) {
5186
- log.err('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
5187
+ (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
5187
5188
  }
5188
5189
  setMerges(merges, reactData.mergeFooterList);
5189
5190
  return (0, _vue.nextTick)().then(() => {
@@ -5193,7 +5194,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
5193
5194
  },
5194
5195
  removeMergeFooterItems(merges) {
5195
5196
  if (props.footerSpanMethod) {
5196
- log.err('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
5197
+ (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
5197
5198
  }
5198
5199
  const rest = removeMerges(merges, reactData.mergeFooterList);
5199
5200
  return (0, _vue.nextTick)().then(() => {
@@ -5227,6 +5228,71 @@ var _default = exports.default = (0, _vue.defineComponent)({
5227
5228
  }
5228
5229
  return (0, _vue.nextTick)();
5229
5230
  },
5231
+ getCustomStoreData() {
5232
+ const {
5233
+ id
5234
+ } = props;
5235
+ const customOpts = computeCustomOpts.value;
5236
+ const {
5237
+ collectColumn
5238
+ } = internalData;
5239
+ const {
5240
+ checkMethod
5241
+ } = customOpts;
5242
+ const resizableData = {};
5243
+ const sortData = {};
5244
+ const visibleData = {};
5245
+ const fixedData = {};
5246
+ const storeData = {
5247
+ resizableData,
5248
+ sortData,
5249
+ visibleData,
5250
+ fixedData
5251
+ };
5252
+ if (!id) {
5253
+ (0, _log.errLog)('vxe.error.reqProp', ['id']);
5254
+ return storeData;
5255
+ }
5256
+ _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parent) => {
5257
+ // 排序只支持一级
5258
+ if (!parent) {
5259
+ collectColumn.forEach(column => {
5260
+ const colKey = column.getKey();
5261
+ if (colKey) {
5262
+ sortData[colKey] = column.renderSortNumber;
5263
+ }
5264
+ });
5265
+ }
5266
+ if (column.resizeWidth) {
5267
+ const colKey = column.getKey();
5268
+ if (colKey) {
5269
+ resizableData[colKey] = column.renderWidth;
5270
+ }
5271
+ }
5272
+ if (column.fixed && column.fixed !== column.defaultFixed) {
5273
+ const colKey = column.getKey();
5274
+ if (colKey) {
5275
+ fixedData[colKey] = column.fixed;
5276
+ }
5277
+ }
5278
+ if (!checkMethod || checkMethod({
5279
+ column
5280
+ })) {
5281
+ if (!column.visible && column.defaultVisible) {
5282
+ const colKey = column.getKey();
5283
+ if (colKey) {
5284
+ visibleData[colKey] = false;
5285
+ }
5286
+ } else if (column.visible && !column.defaultVisible) {
5287
+ const colKey = column.getKey();
5288
+ if (colKey) {
5289
+ visibleData[colKey] = true;
5290
+ }
5291
+ }
5292
+ }
5293
+ });
5294
+ return storeData;
5295
+ },
5230
5296
  focus() {
5231
5297
  internalData.isActivated = true;
5232
5298
  return (0, _vue.nextTick)();
@@ -5247,7 +5313,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
5247
5313
  $table: $xeTable
5248
5314
  });
5249
5315
  } else {
5250
- log.err('vxe.error.barUnableLink');
5316
+ (0, _log.errLog)('vxe.error.barUnableLink');
5251
5317
  }
5252
5318
  return (0, _vue.nextTick)();
5253
5319
  }
@@ -6147,7 +6213,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
6147
6213
  const columnWidthStorageMap = getCustomStorageMap(resizableStorageKey);
6148
6214
  let columnWidthStorage;
6149
6215
  if (!id) {
6150
- log.err('vxe.error.reqProp', ['id']);
6216
+ (0, _log.errLog)('vxe.error.reqProp', ['id']);
6151
6217
  return;
6152
6218
  }
6153
6219
  if (!isReset) {
@@ -6184,18 +6250,16 @@ var _default = exports.default = (0, _vue.defineComponent)({
6184
6250
  const columnSortStorageMap = getCustomStorageMap(sortStorageKey);
6185
6251
  let columnWidthStorage;
6186
6252
  if (!id) {
6187
- log.err('vxe.error.reqProp', ['id']);
6253
+ (0, _log.errLog)('vxe.error.reqProp', ['id']);
6188
6254
  return;
6189
6255
  }
6190
6256
  if (!isReset) {
6191
6257
  columnWidthStorage = _xeUtils.default.isPlainObject(columnSortStorageMap[id]) ? columnSortStorageMap[id] : {};
6192
6258
  // 排序只支持一级
6193
6259
  collectColumn.forEach(column => {
6194
- if (column.sortNumber !== column.renderSortNumber) {
6195
- const colKey = column.getKey();
6196
- if (colKey) {
6197
- columnWidthStorage[colKey] = column.renderSortNumber;
6198
- }
6260
+ const colKey = column.getKey();
6261
+ if (colKey) {
6262
+ columnWidthStorage[colKey] = column.renderSortNumber;
6199
6263
  }
6200
6264
  });
6201
6265
  }
@@ -6222,7 +6286,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
6222
6286
  const columnFixedStorageMap = getCustomStorageMap(fixedStorageKey);
6223
6287
  const colFixeds = [];
6224
6288
  if (!id) {
6225
- log.err('vxe.error.reqProp', ['id']);
6289
+ (0, _log.errLog)('vxe.error.reqProp', ['id']);
6226
6290
  return;
6227
6291
  }
6228
6292
  _xeUtils.default.eachTree(collectColumn, column => {
@@ -6258,7 +6322,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
6258
6322
  const colHides = [];
6259
6323
  const colShows = [];
6260
6324
  if (!id) {
6261
- log.err('vxe.error.reqProp', ['id']);
6325
+ (0, _log.errLog)('vxe.error.reqProp', ['id']);
6262
6326
  return;
6263
6327
  }
6264
6328
  _xeUtils.default.eachTree(collectColumn, column => {
@@ -6313,7 +6377,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
6313
6377
  evntList = interceptor.get('event.clearActived');
6314
6378
  if (process.env.NODE_ENV === 'development') {
6315
6379
  if (evntList.length) {
6316
- log.warn('vxe.error.delEvent', ['event.clearActived', 'event.clearEdit']);
6380
+ (0, _log.warnLog)('vxe.error.delEvent', ['event.clearActived', 'event.clearEdit']);
6317
6381
  }
6318
6382
  }
6319
6383
  }
@@ -7429,12 +7493,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
7429
7493
  if (process.env.NODE_ENV === 'development') {
7430
7494
  'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(name => {
7431
7495
  $xeTable[name] = function () {
7432
- log.err('vxe.error.reqModule', ['VxeTableExportModule']);
7496
+ (0, _log.errLog)('vxe.error.reqModule', ['VxeTableExportModule']);
7433
7497
  };
7434
7498
  });
7435
7499
  'clearValidate,fullValidate,validate'.split(',').forEach(name => {
7436
7500
  $xeTable[name] = function () {
7437
- log.err('vxe.error.reqModule', ['VxeTableValidatorModule']);
7501
+ (0, _log.errLog)('vxe.error.reqModule', ['VxeTableValidatorModule']);
7438
7502
  };
7439
7503
  });
7440
7504
  }
@@ -7535,10 +7599,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
7535
7599
  // const checkboxOpts = computeCheckboxOpts.value
7536
7600
  // const checkboxColumn = internalData.tableFullColumn.find(column => column.type === 'checkbox')
7537
7601
  // if (checkboxColumn && internalData.tableFullData.length > 300 && !checkboxOpts.checkField) {
7538
- // log.warn('vxe.error.checkProp', ['checkbox-config.checkField'])
7602
+ // warnLog('vxe.error.checkProp', ['checkbox-config.checkField'])
7539
7603
  // }
7540
7604
  if ((scrollXLoad || scrollYLoad) && expandColumn) {
7541
- log.warn('vxe.error.scrollErrProp', ['column.type=expand']);
7605
+ (0, _log.warnLog)('vxe.error.scrollErrProp', ['column.type=expand']);
7542
7606
  }
7543
7607
  }
7544
7608
  tableMethods.recalculate();
@@ -7686,40 +7750,40 @@ var _default = exports.default = (0, _vue.defineComponent)({
7686
7750
  const rowOpts = computeRowOpts.value;
7687
7751
  if (process.env.NODE_ENV === 'development') {
7688
7752
  if (props.rowId) {
7689
- log.warn('vxe.error.delProp', ['row-id', 'row-config.keyField']);
7753
+ (0, _log.warnLog)('vxe.error.delProp', ['row-id', 'row-config.keyField']);
7690
7754
  }
7691
7755
  if (props.rowKey) {
7692
- log.warn('vxe.error.delProp', ['row-key', 'row-config.useKey']);
7756
+ (0, _log.warnLog)('vxe.error.delProp', ['row-key', 'row-config.useKey']);
7693
7757
  }
7694
7758
  if (props.columnKey) {
7695
- log.warn('vxe.error.delProp', ['column-id', 'column-config.useKey']);
7759
+ (0, _log.warnLog)('vxe.error.delProp', ['column-id', 'column-config.useKey']);
7696
7760
  }
7697
7761
  if (!(props.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
7698
- log.warn('vxe.error.reqProp', ['row-config.keyField']);
7762
+ (0, _log.warnLog)('vxe.error.reqProp', ['row-config.keyField']);
7699
7763
  }
7700
7764
  if (props.editConfig && (editOpts.showStatus || editOpts.showUpdateStatus || editOpts.showInsertStatus) && !props.keepSource) {
7701
- log.warn('vxe.error.reqProp', ['keep-source']);
7765
+ (0, _log.warnLog)('vxe.error.reqProp', ['keep-source']);
7702
7766
  }
7703
7767
  if (treeConfig && (treeOpts.showLine || treeOpts.line) && (!(props.rowKey || rowOpts.useKey) || !showOverflow)) {
7704
- log.warn('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
7768
+ (0, _log.warnLog)('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
7705
7769
  }
7706
7770
  if (treeConfig && props.stripe) {
7707
- log.warn('vxe.error.noTree', ['stripe']);
7771
+ (0, _log.warnLog)('vxe.error.noTree', ['stripe']);
7708
7772
  }
7709
7773
  if (props.showFooter && !(props.footerMethod || props.footerData)) {
7710
- log.warn('vxe.error.reqProp', ['footer-data | footer-method']);
7774
+ (0, _log.warnLog)('vxe.error.reqProp', ['footer-data | footer-method']);
7711
7775
  }
7712
7776
  // if (props.highlightCurrentRow) {
7713
- // log.warn('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent'])
7777
+ // warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent'])
7714
7778
  // }
7715
7779
  // if (props.highlightHoverRow) {
7716
- // log.warn('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover'])
7780
+ // warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover'])
7717
7781
  // }
7718
7782
  // if (props.highlightCurrentColumn) {
7719
- // log.warn('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent'])
7783
+ // warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent'])
7720
7784
  // }
7721
7785
  // if (props.highlightHoverColumn) {
7722
- // log.warn('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover'])
7786
+ // warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover'])
7723
7787
  // }
7724
7788
  // 检查导入导出类型,如果自定义导入导出方法,则不校验类型
7725
7789
  const {
@@ -7729,10 +7793,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
7729
7793
  const exportOpts = computeExportOpts.value;
7730
7794
  const importOpts = computeImportOpts.value;
7731
7795
  if (importConfig && importOpts.types && !importOpts.importMethod && !_xeUtils.default.includeArrays(_xeUtils.default.keys(importOpts._typeMaps), importOpts.types)) {
7732
- log.warn('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter(type => _xeUtils.default.includes(_xeUtils.default.keys(importOpts._typeMaps), type)).join(',') || _xeUtils.default.keys(importOpts._typeMaps).join(',')]);
7796
+ (0, _log.warnLog)('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter(type => _xeUtils.default.includes(_xeUtils.default.keys(importOpts._typeMaps), type)).join(',') || _xeUtils.default.keys(importOpts._typeMaps).join(',')]);
7733
7797
  }
7734
7798
  if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !_xeUtils.default.includeArrays(_xeUtils.default.keys(exportOpts._typeMaps), exportOpts.types)) {
7735
- log.warn('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter(type => _xeUtils.default.includes(_xeUtils.default.keys(exportOpts._typeMaps), type)).join(',') || _xeUtils.default.keys(exportOpts._typeMaps).join(',')]);
7799
+ (0, _log.warnLog)('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter(type => _xeUtils.default.includes(_xeUtils.default.keys(exportOpts._typeMaps), type)).join(',') || _xeUtils.default.keys(exportOpts._typeMaps).join(',')]);
7736
7800
  }
7737
7801
  }
7738
7802
  if (process.env.NODE_ENV === 'development') {
@@ -7740,64 +7804,64 @@ var _default = exports.default = (0, _vue.defineComponent)({
7740
7804
  const mouseOpts = computeMouseOpts.value;
7741
7805
  const rowOpts = computeRowOpts.value;
7742
7806
  if (!props.id && props.customConfig && (customOpts.storage === true || customOpts.storage && customOpts.storage.resizable || customOpts.storage && customOpts.storage.visible)) {
7743
- log.err('vxe.error.reqProp', ['id']);
7807
+ (0, _log.errLog)('vxe.error.reqProp', ['id']);
7744
7808
  }
7745
7809
  if (props.treeConfig && checkboxOpts.range) {
7746
- log.err('vxe.error.noTree', ['checkbox-config.range']);
7810
+ (0, _log.errLog)('vxe.error.noTree', ['checkbox-config.range']);
7747
7811
  }
7748
7812
  if (rowOpts.height && !props.showOverflow) {
7749
- log.warn('vxe.error.notProp', ['table.show-overflow']);
7813
+ (0, _log.warnLog)('vxe.error.notProp', ['table.show-overflow']);
7750
7814
  }
7751
7815
  if (!$xeTable.handleUpdateCellAreas) {
7752
7816
  if (props.clipConfig) {
7753
- log.warn('vxe.error.notProp', ['clip-config']);
7817
+ (0, _log.warnLog)('vxe.error.notProp', ['clip-config']);
7754
7818
  }
7755
7819
  if (props.fnrConfig) {
7756
- log.warn('vxe.error.notProp', ['fnr-config']);
7820
+ (0, _log.warnLog)('vxe.error.notProp', ['fnr-config']);
7757
7821
  }
7758
7822
  if (mouseOpts.area) {
7759
- log.err('vxe.error.notProp', ['mouse-config.area']);
7823
+ (0, _log.errLog)('vxe.error.notProp', ['mouse-config.area']);
7760
7824
  return;
7761
7825
  }
7762
7826
  }
7763
7827
  if (props.treeConfig && treeOpts.children) {
7764
- log.warn('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);
7828
+ (0, _log.warnLog)('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);
7765
7829
  }
7766
7830
  if (props.treeConfig && treeOpts.line) {
7767
- log.warn('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine']);
7831
+ (0, _log.warnLog)('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine']);
7768
7832
  }
7769
7833
  if (mouseOpts.area && mouseOpts.selected) {
7770
- log.warn('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected']);
7834
+ (0, _log.warnLog)('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected']);
7771
7835
  }
7772
7836
  if (mouseOpts.area && checkboxOpts.range) {
7773
- log.warn('vxe.error.errConflicts', ['mouse-config.area', 'checkbox-config.range']);
7837
+ (0, _log.warnLog)('vxe.error.errConflicts', ['mouse-config.area', 'checkbox-config.range']);
7774
7838
  }
7775
7839
  if (props.treeConfig && mouseOpts.area) {
7776
- log.err('vxe.error.noTree', ['mouse-config.area']);
7840
+ (0, _log.errLog)('vxe.error.noTree', ['mouse-config.area']);
7777
7841
  }
7778
7842
  if (props.editConfig && editOpts.activeMethod) {
7779
- log.warn('vxe.error.delProp', ['edit-config.activeMethod', 'edit-config.beforeEditMethod']);
7843
+ (0, _log.warnLog)('vxe.error.delProp', ['edit-config.activeMethod', 'edit-config.beforeEditMethod']);
7780
7844
  }
7781
7845
  if (props.treeConfig && checkboxOpts.isShiftKey) {
7782
- log.err('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey']);
7846
+ (0, _log.errLog)('vxe.error.errConflicts', ['tree-config', 'checkbox-config.isShiftKey']);
7783
7847
  }
7784
7848
  if (checkboxOpts.halfField) {
7785
- log.warn('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
7849
+ (0, _log.warnLog)('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
7786
7850
  }
7787
7851
  }
7788
7852
  // 检查是否有安装需要的模块
7789
7853
  if (process.env.NODE_ENV === 'development') {
7790
7854
  if (props.editConfig && !$xeTable.insert) {
7791
- log.err('vxe.error.reqModule', ['Edit']);
7855
+ (0, _log.errLog)('vxe.error.reqModule', ['Edit']);
7792
7856
  }
7793
7857
  if (props.editRules && !$xeTable.validate) {
7794
- log.err('vxe.error.reqModule', ['Validator']);
7858
+ (0, _log.errLog)('vxe.error.reqModule', ['Validator']);
7795
7859
  }
7796
7860
  if ((checkboxOpts.range || props.keyboardConfig || props.mouseConfig) && !$xeTable.triggerCellMousedownEvent) {
7797
- log.err('vxe.error.reqModule', ['Keyboard']);
7861
+ (0, _log.errLog)('vxe.error.reqModule', ['Keyboard']);
7798
7862
  }
7799
7863
  if ((props.printConfig || props.importConfig || props.exportConfig) && !$xeTable.exportData) {
7800
- log.err('vxe.error.reqModule', ['Export']);
7864
+ (0, _log.errLog)('vxe.error.reqModule', ['Export']);
7801
7865
  }
7802
7866
  }
7803
7867
  Object.assign(scrollYStore, {