vxe-table 4.7.77 → 4.7.78

package/es/table/src/body.js

@@ -18,7 +18,10 @@ export default defineComponent({
         tableData: Array,
         tableColumn: Array,
         fixedColumn: Array,
-        fixedType: { type: String, default: null }
+        fixedType: {
+            type: String,
+            default: null
+        }
     },
     setup(props) {
         const $xeTable = inject('$xeTable', {});
@@ -147,7 +150,28 @@ export default defineComponent({
             const errorValidItem = validErrorMaps[`${rowid}:${colid}`];
             const showValidTip = editRules && validOpts.showMessage && (validOpts.message === 'default' ? (height || tableData.length > 1) : validOpts.message === 'inline');
             const attrs = { colid };
-            const params = { $table: $xeTable, $grid: $xeTable.xegrid, isEdit: false, seq, rowid, row, rowIndex, $rowIndex, _rowIndex, column, columnIndex, $columnIndex, _columnIndex, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, level: rowLevel, visibleData: afterFullData, data: tableData, items };
+            const params = {
+                $table: $xeTable,
+                $grid: $xeTable.xegrid,
+                isEdit: false,
+                seq,
+                rowid,
+                row,
+                rowIndex,
+                $rowIndex,
+                _rowIndex,
+                column,
+                columnIndex,
+                $columnIndex,
+                _columnIndex,
+                fixed: fixedType,
+                type: renderType,
+                isHidden: fixedHiddenColumn,
+                level: rowLevel,
+                visibleData: afterFullData,
+                data: tableData,
+                items
+            };
             // 虚拟滚动不支持动态高度
             if (scrollYLoad && !hasEllipsis) {
                 showEllipsis = hasEllipsis = true;

package/es/table/src/cell.js

@@ -251,14 +251,14 @@ export const Cell = {
         return [
             h('span', {
                 class: 'vxe-cell--label'
-            }, editRender && eqEmptyValue(cellValue)
-                ? [
-                    // 如果设置占位符
-                    h('span', {
+            }, [
+                // 如果设置占位符
+                editRender && eqEmptyValue(cellValue)
+                    ? h('span', {
                         class: 'vxe-cell--placeholder'
                     }, formatText(getFuncText(cellPlaceholder), 1))
-                ]
-                : formatText(cellValue, 1))
+                    : h('span', formatText(cellValue, 1))
+            ])
         ];
     },
     renderTreeCell(params) {

package/es/table/src/column.js

@@ -1,6 +1,6 @@
-import { defineComponent, h, onUnmounted, inject, ref, provide, onMounted } from 'vue';
-import { watchColumn, assembleColumn, destroyColumn } from '../../table/src/util';
-import Cell from '../../table/src/cell';
+import { defineComponent, h, onUnmounted, inject, ref, provide, onMounted, createCommentVNode } from 'vue';
+import { watchColumn, assembleColumn, destroyColumn } from './util';
+import Cell from './cell';
 export const columnProps = {
     // 列唯一主键
     colId: [String, Number],
@@ -17,7 +17,10 @@ export const columnProps = {
     // 列最大宽度
     maxWidth: [Number, String],
     // 是否允许拖动列宽调整大小
-    resizable: { type: Boolean, default: null },
+    resizable: {
+        type: Boolean,
+        default: null
+    },
     // 将列固定在左侧或者右侧
     fixed: String,
     // 列对其方式
@@ -27,11 +30,20 @@ export const columnProps = {
     // 表尾列的对齐方式
     footerAlign: String,
     // 当内容过长时显示为省略号
-    showOverflow: { type: [Boolean, String], default: null },
+    showOverflow: {
+        type: [Boolean, String],
+        default: null
+    },
     // 当表头内容过长时显示为省略号
-    showHeaderOverflow: { type: [Boolean, String], default: null },
+    showHeaderOverflow: {
+        type: [Boolean, String],
+        default: null
+    },
     // 当表尾内容过长时显示为省略号
-    showFooterOverflow: { type: [Boolean, String], default: null },
+    showFooterOverflow: {
+        type: [Boolean, String],
+        default: null
+    },
     // 给单元格附加 className
     className: [String, Function],
     // 给表头单元格附加 className
@@ -49,9 +61,15 @@ export const columnProps = {
     // 排序的字段类型，比如字符串转数值等
     sortType: String,
     // 配置筛选条件数组
-    filters: { type: Array, default: null },
+    filters: {
+        type: Array,
+        default: null
+    },
     // 筛选是否允许多选
-    filterMultiple: { type: Boolean, default: true },
+    filterMultiple: {
+        type: Boolean,
+        default: true
+    },
     // 自定义筛选方法
     filterMethod: Function,
     // 筛选重置方法
@@ -63,7 +81,10 @@ export const columnProps = {
     // 指定为树节点
     treeNode: Boolean,
     // 是否可视
-    visible: { type: Boolean, default: null },
+    visible: {
+        type: Boolean,
+        default: null
+    },
     // 表头单元格数据导出方法
     headerExportMethod: Function,
     // 单元格数据导出方法
@@ -92,25 +113,31 @@ export default defineComponent({
     props: columnProps,
     setup(props, { slots }) {
         const refElem = ref();
-        const $xeTable = inject('$xeTable', {});
-        const parentColgroup = inject('$xeColgroup', null);
-        const column = Cell.createColumn($xeTable, props);
-        column.slots = slots;
+        const $xeTable = inject('$xeTable', null);
+        const $xeColgroup = inject('$xeColgroup', null);
+        if (!$xeTable) {
+            return () => createCommentVNode();
+        }
+        const columnConfig = Cell.createColumn($xeTable, props);
+        columnConfig.slots = slots;
         const renderVN = () => {
             return h('div', {
                 ref: refElem
             });
         };
         const $xeColumn = {
-            column,
+            columnConfig,
             renderVN
         };
-        watchColumn($xeTable, props, column);
+        watchColumn($xeTable, props, columnConfig);
         onMounted(() => {
-            assembleColumn($xeTable, refElem.value, column, parentColgroup);
+            const elem = refElem.value;
+            if (elem) {
+                assembleColumn($xeTable, elem, columnConfig, $xeColgroup);
+            }
         });
         onUnmounted(() => {
-            destroyColumn($xeTable, column);
+            destroyColumn($xeTable, columnConfig);
         });
         provide('$xeColumn', $xeColumn);
         provide('$xeGrid', null);

package/es/table/src/footer.js

@@ -18,10 +18,22 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
 export default defineComponent({
     name: 'VxeTableFooter',
     props: {
-        footerTableData: { type: Array, default: () => [] },
-        tableColumn: { type: Array, default: () => [] },
-        fixedColumn: { type: Array, default: () => [] },
-        fixedType: { type: String, default: null }
+        footerTableData: {
+            type: Array,
+            default: () => []
+        },
+        tableColumn: {
+            type: Array,
+            default: () => []
+        },
+        fixedColumn: {
+            type: Array,
+            default: () => []
+        },
+        fixedType: {
+            type: String,
+            default: null
+        }
     },
     setup(props) {
         const $xeTable = inject('$xeTable', {});

package/es/table/src/group.js

@@ -1,34 +1,40 @@
-import { defineComponent, h, onUnmounted, provide, inject, ref, onMounted } from 'vue';
+import { defineComponent, h, onUnmounted, provide, inject, ref, onMounted, createCommentVNode } from 'vue';
 import { columnProps } from './column';
-import { watchColumn, assembleColumn, destroyColumn } from '../../table/src/util';
-import Cell from '../../table/src/cell';
+import { watchColumn, assembleColumn, destroyColumn } from './util';
+import Cell from './cell';
 export default defineComponent({
     name: 'VxeColgroup',
     props: columnProps,
     setup(props, { slots }) {
         const refElem = ref();
-        const $xeTable = inject('$xeTable', {});
-        const parentColgroup = inject('$xeColgroup', null);
-        const column = Cell.createColumn($xeTable, props);
+        const $xeTable = inject('$xeTable', null);
+        const $xeParentColgroup = inject('$xeColgroup', null);
+        if (!$xeTable) {
+            return () => createCommentVNode();
+        }
+        const columnConfig = Cell.createColumn($xeTable, props);
         const columnSlots = {};
         if (slots.header) {
             columnSlots.header = slots.header;
         }
-        column.slots = columnSlots;
-        column.children = [];
-        watchColumn($xeTable, props, column);
+        columnConfig.slots = columnSlots;
+        columnConfig.children = [];
+        watchColumn($xeTable, props, columnConfig);
         onMounted(() => {
-            assembleColumn($xeTable, refElem.value, column, parentColgroup);
+            const elem = refElem.value;
+            if (elem) {
+                assembleColumn($xeTable, elem, columnConfig, $xeParentColgroup);
+            }
         });
         onUnmounted(() => {
-            destroyColumn($xeTable, column);
+            destroyColumn($xeTable, columnConfig);
         });
         const renderVN = () => {
             return h('div', {
                 ref: refElem
             }, slots.default ? slots.default() : []);
         };
-        const $xeColgroup = { column };
+        const $xeColgroup = { columnConfig };
         provide('$xeColgroup', $xeColgroup);
         provide('$xeGrid', null);
         return renderVN;

package/es/table/src/header.js

@@ -10,7 +10,10 @@ export default defineComponent({
         tableColumn: Array,
         tableGroupColumn: Array,
         fixedColumn: Array,
-        fixedType: { type: String, default: null }
+        fixedType: {
+            type: String,
+            default: null
+        }
     },
     setup(props) {
         const $xeTable = inject('$xeTable', {});

package/es/table/src/props.js

@@ -8,39 +8,84 @@ export default {
     // 表格的高度
     height: [Number, String],
     // 表格的最小高度
-    minHeight: { type: [Number, String], default: () => getConfig().table.minHeight },
+    minHeight: {
+        type: [Number, String],
+        default: () => getConfig().table.minHeight
+    },
     // 表格的最大高度
     maxHeight: [Number, String],
     // 已废弃，被 column-config.resizable 替换
-    resizable: { type: Boolean, default: () => getConfig().table.resizable },
+    resizable: {
+        type: Boolean,
+        default: () => getConfig().table.resizable
+    },
     // 是否带有斑马纹
-    stripe: { type: Boolean, default: () => getConfig().table.stripe },
+    stripe: {
+        type: Boolean,
+        default: () => getConfig().table.stripe
+    },
     // 是否带有边框
-    border: { type: [Boolean, String], default: () => getConfig().table.border },
+    border: {
+        type: [Boolean, String],
+        default: () => getConfig().table.border
+    },
     // 是否圆角边框
-    round: { type: Boolean, default: () => getConfig().table.round },
+    round: {
+        type: Boolean,
+        default: () => getConfig().table.round
+    },
     // 表格的尺寸
-    size: { type: String, default: () => getConfig().table.size || getConfig().size },
+    size: {
+        type: String,
+        default: () => getConfig().table.size || getConfig().size
+    },
     // 列的宽度是否自撑开（可能会被废弃的参数，不要使用）
-    fit: { type: Boolean, default: () => getConfig().table.fit },
+    fit: {
+        type: Boolean,
+        default: () => getConfig().table.fit
+    },
     // 表格是否加载中
     loading: Boolean,
     // 所有的列对其方式
-    align: { type: String, default: () => getConfig().table.align },
+    align: {
+        type: String,
+        default: () => getConfig().table.align
+    },
     // 所有的表头列的对齐方式
-    headerAlign: { type: String, default: () => getConfig().table.headerAlign },
+    headerAlign: {
+        type: String,
+        default: () => getConfig().table.headerAlign
+    },
     // 所有的表尾列的对齐方式
-    footerAlign: { type: String, default: () => getConfig().table.footerAlign },
+    footerAlign: {
+        type: String,
+        default: () => getConfig().table.footerAlign
+    },
     // 是否显示表头
-    showHeader: { type: Boolean, default: () => getConfig().table.showHeader },
+    showHeader: {
+        type: Boolean,
+        default: () => getConfig().table.showHeader
+    },
     // （即将废弃）是否要高亮当前选中行
-    highlightCurrentRow: { type: Boolean, default: () => getConfig().table.highlightCurrentRow },
+    highlightCurrentRow: {
+        type: Boolean,
+        default: () => getConfig().table.highlightCurrentRow
+    },
     // （即将废弃）鼠标移到行是否要高亮显示
-    highlightHoverRow: { type: Boolean, default: () => getConfig().table.highlightHoverRow },
+    highlightHoverRow: {
+        type: Boolean,
+        default: () => getConfig().table.highlightHoverRow
+    },
     // （即将废弃）是否要高亮当前选中列
-    highlightCurrentColumn: { type: Boolean, default: () => getConfig().table.highlightCurrentColumn },
+    highlightCurrentColumn: {
+        type: Boolean,
+        default: () => getConfig().table.highlightCurrentColumn
+    },
     // （即将废弃）鼠标移到列是否要高亮显示
-    highlightHoverColumn: { type: Boolean, default: () => getConfig().table.highlightHoverColumn },
+    highlightHoverColumn: {
+        type: Boolean,
+        default: () => getConfig().table.highlightHoverColumn
+    },
     // （即将废弃）激活单元格编辑时是否高亮显示
     highlightCell: Boolean,
     // 是否显示表尾合计
@@ -82,23 +127,44 @@ export default {
     // 表尾合并行或列
     footerSpanMethod: Function,
     // 设置所有内容过长时显示为省略号
-    showOverflow: { type: [Boolean, String], default: () => getConfig().table.showOverflow },
+    showOverflow: {
+        type: [Boolean, String],
+        default: () => getConfig().table.showOverflow
+    },
     // 设置表头所有内容过长时显示为省略号
-    showHeaderOverflow: { type: [Boolean, String], default: () => getConfig().table.showHeaderOverflow },
+    showHeaderOverflow: {
+        type: [Boolean, String],
+        default: () => getConfig().table.showHeaderOverflow
+    },
     // 设置表尾所有内容过长时显示为省略号
-    showFooterOverflow: { type: [Boolean, String], default: () => getConfig().table.showFooterOverflow },
+    showFooterOverflow: {
+        type: [Boolean, String],
+        default: () => getConfig().table.showFooterOverflow
+    },
     /** 高级属性 */
     // （即将废弃）columnKey 已废弃，被 column-config.useKey 替换
     columnKey: Boolean,
     // （即将废弃）rowKey 已废弃，被 row-config.useKey 替换
     rowKey: Boolean,
     // （即将废弃）rowId 已废弃，被 row-config.keyField 替换
-    rowId: { type: String, default: () => getConfig().table.rowId },
+    rowId: {
+        type: String,
+        default: () => getConfig().table.rowId
+    },
     zIndex: Number,
-    emptyText: { type: String, default: () => getConfig().table.emptyText },
-    keepSource: { type: Boolean, default: () => getConfig().table.keepSource },
+    emptyText: {
+        type: String,
+        default: () => getConfig().table.emptyText
+    },
+    keepSource: {
+        type: Boolean,
+        default: () => getConfig().table.keepSource
+    },
     // 是否自动监听父容器变化去更新响应式表格宽高
-    autoResize: { type: Boolean, default: () => getConfig().table.autoResize },
+    autoResize: {
+        type: Boolean,
+        default: () => getConfig().table.autoResize
+    },
     // 是否自动根据状态属性去更新响应式表格宽高
     syncResize: [Boolean, String, Number],
     // 响应式布局配置项
@@ -160,9 +226,15 @@ export default {
     // 纵向虚拟滚动配置项
     scrollY: Object,
     // （即将废弃）优化相关
-    animat: { type: Boolean, default: () => getConfig().table.animat },
+    animat: {
+        type: Boolean,
+        default: () => getConfig().table.animat
+    },
     // （可能会被废弃的参数，不要使用）
-    delayHover: { type: Number, default: () => getConfig().table.delayHover },
+    delayHover: {
+        type: Number,
+        default: () => getConfig().table.delayHover
+    },
     // 额外的参数
     params: Object
 };

package/es/table/src/table.js

@@ -6930,9 +6930,7 @@ export default defineComponent({
             globalEvents.on($xeTable, 'mousewheel', handleGlobalMousewheelEvent);
             globalEvents.on($xeTable, 'keydown', handleGlobalKeydownEvent);
             globalEvents.on($xeTable, 'resize', handleGlobalResizeEvent);
-            if ($xeTable.handleGlobalContextmenuEvent) {
-                globalEvents.on($xeTable, 'contextmenu', $xeTable.handleGlobalContextmenuEvent);
-            }
+            globalEvents.on($xeTable, 'contextmenu', $xeTable.handleGlobalContextmenuEvent);
             tablePrivateMethods.preventEvent(null, 'mounted', { $table: $xeTable });
         });
         onBeforeUnmount(() => {
@@ -7135,7 +7133,7 @@ export default defineComponent({
                     })
                     : createCommentVNode(),
                 /**
-                 * 导出/导出
+                 * 导出
                  */
                 initStore.export && (props.exportConfig || props.printConfig)
                     ? h(TableExportPanelComponent, {

package/es/table/src/util.js

@@ -248,7 +248,7 @@ export function assembleColumn($xeTable, elem, column, colgroup) {
     const { reactData } = $xeTable;
     const { staticColumns } = reactData;
     const parentElem = elem.parentNode;
-    const parentColumn = colgroup ? colgroup.column : null;
+    const parentColumn = colgroup ? colgroup.columnConfig : null;
     const parentCols = parentColumn ? parentColumn.children : staticColumns;
     if (parentElem && parentCols) {
         parentCols.splice(XEUtils.arrayIndexOf(parentElem.children, elem), 0, column);