vxe-table 4.0.30 → 4.1.1

package/es/table/src/body.js

@@ -40,7 +40,7 @@ export default defineComponent({
         var xesize = inject('xesize', null);
         var xID = $xetable.xID, tableProps = $xetable.props, tableContext = $xetable.context, tableReactData = $xetable.reactData, tableInternalData = $xetable.internalData;
         var _a = $xetable.getRefMaps(), refTableHeader = _a.refTableHeader, refTableBody = _a.refTableBody, refTableFooter = _a.refTableFooter, refTableLeftBody = _a.refTableLeftBody, refTableRightBody = _a.refTableRightBody, refValidTooltip = _a.refValidTooltip;
-        var _b = $xetable.getComputeMaps(), computeEditOpts = _b.computeEditOpts, computeMouseOpts = _b.computeMouseOpts, computeSYOpts = _b.computeSYOpts, computeEmptyOpts = _b.computeEmptyOpts, computeKeyboardOpts = _b.computeKeyboardOpts, computeTooltipOpts = _b.computeTooltipOpts, computeRadioOpts = _b.computeRadioOpts, computeTreeOpts = _b.computeTreeOpts, computeCheckboxOpts = _b.computeCheckboxOpts, computeValidOpts = _b.computeValidOpts;
+        var _b = $xetable.getComputeMaps(), computeEditOpts = _b.computeEditOpts, computeMouseOpts = _b.computeMouseOpts, computeSYOpts = _b.computeSYOpts, computeEmptyOpts = _b.computeEmptyOpts, computeKeyboardOpts = _b.computeKeyboardOpts, computeTooltipOpts = _b.computeTooltipOpts, computeRadioOpts = _b.computeRadioOpts, computeTreeOpts = _b.computeTreeOpts, computeCheckboxOpts = _b.computeCheckboxOpts, computeValidOpts = _b.computeValidOpts, computeRowOpts = _b.computeRowOpts;
         var refElem = ref();
         var refBodyTable = ref();
         var refBodyColgroup = ref();
@@ -113,16 +113,18 @@ export default defineComponent({
         var renderColumn = function ($seq, seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) {
             var _a;
             var columnKey = tableProps.columnKey, height = tableProps.height, allColumnOverflow = tableProps.showOverflow, cellClassName = tableProps.cellClassName, cellStyle = tableProps.cellStyle, allAlign = tableProps.align, spanMethod = tableProps.spanMethod, mouseConfig = tableProps.mouseConfig, editConfig = tableProps.editConfig, editRules = tableProps.editRules, tooltipConfig = tableProps.tooltipConfig;
-            var tableData = tableReactData.tableData, overflowX = tableReactData.overflowX, scrollXLoad = tableReactData.scrollXLoad, scrollYLoad = tableReactData.scrollYLoad, currentColumn = tableReactData.currentColumn, mergeList = tableReactData.mergeList, editStore = tableReactData.editStore, validStore = tableReactData.validStore, isAllOverflow = tableReactData.isAllOverflow;
+            var tableData = tableReactData.tableData, overflowX = tableReactData.overflowX, scrollYLoad = tableReactData.scrollYLoad, currentColumn = tableReactData.currentColumn, mergeList = tableReactData.mergeList, editStore = tableReactData.editStore, validStore = tableReactData.validStore, isAllOverflow = tableReactData.isAllOverflow;
             var afterFullData = tableInternalData.afterFullData;
             var validOpts = computeValidOpts.value;
             var checkboxOpts = computeCheckboxOpts.value;
             var editOpts = computeEditOpts.value;
             var tooltipOpts = computeTooltipOpts.value;
+            var rowOpts = computeRowOpts.value;
             var sYOpts = computeSYOpts.value;
             var type = column.type, cellRender = column.cellRender, editRender = column.editRender, align = column.align, showOverflow = column.showOverflow, className = column.className, treeNode = column.treeNode;
             var actived = editStore.actived;
-            var rHeight = sYOpts.rHeight;
+            var scrollYRHeight = sYOpts.rHeight;
+            var rowHeight = rowOpts.height;
             var showAllTip = tooltipOpts.showAll;
             var columnIndex = $xetable.getColumnIndex(column);
             var _columnIndex = $xetable.getVTColumnIndex(column);
@@ -141,7 +143,7 @@ export default defineComponent({
             var attrs = { colid: column.id };
             var params = { $table: $xetable, $seq: $seq, seq: seq, rowid: rowid, row: row, rowIndex: rowIndex, $rowIndex: $rowIndex, _rowIndex: _rowIndex, column: column, columnIndex: columnIndex, $columnIndex: $columnIndex, _columnIndex: _columnIndex, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, level: rowLevel, visibleData: afterFullData, data: tableData, items: items };
             // 虚拟滚动不支持动态高度
-            if ((scrollXLoad || scrollYLoad) && !hasEllipsis) {
+            if (scrollYLoad && !hasEllipsis) {
                 showEllipsis = hasEllipsis = true;
             }
             // hover 进入事件
@@ -234,7 +236,7 @@ export default defineComponent({
                             'c--ellipsis': showEllipsis
                         }],
                     style: {
-                        maxHeight: hasEllipsis && rHeight ? rHeight + "px" : ''
+                        maxHeight: hasEllipsis && (scrollYRHeight || rowHeight) ? (scrollYRHeight || rowHeight) + "px" : ''
                     }
                 }));
             }
@@ -247,7 +249,7 @@ export default defineComponent({
                                 'c--ellipsis': showEllipsis
                             }],
                         style: {
-                            maxHeight: hasEllipsis && rHeight ? rHeight + "px" : ''
+                            maxHeight: hasEllipsis && (scrollYRHeight || rowHeight) ? (scrollYRHeight || rowHeight) + "px" : ''
                         },
                         title: showTitle ? $xetable.getCellLabel(row, column) : null
                     }, column.renderCell(params))]));
