vxe-table 4.22.3 → 4.22.4

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 +72 -67
  2. package/dist/style.css +1 -1
  3. package/es/grid/src/grid.js +10 -5
  4. package/es/style.css +1 -1
  5. package/es/table/src/table.js +1 -1
  6. package/es/ui/index.js +1 -1
  7. package/es/ui/src/log.js +1 -1
  8. package/lib/grid/src/grid.js +13 -5
  9. package/lib/grid/src/grid.min.js +1 -1
  10. package/lib/index.umd.js +102 -94
  11. package/lib/index.umd.min.js +1 -1
  12. package/lib/style.css +1 -1
  13. package/lib/table/src/table.js +1 -1
  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 +2 -2
  20. package/packages/grid/src/grid.ts +11 -5
  21. package/packages/table/src/table.ts +1 -1
  22. /package/es/{iconfont.1790757600308.ttf → iconfont.1791617063720.ttf} +0 -0
  23. /package/es/{iconfont.1790757600308.woff → iconfont.1791617063720.woff} +0 -0
  24. /package/es/{iconfont.1790757600308.woff2 → iconfont.1791617063720.woff2} +0 -0
  25. /package/lib/{iconfont.1790757600308.ttf → iconfont.1791617063720.ttf} +0 -0
  26. /package/lib/{iconfont.1790757600308.woff → iconfont.1791617063720.woff} +0 -0
  27. /package/lib/{iconfont.1790757600308.woff2 → iconfont.1791617063720.woff2} +0 -0
package/es/grid/src/grid.js CHANGED
@@ -10,8 +10,8 @@ import { getSlotVNs } from '../../ui/src/vn';
10
10
  import { createComponentLog } from '../../ui/src/log';
11
11
  import { tableEmits } from '../../table/src/emits';
12
12
  import { tableProps } from '../../table/src/props';
13
- import VxeTableComponent from '../../table/src/table';
14
- import VxeToolbarComponent from '../../toolbar/src/toolbar';
13
+ import VxeTableComponent from '../../table';
14
+ import VxeToolbarComponent from '../../toolbar';
15
15
  const { warnLog, errLog } = createComponentLog('grid');
16
16
  const { getConfig, getI18n, commands, hooks, useFns, createEvent, globalEvents, GLOBAL_EVENT_KEYS, renderEmptyElement } = VxeUI;
17
17
  const tableComponentPropKeys = Object.keys(tableProps);
@@ -100,6 +100,10 @@ export default defineVxeComponent({
100
100
  const computePagerOpts = computed(() => {
101
101
  return Object.assign({}, getConfig().grid.pagerConfig, props.pagerConfig);
102
102
  });
103
+ const computePagerProps = computed(() => {
104
+ const pagerOpts = computePagerOpts.value;
105
+ return Object.assign({}, pagerOpts, { enabled: undefined, slots: undefined });
106
+ });
103
107
  const computeFormOpts = computed(() => {
104
108
  return Object.assign({}, getConfig().grid.formConfig, props.formConfig);
105
109
  });
@@ -723,6 +727,7 @@ export default defineVxeComponent({
723
727
  const { proxyConfig, pagerConfig } = props;
724
728
  const proxyOpts = computeProxyOpts.value;
725
729
  const pagerOpts = computePagerOpts.value;
730
+ const pagerProps = computePagerProps.value;
726
731
  const pagerSlot = slots.pager;
727
732
  if ((pagerConfig && isEnableConf(pagerOpts)) || slots.pager) {
728
733
  return h('div', {
@@ -733,7 +738,7 @@ export default defineVxeComponent({
733
738
  ? pagerSlot({ $grid: $xeGrid, $gantt: null })
734
739
  : [
735
740
  VxeUIPagerComponent
736
- ? h(VxeUIPagerComponent, Object.assign(Object.assign(Object.assign({ ref: refPager }, pagerOpts), (proxyConfig && isEnableConf(proxyOpts) ? reactData.tablePage : {})), { onPageChange: pageChangeEvent }), getConfigSlot(pagerOpts.slots))
741
+ ? h(VxeUIPagerComponent, Object.assign(Object.assign(Object.assign({ ref: refPager }, pagerProps), (proxyConfig && isEnableConf(proxyOpts) ? reactData.tablePage : {})), { onPageChange: pageChangeEvent }), getConfigSlot(pagerOpts.slots))
737
742
  : renderEmptyElement($xeGrid)
738
743
  ]);
739
744
  }
@@ -1485,14 +1490,14 @@ export default defineVxeComponent({
1485
1490
  if ($form) {
1486
1491
  return $form.validate();
1487
1492
  }
1488
- return nextTick();
1493
+ return Promise.resolve();
1489
1494
  },
1490
1495
  validateFormField(field) {
1491
1496
  const $form = refForm.value;
1492
1497
  if ($form) {
1493
1498
  return $form.validateField(field);
1494
1499
  }
1495
- return nextTick();
1500
+ return Promise.resolve();
1496
1501
  },
1497
1502
  clearFormValidate(field) {
1498
1503
  const $form = refForm.value;