vxe-table 3.4.4 → 3.4.5

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.
@@ -2923,6 +2923,16 @@ const Methods = {
2923
2923
  const { fullDataRowIdData, afterFullData, checkboxReserveRowMap, checkboxOpts, treeConfig, treeOpts } = this
2924
2924
  const reserveSelection = []
2925
2925
  if (checkboxOpts.reserve) {
2926
+ const afterFullIdMaps = {}
2927
+ if (treeConfig) {
2928
+ XEUtils.eachTree(afterFullData, row => {
2929
+ afterFullIdMaps[getRowid(this, row)] = 1
2930
+ }, treeOpts)
2931
+ } else {
2932
+ afterFullData.forEach(row => {
2933
+ afterFullIdMaps[getRowid(this, row)] = 1
2934
+ })
2935
+ }
2926
2936
  XEUtils.each(checkboxReserveRowMap, (oldRow, oldRowid) => {
2927
2937
  if (oldRow) {
2928
2938
  if (isFull) {
@@ -2930,14 +2940,8 @@ const Methods = {
2930
2940
  reserveSelection.push(oldRow)
2931
2941
  }
2932
2942
  } else {
2933
- if (treeConfig) {
2934
- if (!XEUtils.findTree(afterFullData, row => getRowid(this, row) === oldRowid, treeOpts)) {
2935
- reserveSelection.push(oldRow)
2936
- }
2937
- } else {
2938
- if (!afterFullData.some(row => getRowid(this, row) === oldRowid)) {
2939
- reserveSelection.push(oldRow)
2940
- }
2943
+ if (!afterFullIdMaps[oldRowid]) {
2944
+ reserveSelection.push(oldRow)
2941
2945
  }
2942
2946
  }
2943
2947
  }
@@ -11,6 +11,7 @@ export default {
11
11
  showHeader: true,
12
12
  animat: true,
13
13
  delayHover: 250,
14
+ autoResize: true,
14
15
  // keepSource: false,
15
16
  // showOverflow: null,
16
17
  // showHeaderOverflow: null,
@@ -18,7 +19,6 @@ export default {
18
19
  // resizeInterval: 500,
19
20
  // size: null,
20
21
  // zIndex: null,
21
- // autoResize: false,
22
22
  // stripe: false,
23
23
  // border: false,
24
24
  // round: false,
@@ -151,21 +151,21 @@ export default {
151
151
  const ruleProps = Object.keys(validRest)
152
152
  return this.$nextTick().then(() => {
153
153
  if (ruleProps.length) {
154
- return Promise.reject(validRest[ruleProps[0]][0])
154
+ return validRest[ruleProps[0]][0]
155
155
  }
156
156
  if (cb) {
157
157
  cb()
158
158
  }
159
159
  })
160
160
  }).catch(firstErrParams => {
161
- return new Promise((resolve, reject) => {
161
+ return new Promise((resolve) => {
162
162
  const finish = () => {
163
163
  this.$nextTick(() => {
164
164
  if (cb) {
165
165
  cb(validRest)
166
166
  resolve()
167
167
  } else {
168
- reject(validRest)
168
+ resolve(validRest)
169
169
  }
170
170
  })
171
171
  }
@@ -27,6 +27,8 @@ export interface RendererMapOptions {
27
27
  renderFilter?(h: CreateElement, renderOpts: ColumnFilterRenderOptions, params: ColumnFilterRenderParams): VNode[] | string[];
28
28
  filterMethod?(params: ColumnFilterMethodParams): boolean;
29
29
  filterResetMethod?(params: ColumnFilterResetParams): void;
30
+ // 默认行为
31
+ defaultFilterMethod?(params: ColumnFilterMethodParams): boolean;
30
32
 
31
33
  // 单元格渲染
32
34
  renderHeader?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): VNode[] | string[];
@@ -66,7 +68,7 @@ export class RenderOptions {
66
68
  /**
67
69
  * 渲染器名称
68
70
  */
69
- name: string;
71
+ name?: string;
70
72
  /**
71
73
  * 目标组件渲染的参数
72
74
  */