vxe-table 3.16.0-beta.1 → 3.16.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 (73) hide show
  1. package/es/grid/src/grid.js +17 -5
  2. package/es/index.css +1 -1
  3. package/es/index.min.css +1 -1
  4. package/es/style.css +1 -1
  5. package/es/style.min.css +1 -1
  6. package/es/table/module/custom/mixin.js +0 -4
  7. package/es/table/module/custom/panel.js +0 -1
  8. package/es/table/src/anime.js +46 -0
  9. package/es/table/src/body.js +15 -40
  10. package/es/table/src/columnInfo.js +5 -0
  11. package/es/table/src/footer.js +1 -19
  12. package/es/table/src/header.js +1 -19
  13. package/es/table/src/methods.js +532 -346
  14. package/es/table/src/table.js +21 -2
  15. package/es/table/style.css +8 -8
  16. package/es/table/style.min.css +1 -1
  17. package/es/ui/index.js +2 -1
  18. package/es/ui/src/log.js +1 -1
  19. package/es/vxe-table/style.css +8 -8
  20. package/es/vxe-table/style.min.css +1 -1
  21. package/lib/grid/src/grid.js +22 -7
  22. package/lib/grid/src/grid.min.js +1 -1
  23. package/lib/index.css +1 -1
  24. package/lib/index.min.css +1 -1
  25. package/lib/index.umd.js +642 -436
  26. package/lib/index.umd.min.js +1 -1
  27. package/lib/style.css +1 -1
  28. package/lib/style.min.css +1 -1
  29. package/lib/table/module/custom/mixin.js +0 -4
  30. package/lib/table/module/custom/mixin.min.js +1 -1
  31. package/lib/table/module/custom/panel.js +0 -1
  32. package/lib/table/module/custom/panel.min.js +1 -1
  33. package/lib/table/src/anime.js +56 -0
  34. package/lib/table/src/anime.min.js +1 -0
  35. package/lib/table/src/body.js +3 -28
  36. package/lib/table/src/body.min.js +1 -1
  37. package/lib/table/src/columnInfo.js +5 -0
  38. package/lib/table/src/columnInfo.min.js +1 -1
  39. package/lib/table/src/footer.js +1 -19
  40. package/lib/table/src/footer.min.js +1 -1
  41. package/lib/table/src/header.js +1 -19
  42. package/lib/table/src/header.min.js +1 -1
  43. package/lib/table/src/methods.js +539 -355
  44. package/lib/table/src/methods.min.js +1 -1
  45. package/lib/table/src/table.js +21 -1
  46. package/lib/table/src/table.min.js +1 -1
  47. package/lib/table/style/style.css +8 -8
  48. package/lib/table/style/style.min.css +1 -1
  49. package/lib/ui/index.js +2 -1
  50. package/lib/ui/index.min.js +1 -1
  51. package/lib/ui/src/log.js +1 -1
  52. package/lib/ui/src/log.min.js +1 -1
  53. package/lib/vxe-table/style/style.css +8 -8
  54. package/lib/vxe-table/style/style.min.css +1 -1
  55. package/package.json +1 -1
  56. package/packages/grid/src/grid.ts +19 -6
  57. package/packages/table/module/custom/mixin.ts +0 -4
  58. package/packages/table/module/custom/panel.ts +0 -1
  59. package/packages/table/src/anime.ts +52 -0
  60. package/packages/table/src/body.ts +15 -40
  61. package/packages/table/src/columnInfo.ts +5 -0
  62. package/packages/table/src/footer.ts +1 -19
  63. package/packages/table/src/header.ts +1 -20
  64. package/packages/table/src/methods.ts +554 -360
  65. package/packages/table/src/table.ts +21 -2
  66. package/packages/ui/index.ts +1 -0
  67. package/styles/components/table.scss +9 -9
  68. /package/es/{iconfont.1750910486943.ttf → iconfont.1751194972120.ttf} +0 -0
  69. /package/es/{iconfont.1750910486943.woff → iconfont.1751194972120.woff} +0 -0
  70. /package/es/{iconfont.1750910486943.woff2 → iconfont.1751194972120.woff2} +0 -0
  71. /package/lib/{iconfont.1750910486943.ttf → iconfont.1751194972120.ttf} +0 -0
  72. /package/lib/{iconfont.1750910486943.woff → iconfont.1751194972120.woff} +0 -0
  73. /package/lib/{iconfont.1750910486943.woff2 → iconfont.1751194972120.woff2} +0 -0
