vxe-table 4.23.11 → 4.23.13

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 (278) hide show
  1. package/dist/all.esm.js +20675 -20631
  2. package/dist/all.esm.min.js +3 -0
  3. package/es/colgroup/index.d.ts +18 -18
  4. package/es/column/index.d.ts +18 -18
  5. package/es/grid/index.d.ts +174 -174
  6. package/es/grid/src/emits.d.ts +1 -1
  7. package/es/grid/src/emits.js +3 -3
  8. package/es/grid/src/grid.d.ts +27 -27
  9. package/es/grid/src/grid.js +1670 -1667
  10. package/es/grid/src/props.d.ts +2 -2
  11. package/es/grid/src/props.js +4 -4
  12. package/es/index.esm.js +1 -0
  13. package/es/index.js +1 -0
  14. package/es/table/index.d.ts +174 -174
  15. package/es/table/module/custom/panel.js +1588 -1585
  16. package/es/table/module/export/export-panel.js +587 -584
  17. package/es/table/module/export/import-panel.js +258 -255
  18. package/es/table/module/filter/hook.js +1 -15
  19. package/es/table/module/filter/panel.js +281 -278
  20. package/es/table/module/menu/panel.js +225 -222
  21. package/es/table/src/body.js +895 -892
  22. package/es/table/src/column.d.ts +3 -3
  23. package/es/table/src/column.js +39 -36
  24. package/es/table/src/emits.d.ts +1 -1
  25. package/es/table/src/emits.js +2 -2
  26. package/es/table/src/footer.d.ts +2 -2
  27. package/es/table/src/footer.js +341 -338
  28. package/es/table/src/group.d.ts +3 -3
  29. package/es/table/src/group.js +49 -46
  30. package/es/table/src/header.js +539 -536
  31. package/es/table/src/props.d.ts +2 -2
  32. package/es/table/src/props.js +2 -2
  33. package/es/table/src/table.d.ts +27 -27
  34. package/es/table/src/table.js +13744 -13724
  35. package/es/toolbar/index.d.ts +18 -18
  36. package/es/toolbar/src/toolbar.d.ts +3 -3
  37. package/es/toolbar/src/toolbar.js +595 -592
  38. package/es/ui/index.js +2 -1
  39. package/es/ui/src/dom.d.ts +1 -1
  40. package/es/ui/src/log.js +1 -1
  41. package/es/ui/src/vn.d.ts +2 -2
  42. package/lib/colgroup/index.d.ts +760 -0
  43. package/lib/column/index.d.ts +760 -0
  44. package/lib/components.d.ts +13 -0
  45. package/lib/grid/index.d.ts +2824 -0
  46. package/lib/grid/src/emits.d.ts +2 -0
  47. package/lib/grid/src/emits.js +2 -2
  48. package/lib/grid/src/grid.d.ts +556 -0
  49. package/lib/grid/src/grid.js +1666 -1663
  50. package/lib/grid/src/props.d.ts +200 -0
  51. package/lib/grid/src/props.js +3 -3
  52. package/lib/index.common.js +1 -0
  53. package/lib/index.d.ts +3 -0
  54. package/lib/index.js +1 -0
  55. package/lib/index.umd.js +20675 -20631
  56. package/lib/index.umd.min.js +3 -3
  57. package/lib/locale/ar-EG.umd.d.ts +908 -0
  58. package/lib/locale/ar-EG.umd.min.js +1 -0
  59. package/lib/locale/de-DE.umd.d.ts +908 -0
  60. package/lib/locale/de-DE.umd.min.js +1 -0
  61. package/lib/locale/en-US.umd.d.ts +908 -0
  62. package/lib/locale/en-US.umd.min.js +1 -0
  63. package/lib/locale/es-ES.umd.d.ts +908 -0
  64. package/lib/locale/es-ES.umd.min.js +1 -0
  65. package/lib/locale/fr-FR.umd.d.ts +908 -0
  66. package/lib/locale/fr-FR.umd.min.js +1 -0
  67. package/lib/locale/hu-HU.umd.d.ts +908 -0
  68. package/lib/locale/hu-HU.umd.min.js +1 -0
  69. package/lib/locale/hy-AM.umd.d.ts +908 -0
  70. package/lib/locale/hy-AM.umd.min.js +1 -0
  71. package/lib/locale/id-ID.umd.d.ts +908 -0
  72. package/lib/locale/id-ID.umd.min.js +1 -0
  73. package/lib/locale/it-IT.umd.d.ts +908 -0
  74. package/lib/locale/it-IT.umd.min.js +1 -0
  75. package/lib/locale/ja-JP.umd.d.ts +908 -0
  76. package/lib/locale/ja-JP.umd.min.js +1 -0
  77. package/lib/locale/ko-KR.umd.d.ts +908 -0
  78. package/lib/locale/ko-KR.umd.min.js +1 -0
  79. package/lib/locale/lang/ar-EG.d.ts +908 -0
  80. package/lib/locale/lang/ar-EG.umd.d.ts +908 -0
  81. package/lib/locale/lang/ar-EG.umd.min.js +1 -0
  82. package/lib/locale/lang/de-DE.d.ts +908 -0
  83. package/lib/locale/lang/de-DE.umd.d.ts +908 -0
  84. package/lib/locale/lang/de-DE.umd.min.js +1 -0
  85. package/lib/locale/lang/en-US.d.ts +908 -0
  86. package/lib/locale/lang/en-US.umd.d.ts +908 -0
  87. package/lib/locale/lang/en-US.umd.min.js +1 -0
  88. package/lib/locale/lang/es-ES.d.ts +908 -0
  89. package/lib/locale/lang/es-ES.umd.d.ts +908 -0
  90. package/lib/locale/lang/es-ES.umd.min.js +1 -0
  91. package/lib/locale/lang/fr-FR.d.ts +908 -0
  92. package/lib/locale/lang/fr-FR.umd.d.ts +908 -0
  93. package/lib/locale/lang/fr-FR.umd.min.js +1 -0
  94. package/lib/locale/lang/hu-HU.d.ts +908 -0
  95. package/lib/locale/lang/hu-HU.umd.d.ts +908 -0
  96. package/lib/locale/lang/hu-HU.umd.min.js +1 -0
  97. package/lib/locale/lang/hy-AM.d.ts +908 -0
  98. package/lib/locale/lang/hy-AM.umd.d.ts +908 -0
  99. package/lib/locale/lang/hy-AM.umd.min.js +1 -0
  100. package/lib/locale/lang/id-ID.d.ts +908 -0
  101. package/lib/locale/lang/id-ID.umd.d.ts +908 -0
  102. package/lib/locale/lang/id-ID.umd.min.js +1 -0
  103. package/lib/locale/lang/it-IT.d.ts +908 -0
  104. package/lib/locale/lang/it-IT.umd.d.ts +908 -0
  105. package/lib/locale/lang/it-IT.umd.min.js +1 -0
  106. package/lib/locale/lang/ja-JP.d.ts +908 -0
  107. package/lib/locale/lang/ja-JP.umd.d.ts +908 -0
  108. package/lib/locale/lang/ja-JP.umd.min.js +1 -0
  109. package/lib/locale/lang/ko-KR.d.ts +908 -0
  110. package/lib/locale/lang/ko-KR.umd.d.ts +908 -0
  111. package/lib/locale/lang/ko-KR.umd.min.js +1 -0
  112. package/lib/locale/lang/ms-MY.d.ts +908 -0
  113. package/lib/locale/lang/ms-MY.umd.d.ts +908 -0
  114. package/lib/locale/lang/ms-MY.umd.min.js +1 -0
  115. package/lib/locale/lang/nb-NO.d.ts +908 -0
  116. package/lib/locale/lang/nb-NO.umd.d.ts +908 -0
  117. package/lib/locale/lang/nb-NO.umd.min.js +1 -0
  118. package/lib/locale/lang/pt-BR.d.ts +908 -0
  119. package/lib/locale/lang/pt-BR.umd.d.ts +908 -0
  120. package/lib/locale/lang/pt-BR.umd.min.js +1 -0
  121. package/lib/locale/lang/ru-RU.d.ts +908 -0
  122. package/lib/locale/lang/ru-RU.umd.d.ts +908 -0
  123. package/lib/locale/lang/ru-RU.umd.min.js +1 -0
  124. package/lib/locale/lang/th-TH.d.ts +908 -0
  125. package/lib/locale/lang/th-TH.umd.d.ts +908 -0
  126. package/lib/locale/lang/th-TH.umd.min.js +1 -0
  127. package/lib/locale/lang/ug-CN.d.ts +908 -0
  128. package/lib/locale/lang/ug-CN.umd.d.ts +908 -0
  129. package/lib/locale/lang/ug-CN.umd.min.js +1 -0
  130. package/lib/locale/lang/uk-UA.d.ts +908 -0
  131. package/lib/locale/lang/uk-UA.umd.d.ts +908 -0
  132. package/lib/locale/lang/uk-UA.umd.min.js +1 -0
  133. package/lib/locale/lang/uz-UZ.d.ts +908 -0
  134. package/lib/locale/lang/uz-UZ.umd.d.ts +908 -0
  135. package/lib/locale/lang/uz-UZ.umd.min.js +1 -0
  136. package/lib/locale/lang/vi-VN.d.ts +908 -0
  137. package/lib/locale/lang/vi-VN.umd.d.ts +908 -0
  138. package/lib/locale/lang/vi-VN.umd.min.js +1 -0
  139. package/lib/locale/lang/zh-CHT.d.ts +908 -0
  140. package/lib/locale/lang/zh-CHT.umd.d.ts +908 -0
  141. package/lib/locale/lang/zh-CHT.umd.min.js +1 -0
  142. package/lib/locale/lang/zh-CN.d.ts +908 -0
  143. package/lib/locale/lang/zh-CN.umd.d.ts +908 -0
  144. package/lib/locale/lang/zh-CN.umd.min.js +1 -0
  145. package/lib/locale/lang/zh-HK.d.ts +908 -0
  146. package/lib/locale/lang/zh-HK.umd.d.ts +908 -0
  147. package/lib/locale/lang/zh-HK.umd.min.js +1 -0
  148. package/lib/locale/lang/zh-MO.d.ts +908 -0
  149. package/lib/locale/lang/zh-MO.umd.d.ts +908 -0
  150. package/lib/locale/lang/zh-MO.umd.min.js +1 -0
  151. package/lib/locale/lang/zh-TC.d.ts +908 -0
  152. package/lib/locale/lang/zh-TC.umd.d.ts +908 -0
  153. package/lib/locale/lang/zh-TC.umd.min.js +1 -0
  154. package/lib/locale/lang/zh-TW.d.ts +908 -0
  155. package/lib/locale/lang/zh-TW.umd.d.ts +908 -0
  156. package/lib/locale/lang/zh-TW.umd.min.js +1 -0
  157. package/lib/locale/ms-MY.umd.d.ts +908 -0
  158. package/lib/locale/ms-MY.umd.min.js +1 -0
  159. package/lib/locale/nb-NO.umd.d.ts +908 -0
  160. package/lib/locale/nb-NO.umd.min.js +1 -0
  161. package/lib/locale/pt-BR.umd.d.ts +908 -0
  162. package/lib/locale/pt-BR.umd.min.js +1 -0
  163. package/lib/locale/ru-RU.umd.d.ts +908 -0
  164. package/lib/locale/ru-RU.umd.min.js +1 -0
  165. package/lib/locale/th-TH.umd.d.ts +908 -0
  166. package/lib/locale/th-TH.umd.min.js +1 -0
  167. package/lib/locale/ug-CN.umd.d.ts +908 -0
  168. package/lib/locale/ug-CN.umd.min.js +1 -0
  169. package/lib/locale/uk-UA.umd.d.ts +908 -0
  170. package/lib/locale/uk-UA.umd.min.js +1 -0
  171. package/lib/locale/uz-UZ.umd.d.ts +908 -0
  172. package/lib/locale/uz-UZ.umd.min.js +1 -0
  173. package/lib/locale/vi-VN.umd.d.ts +908 -0
  174. package/lib/locale/vi-VN.umd.min.js +1 -0
  175. package/lib/locale/zh-CHT.umd.d.ts +908 -0
  176. package/lib/locale/zh-CHT.umd.min.js +1 -0
  177. package/lib/locale/zh-CN.umd.d.ts +908 -0
  178. package/lib/locale/zh-CN.umd.min.js +1 -0
  179. package/lib/locale/zh-HK.umd.d.ts +908 -0
  180. package/lib/locale/zh-HK.umd.min.js +1 -0
  181. package/lib/locale/zh-MO.umd.d.ts +908 -0
  182. package/lib/locale/zh-MO.umd.min.js +1 -0
  183. package/lib/locale/zh-TC.umd.d.ts +908 -0
  184. package/lib/locale/zh-TC.umd.min.js +1 -0
  185. package/lib/locale/zh-TW.umd.d.ts +908 -0
  186. package/lib/locale/zh-TW.umd.min.js +1 -0
  187. package/lib/table/index.d.ts +2672 -0
  188. package/lib/table/module/custom/hook.d.ts +1 -0
  189. package/lib/table/module/custom/panel.d.ts +17 -0
  190. package/lib/table/module/custom/panel.js +1588 -1585
  191. package/lib/table/module/edit/hook.d.ts +1 -0
  192. package/lib/table/module/export/export-panel.d.ts +27 -0
  193. package/lib/table/module/export/export-panel.js +587 -584
  194. package/lib/table/module/export/hook.d.ts +1 -0
  195. package/lib/table/module/export/import-panel.d.ts +27 -0
  196. package/lib/table/module/export/import-panel.js +258 -255
  197. package/lib/table/module/export/util.d.ts +5 -0
  198. package/lib/table/module/filter/hook.d.ts +1 -0
  199. package/lib/table/module/filter/hook.js +1 -15
  200. package/lib/table/module/filter/panel.d.ts +16 -0
  201. package/lib/table/module/filter/panel.js +281 -278
  202. package/lib/table/module/keyboard/hook.d.ts +1 -0
  203. package/lib/table/module/menu/hook.d.ts +1 -0
  204. package/lib/table/module/menu/panel.d.ts +2 -0
  205. package/lib/table/module/menu/panel.js +225 -222
  206. package/lib/table/module/validator/hook.d.ts +1 -0
  207. package/lib/table/render/index.d.ts +1 -0
  208. package/lib/table/src/body.d.ts +24 -0
  209. package/lib/table/src/body.js +895 -892
  210. package/lib/table/src/cell.d.ts +192 -0
  211. package/lib/table/src/column.d.ts +263 -0
  212. package/lib/table/src/column.js +39 -36
  213. package/lib/table/src/columnInfo.d.ts +13 -0
  214. package/lib/table/src/emits.d.ts +2 -0
  215. package/lib/table/src/emits.js +2 -2
  216. package/lib/table/src/footer.d.ts +45 -0
  217. package/lib/table/src/footer.js +341 -338
  218. package/lib/table/src/group.d.ts +178 -0
  219. package/lib/table/src/group.js +49 -46
  220. package/lib/table/src/header.d.ts +26 -0
  221. package/lib/table/src/header.js +539 -536
  222. package/lib/table/src/props.d.ts +238 -0
  223. package/lib/table/src/props.js +2 -2
  224. package/lib/table/src/store.d.ts +6 -0
  225. package/lib/table/src/table.d.ts +539 -0
  226. package/lib/table/src/table.js +13742 -13722
  227. package/lib/table/src/use/cell-view.d.ts +10 -0
  228. package/lib/table/src/use/index.d.ts +1 -0
  229. package/lib/table/src/util.d.ts +74 -0
  230. package/lib/toolbar/index.d.ts +340 -0
  231. package/lib/toolbar/src/toolbar.d.ts +75 -0
  232. package/lib/toolbar/src/toolbar.js +595 -592
  233. package/lib/ui/index.d.ts +85 -0
  234. package/lib/ui/index.js +2 -1
  235. package/lib/ui/src/anime.d.ts +10 -0
  236. package/lib/ui/src/comp.d.ts +2 -0
  237. package/lib/ui/src/dom.d.ts +80 -0
  238. package/lib/ui/src/log.d.ts +6 -0
  239. package/lib/ui/src/log.js +1 -1
  240. package/lib/ui/src/utils.d.ts +23 -0
  241. package/lib/ui/src/vn.d.ts +7 -0
  242. package/lib/v-x-e-table/index.d.ts +2 -0
  243. package/lib/vxe-colgroup/index.d.ts +3 -0
  244. package/lib/vxe-column/index.d.ts +3 -0
  245. package/lib/vxe-grid/index.d.ts +3 -0
  246. package/lib/vxe-table/index.d.ts +3 -0
  247. package/lib/vxe-toolbar/index.d.ts +3 -0
  248. package/lib/vxe-ui/index.d.ts +3 -0
  249. package/package.json +9 -2
  250. package/packages/grid/src/emits.ts +2 -2
  251. package/packages/grid/src/grid.ts +10 -10
  252. package/packages/grid/src/props.ts +3 -3
  253. package/packages/index.ts +2 -2
  254. package/packages/table/module/custom/panel.ts +2 -2
  255. package/packages/table/module/export/export-panel.ts +2 -2
  256. package/packages/table/module/export/import-panel.ts +2 -2
  257. package/packages/table/module/filter/hook.ts +1 -15
  258. package/packages/table/module/filter/panel.ts +2 -2
  259. package/packages/table/module/menu/panel.ts +2 -2
  260. package/packages/table/src/body.ts +2 -2
  261. package/packages/table/src/column.ts +2 -2
  262. package/packages/table/src/emits.ts +1 -1
  263. package/packages/table/src/footer.ts +2 -2
  264. package/packages/table/src/group.ts +2 -2
  265. package/packages/table/src/header.ts +2 -2
  266. package/packages/table/src/props.ts +1 -1
  267. package/packages/table/src/table.ts +74 -57
  268. package/packages/toolbar/src/toolbar.ts +2 -2
  269. package/packages/ui/index.ts +1 -0
  270. /package/dist/{iconfont.1793016957545.ttf → iconfont.1793627868721.ttf} +0 -0
  271. /package/dist/{iconfont.1793016957545.woff → iconfont.1793627868721.woff} +0 -0
  272. /package/dist/{iconfont.1793016957545.woff2 → iconfont.1793627868721.woff2} +0 -0
  273. /package/es/{iconfont.1793016957545.ttf → iconfont.1793627868721.ttf} +0 -0
  274. /package/es/{iconfont.1793016957545.woff → iconfont.1793627868721.woff} +0 -0
  275. /package/es/{iconfont.1793016957545.woff2 → iconfont.1793627868721.woff2} +0 -0
  276. /package/lib/{iconfont.1793016957545.ttf → iconfont.1793627868721.ttf} +0 -0
  277. /package/lib/{iconfont.1793016957545.woff → iconfont.1793627868721.woff} +0 -0
  278. /package/lib/{iconfont.1793016957545.woff2 → iconfont.1793627868721.woff2} +0 -0
