vxe-table 3.18.19 → 3.18.20

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 (15) hide show
  1. package/es/style.css +1 -1
  2. package/es/table/src/cell.js +7 -3
  3. package/lib/index.umd.js +9 -3
  4. package/lib/index.umd.min.js +1 -1
  5. package/lib/style.css +1 -1
  6. package/lib/table/src/cell.js +9 -3
  7. package/lib/table/src/cell.min.js +1 -1
  8. package/package.json +2 -2
  9. package/packages/table/src/cell.ts +7 -3
  10. /package/es/{iconfont.1758609487377.ttf → iconfont.1758850648674.ttf} +0 -0
  11. /package/es/{iconfont.1758609487377.woff → iconfont.1758850648674.woff} +0 -0
  12. /package/es/{iconfont.1758609487377.woff2 → iconfont.1758850648674.woff2} +0 -0
  13. /package/lib/{iconfont.1758609487377.ttf → iconfont.1758850648674.ttf} +0 -0
  14. /package/lib/{iconfont.1758609487377.woff → iconfont.1758850648674.woff} +0 -0
  15. /package/lib/{iconfont.1758609487377.woff2 → iconfont.1758850648674.woff2} +0 -0
package/es/table/src/cell.js CHANGED
@@ -281,7 +281,7 @@ function renderCellHandle(h, params) {
281
281
  case 'html':
282
282
  return isDeepCell ? Cell.renderDeepHTMLCell(h, params) : Cell.renderHTMLCell(h, params);
283
283
  }
284
- if (isEnableConf(editConfig) && editRender) {
284
+ if (editConfig && isEnableConf(editOpts) && editRender) {
285
285
  return editOpts.mode === 'cell' ? (isDeepCell ? Cell.renderDeepCellEdit(h, params) : Cell.renderCellEdit(h, params)) : (isDeepCell ? Cell.renderDeepRowEdit(h, params) : Cell.renderRowEdit(h, params));
286
286
  }
287
287
  return isDeepCell ? Cell.renderDeepCell(h, params) : Cell.renderDefaultCell(h, params);
@@ -290,6 +290,7 @@ function renderHeaderHandle(h, params) {
290
290
  const { column, $table } = params;
291
291
  const tableProps = $table;
292
292
  const { editConfig } = tableProps;
293
+ const editOpts = $table.computeEditOpts;
293
294
  const { type, filters, sortable, editRender } = column;
294
295
  switch (type) {
295
296
  case 'seq':
@@ -310,7 +311,7 @@ function renderHeaderHandle(h, params) {
310
311
  }
311
312
  break;
312
313
  }
313
- if (editConfig && editRender) {
314
+ if (editConfig && isEnableConf(editOpts) && editRender) {
314
315
  return Cell.renderEditHeader(h, params);
315
316
  }
316
317
  else if (filters && sortable) {
@@ -364,11 +365,14 @@ export const Cell = {
364
365
  },
365
366
  renderDefaultCell(h, params) {
366
367
  const { $table, row, column } = params;
368
+ const tableProps = $table;
367
369
  const tableReactData = $table;
368
370
  const tableInternalData = $table;
369
371
  const { isRowGroupStatus } = tableReactData;
372
+ const { editConfig } = tableProps;
373
+ const editOpts = $table.computeEditOpts;
370
374
  const { field, slots, editRender, cellRender, rowGroupNode, aggFunc } = column;
371
- const renderOpts = editRender || cellRender;
375
+ const renderOpts = editConfig && isEnableConf(editOpts) && editRender ? editRender : cellRender;
372
376
  const defaultSlot = slots ? slots.default : null;
373
377
  const gcSlot = slots ? (slots.groupContent || slots['group-content']) : null;
374
378
  let cellValue = '';
package/lib/index.umd.js CHANGED
@@ -4103,7 +4103,7 @@ function renderCellHandle(h, params) {
4103
4103
  case 'html':
4104
4104
  return isDeepCell ? Cell.renderDeepHTMLCell(h, params) : Cell.renderHTMLCell(h, params);
4105
4105
  }
4106
- if (isEnableConf(editConfig) && editRender) {
4106
+ if (editConfig && isEnableConf(editOpts) && editRender) {
4107
4107
  return editOpts.mode === 'cell' ? isDeepCell ? Cell.renderDeepCellEdit(h, params) : Cell.renderCellEdit(h, params) : isDeepCell ? Cell.renderDeepRowEdit(h, params) : Cell.renderRowEdit(h, params);
4108
4108
  }
4109
4109
  return isDeepCell ? Cell.renderDeepCell(h, params) : Cell.renderDefaultCell(h, params);
@@ -4117,6 +4117,7 @@ function renderHeaderHandle(h, params) {
4117
4117
  const {
4118
4118
  editConfig
4119
4119
  } = tableProps;
4120
+ const editOpts = $table.computeEditOpts;
4120
4121
  const {
4121
4122
  type,
4122
4123
  filters,
@@ -4140,7 +4141,7 @@ function renderHeaderHandle(h, params) {
4140
4141
  }
4141
4142
  break;
4142
4143
  }
4143
- if (editConfig && editRender) {
4144
+ if (editConfig && isEnableConf(editOpts) && editRender) {
4144
4145
  return Cell.renderEditHeader(h, params);
4145
4146
  } else if (filters && sortable) {
4146
4147
  return Cell.renderSortAndFilterHeader(h, params);
@@ -4204,11 +4205,16 @@ const Cell = {
4204
4205
  row,
4205
4206
  column
4206
4207
  } = params;
4208
+ const tableProps = $table;
4207
4209
  const tableReactData = $table;
4208
4210
  const tableInternalData = $table;
4209
4211
  const {
4210
4212
  isRowGroupStatus
4211
4213
  } = tableReactData;
4214
+ const {
4215
+ editConfig
4216
+ } = tableProps;
4217
+ const editOpts = $table.computeEditOpts;
4212
4218
  const {
4213
4219
  field,
4214
4220
  slots,
@@ -4217,7 +4223,7 @@ const Cell = {
4217
4223
  rowGroupNode,
4218
4224
  aggFunc
4219
4225
  } = column;
4220
- const renderOpts = editRender || cellRender;
4226
+ const renderOpts = editConfig && isEnableConf(editOpts) && editRender ? editRender : cellRender;
4221
4227
  const defaultSlot = slots ? slots.default : null;
4222
4228
  const gcSlot = slots ? slots.groupContent || slots['group-content'] : null;
4223
4229
  let cellValue = '';