vxe-table 4.1.20 → 4.2.0-beta.2

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 (324) hide show
  1. package/README.en.md +2 -4
  2. package/README.md +2 -3
  3. package/README.zh-TW.md +2 -4
  4. package/es/button/index.js +1 -1
  5. package/es/checkbox/index.js +1 -1
  6. package/es/checkbox-group/index.js +1 -1
  7. package/es/colgroup/index.js +3 -2
  8. package/es/column/index.js +3 -2
  9. package/es/edit/src/hook.js +2 -1
  10. package/es/export/index.js +2 -2
  11. package/es/export/src/hook.js +2 -1
  12. package/es/export/src/util.js +3 -5
  13. package/es/filter/index.js +1 -1
  14. package/es/filter/src/hook.js +17 -10
  15. package/es/footer/index.js +1 -1
  16. package/es/footer/src/footer.js +3 -2
  17. package/es/form/index.js +1 -1
  18. package/es/form/src/form-gather.js +3 -3
  19. package/es/form/src/form-item.js +4 -4
  20. package/es/form/src/form.js +36 -43
  21. package/es/form/src/render.js +15 -10
  22. package/es/form/src/util.js +6 -0
  23. package/es/form-gather/index.js +1 -1
  24. package/es/form-item/index.js +1 -1
  25. package/es/grid/index.js +1 -1
  26. package/es/grid/src/grid.js +2 -1
  27. package/es/header/index.js +1 -1
  28. package/es/header/src/header.js +1 -1
  29. package/es/input/index.js +1 -1
  30. package/es/input/src/date.js +41 -0
  31. package/es/input/src/input.js +4 -51
  32. package/es/input/src/number.js +10 -0
  33. package/es/list/index.js +1 -1
  34. package/es/menu/index.js +1 -1
  35. package/es/modal/index.js +1 -1
  36. package/es/modal/src/modal.js +2 -1
  37. package/es/optgroup/index.js +1 -1
  38. package/es/option/index.js +1 -1
  39. package/es/pager/index.js +1 -1
  40. package/es/pager/src/pager.js +13 -2
  41. package/es/pulldown/index.js +1 -1
  42. package/es/radio/index.js +1 -1
  43. package/es/radio-button/index.js +1 -1
  44. package/es/radio-group/index.js +1 -1
  45. package/es/select/index.js +1 -1
  46. package/es/select/style.css +1 -1
  47. package/es/style.css +1 -1
  48. package/es/style.min.css +1 -1
  49. package/es/switch/index.js +1 -1
  50. package/es/table/index.js +1 -1
  51. package/es/table/src/body.js +32 -11
  52. package/es/table/src/cell.js +3 -3
  53. package/es/table/src/column.js +3 -1
  54. package/es/table/src/columnInfo.js +5 -4
  55. package/es/table/src/emits.js +5 -1
  56. package/es/table/src/props.js +5 -2
  57. package/es/table/src/table.js +120 -86
  58. package/es/table/src/util.js +5 -3
  59. package/es/textarea/index.js +1 -1
  60. package/es/toolbar/index.js +1 -1
  61. package/es/toolbar/src/toolbar.js +2 -1
  62. package/es/tools/dom.js +9 -0
  63. package/es/tools/log.js +13 -0
  64. package/es/tools/utils.js +0 -12
  65. package/es/tooltip/index.js +1 -1
  66. package/es/tooltip/src/tooltip.js +85 -45
  67. package/es/tooltip/style.css +1 -1
  68. package/es/v-x-e-table/index.js +1 -0
  69. package/es/v-x-e-table/src/conf.js +12 -7
  70. package/es/v-x-e-table/src/interceptor.js +1 -1
  71. package/es/v-x-e-table/src/renderer.js +2 -1
  72. package/es/v-x-e-table/src/store.js +1 -1
  73. package/helper/vetur/attributes.json +31 -11
  74. package/helper/vetur/tags.json +8 -3
  75. package/lib/button/index.js +3 -2
  76. package/lib/button/index.min.js +1 -1
  77. package/lib/checkbox/index.js +3 -2
  78. package/lib/checkbox/index.min.js +1 -1
  79. package/lib/checkbox-group/index.js +3 -2
  80. package/lib/checkbox-group/index.min.js +1 -1
  81. package/lib/colgroup/index.js +6 -4
  82. package/lib/colgroup/index.min.js +1 -1
  83. package/lib/column/index.js +6 -4
  84. package/lib/column/index.min.js +1 -1
  85. package/lib/edit/src/hook.js +7 -5
  86. package/lib/edit/src/hook.min.js +1 -1
  87. package/lib/export/index.js +5 -4
  88. package/lib/export/index.min.js +1 -1
  89. package/lib/export/src/hook.js +14 -12
  90. package/lib/export/src/hook.min.js +1 -1
  91. package/lib/export/src/util.js +7 -9
  92. package/lib/export/src/util.min.js +1 -1
  93. package/lib/filter/index.js +3 -2
  94. package/lib/filter/index.min.js +1 -1
  95. package/lib/filter/src/hook.js +24 -13
  96. package/lib/filter/src/hook.min.js +1 -1
  97. package/lib/footer/index.js +3 -2
  98. package/lib/footer/index.min.js +1 -1
  99. package/lib/footer/src/footer.js +7 -3
  100. package/lib/footer/src/footer.min.js +1 -1
  101. package/lib/form/index.js +3 -2
  102. package/lib/form/index.min.js +1 -1
  103. package/lib/form/src/form-gather.js +3 -3
  104. package/lib/form/src/form-gather.min.js +1 -1
  105. package/lib/form/src/form-item.js +3 -3
  106. package/lib/form/src/form-item.min.js +1 -1
  107. package/lib/form/src/form.js +45 -58
  108. package/lib/form/src/form.min.js +1 -1
  109. package/lib/form/src/render.js +24 -10
  110. package/lib/form/src/render.min.js +1 -1
  111. package/lib/form/src/util.js +11 -0
  112. package/lib/form/src/util.min.js +1 -1
  113. package/lib/form-gather/index.js +3 -2
  114. package/lib/form-gather/index.min.js +1 -1
  115. package/lib/form-item/index.js +3 -2
  116. package/lib/form-item/index.min.js +1 -1
  117. package/lib/grid/index.js +3 -2
  118. package/lib/grid/index.min.js +1 -1
  119. package/lib/grid/src/grid.js +16 -14
  120. package/lib/grid/src/grid.min.js +1 -1
  121. package/lib/header/index.js +3 -2
  122. package/lib/header/index.min.js +1 -1
  123. package/lib/header/src/header.js +1 -1
  124. package/lib/header/src/header.min.js +1 -1
  125. package/lib/index.umd.js +584 -415
  126. package/lib/index.umd.min.js +1 -2
  127. package/lib/input/index.js +3 -2
  128. package/lib/input/index.min.js +1 -1
  129. package/lib/input/src/date.js +56 -0
  130. package/lib/input/src/date.min.js +1 -0
  131. package/lib/input/src/input.js +13 -67
  132. package/lib/input/src/input.min.js +1 -1
  133. package/lib/input/src/number.js +23 -0
  134. package/lib/input/src/number.min.js +1 -0
  135. package/lib/list/index.js +3 -2
  136. package/lib/list/index.min.js +1 -1
  137. package/lib/menu/index.js +3 -2
  138. package/lib/menu/index.min.js +1 -1
  139. package/lib/modal/index.js +3 -2
  140. package/lib/modal/index.min.js +1 -1
  141. package/lib/modal/src/modal.js +3 -1
  142. package/lib/modal/src/modal.min.js +1 -1
  143. package/lib/optgroup/index.js +3 -2
  144. package/lib/optgroup/index.min.js +1 -1
  145. package/lib/option/index.js +3 -2
  146. package/lib/option/index.min.js +1 -1
  147. package/lib/pager/index.js +3 -2
  148. package/lib/pager/index.min.js +1 -1
  149. package/lib/pager/src/pager.js +15 -1
  150. package/lib/pager/src/pager.min.js +1 -1
  151. package/lib/pulldown/index.js +3 -2
  152. package/lib/pulldown/index.min.js +1 -1
  153. package/lib/radio/index.js +3 -2
  154. package/lib/radio/index.min.js +1 -1
  155. package/lib/radio-button/index.js +3 -2
  156. package/lib/radio-button/index.min.js +1 -1
  157. package/lib/radio-group/index.js +3 -2
  158. package/lib/radio-group/index.min.js +1 -1
  159. package/lib/select/index.js +3 -2
  160. package/lib/select/index.min.js +1 -1
  161. package/lib/select/style/style.css +1 -1
  162. package/lib/select/style/style.min.css +1 -1
  163. package/lib/style.css +1 -1
  164. package/lib/style.min.css +1 -1
  165. package/lib/switch/index.js +3 -2
  166. package/lib/switch/index.min.js +1 -1
  167. package/lib/table/index.js +3 -2
  168. package/lib/table/index.min.js +1 -1
  169. package/lib/table/src/body.js +32 -11
  170. package/lib/table/src/body.min.js +1 -1
  171. package/lib/table/src/cell.js +3 -3
  172. package/lib/table/src/cell.min.js +1 -1
  173. package/lib/table/src/column.js +3 -1
  174. package/lib/table/src/column.min.js +1 -1
  175. package/lib/table/src/columnInfo.js +13 -9
  176. package/lib/table/src/columnInfo.min.js +1 -1
  177. package/lib/table/src/emits.js +1 -1
  178. package/lib/table/src/emits.min.js +1 -1
  179. package/lib/table/src/props.js +5 -2
  180. package/lib/table/src/table.js +187 -148
  181. package/lib/table/src/table.min.js +1 -1
  182. package/lib/table/src/util.js +5 -3
  183. package/lib/table/src/util.min.js +1 -1
  184. package/lib/textarea/index.js +3 -2
  185. package/lib/textarea/index.min.js +1 -1
  186. package/lib/toolbar/index.js +3 -2
  187. package/lib/toolbar/index.min.js +1 -1
  188. package/lib/toolbar/src/toolbar.js +4 -2
  189. package/lib/toolbar/src/toolbar.min.js +1 -1
  190. package/lib/tools/dom.js +12 -1
  191. package/lib/tools/dom.min.js +1 -1
  192. package/lib/tools/log.js +29 -0
  193. package/lib/tools/log.min.js +1 -0
  194. package/lib/tools/utils.js +0 -20
  195. package/lib/tools/utils.min.js +1 -1
  196. package/lib/tooltip/index.js +3 -3
  197. package/lib/tooltip/index.min.js +1 -1
  198. package/lib/tooltip/src/tooltip.js +114 -60
  199. package/lib/tooltip/src/tooltip.min.js +1 -1
  200. package/lib/tooltip/style/style.css +1 -1
  201. package/lib/tooltip/style/style.min.css +1 -1
  202. package/lib/v-x-e-table/index.js +1 -0
  203. package/lib/v-x-e-table/index.min.js +1 -1
  204. package/lib/v-x-e-table/src/conf.js +12 -7
  205. package/lib/v-x-e-table/src/conf.min.js +1 -1
  206. package/lib/v-x-e-table/src/interceptor.js +3 -3
  207. package/lib/v-x-e-table/src/interceptor.min.js +1 -1
  208. package/lib/v-x-e-table/src/renderer.js +3 -1
  209. package/lib/v-x-e-table/src/renderer.min.js +1 -1
  210. package/lib/v-x-e-table/src/store.js +2 -2
  211. package/lib/v-x-e-table/src/store.min.js +1 -1
  212. package/package.json +4 -4
  213. package/packages/button/index.ts +2 -1
  214. package/packages/checkbox/index.ts +2 -1
  215. package/packages/checkbox-group/index.ts +2 -1
  216. package/packages/colgroup/index.ts +4 -2
  217. package/packages/column/index.ts +4 -2
  218. package/packages/edit/src/hook.ts +2 -1
  219. package/packages/export/index.ts +3 -2
  220. package/packages/export/src/hook.ts +2 -1
  221. package/packages/export/src/util.ts +4 -6
  222. package/packages/filter/index.ts +2 -1
  223. package/packages/filter/src/hook.ts +17 -10
  224. package/packages/footer/index.ts +2 -1
  225. package/packages/footer/src/footer.ts +3 -2
  226. package/packages/form/index.ts +2 -1
  227. package/packages/form/src/form-gather.ts +3 -3
  228. package/packages/form/src/form-item.ts +4 -4
  229. package/packages/form/src/form.ts +38 -46
  230. package/packages/form/src/render.ts +8 -6
  231. package/packages/form/src/util.ts +8 -1
  232. package/packages/form-gather/index.ts +2 -1
  233. package/packages/form-item/index.ts +2 -1
  234. package/packages/grid/index.ts +2 -1
  235. package/packages/grid/src/grid.ts +2 -1
  236. package/packages/header/index.ts +2 -1
  237. package/packages/header/src/header.ts +1 -1
  238. package/packages/input/index.ts +2 -1
  239. package/packages/input/src/date.ts +42 -0
  240. package/packages/input/src/input.ts +3 -51
  241. package/packages/input/src/number.ts +12 -0
  242. package/packages/list/index.ts +2 -1
  243. package/packages/menu/index.ts +2 -1
  244. package/packages/modal/index.ts +2 -1
  245. package/packages/modal/src/modal.ts +2 -1
  246. package/packages/optgroup/index.ts +2 -1
  247. package/packages/option/index.ts +2 -1
  248. package/packages/pager/index.ts +2 -1
  249. package/packages/pager/src/pager.ts +17 -3
  250. package/packages/pulldown/index.ts +2 -1
  251. package/packages/radio/index.ts +2 -1
  252. package/packages/radio-button/index.ts +2 -1
  253. package/packages/radio-group/index.ts +2 -1
  254. package/packages/select/index.ts +2 -1
  255. package/packages/switch/index.ts +2 -1
  256. package/packages/table/index.ts +2 -1
  257. package/packages/table/src/body.ts +33 -12
  258. package/packages/table/src/cell.ts +3 -3
  259. package/packages/table/src/column.ts +3 -1
  260. package/packages/table/src/columnInfo.ts +5 -3
  261. package/packages/table/src/emits.ts +5 -1
  262. package/packages/table/src/props.ts +5 -2
  263. package/packages/table/src/table.ts +120 -84
  264. package/packages/table/src/util.ts +5 -3
  265. package/packages/textarea/index.ts +2 -1
  266. package/packages/toolbar/index.ts +2 -1
  267. package/packages/toolbar/src/toolbar.ts +2 -1
  268. package/packages/tools/dom.ts +11 -0
  269. package/packages/tools/log.ts +16 -0
  270. package/packages/tools/utils.ts +0 -15
  271. package/packages/tooltip/index.ts +2 -1
  272. package/packages/tooltip/src/tooltip.ts +87 -46
  273. package/packages/v-x-e-table/index.ts +1 -0
  274. package/packages/v-x-e-table/src/conf.ts +12 -7
  275. package/packages/v-x-e-table/src/interceptor.ts +1 -1
  276. package/packages/v-x-e-table/src/renderer.ts +2 -1
  277. package/packages/v-x-e-table/src/store.ts +1 -1
  278. package/styles/select.scss +1 -1
  279. package/styles/tooltip.scss +1 -1
  280. package/types/all.d.ts +2 -2
  281. package/types/button.d.ts +54 -54
  282. package/types/checkbox-group.d.ts +21 -21
  283. package/types/checkbox.d.ts +30 -30
  284. package/types/colgroup.d.ts +16 -16
  285. package/types/column.d.ts +172 -161
  286. package/types/component.d.ts +9 -9
  287. package/types/edit.d.ts +35 -35
  288. package/types/export.d.ts +101 -101
  289. package/types/filter.d.ts +19 -19
  290. package/types/footer.d.ts +1 -1
  291. package/types/form-gather.d.ts +3 -3
  292. package/types/form-item.d.ts +68 -66
  293. package/types/form.d.ts +136 -131
  294. package/types/grid.d.ts +257 -257
  295. package/types/header.d.ts +1 -1
  296. package/types/icon.d.ts +1 -1
  297. package/types/input.d.ts +162 -162
  298. package/types/keyboard.d.ts +6 -6
  299. package/types/list.d.ts +54 -54
  300. package/types/menu.d.ts +33 -33
  301. package/types/modal.d.ts +160 -160
  302. package/types/optgroup.d.ts +5 -5
  303. package/types/option.d.ts +19 -19
  304. package/types/pager.d.ts +65 -61
  305. package/types/plugins/pro.d.ts +245 -215
  306. package/types/pulldown.d.ts +36 -36
  307. package/types/radio-button.d.ts +25 -25
  308. package/types/radio-group.d.ts +20 -20
  309. package/types/radio.d.ts +27 -27
  310. package/types/select.d.ts +82 -82
  311. package/types/switch.d.ts +40 -40
  312. package/types/table.d.ts +1422 -1336
  313. package/types/textarea.d.ts +71 -71
  314. package/types/toolbar.d.ts +65 -65
  315. package/types/tooltip.d.ts +50 -44
  316. package/types/v-x-e-table/commands.d.ts +12 -12
  317. package/types/v-x-e-table/formats.d.ts +10 -10
  318. package/types/v-x-e-table/hooks.d.ts +9 -9
  319. package/types/v-x-e-table/index.d.ts +51 -43
  320. package/types/v-x-e-table/interceptor.d.ts +26 -26
  321. package/types/v-x-e-table/menus.d.ts +13 -13
  322. package/types/v-x-e-table/renderer.d.ts +128 -128
  323. package/types/v-x-e-table/setup.d.ts +55 -55
  324. package/types/validator.d.ts +28 -28