package/es/grid/src/grid.js CHANGED
@@ -176,11 +176,12 @@ export default {
176
176
  const $xeGrid = this;
177
177
  const props = $xeGrid;
178
178
  const reactData = $xeGrid.reactData;
179
- const { seqConfig, pagerConfig, loading, editConfig, proxyConfig } = props;
180
- const { isZMax, tableLoading, tablePage } = reactData;
179
+ const { seqConfig, pagerConfig, editConfig, proxyConfig } = props;
180
+ const { isZMax, tablePage } = reactData;
181
181
  const tableExtendProps = $xeGrid.computeTableExtendProps;
182
182
  const proxyOpts = $xeGrid.computeProxyOpts;
183
183
  const pagerOpts = $xeGrid.computePagerOpts;
184
+ const isLoading = $xeGrid.computeIsLoading;
184
185
  const tProps = Object.assign({}, tableExtendProps);
185
186
  if (isZMax) {
186
187
  if (tableExtendProps.maxHeight) {
@@ -191,7 +192,7 @@ export default {
191
192
  }
192
193
  }
193
194
  if (proxyConfig && isEnableConf(proxyOpts)) {
194
- tProps.loading = loading || tableLoading;
195
+ tProps.loading = isLoading;
195
196
  if (pagerConfig && proxyOpts.seq && isEnableConf(pagerOpts)) {
196
197
  tProps.seqConfig = Object.assign({}, seqConfig, { startIndex: (tablePage.currentPage - 1) * tablePage.pageSize });
197
198
  }
@@ -249,6 +250,16 @@ export default {
249
250
  const $xeGrid = this;
250
251
  const pagerOpts = $xeGrid.computePagerOpts;
251
252
  return pagerOpts.total;
253
+ },
254
+ computeIsLoading() {
255
+ const $xeGrid = this;
256
+ const props = $xeGrid;
257
+ const reactData = $xeGrid.reactData;
258
+ const { loading, proxyConfig } = props;
259
+ const { tableLoading } = reactData;
260
+ const proxyOpts = $xeGrid.computeProxyOpts;
261
+ const { showLoading } = proxyOpts;
262
+ return loading || (tableLoading && showLoading && proxyConfig && isEnableConf(proxyOpts));
252
263
  } }),
253
264
  watch: {
254
265
  columns(value) {
@@ -577,7 +588,7 @@ export default {
577
588
  reactData.formData = formData;
578
589
  }
579
590
  if ($xeTable) {
580
- const { internalData: tableInternalData } = $xeTable;
591
+ const tableInternalData = $xeTable;
581
592
  const { tableFullColumn, fullColumnFieldData } = tableInternalData;
582
593
  const sortOpts = $xeTable.computeSortOpts;
583
594
  let defaultSort = sortOpts.defaultSort;
@@ -1418,6 +1429,7 @@ export default {
1418
1429
  const reactData = $xeGrid.reactData;
1419
1430
  const vSize = $xeGrid.computeSize;
1420
1431
  const styles = $xeGrid.computeStyles;
1432
+ const isLoading = $xeGrid.computeIsLoading;
1421
1433
  return h('div', {
1422
1434
  ref: 'refElem',
1423
1435
  class: ['vxe-grid', {
@@ -1425,7 +1437,7 @@ export default {
1425
1437
  'is--animat': !!props.animat,
1426
1438
  'is--round': props.round,
1427
1439
  'is--maximize': reactData.isZMax,
1428
- 'is--loading': props.loading || reactData.tableLoading
1440
+ 'is--loading': isLoading
1429
1441
  }],
1430
1442
  style: styles
1431
1443
  }, $xeGrid.renderLayout(h));