vxe-table 3.22.10 → 3.22.11

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 (25) hide show
  1. package/es/grid/src/grid.js +2 -2
  2. package/es/style.css +1 -1
  3. package/es/table/src/methods.js +16 -2
  4. package/es/ui/index.js +1 -1
  5. package/es/ui/src/log.js +1 -1
  6. package/lib/grid/src/grid.js +2 -2
  7. package/lib/grid/src/grid.min.js +1 -1
  8. package/lib/index.umd.js +6 -6
  9. package/lib/index.umd.min.js +1 -1
  10. package/lib/style.css +1 -1
  11. package/lib/table/src/methods.js +2 -2
  12. package/lib/table/src/methods.min.js +1 -1
  13. package/lib/ui/index.js +1 -1
  14. package/lib/ui/index.min.js +1 -1
  15. package/lib/ui/src/log.js +1 -1
  16. package/lib/ui/src/log.min.js +1 -1
  17. package/package.json +1 -1
  18. package/packages/grid/src/grid.ts +2 -2
  19. package/packages/table/src/methods.ts +16 -2
  20. /package/es/{iconfont.1785940479746.ttf → iconfont.1786329223308.ttf} +0 -0
  21. /package/es/{iconfont.1785940479746.woff → iconfont.1786329223308.woff} +0 -0
  22. /package/es/{iconfont.1785940479746.woff2 → iconfont.1786329223308.woff2} +0 -0
  23. /package/lib/{iconfont.1785940479746.ttf → iconfont.1786329223308.ttf} +0 -0
  24. /package/lib/{iconfont.1785940479746.woff → iconfont.1786329223308.woff} +0 -0
  25. /package/lib/{iconfont.1785940479746.woff2 → iconfont.1786329223308.woff2} +0 -0
package/es/grid/src/grid.js CHANGED
@@ -715,12 +715,13 @@ export default {
715
715
  else {
716
716
  let tableData = [];
717
717
  if (rest) {
718
+ const listProp = resConfigs.list;
719
+ const resultProp = resConfigs.result;
718
720
  const reParams = { data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: null };
719
721
  if (pagerConfig && isEnableConf(pagerOpts)) {
720
722
  const totalProp = resConfigs.total;
721
723
  const total = (XEUtils.isFunction(totalProp) ? totalProp(reParams) : XEUtils.get(rest, totalProp || 'page.total')) || 0;
722
724
  tablePage.total = XEUtils.toNumber(total);
723
- const resultProp = resConfigs.result;
724
725
  tableData = (XEUtils.isFunction(resultProp) ? resultProp(reParams) : XEUtils.get(rest, resultProp || 'result')) || [];
725
726
  // 检验当前页码，不能超出当前最大页数
726
727
  const pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);
@@ -729,7 +730,6 @@ export default {
729
730
  }
730
731
  }
731
732
  else {
732
- const listProp = resConfigs.list;
733
733
  if (XEUtils.isArray(rest)) {
734
734
  tableData = rest;
735
735
  }