package/lib/index.umd.js CHANGED
@@ -8435,6 +8435,9 @@ var GlobalConfig = {
8435
8435
  // emptyRender: {
8436
8436
  // name: ''
8437
8437
  // },
8438
+ // rowConfig: {
8439
+ // keyField: '_X_ID' // 行数据的唯一主键字段名
8440
+ // },
8438
8441
  radioConfig: {
8439
8442
  // trigger: 'default'
8440
8443
  strict: true
@@ -8443,10 +8446,9 @@ var GlobalConfig = {
8443
8446
  // trigger: 'default',
8444
8447
  strict: true
8445
8448
  },
8446
- // tooltipConfig: {
8447
- // theme: 'dark',
8448
- // enterable: false
8449
- // },
8449
+ tooltipConfig: {
8450
+ enterable: true
8451
+ },
8450
8452
  validConfig: {
8451
8453
  showMessage: true,
8452
8454
  message: 'default'
@@ -8458,7 +8460,6 @@ var GlobalConfig = {
8458
8460
  // storage: false,
8459
8461
  // checkMethod () {}
8460
8462
  // },
8461
- // rowId: '_X_ID', // 行数据的唯一主键字段名
8462
8463
  sortConfig: {
8463
8464
  // remote: false,
8464
8465
  // trigger: 'default',
@@ -8630,6 +8631,7 @@ var GlobalConfig = {
8630
8631
  // size: null,
8631
8632
  trigger: 'hover',
8632
8633
  theme: 'dark',
8634
+ enterDelay: 500,
8633
8635
  leaveDelay: 300
8634
8636
  },
8635
8637
  pager: {// size: null,
@@ -8642,12 +8644,15 @@ var GlobalConfig = {
8642
8644
  },
8643
8645
  form: {
8644
8646
  // preventSubmit: false,
8647
+ // size: null,
8648
+ // colon: false,
8645
8649
  validConfig: {
8646
8650
  showMessage: true,
8647
8651
  autoPos: true
8648
8652
  },
8649
- // size: null,
8650
- // colon: false,
8653
+ tooltipConfig: {
8654
+ enterable: true
8655
+ },
8651
8656
  titleAsterisk: true
8652
8657
  },
8653
8658
  input: {
@@ -8739,17 +8744,14 @@ var GlobalConfig = {
8739
8744
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.join.js
8740
8745
  var es_array_join = __webpack_require__("a15b");
8741
8746
 
8742
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
8743
- var es_function_name = __webpack_require__("b0c0");
8744
-
8745
- // CONCATENATED MODULE: ./packages/tools/utils.ts
8747
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
8748
+ var es_array_concat = __webpack_require__("99af");
8746
8749
 
8750
+ // CONCATENATED MODULE: ./packages/tools/log.ts
8747
8751
 
8748
8752
 
8749
- var zindexIndex = 0;
8750
- var lastZindex = 1;
8751
8753
  function getLog(message, params) {
8752
- return "[vxe-table] ".concat(conf.i18n(message, params));
8754
+ return "[vxe-table v".concat("4.2.0-beta.2", "] ").concat(conf.i18n(message, params));
8753
8755
  }
8754
8756
 
8755
8757
  function outLog(type) {
@@ -8760,47 +8762,8 @@ function outLog(type) {
8760
8762
  };
8761
8763
  }
8762
8764
 
8763
- function isEnableConf(conf) {
8764
- return conf && conf.enabled !== false;
8765
- }
8766
- function isEmptyValue(cellValue) {
8767
- return cellValue === null || cellValue === undefined || cellValue === '';
8768
- }
8769
- function parseFile(file) {
8770
- var name = file.name;
8771
- var tIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.lastIndexOf(name, '.');
8772
- var type = name.substring(tIndex + 1, name.length);
8773
- var filename = name.substring(0, tIndex);
8774
- return {
8775
- filename: filename,
8776
- type: type
8777
- };
8778
- }
8779
- function nextZIndex() {
8780
- lastZindex = conf.zIndex + zindexIndex++;
8781
- return lastZindex;
8782
- }
8783
- function getLastZIndex() {
8784
- return lastZindex;
8785
- }
8786
8765
  var warnLog = outLog('warn');
8787
8766
  var errLog = outLog('error');
8788
- function hasChildrenList(item) {
8789
- return item && item.children && item.children.length > 0;
8790
- }
8791
- function getFuncText(content) {
8792
- return content ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toValueString(conf.translate ? conf.translate('' + content) : content) : '';
8793
- }
8794
- function formatText(value, placeholder) {
8795
- return '' + (isEmptyValue(value) ? placeholder ? conf.emptyCell : '' : value);
8796
- }
8797
- /**
8798
- * 判断值为:'' | null | undefined 时都属于空值
8799
- */
8800
-
8801
- function eqEmptyValue(cellValue) {
8802
- return cellValue === '' || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(cellValue);
8803
- }
8804
8767
  // CONCATENATED MODULE: ./packages/v-x-e-table/src/interceptor.ts
8805
8768
 
8806
8769
 
@@ -8935,6 +8898,9 @@ function _objectSpread2(target) {
8935
8898
 
8936
8899
  return target;
8937
8900
  }
8901
+ // EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
8902
+ var es_function_name = __webpack_require__("b0c0");
8903
+
8938
8904
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.exec.js
8939
8905
  var es_regexp_exec = __webpack_require__("ac1f");
8940
8906
 
@@ -8944,9 +8910,6 @@ var es_string_replace = __webpack_require__("5319");
8944
8910
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
8945
8911
  var es_object_assign = __webpack_require__("cca6");
8946
8912
 
8947
- // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
8948
- var es_array_concat = __webpack_require__("99af");
8949
-
8950
8913
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.map.js
8951
8914
  var es_array_map = __webpack_require__("d81d");
8952
8915
 
@@ -8977,6 +8940,51 @@ var es_promise = __webpack_require__("e6cf");
8977
8940
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.fixed.js
8978
8941
  var es_string_fixed = __webpack_require__("c7cd");
8979
8942
 
8943
+ // CONCATENATED MODULE: ./packages/tools/utils.ts
8944
+
8945
+
8946
+
8947
+ var zindexIndex = 0;
8948
+ var lastZindex = 1;
8949
+ function isEnableConf(conf) {
8950
+ return conf && conf.enabled !== false;
8951
+ }
8952
+ function isEmptyValue(cellValue) {
8953
+ return cellValue === null || cellValue === undefined || cellValue === '';
8954
+ }
8955
+ function parseFile(file) {
8956
+ var name = file.name;
8957
+ var tIndex = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.lastIndexOf(name, '.');
8958
+ var type = name.substring(tIndex + 1, name.length);
8959
+ var filename = name.substring(0, tIndex);
8960
+ return {
8961
+ filename: filename,
8962
+ type: type
8963
+ };
8964
+ }
8965
+ function nextZIndex() {
8966
+ lastZindex = conf.zIndex + zindexIndex++;
8967
+ return lastZindex;
8968
+ }
8969
+ function getLastZIndex() {
8970
+ return lastZindex;
8971
+ }
8972
+ function hasChildrenList(item) {
8973
+ return item && item.children && item.children.length > 0;
8974
+ }
8975
+ function getFuncText(content) {
8976
+ return content ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toValueString(conf.translate ? conf.translate('' + content) : content) : '';
8977
+ }
8978
+ function formatText(value, placeholder) {
8979
+ return '' + (isEmptyValue(value) ? placeholder ? conf.emptyCell : '' : value);
8980
+ }
8981
+ /**
8982
+ * 判断值为:'' | null | undefined 时都属于空值
8983
+ */
8984
+
8985
+ function eqEmptyValue(cellValue) {
8986
+ return cellValue === '' || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(cellValue);
8987
+ }
8980
8988
  // CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
8981
8989
 
8982
8990
 
@@ -8989,6 +8997,7 @@ var es_string_fixed = __webpack_require__("c7cd");
8989
8997
 
8990
8998
 
8991
8999
 
9000
+
8992
9001
  var columnInfo_ColumnInfo = /*#__PURE__*/function () {
8993
9002
  /* eslint-disable @typescript-eslint/no-use-before-define */
8994
9003
  function ColumnInfo($xetable, _vm) {
@@ -9097,6 +9106,7 @@ var columnInfo_ColumnInfo = /*#__PURE__*/function () {
9097
9106
  exportMethod: _vm.exportMethod,
9098
9107
  footerExportMethod: _vm.footerExportMethod,
9099
9108
  titleHelp: _vm.titleHelp,
9109
+ titlePrefix: _vm.titlePrefix,
9100
9110
  // 自定义参数
9101
9111
  params: _vm.params,
9102
9112
  // 渲染属性
@@ -9159,10 +9169,11 @@ var columnInfo_ColumnInfo = /*#__PURE__*/function () {
9159
9169
  // 不支持双向的属性
9160
9170
  if (name !== 'filters') {
9161
9171
  if (name === 'field') {
9172
+ // 兼容旧属性
9162
9173
  this.property = value;
9163
- } else {
9164
- this[name] = value;
9165
9174
  }
9175
+
9176
+ this[name] = value;
9166
9177
  }
9167
9178
  }
9168
9179
  }]);
@@ -9268,7 +9279,13 @@ function setScrollLeft(elem, scrollLeft) {
9268
9279
  if (elem) {
9269
9280
  elem.scrollLeft = scrollLeft;
9270
9281
  }
9271
- }
9282
+ } // export function setScrollLeftAndTop (elem: HTMLElement | null, scrollLeft: number, scrollTop: number) {
9283
+ // if (elem) {
9284
+ // elem.scrollLeft = scrollLeft
9285
+ // elem.scrollTop = scrollTop
9286
+ // }
9287
+ // }
9288
+
9272
9289
  function updateCellTitle(overflowElem, column) {
9273
9290
  var content = column.type === 'html' ? overflowElem.innerText : overflowElem.textContent;
9274
9291
 
@@ -9348,6 +9365,9 @@ function dom_triggerEvent(targetElem, type) {
9348
9365
  targetElem.dispatchEvent(new Event(type));
9349
9366
  }
9350
9367
  }
9368
+ function isNodeElement(elem) {
9369
+ return elem && elem.nodeType === 1;
9370
+ }
9351
9371
  // CONCATENATED MODULE: ./packages/table/src/util.ts
9352
9372
 
9353
9373
 
@@ -9394,13 +9414,18 @@ function getRowUniqueId() {
9394
9414
 
9395
9415
  function getRowkey($xetable) {
9396
9416
  var props = $xetable.props;
9417
+
9418
+ var _$xetable$getComputeM = $xetable.getComputeMaps(),
9419
+ computeRowOpts = _$xetable$getComputeM.computeRowOpts;
9420
+
9397
9421
  var rowId = props.rowId;
9398
- return rowId || '_X_ID';
9422
+ var rowOpts = computeRowOpts.value;
9423
+ return rowId || rowOpts.keyField || '_X_ID';
9399
9424
  } // 行主键 value
9400
9425
 
9401
9426
  function util_getRowid($xetable, row) {
9402
- var rowId = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, getRowkey($xetable));
9403
- return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(rowId) ? '' : encodeURIComponent(rowId);
9427
+ var rowid = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(row, getRowkey($xetable));
9428
+ return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(rowid) ? '' : encodeURIComponent(rowid);
9404
9429
  }
9405
9430
  var util_handleFieldOrColumn = function handleFieldOrColumn($xetable, fieldOrColumn) {
9406
9431
  if (fieldOrColumn) {
@@ -9749,6 +9774,7 @@ function getOnName(type) {
9749
9774
 
9750
9775
 
9751
9776
 
9777
+
9752
9778
  var componentDefaultModelProp = 'modelValue';
9753
9779
  var defaultCompProps = {
9754
9780
  transfer: true
@@ -10730,6 +10756,7 @@ var v_x_e_table_config = new v_x_e_table_VXETableConfig();
10730
10756
  var v = 'v4';
10731
10757
  var VXETable = {
10732
10758
  v: v,
10759
+ version: "4.2.0-beta.2",
10733
10760
  setup: setup_setup,
10734
10761
  interceptor: interceptor,
10735
10762
  renderer: renderer,
@@ -11171,8 +11198,8 @@ var tableFilterHook = {
11171
11198
  */
11172
11199
  confirmFilterEvent: function confirmFilterEvent(evnt) {
11173
11200
  var filterStore = reactData.filterStore,
11174
- scrollXLoad = reactData.scrollXLoad,
11175
- scrollYLoad = reactData.scrollYLoad;
11201
+ oldScrollXLoad = reactData.scrollXLoad,
11202
+ oldScrollYLoad = reactData.scrollYLoad;
11176
11203
  var filterOpts = computeFilterOpts.value;
11177
11204
  var column = filterStore.column;
11178
11205
  var property = column.property;
@@ -11189,15 +11216,6 @@ var tableFilterHook = {
11189
11216
  if (!filterOpts.remote) {
11190
11217
  $xetable.handleTableData(true);
11191
11218
  $xetable.checkSelectionStatus();
11192
- $xetable.updateFooter();
11193
-
11194
- if (scrollXLoad || scrollYLoad) {
11195
- $xetable.clearScroll();
11196
-
11197
- if (scrollYLoad) {
11198
- $xetable.updateScrollYSpace();
11199
- }
11200
- }
11201
11219
  }
11202
11220
 
11203
11221
  $xetable.dispatchEvent('filter-change', {
@@ -11209,9 +11227,29 @@ var tableFilterHook = {
11209
11227
  filterList: filterList
11210
11228
  }, evnt);
11211
11229
  $xetable.closeFilter();
11212
- Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
11213
- $xetable.recalculate();
11230
+ $xetable.updateFooter().then(function () {
11231
+ var scrollXLoad = reactData.scrollXLoad,
11232
+ scrollYLoad = reactData.scrollYLoad;
11233
+
11234
+ if (oldScrollXLoad || scrollXLoad || oldScrollYLoad || scrollYLoad) {
11235
+ if (oldScrollXLoad || scrollXLoad) {
11236
+ $xetable.updateScrollXSpace();
11237
+ }
11238
+
11239
+ if (oldScrollYLoad || scrollYLoad) {
11240
+ $xetable.updateScrollYSpace();
11241
+ }
11242
+
11243
+ return $xetable.refreshScroll();
11244
+ }
11245
+ }).then(function () {
11214
11246
  $xetable.updateCellAreas();
11247
+ return $xetable.recalculate(true);
11248
+ }).then(function () {
11249
+ // 存在滚动行为未结束情况
11250
+ setTimeout(function () {
11251
+ return $xetable.recalculate();
11252
+ }, 50);
11215
11253
  });
11216
11254
  }
11217
11255
  };
@@ -11372,10 +11410,10 @@ var Filter = {
11372
11410
  Panel: panel,
11373
11411
  install: function install(app) {
11374
11412
  VXETable.hooks.add('$tableFilter', hook);
11375
- dynamicApp.component(panel.name, panel);
11376
11413
  app.component(panel.name, panel);
11377
11414
  }
11378
11415
  };
11416
+ dynamicApp.component(panel.name, panel);
11379
11417
  /* harmony default export */ var filter = (Filter);
11380
11418
  // CONCATENATED MODULE: ./packages/menu/src/panel.ts
11381
11419
 
@@ -11996,10 +12034,10 @@ var Menu = {
11996
12034
  Panel: src_panel,
11997
12035
  install: function install(app) {
11998
12036
  VXETable.hooks.add('$tableMenu', src_hooks);
11999
- dynamicApp.component(src_panel.name, src_panel);
12000
12037
  app.component(src_panel.name, src_panel);
12001
12038
  }
12002
12039
  };
12040
+ dynamicApp.component(src_panel.name, src_panel);
12003
12041
  /* harmony default export */ var packages_menu = (Menu);
12004
12042
  // CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/arrayLikeToArray.js
12005
12043
  function _arrayLikeToArray(arr, len) {
@@ -12091,6 +12129,7 @@ function _toConsumableArray(arr) {
12091
12129
 
12092
12130
 
12093
12131
 
12132
+
12094
12133
  var tableEditMethodKeys = ['insert', 'insertAt', 'remove', 'removeCheckboxRow', 'removeRadioRow', 'removeCurrentRow', 'getRecordset', 'getInsertRecords', 'getRemoveRecords', 'getUpdateRecords', 'getActiveRecord', 'getSelectedCell', 'clearActived', 'clearSelected', 'isActiveByRow', 'setActiveRow', 'setActiveCell', 'setSelectCell'];
12095
12134
  var editHook = {
12096
12135
  setupTable: function setupTable($xetable) {
@@ -13605,6 +13644,7 @@ function useSize(props) {
13605
13644
 
13606
13645
 
13607
13646
 
13647
+
13608
13648
 
13609
13649
 
13610
13650
  var allActivedModals = [];
@@ -14802,40 +14842,19 @@ var msgQueue = [];
14802
14842
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.pad-start.js
14803
14843
  var es_string_pad_start = __webpack_require__("4d90");
14804
14844
 
14805
- // CONCATENATED MODULE: ./packages/input/src/input.ts
14806
-
14807
-
14808
-
14809
-
14810
-
14811
-
14845
+ // CONCATENATED MODULE: ./packages/input/src/date.ts
14812
14846
 
14813
14847
 
14814
14848
 
14815
-
14816
-
14817
-
14818
-
14819
-
14820
-
14821
-
14822
-
14823
-
14824
-
14825
-
14826
- var yearSize = 20;
14827
- var monthSize = 20;
14828
- var quarterSize = 8;
14829
-
14830
14849
  function toStringTimeDate(str) {
14831
14850
  if (str) {
14832
14851
  var rest = new Date();
14833
- var _h = 0;
14852
+ var h = 0;
14834
14853
  var m = 0;
14835
14854
  var s = 0;
14836
14855
 
14837
14856
  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isDate(str)) {
14838
- _h = str.getHours();
14857
+ h = str.getHours();
14839
14858
  m = str.getMinutes();
14840
14859
  s = str.getSeconds();
14841
14860
  } else {
@@ -14843,13 +14862,13 @@ function toStringTimeDate(str) {
14843
14862
  var parses = str.match(/^(\d{1,2})(:(\d{1,2}))?(:(\d{1,2}))?/);
14844
14863
 
14845
14864
  if (parses) {
14846
- _h = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(parses[1]);
14865
+ h = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(parses[1]);
14847
14866
  m = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(parses[3]);
14848
14867
  s = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(parses[5]);
14849
14868
  }
14850
14869
  }
14851
14870
 
14852
- rest.setHours(_h);
14871
+ rest.setHours(h);
14853
14872
  rest.setMinutes(m);
14854
14873
  rest.setSeconds(s);
14855
14874
  return rest;
@@ -14857,7 +14876,58 @@ function toStringTimeDate(str) {
14857
14876
 
14858
14877
  return new Date('');
14859
14878
  }
14879
+ function getDateQuarter(date) {
14880
+ var month = date.getMonth();
14881
+
14882
+ if (month < 3) {
14883
+ return 1;
14884
+ } else if (month < 6) {
14885
+ return 2;
14886
+ } else if (month < 9) {
14887
+ return 3;
14888
+ }
14889
+
14890
+ return 4;
14891
+ }
14892
+ // CONCATENATED MODULE: ./packages/input/src/number.ts
14893
+
14894
+
14895
+
14896
+
14897
+ function handleNumber(val) {
14898
+ return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isString(val) ? val.replace(/,/g, '') : val;
14899
+ }
14900
+ function toFloatValueFixed(inputValue, digitsValue) {
14901
+ if (/^-/.test('' + inputValue)) {
14902
+ return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.ceil(inputValue, digitsValue), digitsValue);
14903
+ }
14904
+
14905
+ return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.floor(inputValue, digitsValue), digitsValue);
14906
+ }
14907
+ // CONCATENATED MODULE: ./packages/input/src/input.ts
14908
+
14909
+
14910
+
14911
+
14912
+
14913
+
14914
+
14915
+
14916
+
14917
+
14918
+
14860
14919
 
14920
+
14921
+
14922
+
14923
+
14924
+
14925
+
14926
+
14927
+
14928
+ var yearSize = 20;
14929
+ var monthSize = 20;
14930
+ var quarterSize = 8;
14861
14931
  /* harmony default export */ var input = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
14862
14932
  name: 'VxeInput',
14863
14933
  props: {
@@ -15259,21 +15329,6 @@ function toStringTimeDate(str) {
15259
15329
  var yearList = computeYearList.value;
15260
15330
  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.chunk(yearList, 4);
15261
15331
  });
15262
-
15263
- var getDateQuarter = function getDateQuarter(date) {
15264
- var month = date.getMonth();
15265
-
15266
- if (month < 3) {
15267
- return 1;
15268
- } else if (month < 6) {
15269
- return 2;
15270
- } else if (month < 9) {
15271
- return 3;
15272
- }
15273
-
15274
- return 4;
15275
- };
15276
-
15277
15332
  var computeQuarterList = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
15278
15333
  var selectMonth = reactData.selectMonth,
15279
15334
  currentDate = reactData.currentDate;
@@ -15470,19 +15525,7 @@ function toStringTimeDate(str) {
15470
15525
  return immediate || !(type === 'text' || type === 'number' || type === 'integer' || type === 'float');
15471
15526
  });
15472
15527
 
15473
- var handleNumber = function handleNumber(val) {
15474
- return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isString(val) ? val.replace(/,/g, '') : val;
15475
- };
15476
-
15477
- function toFloatValueFixed(inputValue, digitsValue) {
15478
- if (/^-/.test('' + inputValue)) {
15479
- return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.ceil(inputValue, digitsValue), digitsValue);
15480
- }
15481
-
15482
- return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toFixed(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.floor(inputValue, digitsValue), digitsValue);
15483
- }
15484
-
15485
- function getNumberValue(val) {
15528
+ var getNumberValue = function getNumberValue(val) {
15486
15529
  var type = props.type,
15487
15530
  exponential = props.exponential;
15488
15531
  var inpMaxlength = computeInpMaxlength.value;
@@ -15494,7 +15537,7 @@ function toStringTimeDate(str) {
15494
15537
  }
15495
15538
 
15496
15539
  return restVal.slice(0, inpMaxlength);
15497
- }
15540
+ };
15498
15541
 
15499
15542
  var triggerEvent = function triggerEvent(evnt) {
15500
15543
  var inputValue = reactData.inputValue;
@@ -19171,6 +19214,7 @@ var web_url_search_params = __webpack_require__("9861");
19171
19214
 
19172
19215
 
19173
19216
 
19217
+
19174
19218
  // 导入
19175
19219
 
19176
19220
  var fileForm;
@@ -19185,13 +19229,9 @@ function createFrame() {
19185
19229
  return frame;
19186
19230
  }
19187
19231
  function getExportBlobByContent(content, options) {
19188
- if (window.Blob) {
19189
- return new Blob([content], {
19190
- type: "text/".concat(options.type, ";charset=utf-8;")
19191
- });
19192
- }
19193
-
19194
- return null;
19232
+ return new Blob([content], {
19233
+ type: "text/".concat(options.type, ";charset=utf-8;")
19234
+ });
19195
19235
  }
19196
19236
  function createHtmlPage(opts, content) {
19197
19237
  var style = opts.style;
@@ -19404,6 +19444,7 @@ var util_saveLocalFile = function saveLocalFile(options) {
19404
19444
 
19405
19445
 
19406
19446
 
19447
+
19407
19448
 
19408
19449
 
19409
19450
  var htmlCellElem;
@@ -21162,12 +21203,12 @@ var Export = {
21162
21203
  }
21163
21204
  });
21164
21205
  VXETable.hooks.add('$tableExport', export_src_hook);
21165
- dynamicApp.component(export_panel.name, export_panel);
21166
- dynamicApp.component(import_panel.name, import_panel);
21167
21206
  app.component(export_panel.name, export_panel);
21168
21207
  app.component(import_panel.name, import_panel);
21169
21208
  }
21170
21209
  };
21210
+ dynamicApp.component(export_panel.name, export_panel);
21211
+ dynamicApp.component(import_panel.name, import_panel);
21171
21212
  /* harmony default export */ var packages_export = (Export);
21172
21213
  // CONCATENATED MODULE: ./packages/keyboard/src/hook.ts
21173
21214
 
@@ -22584,7 +22625,7 @@ var renderType = 'header';
22584
22625
  rowspan: column.rowSpan > 1 ? column.rowSpan : null,
22585
22626
  style: headerCellStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(headerCellStyle) ? headerCellStyle(params) : headerCellStyle : null
22586
22627
  }, thOns), {}, {
22587
- key: columnKey || isColGroup ? column.id : $columnIndex
22628
+ key: columnKey || columnOpts.useKey || isColGroup ? column.id : $columnIndex
22588
22629
  }), [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
22589
22630
  class: ['vxe-cell', {
22590
22631
  'c--title': showTitle,
@@ -22626,10 +22667,10 @@ var renderType = 'header';
22626
22667
 
22627
22668
  var Header = Object.assign(header, {
22628
22669
  install: function install(app) {
22629
- dynamicApp.component(header.name, header);
22630
22670
  app.component(header.name, header);
22631
22671
  }
22632
22672
  });
22673
+ dynamicApp.component(header.name, header);
22633
22674
  /* harmony default export */ var packages_header = (Header);
22634
22675
  // CONCATENATED MODULE: ./packages/footer/src/footer.ts
22635
22676
 
@@ -22709,7 +22750,8 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
22709
22750
  refValidTooltip = _$xetable$getRefMaps.refValidTooltip;
22710
22751
 
22711
22752
  var _$xetable$getComputeM = $xetable.getComputeMaps(),
22712
- computeTooltipOpts = _$xetable$getComputeM.computeTooltipOpts;
22753
+ computeTooltipOpts = _$xetable$getComputeM.computeTooltipOpts,
22754
+ computeColumnOpts = _$xetable$getComputeM.computeColumnOpts;
22713
22755
 
22714
22756
  var refElem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])();
22715
22757
  var refFooterTable = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])();
@@ -22806,7 +22848,8 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
22806
22848
  scrollbarWidth = tableReactData.scrollbarWidth,
22807
22849
  currentColumn = tableReactData.currentColumn,
22808
22850
  mergeFooterList = tableReactData.mergeFooterList;
22809
- var tooltipOpts = computeTooltipOpts.value; // 如果是使用优化模式
22851
+ var tooltipOpts = computeTooltipOpts.value;
22852
+ var columnOpts = computeColumnOpts.value; // 如果是使用优化模式
22810
22853
 
22811
22854
  if (fixedType) {
22812
22855
  if (scrollYLoad || allColumnFooterOverflow) {
@@ -22992,7 +23035,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
22992
23035
  }, attrs), {}, {
22993
23036
  style: footerCellStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(footerCellStyle) ? footerCellStyle(params) : footerCellStyle : null
22994
23037
  }, tfOns), {}, {
22995
- key: columnKey ? column.id : $columnIndex
23038
+ key: columnKey || columnOpts.useKey ? column.id : $columnIndex
22996
23039
  }), [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
22997
23040
  class: ['vxe-cell', {
22998
23041
  'c--title': showTitle,
@@ -23016,10 +23059,10 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
23016
23059
 
23017
23060
  var Footer = Object.assign(footer, {
23018
23061
  install: function install(app) {
23019
- dynamicApp.component(footer.name, footer);
23020
23062
  app.component(footer.name, footer);
23021
23063
  }
23022
23064
  });
23065
+ dynamicApp.component(footer.name, footer);
23023
23066
  /* harmony default export */ var packages_footer = (Footer);
23024
23067
  // CONCATENATED MODULE: ./packages/table/src/cell.ts
23025
23068
 
@@ -23037,9 +23080,9 @@ var Footer = Object.assign(footer, {
23037
23080
  function renderHelpIcon(params) {
23038
23081
  var $table = params.$table,
23039
23082
  column = params.column;
23040
- var titleHelp = column.titleHelp;
23041
- return titleHelp ? [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('i', {
23042
- class: ['vxe-cell-help-icon', titleHelp.icon || conf.icon.TABLE_HELP],
23083
+ var titlePrefix = column.titlePrefix || column.titleHelp;
23084
+ return titlePrefix ? [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('i', {
23085
+ class: ['vxe-cell-help-icon', titlePrefix.icon || conf.icon.TABLE_HELP],
23043
23086
  onMouseenter: function onMouseenter(evnt) {
23044
23087
  $table.triggerHeaderHelpEvent(evnt, params);
23045
23088
  },
@@ -24085,8 +24128,10 @@ var columnProps = {
24085
24128
  exportMethod: Function,
24086
24129
  // 表尾单元格数据导出方法
24087
24130
  footerExportMethod: Function,
24088
- // 标题帮助图标配置项
24131
+ // 已废弃,被 titlePrefix 替换
24089
24132
  titleHelp: Object,
24133
+ // 标题帮助图标配置项
24134
+ titlePrefix: Object,
24090
24135
  // 单元格值类型
24091
24136
  cellType: String,
24092
24137
  // 单元格渲染配置项
@@ -24133,13 +24178,14 @@ var columnProps = {
24133
24178
 
24134
24179
  var Column = Object.assign(src_column, {
24135
24180
  install: function install(app) {
24136
- dynamicApp.component(src_column.name, src_column);
24137
24181
  app.component(src_column.name, src_column); // 兼容旧用法
24138
24182
 
24139
- dynamicApp.component('VxeTableColumn', src_column);
24140
24183
  app.component('VxeTableColumn', src_column);
24141
24184
  }
24142
24185
  });
24186
+ dynamicApp.component(src_column.name, src_column); // 兼容旧用法
24187
+
24188
+ dynamicApp.component('VxeTableColumn', src_column);
24143
24189
  /* harmony default export */ var packages_column = (Column);
24144
24190
  // CONCATENATED MODULE: ./packages/table/src/group.ts
24145
24191
 
@@ -24192,13 +24238,14 @@ var Column = Object.assign(src_column, {
24192
24238
 
24193
24239
  var Colgroup = Object.assign(table_src_group, {
24194
24240
  install: function install(app) {
24195
- dynamicApp.component(table_src_group.name, table_src_group);
24196
24241
  app.component(table_src_group.name, table_src_group); // 兼容旧用法
24197
24242
 
24198
- dynamicApp.component('VxeTableColgroup', table_src_group);
24199
24243
  app.component('VxeTableColgroup', table_src_group);
24200
24244
  }
24201
24245
  });
24246
+ dynamicApp.component(table_src_group.name, table_src_group); // 兼容旧用法
24247
+
24248
+ dynamicApp.component('VxeTableColgroup', table_src_group);
24202
24249
  /* harmony default export */ var packages_colgroup = (Colgroup);
24203
24250
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.sort.js
24204
24251
  var es_array_sort = __webpack_require__("4e82");
@@ -24215,7 +24262,7 @@ var es_array_sort = __webpack_require__("4e82");
24215
24262
  height: [Number, String],
24216
24263
  // 表格的最大高度
24217
24264
  maxHeight: [Number, String],
24218
- // 所有列是否允许拖动列宽调整大小
24265
+ // (即将废弃)所有列是否允许拖动列宽调整大小
24219
24266
  resizable: {
24220
24267
  type: Boolean,
24221
24268
  default: function _default() {
@@ -24376,9 +24423,11 @@ var es_array_sort = __webpack_require__("4e82");
24376
24423
  },
24377
24424
 
24378
24425
  /** 高级属性 */
24379
- // 主键配置
24426
+ // (即将废弃)columnKey 已废弃,被 column-config.useKey 替换
24380
24427
  columnKey: Boolean,
24428
+ // (即将废弃)rowKey 已废弃,被 row-config.useKey 替换
24381
24429
  rowKey: Boolean,
24430
+ // (即将废弃)rowId 已废弃,被 row-config.keyField 替换
24382
24431
  rowId: {
24383
24432
  type: String,
24384
24433
  default: function _default() {
@@ -24468,6 +24517,7 @@ var es_array_sort = __webpack_require__("4e82");
24468
24517
  return conf.table.animat;
24469
24518
  }
24470
24519
  },
24520
+ // (可能会被废弃的参数,不要使用)
24471
24521
  delayHover: {
24472
24522
  type: Number,
24473
24523
  default: function _default() {
@@ -24478,7 +24528,7 @@ var es_array_sort = __webpack_require__("4e82");
24478
24528
  params: Object
24479
24529
  });
24480
24530
  // CONCATENATED MODULE: ./packages/table/src/emits.ts
24481
- /* harmony default export */ var emits = (['update:data', 'keydown', 'paste', 'copy', 'cut', 'current-change', 'radio-change', 'checkbox-change', 'checkbox-all', 'checkbox-range-start', 'checkbox-range-change', 'checkbox-range-end', 'cell-click', 'cell-dblclick', 'cell-menu', 'cell-mouseenter', 'cell-mouseleave', 'header-cell-click', 'header-cell-dblclick', 'header-cell-menu', 'footer-cell-click', 'footer-cell-dblclick', 'footer-cell-menu', 'clear-merge', 'sort-change', 'clear-sort', 'filter-change', 'filter-visible', 'clear-filter', 'resizable-change', 'toggle-row-expand', 'toggle-tree-expand', 'menu-click', 'edit-closed', 'edit-actived', 'edit-disabled', 'valid-error', 'scroll', 'custom', 'change-fnr', 'open-fnr', 'fnr-change', 'fnr-find', 'fnr-find-all', 'fnr-replace', 'fnr-replace-all', 'cell-area-copy', 'cell-area-cut', 'cell-area-paste', 'cell-area-merge', 'clear-cell-area-merge', 'header-cell-area-selection', 'cell-area-selection-start', 'cell-area-selection-end', 'cell-area-extension-start', 'cell-area-extension-end', 'cell-area-arrows-start', 'cell-area-arrows-end']);
24531
+ /* harmony default export */ var emits = (['update:data', 'keydown-start', 'keydown', 'keydown-end', 'paste', 'copy', 'cut', 'current-change', 'radio-change', 'checkbox-change', 'checkbox-all', 'checkbox-range-start', 'checkbox-range-change', 'checkbox-range-end', 'cell-click', 'cell-dblclick', 'cell-menu', 'cell-mouseenter', 'cell-mouseleave', 'header-cell-click', 'header-cell-dblclick', 'header-cell-menu', 'footer-cell-click', 'footer-cell-dblclick', 'footer-cell-menu', 'clear-merge', 'sort-change', 'clear-sort', 'filter-change', 'filter-visible', 'clear-filter', 'resizable-change', 'toggle-row-expand', 'toggle-tree-expand', 'menu-click', 'edit-closed', 'edit-actived', 'edit-disabled', 'valid-error', 'scroll', 'custom', 'change-fnr', 'open-fnr', 'fnr-change', 'fnr-find', 'fnr-find-all', 'fnr-replace', 'fnr-replace-all', 'cell-area-copy', 'cell-area-cut', 'cell-area-paste', 'cell-area-merge', 'clear-cell-area-merge', 'header-cell-area-selection', 'cell-area-selection-start', 'cell-area-selection-end', 'cell-area-extension-start', 'cell-area-extension-end', 'cell-area-arrows-start', 'cell-area-arrows-end', 'active-cell-move-start', 'active-cell-move-end']);
24482
24532
  // CONCATENATED MODULE: ./packages/grid/src/grid.ts
24483
24533
 
24484
24534
 
@@ -24500,6 +24550,7 @@ var es_array_sort = __webpack_require__("4e82");
24500
24550
 
24501
24551
 
24502
24552
 
24553
+
24503
24554
 
24504
24555
 
24505
24556
  var tableComponentPropKeys = Object.keys(src_props);
@@ -25909,10 +25960,10 @@ var gridComponentEmits = [].concat(_toConsumableArray(emits), ['page-change', 'f
25909
25960
 
25910
25961
  var Grid = Object.assign(grid, {
25911
25962
  install: function install(app) {
25912
- dynamicApp.component(grid.name, grid);
25913
25963
  app.component(grid.name, grid);
25914
25964
  }
25915
25965
  });
25966
+ dynamicApp.component(grid.name, grid);
25916
25967
  /* harmony default export */ var packages_grid = (Grid);
25917
25968
  // CONCATENATED MODULE: ./packages/toolbar/src/toolbar.ts
25918
25969
 
@@ -25931,6 +25982,7 @@ var Grid = Object.assign(grid, {
25931
25982
 
25932
25983
 
25933
25984
 
25985
+
25934
25986
  /* harmony default export */ var toolbar = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
25935
25987
  name: 'VxeToolbar',
25936
25988
  props: {
@@ -26684,10 +26736,10 @@ var Grid = Object.assign(grid, {
26684
26736
 
26685
26737
  var Toolbar = Object.assign(toolbar, {
26686
26738
  install: function install(app) {
26687
- dynamicApp.component(toolbar.name, toolbar);
26688
26739
  app.component(toolbar.name, toolbar);
26689
26740
  }
26690
26741
  });
26742
+ dynamicApp.component(toolbar.name, toolbar);
26691
26743
  /* harmony default export */ var packages_toolbar = (Toolbar);
26692
26744
  // CONCATENATED MODULE: ./packages/pager/src/pager.ts
26693
26745
 
@@ -26806,6 +26858,9 @@ var Toolbar = Object.assign(toolbar, {
26806
26858
  var xID = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.uniqueId();
26807
26859
  var computeSize = useSize(props);
26808
26860
  var $xegrid = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["inject"])('$xegrid', null);
26861
+ var reactData = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["reactive"])({
26862
+ inpCurrPage: props.currentPage
26863
+ });
26809
26864
  var refElem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])();
26810
26865
  var refMaps = {
26811
26866
  refElem: refElem
@@ -26933,6 +26988,11 @@ var Toolbar = Object.assign(toolbar, {
26933
26988
  });
26934
26989
  };
26935
26990
 
26991
+ var jumpInputEvent = function jumpInputEvent(evnt) {
26992
+ var inputElem = evnt.target;
26993
+ reactData.inpCurrPage = inputElem.value;
26994
+ };
26995
+
26936
26996
  var jumpKeydownEvent = function jumpKeydownEvent(evnt) {
26937
26997
  if (hasEventKey(evnt, EVENT_KEYS.ENTER)) {
26938
26998
  triggerJumpEvent(evnt);
@@ -27098,9 +27158,10 @@ var Toolbar = Object.assign(toolbar, {
27098
27158
  class: 'vxe-pager--goto-text'
27099
27159
  }, conf.i18n('vxe.pager.goto')) : null, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('input', {
27100
27160
  class: 'vxe-pager--goto',
27101
- value: props.currentPage,
27161
+ value: reactData.inpCurrPage,
27102
27162
  type: 'text',
27103
27163
  autocomplete: 'off',
27164
+ onInput: jumpInputEvent,
27104
27165
  onKeydown: jumpKeydownEvent,
27105
27166
  onBlur: triggerJumpEvent
27106
27167
  }), isFull ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
@@ -27161,6 +27222,11 @@ var Toolbar = Object.assign(toolbar, {
27161
27222
  handleNextJump: handleNextJump
27162
27223
  };
27163
27224
  Object.assign($xepager, pagerMethods, pagerPrivateMethods);
27225
+ Object(external_commonjs_vue_commonjs2_vue_root_Vue_["watch"])(function () {
27226
+ return props.currentPage;
27227
+ }, function (value) {
27228
+ reactData.inpCurrPage = value;
27229
+ });
27164
27230
 
27165
27231
  var renderVN = function renderVN() {
27166
27232
  var _ref;
@@ -27266,10 +27332,10 @@ var Toolbar = Object.assign(toolbar, {
27266
27332
 
27267
27333
  var Pager = Object.assign(pager, {
27268
27334
  install: function install(app) {
27269
- dynamicApp.component(pager.name, pager);
27270
27335
  app.component(pager.name, pager);
27271
27336
  }
27272
27337
  });
27338
+ dynamicApp.component(pager.name, pager);
27273
27339
  /* harmony default export */ var packages_pager = (Pager);
27274
27340
  // CONCATENATED MODULE: ./packages/checkbox/index.ts
27275
27341
 
@@ -27278,10 +27344,10 @@ var Pager = Object.assign(pager, {
27278
27344
 
27279
27345
  var Checkbox = Object.assign(src_checkbox, {
27280
27346
  install: function install(app) {
27281
- dynamicApp.component(src_checkbox.name, src_checkbox);
27282
27347
  app.component(src_checkbox.name, src_checkbox);
27283
27348
  }
27284
27349
  });
27350
+ dynamicApp.component(src_checkbox.name, src_checkbox);
27285
27351
  /* harmony default export */ var packages_checkbox = (Checkbox);
27286
27352
  // CONCATENATED MODULE: ./packages/checkbox/src/group.ts
27287
27353
 
@@ -27362,10 +27428,10 @@ var Checkbox = Object.assign(src_checkbox, {
27362
27428
 
27363
27429
  var CheckboxGroup = Object.assign(checkbox_src_group, {
27364
27430
  install: function install(app) {
27365
- dynamicApp.component(checkbox_src_group.name, checkbox_src_group);
27366
27431
  app.component(checkbox_src_group.name, checkbox_src_group);
27367
27432
  }
27368
27433
  });
27434
+ dynamicApp.component(checkbox_src_group.name, checkbox_src_group);
27369
27435
  /* harmony default export */ var checkbox_group = (CheckboxGroup);
27370
27436
  // CONCATENATED MODULE: ./packages/radio/index.ts
27371
27437
 
@@ -27374,10 +27440,10 @@ var CheckboxGroup = Object.assign(checkbox_src_group, {
27374
27440
 
27375
27441
  var Radio = Object.assign(src_radio, {
27376
27442
  install: function install(app) {
27377
- dynamicApp.component(src_radio.name, src_radio);
27378
27443
  app.component(src_radio.name, src_radio);
27379
27444
  }
27380
27445
  });
27446
+ dynamicApp.component(src_radio.name, src_radio);
27381
27447
  /* harmony default export */ var packages_radio = (Radio);
27382
27448
  // CONCATENATED MODULE: ./packages/radio-group/index.ts
27383
27449
 
@@ -27386,10 +27452,10 @@ var Radio = Object.assign(src_radio, {
27386
27452
 
27387
27453
  var RadioGroup = Object.assign(src_group, {
27388
27454
  install: function install(app) {
27389
- dynamicApp.component(src_group.name, src_group);
27390
27455
  app.component(src_group.name, src_group);
27391
27456
  }
27392
27457
  });
27458
+ dynamicApp.component(src_group.name, src_group);
27393
27459
  /* harmony default export */ var radio_group = (RadioGroup);
27394
27460
  // CONCATENATED MODULE: ./packages/radio/src/button.ts
27395
27461
 
@@ -27531,10 +27597,10 @@ var RadioGroup = Object.assign(src_group, {
27531
27597
 
27532
27598
  var RadioButton = Object.assign(radio_src_button, {
27533
27599
  install: function install(app) {
27534
- dynamicApp.component(radio_src_button.name, radio_src_button);
27535
27600
  app.component(radio_src_button.name, radio_src_button);
27536
27601
  }
27537
27602
  });
27603
+ dynamicApp.component(radio_src_button.name, radio_src_button);
27538
27604
  /* harmony default export */ var radio_button = (RadioButton);
27539
27605
  // CONCATENATED MODULE: ./packages/input/index.ts
27540
27606
 
@@ -27543,10 +27609,10 @@ var RadioButton = Object.assign(radio_src_button, {
27543
27609
 
27544
27610
  var Input = Object.assign(input, {
27545
27611
  install: function install(app) {
27546
- dynamicApp.component(input.name, input);
27547
27612
  app.component(input.name, input);
27548
27613
  }
27549
27614
  });
27615
+ dynamicApp.component(input.name, input);
27550
27616
  /* harmony default export */ var packages_input = (Input);
27551
27617
  // CONCATENATED MODULE: ./packages/textarea/src/textarea.ts
27552
27618
 
@@ -27848,10 +27914,10 @@ var autoTxtElem;
27848
27914
 
27849
27915
  var Textarea = Object.assign(src_textarea, {
27850
27916
  install: function install(app) {
27851
- dynamicApp.component(src_textarea.name, src_textarea);
27852
27917
  app.component(src_textarea.name, src_textarea);
27853
27918
  }
27854
27919
  });
27920
+ dynamicApp.component(src_textarea.name, src_textarea);
27855
27921
  /* harmony default export */ var packages_textarea = (Textarea);
27856
27922
  // CONCATENATED MODULE: ./packages/button/index.ts
27857
27923
 
@@ -27860,10 +27926,10 @@ var Textarea = Object.assign(src_textarea, {
27860
27926
 
27861
27927
  var Button = Object.assign(src_button, {
27862
27928
  install: function install(app) {
27863
- dynamicApp.component(src_button.name, src_button);
27864
27929
  app.component(src_button.name, src_button);
27865
27930
  }
27866
27931
  });
27932
+ dynamicApp.component(src_button.name, src_button);
27867
27933
  /* harmony default export */ var packages_button = (Button);
27868
27934
  // CONCATENATED MODULE: ./packages/modal/index.ts
27869
27935
 
@@ -27986,11 +28052,11 @@ var ModalController = {
27986
28052
  var modal_modal = ModalController;
27987
28053
  var Modal = Object.assign(modal, {
27988
28054
  install: function install(app) {
27989
- dynamicApp.component(modal.name, modal);
27990
28055
  app.component(modal.name, modal);
27991
28056
  VXETable.modal = ModalController;
27992
28057
  }
27993
28058
  });
28059
+ dynamicApp.component(modal.name, modal);
27994
28060
  /* harmony default export */ var packages_modal = (Modal);
27995
28061
  // CONCATENATED MODULE: ./packages/tooltip/src/tooltip.ts
27996
28062
 
@@ -28026,20 +28092,29 @@ var Modal = Object.assign(modal, {
28026
28092
  return conf.tooltip.theme;
28027
28093
  }
28028
28094
  },
28029
- content: [String, Number],
28095
+ content: {
28096
+ type: [String, Number],
28097
+ default: null
28098
+ },
28099
+ useHTML: Boolean,
28030
28100
  zIndex: [String, Number],
28031
28101
  isArrow: {
28032
28102
  type: Boolean,
28033
28103
  default: true
28034
28104
  },
28035
28105
  enterable: Boolean,
28106
+ enterDelay: {
28107
+ type: Number,
28108
+ default: function _default() {
28109
+ return conf.tooltip.enterDelay;
28110
+ }
28111
+ },
28036
28112
  leaveDelay: {
28037
28113
  type: Number,
28038
28114
  default: function _default() {
28039
28115
  return conf.tooltip.leaveDelay;
28040
28116
  }
28041
- },
28042
- leaveMethod: Function
28117
+ }
28043
28118
  },
28044
28119
  emits: ['update:modelValue'],
28045
28120
  setup: function setup(props, context) {
@@ -28050,9 +28125,9 @@ var Modal = Object.assign(modal, {
28050
28125
  var reactData = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["reactive"])({
28051
28126
  target: null,
28052
28127
  isUpdate: false,
28053
- isHover: false,
28054
28128
  visible: false,
28055
- message: '',
28129
+ tipContent: '',
28130
+ tipActive: false,
28056
28131
  tipTarget: null,
28057
28132
  tipZindex: 0,
28058
28133
  tipStore: {
@@ -28075,7 +28150,6 @@ var Modal = Object.assign(modal, {
28075
28150
  }
28076
28151
  };
28077
28152
  var tooltipMethods = {};
28078
- var targetActive;
28079
28153
 
28080
28154
  var updateTipStyle = function updateTipStyle() {
28081
28155
  var tipTarget = reactData.tipTarget,
@@ -28144,11 +28218,11 @@ var Modal = Object.assign(modal, {
28144
28218
  var trigger = props.trigger,
28145
28219
  enterable = props.enterable,
28146
28220
  leaveDelay = props.leaveDelay;
28147
- targetActive = false;
28221
+ reactData.tipActive = false;
28148
28222
 
28149
28223
  if (enterable && trigger === 'hover') {
28150
28224
  setTimeout(function () {
28151
- if (!reactData.isHover) {
28225
+ if (!reactData.tipActive) {
28152
28226
  tooltipMethods.close();
28153
28227
  }
28154
28228
  }, leaveDelay);
@@ -28158,29 +28232,59 @@ var Modal = Object.assign(modal, {
28158
28232
  };
28159
28233
 
28160
28234
  var wrapperMouseenterEvent = function wrapperMouseenterEvent() {
28161
- reactData.isHover = true;
28235
+ reactData.tipActive = true;
28162
28236
  };
28163
28237
 
28164
- var wrapperMouseleaveEvent = function wrapperMouseleaveEvent(evnt) {
28165
- var leaveMethod = props.leaveMethod,
28166
- trigger = props.trigger,
28238
+ var wrapperMouseleaveEvent = function wrapperMouseleaveEvent() {
28239
+ var trigger = props.trigger,
28167
28240
  enterable = props.enterable,
28168
28241
  leaveDelay = props.leaveDelay;
28169
- reactData.isHover = false;
28242
+ reactData.tipActive = false;
28170
28243
 
28171
- if (!leaveMethod || leaveMethod({
28172
- $event: evnt
28173
- }) !== false) {
28174
- if (enterable && trigger === 'hover') {
28175
- setTimeout(function () {
28176
- if (!targetActive) {
28177
- tooltipMethods.close();
28178
- }
28179
- }, leaveDelay);
28244
+ if (enterable && trigger === 'hover') {
28245
+ setTimeout(function () {
28246
+ if (!reactData.tipActive) {
28247
+ tooltipMethods.close();
28248
+ }
28249
+ }, leaveDelay);
28250
+ }
28251
+ };
28252
+
28253
+ var showTip = function showTip() {
28254
+ var tipStore = reactData.tipStore;
28255
+ var el = refElem.value;
28256
+
28257
+ if (el) {
28258
+ var parentNode = el.parentNode;
28259
+
28260
+ if (!parentNode) {
28261
+ document.body.appendChild(el);
28180
28262
  }
28181
28263
  }
28264
+
28265
+ updateValue(true);
28266
+ updateZindex();
28267
+ tipStore.placement = 'top';
28268
+ tipStore.style = {
28269
+ width: 'auto',
28270
+ left: 0,
28271
+ top: 0,
28272
+ zIndex: props.zIndex || reactData.tipZindex
28273
+ };
28274
+ tipStore.arrowStyle = {
28275
+ left: '50%'
28276
+ };
28277
+ return tooltipMethods.updatePlacement();
28182
28278
  };
28183
28279
 
28280
+ var showDelayTip = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.debounce(function () {
28281
+ if (reactData.tipActive) {
28282
+ showTip();
28283
+ }
28284
+ }, props.enterDelay, {
28285
+ leading: false,
28286
+ trailing: true
28287
+ });
28184
28288
  tooltipMethods = {
28185
28289
  dispatchEvent: function dispatchEvent(type, params, evnt) {
28186
28290
  emit(type, Object.assign({
@@ -28188,11 +28292,12 @@ var Modal = Object.assign(modal, {
28188
28292
  $event: evnt
28189
28293
  }, params));
28190
28294
  },
28191
- open: function open(target, message) {
28192
- return tooltipMethods.toVisible(target || reactData.target, message);
28295
+ open: function open(target, content) {
28296
+ return tooltipMethods.toVisible(target || reactData.target, content);
28193
28297
  },
28194
28298
  close: function close() {
28195
28299
  reactData.tipTarget = null;
28300
+ reactData.tipActive = false;
28196
28301
  Object.assign(reactData.tipStore, {
28197
28302
  style: {},
28198
28303
  placement: '',
@@ -28201,36 +28306,22 @@ var Modal = Object.assign(modal, {
28201
28306
  updateValue(false);
28202
28307
  return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])();
28203
28308
  },
28204
- toVisible: function toVisible(target, message) {
28205
- targetActive = true;
28206
-
28309
+ toVisible: function toVisible(target, content) {
28207
28310
  if (target) {
28208
- var tipStore = reactData.tipStore;
28209
- var el = refElem.value;
28210
- var parentNode = el.parentNode;
28311
+ var trigger = props.trigger,
28312
+ enterDelay = props.enterDelay;
28313
+ reactData.tipActive = true;
28314
+ reactData.tipTarget = target;
28211
28315
 
28212
- if (!parentNode) {
28213
- document.body.appendChild(el);
28316
+ if (content) {
28317
+ reactData.tipContent = content;
28214
28318
  }
28215
28319
 
28216
- if (message) {
28217
- reactData.message = message;
28320
+ if (enterDelay && trigger === 'hover') {
28321
+ showDelayTip();
28322
+ } else {
28323
+ return showTip();
28218
28324
  }
28219
-
28220
- reactData.tipTarget = target;
28221
- updateValue(true);
28222
- updateZindex();
28223
- tipStore.placement = 'top';
28224
- tipStore.style = {
28225
- width: 'auto',
28226
- left: 0,
28227
- top: 0,
28228
- zIndex: props.zIndex || reactData.tipZindex
28229
- };
28230
- tipStore.arrowStyle = {
28231
- left: '50%'
28232
- };
28233
- return tooltipMethods.updatePlacement();
28234
28325
  }
28235
28326
 
28236
28327
  return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])();
@@ -28245,13 +28336,19 @@ var Modal = Object.assign(modal, {
28245
28336
  return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])().then(updateTipStyle);
28246
28337
  }
28247
28338
  });
28339
+ },
28340
+ isActived: function isActived() {
28341
+ return reactData.tipActive;
28342
+ },
28343
+ setActived: function setActived(actived) {
28344
+ reactData.tipActive = !!actived;
28248
28345
  }
28249
28346
  };
28250
28347
  Object.assign($xetooltip, tooltipMethods);
28251
28348
  Object(external_commonjs_vue_commonjs2_vue_root_Vue_["watch"])(function () {
28252
28349
  return props.content;
28253
28350
  }, function () {
28254
- reactData.message = props.content;
28351
+ reactData.tipContent = props.content;
28255
28352
  });
28256
28353
  Object(external_commonjs_vue_commonjs2_vue_root_Vue_["watch"])(function () {
28257
28354
  return props.modelValue;
@@ -28275,7 +28372,7 @@ var Modal = Object.assign(modal, {
28275
28372
  var parentNode = wrapperElem.parentNode;
28276
28373
 
28277
28374
  if (parentNode) {
28278
- reactData.message = content;
28375
+ reactData.tipContent = content;
28279
28376
  reactData.tipZindex = nextZIndex();
28280
28377
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.arrayEach(wrapperElem.children, function (elem, index) {
28281
28378
  if (index > 1) {
@@ -28291,8 +28388,8 @@ var Modal = Object.assign(modal, {
28291
28388
 
28292
28389
  if (target) {
28293
28390
  if (trigger === 'hover') {
28294
- target.onmouseleave = targetMouseleaveEvent;
28295
28391
  target.onmouseenter = targetMouseenterEvent;
28392
+ target.onmouseleave = targetMouseleaveEvent;
28296
28393
  } else if (trigger === 'click') {
28297
28394
  target.onclick = clickEvent;
28298
28395
  }
@@ -28327,16 +28424,40 @@ var Modal = Object.assign(modal, {
28327
28424
  }
28328
28425
  });
28329
28426
 
28427
+ var renderContent = function renderContent() {
28428
+ var useHTML = props.useHTML;
28429
+ var tipContent = reactData.tipContent;
28430
+
28431
+ if (slots.content) {
28432
+ return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
28433
+ key: 1,
28434
+ class: 'vxe-table--tooltip-content'
28435
+ }, slots.content({}));
28436
+ }
28437
+
28438
+ if (useHTML) {
28439
+ return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
28440
+ key: 2,
28441
+ class: 'vxe-table--tooltip-content',
28442
+ innerHTML: tipContent
28443
+ });
28444
+ }
28445
+
28446
+ return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
28447
+ key: 3,
28448
+ class: 'vxe-table--tooltip-content'
28449
+ }, formatText(tipContent));
28450
+ };
28451
+
28330
28452
  var renderVN = function renderVN() {
28331
28453
  var _ref;
28332
28454
 
28333
28455
  var theme = props.theme,
28334
28456
  isArrow = props.isArrow,
28335
28457
  enterable = props.enterable;
28336
- var isHover = reactData.isHover,
28458
+ var tipActive = reactData.tipActive,
28337
28459
  visible = reactData.visible,
28338
- tipStore = reactData.tipStore,
28339
- message = reactData.message;
28460
+ tipStore = reactData.tipStore;
28340
28461
  var vSize = computeSize.value;
28341
28462
  var ons;
28342
28463
 
@@ -28349,11 +28470,9 @@ var Modal = Object.assign(modal, {
28349
28470
 
28350
28471
  return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', _objectSpread2({
28351
28472
  ref: refElem,
28352
- class: ['vxe-table--tooltip-wrapper', "theme--".concat(theme), (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, "placement--".concat(tipStore.placement), tipStore.placement), _defineProperty(_ref, 'is--enterable', enterable), _defineProperty(_ref, 'is--visible', visible), _defineProperty(_ref, 'is--arrow', isArrow), _defineProperty(_ref, 'is--hover', isHover), _ref)],
28473
+ class: ['vxe-table--tooltip-wrapper', "theme--".concat(theme), (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, "placement--".concat(tipStore.placement), tipStore.placement), _defineProperty(_ref, 'is--enterable', enterable), _defineProperty(_ref, 'is--visible', visible), _defineProperty(_ref, 'is--arrow', isArrow), _defineProperty(_ref, 'is--actived', tipActive), _ref)],
28353
28474
  style: tipStore.style
28354
- }, ons), [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
28355
- class: 'vxe-table--tooltip-content'
28356
- }, slots.content ? slots.content({}) : formatText(message)), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
28475
+ }, ons), [renderContent(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
28357
28476
  class: 'vxe-table--tooltip-arrow',
28358
28477
  style: tipStore.arrowStyle
28359
28478
  })].concat(slots.default ? slots.default({}) : []));
@@ -28375,10 +28494,10 @@ var Modal = Object.assign(modal, {
28375
28494
  var Tooltip = Object.assign(tooltip, {
28376
28495
  install: function install(app) {
28377
28496
  VXETable.tooltip = true;
28378
- dynamicApp.component(tooltip.name, tooltip);
28379
28497
  app.component(tooltip.name, tooltip);
28380
28498
  }
28381
28499
  });
28500
+ dynamicApp.component(tooltip.name, tooltip);
28382
28501
  /* harmony default export */ var packages_tooltip = (Tooltip);
28383
28502
  // CONCATENATED MODULE: ./packages/form/src/itemInfo.ts
28384
28503
 
@@ -28438,6 +28557,13 @@ function isFormItem(item) {
28438
28557
  function createItem($xeform, _vm) {
28439
28558
  return isFormItem(_vm) ? _vm : new itemInfo_ItemInfo($xeform, _vm);
28440
28559
  }
28560
+ var util_handleFieldOrItem = function handleFieldOrItem($xeform, fieldOrItem) {
28561
+ if (fieldOrItem) {
28562
+ return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isString(fieldOrItem) ? $xeform.getItemByField(fieldOrItem) : fieldOrItem;
28563
+ }
28564
+
28565
+ return null;
28566
+ };
28441
28567
  function watchItem(props, formItem) {
28442
28568
  Object.keys(props).forEach(function (name) {
28443
28569
  Object(external_commonjs_vue_commonjs2_vue_root_Vue_["watch"])(function () {
@@ -28479,6 +28605,7 @@ function destroyItem($xeform, formItem) {
28479
28605
 
28480
28606
 
28481
28607
 
28608
+
28482
28609
  function renderPrefixIcon(titlePrefix) {
28483
28610
  return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
28484
28611
  class: 'vxe-form--item-title-prefix'
@@ -28497,11 +28624,16 @@ function render_renderSuffixIcon(titleSuffix) {
28497
28624
 
28498
28625
  function renderTitle($xeform, item) {
28499
28626
  var data = $xeform.props.data;
28627
+
28628
+ var _$xeform$getComputeMa = $xeform.getComputeMaps(),
28629
+ computeTooltipOpts = _$xeform$getComputeMa.computeTooltipOpts;
28630
+
28500
28631
  var slots = item.slots,
28501
28632
  field = item.field,
28502
28633
  itemRender = item.itemRender,
28503
28634
  titlePrefix = item.titlePrefix,
28504
28635
  titleSuffix = item.titleSuffix;
28636
+ var tooltipOpts = computeTooltipOpts.value;
28505
28637
  var compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null;
28506
28638
  var params = {
28507
28639
  data: data,
@@ -28514,11 +28646,9 @@ function renderTitle($xeform, item) {
28514
28646
  var titVNs = [];
28515
28647
 
28516
28648
  if (titlePrefix) {
28517
- titVNs.push(titlePrefix.content || titlePrefix.message ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])('vxe-tooltip'), {
28518
- content: getFuncText(titlePrefix.content || titlePrefix.message),
28519
- enterable: titlePrefix.enterable,
28520
- theme: titlePrefix.theme
28521
- }, {
28649
+ titVNs.push(titlePrefix.content || titlePrefix.message ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])('vxe-tooltip'), _objectSpread2(_objectSpread2(_objectSpread2({}, tooltipOpts), titlePrefix), {}, {
28650
+ content: getFuncText(titlePrefix.content || titlePrefix.message)
28651
+ }), {
28522
28652
  default: function _default() {
28523
28653
  return renderPrefixIcon(titlePrefix);
28524
28654
  }
@@ -28534,11 +28664,9 @@ function renderTitle($xeform, item) {
28534
28664
  var fixVNs = [];
28535
28665
 
28536
28666
  if (titleSuffix) {
28537
- fixVNs.push(titleSuffix.content || titleSuffix.message ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])('vxe-tooltip'), {
28538
- content: getFuncText(titleSuffix.content || titleSuffix.message),
28539
- enterable: titleSuffix.enterable,
28540
- theme: titleSuffix.theme
28541
- }, {
28667
+ fixVNs.push(titleSuffix.content || titleSuffix.message ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])('vxe-tooltip'), _objectSpread2(_objectSpread2(_objectSpread2({}, tooltipOpts), titleSuffix), {}, {
28668
+ content: getFuncText(titleSuffix.content || titleSuffix.message)
28669
+ }), {
28542
28670
  default: function _default() {
28543
28671
  return render_renderSuffixIcon(titleSuffix);
28544
28672
  }
@@ -28579,7 +28707,6 @@ function renderTitle($xeform, item) {
28579
28707
 
28580
28708
 
28581
28709
 
28582
-
28583
28710
 
28584
28711
 
28585
28712
  var form_Rule = /*#__PURE__*/function () {
@@ -28739,7 +28866,6 @@ function getResetValue(value, resetValue) {
28739
28866
  });
28740
28867
  var internalData = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["reactive"])({
28741
28868
  tooltipTimeout: null,
28742
- tooltipActive: false,
28743
28869
  tooltipStore: {
28744
28870
  item: null,
28745
28871
  visible: false
@@ -28751,28 +28877,8 @@ function getResetValue(value, resetValue) {
28751
28877
  var computeValidOpts = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
28752
28878
  return Object.assign({}, conf.form.validConfig, props.validConfig);
28753
28879
  });
28754
- var computeTooltipOpts = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])();
28755
-
28756
- var handleTooltipLeaveMethod = function handleTooltipLeaveMethod() {
28757
- var tooltipOpts = computeTooltipOpts.value;
28758
- setTimeout(function () {
28759
- if (!internalData.tooltipActive) {
28760
- formMethods.closeTooltip();
28761
- }
28762
- }, tooltipOpts.leaveDelay);
28763
- return false;
28764
- };
28765
-
28766
- computeTooltipOpts = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
28767
- var opts = Object.assign({
28768
- leaveDelay: 300
28769
- }, conf.form.tooltipConfig, props.tooltipConfig);
28770
-
28771
- if (opts.enterable) {
28772
- opts.leaveMethod = handleTooltipLeaveMethod;
28773
- }
28774
-
28775
- return opts;
28880
+ var computeTooltipOpts = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
28881
+ return Object.assign({}, conf.tooltip, conf.form.tooltipConfig, props.tooltipConfig);
28776
28882
  });
28777
28883
  var refMaps = {
28778
28884
  refElem: refElem
@@ -28845,6 +28951,15 @@ function getResetValue(value, resetValue) {
28845
28951
  return itemList;
28846
28952
  };
28847
28953
 
28954
+ var getItemByField = function getItemByField(field) {
28955
+ var rest = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(reactData.formItems, function (item) {
28956
+ return item.field === field;
28957
+ }, {
28958
+ children: 'children'
28959
+ });
28960
+ return rest ? rest.item : null;
28961
+ };
28962
+
28848
28963
  var getCollapseStatus = function getCollapseStatus() {
28849
28964
  return reactData.collapseAll;
28850
28965
  };
@@ -28871,19 +28986,15 @@ function getResetValue(value, resetValue) {
28871
28986
  }, evnt);
28872
28987
  };
28873
28988
 
28874
- var clearValidate = function clearValidate(field) {
28875
- var itemList = getItems();
28876
-
28877
- if (field) {
28878
- var item = itemList.find(function (item) {
28879
- return item.field === field;
28880
- });
28989
+ var clearValidate = function clearValidate(fieldOrItem) {
28990
+ if (fieldOrItem) {
28991
+ var item = util_handleFieldOrItem($xeform, fieldOrItem);
28881
28992
 
28882
28993
  if (item) {
28883
28994
  item.showError = false;
28884
28995
  }
28885
28996
  } else {
28886
- itemList.forEach(function (item) {
28997
+ getItems().forEach(function (item) {
28887
28998
  item.showError = false;
28888
28999
  });
28889
29000
  }
@@ -28931,12 +29042,9 @@ function getResetValue(value, resetValue) {
28931
29042
  };
28932
29043
 
28933
29044
  var handleFocus = function handleFocus(fields) {
28934
- var itemList = getItems();
28935
29045
  var el = refElem.value;
28936
29046
  fields.some(function (property, index) {
28937
- var item = itemList.find(function (item) {
28938
- return item.field === property;
28939
- });
29047
+ var item = getItemByField(property);
28940
29048
 
28941
29049
  if (item && isEnableConf(item.itemRender)) {
28942
29050
  var itemRender = item.itemRender;
@@ -29135,10 +29243,9 @@ function getResetValue(value, resetValue) {
29135
29243
  return beginValidate(getItems(), '', callback);
29136
29244
  };
29137
29245
 
29138
- var validateField = function validateField(field, callback) {
29139
- return beginValidate(getItems().filter(function (item) {
29140
- return item.field === field;
29141
- }), '', callback);
29246
+ var validateField = function validateField(fieldOrItem, callback) {
29247
+ var item = util_handleFieldOrItem($xeform, fieldOrItem);
29248
+ return beginValidate(item ? [item] : [], '', callback);
29142
29249
  };
29143
29250
 
29144
29251
  var submitEvent = function submitEvent(evnt) {
@@ -29177,7 +29284,7 @@ function getResetValue(value, resetValue) {
29177
29284
  return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])();
29178
29285
  };
29179
29286
 
29180
- var triggerHeaderHelpEvent = function triggerHeaderHelpEvent(evnt, params) {
29287
+ var triggerTitleTipEvent = function triggerTitleTipEvent(evnt, params) {
29181
29288
  var item = params.item;
29182
29289
  var tooltipStore = internalData.tooltipStore;
29183
29290
  var $tooltip = refTooltip.value;
@@ -29185,8 +29292,10 @@ function getResetValue(value, resetValue) {
29185
29292
  var content = (overflowElem.textContent || '').trim();
29186
29293
  var isCellOverflow = overflowElem.scrollWidth > overflowElem.clientWidth;
29187
29294
  clearTimeout(internalData.tooltipTimeout);
29188
- internalData.tooltipActive = true;
29189
- closeTooltip();
29295
+
29296
+ if (tooltipStore.item !== item) {
29297
+ closeTooltip();
29298
+ }
29190
29299
 
29191
29300
  if (content && isCellOverflow) {
29192
29301
  Object.assign(tooltipStore, {
@@ -29200,15 +29309,19 @@ function getResetValue(value, resetValue) {
29200
29309
  }
29201
29310
  };
29202
29311
 
29203
- var handleTargetLeaveEvent = function handleTargetLeaveEvent() {
29312
+ var handleTitleTipLeaveEvent = function handleTitleTipLeaveEvent() {
29204
29313
  var tooltipOpts = computeTooltipOpts.value;
29205
- internalData.tooltipActive = false;
29314
+ var $tooltip = refTooltip.value;
29315
+
29316
+ if ($tooltip) {
29317
+ $tooltip.setActived(false);
29318
+ }
29206
29319
 
29207
29320
  if (tooltipOpts.enterable) {
29208
29321
  internalData.tooltipTimeout = setTimeout(function () {
29209
- var $tooltip = refTooltip.value;
29322
+ $tooltip = refTooltip.value;
29210
29323
 
29211
- if ($tooltip && !$tooltip.reactData.isHover) {
29324
+ if ($tooltip && !$tooltip.isActived()) {
29212
29325
  closeTooltip();
29213
29326
  }
29214
29327
  }, tooltipOpts.leaveDelay);
@@ -29231,10 +29344,7 @@ function getResetValue(value, resetValue) {
29231
29344
  clearValidate(property);
29232
29345
  }).catch(function (_ref2) {
29233
29346
  var rule = _ref2.rule;
29234
- var itemList = getItems();
29235
- var item = itemList.find(function (item) {
29236
- return item.field === property;
29237
- });
29347
+ var item = getItemByField(property);
29238
29348
 
29239
29349
  if (item) {
29240
29350
  item.showError = true;
@@ -29250,7 +29360,7 @@ function getResetValue(value, resetValue) {
29250
29360
  allTitleOverflow = props.titleOverflow;
29251
29361
  var collapseAll = reactData.collapseAll;
29252
29362
  var validOpts = computeValidOpts.value;
29253
- return itemList.map(function (item, index) {
29363
+ return itemList.map(function (item) {
29254
29364
  var slots = item.slots,
29255
29365
  title = item.title,
29256
29366
  visible = item.visible,
@@ -29347,9 +29457,9 @@ function getResetValue(value, resetValue) {
29347
29457
 
29348
29458
  var ons = showTooltip ? {
29349
29459
  onMouseenter: function onMouseenter(evnt) {
29350
- triggerHeaderHelpEvent(evnt, params);
29460
+ triggerTitleTipEvent(evnt, params);
29351
29461
  },
29352
- onMouseleave: handleTargetLeaveEvent
29462
+ onMouseleave: handleTitleTipLeaveEvent
29353
29463
  } : {};
29354
29464
  return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
29355
29465
  class: ['vxe-form--item', item.id, span ? "vxe-col--".concat(span, " is--span") : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(className) ? className(params) : className : '', {
@@ -29359,7 +29469,7 @@ function getResetValue(value, resetValue) {
29359
29469
  'is--active': !itemVisibleMethod || itemVisibleMethod(params),
29360
29470
  'is--error': showError
29361
29471
  }],
29362
- key: index
29472
+ key: item.id
29363
29473
  }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
29364
29474
  class: 'vxe-form--item-inner'
29365
29475
  }, [title || titleSlot ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', _objectSpread2({
@@ -29390,13 +29500,14 @@ function getResetValue(value, resetValue) {
29390
29500
  updateStatus: updateStatus,
29391
29501
  toggleCollapse: toggleCollapse,
29392
29502
  getItems: getItems,
29503
+ getItemByField: getItemByField,
29393
29504
  closeTooltip: closeTooltip
29394
29505
  };
29395
29506
  var formPrivateMethods = {
29396
29507
  callSlot: callSlot,
29397
29508
  toggleCollapseEvent: toggleCollapseEvent,
29398
- triggerHeaderHelpEvent: triggerHeaderHelpEvent,
29399
- handleTargetLeaveEvent: handleTargetLeaveEvent
29509
+ triggerTitleTipEvent: triggerTitleTipEvent,
29510
+ handleTitleTipLeaveEvent: handleTitleTipLeaveEvent
29400
29511
  };
29401
29512
  Object.assign($xeform, formMethods, formPrivateMethods);
29402
29513
  Object(external_commonjs_vue_commonjs2_vue_root_Vue_["watch"])(function () {
@@ -29483,10 +29594,10 @@ function getResetValue(value, resetValue) {
29483
29594
 
29484
29595
  var Form = Object.assign(src_form, {
29485
29596
  install: function install(app) {
29486
- dynamicApp.component(src_form.name, src_form);
29487
29597
  app.component(src_form.name, src_form);
29488
29598
  }
29489
29599
  });
29600
+ dynamicApp.component(src_form.name, src_form);
29490
29601
  /* harmony default export */ var packages_form = (Form);
29491
29602
  // CONCATENATED MODULE: ./packages/form/src/form-item.ts
29492
29603
 
@@ -29533,7 +29644,7 @@ var formItemProps = {
29533
29644
  var refElem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])();
29534
29645
  var $xeform = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["inject"])('$xeform', {});
29535
29646
  var formGather = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["inject"])('xeformgather', null);
29536
- var formItem = createItem($xeform, props);
29647
+ var formItem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["reactive"])(createItem($xeform, props));
29537
29648
  formItem.slots = slots;
29538
29649
  watchItem(props, formItem);
29539
29650
  Object(external_commonjs_vue_commonjs2_vue_root_Vue_["onMounted"])(function () {
@@ -29634,9 +29745,9 @@ var formItemProps = {
29634
29745
 
29635
29746
  var ons = showTooltip ? {
29636
29747
  onMouseenter: function onMouseenter(evnt) {
29637
- $xeform.triggerHeaderHelpEvent(evnt, params);
29748
+ $xeform.triggerTitleTipEvent(evnt, params);
29638
29749
  },
29639
- onMouseleave: $xeform.handleTargetLeaveEvent
29750
+ onMouseleave: $xeform.handleTitleTipLeaveEvent
29640
29751
  } : {};
29641
29752
  return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
29642
29753
  ref: refElem,
@@ -29679,10 +29790,10 @@ var formItemProps = {
29679
29790
 
29680
29791
  var FormItem = Object.assign(form_item, {
29681
29792
  install: function install(app) {
29682
- dynamicApp.component(form_item.name, form_item);
29683
29793
  app.component(form_item.name, form_item);
29684
29794
  }
29685
29795
  });
29796
+ dynamicApp.component(form_item.name, form_item);
29686
29797
  /* harmony default export */ var packages_form_item = (FormItem);
29687
29798
  // CONCATENATED MODULE: ./packages/form/src/form-gather.ts
29688
29799
 
@@ -29698,7 +29809,7 @@ var FormItem = Object.assign(form_item, {
29698
29809
  var $xeform = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["inject"])('$xeform', {});
29699
29810
  var formGather = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["inject"])('xeformgather', null);
29700
29811
  var defaultSlot = slots.default;
29701
- var formItem = createItem($xeform, props);
29812
+ var formItem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["reactive"])(createItem($xeform, props));
29702
29813
  var xeformitem = {
29703
29814
  formItem: formItem
29704
29815
  };
@@ -29736,10 +29847,10 @@ var FormItem = Object.assign(form_item, {
29736
29847
 
29737
29848
  var FormGather = Object.assign(form_gather, {
29738
29849
  install: function install(app) {
29739
- dynamicApp.component(form_gather.name, form_gather);
29740
29850
  app.component(form_gather.name, form_gather);
29741
29851
  }
29742
29852
  });
29853
+ dynamicApp.component(form_gather.name, form_gather);
29743
29854
  /* harmony default export */ var packages_form_gather = (FormGather);
29744
29855
  // CONCATENATED MODULE: ./packages/select/index.ts
29745
29856
 
@@ -29748,10 +29859,10 @@ var FormGather = Object.assign(form_gather, {
29748
29859
 
29749
29860
  var Select = Object.assign(src_select, {
29750
29861
  install: function install(app) {
29751
- dynamicApp.component(src_select.name, src_select);
29752
29862
  app.component(src_select.name, src_select);
29753
29863
  }
29754
29864
  });
29865
+ dynamicApp.component(src_select.name, src_select);
29755
29866
  /* harmony default export */ var packages_select = (Select);
29756
29867
  // CONCATENATED MODULE: ./packages/select/src/optionInfo.ts
29757
29868
 
@@ -29880,10 +29991,10 @@ function destroyOption($xeselect, option) {
29880
29991
 
29881
29992
  var Optgroup = Object.assign(src_optgroup, {
29882
29993
  install: function install(app) {
29883
- dynamicApp.component(src_optgroup.name, src_optgroup);
29884
29994
  app.component(src_optgroup.name, src_optgroup);
29885
29995
  }
29886
29996
  });
29997
+ dynamicApp.component(src_optgroup.name, src_optgroup);
29887
29998
  /* harmony default export */ var packages_optgroup = (Optgroup);
29888
29999
  // CONCATENATED MODULE: ./packages/select/src/option.ts
29889
30000
 
@@ -29932,10 +30043,10 @@ var Optgroup = Object.assign(src_optgroup, {
29932
30043
 
29933
30044
  var Option = Object.assign(src_option, {
29934
30045
  install: function install(app) {
29935
- dynamicApp.component(src_option.name, src_option);
29936
30046
  app.component(src_option.name, src_option);
29937
30047
  }
29938
30048
  });
30049
+ dynamicApp.component(src_option.name, src_option);
29939
30050
  /* harmony default export */ var packages_option = (Option);
29940
30051
  // CONCATENATED MODULE: ./packages/switch/src/switch.ts
29941
30052
 
@@ -30099,10 +30210,10 @@ var Option = Object.assign(src_option, {
30099
30210
 
30100
30211
  var Switch = Object.assign(src_switch, {
30101
30212
  install: function install(app) {
30102
- dynamicApp.component(src_switch.name, src_switch);
30103
30213
  app.component(src_switch.name, src_switch);
30104
30214
  }
30105
30215
  });
30216
+ dynamicApp.component(src_switch.name, src_switch);
30106
30217
  /* harmony default export */ var packages_switch = (Switch);
30107
30218
  // CONCATENATED MODULE: ./packages/tools/resize.ts
30108
30219
 
@@ -30637,10 +30748,10 @@ function createResizeEvent(callback) {
30637
30748
 
30638
30749
  var List = Object.assign(src_list, {
30639
30750
  install: function install(app) {
30640
- dynamicApp.component(src_list.name, src_list);
30641
30751
  app.component(src_list.name, src_list);
30642
30752
  }
30643
30753
  });
30754
+ dynamicApp.component(src_list.name, src_list);
30644
30755
  /* harmony default export */ var packages_list = (List);
30645
30756
  // CONCATENATED MODULE: ./packages/pulldown/src/pulldown.ts
30646
30757
 
@@ -30990,10 +31101,10 @@ var List = Object.assign(src_list, {
30990
31101
 
30991
31102
  var Pulldown = Object.assign(pulldown, {
30992
31103
  install: function install(app) {
30993
- dynamicApp.component(pulldown.name, pulldown);
30994
31104
  app.component(pulldown.name, pulldown);
30995
31105
  }
30996
31106
  });
31107
+ dynamicApp.component(pulldown.name, pulldown);
30997
31108
  /* harmony default export */ var packages_pulldown = (Pulldown);
30998
31109
  // CONCATENATED MODULE: ./packages/table/src/body.ts
30999
31110
 
@@ -31057,7 +31168,8 @@ var lineOffsetSizes = {
31057
31168
  computeTreeOpts = _$xetable$getComputeM.computeTreeOpts,
31058
31169
  computeCheckboxOpts = _$xetable$getComputeM.computeCheckboxOpts,
31059
31170
  computeValidOpts = _$xetable$getComputeM.computeValidOpts,
31060
- computeRowOpts = _$xetable$getComputeM.computeRowOpts;
31171
+ computeRowOpts = _$xetable$getComputeM.computeRowOpts,
31172
+ computeColumnOpts = _$xetable$getComputeM.computeColumnOpts;
31061
31173
 
31062
31174
  var refElem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])();
31063
31175
  var refBodyTable = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])();
@@ -31188,6 +31300,7 @@ var lineOffsetSizes = {
31188
31300
  var tooltipOpts = computeTooltipOpts.value;
31189
31301
  var rowOpts = computeRowOpts.value;
31190
31302
  var sYOpts = computeSYOpts.value;
31303
+ var columnOpts = computeColumnOpts.value;
31191
31304
  var type = column.type,
31192
31305
  cellRender = column.cellRender,
31193
31306
  editRender = column.editRender,
@@ -31391,7 +31504,7 @@ var lineOffsetSizes = {
31391
31504
 
31392
31505
  return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('td', _objectSpread2(_objectSpread2({
31393
31506
  class: ['vxe-body--column', column.id, (_ref2 = {}, _defineProperty(_ref2, "col--".concat(cellAlign), cellAlign), _defineProperty(_ref2, "col--".concat(type), type), _defineProperty(_ref2, 'col--last', $columnIndex === columns.length - 1), _defineProperty(_ref2, 'col--tree-node', treeNode), _defineProperty(_ref2, 'col--edit', isEdit), _defineProperty(_ref2, 'col--ellipsis', hasEllipsis), _defineProperty(_ref2, 'fixed--hidden', fixedHiddenColumn), _defineProperty(_ref2, 'col--dirty', isDirty), _defineProperty(_ref2, 'col--actived', editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row')), _defineProperty(_ref2, 'col--valid-error', hasValidError), _defineProperty(_ref2, 'col--current', currentColumn === column), _ref2), getPropClass(className, params), getPropClass(cellClassName, params)],
31394
- key: columnKey ? column.id : $columnIndex
31507
+ key: columnKey || columnOpts.useKey ? column.id : $columnIndex
31395
31508
  }, attrs), {}, {
31396
31509
  style: Object.assign({
31397
31510
  height: hasEllipsis && (scrollYRHeight || rowHeight) ? "".concat(scrollYRHeight || rowHeight, "px") : ''
@@ -31491,7 +31604,7 @@ var lineOffsetSizes = {
31491
31604
  }, rowClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(rowClassName) ? rowClassName(params) : rowClassName : ''],
31492
31605
  rowid: rowid,
31493
31606
  style: rowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(rowStyle) ? rowStyle(params) : rowStyle : null,
31494
- key: rowKey || treeConfig ? rowid : $rowIndex
31607
+ key: rowKey || rowOpts.useKey || treeConfig ? rowid : $rowIndex
31495
31608
  }, trOn), tableColumn.map(function (column, $columnIndex) {
31496
31609
  return renderColumn(seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, tableColumn, tableData);
31497
31610
  }))); // 如果行被展开了
@@ -31553,7 +31666,7 @@ var lineOffsetSizes = {
31553
31666
 
31554
31667
  var scrollProcessTimeout;
31555
31668
 
31556
- var syncBodyScroll = function syncBodyScroll(scrollTop, elem1, elem2) {
31669
+ var syncBodyScroll = function syncBodyScroll(fixedType, scrollTop, elem1, elem2) {
31557
31670
  if (elem1 || elem2) {
31558
31671
  if (elem1) {
31559
31672
  removeScrollListener(elem1);
@@ -31567,8 +31680,27 @@ var lineOffsetSizes = {
31567
31680
 
31568
31681
  clearTimeout(scrollProcessTimeout);
31569
31682
  scrollProcessTimeout = setTimeout(function () {
31683
+ // const tableBody = refTableBody.value
31684
+ // const leftBody = refTableLeftBody.value
31685
+ // const rightBody = refTableRightBody.value
31686
+ // const bodyElem = tableBody.$el as XEBodyScrollElement
31687
+ // const leftElem = leftBody ? leftBody.$el as XEBodyScrollElement : null
31688
+ // const rightElem = rightBody ? rightBody.$el as XEBodyScrollElement : null
31570
31689
  restoreScrollListener(elem1);
31571
- restoreScrollListener(elem2);
31690
+ restoreScrollListener(elem2); // 检查滚动条是的同步
31691
+ // let targetTop = bodyElem.scrollTop
31692
+ // if (fixedType === 'left') {
31693
+ // if (leftElem) {
31694
+ // targetTop = leftElem.scrollTop
31695
+ // }
31696
+ // } else if (fixedType === 'right') {
31697
+ // if (rightElem) {
31698
+ // targetTop = rightElem.scrollTop
31699
+ // }
31700
+ // }
31701
+ // setScrollTop(bodyElem, targetTop)
31702
+ // setScrollTop(leftElem, targetTop)
31703
+ // setScrollTop(rightElem, targetTop)
31572
31704
  }, 300);
31573
31705
  }
31574
31706
  };
@@ -31618,10 +31750,10 @@ var lineOffsetSizes = {
31618
31750
 
31619
31751
  if (leftElem && fixedType === 'left') {
31620
31752
  scrollTop = leftElem.scrollTop;
31621
- syncBodyScroll(scrollTop, bodyElem, rightElem);
31753
+ syncBodyScroll(fixedType, scrollTop, bodyElem, rightElem);
31622
31754
  } else if (rightElem && fixedType === 'right') {
31623
31755
  scrollTop = rightElem.scrollTop;
31624
- syncBodyScroll(scrollTop, bodyElem, leftElem);
31756
+ syncBodyScroll(fixedType, scrollTop, bodyElem, leftElem);
31625
31757
  } else {
31626
31758
  if (isRollX) {
31627
31759
  if (headerElem) {
@@ -31637,7 +31769,7 @@ var lineOffsetSizes = {
31637
31769
  $xetable.checkScrolling();
31638
31770
 
31639
31771
  if (isRollY) {
31640
- syncBodyScroll(scrollTop, leftElem, rightElem);
31772
+ syncBodyScroll(fixedType, scrollTop, leftElem, rightElem);
31641
31773
  }
31642
31774
  }
31643
31775
  }
@@ -31756,8 +31888,8 @@ var lineOffsetSizes = {
31756
31888
  var tableBody = refTableBody.value;
31757
31889
  var scrollBodyElem = refElem.value;
31758
31890
  var bodyElem = tableBody.$el;
31759
- var deltaTop = browse.firefox ? deltaY * 40 : deltaY;
31760
- var deltaLeft = browse.firefox ? deltaX * 40 : deltaX;
31891
+ var deltaTop = deltaY;
31892
+ var deltaLeft = deltaX;
31761
31893
  var isTopWheel = deltaTop < 0; // 如果滚动位置已经是顶部或底部,则不需要触发
31762
31894
 
31763
31895
  if (isTopWheel ? scrollBodyElem.scrollTop <= 0 : scrollBodyElem.scrollTop >= scrollBodyElem.scrollHeight - scrollBodyElem.clientHeight) {
@@ -31886,7 +32018,7 @@ var lineOffsetSizes = {
31886
32018
  ref: refElem,
31887
32019
  class: ['vxe-table--body-wrapper', fixedType ? "fixed-".concat(fixedType, "--wrapper") : 'body--wrapper'],
31888
32020
  xid: xID
31889
- }, scrollYLoad && sYOpts.mode === 'wheel' ? {
32021
+ }, sYOpts.mode === 'wheel' ? {
31890
32022
  onWheel: wheelEvent
31891
32023
  } : {}), [fixedType ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])() : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
31892
32024
  ref: refBodyXSpace,
@@ -31992,6 +32124,7 @@ var lineOffsetSizes = {
31992
32124
 
31993
32125
 
31994
32126
 
32127
+
31995
32128
 
31996
32129
 
31997
32130
  var isWebkit = browse['-webkit'] && !browse.edge;
@@ -32134,6 +32267,14 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
32134
32267
  insertList: [],
32135
32268
  removeList: []
32136
32269
  },
32270
+ // 存放 tooltip 相关信息
32271
+ tooltipStore: {
32272
+ row: null,
32273
+ column: null,
32274
+ content: null,
32275
+ visible: false,
32276
+ currOpts: null
32277
+ },
32137
32278
  // 存放数据校验相关信息
32138
32279
  validStore: {
32139
32280
  visible: false,
@@ -32205,8 +32346,6 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
32205
32346
  startIndex: 0,
32206
32347
  endIndex: 0
32207
32348
  },
32208
- // 存放 tooltip 相关信息
32209
- tooltipStore: {},
32210
32349
  // 表格宽度
32211
32350
  tableWidth: 0,
32212
32351
  // 表格高度
@@ -32252,7 +32391,6 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
32252
32391
  fullColumnIdData: {},
32253
32392
  fullColumnFieldData: {},
32254
32393
  inited: false,
32255
- tooltipActive: false,
32256
32394
  tooltipTimeout: null,
32257
32395
  initStatus: false,
32258
32396
  isActivated: false
@@ -32318,27 +32456,13 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
32318
32456
  return Object.assign({}, conf.table.checkboxConfig, props.checkboxConfig);
32319
32457
  });
32320
32458
  var computeTooltipOpts = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])();
32321
-
32322
- var handleTooltipLeaveMethod = function handleTooltipLeaveMethod() {
32323
- var tooltipOpts = computeTooltipOpts.value;
32324
- setTimeout(function () {
32325
- if (!internalData.tooltipActive) {
32326
- tableMethods.closeTooltip();
32327
- }
32328
- }, tooltipOpts.leaveDelay);
32329
- return false;
32330
- };
32331
-
32332
32459
  computeTooltipOpts = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
32333
- var opts = Object.assign({
32334
- leaveDelay: 300
32335
- }, conf.table.tooltipConfig, props.tooltipConfig);
32336
-
32337
- if (opts.enterable) {
32338
- opts.leaveMethod = handleTooltipLeaveMethod;
32339
- }
32340
-
32341
- return opts;
32460
+ return Object.assign({}, conf.tooltip, conf.table.tooltipConfig, props.tooltipConfig);
32461
+ });
32462
+ var computeTipConfig = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
32463
+ var tooltipStore = reactData.tooltipStore;
32464
+ var tooltipOpts = computeTooltipOpts.value;
32465
+ return _objectSpread2(_objectSpread2({}, tooltipOpts), tooltipStore.currOpts);
32342
32466
  });
32343
32467
  var computeValidTipOpts = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
32344
32468
  var tooltipOpts = computeTooltipOpts.value;
@@ -33678,7 +33802,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
33678
33802
  } else if (layout === 'body') {
33679
33803
  var emptyBlockElem = elemStore["".concat(name, "-").concat(layout, "-emptyBlock")];
33680
33804
 
33681
- if (wrapperElem) {
33805
+ if (isNodeElement(wrapperElem)) {
33682
33806
  if (customMaxHeight) {
33683
33807
  wrapperElem.style.maxHeight = "".concat(fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight, "px");
33684
33808
  } else {
@@ -33692,7 +33816,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
33692
33816
 
33693
33817
 
33694
33818
  if (fixedWrapperElem) {
33695
- if (wrapperElem) {
33819
+ if (isNodeElement(wrapperElem)) {
33696
33820
  wrapperElem.style.top = "".concat(headerHeight, "px");
33697
33821
  }
33698
33822
 
@@ -33709,14 +33833,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
33709
33833
  if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
33710
33834
  tableColumn = fixedColumn;
33711
33835
  } else {
33712
- tableColumn = visibleColumn; // 检查固定列是否被合并,合并范围是否超出固定列
33713
- // if (mergeList.length && !isMergeLeftFixedExceeded && fixedType === 'left') {
33714
- // tableColumn = fixedColumn
33715
- // } else if (mergeList.length && !isMergeRightFixedExceeded && fixedType === 'right') {
33716
- // tableColumn = fixedColumn
33717
- // } else {
33718
- // tableColumn = visibleColumn
33719
- // }
33836
+ tableColumn = visibleColumn;
33720
33837
  }
33721
33838
  } else {
33722
33839
  tableColumn = visibleColumn;
@@ -33744,14 +33861,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
33744
33861
  if (!mergeFooterList.length || !footerSpanMethod) {
33745
33862
  tableColumn = fixedColumn;
33746
33863
  } else {
33747
- tableColumn = visibleColumn; // 检查固定列是否被合并,合并范围是否超出固定列
33748
- // if (mergeFooterList.length && !isMergeFooterLeftFixedExceeded && fixedType === 'left') {
33749
- // tableColumn = fixedColumn
33750
- // } else if (mergeFooterList.length && !isMergeFooterRightFixedExceeded && fixedType === 'right') {
33751
- // tableColumn = fixedColumn
33752
- // } else {
33753
- // tableColumn = visibleColumn
33754
- // }
33864
+ tableColumn = visibleColumn;
33755
33865
  }
33756
33866
  } else {
33757
33867
  tableColumn = visibleColumn;
@@ -33762,7 +33872,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
33762
33872
  return previous + column.renderWidth;
33763
33873
  }, 0);
33764
33874
 
33765
- if (wrapperElem) {
33875
+ if (isNodeElement(wrapperElem)) {
33766
33876
  // 如果是固定列
33767
33877
  if (fixedWrapperElem) {
33768
33878
  wrapperElem.style.top = "".concat(customHeight > 0 ? customHeight - footerHeight : tableHeight + headerHeight, "px");
@@ -34900,12 +35010,34 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
34900
35010
  },
34901
35011
 
34902
35012
  /**
34903
- * 手动处理数据
35013
+ * 手动处理数据,用于手动排序与筛选
34904
35014
  * 对于手动更改了排序、筛选...等条件后需要重新处理数据时可能会用到
34905
35015
  */
34906
35016
  updateData: function updateData() {
34907
- return tablePrivateMethods.handleTableData(true).then(tableMethods.updateFooter).then(function () {
34908
- return tableMethods.recalculate();
35017
+ var scrollXLoad = reactData.scrollXLoad,
35018
+ scrollYLoad = reactData.scrollYLoad;
35019
+ return tablePrivateMethods.handleTableData(true).then(function () {
35020
+ tableMethods.updateFooter();
35021
+
35022
+ if (scrollXLoad || scrollYLoad) {
35023
+ if (scrollXLoad) {
35024
+ tablePrivateMethods.updateScrollXSpace();
35025
+ }
35026
+
35027
+ if (scrollYLoad) {
35028
+ tablePrivateMethods.updateScrollYSpace();
35029
+ }
35030
+
35031
+ return tableMethods.refreshScroll();
35032
+ }
35033
+ }).then(function () {
35034
+ tablePrivateMethods.updateCellAreas();
35035
+ return tableMethods.recalculate(true);
35036
+ }).then(function () {
35037
+ // 存在滚动行为未结束情况
35038
+ setTimeout(function () {
35039
+ return $xetable.recalculate();
35040
+ }, 50);
34909
35041
  });
34910
35042
  },
34911
35043
 
@@ -35607,18 +35739,24 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
35607
35739
  var tableBodyElem = tableBody ? tableBody.$el : null;
35608
35740
  var leftBodyElem = leftBody ? leftBody.$el : null;
35609
35741
  var rightBodyElem = rightBody ? rightBody.$el : null;
35610
- var tableFooterElem = tableFooter ? tableFooter.$el : null; // 还原滚动条位置
35742
+ var tableFooterElem = tableFooter ? tableFooter.$el : null;
35743
+ return new Promise(function (resolve) {
35744
+ // 还原滚动条位置
35745
+ if (lastScrollLeft || lastScrollTop) {
35746
+ return restoreScrollLocation($xetable, lastScrollLeft, lastScrollTop).then(resolve).then(function () {
35747
+ // 存在滚动行为未结束情况
35748
+ setTimeout(resolve, 30);
35749
+ });
35750
+ } // 重置
35611
35751
 
35612
- if (lastScrollLeft || lastScrollTop) {
35613
- return restoreScrollLocation($xetable, lastScrollLeft, lastScrollTop);
35614
- } // 重置
35615
35752
 
35753
+ setScrollTop(tableBodyElem, lastScrollTop);
35754
+ setScrollTop(leftBodyElem, lastScrollTop);
35755
+ setScrollTop(rightBodyElem, lastScrollTop);
35756
+ setScrollLeft(tableFooterElem, lastScrollLeft); // 存在滚动行为未结束情况
35616
35757
 
35617
- setScrollTop(tableBodyElem, lastScrollTop);
35618
- setScrollTop(leftBodyElem, lastScrollTop);
35619
- setScrollTop(rightBodyElem, lastScrollTop);
35620
- setScrollLeft(tableFooterElem, lastScrollLeft);
35621
- return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])();
35758
+ setTimeout(resolve, 30);
35759
+ });
35622
35760
  },
35623
35761
 
35624
35762
  /**
@@ -35661,7 +35799,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
35661
35799
  * 关闭 tooltip
35662
35800
  */
35663
35801
  closeTooltip: function closeTooltip() {
35664
- var tooltipStore = internalData.tooltipStore;
35802
+ var tooltipStore = reactData.tooltipStore;
35665
35803
  var $tooltip = refTooltip.value;
35666
35804
  var $commTip = refCommTooltip.value;
35667
35805
 
@@ -37131,6 +37269,8 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
37131
37269
 
37132
37270
  if (isEsc) {
37133
37271
  tablePrivateMethods.preventEvent(evnt, 'event.keydown', null, function () {
37272
+ tableMethods.dispatchEvent('keydown-start', {}, evnt);
37273
+
37134
37274
  if (keyboardConfig && mouseConfig && mouseOpts.area && $xetable.handleKeyboardEvent) {
37135
37275
  $xetable.handleKeyboardEvent(evnt);
37136
37276
  } else if (actived.row || filterStore.visible || ctxMenuStore.visible) {
@@ -37158,6 +37298,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
37158
37298
  }
37159
37299
 
37160
37300
  tableMethods.dispatchEvent('keydown', {}, evnt);
37301
+ tableMethods.dispatchEvent('keydown-end', {}, evnt);
37161
37302
  });
37162
37303
  }
37163
37304
  };
@@ -37498,10 +37639,17 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
37498
37639
  tableMethods.recalculate(true);
37499
37640
  };
37500
37641
 
37501
- var handleTargetEnterEvent = function handleTargetEnterEvent() {
37642
+ var handleTargetEnterEvent = function handleTargetEnterEvent(isClear) {
37643
+ var $tooltip = refTooltip.value;
37502
37644
  clearTimeout(internalData.tooltipTimeout);
37503
- internalData.tooltipActive = true;
37504
- tableMethods.closeTooltip();
37645
+
37646
+ if (isClear) {
37647
+ tableMethods.closeTooltip();
37648
+ } else {
37649
+ if ($tooltip) {
37650
+ $tooltip.setActived(true);
37651
+ }
37652
+ }
37505
37653
  };
37506
37654
  /**
37507
37655
  * 处理显示 tooltip
@@ -37513,13 +37661,12 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
37513
37661
 
37514
37662
  var handleTooltip = function handleTooltip(evnt, cell, overflowElem, tipElem, params) {
37515
37663
  params.cell = cell;
37516
- var tooltipStore = internalData.tooltipStore;
37664
+ var tooltipStore = reactData.tooltipStore;
37517
37665
  var tooltipOpts = computeTooltipOpts.value;
37518
37666
  var column = params.column,
37519
37667
  row = params.row;
37520
37668
  var showAll = tooltipOpts.showAll,
37521
37669
  contentMethod = tooltipOpts.contentMethod;
37522
- var $tooltip = refTooltip.value;
37523
37670
  var customContent = contentMethod ? contentMethod(params) : null;
37524
37671
  var useCustom = contentMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eqNull(customContent);
37525
37672
  var content = useCustom ? customContent : (column.type === 'html' ? overflowElem.innerText : overflowElem.textContent).trim();
@@ -37529,12 +37676,16 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
37529
37676
  Object.assign(tooltipStore, {
37530
37677
  row: row,
37531
37678
  column: column,
37532
- visible: true
37679
+ visible: true,
37680
+ currOpts: null
37533
37681
  });
37682
+ Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
37683
+ var $tooltip = refTooltip.value;
37534
37684
 
37535
- if ($tooltip) {
37536
- $tooltip.open(isCellOverflow ? overflowElem : tipElem || overflowElem, formatText(content));
37537
- }
37685
+ if ($tooltip) {
37686
+ $tooltip.open(isCellOverflow ? overflowElem : tipElem || overflowElem, formatText(content));
37687
+ }
37688
+ });
37538
37689
  }
37539
37690
 
37540
37691
  return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])();
@@ -38154,18 +38305,23 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
38154
38305
  },
38155
38306
  triggerHeaderHelpEvent: function triggerHeaderHelpEvent(evnt, params) {
38156
38307
  var column = params.column;
38157
- var titleHelp = column.titleHelp;
38308
+ var titlePrefix = column.titlePrefix || column.titleHelp;
38158
38309
 
38159
- if (titleHelp.content || titleHelp.message) {
38160
- var tooltipStore = internalData.tooltipStore;
38161
- var $tooltip = refTooltip.value;
38162
- var content = getFuncText(titleHelp.content || titleHelp.message);
38163
- handleTargetEnterEvent();
38310
+ if (titlePrefix.content || titlePrefix.message) {
38311
+ var tooltipStore = reactData.tooltipStore;
38312
+ var content = getFuncText(titlePrefix.content || titlePrefix.message);
38313
+ handleTargetEnterEvent(true);
38164
38314
  tooltipStore.visible = true;
38315
+ tooltipStore.currOpts = _objectSpread2(_objectSpread2({}, titlePrefix), {}, {
38316
+ content: null
38317
+ });
38318
+ Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
38319
+ var $tooltip = refTooltip.value;
38165
38320
 
38166
- if ($tooltip) {
38167
- $tooltip.open(evnt.currentTarget, content);
38168
- }
38321
+ if ($tooltip) {
38322
+ $tooltip.open(evnt.currentTarget, content);
38323
+ }
38324
+ });
38169
38325
  }
38170
38326
  },
38171
38327
 
@@ -38173,10 +38329,10 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
38173
38329
  * 触发表头 tooltip 事件
38174
38330
  */
38175
38331
  triggerHeaderTooltipEvent: function triggerHeaderTooltipEvent(evnt, params) {
38176
- var tooltipStore = internalData.tooltipStore;
38332
+ var tooltipStore = reactData.tooltipStore;
38177
38333
  var column = params.column;
38178
38334
  var titleElem = evnt.currentTarget;
38179
- handleTargetEnterEvent();
38335
+ handleTargetEnterEvent(true);
38180
38336
 
38181
38337
  if (tooltipStore.column !== column || !tooltipStore.visible) {
38182
38338
  handleTooltip(evnt, titleElem, titleElem, null, params);
@@ -38189,13 +38345,13 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
38189
38345
  triggerBodyTooltipEvent: function triggerBodyTooltipEvent(evnt, params) {
38190
38346
  var editConfig = props.editConfig;
38191
38347
  var editStore = reactData.editStore;
38192
- var tooltipStore = internalData.tooltipStore;
38348
+ var tooltipStore = reactData.tooltipStore;
38193
38349
  var editOpts = computeEditOpts.value;
38194
38350
  var actived = editStore.actived;
38195
38351
  var row = params.row,
38196
38352
  column = params.column;
38197
38353
  var cell = evnt.currentTarget;
38198
- handleTargetEnterEvent();
38354
+ handleTargetEnterEvent(tooltipStore.column !== column || tooltipStore.row !== row);
38199
38355
 
38200
38356
  if (isEnableConf(editConfig)) {
38201
38357
  if (editOpts.mode === 'row' && actived.row === row || actived.row === row && actived.column === column) {
@@ -38226,9 +38382,9 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
38226
38382
  */
38227
38383
  triggerFooterTooltipEvent: function triggerFooterTooltipEvent(evnt, params) {
38228
38384
  var column = params.column;
38229
- var tooltipStore = internalData.tooltipStore;
38385
+ var tooltipStore = reactData.tooltipStore;
38230
38386
  var cell = evnt.currentTarget;
38231
- handleTargetEnterEvent();
38387
+ handleTargetEnterEvent(tooltipStore.column !== column || tooltipStore.row);
38232
38388
 
38233
38389
  if (tooltipStore.column !== column || !tooltipStore.visible) {
38234
38390
  handleTooltip(evnt, cell, cell.querySelector('.vxe-cell--item') || cell.children[0], null, params);
@@ -38236,13 +38392,17 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
38236
38392
  },
38237
38393
  handleTargetLeaveEvent: function handleTargetLeaveEvent() {
38238
38394
  var tooltipOpts = computeTooltipOpts.value;
38239
- internalData.tooltipActive = false;
38395
+ var $tooltip = refTooltip.value;
38396
+
38397
+ if ($tooltip) {
38398
+ $tooltip.setActived(false);
38399
+ }
38240
38400
 
38241
38401
  if (tooltipOpts.enterable) {
38242
38402
  internalData.tooltipTimeout = setTimeout(function () {
38243
- var $tooltip = refTooltip.value;
38403
+ $tooltip = refTooltip.value;
38244
38404
 
38245
- if ($tooltip && !$tooltip.reactData.isHover) {
38405
+ if ($tooltip && !$tooltip.isActived()) {
38246
38406
  tableMethods.closeTooltip();
38247
38407
  }
38248
38408
  }, tooltipOpts.leaveDelay);
@@ -39140,18 +39300,28 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
39140
39300
  var radioOpts = computeRadioOpts.value;
39141
39301
  var checkboxOpts = computeCheckboxOpts.value;
39142
39302
  var expandOpts = computeExpandOpts.value;
39303
+ var rowOpts = computeRowOpts.value;
39143
39304
 
39144
39305
  if (true) {
39145
- if (!props.rowId && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
39146
- warnLog('vxe.error.reqProp', ['row-id']);
39306
+ // if (props.rowId) {
39307
+ // warnLog('vxe.error.delProp', ['rowId', 'row-config.keyField'])
39308
+ // }
39309
+ // if (props.rowKey) {
39310
+ // warnLog('vxe.error.delProp', ['rowId', 'row-config.useKey'])
39311
+ // }
39312
+ // if (props.columnKey) {
39313
+ // warnLog('vxe.error.delProp', ['rowId', 'column-config.useKey'])
39314
+ // }
39315
+ if (!(props.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
39316
+ warnLog('vxe.error.reqProp', ['row-config.keyField']);
39147
39317
  }
39148
39318
 
39149
39319
  if (props.editConfig && (editOpts.showStatus || editOpts.showUpdateStatus || editOpts.showInsertStatus) && !props.keepSource) {
39150
39320
  warnLog('vxe.error.reqProp', ['keep-source']);
39151
39321
  }
39152
39322
 
39153
- if (treeConfig && treeOpts.line && (!props.rowKey || !showOverflow)) {
39154
- warnLog('vxe.error.reqProp', ['row-key | show-overflow']);
39323
+ if (treeConfig && treeOpts.line && (!(props.rowKey || rowOpts.useKey) || !showOverflow)) {
39324
+ warnLog('vxe.error.reqProp', ['row-config.useKey | show-overflow']);
39155
39325
  }
39156
39326
 
39157
39327
  if (treeConfig && props.stripe) {
@@ -39184,7 +39354,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
39184
39354
  if (true) {
39185
39355
  var customOpts = computeCustomOpts.value;
39186
39356
  var mouseOpts = computeMouseOpts.value;
39187
- var rowOpts = computeRowOpts.value;
39357
+ var _rowOpts = computeRowOpts.value;
39188
39358
 
39189
39359
  if (!props.id && props.customConfig && (customOpts.storage === true || customOpts.storage && customOpts.storage.resizable || customOpts.storage && customOpts.storage.visible)) {
39190
39360
  errLog('vxe.error.reqProp', ['id']);
@@ -39194,7 +39364,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
39194
39364
  errLog('vxe.error.noTree', ['checkbox-config.range']);
39195
39365
  }
39196
39366
 
39197
- if (rowOpts.height && !props.showOverflow) {
39367
+ if (_rowOpts.height && !props.showOverflow) {
39198
39368
  warnLog('vxe.error.notProp', ['table.show-overflow']);
39199
39369
  }
39200
39370
 
@@ -39361,7 +39531,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
39361
39531
  filterStore = reactData.filterStore;
39362
39532
  var leftList = columnStore.leftList,
39363
39533
  rightList = columnStore.rightList;
39364
- var tooltipOpts = computeTooltipOpts.value;
39534
+ var tipConfig = computeTipConfig.value;
39365
39535
  var treeOpts = computeTreeOpts.value;
39366
39536
  var rowOpts = computeRowOpts.value;
39367
39537
  var columnOpts = computeColumnOpts.value;
@@ -39503,7 +39673,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
39503
39673
  */
39504
39674
  hasUseTooltip ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])('vxe-tooltip'), _objectSpread2({
39505
39675
  ref: refTooltip
39506
- }, tooltipOpts)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])()]);
39676
+ }, tipConfig)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])()]);
39507
39677
  };
39508
39678
 
39509
39679
  $xetable.renderVN = renderVN;
@@ -39522,10 +39692,10 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
39522
39692
 
39523
39693
  var Table = Object.assign(table, {
39524
39694
  install: function install(app) {
39525
- dynamicApp.component(table.name, table);
39526
39695
  app.component(table.name, table);
39527
39696
  }
39528
39697
  });
39698
+ dynamicApp.component(table.name, table);
39529
39699
  /* harmony default export */ var packages_table = (Table);
39530
39700
  // CONCATENATED MODULE: ./packages/locale/lang/zh-CN.ts
39531
39701
  /* harmony default export */ var zh_CN = ({
@@ -40097,5 +40267,4 @@ module.exports = global.Promise;
40097
40267
  /***/ })
40098
40268
 
40099
40269
  /******/ });
40100
- });
40101
- //# sourceMappingURL=index.umd.js.map
40270
+ });