vxe-table 3.23.7 → 3.23.9

package/es/table/src/cell.js

@@ -4,7 +4,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(h, params) {
     const { $table, column } = params;
     const titlePrefix = column.titlePrefix || column.titleHelp;
@@ -284,9 +284,12 @@ function renderHeaderHandle(h, params) {
     const tableProps = $table;
     const { editConfig } = tableProps;
     const { type, filters, sortable, editRender, slots } = column;
-    const headerSlot = slots ? slots.header : null;
-    if (headerSlot) {
-        return renderTitleContent(h, params, $table.callSlot(headerSlot, params, h));
+    // 兼容已废弃方式
+    if (getConfig().tableHeadeSlotToTitleSlot !== 'obsolete') {
+        const headerSlot = slots ? slots.header : null;
+        if (headerSlot) {
+            return renderTitleContent(h, params, $table.callSlot(headerSlot, params, h));
+        }
     }
     switch (type) {
         case 'seq':
@@ -346,11 +349,18 @@ export const Cell = {
         const { $table, column } = params;
         const tableProps = $table;
         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(h, params, $table.callSlot(headerSlot, params, h));
+            }
+        }
         if (renderOpts) {
             const compConf = renderer.get(renderOpts.name);
             const rtHeader = compConf ? (compConf.renderTableHeader || compConf.renderHeader) : null;
@@ -620,6 +630,12 @@ export const Cell = {
      */
     renderSeqHeader(h, params) {
         const { $table, column } = params;
+        // 兼容已废弃方式
+        if (getConfig().tableHeadeSlotToTitleSlot === 'obsolete') {
+            const { slots } = column;
+            const headerSlot = slots ? slots.header : null;
+            return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, params, headerSlot ? $table.callSlot(headerSlot, params, h) : $table.getHeaderCellLabel(column)));
+        }
         return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, params, $table.getHeaderCellLabel(column)));
     },
     renderSeqCell(h, params) {
@@ -647,6 +663,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(h, params, renderTitleContent(h, params, headerSlot
+                ? $table.callSlot(headerSlot, params, h)
+                : [
+                    h('span', {
+                        class: 'vxe-radio--label'
+                    }, titleSlot ? $table.callSlot(titleSlot, params, h) : $table.getHeaderCellLabel(column))
+                ]));
+        }
         return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, params, [
             h('span', {
                 class: 'vxe-radio--label'
@@ -729,6 +756,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(h, params, renderTitleContent(h, checkboxParams, $table.callSlot(headerSlot, checkboxParams, h)));
+            }
+        }
         if (checkStrictly ? !showHeader : showHeader === false) {
             return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, [
                 h('span', {

package/es/table/src/table.js

@@ -1730,6 +1730,9 @@ export default {
             if (mouseOpts.area && areaOpts.selectCellByHeader && columnOpts.drag && columnDragOpts.trigger === 'cell') {
                 errLog('vxe.error.notSupportProp', ['area-config.selectCellByHeader & column-config.drag', 'column-drag-config.trigger=cell', 'column-drag-config.trigger=default | area-config.selectCellByHeader=false']);
             }
+            if (mouseOpts.area && props.spanMethod) {
+                warnLog('vxe.error.notSupportProp', ['mouse-config.area', 'span-method', 'merge-cells']);
+            }
         }
         if (!$xeTable.handlePivotTableAggData) {
             if (customOpts.allowGroup) {

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.23.7";
+export const version = "3.23.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${"3.23.7"}`;
+const tableVersion = `table v${"3.23.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

@@ -3314,7 +3314,7 @@ function getDefaultConfig(val1, def1) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "3.23.7";
+const version = "3.23.9";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -4276,7 +4276,7 @@ function getPopupAppendElement(appendTo) {
 const {
   log: log_log
 } = core_.VxeUI;
-const tableVersion = `table v${"3.23.7"}`;
+const tableVersion = `table v${"3.23.9"}`;
 function createComponentLog(name) {
   const uiVersion = core_.VxeUI.uiVersion ? `ui v${core_.VxeUI.uiVersion}` : '';
   const ganttVersion = core_.VxeUI.ganttVersion ? `gantt v${core_.VxeUI.ganttVersion}` : '';
@@ -5755,6 +5755,7 @@ function getSlotVNs(vns) {
 
 
 const {
+  getConfig: cell_getConfig,
   getI18n: cell_getI18n,
   getIcon: cell_getIcon,
   renderer: cell_renderer,
@@ -6101,9 +6102,12 @@ function renderHeaderHandle(h, params) {
     editRender,
     slots
   } = column;
-  const headerSlot = slots ? slots.header : null;
-  if (headerSlot) {
-    return renderTitleContent(h, params, $table.callSlot(headerSlot, params, h));
+  // 兼容已废弃方式
+  if (cell_getConfig().tableHeadeSlotToTitleSlot !== 'obsolete') {
+    const headerSlot = slots ? slots.header : null;
+    if (headerSlot) {
+      return renderTitleContent(h, params, $table.callSlot(headerSlot, params, h));
+    }
   }
   switch (type) {
     case 'seq':
@@ -6166,6 +6170,7 @@ const Cell = {
       editConfig
     } = tableProps;
     const {
+      slots,
       editRender,
       cellRender
     } = column;
@@ -6173,6 +6178,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(h, params, $table.callSlot(headerSlot, params, h));
+      }
+    }
     if (renderOpts) {
       const compConf = cell_renderer.get(renderOpts.name);
       const rtHeader = compConf ? compConf.renderTableHeader || compConf.renderHeader : null;
@@ -6507,6 +6519,14 @@ const Cell = {
       $table,
       column
     } = params;
+    // 兼容已废弃方式
+    if (cell_getConfig().tableHeadeSlotToTitleSlot === 'obsolete') {
+      const {
+        slots
+      } = column;
+      const headerSlot = slots ? slots.header : null;
+      return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, params, headerSlot ? $table.callSlot(headerSlot, params, h) : $table.getHeaderCellLabel(column)));
+    }
     return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, params, $table.getHeaderCellLabel(column)));
   },
   renderSeqCell(h, params) {
@@ -6546,6 +6566,13 @@ const Cell = {
       slots
     } = column;
     const titleSlot = slots ? slots.title : null;
+    // 兼容已废弃方式
+    if (cell_getConfig().tableHeadeSlotToTitleSlot === 'obsolete') {
+      const headerSlot = slots ? slots.header : null;
+      return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, params, headerSlot ? $table.callSlot(headerSlot, params, h) : [h('span', {
+        class: 'vxe-radio--label'
+      }, titleSlot ? $table.callSlot(titleSlot, params, h) : $table.getHeaderCellLabel(column))]));
+    }
     return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, params, [h('span', {
       class: 'vxe-radio--label'
     }, titleSlot ? $table.callSlot(titleSlot, params, h) : $table.getHeaderCellLabel(column))]));
@@ -6667,6 +6694,13 @@ const Cell = {
       disabled: isAllCheckboxDisabled,
       indeterminate: isAllCheckboxIndeterminate
     };
+    // 兼容已废弃方式
+    if (cell_getConfig().tableHeadeSlotToTitleSlot === 'obsolete') {
+      const headerSlot = slots ? slots.header : null;
+      if (headerSlot) {
+        return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, $table.callSlot(headerSlot, checkboxParams, h)));
+      }
+    }
     if (checkStrictly ? !showHeader : showHeader === false) {
       return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, [h('span', {
         class: 'vxe-checkbox--label'
@@ -23007,6 +23041,9 @@ function renderBody(h, $xeTable) {
       if (mouseOpts.area && areaOpts.selectCellByHeader && columnOpts.drag && columnDragOpts.trigger === 'cell') {
         table_errLog('vxe.error.notSupportProp', ['area-config.selectCellByHeader & column-config.drag', 'column-drag-config.trigger=cell', 'column-drag-config.trigger=default | area-config.selectCellByHeader=false']);
       }
+      if (mouseOpts.area && props.spanMethod) {
+        table_warnLog('vxe.error.notSupportProp', ['mouse-config.area', 'span-method', 'merge-cells']);
+      }
     }
     if (!$xeTable.handlePivotTableAggData) {
       if (customOpts.allowGroup) {
@@ -29730,7 +29767,7 @@ const Toolbar = VxeToolbar;
           mergeErr: '无法对合并单元格进行该操作',
           multiErr: '无法对多重选择区域进行该操作',
           selectErr: '无法操作指定区域的单元格',
-          extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同',
+          extendErr: '若要执行此操作，所有合并的单元格需大小相同',
           pasteMultiErr: '无法粘贴，需要相同大小的复制的区域和粘贴的区域才能执行此操作',
           cpInvalidErr: '该操作无法进行，您选择的区域中存在被禁止的列（{0}）'
         },
@@ -29882,7 +29919,7 @@ const Toolbar = VxeToolbar;
       area: {
         mergeErr: '无法对合并单元格进行该操作',
         multiErr: '无法对多重选择区域进行该操作',
-        extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同',
+        extendErr: '若要执行此操作，所有合并的单元格需大小相同',
         pasteMultiErr: '无法粘贴，需要相同大小的复制的区域和粘贴的区域才能执行此操作'
       },
       fnr: {