@@ -44,8 +44,8 @@ import Cell from './cell'
44
44
  import TableBodyComponent from './body'
45
45
  import TableHeaderComponent from './header'
46
46
  import TableFooterComponent from './footer'
47
- import { tableProps } from './props'
48
- import { tableEmits } from './emits'
47
+ import { tableComponenProps } from './props'
48
+ import { tableComponenEmits } from './emits'
49
49
  import TableCustomPanelComponent from '../module/custom/panel'
50
50
  import TableFilterPanelComponent from '../module/filter/panel'
51
51
  import TableImportPanelComponent from '../module/export/import-panel'
@@ -83,7 +83,7 @@ import type {
83
83
 
84
84
  const { warnLog, errLog } = createComponentLog('table')
85
85
 
86
- const { getConfig, getIcon, getI18n, renderer, formats, createEvent, globalResize, interceptor, hooks, domUtils, globalEvents, GLOBAL_EVENT_KEYS, useFns, renderEmptyElement } = VxeUI
86
+ const { getConfig, getIcon, getI18n, renderer, formats, createEvent, dbUtils, globalResize, interceptor, hooks, domUtils, globalEvents, GLOBAL_EVENT_KEYS, useFns, renderEmptyElement } = VxeUI
87
87
 
88
88
  const supportMaxRow = 5e6
89
89
  const customStorageKey = 'VXE_CUSTOM_STORE'
@@ -97,10 +97,10 @@ let crossTableDragRowObj: {
97
97
  $newTable: (VxeTableConstructor & VxeTablePrivateMethods) | null
98
98
  } | null = null
99
99
 
100
- export default defineVxeComponent({
100
+ export default /* define-vxe-component start */ defineVxeComponent({
101
101
  name: 'VxeTable',
102
- props: tableProps,
103
- emits: tableEmits,
102
+ props: tableComponenProps,
103
+ emits: tableComponenEmits,
104
104
  setup(props, context) {
105
105
  const { slots, emit } = context
106
106
 
@@ -1080,8 +1080,13 @@ export default defineVxeComponent({
1080
1080
  xegrid: $xeGrid
1081
1081
  } as unknown as VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods
1082
1082
 
1083
- const { refTrackXElem, refTrackYElem, refThumbXElem, refThumbYElem, updateThumbSize, updateThumbOffset, clickTrackXEvent, clickTrackYEvent, pointerdownThumbXEvent, pointermoveThumbXEvent, cleatPointerThumbEvent, pointerdownThumbYEvent, pointermoveThumbYEvent } =
1084
- useFns.useInitVScrollbar($xeTable)
1083
+ const customStoreDB = dbUtils
1084
+ ? dbUtils.createStore<VxeTableDefines.CustomStoreData>(customStorageKey, {
1085
+ driver: computeCustomOpts.value.storeDriver
1086
+ })
1087
+ : null
1088
+
1089
+ const { refTrackXElem, refTrackYElem, refThumbXElem, refThumbYElem, updateThumbSize, updateThumbOffset, clickTrackXEvent, clickTrackYEvent, pointerdownThumbXEvent, pointermoveThumbXEvent, cleatPointerThumbEvent, pointerdownThumbYEvent, pointermoveThumbYEvent } = useFns.useInitVScrollbar($xeTable)
1085
1090
 
1086
1091
  const eqCellValue = (newRow: any, oldRow: any, field: string) => {
1087
1092
  const val1 = XEUtils.get(newRow, field)
@@ -1111,19 +1116,43 @@ export default defineVxeComponent({
1111
1116
  return orders[oIndex < orders.length ? oIndex : 0]
1112
1117
  }
1113
1118
 
1114
- const getCustomStorageMap = (id?: string) => {
1115
- const version = getConfig().version
1116
- const rest = XEUtils.toStringJSON(localStorage.getItem(customStorageKey) || '')
1117
- const maps = rest && rest._v === version ? rest : { _v: version }
1118
- return (id ? maps[id] : maps) || {}
1119
+ /**
1120
+ * 获取个性化数据
1121
+ */
1122
+ function getCustomStorageMap(id: string) {
1123
+ if (customStoreDB) {
1124
+ return customStoreDB.getById(id).then((dbRest) => (dbRest ? dbRest.data : {}))
1125
+ }
1126
+
1127
+ // 已废弃,兼容旧版本
1128
+ return new Promise<VxeTableDefines.CustomStoreData>((resolve) => {
1129
+ const version = getConfig().version
1130
+ const rest = XEUtils.toStringJSON(localStorage.getItem(customStorageKey) || '')
1131
+ const maps = rest && rest._v === version ? rest : { _v: version }
1132
+ resolve((id ? maps[id] : maps) || {})
1133
+ })
1119
1134
  }
1120
1135
 
1136
+ /**
1137
+ * 更新个性化数据
1138
+ * 储存结构以 id 为 key, 储存个性化数据,上升版本号可以用于重置组件保存的数据
1139
+ * {
1140
+ * [id: string]: VxeTableDefines.CustomStoreData,
1141
+ * v: 1
1142
+ * }
1143
+ */
1121
1144
  const setCustomStorageMap = (id: string, data: any) => {
1145
+ if (customStoreDB) {
1146
+ return customStoreDB.updateById(id, data)
1147
+ }
1148
+
1149
+ // 已废弃,兼容旧版本
1122
1150
  const version = getConfig().version
1123
- const maps = getCustomStorageMap()
1151
+ const rest = XEUtils.toStringJSON(localStorage.getItem(customStorageKey) || '')
1152
+ const maps = rest && rest._v === version ? rest : { _v: version }
1124
1153
  maps[id] = data || undefined
1125
- maps._v = version
1126
1154
  localStorage.setItem(customStorageKey, XEUtils.toJSONString(maps))
1155
+ return Promise.resolve()
1127
1156
  }
1128
1157
 
1129
1158
  const getRecoverRowMaps = (keyMaps: Record<string, any>) => {
@@ -1879,20 +1908,21 @@ export default defineVxeComponent({
1879
1908
  errLog('vxe.error.reqProp', ['id'])
1880
1909
  return
1881
1910
  }
1882
- const storeData: VxeTableDefines.CustomStoreData = getCustomStorageMap(tableId)
1883
- if (restoreStore) {
1884
- return Promise.resolve(restoreStore({ $table: $xeTable, id: tableId, type: 'restore', storeData }))
1885
- .then((storeData) => {
1886
- if (!storeData) {
1887
- return
1888
- }
1889
- return handleCustomRestore(storeData)
1890
- })
1891
- .catch((e) => e)
1892
- } else {
1911
+ return getCustomStorageMap(tableId).then((storeData) => {
1912
+ if (restoreStore) {
1913
+ return Promise.resolve(restoreStore({ $table: $xeTable, id: tableId, type: 'restore', storeData }))
1914
+ .then((storeData) => {
1915
+ if (!storeData) {
1916
+ return
1917
+ }
1918
+ return handleCustomRestore(storeData)
1919
+ })
1920
+ .catch((e) => e)
1921
+ }
1893
1922
  return handleCustomRestore(storeData)
1894
- }
1923
+ })
1895
1924
  }
1925
+ return Promise.resolve()
1896
1926
  }
1897
1927
 
1898
1928
  const updateColumnAllOverflow = () => {
@@ -2336,8 +2366,8 @@ export default defineVxeComponent({
2336
2366
  const reHeight = calcCellAutoHeight(rowid, rowRest, el)
2337
2367
  rowRest.height = Math.max(defaultRowHeight, reHeight)
2338
2368
  }
2339
- el.removeAttribute('data-calc-row')
2340
2369
  })
2370
+ el.removeAttribute('data-calc-row')
2341
2371
  reactData.calcCellHeightFlag++
2342
2372
  }
2343
2373
  }
@@ -4483,6 +4513,7 @@ export default defineVxeComponent({
4483
4513
  }
4484
4514
  })
4485
4515
  }
4516
+ const oldVisibleColumn = internalData.visibleColumn
4486
4517
  const visibleColumn = leftList.concat(centerList).concat(rightList)
4487
4518
  internalData.visibleColumn = visibleColumn
4488
4519
  updateColumnOffsetLeft()
@@ -4521,7 +4552,7 @@ export default defineVxeComponent({
4521
4552
  }
4522
4553
  // 如果列被显示/隐藏,则清除合并状态
4523
4554
  // 如果列被设置为固定,则清除合并状态
4524
- if (visibleColumn.length !== internalData.visibleColumn.length || !internalData.visibleColumn.every((column, index) => column === visibleColumn[index])) {
4555
+ if (oldVisibleColumn.length !== visibleColumn.length || !visibleColumn.every((column, index) => column === oldVisibleColumn[index])) {
4525
4556
  $xeTable.clearMergeCells()
4526
4557
  $xeTable.clearMergeFooterItems()
4527
4558
  }
@@ -6719,8 +6750,8 @@ export default defineVxeComponent({
6719
6750
  if (rowRest) {
6720
6751
  rowRest.resizeHeight = calcCellAutoHeight(rowid, rowRest, el)
6721
6752
  }
6722
- el.removeAttribute('data-calc-row')
6723
6753
  })
6754
+ el.removeAttribute('data-calc-row')
6724
6755
  reactData.calcCellHeightFlag++
6725
6756
  }
6726
6757
  return nextTick()
@@ -7080,7 +7111,11 @@ export default defineVxeComponent({
7080
7111
  }
7081
7112
  }
7082
7113
  if (reserve) {
7083
- tableFullData.forEach((row) => handleCheckboxReserveRow(row, false))
7114
+ if (treeConfig) {
7115
+ XEUtils.eachTree(tableFullData, (row) => handleCheckboxReserveRow(row, false), { children: childrenField })
7116
+ } else {
7117
+ tableFullData.forEach((row) => handleCheckboxReserveRow(row, false))
7118
+ }
7084
7119
  }
7085
7120
  reactData.isAllSelected = false
7086
7121
  reactData.isIndeterminate = false
@@ -8858,12 +8893,7 @@ export default defineVxeComponent({
8858
8893
  }
8859
8894
  }
8860
8895
  } else if (hasEnableConf(mouseConfig, mouseOpts)) {
8861
- if (
8862
- !getEventTargetNode(evnt, el).flag &&
8863
- !($xeGGWrapper && getEventTargetNode(evnt, $xeGGWrapper.getRefMaps().refElem.value).flag) &&
8864
- !(tableMenu && getEventTargetNode(evnt, tableMenu.getRefMaps().refElem.value).flag) &&
8865
- !($xeToolbar && getEventTargetNode(evnt, $xeToolbar.getRefMaps().refElem.value).flag)
8866
- ) {
8896
+ if (!getEventTargetNode(evnt, el).flag && !($xeGGWrapper && getEventTargetNode(evnt, $xeGGWrapper.getRefMaps().refElem.value).flag) && !(tableMenu && getEventTargetNode(evnt, tableMenu.getRefMaps().refElem.value).flag) && !($xeToolbar && getEventTargetNode(evnt, $xeToolbar.getRefMaps().refElem.value).flag)) {
8867
8897
  if ($xeTable.clearSelected) {
8868
8898
  $xeTable.clearSelected()
8869
8899
  }
@@ -9299,8 +9329,8 @@ export default defineVxeComponent({
9299
9329
  } else if (hasBackspaceKey && hasEnableConf(keyboardConfig, keyboardOpts) && keyboardOpts.isBack && isEnableConf(editConfig) && (selectRow || selectColumn)) {
9300
9330
  if (!isEditStatus) {
9301
9331
  const { backMethod } = keyboardOpts
9302
- // 如果是删除键
9303
- if (keyboardOpts.isDel && isEnableConf(editConfig) && (selectRow || selectColumn)) {
9332
+ // 如果是回车键
9333
+ if (isEnableConf(editConfig) && (selectRow || selectColumn)) {
9304
9334
  const params = {
9305
9335
  row: selectRow,
9306
9336
  rowIndex: $xeTable.getRowIndex(selectRow),
@@ -9736,15 +9766,7 @@ export default defineVxeComponent({
9736
9766
  * @param {Event} evnt 事件
9737
9767
  * @param {Row} row 行对象
9738
9768
  */
9739
- const handleTooltip = (
9740
- evnt: MouseEvent,
9741
- tipOpts: VxeTablePropTypes.TooltipConfig | VxeTablePropTypes.HeaderTooltipConfig | VxeTablePropTypes.FooterTooltipConfig,
9742
- type: 'header' | 'body' | 'footer',
9743
- tdEl: HTMLTableCellElement,
9744
- overflowElem: HTMLElement | null,
9745
- tipElem: HTMLElement | null,
9746
- params: any
9747
- ) => {
9769
+ const handleTooltip = (evnt: MouseEvent, tipOpts: VxeTablePropTypes.TooltipConfig | VxeTablePropTypes.HeaderTooltipConfig | VxeTablePropTypes.FooterTooltipConfig, type: 'header' | 'body' | 'footer', tdEl: HTMLTableCellElement, overflowElem: HTMLElement | null, tipElem: HTMLElement | null, params: any) => {
9748
9770
  const tipOverEl = overflowElem || tdEl
9749
9771
  if (!tipOverEl) {
9750
9772
  return nextTick()
@@ -10691,9 +10713,8 @@ export default defineVxeComponent({
10691
10713
  type,
10692
10714
  storeData
10693
10715
  })
10694
- } else {
10695
- setCustomStorageMap(tableId, type === 'reset' ? null : storeData)
10696
10716
  }
10717
+ return setCustomStorageMap(tableId, type === 'reset' ? null : storeData)
10697
10718
  }
10698
10719
  return nextTick()
10699
10720
  },
@@ -12702,11 +12723,7 @@ export default defineVxeComponent({
12702
12723
  }
12703
12724
  }
12704
12725
  }
12705
- if (
12706
- $xeTable.eqRow(dragRow, row) ||
12707
- (isControlKey && treeConfig && lazy && row[hasChildField] && rowRest && !rowRest.treeLoaded && !isAutoLazyLoadToChild && !isAutoExpandToChild) ||
12708
- (!isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rowRest.level))
12709
- ) {
12726
+ if ($xeTable.eqRow(dragRow, row) || (isControlKey && treeConfig && lazy && row[hasChildField] && rowRest && !rowRest.treeLoaded && !isAutoLazyLoadToChild && !isAutoExpandToChild) || (!isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rowRest.level))) {
12710
12727
  showDropTip(evnt, trEl, null, false, dragPos)
12711
12728
  return
12712
12729
  }
@@ -13477,7 +13494,7 @@ export default defineVxeComponent({
13477
13494
  return
13478
13495
  }
13479
13496
 
13480
- const { highlightHoverRow } = tableProps
13497
+ const { highlightHoverRow } = props
13481
13498
  const { scrollXLoad, scrollYLoad, overflowX, overflowY, expandColumn } = reactData
13482
13499
  const leftFixedWidth = computeLeftFixedWidth.value
13483
13500
  const rightFixedWidth = computeRightFixedWidth.value
@@ -16008,4 +16025,4 @@ export default defineVxeComponent({
16008
16025
  render() {
16009
16026
  return this.renderVN()
16010
16027
  }
16011
- })
16028
+ }) /* define-vxe-component end */
@@ -26,7 +26,7 @@ function createInternalData(): ToolbarInternalData {
26
26
  }
27
27
  }
28
28
 
29
- export default defineVxeComponent({
29
+ export default /* define-vxe-component start */ defineVxeComponent({
30
30
  name: 'VxeToolbar',
31
31
  props: {
32
32
  loading: Boolean,
@@ -765,4 +765,4 @@ export default defineVxeComponent({
765
765
  render() {
766
766
  return this.renderVN()
767
767
  }
768
- })
768
+ }) /* define-vxe-component end */
@@ -116,6 +116,7 @@ VxeUI.setConfig({
116
116
  },
117
117
  customConfig: {
118
118
  // enabled: false,
119
+ storeDriver: 'localStorage',
119
120
  allowVisible: true,
120
121
  allowResizable: true,
121
122
  allowFixed: true,