vxe-table 3.13.7 → 3.13.9

package/es/table/module/filter/panel.js

@@ -14,12 +14,15 @@ export default {
         }
     },
     render(h) {
+        const $panel = this;
         const $xeTable = this.$parent;
+        const tableInternalData = $xeTable;
         const { filterStore } = this;
-        const { args, visible, multiple, column } = filterStore;
+        const { visible, multiple, column } = filterStore;
         const filterRender = column ? column.filterRender : null;
         const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null;
         const filterClassName = compConf ? (compConf.tableFilterClassName || compConf.filterClassName) : '';
+        const params = Object.assign({}, tableInternalData._currFilterParams, { $panel, $table: $xeTable });
         const filterOpts = $xeTable.computeFilterOpts;
         const { destroyOnClose } = filterOpts;
         return h('div', {
@@ -27,7 +30,7 @@ export default {
                 'vxe-table--filter-wrapper',
                 'filter--prevent-default',
                 compConf && compConf.className ? compConf.className : '',
-                getClass(filterClassName, Object.assign({ $panel: this, $table: $xeTable }, args)),
+                getClass(filterClassName, params),
                 {
                     'is--animat': $xeTable.animat,
                     'is--multiple': multiple,
@@ -39,22 +42,27 @@ export default {
     },
     methods: {
         renderOptions(h, filterRender, compConf) {
-            const { $parent: $xetable, filterStore } = this;
-            const { args, column, multiple, maxHeight } = filterStore;
+            const $panel = this;
+            const $xeTable = this.$parent;
+            const tableInternalData = $xeTable;
+            const { filterStore } = this;
+            const { column, multiple, maxHeight } = filterStore;
             const slots = column ? column.slots : null;
+            const filterSlot = slots ? slots.filter : null;
+            const params = Object.assign({}, tableInternalData._currFilterParams, { $panel, $table: $xeTable });
             const rtFilter = compConf ? (compConf.renderTableFilter || compConf.renderFilter) : null;
-            if (slots && slots.filter) {
+            if (filterSlot) {
                 return [
                     h('div', {
                         class: 'vxe-table--filter-template'
-                    }, $xetable.callSlot(slots.filter, Object.assign({ $panel: this, context: this }, args), h))
+                    }, $xeTable.callSlot(filterSlot, params, h))
                 ];
             }
             else if (rtFilter) {
                 return [
                     h('div', {
                         class: 'vxe-table--filter-template'
-                    }, getSlotVNs(rtFilter.call($xetable, h, filterRender, Object.assign({ $panel: this, context: this }, args))))
+                    }, getSlotVNs(rtFilter.call($xeTable, h, filterRender, params)))
                 ];
             }
             const isAllChecked = multiple ? filterStore.isAllSelected : !filterStore.options.some((item) => item._checked);
@@ -125,9 +133,10 @@ export default {
             ];
         },
         renderFooter(h) {
-            const { $parent: $xetable, hasCheckOption, filterStore } = this;
-            const { filterOpts } = $xetable;
+            const $xeTable = this.$parent;
+            const { hasCheckOption, filterStore } = this;
             const { column, multiple } = filterStore;
+            const filterOpts = $xeTable.computeFilterOpts;
             const filterRender = column.filterRender;
             const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null;
             const isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate;

package/es/table/src/methods.js

@@ -191,7 +191,7 @@ function cacheColumnMap($xeTable) {
     let hasFixed;
     const handleFunc = (column, index, items, path, parentColumn) => {
         const { id: colid, field, fixed, type, treeNode } = column;
-        const rest = { $index: -1, _index: -1, column, colid, index, items, parent: parentColumn || null, width: 0 };
+        const rest = { $index: -1, _index: -1, column, colid, index, items, parent: parentColumn || null, width: 0, oLeft: 0 };
         if (field) {
             if (fullColumnFieldData[field]) {
                 errLog('vxe.error.colRepet', ['field', field]);
@@ -1567,6 +1567,20 @@ function handleScrollToRowColumn($xeTable, fieldOrColumn, row) {
     }
     return $xeTable.$nextTick();
 }
+const handleRowExpandReserve = ($xeTable, row, expanded) => {
+    const internalData = $xeTable;
+    const { rowExpandedReserveRowMap } = internalData;
+    const expandOpts = $xeTable.computeExpandOpts;
+    if (expandOpts.reserve) {
+        const rowid = getRowid($xeTable, row);
+        if (expanded) {
+            rowExpandedReserveRowMap[rowid] = row;
+        }
+        else if (rowExpandedReserveRowMap[rowid]) {
+            delete rowExpandedReserveRowMap[rowid];
+        }
+    }
+};
 // 计算可视渲染相关数据
 function computeScrollLoad($xeTable) {
     const reactData = $xeTable;
@@ -5950,7 +5964,7 @@ const Methods = {
         const rowid = getRowid(this, row);
         this.clearHoverRow();
         if ($el) {
-            XEUtils.arrayEach($el.querySelectorAll(`[rowid="${rowid}"]`), elem => addClass(elem, 'row--hover'));
+            XEUtils.arrayEach($el.querySelectorAll(`.vxe-body--row[rowid="${rowid}"]`), elem => addClass(elem, 'row--hover'));
         }
         this.hoverRow = row;
     },
@@ -7382,7 +7396,7 @@ const Methods = {
                 });
             }
             if (reserve) {
-                validRows.forEach((row) => this.handleRowExpandReserve(row, expanded));
+                validRows.forEach((row) => handleRowExpandReserve($xeTable, row, expanded));
             }
         }
         this.rowExpandedMaps = rExpandedMaps;
@@ -7417,35 +7431,28 @@ const Methods = {
      */
     clearRowExpand() {
         const $xeTable = this;
-        const { expandOpts, tableFullData } = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const { tableFullData } = internalData;
+        const expandOpts = $xeTable.computeExpandOpts;
         const { reserve } = expandOpts;
-        const expList = this.getRowExpandRecords();
-        this.rowExpandedMaps = {};
+        const expList = $xeTable.getRowExpandRecords();
+        reactData.rowExpandedMaps = {};
         if (reserve) {
-            tableFullData.forEach((row) => this.handleRowExpandReserve(row, false));
+            tableFullData.forEach((row) => handleRowExpandReserve($xeTable, row, false));
         }
-        return this.$nextTick().then(() => {
+        return $xeTable.$nextTick().then(() => {
             if (expList.length) {
-                this.recalculate();
+                return $xeTable.recalculate();
             }
-        }).then(() => $xeTable.updateCellAreas());
+        }).then(() => {
+            return $xeTable.updateCellAreas();
+        });
     },
     clearRowExpandReserve() {
         this.rowExpandedReserveRowMap = {};
         return this.$nextTick();
     },
-    handleRowExpandReserve(row, expanded) {
-        const { rowExpandedReserveRowMap, expandOpts } = this;
-        if (expandOpts.reserve) {
-            const rowid = getRowid(this, row);
-            if (expanded) {
-                rowExpandedReserveRowMap[rowid] = row;
-            }
-            else if (rowExpandedReserveRowMap[rowid]) {
-                delete rowExpandedReserveRowMap[rowid];
-            }
-        }
-    },
     getRowExpandRecords() {
         const rest = [];
         XEUtils.each(this.rowExpandedMaps, item => {

package/es/table/src/table.js

@@ -630,6 +630,8 @@ export default {
                 mini: 36
             },
             scrollVMLoading: false,
+            scrollYHeight: 0,
+            scrollXWidth: 0,
             rowExpandHeightFlag: 1,
             calcCellHeightFlag: 1,
             resizeHeightFlag: 1,

package/es/table/style.css

@@ -2211,15 +2211,6 @@
 .vxe-table .vxe-table--header-wrapper {
   color: var(--vxe-ui-table-header-font-color);
 }
-.vxe-table .vxe-table--header-wrapper::after {
-  content: "";
-  position: absolute;
-  left: 0;
-  bottom: 0;
-  height: 0;
-  width: 100%;
-  border-bottom: var(--vxe-ui-table-border-width) solid var(--vxe-ui-table-border-color);
-}
 .vxe-table .vxe-cell--sort {
   text-align: center;
   position: relative;
@@ -2467,11 +2458,6 @@
 .vxe-table--render-default.column--highlight .vxe-header--column:not(.col--seq):hover {
   background-color: var(--vxe-ui-table-column-hover-background-color);
 }
-.vxe-table--render-default.header-cell--area .vxe-table--header-wrapper {
-  -webkit-user-select: none;
-     -moz-user-select: none;
-          user-select: none;
-}
 .vxe-table--render-default.body-cell--area .vxe-table--body-wrapper {
   -webkit-user-select: none;
      -moz-user-select: none;
@@ -2654,9 +2640,6 @@
 .vxe-table--render-default.border--none .vxe-table--border-line {
   display: none;
 }
-.vxe-table--render-default.border--none .vxe-table--header-wrapper::after {
-  display: none;
-}
 .vxe-table--render-default.size--medium {
   font-size: var(--vxe-ui-font-size-medium);
 }