@@ -277,13 +279,13 @@ export default defineComponent({
                         _a['col--valid-error'] = hasValidError,
                         _a['col--current'] = currentColumn === column,
                         _a), getPropClass(className, params), getPropClass(cellClassName, params)], key: columnKey ? column.id : $columnIndex }, attrs), { style: Object.assign({
-                    height: hasEllipsis && rHeight ? rHeight + "px" : ''
+                    height: hasEllipsis && (scrollYRHeight || rowHeight) ? (scrollYRHeight || rowHeight) + "px" : ''
                 }, cellStyle ? (XEUtils.isFunction(cellStyle) ? cellStyle(params) : cellStyle) : null) }), tdOns), tdVNs);
         };
-        var renderRows = function ($seq, rowLevel, fixedType, tableData, tableColumn) {
+        var renderRows = function ($seq, fixedType, tableData, tableColumn) {
             var stripe = tableProps.stripe, rowKey = tableProps.rowKey, highlightHoverRow = tableProps.highlightHoverRow, rowClassName = tableProps.rowClassName, rowStyle = tableProps.rowStyle, allColumnOverflow = tableProps.showOverflow, editConfig = tableProps.editConfig, treeConfig = tableProps.treeConfig;
             var hasFixedColumn = tableReactData.hasFixedColumn, treeExpandeds = tableReactData.treeExpandeds, scrollYLoad = tableReactData.scrollYLoad, editStore = tableReactData.editStore, rowExpandeds = tableReactData.rowExpandeds, expandColumn = tableReactData.expandColumn, selectRow = tableReactData.selectRow;
-            var scrollYStore = tableInternalData.scrollYStore;
+            var fullAllDataRowIdData = tableInternalData.fullAllDataRowIdData, scrollYStore = tableInternalData.scrollYStore;
             var checkboxOpts = computeCheckboxOpts.value;
             var radioOpts = computeRadioOpts.value;
             var treeOpts = computeTreeOpts.value;
@@ -315,6 +317,8 @@ export default defineComponent({
                     };
                 }
                 var rowid = getRowid($xetable, row);
+                var rest = fullAllDataRowIdData[rowid];
+                var rowLevel = rest ? rest.level : 0;
                 var params = { $table: $xetable, $seq: $seq, seq: seq, rowid: rowid, fixed: fixedType, type: renderType, level: rowLevel, row: row, rowIndex: rowIndex, $rowIndex: $rowIndex, _rowIndex: _rowIndex };
                 var isNewRow = false;
                 if (editConfig) {
@@ -358,10 +362,10 @@ export default defineComponent({
                     ]));
                 }
                 // 如果是树形表格
-                if (treeConfig && treeExpandeds.length) {
+                if (treeConfig && !scrollYLoad && treeExpandeds.length) {
                     var rowChildren = row[treeOpts.children];
                     if (rowChildren && rowChildren.length && $xetable.findRowIndexOf(treeExpandeds, row) > -1) {
-                        rows.push.apply(rows, renderRows($seq ? $seq + "." + seq : "" + seq, rowLevel + 1, fixedType, rowChildren, tableColumn));
+                        rows.push.apply(rows, renderRows($seq ? $seq + "." + seq : "" + seq, fixedType, rowChildren, tableColumn));
                     }
                 }
             });
