vxe-table 4.21.8 → 4.21.9

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/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.21.8";
+export const version = "4.21.9";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const tableVersion = `table v${"4.21.8"}`;
+const tableVersion = `table v${"4.21.9"}`;
 export function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';

package/lib/index.umd.js

@@ -3313,7 +3313,7 @@ function getDefaultConfig(val1, def1) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "4.21.8";
+const version = "4.21.9";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -4299,7 +4299,7 @@ function getPopupAppendElement(appendTo) {
 const {
   log: log_log
 } = core_.VxeUI;
-const tableVersion = `table v${"4.21.8"}`;
+const tableVersion = `table v${"4.21.9"}`;
 function createComponentLog(name) {
   const uiVersion = core_.VxeUI.uiVersion ? `ui v${core_.VxeUI.uiVersion}` : '';
   const ganttVersion = core_.VxeUI.ganttVersion ? `gantt v${core_.VxeUI.ganttVersion}` : '';
@@ -5795,6 +5795,7 @@ function getSlotVNs(vns) {
 
 
 const {
+  getConfig: cell_getConfig,
   getI18n: cell_getI18n,
   getIcon: cell_getIcon,
   renderer: cell_renderer,
@@ -6169,9 +6170,12 @@ function renderHeaderHandle(params) {
     editRender,
     slots
   } = column;
-  const headerSlot = slots ? slots.header : null;
-  if (headerSlot) {
-    return renderTitleContent(params, $table.callSlot(headerSlot, params));
+  // 兼容已废弃方式
+  if (cell_getConfig().tableHeadeSlotToTitleSlot !== 'obsolete') {
+    const headerSlot = slots ? slots.header : null;
+    if (headerSlot) {
+      return renderTitleContent(params, $table.callSlot(headerSlot, params));
+    }
   }
   switch (type) {
     case 'seq':
@@ -6234,6 +6238,7 @@ const Cell = {
       editConfig
     } = tableProps;
     const {
+      slots,
       editRender,
       cellRender
     } = column;
@@ -6241,6 +6246,13 @@ const Cell = {
     const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
     const cellRenderOpts = isEnableConf(cellRender) ? cellRender : null;
     const renderOpts = editRenderOpts || cellRenderOpts;
+    // 兼容已废弃方式
+    if (cell_getConfig().tableHeadeSlotToTitleSlot === 'obsolete') {
+      const headerSlot = slots ? slots.header : null;
+      if (headerSlot) {
+        return renderTitleContent(params, $table.callSlot(headerSlot, params));
+      }
+    }
     if (renderOpts) {
       const compConf = cell_renderer.get(renderOpts.name);
       if (compConf) {
@@ -6587,6 +6599,14 @@ const Cell = {
       $table,
       column
     } = params;
+    // 兼容已废弃方式
+    if (cell_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) {
@@ -6630,6 +6650,13 @@ const Cell = {
       slots
     } = column;
     const titleSlot = slots ? slots.title : null;
+    // 兼容已废弃方式
+    if (cell_getConfig().tableHeadeSlotToTitleSlot === 'obsolete') {
+      const headerSlot = slots ? slots.header : null;
+      return renderHeaderCellBaseVNs(params, renderTitleContent(params, headerSlot ? $table.callSlot(headerSlot, params) : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+        class: 'vxe-radio--label'
+      }, titleSlot ? $table.callSlot(titleSlot, params) : $table.getHeaderCellLabel(column))]));
+    }
     return renderHeaderCellBaseVNs(params, renderTitleContent(params, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
       class: 'vxe-radio--label'
     }, titleSlot ? $table.callSlot(titleSlot, params) : $table.getHeaderCellLabel(column))]));
@@ -6758,6 +6785,13 @@ const Cell = {
       disabled: isAllCheckboxDisabled,
       indeterminate: isAllCheckboxIndeterminate
     };
+    // 兼容已废弃方式
+    if (cell_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, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
         class: 'vxe-checkbox--label'