vxe-table 4.21.7 → 4.21.9

package/dist/all.esm.js

@@ -4,7 +4,7 @@ import XEUtils from 'xe-utils';
 import DomZIndex from 'dom-zindex';
 import { defineComponent, watch, reactive, h, ref, inject, createCommentVNode, onMounted, onUnmounted, provide, nextTick, TransitionGroup, computed, Teleport, resolveComponent, onActivated, onDeactivated, onBeforeUnmount } from 'vue';
 
-const { getConfig: getConfig$9 } = VxeUI;
+const { getConfig: getConfig$a } = VxeUI;
 function isEnableConf(conf) {
     return conf && conf.enabled !== false;
 }
@@ -31,11 +31,11 @@ function getFuncText(content, args) {
     if (XEUtils.eqNull(content)) {
         return '';
     }
-    const translate = getConfig$9().translate;
+    const translate = getConfig$a().translate;
     return `${translate ? translate('' + content, args) : content}`;
 }
 function formatText(value, placeholder) {
-    return '' + (isEmptyValue(value) ? (placeholder ? getConfig$9().emptyCell : '') : value);
+    return '' + (isEmptyValue(value) ? (placeholder ? getConfig$a().emptyCell : '') : value);
 }
 /**
  * 判断值为：'' | null | undefined 时都属于空值
@@ -47,7 +47,7 @@ function getDefaultConfig(val1, def1) {
     return XEUtils.eqNull(val1) ? def1 : val1;
 }
 
-const version = "4.21.7";
+const version = "4.21.9";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -441,7 +441,7 @@ VxeUI.setIcon({
 const setTheme = VxeUI.setTheme;
 const getTheme = VxeUI.getTheme;
 const setConfig = VxeUI.setConfig;
-const getConfig$8 = VxeUI.getConfig;
+const getConfig$9 = VxeUI.getConfig;
 const setIcon = VxeUI.setIcon;
 const getIcon$8 = VxeUI.getIcon;
 const setLanguage = VxeUI.setLanguage;
@@ -931,7 +931,7 @@ function getPopupWrapperElement(panelElem) {
 }
 
 const { log } = VxeUI;
-const tableVersion = `table v${"4.21.7"}`;
+const tableVersion = `table v${"4.21.9"}`;
 function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -2253,7 +2253,7 @@ function getSlotVNs(vns) {
     return [vns];
 }
 
-const { getI18n: getI18n$c, getIcon: getIcon$7, renderer: renderer$a, renderEmptyElement: renderEmptyElement$a } = VxeUI;
+const { getConfig: getConfig$8, getI18n: getI18n$c, getIcon: getIcon$7, renderer: renderer$a, renderEmptyElement: renderEmptyElement$a } = VxeUI;
 function renderTitlePrefixIcon(params) {
     const { $table, column } = params;
     const titlePrefix = column.titlePrefix || column.titleHelp;
@@ -2528,9 +2528,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$8().tableHeadeSlotToTitleSlot !== 'obsolete') {
+        const headerSlot = slots ? slots.header : null;
+        if (headerSlot) {
+            return renderTitleContent(params, $table.callSlot(headerSlot, params));
+        }
     }
     switch (type) {
         case 'seq':
@@ -2590,11 +2593,18 @@ 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$8().tableHeadeSlotToTitleSlot === 'obsolete') {
+            const headerSlot = slots ? slots.header : null;
+            if (headerSlot) {
+                return renderTitleContent(params, $table.callSlot(headerSlot, params));
+            }
+        }
         if (renderOpts) {
             const compConf = renderer$a.get(renderOpts.name);
             if (compConf) {
@@ -2863,6 +2873,12 @@ const Cell = {
      */
     renderSeqHeader(params) {
         const { $table, column } = params;
+        // 兼容已废弃方式
+        if (getConfig$8().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) {
@@ -2892,6 +2908,17 @@ const Cell = {
         const { $table, column } = params;
         const { slots } = column;
         const titleSlot = slots ? slots.title : null;
+        // 兼容已废弃方式
+        if (getConfig$8().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'
@@ -2973,6 +3000,13 @@ const Cell = {
             };
         }
         const checkboxParams = Object.assign(Object.assign({}, params), { checked: isAllCheckboxSelected, disabled: isAllCheckboxDisabled, indeterminate: isAllCheckboxIndeterminate });
+        // 兼容已废弃方式
+        if (getConfig$8().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', {
@@ -30386,6 +30420,9 @@ var VxeTableComponent = defineVxeComponent({
                 if (mouseOpts.area && areaOpts.selectCellByHeader && columnOpts.drag && columnDragOpts.trigger === 'cell') {
                     errLog$2('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) {
+                    errLog$2('vxe.error.notSupportProp', ['mouse-config.area', 'span-method', 'merge-cells']);
+                }
             }
             if (!$xeTable.handlePivotTableAggData) {
                 if (customOpts.allowGroup) {
@@ -33724,7 +33761,7 @@ var zhCN = {
                     mergeErr: '无法对合并单元格进行该操作',
                     multiErr: '无法对多重选择区域进行该操作',
                     selectErr: '无法操作指定区域的单元格',
-                    extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同',
+                    extendErr: '若要执行此操作，所有合并的单元格需大小相同',
                     pasteMultiErr: '无法粘贴，需要相同大小的复制的区域和粘贴的区域才能执行此操作',
                     cpInvalidErr: '该操作无法进行，您选择的区域中存在被禁止的列（{0}）'
                 },
@@ -33876,7 +33913,7 @@ var zhCN = {
             area: {
                 mergeErr: '无法对合并单元格进行该操作',
                 multiErr: '无法对多重选择区域进行该操作',
-                extendErr: '如果延伸的区域包含被合并的单元格，所有合并的单元格需大小相同',
+                extendErr: '若要执行此操作，所有合并的单元格需大小相同',
                 pasteMultiErr: '无法粘贴，需要相同大小的复制的区域和粘贴的区域才能执行此操作'
             },
             fnr: {
@@ -34007,7 +34044,7 @@ var VxeUITableExport = /*#__PURE__*/Object.freeze({
     commands: commands$2,
     config: config,
     formats: formats$2,
-    getConfig: getConfig$8,
+    getConfig: getConfig$9,
     getI18n: getI18n$e,
     getIcon: getIcon$8,
     getTheme: getTheme,
@@ -34035,4 +34072,4 @@ var VxeUITableExport = /*#__PURE__*/Object.freeze({
     version: version
 });
 
-export { Colgroup, Column, Grid, Table, Toolbar, VXETable, VxeColgroup, VxeColumn, VxeGrid, VxeTable, VxeToolbar, _t, clipboard, commands$2 as commands, config, VxeUITableExport as default, formats$2 as formats, getConfig$8 as getConfig, getI18n$e as getI18n, getIcon$8 as getIcon, getTheme, globalEvents$3 as globalEvents, globalResize$1 as globalResize, hooks$8 as hooks, install, interceptor$1 as interceptor, log$1 as log, menus$1 as menus, modal, print, readFile, renderer$c as renderer, saveFile, setConfig, setI18n, setIcon, setLanguage, setTheme, setup, t, use, validators$1 as validators, version };
+export { Colgroup, Column, Grid, Table, Toolbar, VXETable, VxeColgroup, VxeColumn, VxeGrid, VxeTable, VxeToolbar, _t, clipboard, commands$2 as commands, config, VxeUITableExport as default, formats$2 as formats, getConfig$9 as getConfig, getI18n$e as getI18n, getIcon$8 as getIcon, getTheme, globalEvents$3 as globalEvents, globalResize$1 as globalResize, hooks$8 as hooks, install, interceptor$1 as interceptor, log$1 as log, menus$1 as menus, modal, print, readFile, renderer$c as renderer, saveFile, setConfig, setI18n, setIcon, setLanguage, setTheme, setup, t, use, validators$1 as validators, version };