vxe-table 4.20.10 → 4.20.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 (27) hide show
  1. package/dist/all.esm.js +20 -6
  2. package/dist/style.css +1 -1
  3. package/es/grid/src/grid.js +2 -2
  4. package/es/style.css +1 -1
  5. package/es/table/src/table.js +16 -2
  6. package/es/ui/index.js +1 -1
  7. package/es/ui/src/log.js +1 -1
  8. package/lib/grid/src/grid.js +2 -2
  9. package/lib/grid/src/grid.min.js +1 -1
  10. package/lib/index.umd.js +6 -6
  11. package/lib/index.umd.min.js +1 -1
  12. package/lib/style.css +1 -1
  13. package/lib/table/src/table.js +2 -2
  14. package/lib/table/src/table.min.js +1 -1
  15. package/lib/ui/index.js +1 -1
  16. package/lib/ui/index.min.js +1 -1
  17. package/lib/ui/src/log.js +1 -1
  18. package/lib/ui/src/log.min.js +1 -1
  19. package/package.json +1 -1
  20. package/packages/grid/src/grid.ts +2 -2
  21. package/packages/table/src/table.ts +16 -2
  22. /package/es/{iconfont.1785940490728.ttf → iconfont.1786329229929.ttf} +0 -0
  23. /package/es/{iconfont.1785940490728.woff → iconfont.1786329229929.woff} +0 -0
  24. /package/es/{iconfont.1785940490728.woff2 → iconfont.1786329229929.woff2} +0 -0
  25. /package/lib/{iconfont.1785940490728.ttf → iconfont.1786329229929.ttf} +0 -0
  26. /package/lib/{iconfont.1785940490728.woff → iconfont.1786329229929.woff} +0 -0
  27. /package/lib/{iconfont.1785940490728.woff2 → iconfont.1786329229929.woff2} +0 -0
package/es/grid/src/grid.js CHANGED
@@ -1054,12 +1054,13 @@ export default defineVxeComponent({
1054
1054
  else {
1055
1055
  let tableData = [];
1056
1056
  if (rest) {
1057
+ const listProp = resConfigs.list;
1058
+ const resultProp = resConfigs.result;
1057
1059
  const reParams = { data: rest, $table: $xeTable, $grid: $xeGrid, $gantt: null };
1058
1060
  if (pagerConfig && isEnableConf(pagerOpts)) {
1059
1061
  const totalProp = resConfigs.total;
1060
1062
  const total = (XEUtils.isFunction(totalProp) ? totalProp(reParams) : XEUtils.get(rest, totalProp || 'page.total')) || 0;
1061
1063
  tablePage.total = XEUtils.toNumber(total);
1062
- const resultProp = resConfigs.result;
1063
1064
  tableData = (XEUtils.isFunction(resultProp) ? resultProp(reParams) : XEUtils.get(rest, resultProp || 'result')) || [];
1064
1065
  // 检验当前页码，不能超出当前最大页数
1065
1066
  const pageCount = Math.max(Math.ceil(total / tablePage.pageSize), 1);
@@ -1068,7 +1069,6 @@ export default defineVxeComponent({
1068
1069
  }
1069
1070
  }
1070
1071
  else {
1071
- const listProp = resConfigs.list;
1072
1072
  if (XEUtils.isArray(rest)) {
1073
1073
  tableData = rest;
1074
1074
  }