vxe-table 4.7.17-beta.0 → 4.7.17-beta.1

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 (37) hide show
  1. package/es/table/module/edit/hook.js +2 -2
  2. package/es/table/module/export/hook.js +2 -2
  3. package/es/table/module/filter/hook.js +7 -7
  4. package/es/table/module/filter/panel.js +5 -4
  5. package/es/table/src/body.js +5 -5
  6. package/es/table/src/cell.js +22 -10
  7. package/es/table/src/table.js +7 -7
  8. package/es/ui/index.js +2 -2
  9. package/es/ui/src/log.js +1 -1
  10. package/lib/index.umd.js +55 -42
  11. package/lib/index.umd.min.js +1 -1
  12. package/lib/table/module/edit/hook.js +2 -2
  13. package/lib/table/module/edit/hook.min.js +1 -1
  14. package/lib/table/module/export/hook.js +2 -2
  15. package/lib/table/module/export/hook.min.js +1 -1
  16. package/lib/table/module/filter/hook.js +7 -7
  17. package/lib/table/module/filter/hook.min.js +1 -1
  18. package/lib/table/module/filter/panel.js +5 -4
  19. package/lib/table/module/filter/panel.min.js +1 -1
  20. package/lib/table/src/body.js +5 -5
  21. package/lib/table/src/body.min.js +1 -1
  22. package/lib/table/src/cell.js +24 -12
  23. package/lib/table/src/cell.min.js +1 -1
  24. package/lib/table/src/table.js +7 -7
  25. package/lib/table/src/table.min.js +1 -1
  26. package/lib/ui/index.js +2 -2
  27. package/lib/ui/index.min.js +1 -1
  28. package/lib/ui/src/log.js +1 -1
  29. package/lib/ui/src/log.min.js +1 -1
  30. package/package.json +2 -2
  31. package/packages/table/module/edit/hook.ts +2 -2
  32. package/packages/table/module/export/hook.ts +2 -2
  33. package/packages/table/module/filter/hook.ts +7 -7
  34. package/packages/table/module/filter/panel.ts +5 -4
  35. package/packages/table/src/body.ts +5 -5
  36. package/packages/table/src/cell.ts +22 -10
  37. package/packages/table/src/table.ts +7 -7
