vxe-table 3.13.8 → 3.13.10

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.
@@ -14,12 +14,15 @@ export default {
14
14
  }
15
15
  },
16
16
  render(h) {
17
+ const $panel = this;
17
18
  const $xeTable = this.$parent;
19
+ const tableInternalData = $xeTable;
18
20
  const { filterStore } = this;
19
- const { args, visible, multiple, column } = filterStore;
21
+ const { visible, multiple, column } = filterStore;
20
22
  const filterRender = column ? column.filterRender : null;
21
23
  const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null;
22
24
  const filterClassName = compConf ? (compConf.tableFilterClassName || compConf.filterClassName) : '';
25
+ const params = Object.assign({}, tableInternalData._currFilterParams, { $panel, $table: $xeTable });
23
26
  const filterOpts = $xeTable.computeFilterOpts;
24
27
  const { destroyOnClose } = filterOpts;
25
28
  return h('div', {
@@ -27,7 +30,7 @@ export default {
27
30
  'vxe-table--filter-wrapper',
28
31
  'filter--prevent-default',
29
32
  compConf && compConf.className ? compConf.className : '',
30
- getClass(filterClassName, Object.assign({ $panel: this, $table: $xeTable }, args)),
33
+ getClass(filterClassName, params),
31
34
  {
32
35
  'is--animat': $xeTable.animat,
33
36
  'is--multiple': multiple,
@@ -39,22 +42,27 @@ export default {
39
42
  },
40
43
  methods: {
41
44
  renderOptions(h, filterRender, compConf) {
42
- const { $parent: $xetable, filterStore } = this;
43
- const { args, column, multiple, maxHeight } = filterStore;
45
+ const $panel = this;
46
+ const $xeTable = this.$parent;
47
+ const tableInternalData = $xeTable;
48
+ const { filterStore } = this;
49
+ const { column, multiple, maxHeight } = filterStore;
44
50
  const slots = column ? column.slots : null;
51
+ const filterSlot = slots ? slots.filter : null;
52
+ const params = Object.assign({}, tableInternalData._currFilterParams, { $panel, $table: $xeTable });
45
53
  const rtFilter = compConf ? (compConf.renderTableFilter || compConf.renderFilter) : null;
46
- if (slots && slots.filter) {
54
+ if (filterSlot) {
47
55
  return [
48
56
  h('div', {
49
57
  class: 'vxe-table--filter-template'
50
- }, $xetable.callSlot(slots.filter, Object.assign({ $panel: this, context: this }, args), h))
58
+ }, $xeTable.callSlot(filterSlot, params, h))
51
59
  ];
52
60
  }
53
61
  else if (rtFilter) {
54
62
  return [
55
63
  h('div', {
56
64
  class: 'vxe-table--filter-template'
57
- }, getSlotVNs(rtFilter.call($xetable, h, filterRender, Object.assign({ $panel: this, context: this }, args))))
65
+ }, getSlotVNs(rtFilter.call($xeTable, h, filterRender, params)))
58
66
  ];
59
67
  }
60
68
  const isAllChecked = multiple ? filterStore.isAllSelected : !filterStore.options.some((item) => item._checked);
@@ -125,9 +133,10 @@ export default {
125
133
  ];
126
134
  },
127
135
  renderFooter(h) {
128
- const { $parent: $xetable, hasCheckOption, filterStore } = this;
129
- const { filterOpts } = $xetable;
136
+ const $xeTable = this.$parent;
137
+ const { hasCheckOption, filterStore } = this;
130
138
  const { column, multiple } = filterStore;
139
+ const filterOpts = $xeTable.computeFilterOpts;
131
140
  const filterRender = column.filterRender;
132
141
  const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null;
133
142
  const isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate;
package/es/ui/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { VxeUI } from '@vxe-ui/core';
2
2
  import { getFuncText } from './src/utils';
3
- export const version = "3.13.8";
3
+ export const version = "3.13.10";
4
4
  VxeUI.version = version;
5
5
  VxeUI.tableVersion = version;
6
6
  VxeUI.setConfig({
package/es/ui/src/log.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { VxeUI } from '@vxe-ui/core';
2
2
  const { log } = VxeUI;
3
- const version = `table v${"3.13.8"}`;
3
+ const version = `table v${"3.13.10"}`;
4
4
  export const warnLog = log.create('warn', version);
5
5
  export const errLog = log.create('error', version);