vxe-table 3.8.3 → 3.8.4

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 (89) hide show
  1. package/README.md +1 -0
  2. package/lib/button/src/button.js +44 -5
  3. package/lib/button/src/button.min.js +1 -1
  4. package/lib/button/src/group.js +10 -1
  5. package/lib/button/src/group.min.js +1 -1
  6. package/lib/custom/src/panel.js +18 -3
  7. package/lib/custom/src/panel.min.js +1 -1
  8. package/lib/custom/style/style.css +15 -9
  9. package/lib/custom/style/style.min.css +1 -1
  10. package/lib/edit/src/mixin.js +10 -7
  11. package/lib/edit/src/mixin.min.js +1 -1
  12. package/lib/grid/src/grid.js +3 -2
  13. package/lib/grid/src/grid.min.js +1 -1
  14. package/lib/icon/style/style.css +1 -1
  15. package/lib/icon/style/style.min.css +1 -1
  16. package/lib/index.css +1 -1
  17. package/lib/index.umd.js +189 -94
  18. package/lib/index.umd.min.js +1 -1
  19. package/lib/locale/lang/en-US.js +75 -74
  20. package/lib/locale/lang/en-US.min.js +1 -1
  21. package/lib/locale/lang/en-US.umd.js +75 -74
  22. package/lib/locale/lang/es-ES.js +11 -2
  23. package/lib/locale/lang/es-ES.min.js +1 -1
  24. package/lib/locale/lang/es-ES.umd.js +11 -2
  25. package/lib/locale/lang/ja-JP.js +157 -156
  26. package/lib/locale/lang/ja-JP.min.js +1 -1
  27. package/lib/locale/lang/ja-JP.umd.js +157 -156
  28. package/lib/locale/lang/pt-BR.js +199 -190
  29. package/lib/locale/lang/pt-BR.min.js +1 -1
  30. package/lib/locale/lang/pt-BR.umd.js +199 -190
  31. package/lib/locale/lang/zh-CN.js +53 -52
  32. package/lib/locale/lang/zh-CN.min.js +1 -1
  33. package/lib/locale/lang/zh-CN.umd.js +53 -52
  34. package/lib/locale/lang/zh-HK.min.js +1 -1
  35. package/lib/locale/lang/zh-HK.umd.js +60 -59
  36. package/lib/locale/lang/zh-MO.min.js +1 -1
  37. package/lib/locale/lang/zh-MO.umd.js +60 -59
  38. package/lib/locale/lang/zh-TC.js +60 -59
  39. package/lib/locale/lang/zh-TC.min.js +1 -1
  40. package/lib/locale/lang/zh-TC.umd.js +60 -59
  41. package/lib/locale/lang/zh-TW.min.js +1 -1
  42. package/lib/locale/lang/zh-TW.umd.js +60 -59
  43. package/lib/menu/src/mixin.js +5 -5
  44. package/lib/menu/src/mixin.min.js +1 -1
  45. package/lib/style.css +1 -1
  46. package/lib/style.min.css +1 -1
  47. package/lib/table/src/methods.js +32 -13
  48. package/lib/table/src/methods.min.js +1 -1
  49. package/lib/table/src/table.js +5 -0
  50. package/lib/table/src/table.min.js +1 -1
  51. package/lib/table/src/util.js +2 -2
  52. package/lib/table/src/util.min.js +1 -1
  53. package/lib/tools/log.js +1 -1
  54. package/lib/tools/log.min.js +1 -1
  55. package/lib/v-x-e-table/index.js +1 -1
  56. package/lib/v-x-e-table/index.min.js +1 -1
  57. package/lib/v-x-e-table/src/interceptor.js +1 -1
  58. package/lib/v-x-e-table/src/interceptor.min.js +1 -1
  59. package/lib/vxe-table-custom-module/style/style.css +15 -9
  60. package/lib/vxe-table-custom-module/style/style.min.css +1 -1
  61. package/package.json +1 -1
  62. package/packages/button/src/button.js +42 -9
  63. package/packages/button/src/group.js +8 -2
  64. package/packages/custom/src/panel.js +22 -5
  65. package/packages/edit/src/mixin.js +9 -7
  66. package/packages/grid/src/grid.js +2 -2
  67. package/packages/locale/lang/en-US.js +75 -74
  68. package/packages/locale/lang/es-ES.js +11 -2
  69. package/packages/locale/lang/ja-JP.js +157 -156
  70. package/packages/locale/lang/pt-BR.js +200 -191
  71. package/packages/locale/lang/zh-CN.js +53 -52
  72. package/packages/locale/lang/zh-TC.js +60 -59
  73. package/packages/menu/src/mixin.js +5 -5
  74. package/packages/table/src/methods.js +33 -14
  75. package/packages/table/src/table.js +5 -0
  76. package/packages/table/src/util.js +2 -2
  77. package/packages/v-x-e-table/src/interceptor.js +1 -1
  78. package/styles/custom.scss +14 -2
  79. package/types/checkbox-group.d.ts +1 -1
  80. package/types/colgroup.d.ts +2 -4
  81. package/types/column.d.ts +7 -9
  82. package/types/table.d.ts +3 -4
  83. package/types/v-x-e-table/renderer.d.ts +1 -2
  84. /package/lib/icon/style/{iconfont.1714353062133.ttf → iconfont.1714486550546.ttf} +0 -0
  85. /package/lib/icon/style/{iconfont.1714353062133.woff → iconfont.1714486550546.woff} +0 -0
  86. /package/lib/icon/style/{iconfont.1714353062133.woff2 → iconfont.1714486550546.woff2} +0 -0
  87. /package/lib/{iconfont.1714353062133.ttf → iconfont.1714486550546.ttf} +0 -0
  88. /package/lib/{iconfont.1714353062133.woff → iconfont.1714486550546.woff} +0 -0
  89. /package/lib/{iconfont.1714353062133.woff2 → iconfont.1714486550546.woff2} +0 -0