package/es/table/module/edit/hook.js CHANGED
@@ -760,10 +760,10 @@ hooks.add('tableEditModule', {
760
760
  let { autofocus, autoselect } = editRender;
761
761
  let inputElem;
762
762
  if (!autofocus && compRender) {
763
- autofocus = compRender.autofocus;
763
+ autofocus = compRender.tableAutofocus || compRender.autofocus;
764
764
  }
765
765
  if (!autoselect && compRender) {
766
- autoselect = compRender.autoselect;
766
+ autoselect = compRender.tableAutoSelect || compRender.autoselect;
767
767
  }
768
768
  // 如果指定了聚焦 class
769
769
  if (XEUtils.isFunction(autofocus)) {
package/es/table/module/export/hook.js CHANGED
@@ -320,7 +320,7 @@ hooks.add('tableExportModule', {
320
320
  if (!bodyExportMethod && renderOpts && renderOpts.name) {
321
321
  const compConf = renderer.get(renderOpts.name);
322
322
  if (compConf) {
323
- bodyExportMethod = compConf.exportMethod;
323
+ bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod;
324
324
  }
325
325
  }
326
326
  if (!bodyExportMethod) {
@@ -442,7 +442,7 @@ hooks.add('tableExportModule', {
442
442
  if (!footLabelMethod && renderOpts && renderOpts.name) {
443
443
  const compConf = renderer.get(renderOpts.name);
444
444
  if (compConf) {
445
- footLabelMethod = compConf.footerExportMethod;
445
+ footLabelMethod = compConf.tableFooterExportMethod || compConf.footerExportMethod;
446
446
  }
447
447
  }
448
448
  if (!footLabelMethod) {
package/es/table/module/filter/hook.js CHANGED
@@ -35,7 +35,7 @@ hooks.add('tableFilterModule', {
35
35
  const { visibleWidth } = getDomNode();
36
36
  const { filters, filterMultiple, filterRender } = column;
37
37
  const compConf = filterRender ? renderer.get(filterRender.name) : null;
38
- const filterRecoverMethod = column.filterRecoverMethod || (compConf ? compConf.filterRecoverMethod : null);
38
+ const frMethod = column.filterRecoverMethod || (compConf ? (compConf.tableFilterRecoverMethod || compConf.filterRecoverMethod) : null);
39
39
  internalData._currFilterParams = params;
40
40
  Object.assign(filterStore, {
41
41
  multiple: filterMultiple,
@@ -48,8 +48,8 @@ hooks.add('tableFilterModule', {
48
48
  const { _checked, checked } = option;
49
49
  option._checked = checked;
50
50
  if (!checked && _checked !== checked) {
51
- if (filterRecoverMethod) {
52
- filterRecoverMethod({ option, column, $table: $xeTable });
51
+ if (frMethod) {
52
+ frMethod({ option, column, $table: $xeTable });
53
53
  }
54
54
  }
55
55
  });
@@ -117,16 +117,16 @@ hooks.add('tableFilterModule', {
117
117
  const { filters, filterRender } = column;
118
118
  if (filters) {
119
119
  const compConf = filterRender ? renderer.get(filterRender.name) : null;
120
- const filterResetMethod = column.filterResetMethod || (compConf ? compConf.filterResetMethod : null);
120
+ const frMethod = column.filterResetMethod || (compConf ? (compConf.tableFilterResetMethod || compConf.filterResetMethod) : null);
121
121
  filters.forEach((item) => {
122
122
  item._checked = false;
123
123
  item.checked = false;
124
- if (!filterResetMethod) {
124
+ if (!frMethod) {
125
125
  item.data = XEUtils.clone(item.resetValue, true);
126
126
  }
127
127
  });
128
- if (filterResetMethod) {
129
- filterResetMethod({ options: filters, column, $table: $xeTable });
128
+ if (frMethod) {
129
+ frMethod({ options: filters, column, $table: $xeTable });
130
130
  }
131
131
  }
132
132
  }
package/es/table/module/filter/panel.js CHANGED
@@ -99,6 +99,7 @@ export default defineComponent({
99
99
  const { slots } = column;
100
100
  const filterSlot = slots ? slots.filter : null;
101
101
  const params = Object.assign({}, tableInternalData._currFilterParams, { $panel, $table: $xeTable });
102
+ const rtFilter = compConf ? (compConf.renderTableFilter || compConf.renderFilter) : null;
102
103
  if (filterSlot) {
103
104
  return [
104
105
  h('div', {
@@ -106,11 +107,11 @@ export default defineComponent({
106
107
  }, $xeTable.callSlot(filterSlot, params))
107
108
  ];
108
109
  }
109
- else if (compConf && compConf.renderFilter) {
110
+ else if (rtFilter) {
110
111
  return [
111
112
  h('div', {
112
113
  class: 'vxe-table--filter-template'
113
- }, getSlotVNs(compConf.renderFilter(filterRender, params)))
114
+ }, getSlotVNs(rtFilter(filterRender, params)))
114
115
  ];
115
116
  }
116
117
  const isAllChecked = multiple ? filterStore.isAllSelected : !filterStore.options.some((item) => item._checked);
@@ -180,7 +181,7 @@ export default defineComponent({
180
181
  const filterRender = column.filterRender;
181
182
  const compConf = filterRender ? renderer.get(filterRender.name) : null;
182
183
  const isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate;
183
- return multiple && (!compConf || compConf.showFilterFooter !== false)
184
+ return multiple && (compConf ? !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false) : true)
184
185
  ? [
185
186
  h('div', {
186
187
  class: 'vxe-table--filter-footer'
@@ -205,7 +206,7 @@ export default defineComponent({
205
206
  const { column } = filterStore;
206
207
  const filterRender = column ? column.filterRender : null;
207
208
  const compConf = filterRender ? renderer.get(filterRender.name) : null;
208
- const filterClassName = compConf ? compConf.filterClassName : '';
209
+ const filterClassName = compConf ? (compConf.tableFilterClassName || compConf.filterClassName) : '';
209
210
  const params = Object.assign({}, tableInternalData._currFilterParams, { $panel, $table: $xeTable });
210
211
  return h('div', {
211
212
  class: [
package/es/table/src/body.js CHANGED
@@ -128,8 +128,8 @@ export default defineComponent({
128
128
  const { height: rowHeight } = rowOpts;
129
129
  const renderOpts = editRender || cellRender;
130
130
  const compConf = renderOpts ? renderer.get(renderOpts.name) : null;
131
- const compCellClassName = compConf ? compConf.cellClassName : '';
132
- const compCellStyle = compConf ? compConf.cellStyle : '';
131
+ const compCellClassName = compConf ? (compConf.tableCellClassName || compConf.cellClassName) : null;
132
+ const compCellStyle = compConf ? (compConf.tableCellStyle || compConf.cellStyle) : '';
133
133
  const showAllTip = tooltipOpts.showAll;
134
134
  const columnIndex = $xeTable.getColumnIndex(column);
135
135
  const _columnIndex = $xeTable.getVTColumnIndex(column);
@@ -743,9 +743,9 @@ export default defineComponent({
743
743
  }
744
744
  else {
745
745
  const compConf = emptyOpts.name ? renderer.get(emptyOpts.name) : null;
746
- const renderTableEmptyView = compConf ? compConf.renderTableEmptyView || compConf.renderEmpty : null;
747
- if (renderTableEmptyView) {
748
- emptyContent = getSlotVNs(renderTableEmptyView(emptyOpts, { $table: $xeTable }));
746
+ const rtEmptyView = compConf ? compConf.renderTableEmptyView || compConf.renderEmpty : null;
747
+ if (rtEmptyView) {
748
+ emptyContent = getSlotVNs(rtEmptyView(emptyOpts, { $table: $xeTable }));
749
749
  }
750
750
  else {
751
751
  emptyContent = tableProps.emptyText || getI18n('vxe.table.emptyText');
package/es/table/src/cell.js CHANGED
@@ -91,8 +91,11 @@ function getFooterContent(params) {
91
91
  }
92
92
  if (renderOpts) {
93
93
  const compConf = renderer.get(renderOpts.name);
94
- if (compConf && compConf.renderFooter) {
95
- return getSlotVNs(compConf.renderFooter(renderOpts, params));
94
+ if (compConf) {
95
+ const rtFooter = compConf.renderTableFooter || compConf.renderFooter;
96
+ if (rtFooter) {
97
+ return getSlotVNs(rtFooter(renderOpts, params));
98
+ }
96
99
  }
97
100
  }
98
101
  // 兼容老模式
@@ -177,8 +180,11 @@ export const Cell = {
177
180
  }
178
181
  if (renderOpts) {
179
182
  const compConf = renderer.get(renderOpts.name);
180
- if (compConf && compConf.renderHeader) {
181
- return renderTitleContent(params, getSlotVNs(compConf.renderHeader(renderOpts, params)));
183
+ if (compConf) {
184
+ const rtHeader = compConf.renderTableHeader || compConf.renderHeader;
185
+ if (rtHeader) {
186
+ return renderTitleContent(params, getSlotVNs(rtHeader(renderOpts, params)));
187
+ }
182
188
  }
183
189
  }
184
190
  return renderTitleContent(params, formatText(column.getTitle(), 1));
@@ -195,11 +201,14 @@ export const Cell = {
195
201
  return $table.callSlot(defaultSlot, params);
196
202
  }
197
203
  if (renderOpts) {
198
- const funName = editRender ? 'renderCell' : 'renderDefault';
199
204
  const compConf = renderer.get(renderOpts.name);
200
- const compFn = compConf ? compConf[funName] : null;
201
- if (compFn) {
202
- return getSlotVNs(compFn(renderOpts, Object.assign({ $type: editRender ? 'edit' : 'cell' }, params)));
205
+ if (compConf) {
206
+ const rtCell = compConf.renderTableCell || compConf.renderCell;
207
+ const rtDefault = compConf.renderTableDefault || compConf.renderDefault;
208
+ const compFn = editRender ? rtCell : rtDefault;
209
+ if (compFn) {
210
+ return getSlotVNs(compFn(renderOpts, Object.assign({ $type: editRender ? 'edit' : 'cell' }, params)));
211
+ }
203
212
  }
204
213
  }
205
214
  const cellValue = $table.getCellLabel(row, column);
@@ -618,8 +627,11 @@ export const Cell = {
618
627
  }
619
628
  if (contentRender) {
620
629
  const compConf = renderer.get(contentRender.name);
621
- if (compConf && compConf.renderExpand) {
622
- return getSlotVNs(compConf.renderExpand(contentRender, params));
630
+ if (compConf) {
631
+ const rtExpand = compConf.renderTableExpand || compConf.renderExpand;
632
+ if (rtExpand) {
633
+ return getSlotVNs(rtExpand(contentRender, params));
634
+ }
623
635
  }
624
636
  }
625
637
  return [];
package/es/table/src/table.js CHANGED
@@ -1276,8 +1276,8 @@ export default defineComponent({
1276
1276
  return filterColumns.every(({ column, valueList, itemList }) => {
1277
1277
  const { filterMethod, filterRender } = column;
1278
1278
  const compConf = filterRender ? renderer.get(filterRender.name) : null;
1279
- const compFilterMethod = compConf ? compConf.filterMethod : null;
1280
- const defaultFilterMethod = compConf ? compConf.defaultFilterMethod : null;
1279
+ const compFilterMethod = compConf ? (compConf.tableFilterMethod || compConf.filterMethod) : null;
1280
+ const tdFilterMethod = compConf ? (compConf.defaultTableFilterMethod || compConf.defaultFilterMethod) : null;
1281
1281
  const cellValue = getCellValue(row, column);
1282
1282
  if (filterMethod) {
1283
1283
  return itemList.some((item) => filterMethod({ value: item.value, option: item, cellValue, row, column, $table: $xeTable }));
@@ -1288,8 +1288,8 @@ export default defineComponent({
1288
1288
  else if (allFilterMethod) {
1289
1289
  return allFilterMethod({ options: itemList, values: valueList, cellValue, row, column });
1290
1290
  }
1291
- else if (defaultFilterMethod) {
1292
- return itemList.some((item) => defaultFilterMethod({ value: item.value, option: item, cellValue, row, column, $table: $xeTable }));
1291
+ else if (tdFilterMethod) {
1292
+ return itemList.some((item) => tdFilterMethod({ value: item.value, option: item, cellValue, row, column, $table: $xeTable }));
1293
1293
  }
1294
1294
  return valueList.indexOf(XEUtils.get(row, column.field)) > -1;
1295
1295
  });
@@ -6376,9 +6376,9 @@ export default defineComponent({
6376
6376
  }
6377
6377
  else {
6378
6378
  const compConf = emptyOpts.name ? renderer.get(emptyOpts.name) : null;
6379
- const renderTableEmptyView = compConf ? compConf.renderTableEmptyView || compConf.renderEmpty : null;
6380
- if (renderTableEmptyView) {
6381
- return getSlotVNs(renderTableEmptyView(emptyOpts, params));
6379
+ const rtEmptyView = compConf ? compConf.renderTableEmptyView || compConf.renderEmpty : null;
6380
+ if (rtEmptyView) {
6381
+ return getSlotVNs(rtEmptyView(emptyOpts, params));
6382
6382
  }
6383
6383
  }
6384
6384
  return getFuncText(props.emptyText) || getI18n('vxe.table.emptyText');
package/es/ui/index.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { VxeUI } from '@vxe-ui/core';
2
2
  import { getFuncText } from './src/utils';
3
- VxeUI.version = "4.7.17-beta.0";
4
- VxeUI.tableVersion = "4.7.17-beta.0";
3
+ VxeUI.version = "4.7.17-beta.1";
4
+ VxeUI.tableVersion = "4.7.17-beta.1";
5
5
  VxeUI.setConfig({
6
6
  emptyCell: '　',
7
7
  table: {
package/es/ui/src/log.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { VxeUI } from '@vxe-ui/core';
2
2
  const { log } = VxeUI;
3
- const version = `table v${"4.7.17-beta.0"}`;
3
+ const version = `table v${"4.7.17-beta.1"}`;
4
4
  export const warnLog = log.create('warn', version);
5
5
  export const errLog = log.create('error', version);
package/lib/index.umd.js CHANGED
@@ -1949,8 +1949,8 @@ function eqEmptyValue(cellValue) {
1949
1949
  ;// CONCATENATED MODULE: ./packages/ui/index.ts
1950
1950
 
1951
1951
 
1952
- core_.VxeUI.version = "4.7.17-beta.0";
1953
- core_.VxeUI.tableVersion = "4.7.17-beta.0";
1952
+ core_.VxeUI.version = "4.7.17-beta.1";
1953
+ core_.VxeUI.tableVersion = "4.7.17-beta.1";
1954
1954
  core_.VxeUI.setConfig({
1955
1955
  emptyCell: '　',
1956
1956
  table: {
@@ -2253,7 +2253,7 @@ var es_array_push = __webpack_require__(4114);
2253
2253
  const {
2254
2254
  log: log_log
2255
2255
  } = core_.VxeUI;
2256
- const version = `table v${"4.7.17-beta.0"}`;
2256
+ const version = `table v${"4.7.17-beta.1"}`;
2257
2257
  const warnLog = log_log.create('warn', version);
2258
2258
  const errLog = log_log.create('error', version);
2259
2259
  ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3212,8 +3212,11 @@ function getFooterContent(params) {
3212
3212
  }
3213
3213
  if (renderOpts) {
3214
3214
  const compConf = cell_renderer.get(renderOpts.name);
3215
- if (compConf && compConf.renderFooter) {
3216
- return getSlotVNs(compConf.renderFooter(renderOpts, params));
3215
+ if (compConf) {
3216
+ const rtFooter = compConf.renderTableFooter || compConf.renderFooter;
3217
+ if (rtFooter) {
3218
+ return getSlotVNs(rtFooter(renderOpts, params));
3219
+ }
3217
3220
  }
3218
3221
  }
3219
3222
  // 兼容老模式
@@ -3317,8 +3320,11 @@ const Cell = {
3317
3320
  }
3318
3321
  if (renderOpts) {
3319
3322
  const compConf = cell_renderer.get(renderOpts.name);
3320
- if (compConf && compConf.renderHeader) {
3321
- return renderTitleContent(params, getSlotVNs(compConf.renderHeader(renderOpts, params)));
3323
+ if (compConf) {
3324
+ const rtHeader = compConf.renderTableHeader || compConf.renderHeader;
3325
+ if (rtHeader) {
3326
+ return renderTitleContent(params, getSlotVNs(rtHeader(renderOpts, params)));
3327
+ }
3322
3328
  }
3323
3329
  }
3324
3330
  return renderTitleContent(params, formatText(column.getTitle(), 1));
@@ -3343,13 +3349,16 @@ const Cell = {
3343
3349
  return $table.callSlot(defaultSlot, params);
3344
3350
  }
3345
3351
  if (renderOpts) {
3346
- const funName = editRender ? 'renderCell' : 'renderDefault';
3347
3352
  const compConf = cell_renderer.get(renderOpts.name);
3348
- const compFn = compConf ? compConf[funName] : null;
3349
- if (compFn) {
3350
- return getSlotVNs(compFn(renderOpts, Object.assign({
3351
- $type: editRender ? 'edit' : 'cell'
3352
- }, params)));
3353
+ if (compConf) {
3354
+ const rtCell = compConf.renderTableCell || compConf.renderCell;
3355
+ const rtDefault = compConf.renderTableDefault || compConf.renderDefault;
3356
+ const compFn = editRender ? rtCell : rtDefault;
3357
+ if (compFn) {
3358
+ return getSlotVNs(compFn(renderOpts, Object.assign({
3359
+ $type: editRender ? 'edit' : 'cell'
3360
+ }, params)));
3361
+ }
3353
3362
  }
3354
3363
  }
3355
3364
  const cellValue = $table.getCellLabel(row, column);
@@ -3920,8 +3929,11 @@ const Cell = {
3920
3929
  }
3921
3930
  if (contentRender) {
3922
3931
  const compConf = cell_renderer.get(contentRender.name);
3923
- if (compConf && compConf.renderExpand) {
3924
- return getSlotVNs(compConf.renderExpand(contentRender, params));
3932
+ if (compConf) {
3933
+ const rtExpand = compConf.renderTableExpand || compConf.renderExpand;
3934
+ if (rtExpand) {
3935
+ return getSlotVNs(rtExpand(contentRender, params));
3936
+ }
3925
3937
  }
3926
3938
  }
3927
3939
  return [];
@@ -4596,8 +4608,8 @@ const lineOffsetSizes = {
4596
4608
  } = rowOpts;
4597
4609
  const renderOpts = editRender || cellRender;
4598
4610
  const compConf = renderOpts ? body_renderer.get(renderOpts.name) : null;
4599
- const compCellClassName = compConf ? compConf.cellClassName : '';
4600
- const compCellStyle = compConf ? compConf.cellStyle : '';
4611
+ const compCellClassName = compConf ? compConf.tableCellClassName || compConf.cellClassName : null;
4612
+ const compCellStyle = compConf ? compConf.tableCellStyle || compConf.cellStyle : '';
4601
4613
  const showAllTip = tooltipOpts.showAll;
4602
4614
  const columnIndex = $xeTable.getColumnIndex(column);
4603
4615
  const _columnIndex = $xeTable.getVTColumnIndex(column);
@@ -5344,9 +5356,9 @@ const lineOffsetSizes = {
5344
5356
  });
5345
5357
  } else {
5346
5358
  const compConf = emptyOpts.name ? body_renderer.get(emptyOpts.name) : null;
5347
- const renderTableEmptyView = compConf ? compConf.renderTableEmptyView || compConf.renderEmpty : null;
5348
- if (renderTableEmptyView) {
5349
- emptyContent = getSlotVNs(renderTableEmptyView(emptyOpts, {
5359
+ const rtEmptyView = compConf ? compConf.renderTableEmptyView || compConf.renderEmpty : null;
5360
+ if (rtEmptyView) {
5361
+ emptyContent = getSlotVNs(rtEmptyView(emptyOpts, {
5350
5362
  $table: $xeTable
5351
5363
  }));
5352
5364
  } else {
@@ -7233,14 +7245,15 @@ const {
7233
7245
  $panel,
7234
7246
  $table: $xeTable
7235
7247
  });
7248
+ const rtFilter = compConf ? compConf.renderTableFilter || compConf.renderFilter : null;
7236
7249
  if (filterSlot) {
7237
7250
  return [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
7238
7251
  class: 'vxe-table--filter-template'
7239
7252
  }, $xeTable.callSlot(filterSlot, params))];
7240
- } else if (compConf && compConf.renderFilter) {
7253
+ } else if (rtFilter) {
7241
7254
  return [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
7242
7255
  class: 'vxe-table--filter-template'
7243
- }, getSlotVNs(compConf.renderFilter(filterRender, params)))];
7256
+ }, getSlotVNs(rtFilter(filterRender, params)))];
7244
7257
  }
7245
7258
  const isAllChecked = multiple ? filterStore.isAllSelected : !filterStore.options.some(item => item._checked);
7246
7259
  const isAllIndeterminate = multiple && filterStore.isIndeterminate;
@@ -7295,7 +7308,7 @@ const {
7295
7308
  const filterRender = column.filterRender;
7296
7309
  const compConf = filterRender ? panel_renderer.get(filterRender.name) : null;
7297
7310
  const isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate;
7298
- return multiple && (!compConf || compConf.showFilterFooter !== false) ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
7311
+ return multiple && (compConf ? !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false) : true) ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
7299
7312
  class: 'vxe-table--filter-footer'
7300
7313
  }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('button', {
7301
7314
  class: {
@@ -7319,7 +7332,7 @@ const {
7319
7332
  } = filterStore;
7320
7333
  const filterRender = column ? column.filterRender : null;
7321
7334
  const compConf = filterRender ? panel_renderer.get(filterRender.name) : null;
7322
- const filterClassName = compConf ? compConf.filterClassName : '';
7335
+ const filterClassName = compConf ? compConf.tableFilterClassName || compConf.filterClassName : '';
7323
7336
  const params = Object.assign({}, tableInternalData._currFilterParams, {
7324
7337
  $panel,
7325
7338
  $table: $xeTable
@@ -9468,8 +9481,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
9468
9481
  filterRender
9469
9482
  } = column;
9470
9483
  const compConf = filterRender ? table_renderer.get(filterRender.name) : null;
9471
- const compFilterMethod = compConf ? compConf.filterMethod : null;
9472
- const defaultFilterMethod = compConf ? compConf.defaultFilterMethod : null;
9484
+ const compFilterMethod = compConf ? compConf.tableFilterMethod || compConf.filterMethod : null;
9485
+ const tdFilterMethod = compConf ? compConf.defaultTableFilterMethod || compConf.defaultFilterMethod : null;
9473
9486
  const cellValue = getCellValue(row, column);
9474
9487
  if (filterMethod) {
9475
9488
  return itemList.some(item => filterMethod({
@@ -9497,8 +9510,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
9497
9510
  row,
9498
9511
  column
9499
9512
  });
9500
- } else if (defaultFilterMethod) {
9501
- return itemList.some(item => defaultFilterMethod({
9513
+ } else if (tdFilterMethod) {
9514
+ return itemList.some(item => tdFilterMethod({
9502
9515
  value: item.value,
9503
9516
  option: item,
9504
9517
  cellValue,
@@ -15440,9 +15453,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
15440
15453
  return slots.empty(params);
15441
15454
  } else {
15442
15455
  const compConf = emptyOpts.name ? table_renderer.get(emptyOpts.name) : null;
15443
- const renderTableEmptyView = compConf ? compConf.renderTableEmptyView || compConf.renderEmpty : null;
15444
- if (renderTableEmptyView) {
15445
- return getSlotVNs(renderTableEmptyView(emptyOpts, params));
15456
+ const rtEmptyView = compConf ? compConf.renderTableEmptyView || compConf.renderEmpty : null;
15457
+ if (rtEmptyView) {
15458
+ return getSlotVNs(rtEmptyView(emptyOpts, params));
15446
15459
  }
15447
15460
  }
15448
15461
  return getFuncText(props.emptyText) || table_getI18n('vxe.table.emptyText');
@@ -16133,7 +16146,7 @@ hook_hooks.add('tableFilterModule', {
16133
16146
  filterRender
16134
16147
  } = column;
16135
16148
  const compConf = filterRender ? hook_renderer.get(filterRender.name) : null;
16136
- const filterRecoverMethod = column.filterRecoverMethod || (compConf ? compConf.filterRecoverMethod : null);
16149
+ const frMethod = column.filterRecoverMethod || (compConf ? compConf.tableFilterRecoverMethod || compConf.filterRecoverMethod : null);
16137
16150
  internalData._currFilterParams = params;
16138
16151
  Object.assign(filterStore, {
16139
16152
  multiple: filterMultiple,
@@ -16149,8 +16162,8 @@ hook_hooks.add('tableFilterModule', {
16149
16162
  } = option;
16150
16163
  option._checked = checked;
16151
16164
  if (!checked && _checked !== checked) {
16152
- if (filterRecoverMethod) {
16153
- filterRecoverMethod({
16165
+ if (frMethod) {
16166
+ frMethod({
16154
16167
  option,
16155
16168
  column,
16156
16169
  $table: $xeTable
@@ -16228,16 +16241,16 @@ hook_hooks.add('tableFilterModule', {
16228
16241
  } = column;
16229
16242
  if (filters) {
16230
16243
  const compConf = filterRender ? hook_renderer.get(filterRender.name) : null;
16231
- const filterResetMethod = column.filterResetMethod || (compConf ? compConf.filterResetMethod : null);
16244
+ const frMethod = column.filterResetMethod || (compConf ? compConf.tableFilterResetMethod || compConf.filterResetMethod : null);
16232
16245
  filters.forEach(item => {
16233
16246
  item._checked = false;
16234
16247
  item.checked = false;
16235
- if (!filterResetMethod) {
16248
+ if (!frMethod) {
16236
16249
  item.data = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(item.resetValue, true);
16237
16250
  }
16238
16251
  });
16239
- if (filterResetMethod) {
16240
- filterResetMethod({
16252
+ if (frMethod) {
16253
+ frMethod({
16241
16254
  options: filters,
16242
16255
  column,
16243
16256
  $table: $xeTable
@@ -17779,10 +17792,10 @@ edit_hook_hooks.add('tableEditModule', {
17779
17792
  } = editRender;
17780
17793
  let inputElem;
17781
17794
  if (!autofocus && compRender) {
17782
- autofocus = compRender.autofocus;
17795
+ autofocus = compRender.tableAutofocus || compRender.autofocus;
17783
17796
  }
17784
17797
  if (!autoselect && compRender) {
17785
- autoselect = compRender.autoselect;
17798
+ autoselect = compRender.tableAutoSelect || compRender.autoselect;
17786
17799
  }
17787
17800
  // 如果指定了聚焦 class
17788
17801
  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(autofocus)) {
@@ -18262,7 +18275,7 @@ export_hook_hooks.add('tableExportModule', {
18262
18275
  if (!bodyExportMethod && renderOpts && renderOpts.name) {
18263
18276
  const compConf = export_hook_renderer.get(renderOpts.name);
18264
18277
  if (compConf) {
18265
- bodyExportMethod = compConf.exportMethod;
18278
+ bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod;
18266
18279
  }
18267
18280
  }
18268
18281
  if (!bodyExportMethod) {
@@ -18404,7 +18417,7 @@ export_hook_hooks.add('tableExportModule', {
18404
18417
  if (!footLabelMethod && renderOpts && renderOpts.name) {
18405
18418
  const compConf = export_hook_renderer.get(renderOpts.name);
18406
18419
  if (compConf) {
18407
- footLabelMethod = compConf.footerExportMethod;
18420
+ footLabelMethod = compConf.tableFooterExportMethod || compConf.footerExportMethod;
18408
18421
  }
18409
18422
  }
18410
18423
  if (!footLabelMethod) {