vxe-table 3.24.3 → 3.24.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 (29) hide show
  1. package/es/grid/src/grid.js +11 -5
  2. package/es/style.css +1 -1
  3. package/es/table/src/methods.js +1 -1
  4. package/es/table/src/table.js +1 -1
  5. package/es/ui/index.js +1 -1
  6. package/es/ui/src/log.js +1 -1
  7. package/lib/grid/src/grid.js +14 -5
  8. package/lib/grid/src/grid.min.js +1 -1
  9. package/lib/index.umd.js +5081 -5072
  10. package/lib/index.umd.min.js +1 -1
  11. package/lib/style.css +1 -1
  12. package/lib/table/src/methods.js +1 -1
  13. package/lib/table/src/methods.min.js +1 -1
  14. package/lib/table/src/table.js +1 -1
  15. package/lib/table/src/table.min.js +1 -1
  16. package/lib/ui/index.js +1 -1
  17. package/lib/ui/index.min.js +1 -1
  18. package/lib/ui/src/log.js +1 -1
  19. package/lib/ui/src/log.min.js +1 -1
  20. package/package.json +2 -2
  21. package/packages/grid/src/grid.ts +12 -5
  22. package/packages/table/src/methods.ts +1 -1
  23. package/packages/table/src/table.ts +1 -1
  24. /package/es/{iconfont.1790757586395.ttf → iconfont.1791617048832.ttf} +0 -0
  25. /package/es/{iconfont.1790757586395.woff → iconfont.1791617048832.woff} +0 -0
  26. /package/es/{iconfont.1790757586395.woff2 → iconfont.1791617048832.woff2} +0 -0
  27. /package/lib/{iconfont.1790757586395.ttf → iconfont.1791617048832.ttf} +0 -0
  28. /package/lib/{iconfont.1790757586395.woff → iconfont.1791617048832.woff} +0 -0
  29. /package/lib/{iconfont.1790757586395.woff2 → iconfont.1791617048832.woff2} +0 -0
package/es/grid/src/grid.js CHANGED
@@ -6,8 +6,8 @@ import { VxeUI } from '../../ui';
6
6
  import { getSlotVNs } from '../../ui/src/vn';
7
7
  import { createComponentLog } from '../../ui/src/log';
8
8
  import { tableProps } from '../../table/src/props';
9
- import VxeTableComponent from '../../table/src/table';
10
- import VxeToolbarComponent from '../../toolbar/src/toolbar';
9
+ import VxeTableComponent from '../../table';
10
+ import VxeToolbarComponent from '../../toolbar';
11
11
  const { warnLog, errLog } = createComponentLog('grid');
12
12
  const { getConfig, getI18n, commands, globalEvents, globalMixins, createEvent, GLOBAL_EVENT_KEYS, renderEmptyElement } = VxeUI;
13
13
  const tableMethods = {};
@@ -123,6 +123,11 @@ export default {
123
123
  const props = $xeGrid;
124
124
  return Object.assign({}, getConfig().grid.pagerConfig, props.pagerConfig);
125
125
  },
126
+ computePagerProps() {
127
+ const $xeGrid = this;
128
+ const pagerOpts = $xeGrid.computePagerOpts;
129
+ return Object.assign({}, pagerOpts, { enabled: undefined, slots: undefined });
130
+ },
126
131
  formOpts() {
127
132
  const $xeGrid = this;
128
133
  return $xeGrid.computeFormOpts;
@@ -1142,7 +1147,7 @@ export default {
1142
1147
  if ($form) {
1143
1148
  return $form.validate();
1144
1149
  }
1145
- return $xeGrid.$nextTick();
1150
+ return Promise.resolve();
1146
1151
  },
1147
1152
  validateFormField(field) {
1148
1153
  const $xeGrid = this;
@@ -1150,7 +1155,7 @@ export default {
1150
1155
  if ($form) {
1151
1156
  return $form.validateField(field);
1152
1157
  }
1153
- return $xeGrid.$nextTick();
1158
+ return Promise.resolve();
1154
1159
  },
1155
1160
  clearFormValidate(field) {
1156
1161
  const $xeGrid = this;
@@ -1749,6 +1754,7 @@ export default {
1749
1754
  const { proxyConfig, pagerConfig } = props;
1750
1755
  const proxyOpts = $xeGrid.computeProxyOpts;
1751
1756
  const pagerOpts = $xeGrid.computePagerOpts;
1757
+ const pagerProps = $xeGrid.computePagerProps;
1752
1758
  const pagerSlot = slots.pager;
1753
1759
  if ((pagerConfig && isEnableConf(pagerOpts)) || slots.pager) {
1754
1760
  return h('div', {
@@ -1761,7 +1767,7 @@ export default {
1761
1767
  VxeUIPagerComponent
1762
1768
  ? h(VxeUIPagerComponent, {
1763
1769
  ref: 'refPager',
1764
- props: Object.assign(Object.assign({}, pagerOpts), (proxyConfig && isEnableConf(proxyOpts) ? reactData.tablePage : {})),
1770
+ props: Object.assign(Object.assign({}, pagerProps), (proxyConfig && isEnableConf(proxyOpts) ? reactData.tablePage : {})),
1765
1771
  on: {
1766
1772
  'page-change': $xeGrid.pageChangeEvent
1767
1773
  },