vxe-table 4.12.0-beta.13 → 4.12.0-beta.14

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.
package/lib/index.umd.js CHANGED
@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
3138
3138
  ;// ./packages/ui/index.ts
3139
3139
 
3140
3140
 
3141
- const version = "4.12.0-beta.13";
3141
+ const version = "4.12.0-beta.14";
3142
3142
  core_.VxeUI.version = version;
3143
3143
  core_.VxeUI.tableVersion = version;
3144
3144
  core_.VxeUI.setConfig({
@@ -3586,7 +3586,7 @@ var esnext_iterator_some = __webpack_require__(7550);
3586
3586
  const {
3587
3587
  log: log_log
3588
3588
  } = core_.VxeUI;
3589
- const log_version = `table v${"4.12.0-beta.13"}`;
3589
+ const log_version = `table v${"4.12.0-beta.14"}`;
3590
3590
  const warnLog = log_log.create('warn', log_version);
3591
3591
  const errLog = log_log.create('error', log_version);
3592
3592
  ;// ./packages/table/src/columnInfo.ts
@@ -5371,7 +5371,12 @@ const Cell = {
5371
5371
  const headerSlot = slots ? slots.header : null;
5372
5372
  const titleSlot = slots ? slots.title : null;
5373
5373
  const checkboxOpts = computeCheckboxOpts.value;
5374
- const headerTitle = column.getTitle();
5374
+ const {
5375
+ checkStrictly,
5376
+ showHeader,
5377
+ headerTitle
5378
+ } = checkboxOpts;
5379
+ const colTitle = column.getTitle();
5375
5380
  const ons = {};
5376
5381
  if (!isHidden) {
5377
5382
  ons.onClick = evnt => {
@@ -5389,10 +5394,10 @@ const Cell = {
5389
5394
  if (headerSlot) {
5390
5395
  return renderHeaderCellBaseVNs(params, renderTitleContent(checkboxParams, $table.callSlot(headerSlot, checkboxParams)));
5391
5396
  }
5392
- if (checkboxOpts.checkStrictly ? !checkboxOpts.showHeader : checkboxOpts.showHeader === false) {
5397
+ if (checkStrictly ? !showHeader : showHeader === false) {
5393
5398
  return renderHeaderCellBaseVNs(params, renderTitleContent(checkboxParams, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
5394
5399
  class: 'vxe-checkbox--label'
5395
- }, titleSlot ? $table.callSlot(titleSlot, checkboxParams) : headerTitle)]));
5400
+ }, titleSlot ? $table.callSlot(titleSlot, checkboxParams) : colTitle)]));
5396
5401
  }
5397
5402
  return renderHeaderCellBaseVNs(params, renderTitleContent(checkboxParams, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
5398
5403
  class: ['vxe-cell--checkbox', {
@@ -5400,13 +5405,13 @@ const Cell = {
5400
5405
  'is--disabled': isAllCheckboxDisabled,
5401
5406
  'is--indeterminate': isAllCheckboxIndeterminate
5402
5407
  }],
5403
- title: cell_getI18n('vxe.table.allTitle'),
5408
+ title: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(headerTitle) ? cell_getI18n('vxe.table.allTitle') : `${headerTitle || ''}`,
5404
5409
  ...ons
5405
5410
  }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
5406
5411
  class: ['vxe-checkbox--icon', isAllCheckboxIndeterminate ? cell_getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllCheckboxSelected ? cell_getIcon().TABLE_CHECKBOX_CHECKED : cell_getIcon().TABLE_CHECKBOX_UNCHECKED]
5407
- })].concat(titleSlot || headerTitle ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
5412
+ })].concat(titleSlot || colTitle ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
5408
5413
  class: 'vxe-checkbox--label'
5409
- }, titleSlot ? $table.callSlot(titleSlot, checkboxParams) : headerTitle)] : []))]));
5414
+ }, titleSlot ? $table.callSlot(titleSlot, checkboxParams) : colTitle)] : []))]));
5410
5415
  },
5411
5416
  renderCheckboxCell(params) {
5412
5417
  const {