@@ -570,7 +574,7 @@ export default defineComponent({
         var renderVN = function () {
             var fixedColumn = props.fixedColumn, fixedType = props.fixedType, tableColumn = props.tableColumn;
             var keyboardConfig = tableProps.keyboardConfig, allColumnOverflow = tableProps.showOverflow, spanMethod = tableProps.spanMethod, mouseConfig = tableProps.mouseConfig;
-            var tableData = tableReactData.tableData, mergeList = tableReactData.mergeList, scrollXLoad = tableReactData.scrollXLoad, scrollYLoad = tableReactData.scrollYLoad, isAllOverflow = tableReactData.isAllOverflow;
+            var tableData = tableReactData.tableData, mergeList = tableReactData.mergeList, scrollYLoad = tableReactData.scrollYLoad, isAllOverflow = tableReactData.isAllOverflow;
             var visibleColumn = tableInternalData.visibleColumn;
             var slots = tableContext.slots;
             var sYOpts = computeSYOpts.value;
@@ -581,7 +585,7 @@ export default defineComponent({
             // const isMergeRightFixedExceeded = computeIsMergeRightFixedExceeded.value
             // 如果是使用优化模式
             if (fixedType) {
-                if (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
+                if (scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
                     if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
                         tableColumn = fixedColumn;
                     }
@@ -648,7 +652,7 @@ export default defineComponent({
                      */
                     h('tbody', {
                         ref: refBodyTBody
-                    }, renderRows('', 0, fixedType, tableData, tableColumn))
+                    }, renderRows('', fixedType, tableData, tableColumn))
                 ]),
                 h('div', {
                     class: 'vxe-table--checkbox-range'

package/es/table/src/emits.js

@@ -26,6 +26,7 @@ export default [
     'sort-change',
     'clear-sort',
     'filter-change',
+    'filter-visible',
     'clear-filter',
     'resizable-change',
     'toggle-row-expand',

package/es/table/src/props.js

@@ -94,8 +94,11 @@ export default {
     autoResize: { type: Boolean, default: function () { return GlobalConfig.table.autoResize; } },
     // 是否自动根据状态属性去更新响应式表格宽高
     syncResize: [Boolean, String, Number],
-    // 设置列的默认参数，仅对部分支持的属性有效
+    // 列配置信息
     columnConfig: Object,
+    // 行配置信息
+    rowConfig: Object,
+    // 列调整配置项
     resizableConfig: Object,
     // 序号配置项
     seqConfig: Object,