@@ -8,7 +8,7 @@ export default {
8
8
  text: '加載中...'
9
9
  },
10
10
  error: {
11
- groupFixed: '如果使用分組表頭,冻结列必須按組設定',
11
+ groupFixed: '如果使用分組表頭,固冻结列必須按組設定',
12
12
  groupMouseRange: '分组表頭與 "{0}" 不能同時使用,這可能會出現錯誤',
13
13
  groupTag: '分組列頭應該使用 "{0}" 而不是 "{1}",這可能會出現錯誤',
14
14
  scrollErrProp: '啟用虛擬滾動後不支持該參數 "{0}"',
@@ -114,9 +114,10 @@ export default {
114
114
  cstmDragTarget: '移動目標:{0}',
115
115
  setting: {
116
116
  colSort: '排序',
117
+ sortHelpTip: '點擊並拖動圖標可以調整列的排序',
117
118
  colTitle: '標題',
118
119
  colVisible: '是否顯示',
119
- colFixed: '冻结列',
120
+ colFixed: '冻结列(最多 {0} 列)',
120
121
  fixedLeft: '左側',
121
122
  fixedUnset: '不設定',
122
123
  fixedRight: '右側'
@@ -268,29 +269,29 @@ export default {
268
269
  plugins: {
269
270
  extendCellArea: {
270
271
  area: {
271
- mergeErr: '无法对合并单元格进行该操作',
272
- multiErr: '无法对多重选择区域进行该操作',
273
- extendErr: '如果延伸的区域包含被合并的单元格,所有合并的单元格需大小相同',
272
+ mergeErr: '無法對合併儲存格進行該操作',
273
+ multiErr: '無法對多重選擇區域進行該操作',
274
+ extendErr: '如果延伸的區域包含被合併的儲存格,所有合併的儲存格需大小相同',
274
275
  pasteMultiErr: '无法粘贴,需要相同大小的复制的区域和粘贴的区域才能执行此操作',
275
- cpInvalidErr: '该操作无法进行,您选择的区域中存在被禁止的列({0})'
276
+ cpInvalidErr: '該操作無法進行,您選擇的區域中存在被禁止的列({0})'
276
277
  },
277
278
  fnr: {
278
- title: '查找和替换',
279
+ title: '查找和替換',
279
280
  findLabel: '查找',
280
- replaceLabel: '替换',
281
- findTitle: '查找内容:',
282
- replaceTitle: '替换为:',
281
+ replaceLabel: '替換',
282
+ findTitle: '查找內容:',
283
+ replaceTitle: '替換為:',
283
284
  tabs: {
284
285
  find: '查找',
285
- replace: '替换'
286
+ replace: '替換'
286
287
  },
287
288
  filter: {
288
- re: '正则表达式',
289
- whole: '全词匹配',
290
- sensitive: '区分大小写'
289
+ re: '規則運算式',
290
+ whole: '全詞匹配',
291
+ sensitive: '區分大小寫'
291
292
  },
292
293
  btns: {
293
- findNext: '查找下一个',
294
+ findNext: '查找下一個',
294
295
  findAll: '查找全部',
295
296
  replace: '替换',
296
297
  replaceAll: '替换全部',
@@ -298,75 +299,75 @@ export default {
298
299
  },
299
300
  header: {
300
301
  seq: '#',
301
- cell: '单元格',
302
+ cell: '儲存格',
302
303
  value: '值'
303
304
  },
304
305
  empty: '(空值)',
305
- reError: '无效的正则表达式',
306
- recordCount: '已找到 {0} 个单元格',
307
- notCell: '找不到匹配的单元格',
308
- replaceSuccess: '成功替换 {0} 个单元格'
306
+ reError: '無效的規則運算式',
307
+ recordCount: '已找到 {0} 個儲存格',
308
+ notCell: '找不到匹配的儲存格',
309
+ replaceSuccess: '成功替換 {0} 個儲存格'
309
310
  }
310
311
  },
311
312
  filterComplexInput: {
312
313
  menus: {
313
- fixedColumn: '锁定列',
314
- fixedGroup: '锁定组',
315
- cancelFixed: '取消锁定',
316
- fixedLeft: '锁定左侧',
317
- fixedRight: '锁定右侧'
314
+ fixedColumn: '凍結列',
315
+ fixedGroup: '凍結分组',
316
+ cancelFixed: '取消凍結',
317
+ fixedLeft: '凍結左侧',
318
+ fixedRight: '凍結右侧'
318
319
  },
319
320
  cases: {
320
- equal: '等于',
321
- gt: '大于',
322
- lt: '小于',
323
- begin: '开头是',
324
- endin: '结尾是',
321
+ equal: '等於',
322
+ gt: '大於',
323
+ lt: '小於',
324
+ begin: '開頭是',
325
+ endin: '結尾是',
325
326
  include: '包含',
326
- isSensitive: '区分大小写'
327
+ isSensitive: '區分大小寫'
327
328
  }
328
329
  },
329
330
  filterCombination: {
330
331
  menus: {
331
332
  clearSort: '清除排序',
332
- sortAsc: '升序',
333
+ sortAsc: '昇冪',
333
334
  sortDesc: '降序',
334
- fixedColumn: '锁定列',
335
- fixedGroup: '锁定组',
336
- cancelFixed: '取消锁定',
337
- fixedLeft: '锁定左侧',
338
- fixedRight: '锁定右侧',
339
- clearFilter: '清除筛选',
340
- textOption: '文本筛选',
341
- numberOption: '数值筛选'
335
+ fixedColumn: '凍結列',
336
+ fixedGroup: '凍結分組',
337
+ cancelFixed: '取消凍結',
338
+ fixedLeft: '凍結左側',
339
+ fixedRight: '凍結右側',
340
+ clearFilter: '清除篩選',
341
+ textOption: '文字篩選',
342
+ numberOption: '數值篩選'
342
343
  },
343
344
  popup: {
344
- title: '自定义筛选的方式',
345
- currColumnTitle: '当前列:',
346
- and: '与',
345
+ title: '自定義篩選的管道',
346
+ currColumnTitle: '當前列:',
347
+ and: '與',
347
348
  or: '或',
348
- describeHtml: '可用 ? 代表单个字符<br/>用 * 代表任意多个字符'
349
+ describeHtml: '用 ? 代表單個字元<br/>用 * 代表任意多個字元'
349
350
  },
350
351
  cases: {
351
- equal: '等于',
352
- unequal: '不等于',
353
- gt: '大于',
354
- ge: '大于或等于',
355
- lt: '小于',
356
- le: '小于或等于',
357
- begin: '开头是',
358
- notbegin: '开头不是',
359
- endin: '结尾是',
360
- notendin: '结尾不是',
352
+ equal: '等於',
353
+ unequal: '不等於',
354
+ gt: '大於',
355
+ ge: '大於或等於',
356
+ lt: '小於',
357
+ le: '小於或等於',
358
+ begin: '開頭是',
359
+ notbegin: '開頭不是',
360
+ endin: '結尾是',
361
+ notendin: '結尾不是',
361
362
  include: '包含',
362
363
  exclude: '不包含',
363
- between: '介于',
364
- custom: '自定义筛选',
365
- insensitive: '不区分大小写',
366
- isSensitive: '区分大小写'
364
+ between: '介於',
365
+ custom: '自定義篩選',
366
+ insensitive: '不區分大小寫',
367
+ isSensitive: '區分大小寫'
367
368
  },
368
369
  empty: '(空白)',
369
- notData: '无匹配项'
370
+ notData: '無匹配項'
370
371
  }
371
372
  },
372
373
 
@@ -70,7 +70,7 @@ export default {
70
70
  if (activeArea && activeArea.row && activeArea.column) {
71
71
  params.row = activeArea.row
72
72
  params.column = activeArea.column
73
- this.openContextMenu(evnt, type, params)
73
+ this.handleOpenMenuEvent(evnt, type, params)
74
74
  return
75
75
  }
76
76
  } else if (mouseConfig && mouseOpts.selected) {
@@ -78,7 +78,7 @@ export default {
78
78
  if (selected.row && selected.column) {
79
79
  params.row = selected.row
80
80
  params.column = selected.column
81
- this.openContextMenu(evnt, type, params)
81
+ this.handleOpenMenuEvent(evnt, type, params)
82
82
  return
83
83
  }
84
84
  }
@@ -102,7 +102,7 @@ export default {
102
102
  params.row = row
103
103
  params.rowIndex = this.getRowIndex(row)
104
104
  }
105
- this.openContextMenu(evnt, layout, params)
105
+ this.handleOpenMenuEvent(evnt, layout, params)
106
106
  // 在 v4 中废弃事件 cell-context-menu、header-cell-context-menu、footer-cell-context-menu
107
107
  if (this.$listeners[`${typePrefix}cell-context-menu`]) {
108
108
  if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
@@ -117,7 +117,7 @@ export default {
117
117
  if (ctxMenuOpts.trigger === 'cell') {
118
118
  evnt.preventDefault()
119
119
  } else {
120
- this.openContextMenu(evnt, layout, params)
120
+ this.handleOpenMenuEvent(evnt, layout, params)
121
121
  }
122
122
  return
123
123
  }
@@ -131,7 +131,7 @@ export default {
131
131
  /**
132
132
  * 显示快捷菜单
133
133
  */
134
- openContextMenu (evnt, type, params) {
134
+ handleOpenMenuEvent (evnt, type, params) {
135
135
  const { isCtxMenu, ctxMenuStore, ctxMenuOpts } = this
136
136
  const config = ctxMenuOpts[type]
137
137
  const visibleMethod = ctxMenuOpts.visibleMethod
@@ -1581,6 +1581,16 @@ const Methods = {
1581
1581
  return this.handleCustom()
1582
1582
  },
1583
1583
  handleCustom () {
1584
+ const { mouseConfig } = this
1585
+ if (mouseConfig) {
1586
+ if (this.clearSelected) {
1587
+ this.clearSelected()
1588
+ }
1589
+ if (this.clearCellAreas) {
1590
+ this.clearCellAreas()
1591
+ this.clearCopyCellArea()
1592
+ }
1593
+ }
1584
1594
  this.saveCustomVisible()
1585
1595
  this.analyColumnWidth()
1586
1596
  return this.refreshColumn(true)
@@ -2405,7 +2415,14 @@ const Methods = {
2405
2415
  }
2406
2416
  },
2407
2417
  preventEvent (evnt, type, args, next, end) {
2408
- const evntList = VXETable.interceptor.get(type)
2418
+ let evntList = VXETable.interceptor.get(type)
2419
+
2420
+ // 兼容老版本
2421
+ if (!evntList.length && type === 'event.clearEdit') {
2422
+ evntList = VXETable.interceptor.get('event.clearActived')
2423
+ }
2424
+ // 兼容老版本
2425
+
2409
2426
  let rest
2410
2427
  if (!evntList.some(func => func(Object.assign({ $grid: this.$xegrid, $table: this, $event: evnt }, args)) === false)) {
2411
2428
  if (next) {
@@ -2460,33 +2477,33 @@ const Methods = {
2460
2477
  } else if (!this.lastCallTime || this.lastCallTime + 50 < Date.now()) {
2461
2478
  if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
2462
2479
  // 如果手动调用了激活单元格,避免触发源被移除后导致重复关闭
2463
- this.preventEvent(evnt, 'event.clearActived', actived.args, () => {
2464
- let isClearActived
2480
+ this.preventEvent(evnt, 'event.clearEdit', actived.args, () => {
2481
+ let isClear
2465
2482
  if (editOpts.mode === 'row') {
2466
2483
  const rowNode = getEventTargetNode(evnt, $el, 'vxe-body--row')
2467
2484
  // row 方式,如果点击了不同行
2468
- isClearActived = rowNode.flag ? getRowNode(rowNode.targetElem).item !== actived.args.row : false
2485
+ isClear = rowNode.flag ? getRowNode(rowNode.targetElem).item !== actived.args.row : false
2469
2486
  } else {
2470
2487
  // cell 方式,如果是非编辑列
2471
- isClearActived = !getEventTargetNode(evnt, $el, 'col--edit').flag
2488
+ isClear = !getEventTargetNode(evnt, $el, 'col--edit').flag
2472
2489
  }
2473
2490
  // 如果点击表头行,则清除激活状态
2474
- if (!isClearActived) {
2475
- isClearActived = getEventTargetNode(evnt, $el, 'vxe-header--row').flag
2491
+ if (!isClear) {
2492
+ isClear = getEventTargetNode(evnt, $el, 'vxe-header--row').flag
2476
2493
  }
2477
2494
  // 如果点击表尾行,则清除激活状态
2478
- if (!isClearActived) {
2479
- isClearActived = getEventTargetNode(evnt, $el, 'vxe-footer--row').flag
2495
+ if (!isClear) {
2496
+ isClear = getEventTargetNode(evnt, $el, 'vxe-footer--row').flag
2480
2497
  }
2481
2498
  // 如果固定了高度且点击了行之外的空白处,则清除激活状态
2482
- if (!isClearActived && this.height && !this.overflowY) {
2499
+ if (!isClear && this.height && !this.overflowY) {
2483
2500
  const bodyWrapperElem = evnt.target
2484
2501
  if (hasClass(bodyWrapperElem, 'vxe-table--body-wrapper')) {
2485
- isClearActived = evnt.offsetY < bodyWrapperElem.clientHeight
2502
+ isClear = evnt.offsetY < bodyWrapperElem.clientHeight
2486
2503
  }
2487
2504
  }
2488
2505
  if (
2489
- isClearActived ||
2506
+ isClear ||
2490
2507
  // 如果点击了当前表格之外
2491
2508
  !getEventTargetNode(evnt, $el).flag
2492
2509
  ) {
@@ -2499,7 +2516,9 @@ const Methods = {
2499
2516
  }
2500
2517
  } else if (mouseConfig) {
2501
2518
  if (!getEventTargetNode(evnt, $el).flag && !($xegrid && getEventTargetNode(evnt, $xegrid.$el).flag) && !(ctxWrapper && getEventTargetNode(evnt, ctxWrapper.$el).flag) && !($toolbar && getEventTargetNode(evnt, $toolbar.$el).flag)) {
2502
- this.clearSelected()
2519
+ if (this.clearSelected) {
2520
+ this.clearSelected()
2521
+ }
2503
2522
  if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
2504
2523
  this.preventEvent(evnt, 'event.clearAreas', {}, () => {
2505
2524
  this.clearCellAreas()
@@ -5318,7 +5337,7 @@ funcs.forEach(name => {
5318
5337
  errLog('vxe.error.reqModule', ['VxeTableValidatorModule'])
5319
5338
  } else if ('setFilter,openFilter,clearFilter,getCheckedFilters'.split(',').includes(name)) {
5320
5339
  errLog('vxe.error.reqModule', ['VxeTableFilterModule'])
5321
- } else if ('insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell'.split(',').includes(name)) {
5340
+ } else if ('insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell'.split(',').includes(name)) {
5322
5341
  errLog('vxe.error.reqModule', ['VxeTableEditModule'])
5323
5342
  } else if ('openCustom'.split(',').includes(name)) {
5324
5343
  errLog('vxe.error.reqModule', ['VxeTableCustomModule'])
@@ -415,6 +415,11 @@ export default {
415
415
  row: null,
416
416
  column: null
417
417
  },
418
+ // 当前被强制聚焦单元格,只会在鼠标点击后算聚焦
419
+ focused: {
420
+ row: null,
421
+ column: null
422
+ },
418
423
  insertList: [],
419
424
  insertMaps: {},
420
425
  removeList: [],
@@ -271,8 +271,8 @@ export function clearTableDefaultStatus (_vm) {
271
271
  _vm.clearRowExpand()
272
272
  _vm.clearTreeExpand()
273
273
  _vm.clearTreeExpandReserve()
274
- if (_vm.clearActived && VXETable._edit) {
275
- _vm.clearActived()
274
+ if (_vm.clearEdit && VXETable._edit) {
275
+ _vm.clearEdit()
276
276
  }
277
277
  if (_vm.clearSelected && (_vm.keyboardConfig || _vm.mouseConfig)) {
278
278
  _vm.clearSelected()
@@ -5,7 +5,7 @@ function toType (type) {
5
5
  return XEUtils.toValueString(type).replace('_', '').toLowerCase()
6
6
  }
7
7
 
8
- const eventTypes = 'created,mounted,activated,beforeDestroy,destroyed,event.clearActived,event.clearFilter,event.clearAreas,event.showMenu,event.keydown,event.export,event.import'.split(',').map(toType)
8
+ const eventTypes = 'created,mounted,activated,beforeDestroy,destroyed,event.clearEdit,event.clearActived,event.clearFilter,event.clearAreas,event.showMenu,event.keydown,event.export,event.import'.split(',').map(toType)
9
9
  const storeMap = {}
10
10
 
11
11
  export const interceptor = {
@@ -125,6 +125,8 @@
125
125
  table {
126
126
  width: 100%;
127
127
  border: 0;
128
+ table-layout: fixed;
129
+ word-break: break-all;
128
130
  border-spacing: 0;
129
131
  border-collapse: separate;
130
132
  th {
@@ -147,6 +149,9 @@
147
149
  border-top: 0;
148
150
  }
149
151
  }
152
+ &:hover {
153
+ background-color: $vxe-table-row-hover-background-color;
154
+ }
150
155
  }
151
156
  th,
152
157
  td {
@@ -176,7 +181,6 @@
176
181
  }
177
182
 
178
183
  .vxe-table-custom-popup--name {
179
- max-width: 360px;
180
184
  overflow: hidden;
181
185
  text-overflow: ellipsis;
182
186
  white-space: nowrap;
@@ -188,7 +192,6 @@
188
192
  &.level--#{$index} {
189
193
  .vxe-table-custom-popup--name {
190
194
  padding-left: $paddingLeft;
191
- max-width: 260px - $paddingLeft;
192
195
  }
193
196
  }
194
197
  }
@@ -272,3 +275,12 @@
272
275
  cursor: grabbing;
273
276
  }
274
277
  }
278
+
279
+ .vxe-table-custom-popup--table-sort-help-title,
280
+ .vxe-table-custom-popup--table-sort-help-icon {
281
+ vertical-align: middle;
282
+ }
283
+ .vxe-table-custom-popup--table-sort-help-icon {
284
+ margin-left: 5px;
285
+ cursor: help;
286
+ }
@@ -3,7 +3,7 @@ import { VXETableComponent } from './component'
3
3
  /**
4
4
  * 组件 - 复选框组
5
5
  */
6
- export interface VxeCheckboxGroup extends VXETableComponent {
6
+ export declare class VxeCheckboxGroup extends VXETableComponent {
7
7
  /**
8
8
  * 绑定值
9
9
  */
@@ -1,8 +1,6 @@
1
1
  import { ColumnFixed, ColumnAlign, ColumnFormatterMethodParams, ColumnCellRenderOptions, ColumnContentRenderOptions, Column } from './column'
2
2
  import { ColumnFilterOption, ColumnFilterRenderOptions, ColumnFilterMethodParams } from './module/filter'
3
3
  import { ColumnCellRenderParams } from './v-x-e-table/renderer'
4
- import { ColumnHeaderRenderParams } from './header'
5
- import { ColumnFooterRenderParams } from './footer'
6
4
  import { ColumnEditRenderOptions } from './module/edit'
7
5
  import { ColumnExportCellRenderParams, ColumnExportFooterRenderParams } from './module/export'
8
6
  import { TableOverflow } from './table'
@@ -77,11 +75,11 @@ export interface ColgroupProps {
77
75
  /**
78
76
  * 给表头单元格附加 className
79
77
  */
80
- headerClassName?: string | ((params: ColumnHeaderRenderParams) => string | any[] | { [key: string]: boolean });
78
+ headerClassName?: string | ((params: any) => string | any[] | { [key: string]: boolean });
81
79
  /**
82
80
  * 给表尾单元格附加 className
83
81
  */
84
- footerClassName?: string | ((params: ColumnFooterRenderParams) => string | any[] | { [key: string]: boolean });
82
+ footerClassName?: string | ((params: any) => string | any[] | { [key: string]: boolean });
85
83
  /**
86
84
  * 格式化显示内容
87
85
  */
package/types/column.d.ts CHANGED
@@ -1,9 +1,7 @@
1
- import { CreateElement, VNode } from 'vue'
1
+ import { CreateElement } from 'vue'
2
2
  import { VXETableComponent, SlotVNodeType } from './component'
3
3
  import { ColumnFilterOption, ColumnFilterParams, ColumnFilterRenderOptions, ColumnFilterSlotParams, ColumnFilterMethodParams } from './module/filter'
4
4
  import { ColumnCellRenderParams, ColumnDefaultSlotParams, ColumnIconSlotParams, ColumnContentSlotParams, RenderOptions, OptionProps, OptionGroupProps } from './v-x-e-table'
5
- import { ColumnHeaderSlotParams, ColumnHeaderRenderParams } from './header'
6
- import { ColumnFooterSlotParams, ColumnFooterRenderParams } from './footer'
7
5
  import { ColumnEditRenderOptions, ColumnEditSlotParams } from './module/edit'
8
6
  import { ColumnExportCellRenderParams, ColumnExportFooterRenderParams, ColumnExportHeaderRenderParams } from './module/export'
9
7
  import { TableOverflow } from './table'
@@ -74,11 +72,11 @@ export declare class VxeColumn extends VXETableComponent {
74
72
  /**
75
73
  * 给表头单元格附加 className
76
74
  */
77
- headerClassName?: string | ((params: ColumnHeaderRenderParams) => string | any[] | { [key: string]: boolean });
75
+ headerClassName?: string | ((params: any) => string | any[] | { [key: string]: boolean });
78
76
  /**
79
77
  * 给表尾单元格附加 className
80
78
  */
81
- footerClassName?: string | ((params: ColumnFooterRenderParams) => string | any[] | { [key: string]: boolean });
79
+ footerClassName?: string | ((params: any) => string | any[] | { [key: string]: boolean });
82
80
  /**
83
81
  * 格式化显示内容
84
82
  */
@@ -219,11 +217,11 @@ export interface ColumnOptions {
219
217
  /**
220
218
  * 给表头单元格附加 className
221
219
  */
222
- headerClassName?: string | ((params: ColumnHeaderRenderParams) => string | any[] | { [key: string]: boolean });
220
+ headerClassName?: string | ((params: any) => string | any[] | { [key: string]: boolean });
223
221
  /**
224
222
  * 给表尾单元格附加 className
225
223
  */
226
- footerClassName?: string | ((params: ColumnFooterRenderParams) => string | any[] | { [key: string]: boolean });
224
+ footerClassName?: string | ((params: any) => string | any[] | { [key: string]: boolean });
227
225
  /**
228
226
  * 格式化显示内容
229
227
  */
@@ -299,8 +297,8 @@ export interface ColumnOptions {
299
297
 
300
298
  slots?: {
301
299
  default?(params: ColumnDefaultSlotParams, h: CreateElement): SlotVNodeType | SlotVNodeType[]
302
- header?(params: ColumnHeaderSlotParams, h: CreateElement): SlotVNodeType | SlotVNodeType[]
303
- footer?(params: ColumnFooterSlotParams, h: CreateElement): SlotVNodeType | SlotVNodeType[]
300
+ header?(params: any, h: CreateElement): SlotVNodeType | SlotVNodeType[]
301
+ footer?(params: any, h: CreateElement): SlotVNodeType | SlotVNodeType[]
304
302
  content?(params: ColumnContentSlotParams, h: CreateElement): SlotVNodeType | SlotVNodeType[]
305
303
  filter?(params: ColumnFilterSlotParams, h: CreateElement): SlotVNodeType | SlotVNodeType[]
306
304
  edit?(params: ColumnEditSlotParams, h: CreateElement): SlotVNodeType | SlotVNodeType[]
package/types/table.d.ts CHANGED
@@ -4,7 +4,6 @@ import { ColumnCellRenderParams, TableEmptyRender } from './v-x-e-table'
4
4
  import { TableExportConfig, TableImportConfig, TablePrintConfig, SaveFileOptions, ReadFileOptions, ReadFileParams } from './module/export'
5
5
  import { ColumnFilterOption } from './module/filter'
6
6
  import { ColumnEditRule, ColumnEditValidErrMapParams } from './module/validator'
7
- import { ColumnFooterRenderParams } from './footer'
8
7
  import { MenuOptions, MenuFirstOption } from './module/menu'
9
8
 
10
9
  /* eslint-disable no-use-before-define */
@@ -733,7 +732,7 @@ export declare class VxeTable extends VXETableComponent {
733
732
  * 已废弃,请使用 isRowExpandByRow
734
733
  * @deprecated
735
734
  */
736
- isExpandByRow(row: RowInfo): boolean;
735
+ isRowExpandByRow(row: RowInfo): boolean;
737
736
  /**
738
737
  * 用于 type=expand,手动清空展开行状态,数据会恢复成未展开的状态
739
738
  */
@@ -952,7 +951,7 @@ export declare class VxeTable extends VXETableComponent {
952
951
  * 请使用 clearEdit
953
952
  * @deprecated
954
953
  */
955
- clearActived(evnt?: Event): Promise<any>
954
+ clearEdit(evnt?: Event): Promise<any>
956
955
  /**
957
956
  * 手动清除单元格激活状态
958
957
  */
@@ -1161,7 +1160,7 @@ export function TableFooterMethod(params: TableFooterMethodParams): Array<string
1161
1160
  export type TableSpanMethodParams = ColumnCellRenderParams
1162
1161
  export function TableSpanMethod(params: TableSpanMethodParams): { rowspan: number, colspan: number }
1163
1162
 
1164
- export type TableFooterSpanMethodParams = ColumnFooterRenderParams
1163
+ export type TableFooterSpanMethodParams = any
1165
1164
  export function TableFooterSpanMethod(params: TableFooterSpanMethodParams): { rowspan: number, colspan: number }
1166
1165
 
1167
1166
  export interface TableOptions {
@@ -5,7 +5,6 @@ import { Grid } from '../grid'
5
5
  import { ColumnInfo, ColumnCellRenderOptions, ColumnContentRenderOptions } from '../column'
6
6
  import { ColumnExportCellRenderParams, ColumnExportFooterRenderParams } from '../module/export'
7
7
  import { ColumnEditRenderOptions, ColumnEditRenderParams } from '../module/edit'
8
- import { ColumnFooterRenderParams } from '../footer'
9
8
  import { ColumnFilterRenderOptions, ColumnFilterRenderParams, ColumnFilterMethodParams, ColumnFilterResetParams } from '../module/filter'
10
9
  import { ToolbarButtonRenderOptions, ToolbarButtonRenderParams, ToolbarToolRenderOptions, ToolbarToolRenderParams } from '../toolbar'
11
10
  import { FormItemRenderOptions, FormItemRenderParams, FormItemVisibleParams, FormItemResetParams } from '../form-item'
@@ -48,7 +47,7 @@ export interface RendererMapOptions {
48
47
  cellStyle?: VNodeStyle | ((params: ColumnCellRenderParams | ColumnEditRenderParams) => VNodeStyle)
49
48
  renderHeader?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): SlotVNodeType | SlotVNodeType[];
50
49
  renderDefault?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): SlotVNodeType | SlotVNodeType[];
51
- renderFooter?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnFooterRenderParams): SlotVNodeType | SlotVNodeType[];
50
+ renderFooter?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: any): SlotVNodeType | SlotVNodeType[];
52
51
  exportMethod?(params: ColumnExportCellRenderParams): string;
53
52
  footerExportMethod?(params: ColumnExportFooterRenderParams): string;
54
53