vxe-table 4.21.8 → 4.21.10

package/es/table/src/cell.js

@@ -5,7 +5,7 @@ import { getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/sr
 import { updateCellTitle } from '../../ui/src/dom';
 import { createColumn, getRowid } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
-const { getI18n, getIcon, renderer, renderEmptyElement } = VxeUI;
+const { getConfig, getI18n, getIcon, renderer, renderEmptyElement } = VxeUI;
 function renderTitlePrefixIcon(params) {
     const { $table, column } = params;
     const titlePrefix = column.titlePrefix || column.titleHelp;
@@ -280,9 +280,12 @@ function renderHeaderHandle(params) {
     const tableProps = $table.props;
     const { editConfig } = tableProps;
     const { type, filters, sortable, editRender, slots } = column;
-    const headerSlot = slots ? slots.header : null;
-    if (headerSlot) {
-        return renderTitleContent(params, $table.callSlot(headerSlot, params));
+    // 兼容已废弃方式
+    if (getConfig().tableHeadeSlotToTitleSlot !== 'obsolete') {
+        const headerSlot = slots ? slots.header : null;
+        if (headerSlot) {
+            return renderTitleContent(params, $table.callSlot(headerSlot, params));
+        }
     }
     switch (type) {
         case 'seq':
@@ -342,11 +345,18 @@ export const Cell = {
         const { $table, column } = params;
         const tableProps = $table.props;
         const { editConfig } = tableProps;
-        const { editRender, cellRender } = column;
+        const { slots, editRender, cellRender } = column;
         const isEnableEdit = editConfig && isEnableConf(editConfig);
         const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
         const cellRenderOpts = isEnableConf(cellRender) ? cellRender : null;
         const renderOpts = editRenderOpts || cellRenderOpts;
+        // 兼容已废弃方式
+        if (getConfig().tableHeadeSlotToTitleSlot === 'obsolete') {
+            const headerSlot = slots ? slots.header : null;
+            if (headerSlot) {
+                return renderTitleContent(params, $table.callSlot(headerSlot, params));
+            }
+        }
         if (renderOpts) {
             const compConf = renderer.get(renderOpts.name);
             if (compConf) {
@@ -615,6 +625,12 @@ export const Cell = {
      */
     renderSeqHeader(params) {
         const { $table, column } = params;
+        // 兼容已废弃方式
+        if (getConfig().tableHeadeSlotToTitleSlot === 'obsolete') {
+            const { slots } = column;
+            const headerSlot = slots ? slots.header : null;
+            return renderHeaderCellBaseVNs(params, renderTitleContent(params, headerSlot ? $table.callSlot(headerSlot, params) : $table.getHeaderCellLabel(column)));
+        }
         return renderHeaderCellBaseVNs(params, renderTitleContent(params, $table.getHeaderCellLabel(column)));
     },
     renderSeqCell(params) {
@@ -644,6 +660,17 @@ export const Cell = {
         const { $table, column } = params;
         const { slots } = column;
         const titleSlot = slots ? slots.title : null;
+        // 兼容已废弃方式
+        if (getConfig().tableHeadeSlotToTitleSlot === 'obsolete') {
+            const headerSlot = slots ? slots.header : null;
+            return renderHeaderCellBaseVNs(params, renderTitleContent(params, headerSlot
+                ? $table.callSlot(headerSlot, params)
+                : [
+                    h('span', {
+                        class: 'vxe-radio--label'
+                    }, titleSlot ? $table.callSlot(titleSlot, params) : $table.getHeaderCellLabel(column))
+                ]));
+        }
         return renderHeaderCellBaseVNs(params, renderTitleContent(params, [
             h('span', {
                 class: 'vxe-radio--label'
@@ -725,6 +752,13 @@ export const Cell = {
             };
         }
         const checkboxParams = Object.assign(Object.assign({}, params), { checked: isAllCheckboxSelected, disabled: isAllCheckboxDisabled, indeterminate: isAllCheckboxIndeterminate });
+        // 兼容已废弃方式
+        if (getConfig().tableHeadeSlotToTitleSlot === 'obsolete') {
+            const headerSlot = slots ? slots.header : null;
+            if (headerSlot) {
+                return renderHeaderCellBaseVNs(params, renderTitleContent(checkboxParams, $table.callSlot(headerSlot, checkboxParams)));
+            }
+        }
         if (checkStrictly ? !showHeader : showHeader === false) {
             return renderHeaderCellBaseVNs(params, renderTitleContent(checkboxParams, [
                 h('span', {

package/es/table/style.css

@@ -3997,7 +3997,7 @@
 .vxe-table--render-default .vxe-cell--wrapper {
   margin: auto 0;
 }
-.vxe-table--render-default .vxe-body--row .vxe-table--column .vxe-cell .vxe-cell--wrapper > .vxe-reusekeep-control {
+.vxe-table--render-default .vxe-body--row .vxe-table--column .vxe-cell .vxe-cell--wrapper > div > .vxe-reusekeep-control, .vxe-table--render-default .vxe-body--row .vxe-table--column .vxe-cell .vxe-cell--wrapper > span > .vxe-reusekeep-control, .vxe-table--render-default .vxe-body--row .vxe-table--column .vxe-cell .vxe-cell--wrapper > .vxe-reusekeep-control {
   position: absolute;
   width: 0;
   height: 0;
@@ -4006,7 +4006,6 @@
   padding: 0;
   outline: none;
 }
-
 /*valid error*/
 div.vxe-table--tooltip-wrapper.vxe-table--valid-error {
   padding: 0;